[desk-tool] Make color helper return observable value

sanity-io · Oct 6, 2020 · edbfb66 · edbfb66
1 parent 5058947
commit edbfb66
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/packages/@sanity/desk-tool/src/@types/parts.d.ts b/packages/@sanity/desk-tool/src/@types/parts.d.ts
@@ -12,6 +12,8 @@ declare module 'all:part:@sanity/base/diff-resolver' {
 }
 
 declare module '@sanity/base' {
+  import {Observable} from 'rxjs'
+
   export type UserColorHue =
     | 'blue'
     | 'cyan'
@@ -22,7 +24,7 @@ declare module '@sanity/base' {
     | 'magenta'
     | 'purple'
   export interface UserColorManager {
-    get: (userId: string) => UserColorHue
+    get: (userId: string) => Observable<UserColorHue>
   }
   export const useUserColorManager: () => UserColorManager
 }

diff --git a/packages/@sanity/desk-tool/src/diffs/helpers.ts b/packages/@sanity/desk-tool/src/diffs/helpers.ts
@@ -44,6 +44,13 @@ export function getAnnotationColor(
     return {bg: '#fcc', fg: '#f00'}
   }
 
-  const hueKey = colorManager.get(annotation.author)
+  let hueKey
+  colorManager
+    .get(annotation.author)
+    .subscribe(userColor => {
+      hueKey = userColor
+    })
+    .unsubscribe()
+
   return color[hueKey]
 }