@hitachivantara/uikit-react-core 5.106.1 → 6.0.0-next.2

package/dist/{esm/VerticalNavigation → VerticalNavigation}/TreeView/TreeViewItem.js

@@ -1,10 +1,9 @@
 import { jsx, jsxs } from "react/jsx-runtime";
-import { forwardRef, useContext, useState, useRef, useMemo, useEffect, useCallback } from "react";
+import { forwardRef, useContext, useId, useState, useRef, useMemo, useEffect, useCallback } from "react";
 import { useDefaultProps, mergeStyles } from "@hitachivantara/uikit-react-utils";
 import { useForkRef } from "../../hooks/useForkRef.js";
 import { HvIcon } from "../../icons.js";
 import { useDescendant, DescendantProvider } from "../../TreeView/internals/DescendantProvider.js";
-import { setId } from "../../utils/setId.js";
 import { VerticalNavigationContext } from "../VerticalNavigationContext.js";
 import { TreeViewControlContext, TreeViewStateContext } from "./TreeViewContext.js";
 import { useClasses } from "./TreeViewItem.styles.js";
@@ -59,6 +58,7 @@ const HvVerticalNavigationTreeViewItem = forwardRef(
     } = treeViewControlContext;
     const treeviewMode = mode === "treeview";
     let id = null;
+    const groupId = useId();
     if (idProp != null) {
       id = idProp;
     } else if (treeId && nodeId) {
@@ -266,7 +266,6 @@ const HvVerticalNavigationTreeViewItem = forwardRef(
       return /* @__PURE__ */ jsx(HvTooltip, { placement: "right", title: showTooltip && label, children: /* @__PURE__ */ jsxs(
         HvTypography,
         {
-          id: setId(id, "button"),
           component: isLink ? "a" : "div",
           ...isLink ? buttonLinkProps : null,
           ref: contentRef,
@@ -292,7 +291,7 @@ const HvVerticalNavigationTreeViewItem = forwardRef(
             onKeyDown: handleKeyDown,
             "aria-current": selectable && selected || !isOpen && isChildSelected?.(nodeId) ? href ? "page" : true : void 0,
             "aria-expanded": expandable ? expanded : void 0,
-            "aria-controls": isOpen && expandable ? setId(id, "group") : void 0,
+            "aria-controls": isOpen && expandable ? groupId : void 0,
             "aria-label": payload?.label
           },
           children: [
@@ -339,7 +338,7 @@ const HvVerticalNavigationTreeViewItem = forwardRef(
       disableTooltip,
       disabled,
       label,
-      id,
+      groupId,
       cx,
       classes.content,
       classes.link,
@@ -370,13 +369,13 @@ const HvVerticalNavigationTreeViewItem = forwardRef(
       () => children && /* @__PURE__ */ jsx(
         "ul",
         {
-          id: setId(id, "group"),
+          id: groupId,
           className: classes.group,
           role: treeviewMode ? "group" : void 0,
           children
         }
       ),
-      [children, classes?.group, id, treeviewMode]
+      [children, classes?.group, groupId, treeviewMode]
     );
     return /* @__PURE__ */ jsxs(
       "li",

package/dist/{esm/hooks → hooks}/useExpandable.js

@@ -1,19 +1,20 @@
-import { setId } from "../utils/setId.js";
+import { useId, useCallback } from "react";
 import { useControlled } from "./useControlled.js";
-import { useUniqueId } from "./useUniqueId.js";
 function useExpandable({
-  id: idProp,
   disabled,
   expanded,
   defaultExpanded
 }) {
   const [isOpen, setIsOpen] = useControlled(expanded, Boolean(defaultExpanded));
-  const id = useUniqueId(idProp);
-  const buttonId = setId(id, "button");
-  const regionId = setId(id, "container");
+  const buttonId = useId();
+  const regionId = useId();
+  const toggleOpen = useCallback(
+    (newOpen) => setIsOpen((o) => newOpen ?? !o),
+    [setIsOpen]
+  );
   return {
     isOpen,
-    toggleOpen: (newOpen) => setIsOpen((o) => newOpen ?? !o),
+    toggleOpen,
     buttonProps: {
       id: buttonId,
       "aria-disabled": disabled,

package/dist/hooks/useUniqueId.js

@@ -0,0 +1,8 @@
+import { useId } from "react";
+const useUniqueId = (deterministicId) => {
+  const id = useId();
+  return deterministicId ?? id;
+};
+export {
+  useUniqueId
+};

package/dist/{esm/icons.js → icons.js}

@@ -44,8 +44,8 @@ const defaultIconPathMap = {
   Add: "M16 8.5H8.5V16h-1V8.5H0v-1h7.5V0h1v7.5H16z",
   Close: "m8.7 8 5.3 5.3-.7.7L8 8.7 2.7 14l-.7-.7L7.3 8 2 2.7l.7-.7L8 7.3 13.3 2l.7.7z",
   Search: "M15.07 14.52 10.5 9.95a5.96 5.96 0 1 0-.72.7l4.58 4.58zM5.9 11A4.95 4.95 0 0 1 1 6v-.1A4.95 4.95 0 0 1 6 1h.1A4.95 4.95 0 0 1 11 6v.1A4.95 4.95 0 0 1 6 11z",
-  SortAsc: "M.08 6.07 6.5.01l6.42 6.06Zm0 0",
-  SortDesc: "M12.92 8.93 6.5 14.99.08 8.93Zm0 0",
+  SortAsc: "M10.24 7 6 11.24 1.76 7z",
+  SortDesc: "M1.76 5 6 .76 10.24 5z",
   Sort: "M10.24 7 6 11.24 1.76 7zM1.76 5 6 .76 10.24 5z",
   // single-use icons in Widgets
   Calendar: "M10.5 2V0h-1v2h-3V0h-1v2H0v14h16V2zM15 15H1V3h14zM3 6h2v2H3zm4 0h2v2H7zm4 0h2v2h-2zm-8 4h2v2H3zm4 0h2v2H7zm4 0h2v2h-2z",