react-resizable-panels 0.0.55 → 0.0.56

package/dist/react-resizable-panels.cjs.js

@@ -33,6 +33,7 @@ const isBrowser = typeof window !== "undefined";
 const {
   createElement,
   createContext,
+  createRef,
   forwardRef,
   useCallback,
   useContext,
@@ -47,6 +48,9 @@ const {
 // `toString()` prevents bundlers from trying to `import { useId } from 'react'`
 const useId = React__namespace["useId".toString()];
 
+const PanelGroupContext = createContext(null);
+PanelGroupContext.displayName = "PanelGroupContext";
+
 const useIsomorphicLayoutEffect = isBrowser ? useLayoutEffect : () => {};
 
 const wrappedUseId = typeof useId === "function" ? useId : () => null;
@@ -57,121 +61,134 @@ function useUniqueId(idFromParams = null) {
   if (idRef.current === null) {
     idRef.current = "" + counter++;
   }
-  return idRef.current;
+  return idFromParams ?? idRef.current;
 }
 
-const PanelGroupContext = createContext(null);
-PanelGroupContext.displayName = "PanelGroupContext";
-
 function PanelWithForwardedRef({
-  children = null,
+  children,
   className: classNameFromProps = "",
-  collapsedSize = 0,
-  collapsible = false,
-  defaultSize = null,
+  collapsedSizePercentage,
+  collapsedSizePixels,
+  collapsible,
+  defaultSizePercentage,
+  defaultSizePixels,
   forwardedRef,
-  id: idFromProps = null,
-  maxSize = null,
-  minSize,
-  onCollapse = null,
-  onResize = null,
-  order = null,
-  style: styleFromProps = {},
+  id: idFromProps,
+  maxSizePercentage,
+  maxSizePixels,
+  minSizePercentage,
+  minSizePixels,
+  onCollapse,
+  onExpand,
+  onResize,
+  order,
+  style: styleFromProps,
   tagName: Type = "div"
 }) {
   const context = useContext(PanelGroupContext);
   if (context === null) {
     throw Error(`Panel components must be rendered within a PanelGroup container`);
   }
-  const panelId = useUniqueId(idFromProps);
   const {
     collapsePanel,
     expandPanel,
     getPanelSize,
     getPanelStyle,
+    isPanelCollapsed,
     registerPanel,
     resizePanel,
-    units,
     unregisterPanel
   } = context;
-  if (minSize == null) {
-    if (units === "percentages") {
-      // Mimics legacy default value for percentage based panel groups
-      minSize = 10;
-    } else {
-      // There is no meaningful minimum pixel default we can provide
-      minSize = 0;
-    }
-  }
-
-  // Use a ref to guard against users passing inline props
-  const callbacksRef = useRef({
-    onCollapse,
-    onResize
-  });
-  useEffect(() => {
-    callbacksRef.current.onCollapse = onCollapse;
-    callbacksRef.current.onResize = onResize;
-  });
-  const style = getPanelStyle(panelId, defaultSize);
-  const committedValuesRef = useRef({
-    size: parseSizeFromStyle(style)
-  });
+  const panelId = useUniqueId(idFromProps);
   const panelDataRef = useRef({
-    callbacksRef,
-    collapsedSize,
-    collapsible,
-    defaultSize,
+    callbacks: {
+      onCollapse,
+      onExpand,
+      onResize
+    },
+    constraints: {
+      collapsedSizePercentage,
+      collapsedSizePixels,
+      collapsible,
+      defaultSizePercentage,
+      defaultSizePixels,
+      maxSizePercentage,
+      maxSizePixels,
+      minSizePercentage,
+      minSizePixels
+    },
     id: panelId,
-    idWasAutoGenerated: idFromProps == null,
-    maxSize,
-    minSize,
+    idIsFromProps: idFromProps !== undefined,
     order
   });
+  useRef({
+    didLogMissingDefaultSizeWarning: false
+  });
   useIsomorphicLayoutEffect(() => {
-    committedValuesRef.current.size = parseSizeFromStyle(style);
-    panelDataRef.current.callbacksRef = callbacksRef;
-    panelDataRef.current.collapsedSize = collapsedSize;
-    panelDataRef.current.collapsible = collapsible;
-    panelDataRef.current.defaultSize = defaultSize;
+    const {
+      callbacks,
+      constraints
+    } = panelDataRef.current;
     panelDataRef.current.id = panelId;
-    panelDataRef.current.idWasAutoGenerated = idFromProps == null;
-    panelDataRef.current.maxSize = maxSize;
-    panelDataRef.current.minSize = minSize;
+    panelDataRef.current.idIsFromProps = idFromProps !== undefined;
     panelDataRef.current.order = order;
+    callbacks.onCollapse = onCollapse;
+    callbacks.onExpand = onExpand;
+    callbacks.onResize = onResize;
+    constraints.collapsedSizePercentage = collapsedSizePercentage;
+    constraints.collapsedSizePixels = collapsedSizePixels;
+    constraints.collapsible = collapsible;
+    constraints.defaultSizePercentage = defaultSizePercentage;
+    constraints.defaultSizePixels = defaultSizePixels;
+    constraints.maxSizePercentage = maxSizePercentage;
+    constraints.maxSizePixels = maxSizePixels;
+    constraints.minSizePercentage = minSizePercentage;
+    constraints.minSizePixels = minSizePixels;
   });
   useIsomorphicLayoutEffect(() => {
-    registerPanel(panelId, panelDataRef);
+    const panelData = panelDataRef.current;
+    registerPanel(panelData);
     return () => {
-      unregisterPanel(panelId);
+      unregisterPanel(panelData);
     };
   }, [order, panelId, registerPanel, unregisterPanel]);
   useImperativeHandle(forwardedRef, () => ({
-    collapse: () => collapsePanel(panelId),
-    expand: () => expandPanel(panelId),
-    getCollapsed() {
-      return committedValuesRef.current.size === 0;
+    collapse: () => {
+      collapsePanel(panelDataRef.current);
+    },
+    expand: () => {
+      expandPanel(panelDataRef.current);
     },
     getId() {
       return panelId;
     },
-    getSize(units) {
-      return getPanelSize(panelId, units);
+    getSize() {
+      return getPanelSize(panelDataRef.current);
+    },
+    isCollapsed() {
+      return isPanelCollapsed(panelDataRef.current);
     },
-    resize: (percentage, units) => resizePanel(panelId, percentage, units)
-  }), [collapsePanel, expandPanel, getPanelSize, panelId, resizePanel]);
+    isExpanded() {
+      return !isPanelCollapsed(panelDataRef.current);
+    },
+    resize: mixedSizes => {
+      resizePanel(panelDataRef.current, mixedSizes);
+    }
+  }), [collapsePanel, expandPanel, getPanelSize, isPanelCollapsed, panelId, resizePanel]);
+  const style = getPanelStyle(panelDataRef.current);
   return createElement(Type, {
     children,
     className: classNameFromProps,
-    "data-panel": "",
-    "data-panel-collapsible": collapsible || undefined,
-    "data-panel-id": panelId,
-    "data-panel-size": parseFloat("" + style.flexGrow).toFixed(1),
-    id: `data-panel-id-${panelId}`,
     style: {
       ...style,
       ...styleFromProps
-    }
+    },
+    // CSS selectors
+    "data-panel": "",
+    // e2e test attributes
+    "data-panel-collapsible": undefined,
+    "data-panel-id": undefined,
+    "data-panel-size": undefined
   });
 }
 const Panel = forwardRef((props, ref) => createElement(PanelWithForwardedRef, {
@@ -181,36 +198,133 @@ const Panel = forwardRef((props, ref) => createElement(PanelWithForwardedRef, {
 PanelWithForwardedRef.displayName = "Panel";
 Panel.displayName = "forwardRef(Panel)";
 
-// HACK
-function parseSizeFromStyle(style) {
+const PRECISION = 10;
+
+function convertPixelsToPercentage(pixels, groupSizePixels) {
+  return pixels / groupSizePixels * 100;
+}
+
+function convertPixelConstraintsToPercentages(panelConstraints, groupSizePixels) {
+  let {
+    collapsedSizePercentage = 0,
+    collapsedSizePixels,
+    defaultSizePercentage,
+    defaultSizePixels,
+    maxSizePercentage = 100,
+    maxSizePixels,
+    minSizePercentage = 0,
+    minSizePixels
+  } = panelConstraints;
+  if (collapsedSizePixels != null) {
+    collapsedSizePercentage = convertPixelsToPercentage(collapsedSizePixels, groupSizePixels);
+  }
+  if (defaultSizePixels != null) {
+    defaultSizePercentage = convertPixelsToPercentage(defaultSizePixels, groupSizePixels);
+  }
+  if (minSizePixels != null) {
+    minSizePercentage = convertPixelsToPercentage(minSizePixels, groupSizePixels);
+  }
+  if (maxSizePixels != null) {
+    maxSizePercentage = convertPixelsToPercentage(maxSizePixels, groupSizePixels);
+  }
+  return {
+    collapsedSizePercentage,
+    defaultSizePercentage,
+    maxSizePercentage,
+    minSizePercentage
+  };
+}
+
+function computePercentagePanelConstraints(panelConstraintsArray, panelIndex, groupSizePixels) {
+  // All panel constraints, excluding the current one
+  let totalMinConstraints = 0;
+  let totalMaxConstraints = 0;
+  for (let index = 0; index < panelConstraintsArray.length; index++) {
+    if (index !== panelIndex) {
+      const {
+        collapsible
+      } = panelConstraintsArray[index];
+      const {
+        collapsedSizePercentage,
+        maxSizePercentage,
+        minSizePercentage
+      } = convertPixelConstraintsToPercentages(panelConstraintsArray[index], groupSizePixels);
+      totalMaxConstraints += maxSizePercentage;
+      totalMinConstraints += collapsible ? collapsedSizePercentage : minSizePercentage;
+    }
+  }
   const {
-    flexGrow
-  } = style;
-  if (typeof flexGrow === "string") {
-    return parseFloat(flexGrow);
+    collapsedSizePercentage,
+    defaultSizePercentage,
+    maxSizePercentage,
+    minSizePercentage
+  } = convertPixelConstraintsToPercentages(panelConstraintsArray[panelIndex], groupSizePixels);
+  return {
+    collapsedSizePercentage,
+    defaultSizePercentage,
+    maxSizePercentage: panelConstraintsArray.length > 1 ? Math.min(maxSizePercentage, 100 - totalMinConstraints) : maxSizePercentage,
+    minSizePercentage: panelConstraintsArray.length > 1 ? Math.max(minSizePercentage, 100 - totalMaxConstraints) : minSizePercentage
+  };
+}
+
+function fuzzyCompareNumbers(actual, expected, fractionDigits = PRECISION) {
+  actual = parseFloat(actual.toFixed(fractionDigits));
+  expected = parseFloat(expected.toFixed(fractionDigits));
+  const delta = actual - expected;
+  if (delta === 0) {
+    return 0;
   } else {
-    return flexGrow;
+    return delta > 0 ? 1 : -1;
   }
 }
 
-const PRECISION = 10;
+function fuzzyNumbersEqual(actual, expected, fractionDigits) {
+  return fuzzyCompareNumbers(actual, expected, fractionDigits) === 0;
+}
 
-function adjustByDelta(event, committedValues, idBefore, idAfter, deltaPixels, prevSizes, panelSizeBeforeCollapse, initialDragState) {
-  const {
-    id: groupId,
-    panels,
-    units
-  } = committedValues;
-  const groupSizePixels = units === "pixels" ? getAvailableGroupSizePixels(groupId) : NaN;
+// Panel size must be in percentages; pixel values should be pre-converted
+function resizePanel({
+  groupSizePixels,
+  panelConstraints,
+  panelIndex,
+  size
+}) {
+  let {
+    collapsible
+  } = panelConstraints[panelIndex];
   const {
-    sizes: initialSizes
-  } = initialDragState || {};
-
-  // If we're resizing by mouse or touch, use the initial sizes as a base.
-  // This has the benefit of causing force-collapsed panels to spring back open if drag is reversed.
-  const baseSizes = initialSizes || prevSizes;
-  const panelsArray = panelsMapToSortedArray(panels);
-  const nextSizes = baseSizes.concat();
+    collapsedSizePercentage,
+    maxSizePercentage,
+    minSizePercentage
+  } = computePercentagePanelConstraints(panelConstraints, panelIndex, groupSizePixels);
+  if (minSizePercentage != null) {
+    if (fuzzyCompareNumbers(size, minSizePercentage) < 0) {
+      if (collapsible) {
+        size = collapsedSizePercentage;
+      } else {
+        size = minSizePercentage;
+      }
+    }
+  }
+  if (maxSizePercentage != null) {
+    size = Math.min(maxSizePercentage, size);
+  }
+  return size;
+}
+
+// All units must be in percentages; pixel values should be pre-converted
+function adjustLayoutByDelta({
+  delta,
+  groupSizePixels,
+  layout: prevLayout,
+  panelConstraints,
+  pivotIndices,
+  trigger
+}) {
+  if (fuzzyNumbersEqual(delta, 0)) {
+    return prevLayout;
+  }
+  const nextLayout = [...prevLayout];
   let deltaApplied = 0;
 
   // A resizing panel affects the panels before or after it.
@@ -221,202 +335,243 @@ function adjustByDelta(event, committedValues, idBefore, idAfter, deltaPixels, p
   // A positive delta means the panel immediately before the resizer should "expand".
   // This is accomplished by shrinking/contracting (and shifting) one or more of the panels after the resizer.
 
-  // Max-bounds check the panel being expanded first.
+  // First, check the panel we're pivoting around;
+  // We should only expand or contract by as much as its constraints allow
   {
-    const pivotId = deltaPixels < 0 ? idAfter : idBefore;
-    const index = panelsArray.findIndex(panel => panel.current.id === pivotId);
-    const panel = panelsArray[index];
-    const baseSize = baseSizes[index];
-    const nextSize = safeResizePanel(units, groupSizePixels, panel, baseSize, baseSize + Math.abs(deltaPixels), event);
-    if (baseSize === nextSize) {
-      // If there's no room for the pivot panel to grow, we can ignore this drag update.
-      return baseSizes;
-    } else {
-      if (nextSize === 0 && baseSize > 0) {
-        panelSizeBeforeCollapse.set(pivotId, baseSize);
+    const pivotIndex = delta < 0 ? pivotIndices[1] : pivotIndices[0];
+    const initialSize = nextLayout[pivotIndex];
+    const {
+      collapsible
+    } = panelConstraints[pivotIndex];
+    const {
+      collapsedSizePercentage,
+      maxSizePercentage,
+      minSizePercentage
+    } = computePercentagePanelConstraints(panelConstraints, pivotIndex, groupSizePixels);
+    const isCollapsed = collapsible && fuzzyNumbersEqual(initialSize, collapsedSizePercentage);
+    let unsafeSize = initialSize + Math.abs(delta);
+    if (isCollapsed) {
+      switch (trigger) {
+        case "keyboard":
+          if (minSizePercentage > unsafeSize) {
+            unsafeSize = minSizePercentage;
+          }
       }
-      deltaPixels = deltaPixels < 0 ? baseSize - nextSize : nextSize - baseSize;
     }
-  }
-  let pivotId = deltaPixels < 0 ? idBefore : idAfter;
-  let index = panelsArray.findIndex(panel => panel.current.id === pivotId);
-  while (true) {
-    const panel = panelsArray[index];
-    const baseSize = baseSizes[index];
-    const deltaRemaining = Math.abs(deltaPixels) - Math.abs(deltaApplied);
-    const nextSize = safeResizePanel(units, groupSizePixels, panel, baseSize, baseSize - deltaRemaining, event);
-    if (baseSize !== nextSize) {
-      if (nextSize === 0 && baseSize > 0) {
-        panelSizeBeforeCollapse.set(panel.current.id, baseSize);
-      }
-      deltaApplied += baseSize - nextSize;
-      nextSizes[index] = nextSize;
-      if (deltaApplied.toPrecision(PRECISION).localeCompare(Math.abs(deltaPixels).toPrecision(PRECISION), undefined, {
-        numeric: true
-      }) >= 0) {
-        break;
-      }
+    const safeSize = resizePanel({
+      groupSizePixels,
+      panelConstraints,
+      panelIndex: pivotIndex,
+      size: unsafeSize
+    });
+    if (fuzzyNumbersEqual(initialSize, safeSize)) {
+      // If there's no room for the pivot panel to grow, we should ignore this change
+      return nextLayout;
+    } else {
+      delta = delta < 0 ? initialSize - safeSize : safeSize - initialSize;
     }
-    if (deltaPixels < 0) {
-      if (--index < 0) {
-        break;
+  }
+
+  // Delta added to a panel needs to be subtracted from other panels
+  // within the constraints that those panels allow
+  {
+    const pivotIndex = delta < 0 ? pivotIndices[0] : pivotIndices[1];
+    let index = pivotIndex;
+    while (index >= 0 && index < panelConstraints.length) {
+      const deltaRemaining = Math.abs(delta) - Math.abs(deltaApplied);
+      const prevSize = prevLayout[index];
+      const unsafeSize = prevSize - deltaRemaining;
+      let safeSize = resizePanel({
+        groupSizePixels,
+        panelConstraints,
+        panelIndex: index,
+        size: unsafeSize
+      });
+      if (!fuzzyNumbersEqual(prevSize, safeSize)) {
+        deltaApplied += prevSize - safeSize;
+        nextLayout[index] = safeSize;
+        if (deltaApplied.toPrecision(3).localeCompare(Math.abs(delta).toPrecision(3), undefined, {
+          numeric: true
+        }) >= 0) {
+          break;
+        }
       }
-    } else {
-      if (++index >= panelsArray.length) {
-        break;
+      if (delta < 0) {
+        index--;
+      } else {
+        index++;
       }
     }
   }
 
   // If we were unable to resize any of the panels panels, return the previous state.
-  // This will essentially bailout and ignore the "mousemove" event.
-  if (deltaApplied === 0) {
-    return baseSizes;
+  // This will essentially bailout and ignore e.g. drags past a panel's boundaries
+  if (fuzzyNumbersEqual(deltaApplied, 0)) {
+    return prevLayout;
   }
+  {
+    const pivotIndex = delta < 0 ? pivotIndices[1] : pivotIndices[0];
+    const unsafeSize = prevLayout[pivotIndex] + deltaApplied;
+    const safeSize = resizePanel({
+      groupSizePixels,
+      panelConstraints,
+      panelIndex: pivotIndex,
+      size: unsafeSize
+    });
 
-  // Adjust the pivot panel before, but only by the amount that surrounding panels were able to shrink/contract.
-  pivotId = deltaPixels < 0 ? idAfter : idBefore;
-  index = panelsArray.findIndex(panel => panel.current.id === pivotId);
-  nextSizes[index] = baseSizes[index] + deltaApplied;
-  return nextSizes;
-}
-function callPanelCallbacks(panelsArray, sizes, panelIdToLastNotifiedSizeMap) {
-  sizes.forEach((size, index) => {
-    const panelRef = panelsArray[index];
-    if (!panelRef) {
-      // Handle initial mount (when panels are registered too late to be in the panels array)
-      // The subsequent render+effects will handle the resize notification
-      return;
-    }
-    const {
-      callbacksRef,
-      collapsedSize,
-      collapsible,
-      id
-    } = panelRef.current;
-    const lastNotifiedSize = panelIdToLastNotifiedSizeMap[id];
-    if (lastNotifiedSize !== size) {
-      panelIdToLastNotifiedSizeMap[id] = size;
-      const {
-        onCollapse,
-        onResize
-      } = callbacksRef.current;
-      if (onResize) {
-        onResize(size, lastNotifiedSize);
+    // Adjust the pivot panel before, but only by the amount that surrounding panels were able to shrink/contract.
+    nextLayout[pivotIndex] = safeSize;
+
+    // Edge case where expanding or contracting one panel caused another one to change collapsed state
+    if (!fuzzyNumbersEqual(safeSize, unsafeSize)) {
+      let deltaRemaining = unsafeSize - safeSize;
+      const pivotIndex = delta < 0 ? pivotIndices[1] : pivotIndices[0];
+      let index = pivotIndex;
+      while (index >= 0 && index < panelConstraints.length) {
+        const prevSize = nextLayout[index];
+        const unsafeSize = prevSize + deltaRemaining;
+        const safeSize = resizePanel({
+          groupSizePixels,
+          panelConstraints,
+          panelIndex: index,
+          size: unsafeSize
+        });
+        if (!fuzzyNumbersEqual(prevSize, safeSize)) {
+          deltaRemaining -= safeSize - prevSize;
+          nextLayout[index] = safeSize;
+        }
+        if (fuzzyNumbersEqual(deltaRemaining, 0)) {
+          break;
+        }
+        if (delta > 0) {
+          index--;
+        } else {
+          index++;
+        }
       }
-      if (collapsible && onCollapse) {
-        if ((lastNotifiedSize == null || lastNotifiedSize === collapsedSize) && size !== collapsedSize) {
-          onCollapse(false);
-        } else if (lastNotifiedSize !== collapsedSize && size === collapsedSize) {
-          onCollapse(true);
+
+      // If we can't redistribute, this layout is invalid;
+      // There may be an incremental layout that is valid though
+      if (!fuzzyNumbersEqual(deltaRemaining, 0)) {
+        try {
+          return adjustLayoutByDelta({
+            delta: delta < 0 ? delta + 1 : delta - 1,
+            groupSizePixels,
+            layout: prevLayout,
+            panelConstraints,
+            pivotIndices,
+            trigger
+          });
+        } catch (error) {
+          if (error instanceof RangeError) {
+            console.error(`Could not apply delta ${delta} to layout`);
+            return prevLayout;
+          }
+        } finally {
         }
       }
     }
-  });
+  }
+  return nextLayout;
 }
-function calculateDefaultLayout({
-  groupId,
-  panels,
-  units
-}) {
-  const groupSizePixels = units === "pixels" ? getAvailableGroupSizePixels(groupId) : NaN;
-  const panelsArray = panelsMapToSortedArray(panels);
-  const sizes = Array(panelsArray.length);
-  let numPanelsWithSizes = 0;
-  let remainingSize = 100;
 
-  // Assigning default sizes requires a couple of passes:
-  // First, all panels with defaultSize should be set as-is
-  for (let index = 0; index < panelsArray.length; index++) {
-    const panel = panelsArray[index];
-    const {
-      defaultSize
-    } = panel.current;
-    if (defaultSize != null) {
-      numPanelsWithSizes++;
-      sizes[index] = units === "pixels" ? defaultSize / groupSizePixels * 100 : defaultSize;
-      remainingSize -= sizes[index];
-    }
+function assert(expectedCondition, message = "Assertion failed!") {
+  if (!expectedCondition) {
+    console.error(message);
+    throw Error(message);
   }
+}
 
-  // Remaining total size should be distributed evenly between panels
-  // This may require two passes, depending on min/max constraints
-  for (let index = 0; index < panelsArray.length; index++) {
-    const panel = panelsArray[index];
-    let {
-      defaultSize,
-      id,
-      maxSize,
-      minSize
-    } = panel.current;
-    if (defaultSize != null) {
-      continue;
-    }
-    if (units === "pixels") {
-      minSize = minSize / groupSizePixels * 100;
-      if (maxSize != null) {
-        maxSize = maxSize / groupSizePixels * 100;
-      }
-    }
-    const remainingPanels = panelsArray.length - numPanelsWithSizes;
-    const size = Math.min(maxSize != null ? maxSize : 100, Math.max(minSize, remainingSize / remainingPanels));
-    sizes[index] = size;
-    numPanelsWithSizes++;
-    remainingSize -= size;
+function getPercentageSizeFromMixedSizes({
+  sizePercentage,
+  sizePixels
+}, groupSizePixels) {
+  if (sizePercentage != null) {
+    return sizePercentage;
+  } else if (sizePixels != null) {
+    return convertPixelsToPercentage(sizePixels, groupSizePixels);
   }
+  return undefined;
+}
 
-  // If there is additional, left over space, assign it to any panel(s) that permits it
-  // (It's not worth taking multiple additional passes to evenly distribute)
-  if (remainingSize !== 0) {
-    for (let index = 0; index < panelsArray.length; index++) {
-      const panel = panelsArray[index];
-      let {
-        maxSize,
-        minSize
-      } = panel.current;
-      if (units === "pixels") {
-        minSize = minSize / groupSizePixels * 100;
-        if (maxSize != null) {
-          maxSize = maxSize / groupSizePixels * 100;
-        }
-      }
-      const size = Math.min(maxSize != null ? maxSize : 100, Math.max(minSize, sizes[index] + remainingSize));
-      if (size !== sizes[index]) {
-        remainingSize -= size - sizes[index];
-        sizes[index] = size;
+function calculateAriaValues({
+  groupSizePixels,
+  layout,
+  panelsArray,
+  pivotIndices
+}) {
+  let currentMinSize = 0;
+  let currentMaxSize = 100;
+  let totalMinSize = 0;
+  let totalMaxSize = 0;
 
-        // Fuzzy comparison to account for imprecise floating point math
-        if (Math.abs(remainingSize).toFixed(3) === "0.000") {
-          break;
-        }
-      }
+  // A panel's effective min/max sizes also need to account for other panel's sizes.
+  panelsArray.forEach((panelData, index) => {
+    const {
+      constraints
+    } = panelData;
+    const {
+      maxSizePercentage,
+      maxSizePixels,
+      minSizePercentage,
+      minSizePixels
+    } = constraints;
+    const minSize = getPercentageSizeFromMixedSizes({
+      sizePercentage: minSizePercentage,
+      sizePixels: minSizePixels
+    }, groupSizePixels) ?? 0;
+    const maxSize = getPercentageSizeFromMixedSizes({
+      sizePercentage: maxSizePercentage,
+      sizePixels: maxSizePixels
+    }, groupSizePixels) ?? 100;
+    if (index === pivotIndices[0]) {
+      currentMinSize = minSize;
+      currentMaxSize = maxSize;
+    } else {
+      totalMinSize += minSize;
+      totalMaxSize += maxSize;
     }
-  }
+  });
+  const valueMax = Math.min(currentMaxSize, 100 - totalMinSize);
+  const valueMin = Math.max(currentMinSize, 100 - totalMaxSize);
+  const valueNow = layout[pivotIndices[0]];
+  return {
+    valueMax,
+    valueMin,
+    valueNow
+  };
+}
 
-  // Finally, if there is still left-over size, log an error
-  if (Math.abs(remainingSize).toFixed(3) !== "0.000") ;
-  return sizes;
+function getResizeHandleElementsForGroup(groupId) {
+  return Array.from(document.querySelectorAll(`[data-panel-resize-handle-id][data-panel-group-id="${groupId}"]`));
 }
-function getBeforeAndAfterIds(id, panelsArray) {
-  if (panelsArray.length < 2) {
-    return [null, null];
-  }
-  const index = panelsArray.findIndex(panel => panel.current.id === id);
-  if (index < 0) {
-    return [null, null];
+
+function getResizeHandleElementIndex(groupId, id) {
+  const handles = getResizeHandleElementsForGroup(groupId);
+  const index = handles.findIndex(handle => handle.getAttribute("data-panel-resize-handle-id") === id);
+  return index ?? null;
+}
+
+function determinePivotIndices(groupId, dragHandleId) {
+  const index = getResizeHandleElementIndex(groupId, dragHandleId);
+  return index != null ? [index, index + 1] : [-1, -1];
+}
+
+function getPanelGroupElement(id) {
+  const element = document.querySelector(`[data-panel-group-id="${id}"]`);
+  if (element) {
+    return element;
   }
-  const isLastPanel = index === panelsArray.length - 1;
-  const idBefore = isLastPanel ? panelsArray[index - 1].current.id : id;
-  const idAfter = isLastPanel ? id : panelsArray[index + 1].current.id;
-  return [idBefore, idAfter];
+  return null;
 }
-function getAvailableGroupSizePixels(groupId) {
-  const panelGroupElement = getPanelGroup(groupId);
+
+function calculateAvailablePanelSizeInPixels(groupId) {
+  const panelGroupElement = getPanelGroupElement(groupId);
   if (panelGroupElement == null) {
     return NaN;
   }
   const direction = panelGroupElement.getAttribute("data-panel-group-direction");
-  const resizeHandles = getResizeHandlesForGroup(groupId);
+  const resizeHandles = getResizeHandleElementsForGroup(groupId);
   if (direction === "horizontal") {
     return panelGroupElement.offsetWidth - resizeHandles.reduce((accumulated, handle) => {
       return accumulated + handle.offsetWidth;
@@ -428,256 +583,102 @@ function getAvailableGroupSizePixels(groupId) {
   }
 }
 
-// This method returns a number between 1 and 100 representing
-// the % of the group's overall space this panel should occupy.
-function getFlexGrow(panels, id, sizes) {
-  if (panels.size === 1) {
-    return "100";
-  }
-  const panelsArray = panelsMapToSortedArray(panels);
-  const index = panelsArray.findIndex(panel => panel.current.id === id);
-  const size = sizes[index];
-  if (size == null) {
-    return "0";
-  }
-  return size.toPrecision(PRECISION);
-}
-function getPanel(id) {
-  const element = document.querySelector(`[data-panel-id="${id}"]`);
-  if (element) {
-    return element;
+function getAvailableGroupSizePixels(groupId) {
+  const panelGroupElement = getPanelGroupElement(groupId);
+  if (panelGroupElement == null) {
+    return NaN;
   }
-  return null;
-}
-function getPanelGroup(id) {
-  const element = document.querySelector(`[data-panel-group-id="${id}"]`);
-  if (element) {
-    return element;
+  const direction = panelGroupElement.getAttribute("data-panel-group-direction");
+  const resizeHandles = getResizeHandleElementsForGroup(groupId);
+  if (direction === "horizontal") {
+    return panelGroupElement.offsetWidth - resizeHandles.reduce((accumulated, handle) => {
+      return accumulated + handle.offsetWidth;
+    }, 0);
+  } else {
+    return panelGroupElement.offsetHeight - resizeHandles.reduce((accumulated, handle) => {
+      return accumulated + handle.offsetHeight;
+    }, 0);
   }
-  return null;
 }
-function getResizeHandle(id) {
+
+function getResizeHandleElement(id) {
   const element = document.querySelector(`[data-panel-resize-handle-id="${id}"]`);
   if (element) {
     return element;
   }
   return null;
 }
-function getResizeHandleIndex(id) {
-  const handles = getResizeHandles();
-  const index = handles.findIndex(handle => handle.getAttribute("data-panel-resize-handle-id") === id);
-  return index ?? null;
-}
-function getResizeHandles() {
-  return Array.from(document.querySelectorAll(`[data-panel-resize-handle-id]`));
-}
-function getResizeHandlesForGroup(groupId) {
-  return Array.from(document.querySelectorAll(`[data-panel-resize-handle-id][data-panel-group-id="${groupId}"]`));
-}
+
 function getResizeHandlePanelIds(groupId, handleId, panelsArray) {
-  const handle = getResizeHandle(handleId);
-  const handles = getResizeHandlesForGroup(groupId);
+  const handle = getResizeHandleElement(handleId);
+  const handles = getResizeHandleElementsForGroup(groupId);
   const index = handle ? handles.indexOf(handle) : -1;
-  const idBefore = panelsArray[index]?.current?.id ?? null;
-  const idAfter = panelsArray[index + 1]?.current?.id ?? null;
+  const idBefore = panelsArray[index]?.id ?? null;
+  const idAfter = panelsArray[index + 1]?.id ?? null;
   return [idBefore, idAfter];
 }
-function panelsMapToSortedArray(panels) {
-  return Array.from(panels.values()).sort((panelA, panelB) => {
-    const orderA = panelA.current.order;
-    const orderB = panelB.current.order;
-    if (orderA == null && orderB == null) {
-      return 0;
-    } else if (orderA == null) {
-      return -1;
-    } else if (orderB == null) {
-      return 1;
-    } else {
-      return orderA - orderB;
-    }
-  });
-}
-function safeResizePanel(units, groupSizePixels, panel, prevSize, nextSize, event = null) {
-  let {
-    collapsedSize,
-    collapsible,
-    maxSize,
-    minSize
-  } = panel.current;
-  if (units === "pixels") {
-    collapsedSize = collapsedSize / groupSizePixels * 100;
-    if (maxSize != null) {
-      maxSize = maxSize / groupSizePixels * 100;
-    }
-    minSize = minSize / groupSizePixels * 100;
-  }
-  if (collapsible) {
-    if (prevSize > collapsedSize) {
-      // Mimic VS COde behavior; collapse a panel if it's smaller than half of its min-size
-      if (nextSize <= minSize / 2 + collapsedSize) {
-        return collapsedSize;
-      }
-    } else {
-      const isKeyboardEvent = event?.type?.startsWith("key");
-      if (!isKeyboardEvent) {
-        // Keyboard events should expand a collapsed panel to the min size,
-        // but mouse events should wait until the panel has reached its min size
-        // to avoid a visual flickering when dragging between collapsed and min size.
-        if (nextSize < minSize) {
-          return collapsedSize;
-        }
-      }
-    }
-  }
-  return Math.min(maxSize != null ? maxSize : 100, Math.max(minSize, nextSize));
-}
-function validatePanelProps(units, panelData) {
-  const {
-    collapsible,
-    defaultSize,
-    maxSize,
-    minSize
-  } = panelData.current;
-
-  // Basic props validation
-  if (minSize < 0 || units === "percentages" && minSize > 100) {
-    panelData.current.minSize = 0;
-  }
-  if (maxSize != null) {
-    if (maxSize < 0 || units === "percentages" && maxSize > 100) {
-      panelData.current.maxSize = null;
-    }
-  }
-  if (defaultSize !== null) {
-    if (defaultSize < 0 || units === "percentages" && defaultSize > 100) {
-      panelData.current.defaultSize = null;
-    } else if (defaultSize < minSize && !collapsible) {
-      panelData.current.defaultSize = minSize;
-    } else if (maxSize != null && defaultSize > maxSize) {
-      panelData.current.defaultSize = maxSize;
-    }
-  }
-}
-function validatePanelGroupLayout({
-  groupId,
-  panels,
-  nextSizes,
-  prevSizes,
-  units
-}) {
-  // Clone because this method modifies
-  nextSizes = [...nextSizes];
-  const panelsArray = panelsMapToSortedArray(panels);
-  const groupSizePixels = units === "pixels" ? getAvailableGroupSizePixels(groupId) : NaN;
-  let remainingSize = 0;
-
-  // First, check all of the proposed sizes against the min/max constraints
-  for (let index = 0; index < panelsArray.length; index++) {
-    const panel = panelsArray[index];
-    const prevSize = prevSizes[index];
-    const nextSize = nextSizes[index];
-    const safeNextSize = safeResizePanel(units, groupSizePixels, panel, prevSize, nextSize);
-    if (nextSize != safeNextSize) {
-      remainingSize += nextSize - safeNextSize;
-      nextSizes[index] = safeNextSize;
-    }
-  }
-
-  // If there is additional, left over space, assign it to any panel(s) that permits it
-  // (It's not worth taking multiple additional passes to evenly distribute)
-  if (remainingSize.toFixed(3) !== "0.000") {
-    for (let index = 0; index < panelsArray.length; index++) {
-      const panel = panelsArray[index];
-      let {
-        maxSize,
-        minSize
-      } = panel.current;
-      if (units === "pixels") {
-        minSize = minSize / groupSizePixels * 100;
-        if (maxSize != null) {
-          maxSize = maxSize / groupSizePixels * 100;
-        }
-      }
-      const size = Math.min(maxSize != null ? maxSize : 100, Math.max(minSize, nextSizes[index] + remainingSize));
-      if (size !== nextSizes[index]) {
-        remainingSize -= size - nextSizes[index];
-        nextSizes[index] = size;
-
-        // Fuzzy comparison to account for imprecise floating point math
-        if (Math.abs(remainingSize).toFixed(3) === "0.000") {
-          break;
-        }
-      }
-    }
-  }
-
-  // If we still have remainder, the requested layout wasn't valid and we should warn about it
-  if (remainingSize.toFixed(3) !== "0.000") ;
-  return nextSizes;
-}
-
-function assert(expectedCondition, message = "Assertion failed!") {
-  if (!expectedCondition) {
-    console.error(message);
-    throw Error(message);
-  }
-}
 
 // https://www.w3.org/WAI/ARIA/apg/patterns/windowsplitter/
 
 function useWindowSplitterPanelGroupBehavior({
   committedValuesRef,
   groupId,
-  panels,
-  setSizes,
-  sizes,
-  panelSizeBeforeCollapse
+  layout,
+  panelDataArray,
+  setLayout
 }) {
+  useRef({
+    didWarnAboutMissingResizeHandle: false
+  });
+  useIsomorphicLayoutEffect(() => {
+    const groupSizePixels = calculateAvailablePanelSizeInPixels(groupId);
+    const resizeHandleElements = getResizeHandleElementsForGroup(groupId);
+    for (let index = 0; index < panelDataArray.length - 1; index++) {
+      const {
+        valueMax,
+        valueMin,
+        valueNow
+      } = calculateAriaValues({
+        groupSizePixels,
+        layout,
+        panelsArray: panelDataArray,
+        pivotIndices: [index, index + 1]
+      });
+      const resizeHandleElement = resizeHandleElements[index];
+      if (resizeHandleElement == null) ; else {
+        resizeHandleElement.setAttribute("aria-controls", panelDataArray[index].id);
+        resizeHandleElement.setAttribute("aria-valuemax", "" + Math.round(valueMax));
+        resizeHandleElement.setAttribute("aria-valuemin", "" + Math.round(valueMin));
+        resizeHandleElement.setAttribute("aria-valuenow", "" + Math.round(valueNow));
+      }
+    }
+    return () => {
+      resizeHandleElements.forEach((resizeHandleElement, index) => {
+        resizeHandleElement.removeAttribute("aria-controls");
+        resizeHandleElement.removeAttribute("aria-valuemax");
+        resizeHandleElement.removeAttribute("aria-valuemin");
+        resizeHandleElement.removeAttribute("aria-valuenow");
+      });
+    };
+  }, [groupId, layout, panelDataArray]);
   useEffect(() => {
     const {
       direction,
-      panels
+      panelDataArray
     } = committedValuesRef.current;
-    const groupElement = getPanelGroup(groupId);
+    const groupElement = getPanelGroupElement(groupId);
     assert(groupElement != null, `No group found for id "${groupId}"`);
     const {
       height,
       width
     } = groupElement.getBoundingClientRect();
-    const handles = getResizeHandlesForGroup(groupId);
+    const handles = getResizeHandleElementsForGroup(groupId);
     const cleanupFunctions = handles.map(handle => {
       const handleId = handle.getAttribute("data-panel-resize-handle-id");
-      const panelsArray = panelsMapToSortedArray(panels);
-      const [idBefore, idAfter] = getResizeHandlePanelIds(groupId, handleId, panelsArray);
+      const [idBefore, idAfter] = getResizeHandlePanelIds(groupId, handleId, panelDataArray);
       if (idBefore == null || idAfter == null) {
         return () => {};
       }
-      let currentMinSize = 0;
-      let currentMaxSize = 100;
-      let totalMinSize = 0;
-      let totalMaxSize = 0;
-
-      // A panel's effective min/max sizes also need to account for other panel's sizes.
-      panelsArray.forEach(panelData => {
-        const {
-          id,
-          maxSize,
-          minSize
-        } = panelData.current;
-        if (id === idBefore) {
-          currentMinSize = minSize;
-          currentMaxSize = maxSize != null ? maxSize : 100;
-        } else {
-          totalMinSize += minSize;
-          totalMaxSize += maxSize != null ? maxSize : 100;
-        }
-      });
-      const ariaValueMax = Math.min(currentMaxSize, 100 - totalMinSize);
-      const ariaValueMin = Math.max(currentMinSize, (panelsArray.length - 1) * 100 - totalMaxSize);
-      const flexGrow = getFlexGrow(panels, idBefore, sizes);
-      handle.setAttribute("aria-valuemax", "" + Math.round(ariaValueMax));
-      handle.setAttribute("aria-valuemin", "" + Math.round(ariaValueMin));
-      handle.setAttribute("aria-valuenow", "" + Math.round(parseInt(flexGrow)));
       const onKeyDown = event => {
         if (event.defaultPrevented) {
           return;
@@ -686,20 +687,32 @@ function useWindowSplitterPanelGroupBehavior({
           case "Enter":
             {
               event.preventDefault();
-              const index = panelsArray.findIndex(panel => panel.current.id === idBefore);
+              const index = panelDataArray.findIndex(panelData => panelData.id === idBefore);
               if (index >= 0) {
-                const panelData = panelsArray[index];
-                const size = sizes[index];
+                const panelData = panelDataArray[index];
+                const size = layout[index];
                 if (size != null) {
+                  const groupSizePixels = getAvailableGroupSizePixels(groupId);
+                  const minSize = getPercentageSizeFromMixedSizes({
+                    sizePercentage: panelData.constraints.minSizePercentage,
+                    sizePixels: panelData.constraints.minSizePixels
+                  }, groupSizePixels) ?? 0;
                   let delta = 0;
-                  if (size.toPrecision(PRECISION) <= panelData.current.minSize.toPrecision(PRECISION)) {
+                  if (size.toPrecision(PRECISION) <= minSize.toPrecision(PRECISION)) {
                     delta = direction === "horizontal" ? width : height;
                   } else {
                     delta = -(direction === "horizontal" ? width : height);
                   }
-                  const nextSizes = adjustByDelta(event, committedValuesRef.current, idBefore, idAfter, delta, sizes, panelSizeBeforeCollapse.current, null);
-                  if (sizes !== nextSizes) {
-                    setSizes(nextSizes);
+                  const nextLayout = adjustLayoutByDelta({
+                    delta,
+                    groupSizePixels,
+                    layout,
+                    panelConstraints: panelDataArray.map(panelData => panelData.constraints),
+                    pivotIndices: determinePivotIndices(groupId, handleId),
+                    trigger: "keyboard"
+                  });
+                  if (layout !== nextLayout) {
+                    setLayout(nextLayout);
                   }
                 }
               }
@@ -708,72 +721,14 @@ function useWindowSplitterPanelGroupBehavior({
         }
       };
       handle.addEventListener("keydown", onKeyDown);
-      const panelBefore = getPanel(idBefore);
-      if (panelBefore != null) {
-        handle.setAttribute("aria-controls", panelBefore.id);
-      }
       return () => {
-        handle.removeAttribute("aria-valuemax");
-        handle.removeAttribute("aria-valuemin");
-        handle.removeAttribute("aria-valuenow");
         handle.removeEventListener("keydown", onKeyDown);
-        if (panelBefore != null) {
-          handle.removeAttribute("aria-controls");
-        }
       };
     });
     return () => {
       cleanupFunctions.forEach(cleanupFunction => cleanupFunction());
     };
-  }, [committedValuesRef, groupId, panels, panelSizeBeforeCollapse, setSizes, sizes]);
-}
-function useWindowSplitterResizeHandlerBehavior({
-  disabled,
-  handleId,
-  resizeHandler
-}) {
-  useEffect(() => {
-    if (disabled || resizeHandler == null) {
-      return;
-    }
-    const handleElement = getResizeHandle(handleId);
-    if (handleElement == null) {
-      return;
-    }
-    const onKeyDown = event => {
-      if (event.defaultPrevented) {
-        return;
-      }
-      switch (event.key) {
-        case "ArrowDown":
-        case "ArrowLeft":
-        case "ArrowRight":
-        case "ArrowUp":
-        case "End":
-        case "Home":
-          {
-            event.preventDefault();
-            resizeHandler(event);
-            break;
-          }
-        case "F6":
-          {
-            event.preventDefault();
-            const handles = getResizeHandles();
-            const index = getResizeHandleIndex(handleId);
-            assert(index !== null);
-            const nextIndex = event.shiftKey ? index > 0 ? index - 1 : handles.length - 1 : index + 1 < handles.length ? index + 1 : 0;
-            const nextHandle = handles[nextIndex];
-            nextHandle.focus();
-            break;
-          }
-      }
-    };
-    handleElement.addEventListener("keydown", onKeyDown);
-    return () => {
-      handleElement.removeEventListener("keydown", onKeyDown);
-    };
-  }, [disabled, handleId, resizeHandler]);
+  }, [committedValuesRef, groupId, layout, panelDataArray, setLayout]);
 }
 
 function areEqual(arrayA, arrayB) {
@@ -788,41 +743,61 @@ function areEqual(arrayA, arrayB) {
   return true;
 }
 
-function getDragOffset(event, handleId, direction, initialOffset = 0, initialHandleElementRect = null) {
+function isKeyDown(event) {
+  return event.type === "keydown";
+}
+function isMouseEvent(event) {
+  return event.type.startsWith("mouse");
+}
+function isTouchEvent(event) {
+  return event.type.startsWith("touch");
+}
+
+function getResizeEventCursorPosition(direction, event) {
   const isHorizontal = direction === "horizontal";
-  let pointerOffset = 0;
   if (isMouseEvent(event)) {
-    pointerOffset = isHorizontal ? event.clientX : event.clientY;
+    return isHorizontal ? event.clientX : event.clientY;
   } else if (isTouchEvent(event)) {
     const firstTouch = event.touches[0];
-    pointerOffset = isHorizontal ? firstTouch.screenX : firstTouch.screenY;
+    return isHorizontal ? firstTouch.screenX : firstTouch.screenY;
   } else {
-    return 0;
+    throw Error(`Unsupported event type "${event.type}"`);
   }
-  const handleElement = getResizeHandle(handleId);
-  const rect = initialHandleElementRect || handleElement.getBoundingClientRect();
-  const elementOffset = isHorizontal ? rect.left : rect.top;
-  return pointerOffset - elementOffset - initialOffset;
+}
+
+function calculateDragOffsetPercentage(event, dragHandleId, direction, initialDragState) {
+  const isHorizontal = direction === "horizontal";
+  const handleElement = getResizeHandleElement(dragHandleId);
+  const groupId = handleElement.getAttribute("data-panel-group-id");
+  let {
+    initialCursorPosition
+  } = initialDragState;
+  const cursorPosition = getResizeEventCursorPosition(direction, event);
+  const groupElement = getPanelGroupElement(groupId);
+  const groupRect = groupElement.getBoundingClientRect();
+  const groupSizeInPixels = isHorizontal ? groupRect.width : groupRect.height;
+  const offsetPixels = cursorPosition - initialCursorPosition;
+  const offsetPercentage = offsetPixels / groupSizeInPixels * 100;
+  return offsetPercentage;
 }
 
 // https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/movementX
-function getMovement(event, groupId, handleId, panelsArray, direction, prevSizes, initialDragState) {
-  const {
-    dragOffset = 0,
-    dragHandleRect,
-    sizes: initialSizes
-  } = initialDragState || {};
-
-  // If we're resizing by mouse or touch, use the initial sizes as a base.
-  // This has the benefit of causing force-collapsed panels to spring back open if drag is reversed.
-  const baseSizes = initialSizes || prevSizes;
+function calculateDeltaPercentage(event, groupId, dragHandleId, direction, initialDragState, keyboardResizeByOptions) {
   if (isKeyDown(event)) {
     const isHorizontal = direction === "horizontal";
-    const groupElement = getPanelGroup(groupId);
+    const groupElement = getPanelGroupElement(groupId);
     const rect = groupElement.getBoundingClientRect();
     const groupSizeInPixels = isHorizontal ? rect.width : rect.height;
-    const denominator = event.shiftKey ? 10 : 100;
-    const delta = groupSizeInPixels / denominator;
+    let delta = 0;
+    if (event.shiftKey) {
+      delta = 100;
+    } else if (keyboardResizeByOptions.percentage != null) {
+      delta = keyboardResizeByOptions.percentage;
+    } else if (keyboardResizeByOptions.pixels != null) {
+      delta = keyboardResizeByOptions.pixels / groupSizeInPixels;
+    } else {
+      delta = 10;
+    }
     let movement = 0;
     switch (event.key) {
       case "ArrowDown":
@@ -838,40 +813,152 @@ function getMovement(event, groupId, handleId, panelsArray, direction, prevSizes
         movement = isHorizontal ? 0 : -delta;
         break;
       case "End":
-        movement = groupSizeInPixels;
+        movement = 100;
         break;
       case "Home":
-        movement = -groupSizeInPixels;
+        movement = -100;
         break;
     }
-
-    // If the Panel being resized is collapsible,
-    // we need to special case resizing around the minSize boundary.
-    // If contracting, Panels should shrink to their minSize and then snap to fully collapsed.
-    // If expanding from collapsed, they should snap back to their minSize.
-    const [idBefore, idAfter] = getResizeHandlePanelIds(groupId, handleId, panelsArray);
-    const targetPanelId = movement < 0 ? idBefore : idAfter;
-    const targetPanelIndex = panelsArray.findIndex(panel => panel.current.id === targetPanelId);
-    const targetPanel = panelsArray[targetPanelIndex];
-    if (targetPanel.current.collapsible) {
-      const baseSize = baseSizes[targetPanelIndex];
-      if (baseSize === 0 || baseSize.toPrecision(PRECISION) === targetPanel.current.minSize.toPrecision(PRECISION)) {
-        movement = movement < 0 ? -targetPanel.current.minSize * groupSizeInPixels : targetPanel.current.minSize * groupSizeInPixels;
-      }
-    }
     return movement;
   } else {
-    return getDragOffset(event, handleId, direction, dragOffset, dragHandleRect);
+    return calculateDragOffsetPercentage(event, dragHandleId, direction, initialDragState);
   }
 }
-function isKeyDown(event) {
-  return event.type === "keydown";
+
+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 isMouseEvent(event) {
-  return event.type.startsWith("mouse");
+
+function convertPercentageToPixels(percentage, groupSizePixels) {
+  return percentage / 100 * groupSizePixels;
 }
-function isTouchEvent(event) {
-  return event.type.startsWith("touch");
+
+// Layout should be pre-converted into percentages
+function callPanelCallbacks(groupId, panelsArray, layout, panelIdToLastNotifiedMixedSizesMap) {
+  const groupSizePixels = calculateAvailablePanelSizeInPixels(groupId);
+  layout.forEach((sizePercentage, index) => {
+    const panelData = panelsArray[index];
+    if (!panelData) {
+      // Handle initial mount (when panels are registered too late to be in the panels array)
+      // The subsequent render+effects will handle the resize notification
+      return;
+    }
+    const {
+      callbacks,
+      constraints,
+      id: panelId
+    } = panelData;
+    const {
+      collapsible
+    } = constraints;
+    const mixedSizes = {
+      sizePercentage,
+      sizePixels: convertPercentageToPixels(sizePercentage, groupSizePixels)
+    };
+    const lastNotifiedMixedSizes = panelIdToLastNotifiedMixedSizesMap[panelId];
+    if (lastNotifiedMixedSizes == null || mixedSizes.sizePercentage !== lastNotifiedMixedSizes.sizePercentage || mixedSizes.sizePixels !== lastNotifiedMixedSizes.sizePixels) {
+      panelIdToLastNotifiedMixedSizesMap[panelId] = mixedSizes;
+      const {
+        onCollapse,
+        onExpand,
+        onResize
+      } = callbacks;
+      if (onResize) {
+        onResize(mixedSizes, lastNotifiedMixedSizes);
+      }
+      if (collapsible && (onCollapse || onExpand)) {
+        const collapsedSize = getPercentageSizeFromMixedSizes({
+          sizePercentage: constraints.collapsedSizePercentage,
+          sizePixels: constraints.collapsedSizePixels
+        }, groupSizePixels) ?? 0;
+        const size = getPercentageSizeFromMixedSizes(mixedSizes, groupSizePixels);
+        if (onExpand && (lastNotifiedMixedSizes == null || lastNotifiedMixedSizes.sizePercentage === collapsedSize) && size !== collapsedSize) {
+          onExpand();
+        }
+        if (onCollapse && (lastNotifiedMixedSizes == null || lastNotifiedMixedSizes.sizePercentage !== collapsedSize) && size === collapsedSize) {
+          onCollapse();
+        }
+      }
+    }
+  });
+}
+
+function compareLayouts(a, b) {
+  if (a.length !== b.length) {
+    return false;
+  } else {
+    for (let index = 0; index < a.length; index++) {
+      if (a[index] != b[index]) {
+        return false;
+      }
+    }
+  }
+  return true;
+}
+
+// This method returns a number between 1 and 100 representing
+
+// the % of the group's overall space this panel should occupy.
+function computePanelFlexBoxStyle({
+  dragState,
+  layout,
+  panelData,
+  panelIndex,
+  precision = 3
+}) {
+  const size = layout[panelIndex];
+  let flexGrow;
+  if (panelData.length === 1) {
+    flexGrow = "100";
+  } else if (size == null) {
+    flexGrow = "0";
+  } else {
+    flexGrow = size.toPrecision(precision);
+  }
+  return {
+    flexBasis: 0,
+    flexGrow,
+    flexShrink: 1,
+    // Without this, Panel sizes may be unintentionally overridden by their content
+    overflow: "hidden",
+    // Disable pointer events inside of a panel during resize
+    // This avoid edge cases like nested iframes
+    pointerEvents: dragState !== null ? "none" : undefined
+  };
 }
 
 let currentState = null;
@@ -925,17 +1012,47 @@ function debounce(callback, durationMs = 10) {
   return callable;
 }
 
+// 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,
+// and avoids throwing user-visible errors.
+function initializeDefaultStorage(storageObject) {
+  try {
+    if (typeof localStorage !== "undefined") {
+      // Bypass this check for future calls
+      storageObject.getItem = name => {
+        return localStorage.getItem(name);
+      };
+      storageObject.setItem = (name, value) => {
+        localStorage.setItem(name, value);
+      };
+    } else {
+      throw new Error("localStorage not supported in this environment");
+    }
+  } catch (error) {
+    console.error(error);
+    storageObject.getItem = () => null;
+    storageObject.setItem = () => {};
+  }
+}
+
 // Note that Panel ids might be user-provided (stable) or useId generated (non-deterministic)
 // so they should not be used as part of the serialization key.
-// Using an attribute like minSize instead should work well enough.
+// Using the min/max size attributes should work well enough as a backup.
 // Pre-sorting by minSize allows remembering layouts even if panels are re-ordered/dragged.
 function getSerializationKey(panels) {
   return panels.map(panel => {
     const {
-      minSize,
+      constraints,
+      id,
+      idIsFromProps,
       order
-    } = panel.current;
-    return order ? `${order}:${minSize}` : `${minSize}`;
+    } = panel;
+    if (idIsFromProps) {
+      return id;
+    } else {
+      return `${order}:${JSON.stringify(constraints)}`;
+    }
   }).sort((a, b) => a.localeCompare(b)).join(",");
 }
 function loadSerializedPanelGroupState(autoSaveId, storage) {
@@ -969,31 +1086,68 @@ function savePanelGroupLayout(autoSaveId, panels, sizes, storage) {
   }
 }
 
-const debounceMap = {};
+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,
+  layout: prevLayout,
+  panelConstraints
+}) {
+  const nextLayout = [...prevLayout];
+
+  // Validate layout expectations
+  if (nextLayout.length !== panelConstraints.length) {
+    throw Error(`Invalid ${panelConstraints.length} panel layout: ${nextLayout.map(size => `${size}%`).join(", ")}`);
+  } else if (!fuzzyNumbersEqual(nextLayout.reduce((accumulated, current) => accumulated + current, 0), 100)) ;
+  let remainingSize = 0;
+
+  // First pass: Validate the proposed layout given each panel's constraints
+  for (let index = 0; index < panelConstraints.length; index++) {
+    const unsafeSize = nextLayout[index];
+    const safeSize = resizePanel({
+      groupSizePixels,
+      panelConstraints,
+      panelIndex: index,
+      size: unsafeSize
+    });
+    if (unsafeSize != safeSize) {
+      remainingSize += unsafeSize - safeSize;
+      nextLayout[index] = safeSize;
+    }
+  }
+
+  // If there is additional, left over space, assign it to any panel(s) that permits it
+  // (It's not worth taking multiple additional passes to evenly distribute)
+  if (!fuzzyNumbersEqual(remainingSize, 0)) {
+    for (let index = 0; index < panelConstraints.length; index++) {
+      const prevSize = nextLayout[index];
+      const unsafeSize = prevSize + remainingSize;
+      const safeSize = resizePanel({
+        groupSizePixels,
+        panelConstraints,
+        panelIndex: index,
+        size: unsafeSize
+      });
+      if (prevSize !== safeSize) {
+        remainingSize -= safeSize - prevSize;
+        nextLayout[index] = safeSize;
 
-// 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,
-// and avoids throwing user-visible errors.
-function initializeDefaultStorage(storageObject) {
-  try {
-    if (typeof localStorage !== "undefined") {
-      // Bypass this check for future calls
-      storageObject.getItem = name => {
-        return localStorage.getItem(name);
-      };
-      storageObject.setItem = (name, value) => {
-        localStorage.setItem(name, value);
-      };
-    } else {
-      throw new Error("localStorage not supported in this environment");
+        // Once we've used up the remainder, bail
+        if (fuzzyNumbersEqual(remainingSize, 0)) {
+          break;
+        }
+      }
     }
-  } catch (error) {
-    console.error(error);
-    storageObject.getItem = () => null;
-    storageObject.setItem = () => {};
   }
+  return nextLayout;
 }
+
+const LOCAL_STORAGE_DEBOUNCE_INTERVAL = 100;
 const defaultStorage = {
   getItem: name => {
     initializeDefaultStorage(defaultStorage);
@@ -1004,150 +1158,113 @@ const defaultStorage = {
     defaultStorage.setItem(name, value);
   }
 };
-
-// Initial drag state serves a few purposes:
-// * dragOffset:
-//   Resize is calculated by the distance between the current pointer event and the resize handle being "dragged"
-//   This value accounts for the initial offset when the touch/click starts, so the handle doesn't appear to "jump"
-// * dragHandleRect, sizes:
-//   When resizing is done via mouse/touch event– some initial state is stored
-//   so that any panels that contract will also expand if drag direction is reversed.
+const debounceMap = {};
 function PanelGroupWithForwardedRef({
   autoSaveId,
-  children = null,
+  children,
   className: classNameFromProps = "",
   direction,
-  disablePointerEventsDuringResize = false,
   forwardedRef,
-  id: idFromProps = null,
-  onLayout,
+  id: idFromProps,
+  onLayout = null,
+  keyboardResizeByPercentage = null,
+  keyboardResizeByPixels = null,
   storage = defaultStorage,
-  style: styleFromProps = {},
-  tagName: Type = "div",
-  units = "percentages"
+  style: styleFromProps,
+  tagName: Type = "div"
 }) {
   const groupId = useUniqueId(idFromProps);
-  const [activeHandleId, setActiveHandleId] = useState(null);
-  const [panels, setPanels] = useState(new Map());
-
-  // When resizing is done via mouse/touch event–
-  // We store the initial Panel sizes in this ref, and apply move deltas to them instead of to the current sizes.
-  // This has the benefit of causing force-collapsed panels to spring back open if drag is reversed.
-  const initialDragStateRef = useRef(null);
-  useRef({
-    didLogDefaultSizeWarning: false,
-    didLogIdAndOrderWarning: false,
-    didLogInvalidLayoutWarning: false,
-    prevPanelIds: []
-  });
-
-  // Use a ref to guard against users passing inline props
-  const callbacksRef = useRef({
-    onLayout
-  });
-  useEffect(() => {
-    callbacksRef.current.onLayout = onLayout;
-  });
-  const panelIdToLastNotifiedSizeMapRef = useRef({});
-
-  // 0-1 values representing the relative size of each panel.
-  const [sizes, setSizes] = useState([]);
-
-  // Used to support imperative collapse/expand API.
-  const panelSizeBeforeCollapse = useRef(new Map());
+  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);
-
-  // Store committed values to avoid unnecessarily re-running memoization/effects functions.
   const committedValuesRef = useRef({
     direction,
+    dragState,
     id: groupId,
-    panels,
-    sizes,
-    units
+    keyboardResizeByPercentage,
+    keyboardResizeByPixels,
+    layout,
+    onLayout,
+    panelDataArray
+  });
+  useRef({
+    didLogIdAndOrderWarning: false,
+    didLogPanelConstraintsWarning: false,
+    prevPanelIds: []
   });
   useImperativeHandle(forwardedRef, () => ({
-    getId: () => groupId,
-    getLayout: unitsFromParams => {
+    getId: () => committedValuesRef.current.id,
+    getLayout: () => {
       const {
-        sizes,
-        units: unitsFromProps
+        id: groupId,
+        layout
       } = committedValuesRef.current;
-      const units = unitsFromParams ?? unitsFromProps;
-      if (units === "pixels") {
-        const groupSizePixels = getAvailableGroupSizePixels(groupId);
-        return sizes.map(size => size / 100 * groupSizePixels);
-      } else {
-        return sizes;
-      }
+      const groupSizePixels = calculateAvailablePanelSizeInPixels(groupId);
+      return layout.map(sizePercentage => {
+        return {
+          sizePercentage,
+          sizePixels: convertPercentageToPixels(sizePercentage, groupSizePixels)
+        };
+      });
     },
-    setLayout: (sizes, unitsFromParams) => {
+    setLayout: mixedSizes => {
       const {
         id: groupId,
-        panels,
-        sizes: prevSizes,
-        units
+        layout: prevLayout,
+        onLayout,
+        panelDataArray
       } = committedValuesRef.current;
-      if ((unitsFromParams || units) === "pixels") {
-        const groupSizePixels = getAvailableGroupSizePixels(groupId);
-        sizes = sizes.map(size => size / groupSizePixels * 100);
-      }
-      const panelIdToLastNotifiedSizeMap = panelIdToLastNotifiedSizeMapRef.current;
-      const panelsArray = panelsMapToSortedArray(panels);
-      const nextSizes = validatePanelGroupLayout({
-        groupId,
-        panels,
-        nextSizes: sizes,
-        prevSizes,
-        units
+      const groupSizePixels = calculateAvailablePanelSizeInPixels(groupId);
+      const unsafeLayout = mixedSizes.map(mixedSize => getPercentageSizeFromMixedSizes(mixedSize, groupSizePixels));
+      const safeLayout = validatePanelGroupLayout({
+        groupSizePixels,
+        layout: unsafeLayout,
+        panelConstraints: panelDataArray.map(panelData => panelData.constraints)
       });
-      if (!areEqual(prevSizes, nextSizes)) {
-        setSizes(nextSizes);
-        callPanelCallbacks(panelsArray, nextSizes, panelIdToLastNotifiedSizeMap);
+      if (!areEqual(prevLayout, safeLayout)) {
+        setLayout(safeLayout);
+        if (onLayout) {
+          onLayout(safeLayout.map(sizePercentage => ({
+            sizePercentage,
+            sizePixels: convertPercentageToPixels(sizePercentage, groupSizePixels)
+          })));
+        }
+        callPanelCallbacks(groupId, panelDataArray, safeLayout, panelIdToLastNotifiedMixedSizesMapRef.current);
       }
     }
-  }), [groupId]);
+  }), []);
   useIsomorphicLayoutEffect(() => {
     committedValuesRef.current.direction = direction;
+    committedValuesRef.current.dragState = dragState;
     committedValuesRef.current.id = groupId;
-    committedValuesRef.current.panels = panels;
-    committedValuesRef.current.sizes = sizes;
-    committedValuesRef.current.units = units;
+    committedValuesRef.current.layout = layout;
+    committedValuesRef.current.onLayout = onLayout;
+    committedValuesRef.current.panelDataArray = panelDataArray;
   });
   useWindowSplitterPanelGroupBehavior({
     committedValuesRef,
     groupId,
-    panels,
-    setSizes,
-    sizes,
-    panelSizeBeforeCollapse
+    layout,
+    panelDataArray,
+    setLayout
   });
-
-  // Notify external code when sizes have changed.
   useEffect(() => {
-    const {
-      onLayout
-    } = callbacksRef.current;
-    const {
-      panels,
-      sizes
-    } = 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) {
+        return;
+      }
 
-    // Don't commit layout until all panels have registered and re-rendered with their actual sizes.
-    if (sizes.length > 0) {
-      if (onLayout) {
-        onLayout(sizes);
+      // Limit the frequency of localStorage updates.
+      if (!debounceMap[autoSaveId]) {
+        debounceMap[autoSaveId] = debounce(savePanelGroupLayout, LOCAL_STORAGE_DEBOUNCE_INTERVAL);
       }
-      const panelIdToLastNotifiedSizeMap = panelIdToLastNotifiedSizeMapRef.current;
-
-      // When possible, we notify before the next render so that rendering work can be batched together.
-      // Some cases are difficult to detect though,
-      // for example– panels that are conditionally rendered can affect the size of neighboring panels.
-      // In this case, the best we can do is notify on commit.
-      // The callPanelCallbacks() uses its own memoization to avoid notifying panels twice in these cases.
-      const panelsArray = panelsMapToSortedArray(panels);
-      callPanelCallbacks(panelsArray, sizes, panelIdToLastNotifiedSizeMap);
+      debounceMap[autoSaveId](autoSaveId, panelDataArray, layout, storage);
     }
-  }, [sizes]);
+  }, [autoSaveId, layout, panelDataArray, storage]);
 
   // Once all panels have registered themselves,
   // Compute the initial sizes based on default weights.
@@ -1155,189 +1272,308 @@ function PanelGroupWithForwardedRef({
   useIsomorphicLayoutEffect(() => {
     const {
       id: groupId,
-      sizes,
-      units
+      layout,
+      onLayout
     } = committedValuesRef.current;
-    if (sizes.length === panels.size) {
-      // Only compute (or restore) default sizes once per panel configuration.
+    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 defaultSizes = null;
+    let unsafeLayout = null;
     if (autoSaveId) {
-      const panelsArray = panelsMapToSortedArray(panels);
-      defaultSizes = loadPanelLayout(autoSaveId, panelsArray, storage);
+      unsafeLayout = loadPanelLayout(autoSaveId, panelDataArray, storage);
     }
-    if (defaultSizes != null) {
-      // Validate saved sizes in case something has changed since last render
-      // e.g. for pixel groups, this could be the size of the window
-      const validatedSizes = validatePanelGroupLayout({
-        groupId,
-        panels,
-        nextSizes: defaultSizes,
-        prevSizes: defaultSizes,
-        units
-      });
-      setSizes(validatedSizes);
-    } else {
-      const sizes = calculateDefaultLayout({
-        groupId,
-        panels,
-        units
+    const groupSizePixels = calculateAvailablePanelSizeInPixels(groupId);
+    if (unsafeLayout == null) {
+      unsafeLayout = calculateUnsafeDefaultLayout({
+        groupSizePixels,
+        panelDataArray
       });
-      setSizes(sizes);
     }
-  }, [autoSaveId, panels, storage]);
-  useEffect(() => {
-    // If this panel has been configured to persist sizing information, save sizes to local storage.
-    if (autoSaveId) {
-      if (sizes.length === 0 || sizes.length !== panels.size) {
-        return;
-      }
-      const panelsArray = panelsMapToSortedArray(panels);
 
-      // Limit the frequency of localStorage updates.
-      if (!debounceMap[autoSaveId]) {
-        debounceMap[autoSaveId] = debounce(savePanelGroupLayout, 100);
-      }
-      debounceMap[autoSaveId](autoSaveId, panelsArray, sizes, storage);
+    // 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)
+      })));
     }
-  }, [autoSaveId, panels, sizes, storage]);
+    callPanelCallbacks(groupId, panelDataArray, validatedLayout, panelIdToLastNotifiedMixedSizesMapRef.current);
+  }, [autoSaveId, layout, panelDataArray, storage]);
   useIsomorphicLayoutEffect(() => {
-    // Pixel panel constraints need to be reassessed after a group resize
-    // We can avoid the ResizeObserver overhead for relative layouts
-    if (units === "pixels") {
+    const constraints = panelDataArray.map(({
+      constraints
+    }) => constraints);
+    if (!shouldMonitorPixelBasedConstraints(constraints)) {
+      // Avoid the overhead of ResizeObserver if no pixel constraints require monitoring
+      return;
+    }
+    if (typeof ResizeObserver === "undefined") {
+      console.warn(`WARNING: Pixel based constraints require ResizeObserver but it is not supported by the current browser.`);
+    } else {
       const resizeObserver = new ResizeObserver(() => {
+        const groupSizePixels = calculateAvailablePanelSizeInPixels(groupId);
         const {
-          panels,
-          sizes: prevSizes
+          layout: prevLayout,
+          onLayout
         } = committedValuesRef.current;
-        const nextSizes = validatePanelGroupLayout({
-          groupId,
-          panels,
-          nextSizes: prevSizes,
-          prevSizes,
-          units
+        const nextLayout = validatePanelGroupLayout({
+          groupSizePixels,
+          layout: prevLayout,
+          panelConstraints: panelDataArray.map(panelData => panelData.constraints)
         });
-        if (!areEqual(prevSizes, nextSizes)) {
-          setSizes(nextSizes);
+        if (!areEqual(prevLayout, nextLayout)) {
+          setLayout(nextLayout);
+          if (onLayout) {
+            onLayout(nextLayout.map(sizePercentage => ({
+              sizePercentage,
+              sizePixels: convertPercentageToPixels(sizePercentage, groupSizePixels)
+            })));
+          }
+          callPanelCallbacks(groupId, panelDataArray, nextLayout, panelIdToLastNotifiedMixedSizesMapRef.current);
         }
       });
-      resizeObserver.observe(getPanelGroup(groupId));
+      resizeObserver.observe(getPanelGroupElement(groupId));
       return () => {
         resizeObserver.disconnect();
       };
     }
-  }, [groupId, units]);
-  const getPanelSize = useCallback((id, unitsFromParams) => {
+  }, [groupId, panelDataArray]);
+
+  // DEV warnings
+  useEffect(() => {
+  });
+
+  // External APIs are safe to memoize via committed values ref
+  const collapsePanel = useCallback(panelData => {
     const {
-      panels,
-      units: unitsFromProps
+      layout: prevLayout,
+      onLayout,
+      panelDataArray
     } = committedValuesRef.current;
-    const panelsArray = panelsMapToSortedArray(panels);
-    const index = panelsArray.findIndex(panel => panel.current.id === id);
-    const size = sizes[index];
-    const units = unitsFromParams ?? unitsFromProps;
-    if (units === "pixels") {
-      const groupSizePixels = getAvailableGroupSizePixels(groupId);
-      return size / 100 * groupSizePixels;
-    } else {
-      return size;
+    if (panelData.constraints.collapsible) {
+      const panelConstraintsArray = panelDataArray.map(panelData => panelData.constraints);
+      const {
+        collapsedSizePercentage,
+        panelSizePercentage,
+        pivotIndices,
+        groupSizePixels
+      } = panelDataHelper(groupId, panelDataArray, panelData, prevLayout);
+      if (panelSizePercentage !== collapsedSizePercentage) {
+        // Store size before collapse;
+        // This is the size that gets restored if the expand() API is used.
+        panelSizeBeforeCollapseRef.current.set(panelData.id, panelSizePercentage);
+        const isLastPanel = panelDataArray.indexOf(panelData) === panelDataArray.length - 1;
+        const delta = isLastPanel ? panelSizePercentage - collapsedSizePercentage : collapsedSizePercentage - panelSizePercentage;
+        const nextLayout = adjustLayoutByDelta({
+          delta,
+          groupSizePixels,
+          layout: prevLayout,
+          panelConstraints: panelConstraintsArray,
+          pivotIndices,
+          trigger: "imperative-api"
+        });
+        if (!compareLayouts(prevLayout, nextLayout)) {
+          setLayout(nextLayout);
+          if (onLayout) {
+            onLayout(nextLayout.map(sizePercentage => ({
+              sizePercentage,
+              sizePixels: convertPercentageToPixels(sizePercentage, groupSizePixels)
+            })));
+          }
+          callPanelCallbacks(groupId, panelDataArray, nextLayout, panelIdToLastNotifiedMixedSizesMapRef.current);
+        }
+      }
     }
-  }, [groupId, sizes]);
-  const getPanelStyle = useCallback((id, defaultSize) => {
+  }, [groupId]);
+
+  // External APIs are safe to memoize via committed values ref
+  const expandPanel = useCallback(panelData => {
     const {
-      panels
+      layout: prevLayout,
+      onLayout,
+      panelDataArray
     } = committedValuesRef.current;
-
-    // Before mounting, Panels will not yet have registered themselves.
-    // This includes server rendering.
-    // At this point the best we can do is render everything with the same size.
-    if (panels.size === 0) {
-      return {
-        flexBasis: 0,
-        flexGrow: defaultSize != null ? defaultSize : undefined,
-        flexShrink: 1,
-        // Without this, Panel sizes may be unintentionally overridden by their content.
-        overflow: "hidden"
-      };
+    if (panelData.constraints.collapsible) {
+      const panelConstraintsArray = panelDataArray.map(panelData => panelData.constraints);
+      const {
+        collapsedSizePercentage,
+        panelSizePercentage,
+        minSizePercentage,
+        pivotIndices,
+        groupSizePixels
+      } = panelDataHelper(groupId, panelDataArray, panelData, prevLayout);
+      if (panelSizePercentage === collapsedSizePercentage) {
+        // Restore this panel to the size it was before it was collapsed, if possible.
+        const prevPanelSizePercentage = panelSizeBeforeCollapseRef.current.get(panelData.id);
+        const baseSizePercentage = prevPanelSizePercentage != null ? prevPanelSizePercentage : minSizePercentage;
+        const isLastPanel = panelDataArray.indexOf(panelData) === panelDataArray.length - 1;
+        const delta = isLastPanel ? panelSizePercentage - baseSizePercentage : baseSizePercentage - panelSizePercentage;
+        const nextLayout = adjustLayoutByDelta({
+          delta,
+          groupSizePixels,
+          layout: prevLayout,
+          panelConstraints: panelConstraintsArray,
+          pivotIndices,
+          trigger: "imperative-api"
+        });
+        if (!compareLayouts(prevLayout, nextLayout)) {
+          setLayout(nextLayout);
+          if (onLayout) {
+            onLayout(nextLayout.map(sizePercentage => ({
+              sizePercentage,
+              sizePixels: convertPercentageToPixels(sizePercentage, groupSizePixels)
+            })));
+          }
+          callPanelCallbacks(groupId, panelDataArray, nextLayout, panelIdToLastNotifiedMixedSizesMapRef.current);
+        }
+      }
     }
-    const flexGrow = getFlexGrow(panels, id, sizes);
+  }, [groupId]);
+
+  // External APIs are safe to memoize via committed values ref
+  const getPanelSize = useCallback(panelData => {
+    const {
+      layout,
+      panelDataArray
+    } = committedValuesRef.current;
+    const {
+      panelSizePercentage,
+      panelSizePixels
+    } = panelDataHelper(groupId, panelDataArray, panelData, layout);
     return {
-      flexBasis: 0,
-      flexGrow,
-      flexShrink: 1,
-      // Without this, Panel sizes may be unintentionally overridden by their content.
-      overflow: "hidden",
-      // Disable pointer events inside of a panel during resize.
-      // This avoid edge cases like nested iframes.
-      pointerEvents: disablePointerEventsDuringResize && activeHandleId !== null ? "none" : undefined
+      sizePercentage: panelSizePercentage,
+      sizePixels: panelSizePixels
     };
-  }, [activeHandleId, disablePointerEventsDuringResize, sizes]);
-  const registerPanel = useCallback((id, panelRef) => {
+  }, [groupId]);
+
+  // This API should never read from committedValuesRef
+  const getPanelStyle = useCallback(panelData => {
+    const panelIndex = panelDataArray.indexOf(panelData);
+    return computePanelFlexBoxStyle({
+      dragState,
+      layout,
+      panelData: panelDataArray,
+      panelIndex
+    });
+  }, [dragState, layout, panelDataArray]);
+
+  // External APIs are safe to memoize via committed values ref
+  const isPanelCollapsed = useCallback(panelData => {
     const {
-      units
+      layout,
+      panelDataArray
     } = committedValuesRef.current;
-    validatePanelProps(units, panelRef);
-    setPanels(prevPanels => {
-      if (prevPanels.has(id)) {
-        return prevPanels;
-      }
-      const nextPanels = new Map(prevPanels);
-      nextPanels.set(id, panelRef);
-      return nextPanels;
+    const {
+      collapsedSizePercentage,
+      collapsible,
+      panelSizePercentage
+    } = panelDataHelper(groupId, panelDataArray, panelData, layout);
+    return collapsible === true && panelSizePercentage === collapsedSizePercentage;
+  }, [groupId]);
+
+  // External APIs are safe to memoize via committed values ref
+  const isPanelExpanded = useCallback(panelData => {
+    const {
+      layout,
+      panelDataArray
+    } = committedValuesRef.current;
+    const {
+      collapsedSizePercentage,
+      collapsible,
+      panelSizePercentage
+    } = panelDataHelper(groupId, panelDataArray, panelData, layout);
+    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 registerResizeHandle = useCallback(handleId => {
-    const resizeHandler = event => {
+  const registerResizeHandle = useCallback(dragHandleId => {
+    return function resizeHandler(event) {
       event.preventDefault();
       const {
         direction,
-        panels,
-        sizes: prevSizes
+        dragState,
+        id: groupId,
+        keyboardResizeByPercentage,
+        keyboardResizeByPixels,
+        onLayout,
+        panelDataArray,
+        layout: prevLayout
       } = committedValuesRef.current;
-      const panelsArray = panelsMapToSortedArray(panels);
-      const [idBefore, idAfter] = getResizeHandlePanelIds(groupId, handleId, panelsArray);
-      if (idBefore == null || idAfter == null) {
-        return;
-      }
-      let movement = getMovement(event, groupId, handleId, panelsArray, direction, prevSizes, initialDragStateRef.current);
-      if (movement === 0) {
+      const {
+        initialLayout
+      } = dragState ?? {};
+      const pivotIndices = determinePivotIndices(groupId, dragHandleId);
+      let delta = calculateDeltaPercentage(event, groupId, dragHandleId, direction, dragState, {
+        percentage: keyboardResizeByPercentage,
+        pixels: keyboardResizeByPixels
+      });
+      if (delta === 0) {
         return;
       }
-      const groupElement = getPanelGroup(groupId);
-      const rect = groupElement.getBoundingClientRect();
-      const isHorizontal = direction === "horizontal";
 
       // Support RTL layouts
+      const isHorizontal = direction === "horizontal";
       if (document.dir === "rtl" && isHorizontal) {
-        movement = -movement;
+        delta = -delta;
       }
-      const size = isHorizontal ? rect.width : rect.height;
-      const delta = movement / size * 100;
-
-      // If a validateLayout method has been provided
-      // it's important to use it before updating the mouse cursor
-      const nextSizes = adjustByDelta(event, committedValuesRef.current, idBefore, idAfter, delta, prevSizes, panelSizeBeforeCollapse.current, initialDragStateRef.current);
-      const sizesChanged = !areEqual(prevSizes, nextSizes);
+      const groupSizePixels = calculateAvailablePanelSizeInPixels(groupId);
+      const panelConstraints = panelDataArray.map(panelData => panelData.constraints);
+      const nextLayout = adjustLayoutByDelta({
+        delta,
+        groupSizePixels,
+        layout: initialLayout ?? prevLayout,
+        panelConstraints,
+        pivotIndices,
+        trigger: isKeyDown(event) ? "keyboard" : "mouse-or-touch"
+      });
+      const layoutChanged = !compareLayouts(prevLayout, nextLayout);
 
-      // Don't update cursor for resizes triggered by keyboard interactions.
+      // Only update the cursor for layout changes triggered by touch/mouse events (not keyboard)
+      // Update the cursor even if the layout hasn't changed (we may need to show an invalid cursor state)
       if (isMouseEvent(event) || isTouchEvent(event)) {
         // Watch for multiple subsequent deltas; this might occur for tiny cursor movements.
         // In this case, Panel sizes might not change–
         // but updating cursor in this scenario would cause a flicker.
         if (prevDeltaRef.current != delta) {
-          if (!sizesChanged) {
+          prevDeltaRef.current = delta;
+          if (!layoutChanged) {
             // If the pointer has moved too far to resize the panel any further,
             // update the cursor style for a visual clue.
             // This mimics VS Code behavior.
 
             if (isHorizontal) {
-              setGlobalCursorStyle(movement < 0 ? "horizontal-min" : "horizontal-max");
+              setGlobalCursorStyle(delta < 0 ? "horizontal-min" : "horizontal-max");
             } else {
-              setGlobalCursorStyle(movement < 0 ? "vertical-min" : "vertical-max");
+              setGlobalCursorStyle(delta < 0 ? "vertical-min" : "vertical-max");
             }
           } else {
             // Reset the cursor style to the the normal resize cursor.
@@ -1345,202 +1581,100 @@ function PanelGroupWithForwardedRef({
           }
         }
       }
-      if (sizesChanged) {
-        const panelIdToLastNotifiedSizeMap = panelIdToLastNotifiedSizeMapRef.current;
-
-        // It's okay to bypass in this case because we already validated above
-        setSizes(nextSizes);
-
-        // If resize change handlers have been declared, this is the time to call them.
-        // Trigger user callbacks after updating state, so that user code can override the sizes.
-        callPanelCallbacks(panelsArray, nextSizes, panelIdToLastNotifiedSizeMap);
+      if (layoutChanged) {
+        setLayout(nextLayout);
+        if (onLayout) {
+          onLayout(nextLayout.map(sizePercentage => ({
+            sizePercentage,
+            sizePixels: convertPercentageToPixels(sizePercentage, groupSizePixels)
+          })));
+        }
+        callPanelCallbacks(groupId, panelDataArray, nextLayout, panelIdToLastNotifiedMixedSizesMapRef.current);
       }
-      prevDeltaRef.current = delta;
     };
-    return resizeHandler;
-  }, [groupId]);
-  const unregisterPanel = useCallback(id => {
-    setPanels(prevPanels => {
-      if (!prevPanels.has(id)) {
-        return prevPanels;
-      }
-      const nextPanels = new Map(prevPanels);
-      nextPanels.delete(id);
-      return nextPanels;
-    });
   }, []);
-  const collapsePanel = useCallback(id => {
+
+  // External APIs are safe to memoize via committed values ref
+  const resizePanel = useCallback((panelData, mixedSizes) => {
     const {
-      panels,
-      sizes: prevSizes
+      layout: prevLayout,
+      onLayout,
+      panelDataArray
     } = committedValuesRef.current;
-    const panel = panels.get(id);
-    if (panel == null) {
-      return;
-    }
+    const panelConstraintsArray = panelDataArray.map(panelData => panelData.constraints);
     const {
-      collapsedSize,
-      collapsible
-    } = panel.current;
-    if (!collapsible) {
-      return;
-    }
-    const panelsArray = panelsMapToSortedArray(panels);
-    const index = panelsArray.indexOf(panel);
-    if (index < 0) {
-      return;
-    }
-    const currentSize = prevSizes[index];
-    if (currentSize === collapsedSize) {
-      // Panel is already collapsed.
-      return;
-    }
-    panelSizeBeforeCollapse.current.set(id, currentSize);
-    const [idBefore, idAfter] = getBeforeAndAfterIds(id, panelsArray);
-    if (idBefore == null || idAfter == null) {
-      return;
-    }
-    const isLastPanel = index === panelsArray.length - 1;
-    const delta = isLastPanel ? currentSize : collapsedSize - currentSize;
-    const nextSizes = adjustByDelta(null, committedValuesRef.current, idBefore, idAfter, delta, prevSizes, panelSizeBeforeCollapse.current, null);
-    if (prevSizes !== nextSizes) {
-      const panelIdToLastNotifiedSizeMap = panelIdToLastNotifiedSizeMapRef.current;
-      setSizes(nextSizes);
-
-      // If resize change handlers have been declared, this is the time to call them.
-      // Trigger user callbacks after updating state, so that user code can override the sizes.
-      callPanelCallbacks(panelsArray, nextSizes, panelIdToLastNotifiedSizeMap);
+      groupSizePixels,
+      panelSizePercentage,
+      pivotIndices
+    } = panelDataHelper(groupId, panelDataArray, panelData, prevLayout);
+    const sizePercentage = getPercentageSizeFromMixedSizes(mixedSizes, groupSizePixels);
+    const isLastPanel = panelDataArray.indexOf(panelData) === panelDataArray.length - 1;
+    const delta = isLastPanel ? panelSizePercentage - sizePercentage : sizePercentage - panelSizePercentage;
+    const nextLayout = adjustLayoutByDelta({
+      delta,
+      groupSizePixels,
+      layout: prevLayout,
+      panelConstraints: panelConstraintsArray,
+      pivotIndices,
+      trigger: "imperative-api"
+    });
+    if (!compareLayouts(prevLayout, nextLayout)) {
+      setLayout(nextLayout);
+      if (onLayout) {
+        onLayout(nextLayout.map(sizePercentage => ({
+          sizePercentage,
+          sizePixels: convertPercentageToPixels(sizePercentage, groupSizePixels)
+        })));
+      }
+      callPanelCallbacks(groupId, panelDataArray, nextLayout, panelIdToLastNotifiedMixedSizesMapRef.current);
     }
-  }, []);
-  const expandPanel = useCallback(id => {
+  }, [groupId]);
+  const startDragging = useCallback((dragHandleId, event) => {
     const {
-      panels,
-      sizes: prevSizes
+      direction,
+      layout
     } = committedValuesRef.current;
-    const panel = panels.get(id);
-    if (panel == null) {
-      return;
-    }
-    const {
-      collapsedSize,
-      minSize
-    } = panel.current;
-    const sizeBeforeCollapse = panelSizeBeforeCollapse.current.get(id) || minSize;
-    if (!sizeBeforeCollapse) {
-      return;
-    }
-    const panelsArray = panelsMapToSortedArray(panels);
-    const index = panelsArray.indexOf(panel);
-    if (index < 0) {
-      return;
-    }
-    const currentSize = prevSizes[index];
-    if (currentSize !== collapsedSize) {
-      // Panel is already expanded.
-      return;
-    }
-    const [idBefore, idAfter] = getBeforeAndAfterIds(id, panelsArray);
-    if (idBefore == null || idAfter == null) {
-      return;
-    }
-    const isLastPanel = index === panelsArray.length - 1;
-    const delta = isLastPanel ? collapsedSize - sizeBeforeCollapse : sizeBeforeCollapse;
-    const nextSizes = adjustByDelta(null, committedValuesRef.current, idBefore, idAfter, delta, prevSizes, panelSizeBeforeCollapse.current, null);
-    if (prevSizes !== nextSizes) {
-      const panelIdToLastNotifiedSizeMap = panelIdToLastNotifiedSizeMapRef.current;
-      setSizes(nextSizes);
-
-      // If resize change handlers have been declared, this is the time to call them.
-      // Trigger user callbacks after updating state, so that user code can override the sizes.
-      callPanelCallbacks(panelsArray, nextSizes, panelIdToLastNotifiedSizeMap);
-    }
+    const handleElement = getResizeHandleElement(dragHandleId);
+    const initialCursorPosition = getResizeEventCursorPosition(direction, event);
+    setDragState({
+      dragHandleId,
+      dragHandleRect: handleElement.getBoundingClientRect(),
+      initialCursorPosition,
+      initialLayout: layout
+    });
   }, []);
-  const resizePanel = useCallback((id, nextSize, unitsFromParams) => {
-    const {
-      id: groupId,
-      panels,
-      sizes: prevSizes,
-      units
-    } = committedValuesRef.current;
-    if ((unitsFromParams || units) === "pixels") {
-      const groupSizePixels = getAvailableGroupSizePixels(groupId);
-      nextSize = nextSize / groupSizePixels * 100;
-    }
-    const panel = panels.get(id);
-    if (panel == null) {
-      return;
-    }
-    let {
-      collapsedSize,
-      collapsible,
-      maxSize,
-      minSize
-    } = panel.current;
-    if (units === "pixels") {
-      const groupSizePixels = getAvailableGroupSizePixels(groupId);
-      minSize = minSize / groupSizePixels * 100;
-      if (maxSize != null) {
-        maxSize = maxSize / groupSizePixels * 100;
+  const stopDragging = useCallback(() => {
+    resetGlobalCursorStyle();
+    setDragState(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 panelsArray = panelsMapToSortedArray(panels);
-    const index = panelsArray.indexOf(panel);
-    if (index < 0) {
-      return;
-    }
-    const currentSize = prevSizes[index];
-    if (currentSize === nextSize) {
-      return;
-    }
-    if (collapsible && nextSize === collapsedSize) ; else {
-      nextSize = Math.min(maxSize != null ? maxSize : 100, Math.max(minSize, nextSize));
-    }
-    const [idBefore, idAfter] = getBeforeAndAfterIds(id, panelsArray);
-    if (idBefore == null || idAfter == null) {
-      return;
-    }
-    const isLastPanel = index === panelsArray.length - 1;
-    const delta = isLastPanel ? currentSize - nextSize : nextSize - currentSize;
-    const nextSizes = adjustByDelta(null, committedValuesRef.current, idBefore, idAfter, delta, prevSizes, panelSizeBeforeCollapse.current, null);
-    if (prevSizes !== nextSizes) {
-      const panelIdToLastNotifiedSizeMap = panelIdToLastNotifiedSizeMapRef.current;
-      setSizes(nextSizes);
-
-      // If resize change handlers have been declared, this is the time to call them.
-      // Trigger user callbacks after updating state, so that user code can override the sizes.
-      callPanelCallbacks(panelsArray, nextSizes, panelIdToLastNotifiedSizeMap);
-    }
+      return panelDataArray;
+    });
   }, []);
   const context = useMemo(() => ({
-    activeHandleId,
     collapsePanel,
     direction,
+    dragState,
     expandPanel,
     getPanelSize,
     getPanelStyle,
     groupId,
+    isPanelCollapsed,
+    isPanelExpanded,
     registerPanel,
     registerResizeHandle,
     resizePanel,
-    startDragging: (id, event) => {
-      setActiveHandleId(id);
-      if (isMouseEvent(event) || isTouchEvent(event)) {
-        const handleElement = getResizeHandle(id);
-        initialDragStateRef.current = {
-          dragHandleRect: handleElement.getBoundingClientRect(),
-          dragOffset: getDragOffset(event, id, direction),
-          sizes: committedValuesRef.current.sizes
-        };
-      }
-    },
-    stopDragging: () => {
-      resetGlobalCursorStyle();
-      setActiveHandleId(null);
-      initialDragStateRef.current = null;
-    },
-    units,
+    startDragging,
+    stopDragging,
     unregisterPanel
-  }), [activeHandleId, collapsePanel, direction, expandPanel, getPanelSize, getPanelStyle, groupId, registerPanel, registerResizeHandle, resizePanel, units, unregisterPanel]);
+  }), [collapsePanel, dragState, direction, expandPanel, getPanelSize, getPanelStyle, groupId, isPanelCollapsed, isPanelExpanded, registerPanel, registerResizeHandle, resizePanel, startDragging, stopDragging, unregisterPanel]);
   const style = {
     display: "flex",
     flexDirection: direction === "horizontal" ? "row" : "column",
@@ -1549,20 +1683,20 @@ function PanelGroupWithForwardedRef({
     width: "100%"
   };
   return createElement(PanelGroupContext.Provider, {
-    children: createElement(Type, {
-      children,
-      className: classNameFromProps,
-      "data-panel-group": "",
-      "data-panel-group-direction": direction,
-      "data-panel-group-id": groupId,
-      "data-panel-group-units": units,
-      style: {
-        ...style,
-        ...styleFromProps
-      }
-    }),
     value: context
-  });
+  }, createElement(Type, {
+    children,
+    className: classNameFromProps,
+    style: {
+      ...style,
+      ...styleFromProps
+    },
+    // CSS selectors
+    "data-panel-group": "",
+    // e2e test attributes
+    "data-panel-group-direction": undefined,
+    "data-panel-group-id": undefined
+  }));
 }
 const PanelGroup = forwardRef((props, ref) => createElement(PanelGroupWithForwardedRef, {
   ...props,
@@ -1570,6 +1704,77 @@ const PanelGroup = forwardRef((props, ref) => createElement(PanelGroupWithForwar
 }));
 PanelGroupWithForwardedRef.displayName = "PanelGroup";
 PanelGroup.displayName = "forwardRef(PanelGroup)";
+function panelDataHelper(groupId, panelDataArray, panelData, layout) {
+  const panelConstraintsArray = panelDataArray.map(panelData => panelData.constraints);
+  const panelIndex = panelDataArray.indexOf(panelData);
+  const panelConstraints = panelConstraintsArray[panelIndex];
+  const groupSizePixels = calculateAvailablePanelSizeInPixels(groupId);
+  const percentagePanelConstraints = computePercentagePanelConstraints(panelConstraintsArray, panelIndex, groupSizePixels);
+  const isLastPanel = panelIndex === panelDataArray.length - 1;
+  const pivotIndices = isLastPanel ? [panelIndex - 1, panelIndex] : [panelIndex, panelIndex + 1];
+  const panelSizePercentage = layout[panelIndex];
+  const panelSizePixels = convertPercentageToPixels(panelSizePercentage, groupSizePixels);
+  return {
+    ...percentagePanelConstraints,
+    collapsible: panelConstraints.collapsible,
+    panelSizePercentage,
+    panelSizePixels,
+    groupSizePixels,
+    pivotIndices
+  };
+}
+
+// https://www.w3.org/WAI/ARIA/apg/patterns/windowsplitter/
+
+function useWindowSplitterResizeHandlerBehavior({
+  disabled,
+  handleId,
+  resizeHandler
+}) {
+  useEffect(() => {
+    if (disabled || resizeHandler == null) {
+      return;
+    }
+    const handleElement = getResizeHandleElement(handleId);
+    if (handleElement == null) {
+      return;
+    }
+    const onKeyDown = event => {
+      if (event.defaultPrevented) {
+        return;
+      }
+      switch (event.key) {
+        case "ArrowDown":
+        case "ArrowLeft":
+        case "ArrowRight":
+        case "ArrowUp":
+        case "End":
+        case "Home":
+          {
+            event.preventDefault();
+            resizeHandler(event);
+            break;
+          }
+        case "F6":
+          {
+            event.preventDefault();
+            const groupId = handleElement.getAttribute("data-panel-group-id");
+            const handles = getResizeHandleElementsForGroup(groupId);
+            const index = getResizeHandleElementIndex(groupId, handleId);
+            assert(index !== null);
+            const nextIndex = event.shiftKey ? index > 0 ? index - 1 : handles.length - 1 : index + 1 < handles.length ? index + 1 : 0;
+            const nextHandle = handles[nextIndex];
+            nextHandle.focus();
+            break;
+          }
+      }
+    };
+    handleElement.addEventListener("keydown", onKeyDown);
+    return () => {
+      handleElement.removeEventListener("keydown", onKeyDown);
+    };
+  }, [disabled, handleId, resizeHandler]);
+}
 
 function PanelResizeHandle({
   children = null,
@@ -1594,15 +1799,15 @@ function PanelResizeHandle({
     throw Error(`PanelResizeHandle components must be rendered within a PanelGroup container`);
   }
   const {
-    activeHandleId,
     direction,
+    dragState,
     groupId,
     registerResizeHandle,
     startDragging,
     stopDragging
   } = panelGroupContext;
   const resizeHandleId = useUniqueId(idFromProps);
-  const isDragging = activeHandleId === resizeHandleId;
+  const isDragging = dragState?.dragHandleId === resizeHandleId;
   const [isFocused, setIsFocused] = useState(false);
   const [resizeHandler, setResizeHandler] = useState(null);
   const stopDraggingAndBlur = useCallback(() => {
@@ -1666,6 +1871,8 @@ function PanelResizeHandle({
   return createElement(Type, {
     children,
     className: classNameFromProps,
+    // CSS selectors
+    "data-resize-handle": "",
     "data-resize-handle-active": isDragging ? "pointer" : isFocused ? "keyboard" : undefined,
     "data-panel-group-direction": direction,
     "data-panel-group-id": groupId,
@@ -1708,4 +1915,3 @@ PanelResizeHandle.displayName = "PanelResizeHandle";
 exports.Panel = Panel;
 exports.PanelGroup = PanelGroup;
 exports.PanelResizeHandle = PanelResizeHandle;
-exports.getAvailableGroupSizePixels = getAvailableGroupSizePixels;