react-resizable-panels 0.0.59 → 0.0.60

package/dist/react-resizable-panels.node.esm.js

@@ -67,6 +67,7 @@ function PanelWithForwardedRef({
     expandPanel,
     getPanelSize,
     getPanelStyle,
+    groupId,
     isPanelCollapsed,
     registerPanel,
     resizePanel,
@@ -132,6 +133,7 @@ function PanelWithForwardedRef({
     // CSS selectors
     "data-panel": "",
     "data-panel-id": panelId,
+    "data-panel-group-id": groupId,
     // e2e test attributes
     "data-panel-collapsible": undefined,
     "data-panel-size": undefined
@@ -772,6 +774,44 @@ function calculateDeltaPercentage(event, groupId, dragHandleId, direction, initi
   }
 }
 
+function calculateUnsafeDefaultLayout({
+  groupSizePixels,
+  panelDataArray
+}) {
+  const layout = Array(panelDataArray.length);
+  const panelDataConstraints = panelDataArray.map(panelData => panelData.constraints);
+  let numPanelsWithSizes = 0;
+  let remainingSize = 100;
+
+  // Distribute default sizes first
+  for (let index = 0; index < panelDataArray.length; index++) {
+    const {
+      defaultSizePercentage
+    } = computePercentagePanelConstraints(panelDataConstraints, index, groupSizePixels);
+    if (defaultSizePercentage != null) {
+      numPanelsWithSizes++;
+      layout[index] = defaultSizePercentage;
+      remainingSize -= defaultSizePercentage;
+    }
+  }
+
+  // Remaining size should be distributed evenly between panels without default sizes
+  for (let index = 0; index < panelDataArray.length; index++) {
+    const {
+      defaultSizePercentage
+    } = computePercentagePanelConstraints(panelDataConstraints, index, groupSizePixels);
+    if (defaultSizePercentage != null) {
+      continue;
+    }
+    const numRemainingPanels = panelDataArray.length - numPanelsWithSizes;
+    const size = remainingSize / numRemainingPanels;
+    numPanelsWithSizes++;
+    layout[index] = size;
+    remainingSize -= size;
+  }
+  return layout;
+}
+
 function convertPercentageToPixels(percentage, groupSizePixels) {
   return percentage / 100 * groupSizePixels;
 }
@@ -922,6 +962,10 @@ function debounce(callback, durationMs = 10) {
   return callable;
 }
 
+function getPanelElementsForGroup(groupId) {
+  return Array.from(document.querySelectorAll(`[data-panel][data-panel-group-id="${groupId}"]`));
+}
+
 // PanelGroup might be rendering in a server-side environment where localStorage is not available
 // or on a browser with cookies/storage disabled.
 // In either case, this function avoids accessing localStorage until needed,
@@ -977,6 +1021,15 @@ function loadSerializedPanelGroupState(autoSaveId, storage) {
   } catch (error) {}
   return null;
 }
+function loadPanelLayout(autoSaveId, panels, storage) {
+  const state = loadSerializedPanelGroupState(autoSaveId, storage);
+  if (state) {
+    var _state$key;
+    const key = getSerializationKey(panels);
+    return (_state$key = state[key]) !== null && _state$key !== void 0 ? _state$key : null;
+  }
+  return null;
+}
 function savePanelGroupLayout(autoSaveId, panels, sizes, storage) {
   const key = getSerializationKey(panels);
   const state = loadSerializedPanelGroupState(autoSaveId, storage) || {};
@@ -988,6 +1041,12 @@ function savePanelGroupLayout(autoSaveId, panels, sizes, storage) {
   }
 }
 
+function shouldMonitorPixelBasedConstraints(constraints) {
+  return constraints.some(constraints => {
+    return constraints.collapsedSizePixels !== undefined || constraints.maxSizePixels !== undefined || constraints.minSizePixels !== undefined;
+  });
+}
+
 // All units must be in percentages; pixel values should be pre-converted
 function validatePanelGroupLayout({
   groupSizePixels,
@@ -1056,7 +1115,7 @@ const defaultStorage = {
 };
 const debounceMap = {};
 function PanelGroupWithForwardedRef({
-  autoSaveId,
+  autoSaveId = null,
   children,
   className: classNameFromProps = "",
   dataAttributes,
@@ -1073,12 +1132,11 @@ function PanelGroupWithForwardedRef({
   const groupId = useUniqueId(idFromProps);
   const [dragState, setDragState] = useState(null);
   const [layout, setLayout] = useState([]);
-  const [panelDataArray, setPanelDataArray] = useState([]);
   const panelIdToLastNotifiedMixedSizesMapRef = useRef({});
   const panelSizeBeforeCollapseRef = useRef(new Map());
   const prevDeltaRef = useRef(0);
-  const [imperativeApiQueue, setImperativeApiQueue] = useState([]);
   const committedValuesRef = useRef({
+    autoSaveId,
     direction,
     dragState,
     id: groupId,
@@ -1086,7 +1144,8 @@ function PanelGroupWithForwardedRef({
     keyboardResizeByPixels,
     layout,
     onLayout,
-    panelDataArray
+    panelDataArray: [],
+    storage
   });
   useRef({
     didLogIdAndOrderWarning: false,
@@ -1124,6 +1183,7 @@ function PanelGroupWithForwardedRef({
       });
       if (!areEqual(prevLayout, safeLayout)) {
         setLayout(safeLayout);
+        committedValuesRef.current.layout = safeLayout;
         if (onLayout) {
           onLayout(safeLayout.map(sizePercentage => ({
             sizePercentage,
@@ -1134,14 +1194,19 @@ function PanelGroupWithForwardedRef({
       }
     }
   }), []);
+
   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) {
@@ -1154,7 +1219,7 @@ function PanelGroupWithForwardedRef({
       }
       debounceMap[autoSaveId](autoSaveId, panelDataArray, layout, storage);
     }
-  }, [autoSaveId, layout, panelDataArray, storage]);
+  }, [autoSaveId, layout, storage]);
 
   // DEV warnings
   useEffect(() => {
@@ -1167,17 +1232,6 @@ function PanelGroupWithForwardedRef({
       onLayout,
       panelDataArray
     } = committedValuesRef.current;
-
-    // See issues/211
-    if (panelDataArray.find(({
-      id
-    }) => id === panelData.id) == null) {
-      setImperativeApiQueue(prev => [...prev, {
-        panelData,
-        type: "collapse"
-      }]);
-      return;
-    }
     if (panelData.constraints.collapsible) {
       const panelConstraintsArray = panelDataArray.map(panelData => panelData.constraints);
       const {
@@ -1202,6 +1256,7 @@ function PanelGroupWithForwardedRef({
         });
         if (!compareLayouts(prevLayout, nextLayout)) {
           setLayout(nextLayout);
+          committedValuesRef.current.layout = nextLayout;
           if (onLayout) {
             onLayout(nextLayout.map(sizePercentage => ({
               sizePercentage,
@@ -1221,17 +1276,6 @@ function PanelGroupWithForwardedRef({
       onLayout,
       panelDataArray
     } = committedValuesRef.current;
-
-    // See issues/211
-    if (panelDataArray.find(({
-      id
-    }) => id === panelData.id) == null) {
-      setImperativeApiQueue(prev => [...prev, {
-        panelData,
-        type: "expand"
-      }]);
-      return;
-    }
     if (panelData.constraints.collapsible) {
       const panelConstraintsArray = panelDataArray.map(panelData => panelData.constraints);
       const {
@@ -1257,6 +1301,7 @@ function PanelGroupWithForwardedRef({
         });
         if (!compareLayouts(prevLayout, nextLayout)) {
           setLayout(nextLayout);
+          committedValuesRef.current.layout = nextLayout;
           if (onLayout) {
             onLayout(nextLayout.map(sizePercentage => ({
               sizePercentage,
@@ -1287,6 +1332,9 @@ function PanelGroupWithForwardedRef({
 
   // This API should never read from committedValuesRef
   const getPanelStyle = useCallback(panelData => {
+    const {
+      panelDataArray
+    } = committedValuesRef.current;
     const panelIndex = panelDataArray.indexOf(panelData);
     return computePanelFlexBoxStyle({
       dragState,
@@ -1294,7 +1342,7 @@ function PanelGroupWithForwardedRef({
       panelData: panelDataArray,
       panelIndex
     });
-  }, [dragState, layout, panelDataArray]);
+  }, [dragState, layout]);
 
   // External APIs are safe to memoize via committed values ref
   const isPanelCollapsed = useCallback(panelData => {
@@ -1324,22 +1372,76 @@ function PanelGroupWithForwardedRef({
     return !collapsible || panelSizePercentage > collapsedSizePercentage;
   }, [groupId]);
   const registerPanel = useCallback(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 = 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 => {
     return function resizeHandler(event) {
@@ -1409,6 +1511,7 @@ function PanelGroupWithForwardedRef({
       }
       if (layoutChanged) {
         setLayout(nextLayout);
+        committedValuesRef.current.layout = nextLayout;
         if (onLayout) {
           onLayout(nextLayout.map(sizePercentage => ({
             sizePercentage,
@@ -1427,18 +1530,6 @@ function PanelGroupWithForwardedRef({
       onLayout,
       panelDataArray
     } = committedValuesRef.current;
-
-    // See issues/211
-    if (panelDataArray.find(({
-      id
-    }) => id === panelData.id) == null) {
-      setImperativeApiQueue(prev => [...prev, {
-        panelData,
-        mixedSizes,
-        type: "resize"
-      }]);
-      return;
-    }
     const panelConstraintsArray = panelDataArray.map(panelData => panelData.constraints);
     const {
       groupSizePixels,
@@ -1458,6 +1549,7 @@ function PanelGroupWithForwardedRef({
     });
     if (!compareLayouts(prevLayout, nextLayout)) {
       setLayout(nextLayout);
+      committedValuesRef.current.layout = nextLayout;
       if (onLayout) {
         onLayout(nextLayout.map(sizePercentage => ({
           sizePercentage,
@@ -1485,16 +1577,84 @@ function PanelGroupWithForwardedRef({
     resetGlobalCursorStyle();
     setDragState(null);
   }, []);
+  const unregisterPanelRef = useRef({
+    pendingPanelIds: new Set(),
+    timeout: null
+  });
   const unregisterPanel = useCallback(panelData => {
-    delete panelIdToLastNotifiedMixedSizesMapRef.current[panelData.id];
-    setPanelDataArray(panelDataArray => {
-      const index = panelDataArray.indexOf(panelData);
-      if (index >= 0) {
-        panelDataArray = [...panelDataArray];
-        panelDataArray.splice(index, 1);
+    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;
+      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];
+        }
+      });
+      if (!unmountDueToStrictMode) {
+        return;
       }
-      return panelDataArray;
-    });
+      if (panelDataArray.length === 0) {
+        // The group is unmounting; skip layout calculation.
+        return;
+      }
+      const groupSizePixels = calculateAvailablePanelSizeInPixels(groupId);
+      let 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);
+      }
+    }, 0);
   }, []);
   const context = useMemo(() => ({
     collapsePanel,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-resizable-panels",
-  "version": "0.0.59",
+  "version": "0.0.60",
   "description": "React components for resizable panel groups/layouts",
   "author": "Brian Vaughn <brian.david.vaughn@gmail.com>",
   "license": "MIT",

package/src/Panel.ts

@@ -115,6 +115,7 @@ export function PanelWithForwardedRef({
     expandPanel,
     getPanelSize,
     getPanelStyle,
+    groupId,
     isPanelCollapsed,
     registerPanel,
     resizePanel,
@@ -250,6 +251,7 @@ export function PanelWithForwardedRef({
     // CSS selectors
     "data-panel": "",
     "data-panel-id": panelId,
+    "data-panel-group-id": groupId,
 
     // e2e test attributes
     "data-panel-collapsible": isDevelopment