Revert "Discriminated union type"

This reverts commit dcc67bd.
concrete-utopia · Jan 25, 2024 · d4344c9 · d4344c9
1 parent 8e04f24
commit d4344c9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/editor/liveblocks.config.ts b/editor/liveblocks.config.ts
@@ -97,26 +97,25 @@ export type RoomEvent = ControlChangedRoomEvent
 // each thread. Can only contain booleans, strings, and numbers.
 export type ThreadMetadata = CanvasThreadMetadata | SceneThreadMetadata
 
-export type SceneThreadMetadata = BaseThreadMetadata & {
-  type: 'scene'
+export type SceneThreadMetadata = {
+  x: number
+  y: number
   sceneId: string
   sceneX: number
   sceneY: number
+  remixLocationRoute?: string
+  resolved: boolean
 }
 
-export type CanvasThreadMetadata = BaseThreadMetadata & {
-  type: 'canvas'
-}
-
-type BaseThreadMetadata = {
+export type CanvasThreadMetadata = {
   x: number
   y: number
   remixLocationRoute?: string
   resolved: boolean
 }
 
 export function isSceneThreadMetadata(metadata: ThreadMetadata): metadata is SceneThreadMetadata {
-  return metadata.type === 'scene'
+  return metadata.hasOwnProperty('sceneId')
 }
 
 export const {

diff --git a/editor/src/components/canvas/controls/comment-popup.tsx b/editor/src/components/canvas/controls/comment-popup.tsx
@@ -154,7 +154,6 @@ const CommentThread = React.memo(({ comment }: CommentThreadProps) => {
             const newThreadOnCanvas = createThread({
               body,
               metadata: {
-                type: 'canvas',
                 resolved: false,
                 x: comment.location.position.x,
                 y: comment.location.position.y,
@@ -183,7 +182,6 @@ const CommentThread = React.memo(({ comment }: CommentThreadProps) => {
             const newThreadOnScene = createThread({
               body,
               metadata: {
-                type: 'scene',
                 resolved: false,
                 x: comment.location.position.x,
                 y: comment.location.position.x,