fix(liveshare): update color for other members

Novout · May 9, 2023 · 088de58 · 088de58
1 parent 66359ab
commit 088de58
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/packages/app/src/components/page/editor/main/render/bar/EditorBaseRenderBarLiveshare.vue b/packages/app/src/components/page/editor/main/render/bar/EditorBaseRenderBarLiveshare.vue
@@ -2,8 +2,8 @@
   <div
     v-if="presence.length > 0"
     :style="[
-      LIVESHARE.lastUpdatedColor
-        ? { border: `1px solid ${LIVESHARE.lastUpdatedColor}` }
+      LIVESHARE.activeColor
+        ? { border: `1px solid ${LIVESHARE.activeColor}` }
         : {},
     ]"
     class="flex px-2 cursor-pointer items-center gap-2"

diff --git a/packages/app/src/store/liveshare.ts b/packages/app/src/store/liveshare.ts
@@ -8,7 +8,8 @@ export const useLiveshareStore = defineStore('liveshare', {
       presenceLimit: 5,
       user: undefined,
       roomKey: undefined,
-      lastUpdatedColor: undefined,
+      yourColor: undefined,
+      activeColor: undefined,
     }
   },
   actions: {

diff --git a/packages/plugin-multiplayer/src/room.ts b/packages/plugin-multiplayer/src/room.ts
@@ -44,7 +44,7 @@ export const RoomSet = (
     stores.PDF.$state = ctx.object.pdf
     stores.DOCX.$state = ctx.object.docx
 
-    stores.LIVESHARE.lastUpdatedColor = ctx.liveshare.lastUpdatedColor
+    stores.LIVESHARE.activeColor = ctx.liveshare.yourColor
 
     emitter.emit('plugin-theme-set')
   }
@@ -102,7 +102,7 @@ export const RoomSet = (
         if (leftPresences.some((presence) => getOwner(presence))) {
           await removePresence(channel)
 
-          if (type === 'visit') {
+          if (type !== 'owner') {
             hooks.local.deleteProject()
             stores.CONTEXT.$reset()
             stores.PROJECT.$reset()
@@ -123,8 +123,6 @@ export const RoomSet = (
         stores.LIVESHARE.presence = state
       })
       .on('broadcast', { event: 'ctx' }, ({ payload }) => {
-        if (type === 'owner') return
-
         setCTX(payload)
       })
       .subscribe(async (status) => {
@@ -144,7 +142,6 @@ export const RoomSet = (
           }
 
           const tracked = await channel.track(user)
-          stores.LIVESHARE.user = { presence_ref: '', ...user }
 
           if (tracked !== 'ok') {
             await removePresence(channel)
@@ -154,11 +151,14 @@ export const RoomSet = (
             return
           }
 
+          stores.LIVESHARE.user = { presence_ref: '', ...user }
+          stores.LIVESHARE.yourColor = hexColor
+
           const target = getCTX()
 
           if (type === 'owner') {
             channel.send(target)
-            stores.LIVESHARE.lastUpdatedColor = hexColor
+            stores.LIVESHARE.activeColor = hexColor
           } else {
             setCTX(target.payload)
           }
@@ -226,6 +226,8 @@ export const RoomSet = (
       stores.LIVESHARE.$reset()
       stores.ABSOLUTE.modal.presence.info = false
       stores.ABSOLUTE.modal.presence.createOrJoin = false
+
+      hooks.toast.warning(hooks.i18n.t('toast.generics.successRemoved'))
     },
     () => {},
   ])

diff --git a/packages/types/src/liveshare.ts b/packages/types/src/liveshare.ts
@@ -18,5 +18,6 @@ export interface LiveshareState {
   user?: LivesharePresenceUser
   roomKey?: string
   presenceLimit: number
-  lastUpdatedColor?: string
+  yourColor?: string
+  activeColor?: string
 }