From 7c62787c98afc01379b2530530cf6382c01038e0 Mon Sep 17 00:00:00 2001
From: moklick <info@moritzklack.com>
Date: Thu, 29 Apr 2021 17:27:29 +0200
Subject: [PATCH] refactor(wrapNode): dont call dimension update twice on mount
 #1075

---
 src/components/Nodes/wrapNode.tsx | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/components/Nodes/wrapNode.tsx b/src/components/Nodes/wrapNode.tsx
index 9b7faf5c..d33f184c 100644
--- a/src/components/Nodes/wrapNode.tsx
+++ b/src/components/Nodes/wrapNode.tsx
@@ -1,4 +1,14 @@
-import React, { useEffect, useRef, memo, ComponentType, CSSProperties, useMemo, MouseEvent, useCallback } from 'react';
+import React, {
+  useEffect,
+  useLayoutEffect,
+  useRef,
+  memo,
+  ComponentType,
+  CSSProperties,
+  useMemo,
+  MouseEvent,
+  useCallback,
+} from 'react';
 import { DraggableCore, DraggableData, DraggableEvent } from 'react-draggable';
 import cc from 'classcat';
 
@@ -39,6 +49,7 @@ export default (NodeComponent: ComponentType<NodeComponentProps>) => {
     isDragging,
     resizeObserver,
   }: WrapNodeProps) => {
+    const observerInitialized = useRef<boolean>(false);
     const updateNodeDimensions = useStoreActions((actions) => actions.updateNodeDimensions);
     const addSelectedElements = useStoreActions((actions) => actions.addSelectedElements);
     const updateNodePosDiff = useStoreActions((actions) => actions.updateNodePosDiff);
@@ -191,21 +202,22 @@ export default (NodeComponent: ComponentType<NodeComponentProps>) => {
       [node, onNodeDoubleClick]
     );
 
-    useEffect(() => {
-      if (nodeElement.current && !isHidden) {
+    useLayoutEffect(() => {
+      // the resize observer calls an updateNodeDimensions initially.
+      // We don't need to force another dimension update if it hasn't happened yet
+      if (nodeElement.current && !isHidden && observerInitialized.current) {
         updateNodeDimensions([{ id, nodeElement: nodeElement.current, forceUpdate: true }]);
       }
     }, [id, isHidden, sourcePosition, targetPosition]);
 
     useEffect(() => {
       if (nodeElement.current) {
+        observerInitialized.current = true;
         const currNode = nodeElement.current;
         resizeObserver?.observe(currNode);
 
         return () => resizeObserver?.unobserve(currNode);
       }
-
-      return;
     }, []);
 
     if (isHidden) {