avoid creating new object when id is not present

caplin · Oct 10, 2021 · 42e39dd · 42e39dd
1 parent 9168c0c
commit 42e39dd
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/examples/demo/App.tsx b/examples/demo/App.tsx
@@ -528,7 +528,11 @@ function TabStorage({ tab, layout }: { tab: TabNode, layout: FlexLayout.Layout }
     }, [scrollDown])
 
     const kickstartingCallback = useCallback((dragging: TabNode | IJsonTabNode) => {
-        const json = dragging instanceof TabNode ? dragging.toJson() as IJsonTabNode : { id: '#' + v4(), ...dragging }
+        const json = dragging instanceof TabNode ? dragging.toJson() as IJsonTabNode : dragging
+
+        if (json.id === undefined) {
+            json.id = `#${v4()}`
+        }
 
         setStoredTabs(tabs => [...tabs, json])
 
@@ -565,7 +569,11 @@ function TabStorage({ tab, layout }: { tab: TabNode, layout: FlexLayout.Layout }
     const insertionCallback = useCallback((dragging: TabNode | IJsonTabNode, _, __, y: number) => {
         const absoluteY = y + tab.getRect().y + layout.getDomRect().top
         const { insertionIndex } = calculateInsertion(absoluteY)
-        const json = dragging instanceof TabNode ? dragging.toJson() as IJsonTabNode : { id: '#' + v4(), ...dragging }
+        const json = dragging instanceof TabNode ? dragging.toJson() as IJsonTabNode : dragging
+
+        if (json.id === undefined) {
+            json.id = `#${v4()}`
+        }
 
         setStoredTabs(tabs => {
             const newTabs = [...tabs]