@darajs/core 1.10.2 → 1.10.3

package/dist/umd/dara.core.umd.js

@@ -17360,6 +17360,15 @@ var __privateWrapper = (obj, member, setter, getter) => ({
   function isTableElement$1(element) {
     return ["table", "td", "th"].includes(getNodeName$1(element));
   }
+  function isTopLayer(element) {
+    return [":popover-open", ":modal"].some((selector2) => {
+      try {
+        return element.matches(selector2);
+      } catch (e3) {
+        return false;
+      }
+    });
+  }
   function isContainingBlock(element) {
     const webkit = isWebKit();
     const css2 = getComputedStyle$2(element);
@@ -17368,6 +17377,9 @@ var __privateWrapper = (obj, member, setter, getter) => ({
   function getContainingBlock$1(element) {
     let currentNode = getParentNode$1(element);
     while (isHTMLElement$1(currentNode) && !isLastTraversableNode(currentNode)) {
+      if (isTopLayer(currentNode)) {
+        return null;
+      }
       if (isContainingBlock(currentNode)) {
         return currentNode;
       }
@@ -17992,10 +18004,12 @@ var __privateWrapper = (obj, member, setter, getter) => ({
           return {};
         }
         const side = getSide(placement);
+        const initialSideAxis = getSideAxis(initialPlacement);
         const isBasePlacement = getSide(initialPlacement) === initialPlacement;
         const rtl = await (platform2.isRTL == null ? void 0 : platform2.isRTL(elements.floating));
         const fallbackPlacements = specifiedFallbackPlacements || (isBasePlacement || !flipAlignment ? [getOppositePlacement$1(initialPlacement)] : getExpandedPlacements(initialPlacement));
-        if (!specifiedFallbackPlacements && fallbackAxisSideDirection !== "none") {
+        const hasFallbackAxisSideDirection = fallbackAxisSideDirection !== "none";
+        if (!specifiedFallbackPlacements && hasFallbackAxisSideDirection) {
           fallbackPlacements.push(...getOppositeAxisPlacements(initialPlacement, flipAlignment, fallbackAxisSideDirection, rtl));
         }
         const placements2 = [initialPlacement, ...fallbackPlacements];
@@ -18032,8 +18046,14 @@ var __privateWrapper = (obj, member, setter, getter) => ({
           if (!resetPlacement) {
             switch (fallbackStrategy) {
               case "bestFit": {
-                var _overflowsData$map$so;
-                const placement2 = (_overflowsData$map$so = overflowsData.map((d2) => [d2.placement, d2.overflows.filter((overflow2) => overflow2 > 0).reduce((acc, overflow2) => acc + overflow2, 0)]).sort((a2, b2) => a2[1] - b2[1])[0]) == null ? void 0 : _overflowsData$map$so[0];
+                var _overflowsData$filter2;
+                const placement2 = (_overflowsData$filter2 = overflowsData.filter((d2) => {
+                  if (hasFallbackAxisSideDirection) {
+                    const currentSideAxis = getSideAxis(d2.placement);
+                    return currentSideAxis === initialSideAxis || currentSideAxis === "y";
+                  }
+                  return true;
+                }).map((d2) => [d2.placement, d2.overflows.filter((overflow2) => overflow2 > 0).reduce((acc, overflow2) => acc + overflow2, 0)]).sort((a2, b2) => a2[1] - b2[1])[0]) == null ? void 0 : _overflowsData$filter2[0];
                 if (placement2) {
                   resetPlacement = placement2;
                 }
@@ -18628,16 +18648,6 @@ var __privateWrapper = (obj, member, setter, getter) => ({
       y: y2
     });
   }
-  const topLayerSelectors = [":popover-open", ":modal"];
-  function isTopLayer(element) {
-    return topLayerSelectors.some((selector2) => {
-      try {
-        return element.matches(selector2);
-      } catch (e3) {
-        return false;
-      }
-    });
-  }
   function convertOffsetParentRelativeRectToViewportRelativeRect(_ref2) {
     let {
       elements,
@@ -19421,78 +19431,73 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     } = props;
     const pointerTypeRef = React__namespace.useRef();
     const didKeyDownRef = React__namespace.useRef(false);
-    return React__namespace.useMemo(() => {
-      if (!enabled)
-        return {};
-      return {
-        reference: {
-          onPointerDown(event) {
-            pointerTypeRef.current = event.pointerType;
-          },
-          onMouseDown(event) {
-            if (event.button !== 0) {
-              return;
-            }
-            if (isMouseLikePointerType(pointerTypeRef.current, true) && ignoreMouse) {
-              return;
-            }
-            if (eventOption === "click") {
-              return;
-            }
-            if (open2 && toggle && (dataRef.current.openEvent ? dataRef.current.openEvent.type === "mousedown" : true)) {
-              onOpenChange(false, event.nativeEvent, "click");
-            } else {
-              event.preventDefault();
-              onOpenChange(true, event.nativeEvent, "click");
-            }
-          },
-          onClick(event) {
-            if (eventOption === "mousedown" && pointerTypeRef.current) {
-              pointerTypeRef.current = void 0;
-              return;
-            }
-            if (isMouseLikePointerType(pointerTypeRef.current, true) && ignoreMouse) {
-              return;
-            }
-            if (open2 && toggle && (dataRef.current.openEvent ? dataRef.current.openEvent.type === "click" : true)) {
-              onOpenChange(false, event.nativeEvent, "click");
-            } else {
-              onOpenChange(true, event.nativeEvent, "click");
-            }
-          },
-          onKeyDown(event) {
-            pointerTypeRef.current = void 0;
-            if (event.defaultPrevented || !keyboardHandlers || isButtonTarget(event)) {
-              return;
-            }
-            if (event.key === " " && !isSpaceIgnored(domReference)) {
-              event.preventDefault();
-              didKeyDownRef.current = true;
-            }
-            if (event.key === "Enter") {
-              if (open2 && toggle) {
-                onOpenChange(false, event.nativeEvent, "click");
-              } else {
-                onOpenChange(true, event.nativeEvent, "click");
-              }
-            }
-          },
-          onKeyUp(event) {
-            if (event.defaultPrevented || !keyboardHandlers || isButtonTarget(event) || isSpaceIgnored(domReference)) {
-              return;
-            }
-            if (event.key === " " && didKeyDownRef.current) {
-              didKeyDownRef.current = false;
-              if (open2 && toggle) {
-                onOpenChange(false, event.nativeEvent, "click");
-              } else {
-                onOpenChange(true, event.nativeEvent, "click");
-              }
-            }
+    const reference2 = React__namespace.useMemo(() => ({
+      onPointerDown(event) {
+        pointerTypeRef.current = event.pointerType;
+      },
+      onMouseDown(event) {
+        const pointerType = pointerTypeRef.current;
+        if (event.button !== 0)
+          return;
+        if (eventOption === "click")
+          return;
+        if (isMouseLikePointerType(pointerType, true) && ignoreMouse)
+          return;
+        if (open2 && toggle && (dataRef.current.openEvent ? dataRef.current.openEvent.type === "mousedown" : true)) {
+          onOpenChange(false, event.nativeEvent, "click");
+        } else {
+          event.preventDefault();
+          onOpenChange(true, event.nativeEvent, "click");
+        }
+      },
+      onClick(event) {
+        const pointerType = pointerTypeRef.current;
+        if (eventOption === "mousedown" && pointerTypeRef.current) {
+          pointerTypeRef.current = void 0;
+          return;
+        }
+        if (isMouseLikePointerType(pointerType, true) && ignoreMouse)
+          return;
+        if (open2 && toggle && (dataRef.current.openEvent ? dataRef.current.openEvent.type === "click" : true)) {
+          onOpenChange(false, event.nativeEvent, "click");
+        } else {
+          onOpenChange(true, event.nativeEvent, "click");
+        }
+      },
+      onKeyDown(event) {
+        pointerTypeRef.current = void 0;
+        if (event.defaultPrevented || !keyboardHandlers || isButtonTarget(event)) {
+          return;
+        }
+        if (event.key === " " && !isSpaceIgnored(domReference)) {
+          event.preventDefault();
+          didKeyDownRef.current = true;
+        }
+        if (event.key === "Enter") {
+          if (open2 && toggle) {
+            onOpenChange(false, event.nativeEvent, "click");
+          } else {
+            onOpenChange(true, event.nativeEvent, "click");
           }
         }
-      };
-    }, [enabled, dataRef, eventOption, ignoreMouse, keyboardHandlers, domReference, toggle, open2, onOpenChange]);
+      },
+      onKeyUp(event) {
+        if (event.defaultPrevented || !keyboardHandlers || isButtonTarget(event) || isSpaceIgnored(domReference)) {
+          return;
+        }
+        if (event.key === " " && didKeyDownRef.current) {
+          didKeyDownRef.current = false;
+          if (open2 && toggle) {
+            onOpenChange(false, event.nativeEvent, "click");
+          } else {
+            onOpenChange(true, event.nativeEvent, "click");
+          }
+        }
+      }
+    }), [dataRef, domReference, eventOption, ignoreMouse, keyboardHandlers, onOpenChange, open2, toggle]);
+    return React__namespace.useMemo(() => enabled ? {
+      reference: reference2
+    } : {}, [enabled, reference2]);
   }
   const bubbleHandlerKeys = {
     pointerdown: "onPointerDown",
@@ -19518,11 +19523,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     const {
       open: open2,
       onOpenChange,
-      elements: {
-        reference: reference2,
-        domReference,
-        floating
-      },
+      elements,
       dataRef
     } = context2;
     const {
@@ -19600,7 +19601,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
       }
       const target = getTarget(event);
       const inertSelector = "[" + createAttribute("inert") + "]";
-      const markers = getDocument(floating).querySelectorAll(inertSelector);
+      const markers = getDocument(elements.floating).querySelectorAll(inertSelector);
       let targetRootAncestor = isElement$3(target) ? target : null;
       while (targetRootAncestor && !isLastTraversableNode(targetRootAncestor)) {
         const nextParent = getParentNode$1(targetRootAncestor);
@@ -19609,7 +19610,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
         }
         targetRootAncestor = nextParent;
       }
-      if (markers.length && isElement$3(target) && !isRootElement(target) && !contains$1(target, floating) && Array.from(markers).every((marker) => !contains$1(targetRootAncestor, marker))) {
+      if (markers.length && isElement$3(target) && !isRootElement(target) && !contains$1(target, elements.floating) && Array.from(markers).every((marker) => !contains$1(targetRootAncestor, marker))) {
         return;
       }
       if (isHTMLElement$1(target) && floating) {
@@ -19631,7 +19632,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
         var _node$context;
         return isEventTargetWithin(event, (_node$context = node.context) == null ? void 0 : _node$context.elements.floating);
       });
-      if (isEventTargetWithin(event, floating) || isEventTargetWithin(event, domReference) || targetIsInsideChildren) {
+      if (isEventTargetWithin(event, elements.floating) || isEventTargetWithin(event, elements.domReference) || targetIsInsideChildren) {
         return;
       }
       const children = tree ? getChildren$2(tree.nodesRef.current, nodeId) : [];
@@ -19668,19 +19669,19 @@ var __privateWrapper = (obj, member, setter, getter) => ({
       function onScroll(event) {
         onOpenChange(false, event, "ancestor-scroll");
       }
-      const doc = getDocument(floating);
+      const doc = getDocument(elements.floating);
       escapeKey && doc.addEventListener("keydown", escapeKeyCapture ? closeOnEscapeKeyDownCapture : closeOnEscapeKeyDown, escapeKeyCapture);
       outsidePress && doc.addEventListener(outsidePressEvent, outsidePressCapture ? closeOnPressOutsideCapture : closeOnPressOutside, outsidePressCapture);
       let ancestors = [];
       if (ancestorScroll) {
-        if (isElement$3(domReference)) {
-          ancestors = getOverflowAncestors(domReference);
+        if (isElement$3(elements.domReference)) {
+          ancestors = getOverflowAncestors(elements.domReference);
         }
-        if (isElement$3(floating)) {
-          ancestors = ancestors.concat(getOverflowAncestors(floating));
+        if (isElement$3(elements.floating)) {
+          ancestors = ancestors.concat(getOverflowAncestors(elements.floating));
         }
-        if (!isElement$3(reference2) && reference2 && reference2.contextElement) {
-          ancestors = ancestors.concat(getOverflowAncestors(reference2.contextElement));
+        if (!isElement$3(elements.reference) && elements.reference && elements.reference.contextElement) {
+          ancestors = ancestors.concat(getOverflowAncestors(elements.reference.contextElement));
         }
       }
       ancestors = ancestors.filter((ancestor) => {
@@ -19699,37 +19700,34 @@ var __privateWrapper = (obj, member, setter, getter) => ({
           ancestor.removeEventListener("scroll", onScroll);
         });
       };
-    }, [dataRef, floating, domReference, reference2, escapeKey, outsidePress, outsidePressEvent, open2, onOpenChange, ancestorScroll, enabled, escapeKeyBubbles, outsidePressBubbles, closeOnEscapeKeyDown, escapeKeyCapture, closeOnEscapeKeyDownCapture, closeOnPressOutside, outsidePressCapture, closeOnPressOutsideCapture]);
+    }, [dataRef, elements, escapeKey, outsidePress, outsidePressEvent, open2, onOpenChange, ancestorScroll, enabled, escapeKeyBubbles, outsidePressBubbles, closeOnEscapeKeyDown, escapeKeyCapture, closeOnEscapeKeyDownCapture, closeOnPressOutside, outsidePressCapture, closeOnPressOutsideCapture]);
     React__namespace.useEffect(() => {
       insideReactTreeRef.current = false;
     }, [outsidePress, outsidePressEvent]);
-    return React__namespace.useMemo(() => {
-      if (!enabled) {
-        return {};
+    const reference2 = React__namespace.useMemo(() => ({
+      onKeyDown: closeOnEscapeKeyDown,
+      [bubbleHandlerKeys[referencePressEvent]]: (event) => {
+        if (referencePress) {
+          onOpenChange(false, event.nativeEvent, "reference-press");
+        }
+      }
+    }), [closeOnEscapeKeyDown, onOpenChange, referencePress, referencePressEvent]);
+    const floating = React__namespace.useMemo(() => ({
+      onKeyDown: closeOnEscapeKeyDown,
+      onMouseDown() {
+        endedOrStartedInsideRef.current = true;
+      },
+      onMouseUp() {
+        endedOrStartedInsideRef.current = true;
+      },
+      [captureHandlerKeys[outsidePressEvent]]: () => {
+        insideReactTreeRef.current = true;
       }
-      return {
-        reference: {
-          onKeyDown: closeOnEscapeKeyDown,
-          [bubbleHandlerKeys[referencePressEvent]]: (event) => {
-            if (referencePress) {
-              onOpenChange(false, event.nativeEvent, "reference-press");
-            }
-          }
-        },
-        floating: {
-          onKeyDown: closeOnEscapeKeyDown,
-          onMouseDown() {
-            endedOrStartedInsideRef.current = true;
-          },
-          onMouseUp() {
-            endedOrStartedInsideRef.current = true;
-          },
-          [captureHandlerKeys[outsidePressEvent]]: () => {
-            insideReactTreeRef.current = true;
-          }
-        }
-      };
-    }, [enabled, referencePress, outsidePressEvent, referencePressEvent, onOpenChange, closeOnEscapeKeyDown]);
+    }), [closeOnEscapeKeyDown, outsidePressEvent]);
+    return React__namespace.useMemo(() => enabled ? {
+      reference: reference2,
+      floating
+    } : {}, [enabled, reference2, floating]);
   }
   function useFloatingRootContext(options) {
     const {
@@ -19916,18 +19914,20 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     if (propsList === void 0) {
       propsList = [];
     }
-    const deps = propsList;
+    const referenceDeps = propsList.map((key) => key == null ? void 0 : key.reference);
+    const floatingDeps = propsList.map((key) => key == null ? void 0 : key.floating);
+    const itemDeps = propsList.map((key) => key == null ? void 0 : key.item);
     const getReferenceProps = React__namespace.useCallback(
       (userProps) => mergeProps(userProps, propsList, "reference"),
-      deps
+      referenceDeps
     );
     const getFloatingProps = React__namespace.useCallback(
       (userProps) => mergeProps(userProps, propsList, "floating"),
-      deps
+      floatingDeps
     );
     const getItemProps = React__namespace.useCallback(
       (userProps) => mergeProps(userProps, propsList, "item"),
-      propsList.map((key) => key == null ? void 0 : key.item)
+      itemDeps
     );
     return React__namespace.useMemo(() => ({
       getReferenceProps,
@@ -19953,9 +19953,34 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     const referenceId = useId();
     const parentId = useFloatingParentNodeId();
     const isNested = parentId != null;
-    return React__namespace.useMemo(() => {
-      if (!enabled)
-        return {};
+    const reference2 = React__namespace.useMemo(() => {
+      if (ariaRole === "tooltip" || role === "label") {
+        return {
+          ["aria-" + (role === "label" ? "labelledby" : "describedby")]: open2 ? floatingId : void 0
+        };
+      }
+      return {
+        "aria-expanded": open2 ? "true" : "false",
+        "aria-haspopup": ariaRole === "alertdialog" ? "dialog" : ariaRole,
+        "aria-controls": open2 ? floatingId : void 0,
+        ...ariaRole === "listbox" && {
+          role: "combobox"
+        },
+        ...ariaRole === "menu" && {
+          id: referenceId
+        },
+        ...ariaRole === "menu" && isNested && {
+          role: "menuitem"
+        },
+        ...role === "select" && {
+          "aria-autocomplete": "none"
+        },
+        ...role === "combobox" && {
+          "aria-autocomplete": "list"
+        }
+      };
+    }, [ariaRole, floatingId, isNested, open2, referenceId, role]);
+    const floating = React__namespace.useMemo(() => {
       const floatingProps = {
         id: floatingId,
         ...ariaRole && {
@@ -19963,70 +19988,48 @@ var __privateWrapper = (obj, member, setter, getter) => ({
         }
       };
       if (ariaRole === "tooltip" || role === "label") {
-        return {
-          reference: {
-            ["aria-" + (role === "label" ? "labelledby" : "describedby")]: open2 ? floatingId : void 0
-          },
-          floating: floatingProps
-        };
+        return floatingProps;
       }
       return {
-        reference: {
-          "aria-expanded": open2 ? "true" : "false",
-          "aria-haspopup": ariaRole === "alertdialog" ? "dialog" : ariaRole,
-          "aria-controls": open2 ? floatingId : void 0,
-          ...ariaRole === "listbox" && {
-            role: "combobox"
-          },
-          ...ariaRole === "menu" && {
-            id: referenceId
-          },
-          ...ariaRole === "menu" && isNested && {
-            role: "menuitem"
-          },
-          ...role === "select" && {
-            "aria-autocomplete": "none"
-          },
-          ...role === "combobox" && {
-            "aria-autocomplete": "list"
-          }
-        },
-        floating: {
-          ...floatingProps,
-          ...ariaRole === "menu" && {
-            "aria-labelledby": referenceId
-          }
-        },
-        item(_ref2) {
-          let {
-            active,
-            selected
-          } = _ref2;
-          const commonProps = {
-            role: "option",
+        ...floatingProps,
+        ...ariaRole === "menu" && {
+          "aria-labelledby": referenceId
+        }
+      };
+    }, [ariaRole, floatingId, referenceId, role]);
+    const item = React__namespace.useCallback((_ref2) => {
+      let {
+        active,
+        selected
+      } = _ref2;
+      const commonProps = {
+        role: "option",
+        ...active && {
+          id: floatingId + "-option"
+        }
+      };
+      switch (role) {
+        case "select":
+          return {
+            ...commonProps,
+            "aria-selected": active && selected
+          };
+        case "combobox": {
+          return {
+            ...commonProps,
             ...active && {
-              id: floatingId + "-option"
+              "aria-selected": true
             }
           };
-          switch (role) {
-            case "select":
-              return {
-                ...commonProps,
-                "aria-selected": active && selected
-              };
-            case "combobox": {
-              return {
-                ...commonProps,
-                ...active && {
-                  "aria-selected": true
-                }
-              };
-            }
-          }
-          return {};
         }
-      };
-    }, [enabled, role, ariaRole, open2, floatingId, referenceId, isNested]);
+      }
+      return {};
+    }, [floatingId, role]);
+    return React__namespace.useMemo(() => enabled ? {
+      reference: reference2,
+      floating,
+      item
+    } : {}, [enabled, reference2, floating, item]);
   }
   const matchWidthToReference = (delta = 0) => size$1({
     apply({ rects, elements }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darajs/core",
-  "version": "1.10.2",
+  "version": "1.10.3",
   "description": "Dara Framework core",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -37,9 +37,9 @@
     "@babel/preset-env": "^7.23.0",
     "@babel/preset-react": "^7.22.15",
     "@babel/preset-typescript": "^7.23.0",
-    "@darajs/eslint-config": "~1.10.0",
-    "@darajs/prettier-config": "~1.10.0",
-    "@darajs/stylelint-config": "~1.10.0",
+    "@darajs/eslint-config": "~1.10.2",
+    "@darajs/prettier-config": "~1.10.2",
+    "@darajs/stylelint-config": "~1.10.2",
     "@rollup/plugin-inject": "^4.0.4",
     "@testing-library/dom": "^9.3.0",
     "@testing-library/jest-dom": "^5.16.5",
@@ -79,10 +79,10 @@
     "whatwg-fetch": "^3.6.2"
   },
   "dependencies": {
-    "@darajs/styled-components": "~1.10.0",
-    "@darajs/ui-components": "~1.10.0",
-    "@darajs/ui-notifications": "~1.10.0",
-    "@darajs/ui-utils": "~1.10.0",
+    "@darajs/styled-components": "~1.10.2",
+    "@darajs/ui-components": "~1.10.2",
+    "@darajs/ui-notifications": "~1.10.2",
+    "@darajs/ui-utils": "~1.10.2",
     "@fortawesome/fontawesome-free": "~6.4.0",
     "@recoiljs/refine": "^0.1.1",
     "@tanstack/query-core": "^4.0.0",
@@ -118,5 +118,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b202900e7ed991a58945cdf936ca0e14758418f2"
+  "gitHead": "7d528d1d369b25f98e3f34cd34900105b34b020d"
 }