@elliemae/ds-toolbar 3.0.4-rc.4 → 3.0.4-rc.5

package/dist/cjs/deprecated/DSToolbar.js

@@ -61,12 +61,12 @@ var React = __toESM(require("react"));
 var import_react = __toESM(require("react"));
 var import_react_desc = require("react-desc");
 var import_ds_classnames = require("@elliemae/ds-classnames");
-var import_ds_shared = require("@elliemae/ds-shared");
 var import_ds_utilities = require("@elliemae/ds-utilities");
 var import_decorateToolbarChildren = __toESM(require("./decorateToolbarChildren"));
 var import_ToolbarItem = __toESM(require("./ToolbarItem"));
 var import_ToolbarGroup = __toESM(require("./ToolbarGroup"));
 var import_ToolbarDivider = __toESM(require("./ToolbarDivider"));
+var import_useKeyboardNavigation = require("./hooks/useKeyboardNavigation");
 const blockName = "toolbar";
 const ToolbarContainer = (0, import_ds_classnames.aggregatedClasses)("div")(blockName, null, ({ withDepth, alignment, size }) => ({
   "without-depth": !withDepth,
@@ -92,17 +92,12 @@ const DSToolbar = (_a) => {
     "size"
   ]);
   const containerRef = (0, import_react.useRef)(null);
-  return /* @__PURE__ */ import_react.default.createElement(import_ds_shared.FocusGroupProvider, {
-    autoFocusOnMount,
-    getContainer: () => containerRef.current,
-    keyBindings: {
-      Tab: "next"
-    },
-    orientation: "horizontal"
-  }, /* @__PURE__ */ import_react.default.createElement(ToolbarContainer, __spreadProps(__spreadValues(__spreadValues({}, containerProps), otherProps), {
+  const { handleOnKeyDown } = (0, import_useKeyboardNavigation.useKeyboardNavigation)({ containerRef, autoFocusOnMount });
+  return /* @__PURE__ */ import_react.default.createElement(ToolbarContainer, __spreadProps(__spreadValues(__spreadValues({}, containerProps), otherProps), {
     classProps: { withDepth, alignment, size },
-    innerRef: (0, import_ds_utilities.mergeRefs)(innerRef, containerRef)
-  }), (0, import_decorateToolbarChildren.default)(children)));
+    innerRef: (0, import_ds_utilities.mergeRefs)(innerRef, containerRef),
+    onKeyDown: handleOnKeyDown
+  }), (0, import_decorateToolbarChildren.default)(children));
 };
 const toolbarProps = {
   containerProps: import_react_desc.PropTypes.object.description("Set of Properties attached to the main container"),

package/dist/cjs/deprecated/DSToolbar.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/deprecated/DSToolbar.tsx", "../../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["import React, { useRef } from 'react';\nimport { describe, PropTypes } from 'react-desc';\nimport { aggregatedClasses } from '@elliemae/ds-classnames';\nimport { FocusGroupProvider } from '@elliemae/ds-shared';\nimport { mergeRefs } from '@elliemae/ds-utilities';\nimport decorateToolbarChildren from './decorateToolbarChildren';\nimport Item from './ToolbarItem';\nimport ToolbarGroup from './ToolbarGroup';\nimport Divider from './ToolbarDivider';\n\nconst blockName = 'toolbar';\n\nconst ToolbarContainer = aggregatedClasses('div')(blockName, null, ({ withDepth, alignment, size }) => ({\n  'without-depth': !withDepth,\n  [alignment]: !!alignment,\n  [size]: size,\n}));\n\nconst DSToolbar = ({\n  containerProps = {},\n  innerRef,\n  withDepth = true,\n  alignment = 'right', // left || right\n  autoFocusOnMount = true,\n  children = [],\n  size = 'normal',\n  ...otherProps\n}) => {\n  const containerRef = useRef(null);\n  return (\n    <FocusGroupProvider\n      autoFocusOnMount={autoFocusOnMount}\n      getContainer={() => containerRef.current}\n      keyBindings={{\n        Tab: 'next',\n      }}\n      orientation=\"horizontal\"\n    >\n      <ToolbarContainer\n        {...containerProps}\n        {...otherProps}\n        classProps={{ withDepth, alignment, size }}\n        innerRef={mergeRefs(innerRef, containerRef)}\n      >\n        {decorateToolbarChildren(children)}\n      </ToolbarContainer>\n    </FocusGroupProvider>\n  );\n};\n\nconst toolbarProps = {\n  containerProps: PropTypes.object.description('Set of Properties attached to the main container'),\n  withDepth: PropTypes.bool.description('Shows a shadow rear the toolbar').defaultValue(true),\n  alignment: PropTypes.oneOf(['right', 'left'])\n    .description('Aligns the toolbar to the left or right')\n    .defaultValue('right'),\n  size: PropTypes.oneOf(['normal', 'compact']).description('Toolbar size').defaultValue('normal'),\n  autoFocusOnMount: PropTypes.bool\n    .description('Wheter to focus the component when it mounts or not')\n    .defaultValue(true),\n  children: PropTypes.oneOfType([PropTypes.array, PropTypes.func, PropTypes.node]).description('Toolbar items')\n    .isRequired,\n  innerRef: PropTypes.object.description('Ref to the Toolbar container element'),\n};\n\nDSToolbar.propTypes = toolbarProps;\nDSToolbar.displayName = 'DSToolbar';\nconst ToolbarWithSchema = describe(DSToolbar);\nToolbarWithSchema.propTypes = toolbarProps;\n\nexport { DSToolbar, Item as ToolbarItem, ToolbarGroup, Divider as ToolbarDivider, ToolbarWithSchema };\n\nexport default DSToolbar;\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,mBAA8B;AAC9B,wBAAoC;AACpC,2BAAkC;AAClC,uBAAmC;AACnC,0BAA0B;AAC1B,qCAAoC;AACpC,yBAAiB;AACjB,0BAAyB;AACzB,4BAAoB;AAEpB,MAAM,YAAY;AAElB,MAAM,mBAAmB,4CAAkB,KAAK,EAAE,WAAW,MAAM,CAAC,EAAE,WAAW,WAAW,WAAY;AAAA,EACtG,iBAAiB,CAAC;AAAA,GACjB,YAAY,CAAC,CAAC;AAAA,GACd,OAAO;AACV,EAAE;AAEF,MAAM,YAAY,CAAC,OASb;AATa,eACjB;AAAA,qBAAiB,CAAC;AAAA,IAClB;AAAA,IACA,YAAY;AAAA,IACZ,YAAY;AAAA,IACZ,mBAAmB;AAAA,IACnB,WAAW,CAAC;AAAA,IACZ,OAAO;AAAA,MAPU,IAQd,uBARc,IAQd;AAAA,IAPH;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA;AAGA,QAAM,eAAe,yBAAO,IAAI;AAChC,SACE,mDAAC;AAAA,IACC;AAAA,IACA,cAAc,MAAM,aAAa;AAAA,IACjC,aAAa;AAAA,MACX,KAAK;AAAA,IACP;AAAA,IACA,aAAY;AAAA,KAEZ,mDAAC,kEACK,iBACA,aAFL;AAAA,IAGC,YAAY,EAAE,WAAW,WAAW,KAAK;AAAA,IACzC,UAAU,mCAAU,UAAU,YAAY;AAAA,MAEzC,4CAAwB,QAAQ,CACnC,CACF;AAEJ;AAEA,MAAM,eAAe;AAAA,EACnB,gBAAgB,4BAAU,OAAO,YAAY,kDAAkD;AAAA,EAC/F,WAAW,4BAAU,KAAK,YAAY,iCAAiC,EAAE,aAAa,IAAI;AAAA,EAC1F,WAAW,4BAAU,MAAM,CAAC,SAAS,MAAM,CAAC,EACzC,YAAY,yCAAyC,EACrD,aAAa,OAAO;AAAA,EACvB,MAAM,4BAAU,MAAM,CAAC,UAAU,SAAS,CAAC,EAAE,YAAY,cAAc,EAAE,aAAa,QAAQ;AAAA,EAC9F,kBAAkB,4BAAU,KACzB,YAAY,qDAAqD,EACjE,aAAa,IAAI;AAAA,EACpB,UAAU,4BAAU,UAAU,CAAC,4BAAU,OAAO,4BAAU,MAAM,4BAAU,IAAI,CAAC,EAAE,YAAY,eAAe,EACzG;AAAA,EACH,UAAU,4BAAU,OAAO,YAAY,sCAAsC;AAC/E;AAEA,UAAU,YAAY;AACtB,UAAU,cAAc;AACxB,MAAM,oBAAoB,gCAAS,SAAS;AAC5C,kBAAkB,YAAY;AAI9B,IAAO,oBAAQ;",
+  "sourcesContent": ["import React, { useRef } from 'react';\nimport { describe, PropTypes } from 'react-desc';\nimport { aggregatedClasses } from '@elliemae/ds-classnames';\nimport { mergeRefs } from '@elliemae/ds-utilities';\nimport decorateToolbarChildren from './decorateToolbarChildren';\nimport Item from './ToolbarItem';\nimport ToolbarGroup from './ToolbarGroup';\nimport Divider from './ToolbarDivider';\nimport { useKeyboardNavigation } from './hooks/useKeyboardNavigation';\n\nconst blockName = 'toolbar';\n\nconst ToolbarContainer = aggregatedClasses('div')(blockName, null, ({ withDepth, alignment, size }) => ({\n  'without-depth': !withDepth,\n  [alignment]: !!alignment,\n  [size]: size,\n}));\n\nconst DSToolbar = ({\n  containerProps = {},\n  innerRef,\n  withDepth = true,\n  alignment = 'right', // left || right\n  autoFocusOnMount = true,\n  children = [],\n  size = 'normal',\n  ...otherProps\n}) => {\n  const containerRef = useRef<HTMLDivElement | null>(null);\n\n  const { handleOnKeyDown } = useKeyboardNavigation({ containerRef, autoFocusOnMount });\n\n  return (\n    <ToolbarContainer\n      {...containerProps}\n      {...otherProps}\n      classProps={{ withDepth, alignment, size }}\n      innerRef={mergeRefs(innerRef, containerRef)}\n      onKeyDown={handleOnKeyDown}\n    >\n      {decorateToolbarChildren(children)}\n    </ToolbarContainer>\n  );\n};\n\nconst toolbarProps = {\n  containerProps: PropTypes.object.description('Set of Properties attached to the main container'),\n  withDepth: PropTypes.bool.description('Shows a shadow rear the toolbar').defaultValue(true),\n  alignment: PropTypes.oneOf(['right', 'left'])\n    .description('Aligns the toolbar to the left or right')\n    .defaultValue('right'),\n  size: PropTypes.oneOf(['normal', 'compact']).description('Toolbar size').defaultValue('normal'),\n  autoFocusOnMount: PropTypes.bool\n    .description('Wheter to focus the component when it mounts or not')\n    .defaultValue(true),\n  children: PropTypes.oneOfType([PropTypes.array, PropTypes.func, PropTypes.node]).description('Toolbar items')\n    .isRequired,\n  innerRef: PropTypes.object.description('Ref to the Toolbar container element'),\n};\n\nDSToolbar.propTypes = toolbarProps;\nDSToolbar.displayName = 'DSToolbar';\nconst ToolbarWithSchema = describe(DSToolbar);\nToolbarWithSchema.propTypes = toolbarProps;\n\nexport { DSToolbar, Item as ToolbarItem, ToolbarGroup, Divider as ToolbarDivider, ToolbarWithSchema };\n\nexport default DSToolbar;\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,mBAA8B;AAC9B,wBAAoC;AACpC,2BAAkC;AAClC,0BAA0B;AAC1B,qCAAoC;AACpC,yBAAiB;AACjB,0BAAyB;AACzB,4BAAoB;AACpB,mCAAsC;AAEtC,MAAM,YAAY;AAElB,MAAM,mBAAmB,4CAAkB,KAAK,EAAE,WAAW,MAAM,CAAC,EAAE,WAAW,WAAW,WAAY;AAAA,EACtG,iBAAiB,CAAC;AAAA,GACjB,YAAY,CAAC,CAAC;AAAA,GACd,OAAO;AACV,EAAE;AAEF,MAAM,YAAY,CAAC,OASb;AATa,eACjB;AAAA,qBAAiB,CAAC;AAAA,IAClB;AAAA,IACA,YAAY;AAAA,IACZ,YAAY;AAAA,IACZ,mBAAmB;AAAA,IACnB,WAAW,CAAC;AAAA,IACZ,OAAO;AAAA,MAPU,IAQd,uBARc,IAQd;AAAA,IAPH;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA;AAGA,QAAM,eAAe,yBAA8B,IAAI;AAEvD,QAAM,EAAE,oBAAoB,wDAAsB,EAAE,cAAc,iBAAiB,CAAC;AAEpF,SACE,mDAAC,kEACK,iBACA,aAFL;AAAA,IAGC,YAAY,EAAE,WAAW,WAAW,KAAK;AAAA,IACzC,UAAU,mCAAU,UAAU,YAAY;AAAA,IAC1C,WAAW;AAAA,MAEV,4CAAwB,QAAQ,CACnC;AAEJ;AAEA,MAAM,eAAe;AAAA,EACnB,gBAAgB,4BAAU,OAAO,YAAY,kDAAkD;AAAA,EAC/F,WAAW,4BAAU,KAAK,YAAY,iCAAiC,EAAE,aAAa,IAAI;AAAA,EAC1F,WAAW,4BAAU,MAAM,CAAC,SAAS,MAAM,CAAC,EACzC,YAAY,yCAAyC,EACrD,aAAa,OAAO;AAAA,EACvB,MAAM,4BAAU,MAAM,CAAC,UAAU,SAAS,CAAC,EAAE,YAAY,cAAc,EAAE,aAAa,QAAQ;AAAA,EAC9F,kBAAkB,4BAAU,KACzB,YAAY,qDAAqD,EACjE,aAAa,IAAI;AAAA,EACpB,UAAU,4BAAU,UAAU,CAAC,4BAAU,OAAO,4BAAU,MAAM,4BAAU,IAAI,CAAC,EAAE,YAAY,eAAe,EACzG;AAAA,EACH,UAAU,4BAAU,OAAO,YAAY,sCAAsC;AAC/E;AAEA,UAAU,YAAY;AACtB,UAAU,cAAc;AACxB,MAAM,oBAAoB,gCAAS,SAAS;AAC5C,kBAAkB,YAAY;AAI9B,IAAO,oBAAQ;",
   "names": []
 }

package/dist/cjs/deprecated/hooks/useKeyboardNavigation.js

@@ -0,0 +1,64 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var useKeyboardNavigation_exports = {};
+__export(useKeyboardNavigation_exports, {
+  useKeyboardNavigation: () => useKeyboardNavigation
+});
+module.exports = __toCommonJS(useKeyboardNavigation_exports);
+var React = __toESM(require("react"));
+var import_react = require("react");
+const useKeyboardNavigation = ({ containerRef, autoFocusOnMount }) => {
+  const allChildrenButtonRef = (0, import_react.useRef)(null);
+  (0, import_react.useEffect)(() => {
+    if (containerRef.current) {
+      allChildrenButtonRef.current = containerRef.current.querySelectorAll("button");
+    }
+    if (autoFocusOnMount) {
+      setTimeout(() => allChildrenButtonRef.current?.[0].focus());
+    }
+  }, [autoFocusOnMount]);
+  const handleOnKeyDown = (0, import_react.useCallback)((e) => {
+    if (allChildrenButtonRef.current) {
+      const lastButton = allChildrenButtonRef.current[allChildrenButtonRef.current?.length - 1];
+      const firstButton = allChildrenButtonRef.current[0];
+      if (e.key === "ArrowRight") {
+        e.preventDefault();
+        if (e.target !== lastButton) {
+          e.target.nextSibling.focus();
+        } else {
+          firstButton.focus();
+        }
+      }
+      if (e.key === "ArrowLeft") {
+        e.preventDefault();
+        if (e.target !== firstButton) {
+          e.target.previousSibling.focus();
+        } else {
+          lastButton.focus();
+        }
+      }
+    }
+  }, []);
+  return {
+    handleOnKeyDown
+  };
+};
+//# sourceMappingURL=useKeyboardNavigation.js.map

package/dist/cjs/deprecated/hooks/useKeyboardNavigation.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/deprecated/hooks/useKeyboardNavigation.tsx", "../../../../../../scripts/build/transpile/react-shim.js"],
+  "sourcesContent": ["import React, { useRef, useEffect, useCallback } from 'react';\n\ninterface useKeyboardNavigationT {\n  containerRef: React.MutableRefObject<HTMLDivElement | null>;\n  autoFocusOnMount: boolean;\n}\n\n// Toolbar should not allow to use Tab/Shift+Tab to navigate between ToolbarItems.\n// Tab/Shift+Tab should be only used once to enter the whole controller.\n// Toolbars should be only navigable with Arrows to follow correct a11y.\n// https://www.w3.org/TR/wai-aria-practices/examples/toolbar/toolbar.html\n\nexport const useKeyboardNavigation = ({ containerRef, autoFocusOnMount }: useKeyboardNavigationT) => {\n  const allChildrenButtonRef = useRef<NodeListOf<HTMLButtonElement> | null>(null);\n\n  useEffect(() => {\n    if (containerRef.current) {\n      allChildrenButtonRef.current = containerRef.current.querySelectorAll('button');\n      // allChildrenButtonRef.current.forEach((button, index) => {\n      //   if (index !== 0) {\n      //     button.setAttribute('tabindex', '-1');\n      //   }\n      // });\n    }\n\n    if (autoFocusOnMount) {\n      setTimeout(() => allChildrenButtonRef.current?.[0].focus());\n    }\n\n    // return () => {\n    //   allChildrenButtonRef.current?.forEach((button, index) => {\n    //     if (index !== 0) {\n    //       button.setAttribute('tabindex', '');\n    //     }\n    //   });\n    // };\n  }, [autoFocusOnMount]);\n\n  const handleOnKeyDown = useCallback((e) => {\n    if (allChildrenButtonRef.current) {\n      const lastButton = allChildrenButtonRef.current[allChildrenButtonRef.current?.length - 1];\n      const firstButton = allChildrenButtonRef.current[0];\n\n      if (e.key === 'ArrowRight') {\n        e.preventDefault();\n        if (e.target !== lastButton) {\n          e.target.nextSibling.focus();\n        } else {\n          firstButton.focus();\n        }\n      }\n      if (e.key === 'ArrowLeft') {\n        e.preventDefault();\n        if (e.target !== firstButton) {\n          e.target.previousSibling.focus();\n        } else {\n          lastButton.focus();\n        }\n      }\n    }\n  }, []);\n\n  return {\n    handleOnKeyDown,\n  };\n};\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,mBAAsD;AAY/C,MAAM,wBAAwB,CAAC,EAAE,cAAc,uBAA+C;AACnG,QAAM,uBAAuB,yBAA6C,IAAI;AAE9E,8BAAU,MAAM;AACd,QAAI,aAAa,SAAS;AACxB,2BAAqB,UAAU,aAAa,QAAQ,iBAAiB,QAAQ;AAAA,IAM/E;AAEA,QAAI,kBAAkB;AACpB,iBAAW,MAAM,qBAAqB,UAAU,GAAG,MAAM,CAAC;AAAA,IAC5D;AAAA,EASF,GAAG,CAAC,gBAAgB,CAAC;AAErB,QAAM,kBAAkB,8BAAY,CAAC,MAAM;AACzC,QAAI,qBAAqB,SAAS;AAChC,YAAM,aAAa,qBAAqB,QAAQ,qBAAqB,SAAS,SAAS;AACvF,YAAM,cAAc,qBAAqB,QAAQ;AAEjD,UAAI,EAAE,QAAQ,cAAc;AAC1B,UAAE,eAAe;AACjB,YAAI,EAAE,WAAW,YAAY;AAC3B,YAAE,OAAO,YAAY,MAAM;AAAA,QAC7B,OAAO;AACL,sBAAY,MAAM;AAAA,QACpB;AAAA,MACF;AACA,UAAI,EAAE,QAAQ,aAAa;AACzB,UAAE,eAAe;AACjB,YAAI,EAAE,WAAW,aAAa;AAC5B,YAAE,OAAO,gBAAgB,MAAM;AAAA,QACjC,OAAO;AACL,qBAAW,MAAM;AAAA,QACnB;AAAA,MACF;AAAA,IACF;AAAA,EACF,GAAG,CAAC,CAAC;AAEL,SAAO;AAAA,IACL;AAAA,EACF;AACF;",
+  "names": []
+}

package/dist/esm/deprecated/DSToolbar.js

@@ -33,12 +33,12 @@ import * as React from "react";
 import React2, { useRef } from "react";
 import { describe, PropTypes } from "react-desc";
 import { aggregatedClasses } from "@elliemae/ds-classnames";
-import { FocusGroupProvider } from "@elliemae/ds-shared";
 import { mergeRefs } from "@elliemae/ds-utilities";
 import decorateToolbarChildren from "./decorateToolbarChildren";
 import Item from "./ToolbarItem";
 import ToolbarGroup from "./ToolbarGroup";
 import Divider from "./ToolbarDivider";
+import { useKeyboardNavigation } from "./hooks/useKeyboardNavigation";
 const blockName = "toolbar";
 const ToolbarContainer = aggregatedClasses("div")(blockName, null, ({ withDepth, alignment, size }) => ({
   "without-depth": !withDepth,
@@ -64,17 +64,12 @@ const DSToolbar = (_a) => {
     "size"
   ]);
   const containerRef = useRef(null);
-  return /* @__PURE__ */ React2.createElement(FocusGroupProvider, {
-    autoFocusOnMount,
-    getContainer: () => containerRef.current,
-    keyBindings: {
-      Tab: "next"
-    },
-    orientation: "horizontal"
-  }, /* @__PURE__ */ React2.createElement(ToolbarContainer, __spreadProps(__spreadValues(__spreadValues({}, containerProps), otherProps), {
+  const { handleOnKeyDown } = useKeyboardNavigation({ containerRef, autoFocusOnMount });
+  return /* @__PURE__ */ React2.createElement(ToolbarContainer, __spreadProps(__spreadValues(__spreadValues({}, containerProps), otherProps), {
     classProps: { withDepth, alignment, size },
-    innerRef: mergeRefs(innerRef, containerRef)
-  }), decorateToolbarChildren(children)));
+    innerRef: mergeRefs(innerRef, containerRef),
+    onKeyDown: handleOnKeyDown
+  }), decorateToolbarChildren(children));
 };
 const toolbarProps = {
   containerProps: PropTypes.object.description("Set of Properties attached to the main container"),

package/dist/esm/deprecated/DSToolbar.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../scripts/build/transpile/react-shim.js", "../../../src/deprecated/DSToolbar.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import React, { useRef } from 'react';\nimport { describe, PropTypes } from 'react-desc';\nimport { aggregatedClasses } from '@elliemae/ds-classnames';\nimport { FocusGroupProvider } from '@elliemae/ds-shared';\nimport { mergeRefs } from '@elliemae/ds-utilities';\nimport decorateToolbarChildren from './decorateToolbarChildren';\nimport Item from './ToolbarItem';\nimport ToolbarGroup from './ToolbarGroup';\nimport Divider from './ToolbarDivider';\n\nconst blockName = 'toolbar';\n\nconst ToolbarContainer = aggregatedClasses('div')(blockName, null, ({ withDepth, alignment, size }) => ({\n  'without-depth': !withDepth,\n  [alignment]: !!alignment,\n  [size]: size,\n}));\n\nconst DSToolbar = ({\n  containerProps = {},\n  innerRef,\n  withDepth = true,\n  alignment = 'right', // left || right\n  autoFocusOnMount = true,\n  children = [],\n  size = 'normal',\n  ...otherProps\n}) => {\n  const containerRef = useRef(null);\n  return (\n    <FocusGroupProvider\n      autoFocusOnMount={autoFocusOnMount}\n      getContainer={() => containerRef.current}\n      keyBindings={{\n        Tab: 'next',\n      }}\n      orientation=\"horizontal\"\n    >\n      <ToolbarContainer\n        {...containerProps}\n        {...otherProps}\n        classProps={{ withDepth, alignment, size }}\n        innerRef={mergeRefs(innerRef, containerRef)}\n      >\n        {decorateToolbarChildren(children)}\n      </ToolbarContainer>\n    </FocusGroupProvider>\n  );\n};\n\nconst toolbarProps = {\n  containerProps: PropTypes.object.description('Set of Properties attached to the main container'),\n  withDepth: PropTypes.bool.description('Shows a shadow rear the toolbar').defaultValue(true),\n  alignment: PropTypes.oneOf(['right', 'left'])\n    .description('Aligns the toolbar to the left or right')\n    .defaultValue('right'),\n  size: PropTypes.oneOf(['normal', 'compact']).description('Toolbar size').defaultValue('normal'),\n  autoFocusOnMount: PropTypes.bool\n    .description('Wheter to focus the component when it mounts or not')\n    .defaultValue(true),\n  children: PropTypes.oneOfType([PropTypes.array, PropTypes.func, PropTypes.node]).description('Toolbar items')\n    .isRequired,\n  innerRef: PropTypes.object.description('Ref to the Toolbar container element'),\n};\n\nDSToolbar.propTypes = toolbarProps;\nDSToolbar.displayName = 'DSToolbar';\nconst ToolbarWithSchema = describe(DSToolbar);\nToolbarWithSchema.propTypes = toolbarProps;\n\nexport { DSToolbar, Item as ToolbarItem, ToolbarGroup, Divider as ToolbarDivider, ToolbarWithSchema };\n\nexport default DSToolbar;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA,MAAM,YAAY;AAElB,MAAM,mBAAmB,kBAAkB,KAAK,EAAE,WAAW,MAAM,CAAC,EAAE,WAAW,WAAW,WAAY;AAAA,EACtG,iBAAiB,CAAC;AAAA,GACjB,YAAY,CAAC,CAAC;AAAA,GACd,OAAO;AACV,EAAE;AAEF,MAAM,YAAY,CAAC,OASb;AATa,eACjB;AAAA,qBAAiB,CAAC;AAAA,IAClB;AAAA,IACA,YAAY;AAAA,IACZ,YAAY;AAAA,IACZ,mBAAmB;AAAA,IACnB,WAAW,CAAC;AAAA,IACZ,OAAO;AAAA,MAPU,IAQd,uBARc,IAQd;AAAA,IAPH;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA;AAGA,QAAM,eAAe,OAAO,IAAI;AAChC,SACE,qCAAC;AAAA,IACC;AAAA,IACA,cAAc,MAAM,aAAa;AAAA,IACjC,aAAa;AAAA,MACX,KAAK;AAAA,IACP;AAAA,IACA,aAAY;AAAA,KAEZ,qCAAC,kEACK,iBACA,aAFL;AAAA,IAGC,YAAY,EAAE,WAAW,WAAW,KAAK;AAAA,IACzC,UAAU,UAAU,UAAU,YAAY;AAAA,MAEzC,wBAAwB,QAAQ,CACnC,CACF;AAEJ;AAEA,MAAM,eAAe;AAAA,EACnB,gBAAgB,UAAU,OAAO,YAAY,kDAAkD;AAAA,EAC/F,WAAW,UAAU,KAAK,YAAY,iCAAiC,EAAE,aAAa,IAAI;AAAA,EAC1F,WAAW,UAAU,MAAM,CAAC,SAAS,MAAM,CAAC,EACzC,YAAY,yCAAyC,EACrD,aAAa,OAAO;AAAA,EACvB,MAAM,UAAU,MAAM,CAAC,UAAU,SAAS,CAAC,EAAE,YAAY,cAAc,EAAE,aAAa,QAAQ;AAAA,EAC9F,kBAAkB,UAAU,KACzB,YAAY,qDAAqD,EACjE,aAAa,IAAI;AAAA,EACpB,UAAU,UAAU,UAAU,CAAC,UAAU,OAAO,UAAU,MAAM,UAAU,IAAI,CAAC,EAAE,YAAY,eAAe,EACzG;AAAA,EACH,UAAU,UAAU,OAAO,YAAY,sCAAsC;AAC/E;AAEA,UAAU,YAAY;AACtB,UAAU,cAAc;AACxB,MAAM,oBAAoB,SAAS,SAAS;AAC5C,kBAAkB,YAAY;AAI9B,IAAO,oBAAQ;",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import React, { useRef } from 'react';\nimport { describe, PropTypes } from 'react-desc';\nimport { aggregatedClasses } from '@elliemae/ds-classnames';\nimport { mergeRefs } from '@elliemae/ds-utilities';\nimport decorateToolbarChildren from './decorateToolbarChildren';\nimport Item from './ToolbarItem';\nimport ToolbarGroup from './ToolbarGroup';\nimport Divider from './ToolbarDivider';\nimport { useKeyboardNavigation } from './hooks/useKeyboardNavigation';\n\nconst blockName = 'toolbar';\n\nconst ToolbarContainer = aggregatedClasses('div')(blockName, null, ({ withDepth, alignment, size }) => ({\n  'without-depth': !withDepth,\n  [alignment]: !!alignment,\n  [size]: size,\n}));\n\nconst DSToolbar = ({\n  containerProps = {},\n  innerRef,\n  withDepth = true,\n  alignment = 'right', // left || right\n  autoFocusOnMount = true,\n  children = [],\n  size = 'normal',\n  ...otherProps\n}) => {\n  const containerRef = useRef<HTMLDivElement | null>(null);\n\n  const { handleOnKeyDown } = useKeyboardNavigation({ containerRef, autoFocusOnMount });\n\n  return (\n    <ToolbarContainer\n      {...containerProps}\n      {...otherProps}\n      classProps={{ withDepth, alignment, size }}\n      innerRef={mergeRefs(innerRef, containerRef)}\n      onKeyDown={handleOnKeyDown}\n    >\n      {decorateToolbarChildren(children)}\n    </ToolbarContainer>\n  );\n};\n\nconst toolbarProps = {\n  containerProps: PropTypes.object.description('Set of Properties attached to the main container'),\n  withDepth: PropTypes.bool.description('Shows a shadow rear the toolbar').defaultValue(true),\n  alignment: PropTypes.oneOf(['right', 'left'])\n    .description('Aligns the toolbar to the left or right')\n    .defaultValue('right'),\n  size: PropTypes.oneOf(['normal', 'compact']).description('Toolbar size').defaultValue('normal'),\n  autoFocusOnMount: PropTypes.bool\n    .description('Wheter to focus the component when it mounts or not')\n    .defaultValue(true),\n  children: PropTypes.oneOfType([PropTypes.array, PropTypes.func, PropTypes.node]).description('Toolbar items')\n    .isRequired,\n  innerRef: PropTypes.object.description('Ref to the Toolbar container element'),\n};\n\nDSToolbar.propTypes = toolbarProps;\nDSToolbar.displayName = 'DSToolbar';\nconst ToolbarWithSchema = describe(DSToolbar);\nToolbarWithSchema.propTypes = toolbarProps;\n\nexport { DSToolbar, Item as ToolbarItem, ToolbarGroup, Divider as ToolbarDivider, ToolbarWithSchema };\n\nexport default DSToolbar;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA,MAAM,YAAY;AAElB,MAAM,mBAAmB,kBAAkB,KAAK,EAAE,WAAW,MAAM,CAAC,EAAE,WAAW,WAAW,WAAY;AAAA,EACtG,iBAAiB,CAAC;AAAA,GACjB,YAAY,CAAC,CAAC;AAAA,GACd,OAAO;AACV,EAAE;AAEF,MAAM,YAAY,CAAC,OASb;AATa,eACjB;AAAA,qBAAiB,CAAC;AAAA,IAClB;AAAA,IACA,YAAY;AAAA,IACZ,YAAY;AAAA,IACZ,mBAAmB;AAAA,IACnB,WAAW,CAAC;AAAA,IACZ,OAAO;AAAA,MAPU,IAQd,uBARc,IAQd;AAAA,IAPH;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA;AAGA,QAAM,eAAe,OAA8B,IAAI;AAEvD,QAAM,EAAE,oBAAoB,sBAAsB,EAAE,cAAc,iBAAiB,CAAC;AAEpF,SACE,qCAAC,kEACK,iBACA,aAFL;AAAA,IAGC,YAAY,EAAE,WAAW,WAAW,KAAK;AAAA,IACzC,UAAU,UAAU,UAAU,YAAY;AAAA,IAC1C,WAAW;AAAA,MAEV,wBAAwB,QAAQ,CACnC;AAEJ;AAEA,MAAM,eAAe;AAAA,EACnB,gBAAgB,UAAU,OAAO,YAAY,kDAAkD;AAAA,EAC/F,WAAW,UAAU,KAAK,YAAY,iCAAiC,EAAE,aAAa,IAAI;AAAA,EAC1F,WAAW,UAAU,MAAM,CAAC,SAAS,MAAM,CAAC,EACzC,YAAY,yCAAyC,EACrD,aAAa,OAAO;AAAA,EACvB,MAAM,UAAU,MAAM,CAAC,UAAU,SAAS,CAAC,EAAE,YAAY,cAAc,EAAE,aAAa,QAAQ;AAAA,EAC9F,kBAAkB,UAAU,KACzB,YAAY,qDAAqD,EACjE,aAAa,IAAI;AAAA,EACpB,UAAU,UAAU,UAAU,CAAC,UAAU,OAAO,UAAU,MAAM,UAAU,IAAI,CAAC,EAAE,YAAY,eAAe,EACzG;AAAA,EACH,UAAU,UAAU,OAAO,YAAY,sCAAsC;AAC/E;AAEA,UAAU,YAAY;AACtB,UAAU,cAAc;AACxB,MAAM,oBAAoB,SAAS,SAAS;AAC5C,kBAAkB,YAAY;AAI9B,IAAO,oBAAQ;",
   "names": []
 }

package/dist/esm/deprecated/hooks/useKeyboardNavigation.js

@@ -0,0 +1,42 @@
+import * as React from "react";
+import { useRef, useEffect, useCallback } from "react";
+const useKeyboardNavigation = ({ containerRef, autoFocusOnMount }) => {
+  const allChildrenButtonRef = useRef(null);
+  useEffect(() => {
+    if (containerRef.current) {
+      allChildrenButtonRef.current = containerRef.current.querySelectorAll("button");
+    }
+    if (autoFocusOnMount) {
+      setTimeout(() => allChildrenButtonRef.current?.[0].focus());
+    }
+  }, [autoFocusOnMount]);
+  const handleOnKeyDown = useCallback((e) => {
+    if (allChildrenButtonRef.current) {
+      const lastButton = allChildrenButtonRef.current[allChildrenButtonRef.current?.length - 1];
+      const firstButton = allChildrenButtonRef.current[0];
+      if (e.key === "ArrowRight") {
+        e.preventDefault();
+        if (e.target !== lastButton) {
+          e.target.nextSibling.focus();
+        } else {
+          firstButton.focus();
+        }
+      }
+      if (e.key === "ArrowLeft") {
+        e.preventDefault();
+        if (e.target !== firstButton) {
+          e.target.previousSibling.focus();
+        } else {
+          lastButton.focus();
+        }
+      }
+    }
+  }, []);
+  return {
+    handleOnKeyDown
+  };
+};
+export {
+  useKeyboardNavigation
+};
+//# sourceMappingURL=useKeyboardNavigation.js.map

package/dist/esm/deprecated/hooks/useKeyboardNavigation.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../scripts/build/transpile/react-shim.js", "../../../../src/deprecated/hooks/useKeyboardNavigation.tsx"],
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import React, { useRef, useEffect, useCallback } from 'react';\n\ninterface useKeyboardNavigationT {\n  containerRef: React.MutableRefObject<HTMLDivElement | null>;\n  autoFocusOnMount: boolean;\n}\n\n// Toolbar should not allow to use Tab/Shift+Tab to navigate between ToolbarItems.\n// Tab/Shift+Tab should be only used once to enter the whole controller.\n// Toolbars should be only navigable with Arrows to follow correct a11y.\n// https://www.w3.org/TR/wai-aria-practices/examples/toolbar/toolbar.html\n\nexport const useKeyboardNavigation = ({ containerRef, autoFocusOnMount }: useKeyboardNavigationT) => {\n  const allChildrenButtonRef = useRef<NodeListOf<HTMLButtonElement> | null>(null);\n\n  useEffect(() => {\n    if (containerRef.current) {\n      allChildrenButtonRef.current = containerRef.current.querySelectorAll('button');\n      // allChildrenButtonRef.current.forEach((button, index) => {\n      //   if (index !== 0) {\n      //     button.setAttribute('tabindex', '-1');\n      //   }\n      // });\n    }\n\n    if (autoFocusOnMount) {\n      setTimeout(() => allChildrenButtonRef.current?.[0].focus());\n    }\n\n    // return () => {\n    //   allChildrenButtonRef.current?.forEach((button, index) => {\n    //     if (index !== 0) {\n    //       button.setAttribute('tabindex', '');\n    //     }\n    //   });\n    // };\n  }, [autoFocusOnMount]);\n\n  const handleOnKeyDown = useCallback((e) => {\n    if (allChildrenButtonRef.current) {\n      const lastButton = allChildrenButtonRef.current[allChildrenButtonRef.current?.length - 1];\n      const firstButton = allChildrenButtonRef.current[0];\n\n      if (e.key === 'ArrowRight') {\n        e.preventDefault();\n        if (e.target !== lastButton) {\n          e.target.nextSibling.focus();\n        } else {\n          firstButton.focus();\n        }\n      }\n      if (e.key === 'ArrowLeft') {\n        e.preventDefault();\n        if (e.target !== firstButton) {\n          e.target.previousSibling.focus();\n        } else {\n          lastButton.focus();\n        }\n      }\n    }\n  }, []);\n\n  return {\n    handleOnKeyDown,\n  };\n};\n"],
+  "mappings": "AAAA;ACAA;AAYO,MAAM,wBAAwB,CAAC,EAAE,cAAc,uBAA+C;AACnG,QAAM,uBAAuB,OAA6C,IAAI;AAE9E,YAAU,MAAM;AACd,QAAI,aAAa,SAAS;AACxB,2BAAqB,UAAU,aAAa,QAAQ,iBAAiB,QAAQ;AAAA,IAM/E;AAEA,QAAI,kBAAkB;AACpB,iBAAW,MAAM,qBAAqB,UAAU,GAAG,MAAM,CAAC;AAAA,IAC5D;AAAA,EASF,GAAG,CAAC,gBAAgB,CAAC;AAErB,QAAM,kBAAkB,YAAY,CAAC,MAAM;AACzC,QAAI,qBAAqB,SAAS;AAChC,YAAM,aAAa,qBAAqB,QAAQ,qBAAqB,SAAS,SAAS;AACvF,YAAM,cAAc,qBAAqB,QAAQ;AAEjD,UAAI,EAAE,QAAQ,cAAc;AAC1B,UAAE,eAAe;AACjB,YAAI,EAAE,WAAW,YAAY;AAC3B,YAAE,OAAO,YAAY,MAAM;AAAA,QAC7B,OAAO;AACL,sBAAY,MAAM;AAAA,QACpB;AAAA,MACF;AACA,UAAI,EAAE,QAAQ,aAAa;AACzB,UAAE,eAAe;AACjB,YAAI,EAAE,WAAW,aAAa;AAC5B,YAAE,OAAO,gBAAgB,MAAM;AAAA,QACjC,OAAO;AACL,qBAAW,MAAM;AAAA,QACnB;AAAA,MACF;AAAA,IACF;AAAA,EACF,GAAG,CAAC,CAAC;AAEL,SAAO;AAAA,IACL;AAAA,EACF;AACF;",
+  "names": []
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/ds-toolbar",
-  "version": "3.0.4-rc.4",
+  "version": "3.0.4-rc.5",
   "license": "MIT",
   "description": "ICE MT - Dimsum - Toolbar",
   "files": [
@@ -86,22 +86,15 @@
     "reportFile": "tests.xml",
     "indent": 4
   },
-  "scripts": {
-    "dev": "cross-env NODE_ENV=development node ../../scripts/build/build.mjs --watch",
-    "test": "node ../../scripts/testing/test.mjs",
-    "lint": "node ../../scripts/lint.mjs",
-    "dts": "node ../../scripts/dts.mjs",
-    "build": "cross-env NODE_ENV=production node ../../scripts/build/build.mjs"
-  },
   "dependencies": {
-    "@elliemae/ds-button": "3.0.4-rc.4",
-    "@elliemae/ds-classnames": "3.0.4-rc.4",
-    "@elliemae/ds-grid": "3.0.4-rc.4",
-    "@elliemae/ds-icons": "3.0.4-rc.4",
-    "@elliemae/ds-popper": "3.0.4-rc.4",
-    "@elliemae/ds-shared": "3.0.4-rc.4",
-    "@elliemae/ds-system": "3.0.4-rc.4",
-    "@elliemae/ds-utilities": "3.0.4-rc.4",
+    "@elliemae/ds-button": "3.0.4-rc.5",
+    "@elliemae/ds-classnames": "3.0.4-rc.5",
+    "@elliemae/ds-grid": "3.0.4-rc.5",
+    "@elliemae/ds-icons": "3.0.4-rc.5",
+    "@elliemae/ds-popper": "3.0.4-rc.5",
+    "@elliemae/ds-shared": "3.0.4-rc.5",
+    "@elliemae/ds-system": "3.0.4-rc.5",
+    "@elliemae/ds-utilities": "3.0.4-rc.5",
     "prop-types": "~15.8.1",
     "react-desc": "~4.1.3",
     "uid": "2.0.0"
@@ -121,5 +114,12 @@
   "publishConfig": {
     "access": "public",
     "typeSafety": false
+  },
+  "scripts": {
+    "dev": "cross-env NODE_ENV=development node ../../scripts/build/build.mjs --watch",
+    "test": "node ../../scripts/testing/test.mjs",
+    "lint": "node ../../scripts/lint.mjs",
+    "dts": "node ../../scripts/dts.mjs",
+    "build": "cross-env NODE_ENV=production node ../../scripts/build/build.mjs"
   }
-}
+}