@darajs/core 1.14.2 → 1.14.4

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

@@ -18483,6 +18483,25 @@ var __privateWrapper = (obj, member, setter, getter) => ({
       y: y2
     });
   }
+  function getWindowScrollBarX$1(element, rect) {
+    const leftScroll = getNodeScroll$1(element).scrollLeft;
+    if (!rect) {
+      return getBoundingClientRect$1(getDocumentElement$1(element)).left + leftScroll;
+    }
+    return rect.left + leftScroll;
+  }
+  function getHTMLOffset(documentElement, scroll, ignoreScrollbarX) {
+    if (ignoreScrollbarX === void 0) {
+      ignoreScrollbarX = false;
+    }
+    const htmlRect = documentElement.getBoundingClientRect();
+    const x2 = htmlRect.left + scroll.scrollLeft - (ignoreScrollbarX ? 0 : getWindowScrollBarX$1(documentElement, htmlRect));
+    const y2 = htmlRect.top + scroll.scrollTop;
+    return {
+      x: x2,
+      y: y2
+    };
+  }
   function convertOffsetParentRelativeRectToViewportRelativeRect(_ref2) {
     let {
       elements,
@@ -18514,23 +18533,17 @@ var __privateWrapper = (obj, member, setter, getter) => ({
         offsets.y = offsetRect.y + offsetParent.clientTop;
       }
     }
+    const htmlOffset = documentElement && !isOffsetParentAnElement && !isFixed ? getHTMLOffset(documentElement, scroll, true) : createCoords(0);
     return {
       width: rect.width * scale.x,
       height: rect.height * scale.y,
-      x: rect.x * scale.x - scroll.scrollLeft * scale.x + offsets.x,
-      y: rect.y * scale.y - scroll.scrollTop * scale.y + offsets.y
+      x: rect.x * scale.x - scroll.scrollLeft * scale.x + offsets.x + htmlOffset.x,
+      y: rect.y * scale.y - scroll.scrollTop * scale.y + offsets.y + htmlOffset.y
     };
   }
   function getClientRects(element) {
     return Array.from(element.getClientRects());
   }
-  function getWindowScrollBarX$1(element, rect) {
-    const leftScroll = getNodeScroll$1(element).scrollLeft;
-    if (!rect) {
-      return getBoundingClientRect$1(getDocumentElement$1(element)).left + leftScroll;
-    }
-    return rect.left + leftScroll;
-  }
   function getDocumentRect$1(element) {
     const html = getDocumentElement$1(element);
     const scroll = getNodeScroll$1(element);
@@ -18600,9 +18613,10 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     } else {
       const visualOffsets = getVisualOffsets(element);
       rect = {
-        ...clippingAncestor,
         x: clippingAncestor.x - visualOffsets.x,
-        y: clippingAncestor.y - visualOffsets.y
+        y: clippingAncestor.y - visualOffsets.y,
+        width: clippingAncestor.width,
+        height: clippingAncestor.height
       };
     }
     return rectToClientRect$1(rect);
@@ -18697,15 +18711,9 @@ var __privateWrapper = (obj, member, setter, getter) => ({
         offsets.x = getWindowScrollBarX$1(documentElement);
       }
     }
-    let htmlX = 0;
-    let htmlY = 0;
-    if (documentElement && !isOffsetParentAnElement && !isFixed) {
-      const htmlRect = documentElement.getBoundingClientRect();
-      htmlY = htmlRect.top + scroll.scrollTop;
-      htmlX = htmlRect.left + scroll.scrollLeft - getWindowScrollBarX$1(documentElement, htmlRect);
-    }
-    const x2 = rect.left + scroll.scrollLeft - offsets.x - htmlX;
-    const y2 = rect.top + scroll.scrollTop - offsets.y - htmlY;
+    const htmlOffset = documentElement && !isOffsetParentAnElement && !isFixed ? getHTMLOffset(documentElement, scroll) : createCoords(0);
+    const x2 = rect.left + scroll.scrollLeft - offsets.x - htmlOffset.x;
+    const y2 = rect.top + scroll.scrollTop - offsets.y - htmlOffset.y;
     return {
       x: x2,
       y: y2,
@@ -19665,7 +19673,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     const computedElements = rootContext.elements;
     const [_domReference, setDomReference] = React__namespace.useState(null);
     const [positionReference, _setPositionReference] = React__namespace.useState(null);
-    const optionDomReference = computedElements == null ? void 0 : computedElements.reference;
+    const optionDomReference = computedElements == null ? void 0 : computedElements.domReference;
     const domReference = optionDomReference || _domReference;
     const domReferenceRef = React__namespace.useRef(null);
     const tree = useFloatingTree();
@@ -36522,6 +36530,9 @@ var __privateWrapper = (obj, member, setter, getter) => ({
 
     overflow: hidden;
 
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
     width: 100%;
     min-height: 2rem;
     padding: 0.25rem 1rem;
@@ -36566,10 +36577,16 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     border-radius: 0 0 0.25rem 0.25rem;
     outline: 0;
     box-shadow: ${(props) => props.theme.shadow.light};
+`;
+  const InnerItem = styled__default.default.span`
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
 `;
   const DropdownList = React__default.default.forwardRef(({ items, getItemProps, getFloatingProps, isOpen, getMenuProps, size: size2, style, maxItems, itemClass, className, children, selectedItem, kbdHighlightIdx }, ref) => jsxRuntime.exports.jsx(StyledDropdownList$1, Object.assign({}, getMenuProps ? getMenuProps({ ref }) : { ref }, getFloatingProps(), { isOpen, maxItems, style: Object.assign(Object.assign({}, style), { zIndex: 9999 }), className, children: !lodash$2.exports.isEmpty(items) ? items.map((item, index2) => {
     const isSelected = (selectedItem === null || selectedItem === void 0 ? void 0 : selectedItem.label) === item.label;
-    return children ? children(item, index2) : jsxRuntime.exports.jsx(ListItem$1, { getItemProps, size: size2, title: item.label, item, index: index2, itemClass, isHighlighted: isOpen && kbdHighlightIdx !== void 0 && kbdHighlightIdx === index2, isSelected, children: item.label }, `item-${index2}-${isOpen && isSelected}`);
+    return children ? children(item, index2) : jsxRuntime.exports.jsxs(ListItem$1, { getItemProps, size: size2, title: item.label, item, index: index2, itemClass, isHighlighted: isOpen && kbdHighlightIdx !== void 0 && kbdHighlightIdx === index2, isSelected, children: [jsxRuntime.exports.jsx(InnerItem, { children: item.label }), item.icon] }, `item-${index2}-${isOpen && isSelected}`);
   }) : jsxRuntime.exports.jsx(NoItemsLabel, { children: "No Items" }) })));
   DropdownList.displayName = "DropdownList";
   const DropdownList$1 = React__default.default.memo(DropdownList);
@@ -59208,7 +59225,7 @@ Inferred class string: "${iconClasses}."`
           childToRender = fallbackRender(props);
         } else if (FallbackComponent) {
           childToRender = React.createElement(FallbackComponent, props);
-        } else if (fallback === null || React.isValidElement(fallback)) {
+        } else if (fallback !== void 0) {
           childToRender = fallback;
         } else {
           throw error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darajs/core",
-  "version": "1.14.2",
+  "version": "1.14.4",
   "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.14.2",
-    "@darajs/prettier-config": "1.14.2",
-    "@darajs/stylelint-config": "1.14.2",
+    "@darajs/eslint-config": "1.14.4",
+    "@darajs/prettier-config": "1.14.4",
+    "@darajs/stylelint-config": "1.14.4",
     "@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.14.2",
-    "@darajs/ui-components": "1.14.2",
-    "@darajs/ui-notifications": "1.14.2",
-    "@darajs/ui-utils": "1.14.2",
+    "@darajs/styled-components": "1.14.4",
+    "@darajs/ui-components": "1.14.4",
+    "@darajs/ui-notifications": "1.14.4",
+    "@darajs/ui-utils": "1.14.4",
     "@fortawesome/fontawesome-free": "~6.4.0",
     "@recoiljs/refine": "^0.1.1",
     "@tanstack/query-core": "^4.0.0",
@@ -117,5 +117,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2036681dbadd1bc53cb3243abb0289a570853b2c"
+  "gitHead": "34ec04ef2339e5d34c8edbae7f3940aeedd867a7"
 }