react-resizable-panels 2.1.7 → 2.1.9

package/dist/react-resizable-panels.node.cjs.mjs

@@ -1,4 +1,5 @@
 export {
+  DATA_ATTRIBUTES,
   Panel,
   PanelGroup,
   PanelResizeHandle,

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

@@ -1,32 +1,28 @@
 import * as React from 'react';
-
-// This module exists to work around Webpack issue https://github.com/webpack/webpack/issues/14814
-
-// eslint-disable-next-line no-restricted-imports
-
-const {
-  createElement,
-  createContext,
-  createRef,
-  forwardRef,
-  useCallback,
-  useContext,
-  useEffect,
-  useImperativeHandle,
-  useLayoutEffect,
-  useMemo,
-  useRef,
-  useState
-} = React;
-
-// `Math.random()` and `.slice(0, 5)` prevents bundlers from trying to `import { useId } from 'react'`
-const useId = React[`useId${Math.random()}`.slice(0, 5)];
+import { createContext, useRef, forwardRef, createElement, useContext, useImperativeHandle, useState, useCallback, useEffect, useMemo } from 'react';
 
 // The "contextmenu" event is not supported as a PointerEvent in all browsers yet, so MouseEvent still need to be handled
 
 const PanelGroupContext = createContext(null);
 PanelGroupContext.displayName = "PanelGroupContext";
 
+const DATA_ATTRIBUTES = {
+  group: "data-panel-group",
+  groupDirection: "data-panel-group-direction",
+  groupId: "data-panel-group-id",
+  panel: "data-panel",
+  panelCollapsible: "data-panel-collapsible",
+  panelId: "data-panel-id",
+  panelSize: "data-panel-size",
+  resizeHandle: "data-resize-handle",
+  resizeHandleActive: "data-resize-handle-active",
+  resizeHandleEnabled: "data-panel-resize-handle-enabled",
+  resizeHandleId: "data-panel-resize-handle-id",
+  resizeHandleState: "data-resize-handle-state"
+};
+const PRECISION = 10;
+
+const useId = React["useId".toString()];
 const wrappedUseId = typeof useId === "function" ? useId : () => null;
 let counter = 0;
 function useUniqueId(idFromParams = null) {
@@ -121,17 +117,17 @@ function PanelWithForwardedRef({
     ...rest,
     children,
     className: classNameFromProps,
-    id: idFromProps,
+    id: panelId,
     style: {
       ...style,
       ...styleFromProps
     },
     // CSS selectors
-    "data-panel": "",
-    "data-panel-collapsible": collapsible || undefined,
-    "data-panel-group-id": groupId,
-    "data-panel-id": panelId,
-    "data-panel-size": parseFloat("" + style.flexGrow).toFixed(1)
+    [DATA_ATTRIBUTES.groupId]: groupId,
+    [DATA_ATTRIBUTES.panel]: "",
+    [DATA_ATTRIBUTES.panelCollapsible]: collapsible || undefined,
+    [DATA_ATTRIBUTES.panelId]: panelId,
+    [DATA_ATTRIBUTES.panelSize]: parseFloat("" + style.flexGrow).toFixed(1)
   });
 }
 const Panel = forwardRef((props, ref) => createElement(PanelWithForwardedRef, {
@@ -151,6 +147,7 @@ function setNonce(value) {
 
 let currentCursorStyle = null;
 let enabled = true;
+let prevRuleIndex = -1;
 let styleElement = null;
 function disableGlobalCursorStyles() {
   enabled = false;
@@ -200,9 +197,11 @@ function resetGlobalCursorStyle() {
     document.head.removeChild(styleElement);
     currentCursorStyle = null;
     styleElement = null;
+    prevRuleIndex = -1;
   }
 }
 function setGlobalCursorStyle(state, constraintFlags) {
+  var _styleElement$sheet$i, _styleElement$sheet2;
   if (!enabled) {
     return;
   }
@@ -219,7 +218,11 @@ function setGlobalCursorStyle(state, constraintFlags) {
     }
     document.head.appendChild(styleElement);
   }
-  styleElement.innerHTML = `*{cursor: ${style}!important;}`;
+  if (prevRuleIndex >= 0) {
+    var _styleElement$sheet;
+    (_styleElement$sheet = styleElement.sheet) === null || _styleElement$sheet === void 0 ? void 0 : _styleElement$sheet.removeRule(prevRuleIndex);
+  }
+  prevRuleIndex = (_styleElement$sheet$i = (_styleElement$sheet2 = styleElement.sheet) === null || _styleElement$sheet2 === void 0 ? void 0 : _styleElement$sheet2.insertRule(`*{cursor: ${style} !important;}`)) !== null && _styleElement$sheet$i !== void 0 ? _styleElement$sheet$i : -1;
 }
 
 function isKeyDown(event) {
@@ -450,7 +453,9 @@ function handlePointerDown(event) {
   if (intersectingHandles.length > 0) {
     updateResizeHandlerStates("down", event);
     event.preventDefault();
-    event.stopPropagation();
+    if (!isWithinResizeHandle(target)) {
+      event.stopImmediatePropagation();
+    }
   }
 }
 function handlePointerMove(event) {
@@ -499,6 +504,9 @@ function handlePointerUp(event) {
   isPointerDown = false;
   if (intersectingHandles.length > 0) {
     event.preventDefault();
+    if (!isWithinResizeHandle(target)) {
+      event.stopImmediatePropagation();
+    }
   }
   updateResizeHandlerStates("up", event);
   recalculateIntersectingHandles({
@@ -509,6 +517,16 @@ function handlePointerUp(event) {
   updateCursor();
   updateListeners();
 }
+function isWithinResizeHandle(element) {
+  let currentElement = element;
+  while (currentElement) {
+    if (currentElement.hasAttribute(DATA_ATTRIBUTES.resizeHandle)) {
+      return true;
+    }
+    currentElement = currentElement.parentElement;
+  }
+  return false;
+}
 function recalculateIntersectingHandles({
   target,
   x,
@@ -600,47 +618,42 @@ function updateCursor() {
     resetGlobalCursorStyle();
   }
 }
+let listenersAbortController = new AbortController();
 function updateListeners() {
-  ownerDocumentCounts.forEach((_, ownerDocument) => {
-    const {
-      body
-    } = ownerDocument;
-    body.removeEventListener("contextmenu", handlePointerUp);
-    body.removeEventListener("pointerdown", handlePointerDown);
-    body.removeEventListener("pointerleave", handlePointerMove);
-    body.removeEventListener("pointermove", handlePointerMove);
-  });
-  window.removeEventListener("pointerup", handlePointerUp);
-  window.removeEventListener("pointercancel", handlePointerUp);
-  if (registeredResizeHandlers.size > 0) {
-    if (isPointerDown) {
-      if (intersectingHandles.length > 0) {
-        ownerDocumentCounts.forEach((count, ownerDocument) => {
-          const {
-            body
-          } = ownerDocument;
-          if (count > 0) {
-            body.addEventListener("contextmenu", handlePointerUp);
-            body.addEventListener("pointerleave", handlePointerMove);
-            body.addEventListener("pointermove", handlePointerMove);
-          }
-        });
-      }
-      window.addEventListener("pointerup", handlePointerUp);
-      window.addEventListener("pointercancel", handlePointerUp);
-    } else {
+  listenersAbortController.abort();
+  listenersAbortController = new AbortController();
+  const options = {
+    capture: true,
+    signal: listenersAbortController.signal
+  };
+  if (!registeredResizeHandlers.size) {
+    return;
+  }
+  if (isPointerDown) {
+    if (intersectingHandles.length > 0) {
       ownerDocumentCounts.forEach((count, ownerDocument) => {
         const {
           body
         } = ownerDocument;
         if (count > 0) {
-          body.addEventListener("pointerdown", handlePointerDown, {
-            capture: true
-          });
-          body.addEventListener("pointermove", handlePointerMove);
+          body.addEventListener("contextmenu", handlePointerUp, options);
+          body.addEventListener("pointerleave", handlePointerMove, options);
+          body.addEventListener("pointermove", handlePointerMove, options);
         }
       });
     }
+    window.addEventListener("pointerup", handlePointerUp, options);
+    window.addEventListener("pointercancel", handlePointerUp, options);
+  } else {
+    ownerDocumentCounts.forEach((count, ownerDocument) => {
+      const {
+        body
+      } = ownerDocument;
+      if (count > 0) {
+        body.addEventListener("pointerdown", handlePointerDown, options);
+        body.addEventListener("pointermove", handlePointerMove, options);
+      }
+    });
   }
 }
 function updateResizeHandlerStates(action, event) {
@@ -665,8 +678,6 @@ function assert(expectedCondition, message) {
   }
 }
 
-const PRECISION = 10;
-
 function fuzzyCompareNumbers(actual, expected, fractionDigits = PRECISION) {
   if (actual.toFixed(fractionDigits) === expected.toFixed(fractionDigits)) {
     return 0;
@@ -971,12 +982,12 @@ function adjustLayoutByDelta({
 }
 
 function getResizeHandleElementsForGroup(groupId, scope = document) {
-  return Array.from(scope.querySelectorAll(`[data-panel-resize-handle-id][data-panel-group-id="${groupId}"]`));
+  return Array.from(scope.querySelectorAll(`[${DATA_ATTRIBUTES.resizeHandleId}][data-panel-group-id="${groupId}"]`));
 }
 
 function getResizeHandleElementIndex(groupId, id, scope = document) {
   const handles = getResizeHandleElementsForGroup(groupId, scope);
-  const index = handles.findIndex(handle => handle.getAttribute("data-panel-resize-handle-id") === id);
+  const index = handles.findIndex(handle => handle.getAttribute(DATA_ATTRIBUTES.resizeHandleId) === id);
   return index !== null && index !== void 0 ? index : null;
 }
 
@@ -1001,7 +1012,7 @@ function getPanelGroupElement(id, rootElement = document) {
 }
 
 function getResizeHandleElement(id, scope = document) {
-  const element = scope.querySelector(`[data-panel-resize-handle-id="${id}"]`);
+  const element = scope.querySelector(`[${DATA_ATTRIBUTES.resizeHandleId}="${id}"]`);
   if (element) {
     return element;
   }
@@ -1046,7 +1057,7 @@ function useWindowSplitterPanelGroupBehavior({
     const handles = getResizeHandleElementsForGroup(groupId, panelGroupElement);
     assert(handles, `No resize handles found for group id "${groupId}"`);
     const cleanupFunctions = handles.map(handle => {
-      const handleId = handle.getAttribute("data-panel-resize-handle-id");
+      const handleId = handle.getAttribute(DATA_ATTRIBUTES.resizeHandleId);
       assert(handleId, `Resize handle element has no handle id attribute`);
       const [idBefore, idAfter] = getResizeHandlePanelIds(groupId, handleId, panelDataArray, panelGroupElement);
       if (idBefore == null || idAfter == null) {
@@ -1124,7 +1135,7 @@ function calculateDragOffsetPercentage(event, dragHandleId, direction, initialDr
   const isHorizontal = direction === "horizontal";
   const handleElement = getResizeHandleElement(dragHandleId, panelGroupElement);
   assert(handleElement, `No resize handle element found for id "${dragHandleId}"`);
-  const groupId = handleElement.getAttribute("data-panel-group-id");
+  const groupId = handleElement.getAttribute(DATA_ATTRIBUTES.groupId);
   assert(groupId, `Resize handle element has no group id attribute`);
   let {
     initialCursorPosition
@@ -1929,9 +1940,9 @@ function PanelGroupWithForwardedRef({
       ...styleFromProps
     },
     // CSS selectors
-    "data-panel-group": "",
-    "data-panel-group-direction": direction,
-    "data-panel-group-id": groupId
+    [DATA_ATTRIBUTES.group]: "",
+    [DATA_ATTRIBUTES.groupDirection]: direction,
+    [DATA_ATTRIBUTES.groupId]: groupId
   }));
 }
 const PanelGroup = forwardRef((props, ref) => createElement(PanelGroupWithForwardedRef, {
@@ -1990,7 +2001,7 @@ function useWindowSplitterResizeHandlerBehavior({
         case "F6":
           {
             event.preventDefault();
-            const groupId = handleElement.getAttribute("data-panel-group-id");
+            const groupId = handleElement.getAttribute(DATA_ATTRIBUTES.groupId);
             assert(groupId, `No group element found for id "${groupId}"`);
             const handles = getResizeHandleElementsForGroup(groupId, panelGroupElement);
             const index = getResizeHandleElementIndex(groupId, handleId, panelGroupElement);
@@ -2016,8 +2027,11 @@ function PanelResizeHandle({
   hitAreaMargins,
   id: idFromProps,
   onBlur,
+  onClick,
   onDragging,
   onFocus,
+  onPointerDown,
+  onPointerUp,
   style: styleFromProps = {},
   tabIndex = 0,
   tagName: Type = "div",
@@ -2028,10 +2042,16 @@ function PanelResizeHandle({
 
   // Use a ref to guard against users passing inline props
   const callbacksRef = useRef({
-    onDragging
+    onClick,
+    onDragging,
+    onPointerDown,
+    onPointerUp
   });
   useEffect(() => {
+    callbacksRef.current.onClick = onClick;
     callbacksRef.current.onDragging = onDragging;
+    callbacksRef.current.onPointerDown = onPointerDown;
+    callbacksRef.current.onPointerUp = onPointerUp;
   });
   const panelGroupContext = useContext(PanelGroupContext);
   if (panelGroupContext === null) {
@@ -2071,49 +2091,56 @@ function PanelResizeHandle({
     }
     const element = elementRef.current;
     assert(element, "Element ref not attached");
+    let didMove = false;
     const setResizeHandlerState = (action, isActive, event) => {
-      if (isActive) {
-        switch (action) {
-          case "down":
-            {
-              setState("drag");
-              assert(event, 'Expected event to be defined for "down" action');
-              startDragging(resizeHandleId, event);
-              const {
-                onDragging
-              } = callbacksRef.current;
-              if (onDragging) {
-                onDragging(true);
-              }
-              break;
-            }
-          case "move":
-            {
-              const {
-                state
-              } = committedValuesRef.current;
-              if (state !== "drag") {
-                setState("hover");
-              }
-              assert(event, 'Expected event to be defined for "move" action');
-              resizeHandler(event);
-              break;
-            }
-          case "up":
-            {
+      if (!isActive) {
+        setState("inactive");
+        return;
+      }
+      switch (action) {
+        case "down":
+          {
+            setState("drag");
+            didMove = false;
+            assert(event, 'Expected event to be defined for "down" action');
+            startDragging(resizeHandleId, event);
+            const {
+              onDragging,
+              onPointerDown
+            } = callbacksRef.current;
+            onDragging === null || onDragging === void 0 ? void 0 : onDragging(true);
+            onPointerDown === null || onPointerDown === void 0 ? void 0 : onPointerDown();
+            break;
+          }
+        case "move":
+          {
+            const {
+              state
+            } = committedValuesRef.current;
+            didMove = true;
+            if (state !== "drag") {
               setState("hover");
-              stopDragging();
-              const {
-                onDragging
-              } = callbacksRef.current;
-              if (onDragging) {
-                onDragging(false);
-              }
-              break;
             }
-        }
-      } else {
-        setState("inactive");
+            assert(event, 'Expected event to be defined for "move" action');
+            resizeHandler(event);
+            break;
+          }
+        case "up":
+          {
+            setState("hover");
+            stopDragging();
+            const {
+              onClick,
+              onDragging,
+              onPointerUp
+            } = callbacksRef.current;
+            onDragging === null || onDragging === void 0 ? void 0 : onDragging(false);
+            onPointerUp === null || onPointerUp === void 0 ? void 0 : onPointerUp();
+            if (!didMove) {
+              onClick === null || onClick === void 0 ? void 0 : onClick();
+            }
+            break;
+          }
       }
     };
     return registerResizeHandle(resizeHandleId, element, direction, {
@@ -2152,13 +2179,13 @@ function PanelResizeHandle({
     },
     tabIndex,
     // CSS selectors
-    "data-panel-group-direction": direction,
-    "data-panel-group-id": groupId,
-    "data-resize-handle": "",
-    "data-resize-handle-active": state === "drag" ? "pointer" : isFocused ? "keyboard" : undefined,
-    "data-resize-handle-state": state,
-    "data-panel-resize-handle-enabled": !disabled,
-    "data-panel-resize-handle-id": resizeHandleId
+    [DATA_ATTRIBUTES.groupDirection]: direction,
+    [DATA_ATTRIBUTES.groupId]: groupId,
+    [DATA_ATTRIBUTES.resizeHandle]: "",
+    [DATA_ATTRIBUTES.resizeHandleActive]: state === "drag" ? "pointer" : isFocused ? "keyboard" : undefined,
+    [DATA_ATTRIBUTES.resizeHandleEnabled]: !disabled,
+    [DATA_ATTRIBUTES.resizeHandleId]: resizeHandleId,
+    [DATA_ATTRIBUTES.resizeHandleState]: state
   });
 }
 PanelResizeHandle.displayName = "PanelResizeHandle";
@@ -2192,4 +2219,4 @@ function getIntersectingRectangle(rectOne, rectTwo, strict) {
   };
 }
 
-export { Panel, PanelGroup, PanelResizeHandle, assert, disableGlobalCursorStyles, enableGlobalCursorStyles, getIntersectingRectangle, getPanelElement, getPanelElementsForGroup, getPanelGroupElement, getResizeHandleElement, getResizeHandleElementIndex, getResizeHandleElementsForGroup, getResizeHandlePanelIds, intersects, setNonce };
+export { DATA_ATTRIBUTES, Panel, PanelGroup, PanelResizeHandle, assert, disableGlobalCursorStyles, enableGlobalCursorStyles, getIntersectingRectangle, getPanelElement, getPanelElementsForGroup, getPanelGroupElement, getResizeHandleElement, getResizeHandleElementIndex, getResizeHandleElementsForGroup, getResizeHandlePanelIds, intersects, setNonce };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-resizable-panels",
-  "version": "2.1.7",
+  "version": "2.1.9",
   "description": "React components for resizable panel groups/layouts",
   "author": "Brian Vaughn <brian.david.vaughn@gmail.com>",
   "license": "MIT",
@@ -66,20 +66,10 @@
     }
   },
   "types": "dist/react-resizable-panels.cjs.d.ts",
-  "scripts": {
-    "clear": "pnpm run clear:builds & pnpm run clear:node_modules",
-    "clear:builds": "rm -rf ./packages/*/dist",
-    "clear:node_modules": "rm -rf ./node_modules",
-    "lint": "eslint \"src/**/*.{ts,tsx}\"",
-    "test": "jest --config=jest.config.js",
-    "test:watch": "jest --config=jest.config.js --watch",
-    "watch": "parcel watch --port=2345"
-  },
   "devDependencies": {
     "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
     "@babel/plugin-proposal-optional-chaining": "7.21.0",
     "eslint": "^8.37.0",
-    "eslint-plugin-no-restricted-imports": "^0.0.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
@@ -92,5 +82,14 @@
   },
   "browserslist": [
     "Chrome 79"
-  ]
-}
+  ],
+  "scripts": {
+    "clear": "pnpm run clear:builds & pnpm run clear:node_modules",
+    "clear:builds": "rm -rf ./packages/*/dist",
+    "clear:node_modules": "rm -rf ./node_modules",
+    "lint": "eslint \"src/**/*.{ts,tsx}\"",
+    "test": "jest --config=jest.config.js",
+    "test:watch": "jest --config=jest.config.js --watch",
+    "watch": "parcel watch --port=2345"
+  }
+}

package/dist/declarations/src/vendor/react.d.ts

@@ -1,7 +0,0 @@
-import * as React from "react";
-import type { CSSProperties, ElementType, ForwardedRef, HTMLAttributes, MouseEvent, PropsWithChildren, ReactElement, ReactNode, RefObject, TouchEvent } from "react";
-declare const createElement: typeof React.createElement, createContext: typeof React.createContext, createRef: typeof React.createRef, forwardRef: typeof React.forwardRef, useCallback: typeof React.useCallback, useContext: typeof React.useContext, useEffect: typeof React.useEffect, useImperativeHandle: typeof React.useImperativeHandle, useMemo: typeof React.useMemo, useRef: typeof React.useRef, useState: typeof React.useState;
-declare const useId: () => string;
-declare const useLayoutEffect_do_not_use_directly: typeof React.useLayoutEffect;
-export { createElement, createContext, createRef, forwardRef, useCallback, useContext, useEffect, useId, useImperativeHandle, useLayoutEffect_do_not_use_directly, useMemo, useRef, useState, };
-export type { CSSProperties, ElementType, ForwardedRef, HTMLAttributes, MouseEvent, PropsWithChildren, ReactElement, ReactNode, RefObject, TouchEvent, };