fix(base-modal): resubscribe observer when content node changed

core-ds · Jul 2, 2021 · 2fef06e · 2fef06e
1 parent f153178
commit 2fef06e
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/packages/base-modal/src/Component.tsx b/packages/base-modal/src/Component.tsx
@@ -232,13 +232,6 @@ export const BaseModal = forwardRef<HTMLDivElement, BaseModalProps>(
             }
         };
 
-        const contentRef = useCallback((node: HTMLDivElement) => {
-            if (node !== null) {
-                contentNodeRef.current = node;
-                checkToHasScrollBar();
-            }
-        }, []);
-
         const shouldRender = keepMounted || open || !exited;
 
         const resizeObserver = useMemo(() => new ResizeObserver(checkToHasScrollBar), []);
@@ -252,6 +245,17 @@ export const BaseModal = forwardRef<HTMLDivElement, BaseModalProps>(
             resizeObserver.disconnect();
         }, [resizeObserver]);
 
+        const contentRef = useCallback(
+            (node: HTMLDivElement) => {
+                if (node !== null) {
+                    contentNodeRef.current = node;
+                    resizeObserver.observe(node);
+                    checkToHasScrollBar();
+                }
+            },
+            [resizeObserver],
+        );
+
         const handleScroll = useCallback(() => {
             if (!scrollableNodeRef.current || !componentRef.current) return;