diff --git a/bun.lockb b/bun.lockb index 6c715ad7..ba1e0d01 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/dist/index.js b/dist/index.js index 5535c79f..3d509265 100644 --- a/dist/index.js +++ b/dist/index.js @@ -132,6 +132,7 @@ } // list set(key, item) { + this.remove(key); this.value.set(key, item); this.additionHandlers.forEach((handler) => handler(item)); this.callSubscriptions(); @@ -404,6 +405,9 @@ outbox(id) { return id + "outbox"; }, + itemOutbox(id) { + return id + "item-outbox"; + }, composingMessage(id) { return id + "composing-message"; } @@ -420,6 +424,7 @@ messages; items; outbox; + itemOutbox; isOutBoxEmpty; composingMessage; primaryChannelInput; @@ -448,6 +453,7 @@ this.messages = restoreListState(storageKeys.messages(id)); this.items = restoreMapState(storageKeys.items(id)); this.outbox = restoreListState(storageKeys.outbox(id)); + this.itemOutbox = restoreListState(storageKeys.itemOutbox(id)); this.isOutBoxEmpty = createProxyState( [this.outbox], () => this.outbox.value.size == 0 @@ -563,6 +569,7 @@ const messageString = JSON.stringify(chatMessage); UDN.sendMessage(chatMessage.channel, messageString); } else { + if (chatMessage.itemData) return this.itemOutbox.add(chatMessage); this.outbox.add(chatMessage); } }; @@ -571,6 +578,10 @@ this.sendMessage(message); this.outbox.remove(message); }); + this.itemOutbox.value.forEach((message) => { + this.sendMessage(message); + this.itemOutbox.remove(message); + }); }; clearMessages = () => { this.messages.clear(); diff --git a/package.json b/package.json index 27152464..aba530a7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "bloatless-react": "^1.3.3", + "bloatless-react": "^1.3.4", "esbuild": "latest", "udn-frontend": "^1.0.7-beta1" }, diff --git a/src/Model/chatModel.ts b/src/Model/chatModel.ts index 551947f5..b553c92c 100644 --- a/src/Model/chatModel.ts +++ b/src/Model/chatModel.ts @@ -48,6 +48,7 @@ export class Chat { messages: React.ListState; items: React.MapState; outbox: React.ListState; + itemOutbox: React.ListState; isOutBoxEmpty: React.State; composingMessage: React.State; @@ -83,6 +84,7 @@ export class Chat { this.messages = React.restoreListState(storageKeys.messages(id)); this.items = React.restoreMapState(storageKeys.items(id)); this.outbox = React.restoreListState(storageKeys.outbox(id)); + this.itemOutbox = React.restoreListState(storageKeys.itemOutbox(id)); this.isOutBoxEmpty = React.createProxyState( [this.outbox], () => this.outbox.value.size == 0 @@ -236,6 +238,7 @@ export class Chat { const messageString = JSON.stringify(chatMessage); UDN.sendMessage(chatMessage.channel, messageString); } else { + if (chatMessage.itemData) return this.itemOutbox.add(chatMessage); this.outbox.add(chatMessage); } }; @@ -245,6 +248,10 @@ export class Chat { this.sendMessage(message); this.outbox.remove(message); }); + this.itemOutbox.value.forEach((message) => { + this.sendMessage(message); + this.itemOutbox.remove(message); + }); }; clearMessages = (): void => { diff --git a/src/utility.ts b/src/utility.ts index 8e71f43e..249ed8cb 100644 --- a/src/utility.ts +++ b/src/utility.ts @@ -27,6 +27,10 @@ export const storageKeys = { return id + "outbox"; }, + itemOutbox(id: string): string { + return id + "item-outbox"; + }, + composingMessage(id: string): string { return id + "composing-message"; },