react-resizable-panels 0.0.58 → 0.0.60

package/src/PanelGroup.ts

@@ -18,6 +18,7 @@ import { resetGlobalCursorStyle, setGlobalCursorStyle } from "./utils/cursor";
 import debounce from "./utils/debounce";
 import { determinePivotIndices } from "./utils/determinePivotIndices";
 import { calculateAvailablePanelSizeInPixels } from "./utils/dom/calculateAvailablePanelSizeInPixels";
+import { getPanelElementsForGroup } from "./utils/dom/getPanelElementsForGroup";
 import { getPanelGroupElement } from "./utils/dom/getPanelGroupElement";
 import { getResizeHandleElement } from "./utils/dom/getResizeHandleElement";
 import { isKeyDown, isMouseEvent, isTouchEvent } from "./utils/events";
@@ -70,7 +71,7 @@ const defaultStorage: PanelGroupStorage = {
 };
 
 export type PanelGroupProps = PropsWithChildren<{
-  autoSaveId?: string;
+  autoSaveId?: string | null;
   className?: string;
   dataAttributes?: DataAttributes;
   direction: Direction;
@@ -88,7 +89,7 @@ const debounceMap: {
 } = {};
 
 function PanelGroupWithForwardedRef({
-  autoSaveId,
+  autoSaveId = null,
   children,
   className: classNameFromProps = "",
   dataAttributes,
@@ -108,7 +109,6 @@ function PanelGroupWithForwardedRef({
 
   const [dragState, setDragState] = useState<DragState | null>(null);
   const [layout, setLayout] = useState<number[]>([]);
-  const [panelDataArray, setPanelDataArray] = useState<PanelData[]>([]);
 
   const panelIdToLastNotifiedMixedSizesMapRef = useRef<
     Record<string, MixedSizes>
@@ -117,6 +117,7 @@ function PanelGroupWithForwardedRef({
   const prevDeltaRef = useRef<number>(0);
 
   const committedValuesRef = useRef<{
+    autoSaveId: string | null;
     direction: Direction;
     dragState: DragState | null;
     id: string;
@@ -125,7 +126,9 @@ function PanelGroupWithForwardedRef({
     layout: number[];
     onLayout: PanelGroupOnLayout | null;
     panelDataArray: PanelData[];
+    storage: PanelGroupStorage;
   }>({
+    autoSaveId,
     direction,
     dragState,
     id: groupId,
@@ -133,7 +136,8 @@ function PanelGroupWithForwardedRef({
     keyboardResizeByPixels,
     layout,
     onLayout,
-    panelDataArray,
+    panelDataArray: [],
+    storage,
   });
 
   const devWarningsRef = useRef<{
@@ -191,6 +195,8 @@ function PanelGroupWithForwardedRef({
         if (!areEqual(prevLayout, safeLayout)) {
           setLayout(safeLayout);
 
+          committedValuesRef.current.layout = safeLayout;
+
           if (onLayout) {
             onLayout(
               safeLayout.map((sizePercentage) => ({
@@ -216,23 +222,28 @@ function PanelGroupWithForwardedRef({
   );
 
   useIsomorphicLayoutEffect(() => {
+    committedValuesRef.current.autoSaveId = autoSaveId;
     committedValuesRef.current.direction = direction;
     committedValuesRef.current.dragState = dragState;
     committedValuesRef.current.id = groupId;
-    committedValuesRef.current.layout = layout;
     committedValuesRef.current.onLayout = onLayout;
-    committedValuesRef.current.panelDataArray = panelDataArray;
+    committedValuesRef.current.storage = storage;
+
+    // panelDataArray and layout are updated in-sync with scheduled state updates.
+    // TODO [217] Move these values into a separate ref
   });
 
   useWindowSplitterPanelGroupBehavior({
     committedValuesRef,
     groupId,
     layout,
-    panelDataArray,
+    panelDataArray: committedValuesRef.current.panelDataArray,
     setLayout,
   });
 
   useEffect(() => {
+    const { panelDataArray } = committedValuesRef.current;
+
     // If this panel has been configured to persist sizing information, save sizes to local storage.
     if (autoSaveId) {
       if (layout.length === 0 || layout.length !== panelDataArray.length) {
@@ -248,73 +259,11 @@ function PanelGroupWithForwardedRef({
       }
       debounceMap[autoSaveId](autoSaveId, panelDataArray, layout, storage);
     }
-  }, [autoSaveId, layout, panelDataArray, storage]);
+  }, [autoSaveId, layout, storage]);
 
-  // Once all panels have registered themselves,
-  // Compute the initial sizes based on default weights.
-  // This assumes that panels register during initial mount (no conditional rendering)!
   useIsomorphicLayoutEffect(() => {
-    const { id: groupId, layout, onLayout } = committedValuesRef.current;
-    if (layout.length === panelDataArray.length) {
-      // Only compute (or restore) default layout once per panel configuration.
-      return;
-    }
-
-    // If this panel has been configured to persist sizing information,
-    // default size should be restored from local storage if possible.
-    let unsafeLayout: number[] | null = null;
-    if (autoSaveId) {
-      unsafeLayout = loadPanelLayout(autoSaveId, panelDataArray, storage);
-    }
-
-    const groupSizePixels = calculateAvailablePanelSizeInPixels(groupId);
-    if (groupSizePixels <= 0) {
-      // Wait until the group has rendered a non-zero size before computing layout.
-      return;
-    }
-
-    if (unsafeLayout == null) {
-      unsafeLayout = calculateUnsafeDefaultLayout({
-        groupSizePixels,
-        panelDataArray,
-      });
-    }
-
-    // Validate even saved layouts in case something has changed since last render
-    // e.g. for pixel groups, this could be the size of the window
-    const validatedLayout = validatePanelGroupLayout({
-      groupSizePixels,
-      layout: unsafeLayout,
-      panelConstraints: panelDataArray.map(
-        (panelData) => panelData.constraints
-      ),
-    });
-
-    if (!areEqual(layout, validatedLayout)) {
-      setLayout(validatedLayout);
-    }
-
-    if (onLayout) {
-      onLayout(
-        validatedLayout.map((sizePercentage) => ({
-          sizePercentage,
-          sizePixels: convertPercentageToPixels(
-            sizePercentage,
-            groupSizePixels
-          ),
-        }))
-      );
-    }
-
-    callPanelCallbacks(
-      groupId,
-      panelDataArray,
-      validatedLayout,
-      panelIdToLastNotifiedMixedSizesMapRef.current
-    );
-  }, [autoSaveId, layout, panelDataArray, storage]);
+    const { panelDataArray } = committedValuesRef.current;
 
-  useIsomorphicLayoutEffect(() => {
     const constraints = panelDataArray.map(({ constraints }) => constraints);
     if (!shouldMonitorPixelBasedConstraints(constraints)) {
       // Avoid the overhead of ResizeObserver if no pixel constraints require monitoring
@@ -342,6 +291,8 @@ function PanelGroupWithForwardedRef({
         if (!areEqual(prevLayout, nextLayout)) {
           setLayout(nextLayout);
 
+          committedValuesRef.current.layout = nextLayout;
+
           if (onLayout) {
             onLayout(
               nextLayout.map((sizePercentage) => ({
@@ -369,11 +320,13 @@ function PanelGroupWithForwardedRef({
         resizeObserver.disconnect();
       };
     }
-  }, [groupId, panelDataArray]);
+  }, [groupId]);
 
   // DEV warnings
   useEffect(() => {
     if (isDevelopment) {
+      const { panelDataArray } = committedValuesRef.current;
+
       const {
         didLogIdAndOrderWarning,
         didLogPanelConstraintsWarning,
@@ -381,8 +334,6 @@ function PanelGroupWithForwardedRef({
       } = devWarningsRef.current;
 
       if (!didLogIdAndOrderWarning) {
-        const { panelDataArray } = committedValuesRef.current;
-
         const panelIds = panelDataArray.map(({ id }) => id);
 
         devWarningsRef.current.prevPanelIds = panelIds;
@@ -480,6 +431,8 @@ function PanelGroupWithForwardedRef({
           if (!compareLayouts(prevLayout, nextLayout)) {
             setLayout(nextLayout);
 
+            committedValuesRef.current.layout = nextLayout;
+
             if (onLayout) {
               onLayout(
                 nextLayout.map((sizePercentage) => ({
@@ -555,6 +508,8 @@ function PanelGroupWithForwardedRef({
           if (!compareLayouts(prevLayout, nextLayout)) {
             setLayout(nextLayout);
 
+            committedValuesRef.current.layout = nextLayout;
+
             if (onLayout) {
               onLayout(
                 nextLayout.map((sizePercentage) => ({
@@ -603,6 +558,8 @@ function PanelGroupWithForwardedRef({
   // This API should never read from committedValuesRef
   const getPanelStyle = useCallback(
     (panelData: PanelData) => {
+      const { panelDataArray } = committedValuesRef.current;
+
       const panelIndex = panelDataArray.indexOf(panelData);
 
       return computePanelFlexBoxStyle({
@@ -612,7 +569,7 @@ function PanelGroupWithForwardedRef({
         panelIndex,
       });
     },
-    [dragState, layout, panelDataArray]
+    [dragState, layout]
   );
 
   // External APIs are safe to memoize via committed values ref
@@ -644,22 +601,97 @@ function PanelGroupWithForwardedRef({
   );
 
   const registerPanel = useCallback((panelData: PanelData) => {
-    setPanelDataArray((prevPanelDataArray) => {
-      const nextPanelDataArray = [...prevPanelDataArray, panelData];
-      return nextPanelDataArray.sort((panelA, panelB) => {
-        const orderA = panelA.order;
-        const orderB = panelB.order;
-        if (orderA == null && orderB == null) {
-          return 0;
-        } else if (orderA == null) {
-          return -1;
-        } else if (orderB == null) {
-          return 1;
-        } else {
-          return orderA - orderB;
-        }
+    const {
+      autoSaveId,
+      id: groupId,
+      layout: prevLayout,
+      onLayout,
+      panelDataArray,
+      storage,
+    } = committedValuesRef.current;
+
+    panelDataArray.push(panelData);
+    panelDataArray.sort((panelA, panelB) => {
+      const orderA = panelA.order;
+      const orderB = panelB.order;
+      if (orderA == null && orderB == null) {
+        return 0;
+      } else if (orderA == null) {
+        return -1;
+      } else if (orderB == null) {
+        return 1;
+      } else {
+        return orderA - orderB;
+      }
+    });
+
+    // Wait until all panels have registered before we try to compute layout;
+    // doing it earlier is both wasteful and may trigger misleading warnings in development mode.
+    const panelElements = getPanelElementsForGroup(groupId);
+    if (panelElements.length !== panelDataArray.length) {
+      return;
+    }
+
+    // If this panel has been configured to persist sizing information,
+    // default size should be restored from local storage if possible.
+    let unsafeLayout: number[] | null = null;
+    if (autoSaveId) {
+      unsafeLayout = loadPanelLayout(autoSaveId, panelDataArray, storage);
+    }
+
+    const groupSizePixels = calculateAvailablePanelSizeInPixels(groupId);
+    if (groupSizePixels <= 0) {
+      if (
+        shouldMonitorPixelBasedConstraints(
+          panelDataArray.map(({ constraints }) => constraints)
+        )
+      ) {
+        // Wait until the group has rendered a non-zero size before computing layout.
+        return;
+      }
+    }
+
+    if (unsafeLayout == null) {
+      unsafeLayout = calculateUnsafeDefaultLayout({
+        groupSizePixels,
+        panelDataArray,
       });
+    }
+
+    // Validate even saved layouts in case something has changed since last render
+    // e.g. for pixel groups, this could be the size of the window
+    const nextLayout = validatePanelGroupLayout({
+      groupSizePixels,
+      layout: unsafeLayout,
+      panelConstraints: panelDataArray.map(
+        (panelData) => panelData.constraints
+      ),
     });
+
+    if (!areEqual(prevLayout, nextLayout)) {
+      setLayout(nextLayout);
+
+      committedValuesRef.current.layout = nextLayout;
+
+      if (onLayout) {
+        onLayout(
+          nextLayout.map((sizePercentage) => ({
+            sizePercentage,
+            sizePixels: convertPercentageToPixels(
+              sizePercentage,
+              groupSizePixels
+            ),
+          }))
+        );
+      }
+
+      callPanelCallbacks(
+        groupId,
+        panelDataArray,
+        nextLayout,
+        panelIdToLastNotifiedMixedSizesMapRef.current
+      );
+    }
   }, []);
 
   const registerResizeHandle = useCallback((dragHandleId: string) => {
@@ -749,6 +781,8 @@ function PanelGroupWithForwardedRef({
       if (layoutChanged) {
         setLayout(nextLayout);
 
+        committedValuesRef.current.layout = nextLayout;
+
         if (onLayout) {
           onLayout(
             nextLayout.map((sizePercentage) => ({
@@ -810,6 +844,8 @@ function PanelGroupWithForwardedRef({
       if (!compareLayouts(prevLayout, nextLayout)) {
         setLayout(nextLayout);
 
+        committedValuesRef.current.layout = nextLayout;
+
         if (onLayout) {
           onLayout(
             nextLayout.map((sizePercentage) => ({
@@ -859,18 +895,106 @@ function PanelGroupWithForwardedRef({
     setDragState(null);
   }, []);
 
+  const unregisterPanelRef = useRef<{
+    pendingPanelIds: Set<string>;
+    timeout: NodeJS.Timeout | null;
+  }>({
+    pendingPanelIds: new Set(),
+    timeout: null,
+  });
   const unregisterPanel = useCallback((panelData: PanelData) => {
-    delete panelIdToLastNotifiedMixedSizesMapRef.current[panelData.id];
+    const {
+      id: groupId,
+      layout: prevLayout,
+      onLayout,
+      panelDataArray,
+    } = committedValuesRef.current;
+
+    const index = panelDataArray.indexOf(panelData);
+    if (index >= 0) {
+      panelDataArray.splice(index, 1);
+      unregisterPanelRef.current.pendingPanelIds.add(panelData.id);
+    }
+
+    if (unregisterPanelRef.current.timeout != null) {
+      clearTimeout(unregisterPanelRef.current.timeout);
+    }
+
+    // Batch panel unmounts so that we only calculate layout once;
+    // This is more efficient and avoids misleading warnings in development mode.
+    // We can't check the DOM to detect this because Panel elements have not yet been removed.
+    unregisterPanelRef.current.timeout = setTimeout(() => {
+      const { pendingPanelIds } = unregisterPanelRef.current;
+      const map = panelIdToLastNotifiedMixedSizesMapRef.current;
+
+      // TRICKY
+      // Strict effects mode
+      let unmountDueToStrictMode = false;
+      pendingPanelIds.forEach((panelId) => {
+        pendingPanelIds.delete(panelId);
+
+        if (panelDataArray.find(({ id }) => id === panelId) == null) {
+          unmountDueToStrictMode = true;
+
+          // TRICKY
+          // When a panel is removed from the group, we should delete the most recent prev-size entry for it.
+          // If we don't do this, then a conditionally rendered panel might not call onResize when it's re-mounted.
+          // Strict effects mode makes this tricky though because all panels will be registered, unregistered, then re-registered on mount.
+          delete panelIdToLastNotifiedMixedSizesMapRef.current[panelData.id];
+        }
+      });
 
-    setPanelDataArray((panelDataArray) => {
-      const index = panelDataArray.indexOf(panelData);
-      if (index >= 0) {
-        panelDataArray = [...panelDataArray];
-        panelDataArray.splice(index, 1);
+      if (!unmountDueToStrictMode) {
+        return;
       }
 
-      return panelDataArray;
-    });
+      if (panelDataArray.length === 0) {
+        // The group is unmounting; skip layout calculation.
+        return;
+      }
+
+      const groupSizePixels = calculateAvailablePanelSizeInPixels(groupId);
+
+      let unsafeLayout: number[] = calculateUnsafeDefaultLayout({
+        groupSizePixels,
+        panelDataArray,
+      });
+
+      // Validate even saved layouts in case something has changed since last render
+      // e.g. for pixel groups, this could be the size of the window
+      const nextLayout = validatePanelGroupLayout({
+        groupSizePixels,
+        layout: unsafeLayout,
+        panelConstraints: panelDataArray.map(
+          (panelData) => panelData.constraints
+        ),
+      });
+
+      if (!areEqual(prevLayout, nextLayout)) {
+        setLayout(nextLayout);
+
+        committedValuesRef.current.layout = nextLayout;
+
+        if (onLayout) {
+          onLayout(
+            nextLayout.map((sizePercentage) => ({
+              sizePercentage,
+              sizePixels: convertPercentageToPixels(
+                sizePercentage,
+                groupSizePixels
+              ),
+            }))
+          );
+        }
+
+        callPanelCallbacks(
+          groupId,
+          panelDataArray,
+          nextLayout,
+          panelIdToLastNotifiedMixedSizesMapRef.current
+        );
+      }
+    }, 0);
   }, []);
 
   const context = useMemo(

package/src/hooks/useWindowSplitterPanelGroupBehavior.ts

@@ -1,6 +1,5 @@
 import { isDevelopment } from "#is-development";
 import { PanelData } from "../Panel";
-import { PRECISION } from "../constants";
 import { Direction } from "../types";
 import { adjustLayoutByDelta } from "../utils/adjustLayoutByDelta";
 import { assert } from "../utils/assert";
@@ -12,6 +11,7 @@ import { getPanelGroupElement } from "../utils/dom/getPanelGroupElement";
 import { getResizeHandleElementsForGroup } from "../utils/dom/getResizeHandleElementsForGroup";
 import { getResizeHandlePanelIds } from "../utils/dom/getResizeHandlePanelIds";
 import { getPercentageSizeFromMixedSizes } from "../utils/getPercentageSizeFromMixedSizes";
+import { fuzzyNumbersEqual } from "../utils/numbers/fuzzyNumbersEqual";
 import { RefObject, useEffect, useRef } from "../vendor/react";
 import useIsomorphicLayoutEffect from "./useIsomorphicEffect";
 
@@ -95,13 +95,11 @@ export function useWindowSplitterPanelGroupBehavior({
   }, [groupId, layout, panelDataArray]);
 
   useEffect(() => {
-    const { direction, panelDataArray } = committedValuesRef.current!;
+    const { panelDataArray } = committedValuesRef.current!;
 
     const groupElement = getPanelGroupElement(groupId);
     assert(groupElement != null, `No group found for id "${groupId}"`);
 
-    const { height, width } = groupElement.getBoundingClientRect();
-
     const handles = getResizeHandleElementsForGroup(groupId);
     const cleanupFunctions = handles.map((handle) => {
       const handleId = handle.getAttribute("data-panel-resize-handle-id")!;
@@ -130,9 +128,18 @@ export function useWindowSplitterPanelGroupBehavior({
             if (index >= 0) {
               const panelData = panelDataArray[index];
               const size = layout[index];
-              if (size != null) {
+              if (size != null && panelData.constraints.collapsible) {
                 const groupSizePixels = getAvailableGroupSizePixels(groupId);
 
+                const collapsedSize =
+                  getPercentageSizeFromMixedSizes(
+                    {
+                      sizePercentage:
+                        panelData.constraints.collapsedSizePercentage,
+                      sizePixels: panelData.constraints.collapsedSizePixels,
+                    },
+                    groupSizePixels
+                  ) ?? 0;
                 const minSize =
                   getPercentageSizeFromMixedSizes(
                     {
@@ -142,17 +149,10 @@ export function useWindowSplitterPanelGroupBehavior({
                     groupSizePixels
                   ) ?? 0;
 
-                let delta = 0;
-                if (
-                  size.toPrecision(PRECISION) <= minSize.toPrecision(PRECISION)
-                ) {
-                  delta = direction === "horizontal" ? width : height;
-                } else {
-                  delta = -(direction === "horizontal" ? width : height);
-                }
-
                 const nextLayout = adjustLayoutByDelta({
-                  delta,
+                  delta: fuzzyNumbersEqual(size, collapsedSize)
+                    ? minSize - collapsedSize
+                    : collapsedSize - size,
                   groupSizePixels,
                   layout,
                   panelConstraints: panelDataArray.map(

package/src/utils/dom/getPanelElementsForGroup.ts

@@ -0,0 +1,5 @@
+export function getPanelElementsForGroup(groupId: string): HTMLDivElement[] {
+  return Array.from(
+    document.querySelectorAll(`[data-panel][data-panel-group-id="${groupId}"]`)
+  );
+}