@elliemae/ds-toolbar 3.22.0-next.23 → 3.22.0-next.25

package/dist/cjs/DSToolbarItemV2.js

@@ -37,6 +37,7 @@ var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
 var import_ds_props_helpers = require("@elliemae/ds-props-helpers");
 var import_uid = require("uid");
+var import_lodash = require("lodash");
 var import_DSToolbarV2Context = require("./DSToolbarV2Context.js");
 var import_styled = require("./styled.js");
 var import_useToolbarItemHandlers = require("./useToolbarItemHandlers.js");
@@ -46,7 +47,7 @@ const DSToolbarItemV2 = (props) => {
   const propsWithDefaults = (0, import_ds_props_helpers.useMemoMergePropsWithDefault)(props, import_react_desc_prop_types.defaultItemProps);
   (0, import_ds_props_helpers.useValidateTypescriptPropTypes)(propsWithDefaults, import_react_desc_prop_types.DSToolbarItemV2Schema, import_DSToolbarDefinitions.DSToolbarItemName);
   const { render: ComponentRenderer, isFirstItem } = propsWithDefaults;
-  const { id: providedId, ...restGlobals } = (0, import_ds_props_helpers.useGetGlobalAttributes)(propsWithDefaults);
+  const { id: providedId, ...restGlobals } = (0, import_lodash.omit)((0, import_ds_props_helpers.useGetGlobalAttributes)(propsWithDefaults), ["rows", "cols", "wrap"]);
   const { registerReference, dndDraggingItem } = (0, import_react.useContext)(import_DSToolbarV2Context.DSToolbarV2Context);
   const ref = (0, import_react.useRef)(null);
   const toolbarItemId = (0, import_react.useMemo)(() => {

package/dist/cjs/DSToolbarItemV2.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/DSToolbarItemV2.tsx", "../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["/* eslint-disable react/prop-types */\nimport React, { useContext, useMemo, useRef } from 'react';\nimport {\n  describe,\n  useMemoMergePropsWithDefault,\n  useValidateTypescriptPropTypes,\n  useGetGlobalAttributes,\n} from '@elliemae/ds-props-helpers';\nimport { uid } from 'uid';\nimport { DSToolbarV2Context } from './DSToolbarV2Context.js';\nimport { StyledToolbarItem } from './styled.js';\nimport { useToolbarItemHandlers } from './useToolbarItemHandlers.js';\nimport { defaultItemProps, DSToolbarItemV2Schema } from './react-desc-prop-types.js';\nimport type { DSToolbarItemT } from './react-desc-prop-types.js';\nimport { DSToolbarItemName } from './DSToolbarDefinitions.js';\n\nconst DSToolbarItemV2: React.ComponentType<DSToolbarItemT.Props> = (props) => {\n  const propsWithDefaults = useMemoMergePropsWithDefault(props, defaultItemProps);\n\n  useValidateTypescriptPropTypes(propsWithDefaults, DSToolbarItemV2Schema, DSToolbarItemName);\n  const { render: ComponentRenderer, isFirstItem } = propsWithDefaults;\n  const { id: providedId, ...restGlobals } = useGetGlobalAttributes(propsWithDefaults);\n  const { registerReference, dndDraggingItem } = useContext(DSToolbarV2Context);\n  const ref = useRef<HTMLElement | null>(null);\n\n  const toolbarItemId = useMemo(() => {\n    const id = providedId ?? `ds-toolbar-item-${uid()}`;\n    registerReference(id, ref);\n    return id;\n  }, [registerReference, ref, providedId]);\n\n  const tabIndex = useMemo(\n    () => (dndDraggingItem === toolbarItemId || (!dndDraggingItem && isFirstItem) ? 0 : -1),\n    [dndDraggingItem, isFirstItem, toolbarItemId],\n  );\n\n  const handlers = useToolbarItemHandlers(toolbarItemId);\n  return (\n    <StyledToolbarItem\n      id={toolbarItemId}\n      data-testid=\"ds-toolbar-item\"\n      className=\"ds-toolbar-item\"\n      {...handlers}\n      {...restGlobals}\n    >\n      <ComponentRenderer innerRef={ref} tabIndex={tabIndex} />\n    </StyledToolbarItem>\n  );\n};\n\nDSToolbarItemV2.propTypes = DSToolbarItemV2Schema;\n\nDSToolbarItemV2.displayName = DSToolbarItemName;\nconst DSToolbarItemV2WithSchema = describe(DSToolbarItemV2).description('Toolbar Item');\nDSToolbarItemV2WithSchema.propTypes = DSToolbarItemV2Schema;\n\nexport { DSToolbarItemV2, DSToolbarItemV2WithSchema };\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;AD6CjB;AA5CN,mBAAmD;AACnD,8BAKO;AACP,iBAAoB;AACpB,gCAAmC;AACnC,oBAAkC;AAClC,oCAAuC;AACvC,mCAAwD;AAExD,kCAAkC;AAElC,MAAM,kBAA6D,CAAC,UAAU;AAC5E,QAAM,wBAAoB,sDAA6B,OAAO,6CAAgB;AAE9E,8DAA+B,mBAAmB,oDAAuB,6CAAiB;AAC1F,QAAM,EAAE,QAAQ,mBAAmB,YAAY,IAAI;AACnD,QAAM,EAAE,IAAI,YAAY,GAAG,YAAY,QAAI,gDAAuB,iBAAiB;AACnF,QAAM,EAAE,mBAAmB,gBAAgB,QAAI,yBAAW,4CAAkB;AAC5E,QAAM,UAAM,qBAA2B,IAAI;AAE3C,QAAM,oBAAgB,sBAAQ,MAAM;AAClC,UAAM,KAAK,cAAc,uBAAmB,gBAAI;AAChD,sBAAkB,IAAI,GAAG;AACzB,WAAO;AAAA,EACT,GAAG,CAAC,mBAAmB,KAAK,UAAU,CAAC;AAEvC,QAAM,eAAW;AAAA,IACf,MAAO,oBAAoB,iBAAkB,CAAC,mBAAmB,cAAe,IAAI;AAAA,IACpF,CAAC,iBAAiB,aAAa,aAAa;AAAA,EAC9C;AAEA,QAAM,eAAW,sDAAuB,aAAa;AACrD,SACE;AAAA,IAAC;AAAA;AAAA,MACC,IAAI;AAAA,MACJ,eAAY;AAAA,MACZ,WAAU;AAAA,MACT,GAAG;AAAA,MACH,GAAG;AAAA,MAEJ,sDAAC,qBAAkB,UAAU,KAAK,UAAoB;AAAA;AAAA,EACxD;AAEJ;AAEA,gBAAgB,YAAY;AAE5B,gBAAgB,cAAc;AAC9B,MAAM,gCAA4B,kCAAS,eAAe,EAAE,YAAY,cAAc;AACtF,0BAA0B,YAAY;",
+  "sourcesContent": ["/* eslint-disable react/prop-types */\nimport React, { useContext, useMemo, useRef } from 'react';\nimport {\n  describe,\n  useMemoMergePropsWithDefault,\n  useValidateTypescriptPropTypes,\n  useGetGlobalAttributes,\n} from '@elliemae/ds-props-helpers';\nimport { uid } from 'uid';\nimport { omit } from 'lodash';\nimport { DSToolbarV2Context } from './DSToolbarV2Context.js';\nimport { StyledToolbarItem } from './styled.js';\nimport { useToolbarItemHandlers } from './useToolbarItemHandlers.js';\nimport { defaultItemProps, DSToolbarItemV2Schema } from './react-desc-prop-types.js';\nimport type { DSToolbarItemT } from './react-desc-prop-types.js';\nimport { DSToolbarItemName } from './DSToolbarDefinitions.js';\nconst DSToolbarItemV2: React.ComponentType<DSToolbarItemT.Props> = (props) => {\n  const propsWithDefaults = useMemoMergePropsWithDefault<DSToolbarItemT.Props>(props, defaultItemProps);\n\n  useValidateTypescriptPropTypes(propsWithDefaults, DSToolbarItemV2Schema, DSToolbarItemName);\n  const { render: ComponentRenderer, isFirstItem } = propsWithDefaults;\n  const { id: providedId, ...restGlobals } = omit(useGetGlobalAttributes(propsWithDefaults), ['rows', 'cols', 'wrap']);\n  const { registerReference, dndDraggingItem } = useContext(DSToolbarV2Context);\n  const ref = useRef<DSToolbarItemT.RenderHTMLElementT>(null);\n\n  const toolbarItemId = useMemo(() => {\n    const id = providedId ?? `ds-toolbar-item-${uid()}`;\n    registerReference(id, ref);\n    return id;\n  }, [registerReference, ref, providedId]);\n\n  const tabIndex = useMemo(\n    () => (dndDraggingItem === toolbarItemId || (!dndDraggingItem && isFirstItem) ? 0 : -1),\n    [dndDraggingItem, isFirstItem, toolbarItemId],\n  );\n\n  const handlers = useToolbarItemHandlers(toolbarItemId);\n  return (\n    <StyledToolbarItem\n      id={toolbarItemId}\n      data-testid=\"ds-toolbar-item\"\n      className=\"ds-toolbar-item\"\n      {...handlers}\n      {...restGlobals}\n    >\n      <ComponentRenderer innerRef={ref} tabIndex={tabIndex} />\n    </StyledToolbarItem>\n  );\n};\n\nDSToolbarItemV2.propTypes = DSToolbarItemV2Schema;\n\nDSToolbarItemV2.displayName = DSToolbarItemName;\nconst DSToolbarItemV2WithSchema = describe(DSToolbarItemV2).description('Toolbar Item');\nDSToolbarItemV2WithSchema.propTypes = DSToolbarItemV2Schema;\n\nexport { DSToolbarItemV2, DSToolbarItemV2WithSchema };\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;AD6CjB;AA5CN,mBAAmD;AACnD,8BAKO;AACP,iBAAoB;AACpB,oBAAqB;AACrB,gCAAmC;AACnC,oBAAkC;AAClC,oCAAuC;AACvC,mCAAwD;AAExD,kCAAkC;AAClC,MAAM,kBAA6D,CAAC,UAAU;AAC5E,QAAM,wBAAoB,sDAAmD,OAAO,6CAAgB;AAEpG,8DAA+B,mBAAmB,oDAAuB,6CAAiB;AAC1F,QAAM,EAAE,QAAQ,mBAAmB,YAAY,IAAI;AACnD,QAAM,EAAE,IAAI,YAAY,GAAG,YAAY,QAAI,wBAAK,gDAAuB,iBAAiB,GAAG,CAAC,QAAQ,QAAQ,MAAM,CAAC;AACnH,QAAM,EAAE,mBAAmB,gBAAgB,QAAI,yBAAW,4CAAkB;AAC5E,QAAM,UAAM,qBAA0C,IAAI;AAE1D,QAAM,oBAAgB,sBAAQ,MAAM;AAClC,UAAM,KAAK,cAAc,uBAAmB,gBAAI;AAChD,sBAAkB,IAAI,GAAG;AACzB,WAAO;AAAA,EACT,GAAG,CAAC,mBAAmB,KAAK,UAAU,CAAC;AAEvC,QAAM,eAAW;AAAA,IACf,MAAO,oBAAoB,iBAAkB,CAAC,mBAAmB,cAAe,IAAI;AAAA,IACpF,CAAC,iBAAiB,aAAa,aAAa;AAAA,EAC9C;AAEA,QAAM,eAAW,sDAAuB,aAAa;AACrD,SACE;AAAA,IAAC;AAAA;AAAA,MACC,IAAI;AAAA,MACJ,eAAY;AAAA,MACZ,WAAU;AAAA,MACT,GAAG;AAAA,MACH,GAAG;AAAA,MAEJ,sDAAC,qBAAkB,UAAU,KAAK,UAAoB;AAAA;AAAA,EACxD;AAEJ;AAEA,gBAAgB,YAAY;AAE5B,gBAAgB,cAAc;AAC9B,MAAM,gCAA4B,kCAAS,eAAe,EAAE,YAAY,cAAc;AACtF,0BAA0B,YAAY;",
   "names": []
 }

package/dist/cjs/DSToolbarV2.js

@@ -37,6 +37,7 @@ var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
 var import_ds_props_helpers = require("@elliemae/ds-props-helpers");
 var import_uid = require("uid");
+var import_lodash = require("lodash");
 var import_DSToolbarV2Context = require("./DSToolbarV2Context.js");
 var import_react_desc_prop_types = require("./react-desc-prop-types.js");
 var import_styled = require("./styled.js");
@@ -45,8 +46,8 @@ const DSToolbarV2 = (props) => {
   const propsWithDefaults = (0, import_ds_props_helpers.useMemoMergePropsWithDefault)(props, import_react_desc_prop_types.defaultProps);
   (0, import_ds_props_helpers.useValidateTypescriptPropTypes)(propsWithDefaults, import_react_desc_prop_types.DSToolbarV2Schema, import_DSToolbarDefinitions.DSToolbarName);
   const { alignment, withDepth, compact, innerRef, children } = propsWithDefaults;
-  const globalsProps = (0, import_ds_props_helpers.useGetGlobalAttributes)(propsWithDefaults);
-  const toolbarUid = (0, import_react.useMemo)(() => globalsProps.id ?? `ds-toolbar-${(0, import_uid.uid)()}`, []);
+  const globalsProps = (0, import_lodash.omit)((0, import_ds_props_helpers.useGetGlobalAttributes)(propsWithDefaults), ["cols", "rows", "wrap"]);
+  const toolbarUid = (0, import_react.useMemo)(() => globalsProps.id ?? `ds-toolbar-${(0, import_uid.uid)()}`, [globalsProps.id]);
   const [itemReferences, setItemReferences] = (0, import_react.useState)({});
   const [dndDraggingItem, setDndDraggingItem] = (0, import_react.useState)("");
   const registerReference = (0, import_react.useCallback)(

package/dist/cjs/DSToolbarV2.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/DSToolbarV2.tsx", "../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["/* eslint-disable react/prop-types */\nimport React, { useCallback, useMemo, useState } from 'react';\nimport {\n  useMemoMergePropsWithDefault,\n  useValidateTypescriptPropTypes,\n  useGetGlobalAttributes,\n  describe,\n} from '@elliemae/ds-props-helpers';\nimport { uid } from 'uid';\nimport { DSToolbarV2Context } from './DSToolbarV2Context.js';\nimport { DSToolbarV2Schema, defaultProps } from './react-desc-prop-types.js';\nimport { StyledToolbarWrapper } from './styled.js';\nimport type { DSToolbarT, DSToolbarItemT } from './react-desc-prop-types.js';\nimport { DSToolbarName } from './DSToolbarDefinitions.js';\n\nconst DSToolbarV2: React.ComponentType<DSToolbarT.Props> = (props) => {\n  const propsWithDefaults = useMemoMergePropsWithDefault(props, defaultProps);\n\n  useValidateTypescriptPropTypes(propsWithDefaults, DSToolbarV2Schema, DSToolbarName);\n\n  const { alignment, withDepth, compact, innerRef, children } = propsWithDefaults;\n\n  const globalsProps = useGetGlobalAttributes(propsWithDefaults);\n\n  const toolbarUid = useMemo(() => globalsProps.id ?? `ds-toolbar-${uid()}`, []);\n\n  const [itemReferences, setItemReferences] = useState({});\n  const [dndDraggingItem, setDndDraggingItem] = useState('');\n\n  const registerReference = useCallback(\n    (itemId: string, ref: React.MutableRefObject<DSToolbarItemT.RenderHTMLElementT>) => {\n      setItemReferences((prevItemReferences) => ({ ...prevItemReferences, [itemId]: ref }));\n    },\n    [setItemReferences],\n  );\n\n  const ctx = useMemo(\n    () => ({ toolbarUid, registerReference, itemReferences, dndDraggingItem, setDndDraggingItem }),\n    [dndDraggingItem, itemReferences, registerReference, toolbarUid],\n  );\n\n  return (\n    <DSToolbarV2Context.Provider value={ctx}>\n      <StyledToolbarWrapper\n        role=\"toolbar\"\n        data-testid=\"ds-toolbar-wrapper\"\n        id={toolbarUid}\n        alignItems=\"center\"\n        justifyContent={alignment === 'left' ? 'flex-start' : 'flex-end'}\n        withDepth={withDepth}\n        gutter=\"xxs2\"\n        compact={compact}\n        ref={innerRef}\n        {...globalsProps}\n      >\n        {children}\n      </StyledToolbarWrapper>\n    </DSToolbarV2Context.Provider>\n  );\n};\n\nDSToolbarV2.propTypes = DSToolbarV2Schema;\n\nDSToolbarV2.displayName = DSToolbarName;\nconst DSToolbarV2WithSchema = describe(DSToolbarV2).description('Toolbar');\nDSToolbarV2WithSchema.propTypes = DSToolbarV2Schema;\n\nexport { DSToolbarV2, DSToolbarV2WithSchema };\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;AD2CjB;AA1CN,mBAAsD;AACtD,8BAKO;AACP,iBAAoB;AACpB,gCAAmC;AACnC,mCAAgD;AAChD,oBAAqC;AAErC,kCAA8B;AAE9B,MAAM,cAAqD,CAAC,UAAU;AACpE,QAAM,wBAAoB,sDAA6B,OAAO,yCAAY;AAE1E,8DAA+B,mBAAmB,gDAAmB,yCAAa;AAElF,QAAM,EAAE,WAAW,WAAW,SAAS,UAAU,SAAS,IAAI;AAE9D,QAAM,mBAAe,gDAAuB,iBAAiB;AAE7D,QAAM,iBAAa,sBAAQ,MAAM,aAAa,MAAM,kBAAc,gBAAI,KAAK,CAAC,CAAC;AAE7E,QAAM,CAAC,gBAAgB,iBAAiB,QAAI,uBAAS,CAAC,CAAC;AACvD,QAAM,CAAC,iBAAiB,kBAAkB,QAAI,uBAAS,EAAE;AAEzD,QAAM,wBAAoB;AAAA,IACxB,CAAC,QAAgB,QAAmE;AAClF,wBAAkB,CAAC,wBAAwB,EAAE,GAAG,oBAAoB,CAAC,MAAM,GAAG,IAAI,EAAE;AAAA,IACtF;AAAA,IACA,CAAC,iBAAiB;AAAA,EACpB;AAEA,QAAM,UAAM;AAAA,IACV,OAAO,EAAE,YAAY,mBAAmB,gBAAgB,iBAAiB,mBAAmB;AAAA,IAC5F,CAAC,iBAAiB,gBAAgB,mBAAmB,UAAU;AAAA,EACjE;AAEA,SACE,4CAAC,6CAAmB,UAAnB,EAA4B,OAAO,KAClC;AAAA,IAAC;AAAA;AAAA,MACC,MAAK;AAAA,MACL,eAAY;AAAA,MACZ,IAAI;AAAA,MACJ,YAAW;AAAA,MACX,gBAAgB,cAAc,SAAS,eAAe;AAAA,MACtD;AAAA,MACA,QAAO;AAAA,MACP;AAAA,MACA,KAAK;AAAA,MACJ,GAAG;AAAA,MAEH;AAAA;AAAA,EACH,GACF;AAEJ;AAEA,YAAY,YAAY;AAExB,YAAY,cAAc;AAC1B,MAAM,4BAAwB,kCAAS,WAAW,EAAE,YAAY,SAAS;AACzE,sBAAsB,YAAY;",
+  "sourcesContent": ["/* eslint-disable react/prop-types */\nimport React, { useCallback, useMemo, useState } from 'react';\nimport {\n  useMemoMergePropsWithDefault,\n  useValidateTypescriptPropTypes,\n  useGetGlobalAttributes,\n  describe,\n} from '@elliemae/ds-props-helpers';\nimport { uid } from 'uid';\nimport { omit } from 'lodash';\nimport { DSToolbarV2Context } from './DSToolbarV2Context.js';\nimport { DSToolbarV2Schema, defaultProps } from './react-desc-prop-types.js';\nimport { StyledToolbarWrapper } from './styled.js';\nimport type { DSToolbarT, DSToolbarItemT } from './react-desc-prop-types.js';\nimport { DSToolbarName } from './DSToolbarDefinitions.js';\nconst DSToolbarV2: React.ComponentType<DSToolbarT.Props> = (props) => {\n  const propsWithDefaults = useMemoMergePropsWithDefault<DSToolbarT.InternalProps>(props, defaultProps);\n\n  useValidateTypescriptPropTypes(propsWithDefaults, DSToolbarV2Schema, DSToolbarName);\n\n  const { alignment, withDepth, compact, innerRef, children } = propsWithDefaults;\n\n  const globalsProps = omit(useGetGlobalAttributes(propsWithDefaults), ['cols', 'rows', 'wrap']);\n\n  const toolbarUid = useMemo(() => globalsProps.id ?? `ds-toolbar-${uid()}`, [globalsProps.id]);\n\n  const [itemReferences, setItemReferences] = useState({});\n  const [dndDraggingItem, setDndDraggingItem] = useState('');\n\n  const registerReference = useCallback(\n    (itemId: string, ref: React.MutableRefObject<DSToolbarItemT.RenderHTMLElementT>) => {\n      setItemReferences((prevItemReferences) => ({ ...prevItemReferences, [itemId]: ref }));\n    },\n    [setItemReferences],\n  );\n\n  const ctx = useMemo(\n    () => ({ toolbarUid, registerReference, itemReferences, dndDraggingItem, setDndDraggingItem }),\n    [dndDraggingItem, itemReferences, registerReference, toolbarUid],\n  );\n\n  return (\n    <DSToolbarV2Context.Provider value={ctx}>\n      <StyledToolbarWrapper\n        role=\"toolbar\"\n        data-testid=\"ds-toolbar-wrapper\"\n        id={toolbarUid}\n        alignItems=\"center\"\n        justifyContent={alignment === 'left' ? 'flex-start' : 'flex-end'}\n        withDepth={withDepth}\n        gutter=\"xxs2\"\n        compact={compact}\n        ref={innerRef}\n        {...globalsProps}\n      >\n        {children}\n      </StyledToolbarWrapper>\n    </DSToolbarV2Context.Provider>\n  );\n};\n\nDSToolbarV2.propTypes = DSToolbarV2Schema;\n\nDSToolbarV2.displayName = DSToolbarName;\nconst DSToolbarV2WithSchema = describe(DSToolbarV2).description('Toolbar');\nDSToolbarV2WithSchema.propTypes = DSToolbarV2Schema;\n\nexport { DSToolbarV2, DSToolbarV2WithSchema };\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;AD2CjB;AA1CN,mBAAsD;AACtD,8BAKO;AACP,iBAAoB;AACpB,oBAAqB;AACrB,gCAAmC;AACnC,mCAAgD;AAChD,oBAAqC;AAErC,kCAA8B;AAC9B,MAAM,cAAqD,CAAC,UAAU;AACpE,QAAM,wBAAoB,sDAAuD,OAAO,yCAAY;AAEpG,8DAA+B,mBAAmB,gDAAmB,yCAAa;AAElF,QAAM,EAAE,WAAW,WAAW,SAAS,UAAU,SAAS,IAAI;AAE9D,QAAM,mBAAe,wBAAK,gDAAuB,iBAAiB,GAAG,CAAC,QAAQ,QAAQ,MAAM,CAAC;AAE7F,QAAM,iBAAa,sBAAQ,MAAM,aAAa,MAAM,kBAAc,gBAAI,KAAK,CAAC,aAAa,EAAE,CAAC;AAE5F,QAAM,CAAC,gBAAgB,iBAAiB,QAAI,uBAAS,CAAC,CAAC;AACvD,QAAM,CAAC,iBAAiB,kBAAkB,QAAI,uBAAS,EAAE;AAEzD,QAAM,wBAAoB;AAAA,IACxB,CAAC,QAAgB,QAAmE;AAClF,wBAAkB,CAAC,wBAAwB,EAAE,GAAG,oBAAoB,CAAC,MAAM,GAAG,IAAI,EAAE;AAAA,IACtF;AAAA,IACA,CAAC,iBAAiB;AAAA,EACpB;AAEA,QAAM,UAAM;AAAA,IACV,OAAO,EAAE,YAAY,mBAAmB,gBAAgB,iBAAiB,mBAAmB;AAAA,IAC5F,CAAC,iBAAiB,gBAAgB,mBAAmB,UAAU;AAAA,EACjE;AAEA,SACE,4CAAC,6CAAmB,UAAnB,EAA4B,OAAO,KAClC;AAAA,IAAC;AAAA;AAAA,MACC,MAAK;AAAA,MACL,eAAY;AAAA,MACZ,IAAI;AAAA,MACJ,YAAW;AAAA,MACX,gBAAgB,cAAc,SAAS,eAAe;AAAA,MACtD;AAAA,MACA,QAAO;AAAA,MACP;AAAA,MACA,KAAK;AAAA,MACJ,GAAG;AAAA,MAEH;AAAA;AAAA,EACH,GACF;AAEJ;AAEA,YAAY,YAAY;AAExB,YAAY,cAAc;AAC1B,MAAM,4BAAwB,kCAAS,WAAW,EAAE,YAAY,SAAS;AACzE,sBAAsB,YAAY;",
   "names": []
 }

package/dist/cjs/DSToolbarV2Context.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/DSToolbarV2Context.tsx", "../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["import type { MutableRefObject } from 'react';\nimport { createContext } from 'react';\ninterface IDSToolbarV2Context {\n  registerReference: (uid: string, ref: MutableRefObject<HTMLElement | null>) => void;\n  itemReferences: Record<string, MutableRefObject<HTMLElement | null>>;\n  toolbarUid: string;\n  dndDraggingItem: string;\n  setDndDraggingItem: React.Dispatch<React.SetStateAction<string>>;\n}\n\nexport const DSToolbarV2Context = createContext<IDSToolbarV2Context>({\n  registerReference: () => null,\n  itemReferences: {},\n  toolbarUid: '',\n  dndDraggingItem: '',\n  setDndDraggingItem: () => {},\n});\n", "import * as React from 'react';\nexport { React };\n"],
+  "sourcesContent": ["import type { MutableRefObject } from 'react';\nimport { createContext } from 'react';\nimport { type DSToolbarItemT } from 'react-desc-prop-types';\ninterface IDSToolbarV2Context {\n  registerReference: (uid: string, ref: React.MutableRefObject<DSToolbarItemT.RenderHTMLElementT>) => void;\n  itemReferences: Record<string, MutableRefObject<HTMLElement | null>>;\n  toolbarUid: string;\n  dndDraggingItem: string;\n  setDndDraggingItem: React.Dispatch<React.SetStateAction<string>>;\n}\nexport const DSToolbarV2Context = createContext<IDSToolbarV2Context>({\n  registerReference: () => null,\n  itemReferences: {},\n  toolbarUid: '',\n  dndDraggingItem: '',\n  setDndDraggingItem: () => {},\n});\n", "import * as React from 'react';\nexport { React };\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADCvB,mBAA8B;AASvB,MAAM,yBAAqB,4BAAmC;AAAA,EACnE,mBAAmB,MAAM;AAAA,EACzB,gBAAgB,CAAC;AAAA,EACjB,YAAY;AAAA,EACZ,iBAAiB;AAAA,EACjB,oBAAoB,MAAM;AAAA,EAAC;AAC7B,CAAC;",
   "names": []
 }

package/dist/cjs/index.js

@@ -5,10 +5,6 @@ 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))
@@ -28,13 +24,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var src_exports = {};
-__export(src_exports, {
-  default: () => import_deprecated.default
-});
 module.exports = __toCommonJS(src_exports);
 var React = __toESM(require("react"));
-__reExport(src_exports, require("./deprecated/index.js"), module.exports);
-var import_deprecated = __toESM(require("./deprecated/index.js"));
+__reExport(src_exports, require("@elliemae/ds-toolbar-v1"), module.exports);
 __reExport(src_exports, require("./DSToolbarV2.js"), module.exports);
 __reExport(src_exports, require("./DSToolbarItemV2.js"), module.exports);
 __reExport(src_exports, require("./DSToolbarSeparatorV2.js"), module.exports);

package/dist/cjs/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/index.tsx", "../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["export * from './deprecated/index.js';\nexport { default } from './deprecated/index.js';\nexport * from './DSToolbarV2.js';\nexport * from './DSToolbarItemV2.js';\nexport * from './DSToolbarSeparatorV2.js';\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,wBAAc,kCAAd;AACA,wBAAwB;AACxB,wBAAc,6BAFd;AAGA,wBAAc,iCAHd;AAIA,wBAAc,sCAJd;",
+  "sourcesContent": ["export * from '@elliemae/ds-toolbar-v1';\nexport * from './DSToolbarV2.js';\nexport * from './DSToolbarItemV2.js';\nexport * from './DSToolbarSeparatorV2.js';\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;ACAA,YAAuB;ADAvB,wBAAc,oCAAd;AACA,wBAAc,6BADd;AAEA,wBAAc,iCAFd;AAGA,wBAAc,sCAHd;",
   "names": []
 }

package/dist/cjs/react-desc-prop-types.js

@@ -28,17 +28,19 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var react_desc_prop_types_exports = {};
 __export(react_desc_prop_types_exports, {
+  DSToolbarItemV2PropTypes: () => DSToolbarItemV2PropTypes,
   DSToolbarItemV2Schema: () => DSToolbarItemV2Schema,
+  DSToolbarPropTypes: () => DSToolbarPropTypes,
   DSToolbarV2Schema: () => DSToolbarV2Schema,
   defaultItemProps: () => defaultItemProps,
   defaultProps: () => defaultProps
 });
 module.exports = __toCommonJS(react_desc_prop_types_exports);
 var React = __toESM(require("react"));
+var import_jsx_runtime = require("react/jsx-runtime");
 var import_ds_props_helpers = require("@elliemae/ds-props-helpers");
 const defaultItemProps = {
-  render: () => {
-  },
+  render: () => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {}),
   isFirstItem: false
 };
 const defaultProps = {
@@ -46,14 +48,17 @@ const defaultProps = {
   withDepth: true,
   compact: false
 };
-const DSToolbarV2Schema = {
+const DSToolbarPropTypes = {
+  ...import_ds_props_helpers.xstyledPropTypes,
   ...import_ds_props_helpers.globalAttributesPropTypes,
   alignment: import_ds_props_helpers.PropTypes.oneOf(["right", "left"]).description("Whether to align the content left or right").defaultValue("right"),
   withDepth: import_ds_props_helpers.PropTypes.bool.description("Whether to add a box-shadow to the container").defaultValue(true),
   compact: import_ds_props_helpers.PropTypes.bool.description("Whether you want the compact version of the toolbar").defaultValue(false),
   innerRef: import_ds_props_helpers.PropTypes.oneOfType([import_ds_props_helpers.PropTypes.func, import_ds_props_helpers.PropTypes.object]).description("Reference to attach to the wrapper")
 };
-const DSToolbarItemV2Schema = {
+const DSToolbarV2Schema = DSToolbarPropTypes;
+const DSToolbarItemV2PropTypes = {
+  ...import_ds_props_helpers.xstyledPropTypes,
   ...import_ds_props_helpers.globalAttributesPropTypes,
   render: import_ds_props_helpers.PropTypes.func.isRequired.description("render function").defaultValue(() => {
   }),
@@ -61,4 +66,5 @@ const DSToolbarItemV2Schema = {
     "If true the item will have tab index 0 to be the first element focusable by keyboard on the page load"
   ).defaultValue(false)
 };
+const DSToolbarItemV2Schema = DSToolbarPropTypes;
 //# sourceMappingURL=react-desc-prop-types.js.map

package/dist/cjs/react-desc-prop-types.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/react-desc-prop-types.tsx", "../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["import { globalAttributesPropTypes, PropTypes } from '@elliemae/ds-props-helpers';\n\nexport declare namespace DSToolbarT {\n  export interface Props {\n    alignment?: 'left' | 'right';\n    withDepth?: boolean;\n    compact?: boolean;\n    innerRef?: React.MutableRefObject<HTMLDivElement>;\n    children: React.Component<DSToolbarItemT.Props>;\n  }\n}\n\nexport declare namespace DSToolbarItemT {\n  export type RenderHTMLElementT =\n    | HTMLButtonElement\n    | HTMLInputElement\n    | HTMLTextAreaElement\n    | HTMLSelectElement\n    | HTMLOptionElement;\n  export interface Props {\n    render: (props: { innerRef: React.MutableRefObject<HTMLElement | null>; tabIndex: number }) => JSX.Element;\n    isFirstItem?: boolean;\n  }\n}\n\nexport const defaultItemProps = {\n  render: () => {},\n  isFirstItem: false,\n};\n\nexport const defaultProps = {\n  alignment: 'right',\n  withDepth: true,\n  compact: false,\n};\n\nexport const DSToolbarV2Schema = {\n  ...globalAttributesPropTypes,\n  alignment: PropTypes.oneOf(['right', 'left'])\n    .description('Whether to align the content left or right')\n    .defaultValue('right'),\n  withDepth: PropTypes.bool.description('Whether to add a box-shadow to the container').defaultValue(true),\n  compact: PropTypes.bool.description('Whether you want the compact version of the toolbar').defaultValue(false),\n  innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]).description('Reference to attach to the wrapper'),\n};\n\nexport const DSToolbarItemV2Schema = {\n  ...globalAttributesPropTypes,\n  render: PropTypes.func.isRequired.description('render function').defaultValue(() => {}),\n  isFirstItem: PropTypes.bool\n    .description(\n      'If true the item will have tab index 0 to be the first element focusable by keyboard on the page load',\n    )\n    .defaultValue(false),\n};\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,8BAAqD;AAyB9C,MAAM,mBAAmB;AAAA,EAC9B,QAAQ,MAAM;AAAA,EAAC;AAAA,EACf,aAAa;AACf;AAEO,MAAM,eAAe;AAAA,EAC1B,WAAW;AAAA,EACX,WAAW;AAAA,EACX,SAAS;AACX;AAEO,MAAM,oBAAoB;AAAA,EAC/B,GAAG;AAAA,EACH,WAAW,kCAAU,MAAM,CAAC,SAAS,MAAM,CAAC,EACzC,YAAY,4CAA4C,EACxD,aAAa,OAAO;AAAA,EACvB,WAAW,kCAAU,KAAK,YAAY,8CAA8C,EAAE,aAAa,IAAI;AAAA,EACvG,SAAS,kCAAU,KAAK,YAAY,qDAAqD,EAAE,aAAa,KAAK;AAAA,EAC7G,UAAU,kCAAU,UAAU,CAAC,kCAAU,MAAM,kCAAU,MAAM,CAAC,EAAE,YAAY,oCAAoC;AACpH;AAEO,MAAM,wBAAwB;AAAA,EACnC,GAAG;AAAA,EACH,QAAQ,kCAAU,KAAK,WAAW,YAAY,iBAAiB,EAAE,aAAa,MAAM;AAAA,EAAC,CAAC;AAAA,EACtF,aAAa,kCAAU,KACpB;AAAA,IACC;AAAA,EACF,EACC,aAAa,KAAK;AACvB;",
+  "sourcesContent": ["import {\n  globalAttributesPropTypes,\n  xstyledPropTypes,\n  PropTypes,\n  type GlobalAttributesT,\n  type XstyledProps,\n  type DSPropTypesSchema,\n} from '@elliemae/ds-props-helpers';\nimport { type WeakValidationMap } from 'react';\n\nexport declare namespace DSToolbarT {\n  export interface DefaultProps {\n    alignment: 'left' | 'right';\n    withDepth: boolean;\n    compact: boolean;\n  }\n\n  export interface OptionalProps {\n    innerRef?: React.MutableRefObject<HTMLDivElement>;\n    children?: React.ReactNode;\n  }\n\n  export interface Props\n    extends Partial<DefaultProps>,\n      OptionalProps,\n      Omit<GlobalAttributesT<HTMLButtonElement>, keyof DefaultProps | keyof OptionalProps>,\n      XstyledProps {}\n  export interface InternalProps\n    extends DefaultProps,\n      OptionalProps,\n      Omit<GlobalAttributesT<HTMLButtonElement>, keyof DefaultProps | keyof OptionalProps>,\n      XstyledProps {}\n}\n\nexport declare namespace DSToolbarItemT {\n  export type RenderHTMLElementT =\n    | HTMLElement\n    | HTMLButtonElement\n    | HTMLInputElement\n    | HTMLTextAreaElement\n    | HTMLSelectElement\n    | HTMLOptionElement\n    | null;\n\n  export interface Props {\n    render: <T>(props: { innerRef: React.MutableRefObject<T>; tabIndex: number }) => JSX.Element;\n    isFirstItem?: boolean;\n  }\n}\n\nexport const defaultItemProps: DSToolbarItemT.Props = {\n  render: () => <></>,\n  isFirstItem: false,\n};\n\nexport const defaultProps: DSToolbarT.DefaultProps = {\n  alignment: 'right',\n  withDepth: true,\n  compact: false,\n};\n\nexport const DSToolbarPropTypes: DSPropTypesSchema<DSToolbarT.Props> = {\n  ...xstyledPropTypes,\n  ...globalAttributesPropTypes,\n  alignment: PropTypes.oneOf(['right', 'left'])\n    .description('Whether to align the content left or right')\n    .defaultValue('right'),\n  withDepth: PropTypes.bool.description('Whether to add a box-shadow to the container').defaultValue(true),\n  compact: PropTypes.bool.description('Whether you want the compact version of the toolbar').defaultValue(false),\n  innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]).description('Reference to attach to the wrapper'),\n};\n\nexport const DSToolbarV2Schema = DSToolbarPropTypes as unknown as WeakValidationMap<DSToolbarT.Props>;\n\nexport const DSToolbarItemV2PropTypes = {\n  ...xstyledPropTypes,\n  ...globalAttributesPropTypes,\n  render: PropTypes.func.isRequired.description('render function').defaultValue(() => {}),\n  isFirstItem: PropTypes.bool\n    .description(\n      'If true the item will have tab index 0 to be the first element focusable by keyboard on the page load',\n    )\n    .defaultValue(false),\n};\n\nexport const DSToolbarItemV2Schema = DSToolbarPropTypes as unknown as WeakValidationMap<DSToolbarItemT.Props>;\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADmDP;AAnDhB,8BAOO;AA2CA,MAAM,mBAAyC;AAAA,EACpD,QAAQ,MAAM,2EAAE;AAAA,EAChB,aAAa;AACf;AAEO,MAAM,eAAwC;AAAA,EACnD,WAAW;AAAA,EACX,WAAW;AAAA,EACX,SAAS;AACX;AAEO,MAAM,qBAA0D;AAAA,EACrE,GAAG;AAAA,EACH,GAAG;AAAA,EACH,WAAW,kCAAU,MAAM,CAAC,SAAS,MAAM,CAAC,EACzC,YAAY,4CAA4C,EACxD,aAAa,OAAO;AAAA,EACvB,WAAW,kCAAU,KAAK,YAAY,8CAA8C,EAAE,aAAa,IAAI;AAAA,EACvG,SAAS,kCAAU,KAAK,YAAY,qDAAqD,EAAE,aAAa,KAAK;AAAA,EAC7G,UAAU,kCAAU,UAAU,CAAC,kCAAU,MAAM,kCAAU,MAAM,CAAC,EAAE,YAAY,oCAAoC;AACpH;AAEO,MAAM,oBAAoB;AAE1B,MAAM,2BAA2B;AAAA,EACtC,GAAG;AAAA,EACH,GAAG;AAAA,EACH,QAAQ,kCAAU,KAAK,WAAW,YAAY,iBAAiB,EAAE,aAAa,MAAM;AAAA,EAAC,CAAC;AAAA,EACtF,aAAa,kCAAU,KACpB;AAAA,IACC;AAAA,EACF,EACC,aAAa,KAAK;AACvB;AAEO,MAAM,wBAAwB;",
   "names": []
 }

package/dist/cjs/styled.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/styled.tsx", "../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["import { styled } from '@elliemae/ds-system';\nimport Grid from '@elliemae/ds-grid';\n\nexport const StyledToolbarWrapper = styled(Grid)`\n  background-color: ${(props) => props.theme.colors.neutral['000']};\n\n  min-height: ${(props) => (props.compact ? '28px' : '36px')};\n  max-height: ${(props) => props.theme.space.xxl};\n\n  padding: 0 ${(props) => props.theme.space.xxs};\n  grid-auto-flow: column;\n  box-shadow: ${(props) => (!props.withDepth ? 'none' : '0 1px 5px 0 rgb(0 0 0 / 13%), 0 2px 4px 0 rgb(0 0 0 / 20%)')};\n`;\n\nexport const StyledToolbarItem = styled(Grid)``;\n\nexport const StyledSeparator = styled(Grid)`\n  height: 30px;\n  width: 1px;\n  background-color: ${(props) => props.theme.colors.neutral[200]};\n`;\n", "import * as React from 'react';\nexport { React };\n"],
+  "sourcesContent": ["import { styled } from '@elliemae/ds-system';\nimport Grid from '@elliemae/ds-grid';\n\nexport const StyledToolbarWrapper = styled(Grid)<{ compact: boolean; withDepth: boolean }>`\n  background-color: ${(props) => props.theme.colors.neutral['000']};\n\n  min-height: ${(props) => (props.compact ? '28px' : '36px')};\n  max-height: ${(props) => props.theme.space.xxl};\n\n  padding: 0 ${(props) => props.theme.space.xxs};\n  grid-auto-flow: column;\n  box-shadow: ${(props) => (!props.withDepth ? 'none' : '0 1px 5px 0 rgb(0 0 0 / 13%), 0 2px 4px 0 rgb(0 0 0 / 20%)')};\n`;\n\nexport const StyledToolbarItem = styled(Grid)``;\n\nexport const StyledSeparator = styled(Grid)`\n  height: 30px;\n  width: 1px;\n  background-color: ${(props) => props.theme.colors.neutral[200]};\n`;\n", "import * as React from 'react';\nexport { React };\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,uBAAuB;AACvB,qBAAiB;AAEV,MAAM,2BAAuB,yBAAO,eAAAA,OAAI;AAAA,sBACzB,CAAC,UAAU,MAAM,MAAM,OAAO,QAAQ,KAAK;AAAA;AAAA,gBAEjD,CAAC,UAAW,MAAM,UAAU,SAAS;AAAA,gBACrC,CAAC,UAAU,MAAM,MAAM,MAAM;AAAA;AAAA,eAE9B,CAAC,UAAU,MAAM,MAAM,MAAM;AAAA;AAAA,gBAE5B,CAAC,UAAW,CAAC,MAAM,YAAY,SAAS;AAAA;AAGjD,MAAM,wBAAoB,yBAAO,eAAAA,OAAI;AAErC,MAAM,sBAAkB,yBAAO,eAAAA,OAAI;AAAA;AAAA;AAAA,sBAGpB,CAAC,UAAU,MAAM,MAAM,OAAO,QAAQ,GAAG;AAAA;",
   "names": ["Grid"]
 }

package/dist/cjs/useToolbarItemHandlers.js

@@ -53,7 +53,7 @@ const useToolbarItemHandlers = (toolbarItemId) => {
       const toolbarItemIndex = toolbarItems.findIndex((domElem) => domElem.id === toolbarItemId);
       const criteria = (item) => {
         const ref = itemReferences[item.id];
-        return !ref.current.disabled;
+        return !ref.current?.getAttribute("disabled");
       };
       if (["ArrowLeft", "ArrowRight"].includes(e.code)) {
         nextToolbarItemIndex = findInCircularList(

package/dist/cjs/useToolbarItemHandlers.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/useToolbarItemHandlers.tsx", "../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["import { useCallback, useContext } from 'react';\nimport { DSToolbarV2Context } from './DSToolbarV2Context.js';\n\nconst findInCircularList = (\n  list: Element[],\n  from: number,\n  criteria: (item: Element) => boolean,\n  step = 1,\n  // eslint-disable-next-line max-params\n): number => {\n  for (\n    let i = (from + step + list.length) % list.length;\n    i !== from && from > -1;\n    i = (i + step + list.length) % list.length\n  ) {\n    if (criteria(list[i])) return i;\n  }\n  return from; // return same item\n};\n\nexport const useToolbarItemHandlers = (\n  toolbarItemId: string,\n): {\n  onKeyDown: React.KeyboardEventHandler;\n  onFocus: React.FocusEventHandler;\n} => {\n  const { toolbarUid, itemReferences, setDndDraggingItem } = useContext(DSToolbarV2Context);\n\n  const onFocus: React.FocusEventHandler = useCallback(() => {\n    setDndDraggingItem(toolbarItemId);\n  }, [setDndDraggingItem, toolbarItemId]);\n\n  const onKeyDown: React.KeyboardEventHandler = useCallback(\n    (e) => {\n      const toolbarItems = [...document.querySelectorAll(`#${toolbarUid} .ds-toolbar-item`)];\n      let nextToolbarItemIndex = -1;\n      const toolbarItemIndex = toolbarItems.findIndex((domElem) => domElem.id === toolbarItemId);\n\n      const criteria = (item: Element) => {\n        const ref = itemReferences[item.id];\n\n        return !ref.current.disabled;\n      };\n\n      if (['ArrowLeft', 'ArrowRight'].includes(e.code)) {\n        nextToolbarItemIndex = findInCircularList(\n          toolbarItems,\n          toolbarItemIndex,\n          criteria,\n          e.code === 'ArrowLeft' ? -1 : 1,\n        );\n      } else if (e.code === 'Home') {\n        nextToolbarItemIndex = 0;\n      } else if (e.code === 'End') {\n        nextToolbarItemIndex = toolbarItems.length - 1;\n      }\n\n      if (nextToolbarItemIndex >= 0 && nextToolbarItemIndex < toolbarItems.length) {\n        e.preventDefault();\n        e.stopPropagation();\n        const ref = itemReferences[toolbarItems[nextToolbarItemIndex].id];\n        if (ref.current) ref.current.focus();\n      }\n    },\n    [toolbarUid, toolbarItemId, itemReferences],\n  );\n\n  return { onKeyDown, onFocus };\n};\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,mBAAwC;AACxC,gCAAmC;AAEnC,MAAM,qBAAqB,CACzB,MACA,MACA,UACA,OAAO,MAEI;AACX,WACM,KAAK,OAAO,OAAO,KAAK,UAAU,KAAK,QAC3C,MAAM,QAAQ,OAAO,IACrB,KAAK,IAAI,OAAO,KAAK,UAAU,KAAK,QACpC;AACA,QAAI,SAAS,KAAK,CAAC,CAAC;AAAG,aAAO;AAAA,EAChC;AACA,SAAO;AACT;AAEO,MAAM,yBAAyB,CACpC,kBAIG;AACH,QAAM,EAAE,YAAY,gBAAgB,mBAAmB,QAAI,yBAAW,4CAAkB;AAExF,QAAM,cAAmC,0BAAY,MAAM;AACzD,uBAAmB,aAAa;AAAA,EAClC,GAAG,CAAC,oBAAoB,aAAa,CAAC;AAEtC,QAAM,gBAAwC;AAAA,IAC5C,CAAC,MAAM;AACL,YAAM,eAAe,CAAC,GAAG,SAAS,iBAAiB,IAAI,6BAA6B,CAAC;AACrF,UAAI,uBAAuB;AAC3B,YAAM,mBAAmB,aAAa,UAAU,CAAC,YAAY,QAAQ,OAAO,aAAa;AAEzF,YAAM,WAAW,CAAC,SAAkB;AAClC,cAAM,MAAM,eAAe,KAAK,EAAE;AAElC,eAAO,CAAC,IAAI,QAAQ;AAAA,MACtB;AAEA,UAAI,CAAC,aAAa,YAAY,EAAE,SAAS,EAAE,IAAI,GAAG;AAChD,+BAAuB;AAAA,UACrB;AAAA,UACA;AAAA,UACA;AAAA,UACA,EAAE,SAAS,cAAc,KAAK;AAAA,QAChC;AAAA,MACF,WAAW,EAAE,SAAS,QAAQ;AAC5B,+BAAuB;AAAA,MACzB,WAAW,EAAE,SAAS,OAAO;AAC3B,+BAAuB,aAAa,SAAS;AAAA,MAC/C;AAEA,UAAI,wBAAwB,KAAK,uBAAuB,aAAa,QAAQ;AAC3E,UAAE,eAAe;AACjB,UAAE,gBAAgB;AAClB,cAAM,MAAM,eAAe,aAAa,oBAAoB,EAAE,EAAE;AAChE,YAAI,IAAI;AAAS,cAAI,QAAQ,MAAM;AAAA,MACrC;AAAA,IACF;AAAA,IACA,CAAC,YAAY,eAAe,cAAc;AAAA,EAC5C;AAEA,SAAO,EAAE,WAAW,QAAQ;AAC9B;",
+  "sourcesContent": ["import { useCallback, useContext } from 'react';\nimport { DSToolbarV2Context } from './DSToolbarV2Context.js';\nconst findInCircularList = (\n  list: Element[],\n  from: number,\n  criteria: (item: Element) => boolean,\n  step = 1,\n  // eslint-disable-next-line max-params\n): number => {\n  for (\n    let i = (from + step + list.length) % list.length;\n    i !== from && from > -1;\n    i = (i + step + list.length) % list.length\n  ) {\n    if (criteria(list[i])) return i;\n  }\n  return from; // return same item\n};\n\nexport const useToolbarItemHandlers = (\n  toolbarItemId: string,\n): {\n  onKeyDown: React.KeyboardEventHandler;\n  onFocus: React.FocusEventHandler;\n} => {\n  const { toolbarUid, itemReferences, setDndDraggingItem } = useContext(DSToolbarV2Context);\n\n  const onFocus: React.FocusEventHandler = useCallback(() => {\n    setDndDraggingItem(toolbarItemId);\n  }, [setDndDraggingItem, toolbarItemId]);\n\n  const onKeyDown: React.KeyboardEventHandler = useCallback(\n    (e) => {\n      const toolbarItems = [...document.querySelectorAll(`#${toolbarUid} .ds-toolbar-item`)];\n      let nextToolbarItemIndex = -1;\n      const toolbarItemIndex = toolbarItems.findIndex((domElem) => domElem.id === toolbarItemId);\n\n      const criteria = (item: Element) => {\n        const ref = itemReferences[item.id];\n\n        return !ref.current?.getAttribute('disabled');\n      };\n\n      if (['ArrowLeft', 'ArrowRight'].includes(e.code)) {\n        nextToolbarItemIndex = findInCircularList(\n          toolbarItems,\n          toolbarItemIndex,\n          criteria,\n          e.code === 'ArrowLeft' ? -1 : 1,\n        );\n      } else if (e.code === 'Home') {\n        nextToolbarItemIndex = 0;\n      } else if (e.code === 'End') {\n        nextToolbarItemIndex = toolbarItems.length - 1;\n      }\n\n      if (nextToolbarItemIndex >= 0 && nextToolbarItemIndex < toolbarItems.length) {\n        e.preventDefault();\n        e.stopPropagation();\n        const ref = itemReferences[toolbarItems[nextToolbarItemIndex].id];\n        if (ref.current) ref.current.focus();\n      }\n    },\n    [toolbarUid, toolbarItemId, itemReferences],\n  );\n\n  return { onKeyDown, onFocus };\n};\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,mBAAwC;AACxC,gCAAmC;AACnC,MAAM,qBAAqB,CACzB,MACA,MACA,UACA,OAAO,MAEI;AACX,WACM,KAAK,OAAO,OAAO,KAAK,UAAU,KAAK,QAC3C,MAAM,QAAQ,OAAO,IACrB,KAAK,IAAI,OAAO,KAAK,UAAU,KAAK,QACpC;AACA,QAAI,SAAS,KAAK,CAAC,CAAC;AAAG,aAAO;AAAA,EAChC;AACA,SAAO;AACT;AAEO,MAAM,yBAAyB,CACpC,kBAIG;AACH,QAAM,EAAE,YAAY,gBAAgB,mBAAmB,QAAI,yBAAW,4CAAkB;AAExF,QAAM,cAAmC,0BAAY,MAAM;AACzD,uBAAmB,aAAa;AAAA,EAClC,GAAG,CAAC,oBAAoB,aAAa,CAAC;AAEtC,QAAM,gBAAwC;AAAA,IAC5C,CAAC,MAAM;AACL,YAAM,eAAe,CAAC,GAAG,SAAS,iBAAiB,IAAI,6BAA6B,CAAC;AACrF,UAAI,uBAAuB;AAC3B,YAAM,mBAAmB,aAAa,UAAU,CAAC,YAAY,QAAQ,OAAO,aAAa;AAEzF,YAAM,WAAW,CAAC,SAAkB;AAClC,cAAM,MAAM,eAAe,KAAK,EAAE;AAElC,eAAO,CAAC,IAAI,SAAS,aAAa,UAAU;AAAA,MAC9C;AAEA,UAAI,CAAC,aAAa,YAAY,EAAE,SAAS,EAAE,IAAI,GAAG;AAChD,+BAAuB;AAAA,UACrB;AAAA,UACA;AAAA,UACA;AAAA,UACA,EAAE,SAAS,cAAc,KAAK;AAAA,QAChC;AAAA,MACF,WAAW,EAAE,SAAS,QAAQ;AAC5B,+BAAuB;AAAA,MACzB,WAAW,EAAE,SAAS,OAAO;AAC3B,+BAAuB,aAAa,SAAS;AAAA,MAC/C;AAEA,UAAI,wBAAwB,KAAK,uBAAuB,aAAa,QAAQ;AAC3E,UAAE,eAAe;AACjB,UAAE,gBAAgB;AAClB,cAAM,MAAM,eAAe,aAAa,oBAAoB,EAAE,EAAE;AAChE,YAAI,IAAI;AAAS,cAAI,QAAQ,MAAM;AAAA,MACrC;AAAA,IACF;AAAA,IACA,CAAC,YAAY,eAAe,cAAc;AAAA,EAC5C;AAEA,SAAO,EAAE,WAAW,QAAQ;AAC9B;",
   "names": []
 }

package/dist/esm/DSToolbarItemV2.js

@@ -8,6 +8,7 @@ import {
   useGetGlobalAttributes
 } from "@elliemae/ds-props-helpers";
 import { uid } from "uid";
+import { omit } from "lodash";
 import { DSToolbarV2Context } from "./DSToolbarV2Context.js";
 import { StyledToolbarItem } from "./styled.js";
 import { useToolbarItemHandlers } from "./useToolbarItemHandlers.js";
@@ -17,7 +18,7 @@ const DSToolbarItemV2 = (props) => {
   const propsWithDefaults = useMemoMergePropsWithDefault(props, defaultItemProps);
   useValidateTypescriptPropTypes(propsWithDefaults, DSToolbarItemV2Schema, DSToolbarItemName);
   const { render: ComponentRenderer, isFirstItem } = propsWithDefaults;
-  const { id: providedId, ...restGlobals } = useGetGlobalAttributes(propsWithDefaults);
+  const { id: providedId, ...restGlobals } = omit(useGetGlobalAttributes(propsWithDefaults), ["rows", "cols", "wrap"]);
   const { registerReference, dndDraggingItem } = useContext(DSToolbarV2Context);
   const ref = useRef(null);
   const toolbarItemId = useMemo(() => {

package/dist/esm/DSToolbarItemV2.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../scripts/build/transpile/react-shim.js", "../../src/DSToolbarItemV2.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable react/prop-types */\nimport React, { useContext, useMemo, useRef } from 'react';\nimport {\n  describe,\n  useMemoMergePropsWithDefault,\n  useValidateTypescriptPropTypes,\n  useGetGlobalAttributes,\n} from '@elliemae/ds-props-helpers';\nimport { uid } from 'uid';\nimport { DSToolbarV2Context } from './DSToolbarV2Context.js';\nimport { StyledToolbarItem } from './styled.js';\nimport { useToolbarItemHandlers } from './useToolbarItemHandlers.js';\nimport { defaultItemProps, DSToolbarItemV2Schema } from './react-desc-prop-types.js';\nimport type { DSToolbarItemT } from './react-desc-prop-types.js';\nimport { DSToolbarItemName } from './DSToolbarDefinitions.js';\n\nconst DSToolbarItemV2: React.ComponentType<DSToolbarItemT.Props> = (props) => {\n  const propsWithDefaults = useMemoMergePropsWithDefault(props, defaultItemProps);\n\n  useValidateTypescriptPropTypes(propsWithDefaults, DSToolbarItemV2Schema, DSToolbarItemName);\n  const { render: ComponentRenderer, isFirstItem } = propsWithDefaults;\n  const { id: providedId, ...restGlobals } = useGetGlobalAttributes(propsWithDefaults);\n  const { registerReference, dndDraggingItem } = useContext(DSToolbarV2Context);\n  const ref = useRef<HTMLElement | null>(null);\n\n  const toolbarItemId = useMemo(() => {\n    const id = providedId ?? `ds-toolbar-item-${uid()}`;\n    registerReference(id, ref);\n    return id;\n  }, [registerReference, ref, providedId]);\n\n  const tabIndex = useMemo(\n    () => (dndDraggingItem === toolbarItemId || (!dndDraggingItem && isFirstItem) ? 0 : -1),\n    [dndDraggingItem, isFirstItem, toolbarItemId],\n  );\n\n  const handlers = useToolbarItemHandlers(toolbarItemId);\n  return (\n    <StyledToolbarItem\n      id={toolbarItemId}\n      data-testid=\"ds-toolbar-item\"\n      className=\"ds-toolbar-item\"\n      {...handlers}\n      {...restGlobals}\n    >\n      <ComponentRenderer innerRef={ref} tabIndex={tabIndex} />\n    </StyledToolbarItem>\n  );\n};\n\nDSToolbarItemV2.propTypes = DSToolbarItemV2Schema;\n\nDSToolbarItemV2.displayName = DSToolbarItemName;\nconst DSToolbarItemV2WithSchema = describe(DSToolbarItemV2).description('Toolbar Item');\nDSToolbarItemV2WithSchema.propTypes = DSToolbarItemV2Schema;\n\nexport { DSToolbarItemV2, DSToolbarItemV2WithSchema };\n"],
-  "mappings": "AAAA,YAAY,WAAW;AC6CjB;AA5CN,SAAgB,YAAY,SAAS,cAAc;AACnD;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,WAAW;AACpB,SAAS,0BAA0B;AACnC,SAAS,yBAAyB;AAClC,SAAS,8BAA8B;AACvC,SAAS,kBAAkB,6BAA6B;AAExD,SAAS,yBAAyB;AAElC,MAAM,kBAA6D,CAAC,UAAU;AAC5E,QAAM,oBAAoB,6BAA6B,OAAO,gBAAgB;AAE9E,iCAA+B,mBAAmB,uBAAuB,iBAAiB;AAC1F,QAAM,EAAE,QAAQ,mBAAmB,YAAY,IAAI;AACnD,QAAM,EAAE,IAAI,YAAY,GAAG,YAAY,IAAI,uBAAuB,iBAAiB;AACnF,QAAM,EAAE,mBAAmB,gBAAgB,IAAI,WAAW,kBAAkB;AAC5E,QAAM,MAAM,OAA2B,IAAI;AAE3C,QAAM,gBAAgB,QAAQ,MAAM;AAClC,UAAM,KAAK,cAAc,mBAAmB,IAAI;AAChD,sBAAkB,IAAI,GAAG;AACzB,WAAO;AAAA,EACT,GAAG,CAAC,mBAAmB,KAAK,UAAU,CAAC;AAEvC,QAAM,WAAW;AAAA,IACf,MAAO,oBAAoB,iBAAkB,CAAC,mBAAmB,cAAe,IAAI;AAAA,IACpF,CAAC,iBAAiB,aAAa,aAAa;AAAA,EAC9C;AAEA,QAAM,WAAW,uBAAuB,aAAa;AACrD,SACE;AAAA,IAAC;AAAA;AAAA,MACC,IAAI;AAAA,MACJ,eAAY;AAAA,MACZ,WAAU;AAAA,MACT,GAAG;AAAA,MACH,GAAG;AAAA,MAEJ,8BAAC,qBAAkB,UAAU,KAAK,UAAoB;AAAA;AAAA,EACxD;AAEJ;AAEA,gBAAgB,YAAY;AAE5B,gBAAgB,cAAc;AAC9B,MAAM,4BAA4B,SAAS,eAAe,EAAE,YAAY,cAAc;AACtF,0BAA0B,YAAY;",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable react/prop-types */\nimport React, { useContext, useMemo, useRef } from 'react';\nimport {\n  describe,\n  useMemoMergePropsWithDefault,\n  useValidateTypescriptPropTypes,\n  useGetGlobalAttributes,\n} from '@elliemae/ds-props-helpers';\nimport { uid } from 'uid';\nimport { omit } from 'lodash';\nimport { DSToolbarV2Context } from './DSToolbarV2Context.js';\nimport { StyledToolbarItem } from './styled.js';\nimport { useToolbarItemHandlers } from './useToolbarItemHandlers.js';\nimport { defaultItemProps, DSToolbarItemV2Schema } from './react-desc-prop-types.js';\nimport type { DSToolbarItemT } from './react-desc-prop-types.js';\nimport { DSToolbarItemName } from './DSToolbarDefinitions.js';\nconst DSToolbarItemV2: React.ComponentType<DSToolbarItemT.Props> = (props) => {\n  const propsWithDefaults = useMemoMergePropsWithDefault<DSToolbarItemT.Props>(props, defaultItemProps);\n\n  useValidateTypescriptPropTypes(propsWithDefaults, DSToolbarItemV2Schema, DSToolbarItemName);\n  const { render: ComponentRenderer, isFirstItem } = propsWithDefaults;\n  const { id: providedId, ...restGlobals } = omit(useGetGlobalAttributes(propsWithDefaults), ['rows', 'cols', 'wrap']);\n  const { registerReference, dndDraggingItem } = useContext(DSToolbarV2Context);\n  const ref = useRef<DSToolbarItemT.RenderHTMLElementT>(null);\n\n  const toolbarItemId = useMemo(() => {\n    const id = providedId ?? `ds-toolbar-item-${uid()}`;\n    registerReference(id, ref);\n    return id;\n  }, [registerReference, ref, providedId]);\n\n  const tabIndex = useMemo(\n    () => (dndDraggingItem === toolbarItemId || (!dndDraggingItem && isFirstItem) ? 0 : -1),\n    [dndDraggingItem, isFirstItem, toolbarItemId],\n  );\n\n  const handlers = useToolbarItemHandlers(toolbarItemId);\n  return (\n    <StyledToolbarItem\n      id={toolbarItemId}\n      data-testid=\"ds-toolbar-item\"\n      className=\"ds-toolbar-item\"\n      {...handlers}\n      {...restGlobals}\n    >\n      <ComponentRenderer innerRef={ref} tabIndex={tabIndex} />\n    </StyledToolbarItem>\n  );\n};\n\nDSToolbarItemV2.propTypes = DSToolbarItemV2Schema;\n\nDSToolbarItemV2.displayName = DSToolbarItemName;\nconst DSToolbarItemV2WithSchema = describe(DSToolbarItemV2).description('Toolbar Item');\nDSToolbarItemV2WithSchema.propTypes = DSToolbarItemV2Schema;\n\nexport { DSToolbarItemV2, DSToolbarItemV2WithSchema };\n"],
+  "mappings": "AAAA,YAAY,WAAW;AC6CjB;AA5CN,SAAgB,YAAY,SAAS,cAAc;AACnD;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,WAAW;AACpB,SAAS,YAAY;AACrB,SAAS,0BAA0B;AACnC,SAAS,yBAAyB;AAClC,SAAS,8BAA8B;AACvC,SAAS,kBAAkB,6BAA6B;AAExD,SAAS,yBAAyB;AAClC,MAAM,kBAA6D,CAAC,UAAU;AAC5E,QAAM,oBAAoB,6BAAmD,OAAO,gBAAgB;AAEpG,iCAA+B,mBAAmB,uBAAuB,iBAAiB;AAC1F,QAAM,EAAE,QAAQ,mBAAmB,YAAY,IAAI;AACnD,QAAM,EAAE,IAAI,YAAY,GAAG,YAAY,IAAI,KAAK,uBAAuB,iBAAiB,GAAG,CAAC,QAAQ,QAAQ,MAAM,CAAC;AACnH,QAAM,EAAE,mBAAmB,gBAAgB,IAAI,WAAW,kBAAkB;AAC5E,QAAM,MAAM,OAA0C,IAAI;AAE1D,QAAM,gBAAgB,QAAQ,MAAM;AAClC,UAAM,KAAK,cAAc,mBAAmB,IAAI;AAChD,sBAAkB,IAAI,GAAG;AACzB,WAAO;AAAA,EACT,GAAG,CAAC,mBAAmB,KAAK,UAAU,CAAC;AAEvC,QAAM,WAAW;AAAA,IACf,MAAO,oBAAoB,iBAAkB,CAAC,mBAAmB,cAAe,IAAI;AAAA,IACpF,CAAC,iBAAiB,aAAa,aAAa;AAAA,EAC9C;AAEA,QAAM,WAAW,uBAAuB,aAAa;AACrD,SACE;AAAA,IAAC;AAAA;AAAA,MACC,IAAI;AAAA,MACJ,eAAY;AAAA,MACZ,WAAU;AAAA,MACT,GAAG;AAAA,MACH,GAAG;AAAA,MAEJ,8BAAC,qBAAkB,UAAU,KAAK,UAAoB;AAAA;AAAA,EACxD;AAEJ;AAEA,gBAAgB,YAAY;AAE5B,gBAAgB,cAAc;AAC9B,MAAM,4BAA4B,SAAS,eAAe,EAAE,YAAY,cAAc;AACtF,0BAA0B,YAAY;",
   "names": []
 }

package/dist/esm/DSToolbarV2.js

@@ -8,6 +8,7 @@ import {
   describe
 } from "@elliemae/ds-props-helpers";
 import { uid } from "uid";
+import { omit } from "lodash";
 import { DSToolbarV2Context } from "./DSToolbarV2Context.js";
 import { DSToolbarV2Schema, defaultProps } from "./react-desc-prop-types.js";
 import { StyledToolbarWrapper } from "./styled.js";
@@ -16,8 +17,8 @@ const DSToolbarV2 = (props) => {
   const propsWithDefaults = useMemoMergePropsWithDefault(props, defaultProps);
   useValidateTypescriptPropTypes(propsWithDefaults, DSToolbarV2Schema, DSToolbarName);
   const { alignment, withDepth, compact, innerRef, children } = propsWithDefaults;
-  const globalsProps = useGetGlobalAttributes(propsWithDefaults);
-  const toolbarUid = useMemo(() => globalsProps.id ?? `ds-toolbar-${uid()}`, []);
+  const globalsProps = omit(useGetGlobalAttributes(propsWithDefaults), ["cols", "rows", "wrap"]);
+  const toolbarUid = useMemo(() => globalsProps.id ?? `ds-toolbar-${uid()}`, [globalsProps.id]);
   const [itemReferences, setItemReferences] = useState({});
   const [dndDraggingItem, setDndDraggingItem] = useState("");
   const registerReference = useCallback(

package/dist/esm/DSToolbarV2.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../scripts/build/transpile/react-shim.js", "../../src/DSToolbarV2.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable react/prop-types */\nimport React, { useCallback, useMemo, useState } from 'react';\nimport {\n  useMemoMergePropsWithDefault,\n  useValidateTypescriptPropTypes,\n  useGetGlobalAttributes,\n  describe,\n} from '@elliemae/ds-props-helpers';\nimport { uid } from 'uid';\nimport { DSToolbarV2Context } from './DSToolbarV2Context.js';\nimport { DSToolbarV2Schema, defaultProps } from './react-desc-prop-types.js';\nimport { StyledToolbarWrapper } from './styled.js';\nimport type { DSToolbarT, DSToolbarItemT } from './react-desc-prop-types.js';\nimport { DSToolbarName } from './DSToolbarDefinitions.js';\n\nconst DSToolbarV2: React.ComponentType<DSToolbarT.Props> = (props) => {\n  const propsWithDefaults = useMemoMergePropsWithDefault(props, defaultProps);\n\n  useValidateTypescriptPropTypes(propsWithDefaults, DSToolbarV2Schema, DSToolbarName);\n\n  const { alignment, withDepth, compact, innerRef, children } = propsWithDefaults;\n\n  const globalsProps = useGetGlobalAttributes(propsWithDefaults);\n\n  const toolbarUid = useMemo(() => globalsProps.id ?? `ds-toolbar-${uid()}`, []);\n\n  const [itemReferences, setItemReferences] = useState({});\n  const [dndDraggingItem, setDndDraggingItem] = useState('');\n\n  const registerReference = useCallback(\n    (itemId: string, ref: React.MutableRefObject<DSToolbarItemT.RenderHTMLElementT>) => {\n      setItemReferences((prevItemReferences) => ({ ...prevItemReferences, [itemId]: ref }));\n    },\n    [setItemReferences],\n  );\n\n  const ctx = useMemo(\n    () => ({ toolbarUid, registerReference, itemReferences, dndDraggingItem, setDndDraggingItem }),\n    [dndDraggingItem, itemReferences, registerReference, toolbarUid],\n  );\n\n  return (\n    <DSToolbarV2Context.Provider value={ctx}>\n      <StyledToolbarWrapper\n        role=\"toolbar\"\n        data-testid=\"ds-toolbar-wrapper\"\n        id={toolbarUid}\n        alignItems=\"center\"\n        justifyContent={alignment === 'left' ? 'flex-start' : 'flex-end'}\n        withDepth={withDepth}\n        gutter=\"xxs2\"\n        compact={compact}\n        ref={innerRef}\n        {...globalsProps}\n      >\n        {children}\n      </StyledToolbarWrapper>\n    </DSToolbarV2Context.Provider>\n  );\n};\n\nDSToolbarV2.propTypes = DSToolbarV2Schema;\n\nDSToolbarV2.displayName = DSToolbarName;\nconst DSToolbarV2WithSchema = describe(DSToolbarV2).description('Toolbar');\nDSToolbarV2WithSchema.propTypes = DSToolbarV2Schema;\n\nexport { DSToolbarV2, DSToolbarV2WithSchema };\n"],
-  "mappings": "AAAA,YAAY,WAAW;AC2CjB;AA1CN,SAAgB,aAAa,SAAS,gBAAgB;AACtD;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,WAAW;AACpB,SAAS,0BAA0B;AACnC,SAAS,mBAAmB,oBAAoB;AAChD,SAAS,4BAA4B;AAErC,SAAS,qBAAqB;AAE9B,MAAM,cAAqD,CAAC,UAAU;AACpE,QAAM,oBAAoB,6BAA6B,OAAO,YAAY;AAE1E,iCAA+B,mBAAmB,mBAAmB,aAAa;AAElF,QAAM,EAAE,WAAW,WAAW,SAAS,UAAU,SAAS,IAAI;AAE9D,QAAM,eAAe,uBAAuB,iBAAiB;AAE7D,QAAM,aAAa,QAAQ,MAAM,aAAa,MAAM,cAAc,IAAI,KAAK,CAAC,CAAC;AAE7E,QAAM,CAAC,gBAAgB,iBAAiB,IAAI,SAAS,CAAC,CAAC;AACvD,QAAM,CAAC,iBAAiB,kBAAkB,IAAI,SAAS,EAAE;AAEzD,QAAM,oBAAoB;AAAA,IACxB,CAAC,QAAgB,QAAmE;AAClF,wBAAkB,CAAC,wBAAwB,EAAE,GAAG,oBAAoB,CAAC,MAAM,GAAG,IAAI,EAAE;AAAA,IACtF;AAAA,IACA,CAAC,iBAAiB;AAAA,EACpB;AAEA,QAAM,MAAM;AAAA,IACV,OAAO,EAAE,YAAY,mBAAmB,gBAAgB,iBAAiB,mBAAmB;AAAA,IAC5F,CAAC,iBAAiB,gBAAgB,mBAAmB,UAAU;AAAA,EACjE;AAEA,SACE,oBAAC,mBAAmB,UAAnB,EAA4B,OAAO,KAClC;AAAA,IAAC;AAAA;AAAA,MACC,MAAK;AAAA,MACL,eAAY;AAAA,MACZ,IAAI;AAAA,MACJ,YAAW;AAAA,MACX,gBAAgB,cAAc,SAAS,eAAe;AAAA,MACtD;AAAA,MACA,QAAO;AAAA,MACP;AAAA,MACA,KAAK;AAAA,MACJ,GAAG;AAAA,MAEH;AAAA;AAAA,EACH,GACF;AAEJ;AAEA,YAAY,YAAY;AAExB,YAAY,cAAc;AAC1B,MAAM,wBAAwB,SAAS,WAAW,EAAE,YAAY,SAAS;AACzE,sBAAsB,YAAY;",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable react/prop-types */\nimport React, { useCallback, useMemo, useState } from 'react';\nimport {\n  useMemoMergePropsWithDefault,\n  useValidateTypescriptPropTypes,\n  useGetGlobalAttributes,\n  describe,\n} from '@elliemae/ds-props-helpers';\nimport { uid } from 'uid';\nimport { omit } from 'lodash';\nimport { DSToolbarV2Context } from './DSToolbarV2Context.js';\nimport { DSToolbarV2Schema, defaultProps } from './react-desc-prop-types.js';\nimport { StyledToolbarWrapper } from './styled.js';\nimport type { DSToolbarT, DSToolbarItemT } from './react-desc-prop-types.js';\nimport { DSToolbarName } from './DSToolbarDefinitions.js';\nconst DSToolbarV2: React.ComponentType<DSToolbarT.Props> = (props) => {\n  const propsWithDefaults = useMemoMergePropsWithDefault<DSToolbarT.InternalProps>(props, defaultProps);\n\n  useValidateTypescriptPropTypes(propsWithDefaults, DSToolbarV2Schema, DSToolbarName);\n\n  const { alignment, withDepth, compact, innerRef, children } = propsWithDefaults;\n\n  const globalsProps = omit(useGetGlobalAttributes(propsWithDefaults), ['cols', 'rows', 'wrap']);\n\n  const toolbarUid = useMemo(() => globalsProps.id ?? `ds-toolbar-${uid()}`, [globalsProps.id]);\n\n  const [itemReferences, setItemReferences] = useState({});\n  const [dndDraggingItem, setDndDraggingItem] = useState('');\n\n  const registerReference = useCallback(\n    (itemId: string, ref: React.MutableRefObject<DSToolbarItemT.RenderHTMLElementT>) => {\n      setItemReferences((prevItemReferences) => ({ ...prevItemReferences, [itemId]: ref }));\n    },\n    [setItemReferences],\n  );\n\n  const ctx = useMemo(\n    () => ({ toolbarUid, registerReference, itemReferences, dndDraggingItem, setDndDraggingItem }),\n    [dndDraggingItem, itemReferences, registerReference, toolbarUid],\n  );\n\n  return (\n    <DSToolbarV2Context.Provider value={ctx}>\n      <StyledToolbarWrapper\n        role=\"toolbar\"\n        data-testid=\"ds-toolbar-wrapper\"\n        id={toolbarUid}\n        alignItems=\"center\"\n        justifyContent={alignment === 'left' ? 'flex-start' : 'flex-end'}\n        withDepth={withDepth}\n        gutter=\"xxs2\"\n        compact={compact}\n        ref={innerRef}\n        {...globalsProps}\n      >\n        {children}\n      </StyledToolbarWrapper>\n    </DSToolbarV2Context.Provider>\n  );\n};\n\nDSToolbarV2.propTypes = DSToolbarV2Schema;\n\nDSToolbarV2.displayName = DSToolbarName;\nconst DSToolbarV2WithSchema = describe(DSToolbarV2).description('Toolbar');\nDSToolbarV2WithSchema.propTypes = DSToolbarV2Schema;\n\nexport { DSToolbarV2, DSToolbarV2WithSchema };\n"],
+  "mappings": "AAAA,YAAY,WAAW;AC2CjB;AA1CN,SAAgB,aAAa,SAAS,gBAAgB;AACtD;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,WAAW;AACpB,SAAS,YAAY;AACrB,SAAS,0BAA0B;AACnC,SAAS,mBAAmB,oBAAoB;AAChD,SAAS,4BAA4B;AAErC,SAAS,qBAAqB;AAC9B,MAAM,cAAqD,CAAC,UAAU;AACpE,QAAM,oBAAoB,6BAAuD,OAAO,YAAY;AAEpG,iCAA+B,mBAAmB,mBAAmB,aAAa;AAElF,QAAM,EAAE,WAAW,WAAW,SAAS,UAAU,SAAS,IAAI;AAE9D,QAAM,eAAe,KAAK,uBAAuB,iBAAiB,GAAG,CAAC,QAAQ,QAAQ,MAAM,CAAC;AAE7F,QAAM,aAAa,QAAQ,MAAM,aAAa,MAAM,cAAc,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;AAE5F,QAAM,CAAC,gBAAgB,iBAAiB,IAAI,SAAS,CAAC,CAAC;AACvD,QAAM,CAAC,iBAAiB,kBAAkB,IAAI,SAAS,EAAE;AAEzD,QAAM,oBAAoB;AAAA,IACxB,CAAC,QAAgB,QAAmE;AAClF,wBAAkB,CAAC,wBAAwB,EAAE,GAAG,oBAAoB,CAAC,MAAM,GAAG,IAAI,EAAE;AAAA,IACtF;AAAA,IACA,CAAC,iBAAiB;AAAA,EACpB;AAEA,QAAM,MAAM;AAAA,IACV,OAAO,EAAE,YAAY,mBAAmB,gBAAgB,iBAAiB,mBAAmB;AAAA,IAC5F,CAAC,iBAAiB,gBAAgB,mBAAmB,UAAU;AAAA,EACjE;AAEA,SACE,oBAAC,mBAAmB,UAAnB,EAA4B,OAAO,KAClC;AAAA,IAAC;AAAA;AAAA,MACC,MAAK;AAAA,MACL,eAAY;AAAA,MACZ,IAAI;AAAA,MACJ,YAAW;AAAA,MACX,gBAAgB,cAAc,SAAS,eAAe;AAAA,MACtD;AAAA,MACA,QAAO;AAAA,MACP;AAAA,MACA,KAAK;AAAA,MACJ,GAAG;AAAA,MAEH;AAAA;AAAA,EACH,GACF;AAEJ;AAEA,YAAY,YAAY;AAExB,YAAY,cAAc;AAC1B,MAAM,wBAAwB,SAAS,WAAW,EAAE,YAAY,SAAS;AACzE,sBAAsB,YAAY;",
   "names": []
 }

package/dist/esm/DSToolbarV2Context.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../scripts/build/transpile/react-shim.js", "../../src/DSToolbarV2Context.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import type { MutableRefObject } from 'react';\nimport { createContext } from 'react';\ninterface IDSToolbarV2Context {\n  registerReference: (uid: string, ref: MutableRefObject<HTMLElement | null>) => void;\n  itemReferences: Record<string, MutableRefObject<HTMLElement | null>>;\n  toolbarUid: string;\n  dndDraggingItem: string;\n  setDndDraggingItem: React.Dispatch<React.SetStateAction<string>>;\n}\n\nexport const DSToolbarV2Context = createContext<IDSToolbarV2Context>({\n  registerReference: () => null,\n  itemReferences: {},\n  toolbarUid: '',\n  dndDraggingItem: '',\n  setDndDraggingItem: () => {},\n});\n"],
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import type { MutableRefObject } from 'react';\nimport { createContext } from 'react';\nimport { type DSToolbarItemT } from 'react-desc-prop-types';\ninterface IDSToolbarV2Context {\n  registerReference: (uid: string, ref: React.MutableRefObject<DSToolbarItemT.RenderHTMLElementT>) => void;\n  itemReferences: Record<string, MutableRefObject<HTMLElement | null>>;\n  toolbarUid: string;\n  dndDraggingItem: string;\n  setDndDraggingItem: React.Dispatch<React.SetStateAction<string>>;\n}\nexport const DSToolbarV2Context = createContext<IDSToolbarV2Context>({\n  registerReference: () => null,\n  itemReferences: {},\n  toolbarUid: '',\n  dndDraggingItem: '',\n  setDndDraggingItem: () => {},\n});\n"],
   "mappings": "AAAA,YAAY,WAAW;ACCvB,SAAS,qBAAqB;AASvB,MAAM,qBAAqB,cAAmC;AAAA,EACnE,mBAAmB,MAAM;AAAA,EACzB,gBAAgB,CAAC;AAAA,EACjB,YAAY;AAAA,EACZ,iBAAiB;AAAA,EACjB,oBAAoB,MAAM;AAAA,EAAC;AAC7B,CAAC;",
   "names": []
 }

package/dist/esm/index.js

@@ -1,10 +1,6 @@
 import * as React from "react";
-export * from "./deprecated/index.js";
-import { default as default2 } from "./deprecated/index.js";
+export * from "@elliemae/ds-toolbar-v1";
 export * from "./DSToolbarV2.js";
 export * from "./DSToolbarItemV2.js";
 export * from "./DSToolbarSeparatorV2.js";
-export {
-  default2 as default
-};
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../scripts/build/transpile/react-shim.js", "../../src/index.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "export * from './deprecated/index.js';\nexport { default } from './deprecated/index.js';\nexport * from './DSToolbarV2.js';\nexport * from './DSToolbarItemV2.js';\nexport * from './DSToolbarSeparatorV2.js';\n"],
-  "mappings": "AAAA,YAAY,WAAW;ACAvB,cAAc;AACd,SAAS,WAAAA,gBAAe;AACxB,cAAc;AACd,cAAc;AACd,cAAc;",
-  "names": ["default"]
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "export * from '@elliemae/ds-toolbar-v1';\nexport * from './DSToolbarV2.js';\nexport * from './DSToolbarItemV2.js';\nexport * from './DSToolbarSeparatorV2.js';\n"],
+  "mappings": "AAAA,YAAY,WAAW;ACAvB,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;",
+  "names": []
 }

package/dist/esm/react-desc-prop-types.js

@@ -1,8 +1,12 @@
 import * as React from "react";
-import { globalAttributesPropTypes, PropTypes } from "@elliemae/ds-props-helpers";
+import { Fragment, jsx } from "react/jsx-runtime";
+import {
+  globalAttributesPropTypes,
+  xstyledPropTypes,
+  PropTypes
+} from "@elliemae/ds-props-helpers";
 const defaultItemProps = {
-  render: () => {
-  },
+  render: () => /* @__PURE__ */ jsx(Fragment, {}),
   isFirstItem: false
 };
 const defaultProps = {
@@ -10,14 +14,17 @@ const defaultProps = {
   withDepth: true,
   compact: false
 };
-const DSToolbarV2Schema = {
+const DSToolbarPropTypes = {
+  ...xstyledPropTypes,
   ...globalAttributesPropTypes,
   alignment: PropTypes.oneOf(["right", "left"]).description("Whether to align the content left or right").defaultValue("right"),
   withDepth: PropTypes.bool.description("Whether to add a box-shadow to the container").defaultValue(true),
   compact: PropTypes.bool.description("Whether you want the compact version of the toolbar").defaultValue(false),
   innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]).description("Reference to attach to the wrapper")
 };
-const DSToolbarItemV2Schema = {
+const DSToolbarV2Schema = DSToolbarPropTypes;
+const DSToolbarItemV2PropTypes = {
+  ...xstyledPropTypes,
   ...globalAttributesPropTypes,
   render: PropTypes.func.isRequired.description("render function").defaultValue(() => {
   }),
@@ -25,8 +32,11 @@ const DSToolbarItemV2Schema = {
     "If true the item will have tab index 0 to be the first element focusable by keyboard on the page load"
   ).defaultValue(false)
 };
+const DSToolbarItemV2Schema = DSToolbarPropTypes;
 export {
+  DSToolbarItemV2PropTypes,
   DSToolbarItemV2Schema,
+  DSToolbarPropTypes,
   DSToolbarV2Schema,
   defaultItemProps,
   defaultProps

package/dist/esm/react-desc-prop-types.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../scripts/build/transpile/react-shim.js", "../../src/react-desc-prop-types.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import { globalAttributesPropTypes, PropTypes } from '@elliemae/ds-props-helpers';\n\nexport declare namespace DSToolbarT {\n  export interface Props {\n    alignment?: 'left' | 'right';\n    withDepth?: boolean;\n    compact?: boolean;\n    innerRef?: React.MutableRefObject<HTMLDivElement>;\n    children: React.Component<DSToolbarItemT.Props>;\n  }\n}\n\nexport declare namespace DSToolbarItemT {\n  export type RenderHTMLElementT =\n    | HTMLButtonElement\n    | HTMLInputElement\n    | HTMLTextAreaElement\n    | HTMLSelectElement\n    | HTMLOptionElement;\n  export interface Props {\n    render: (props: { innerRef: React.MutableRefObject<HTMLElement | null>; tabIndex: number }) => JSX.Element;\n    isFirstItem?: boolean;\n  }\n}\n\nexport const defaultItemProps = {\n  render: () => {},\n  isFirstItem: false,\n};\n\nexport const defaultProps = {\n  alignment: 'right',\n  withDepth: true,\n  compact: false,\n};\n\nexport const DSToolbarV2Schema = {\n  ...globalAttributesPropTypes,\n  alignment: PropTypes.oneOf(['right', 'left'])\n    .description('Whether to align the content left or right')\n    .defaultValue('right'),\n  withDepth: PropTypes.bool.description('Whether to add a box-shadow to the container').defaultValue(true),\n  compact: PropTypes.bool.description('Whether you want the compact version of the toolbar').defaultValue(false),\n  innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]).description('Reference to attach to the wrapper'),\n};\n\nexport const DSToolbarItemV2Schema = {\n  ...globalAttributesPropTypes,\n  render: PropTypes.func.isRequired.description('render function').defaultValue(() => {}),\n  isFirstItem: PropTypes.bool\n    .description(\n      'If true the item will have tab index 0 to be the first element focusable by keyboard on the page load',\n    )\n    .defaultValue(false),\n};\n"],
-  "mappings": "AAAA,YAAY,WAAW;ACAvB,SAAS,2BAA2B,iBAAiB;AAyB9C,MAAM,mBAAmB;AAAA,EAC9B,QAAQ,MAAM;AAAA,EAAC;AAAA,EACf,aAAa;AACf;AAEO,MAAM,eAAe;AAAA,EAC1B,WAAW;AAAA,EACX,WAAW;AAAA,EACX,SAAS;AACX;AAEO,MAAM,oBAAoB;AAAA,EAC/B,GAAG;AAAA,EACH,WAAW,UAAU,MAAM,CAAC,SAAS,MAAM,CAAC,EACzC,YAAY,4CAA4C,EACxD,aAAa,OAAO;AAAA,EACvB,WAAW,UAAU,KAAK,YAAY,8CAA8C,EAAE,aAAa,IAAI;AAAA,EACvG,SAAS,UAAU,KAAK,YAAY,qDAAqD,EAAE,aAAa,KAAK;AAAA,EAC7G,UAAU,UAAU,UAAU,CAAC,UAAU,MAAM,UAAU,MAAM,CAAC,EAAE,YAAY,oCAAoC;AACpH;AAEO,MAAM,wBAAwB;AAAA,EACnC,GAAG;AAAA,EACH,QAAQ,UAAU,KAAK,WAAW,YAAY,iBAAiB,EAAE,aAAa,MAAM;AAAA,EAAC,CAAC;AAAA,EACtF,aAAa,UAAU,KACpB;AAAA,IACC;AAAA,EACF,EACC,aAAa,KAAK;AACvB;",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import {\n  globalAttributesPropTypes,\n  xstyledPropTypes,\n  PropTypes,\n  type GlobalAttributesT,\n  type XstyledProps,\n  type DSPropTypesSchema,\n} from '@elliemae/ds-props-helpers';\nimport { type WeakValidationMap } from 'react';\n\nexport declare namespace DSToolbarT {\n  export interface DefaultProps {\n    alignment: 'left' | 'right';\n    withDepth: boolean;\n    compact: boolean;\n  }\n\n  export interface OptionalProps {\n    innerRef?: React.MutableRefObject<HTMLDivElement>;\n    children?: React.ReactNode;\n  }\n\n  export interface Props\n    extends Partial<DefaultProps>,\n      OptionalProps,\n      Omit<GlobalAttributesT<HTMLButtonElement>, keyof DefaultProps | keyof OptionalProps>,\n      XstyledProps {}\n  export interface InternalProps\n    extends DefaultProps,\n      OptionalProps,\n      Omit<GlobalAttributesT<HTMLButtonElement>, keyof DefaultProps | keyof OptionalProps>,\n      XstyledProps {}\n}\n\nexport declare namespace DSToolbarItemT {\n  export type RenderHTMLElementT =\n    | HTMLElement\n    | HTMLButtonElement\n    | HTMLInputElement\n    | HTMLTextAreaElement\n    | HTMLSelectElement\n    | HTMLOptionElement\n    | null;\n\n  export interface Props {\n    render: <T>(props: { innerRef: React.MutableRefObject<T>; tabIndex: number }) => JSX.Element;\n    isFirstItem?: boolean;\n  }\n}\n\nexport const defaultItemProps: DSToolbarItemT.Props = {\n  render: () => <></>,\n  isFirstItem: false,\n};\n\nexport const defaultProps: DSToolbarT.DefaultProps = {\n  alignment: 'right',\n  withDepth: true,\n  compact: false,\n};\n\nexport const DSToolbarPropTypes: DSPropTypesSchema<DSToolbarT.Props> = {\n  ...xstyledPropTypes,\n  ...globalAttributesPropTypes,\n  alignment: PropTypes.oneOf(['right', 'left'])\n    .description('Whether to align the content left or right')\n    .defaultValue('right'),\n  withDepth: PropTypes.bool.description('Whether to add a box-shadow to the container').defaultValue(true),\n  compact: PropTypes.bool.description('Whether you want the compact version of the toolbar').defaultValue(false),\n  innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]).description('Reference to attach to the wrapper'),\n};\n\nexport const DSToolbarV2Schema = DSToolbarPropTypes as unknown as WeakValidationMap<DSToolbarT.Props>;\n\nexport const DSToolbarItemV2PropTypes = {\n  ...xstyledPropTypes,\n  ...globalAttributesPropTypes,\n  render: PropTypes.func.isRequired.description('render function').defaultValue(() => {}),\n  isFirstItem: PropTypes.bool\n    .description(\n      'If true the item will have tab index 0 to be the first element focusable by keyboard on the page load',\n    )\n    .defaultValue(false),\n};\n\nexport const DSToolbarItemV2Schema = DSToolbarPropTypes as unknown as WeakValidationMap<DSToolbarItemT.Props>;\n"],
+  "mappings": "AAAA,YAAY,WAAW;ACmDP;AAnDhB;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OAIK;AA2CA,MAAM,mBAAyC;AAAA,EACpD,QAAQ,MAAM,gCAAE;AAAA,EAChB,aAAa;AACf;AAEO,MAAM,eAAwC;AAAA,EACnD,WAAW;AAAA,EACX,WAAW;AAAA,EACX,SAAS;AACX;AAEO,MAAM,qBAA0D;AAAA,EACrE,GAAG;AAAA,EACH,GAAG;AAAA,EACH,WAAW,UAAU,MAAM,CAAC,SAAS,MAAM,CAAC,EACzC,YAAY,4CAA4C,EACxD,aAAa,OAAO;AAAA,EACvB,WAAW,UAAU,KAAK,YAAY,8CAA8C,EAAE,aAAa,IAAI;AAAA,EACvG,SAAS,UAAU,KAAK,YAAY,qDAAqD,EAAE,aAAa,KAAK;AAAA,EAC7G,UAAU,UAAU,UAAU,CAAC,UAAU,MAAM,UAAU,MAAM,CAAC,EAAE,YAAY,oCAAoC;AACpH;AAEO,MAAM,oBAAoB;AAE1B,MAAM,2BAA2B;AAAA,EACtC,GAAG;AAAA,EACH,GAAG;AAAA,EACH,QAAQ,UAAU,KAAK,WAAW,YAAY,iBAAiB,EAAE,aAAa,MAAM;AAAA,EAAC,CAAC;AAAA,EACtF,aAAa,UAAU,KACpB;AAAA,IACC;AAAA,EACF,EACC,aAAa,KAAK;AACvB;AAEO,MAAM,wBAAwB;",
   "names": []
 }

package/dist/esm/styled.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../scripts/build/transpile/react-shim.js", "../../src/styled.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import { styled } from '@elliemae/ds-system';\nimport Grid from '@elliemae/ds-grid';\n\nexport const StyledToolbarWrapper = styled(Grid)`\n  background-color: ${(props) => props.theme.colors.neutral['000']};\n\n  min-height: ${(props) => (props.compact ? '28px' : '36px')};\n  max-height: ${(props) => props.theme.space.xxl};\n\n  padding: 0 ${(props) => props.theme.space.xxs};\n  grid-auto-flow: column;\n  box-shadow: ${(props) => (!props.withDepth ? 'none' : '0 1px 5px 0 rgb(0 0 0 / 13%), 0 2px 4px 0 rgb(0 0 0 / 20%)')};\n`;\n\nexport const StyledToolbarItem = styled(Grid)``;\n\nexport const StyledSeparator = styled(Grid)`\n  height: 30px;\n  width: 1px;\n  background-color: ${(props) => props.theme.colors.neutral[200]};\n`;\n"],
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import { styled } from '@elliemae/ds-system';\nimport Grid from '@elliemae/ds-grid';\n\nexport const StyledToolbarWrapper = styled(Grid)<{ compact: boolean; withDepth: boolean }>`\n  background-color: ${(props) => props.theme.colors.neutral['000']};\n\n  min-height: ${(props) => (props.compact ? '28px' : '36px')};\n  max-height: ${(props) => props.theme.space.xxl};\n\n  padding: 0 ${(props) => props.theme.space.xxs};\n  grid-auto-flow: column;\n  box-shadow: ${(props) => (!props.withDepth ? 'none' : '0 1px 5px 0 rgb(0 0 0 / 13%), 0 2px 4px 0 rgb(0 0 0 / 20%)')};\n`;\n\nexport const StyledToolbarItem = styled(Grid)``;\n\nexport const StyledSeparator = styled(Grid)`\n  height: 30px;\n  width: 1px;\n  background-color: ${(props) => props.theme.colors.neutral[200]};\n`;\n"],
   "mappings": "AAAA,YAAY,WAAW;ACAvB,SAAS,cAAc;AACvB,OAAO,UAAU;AAEV,MAAM,uBAAuB,OAAO,IAAI;AAAA,sBACzB,CAAC,UAAU,MAAM,MAAM,OAAO,QAAQ,KAAK;AAAA;AAAA,gBAEjD,CAAC,UAAW,MAAM,UAAU,SAAS;AAAA,gBACrC,CAAC,UAAU,MAAM,MAAM,MAAM;AAAA;AAAA,eAE9B,CAAC,UAAU,MAAM,MAAM,MAAM;AAAA;AAAA,gBAE5B,CAAC,UAAW,CAAC,MAAM,YAAY,SAAS;AAAA;AAGjD,MAAM,oBAAoB,OAAO,IAAI;AAErC,MAAM,kBAAkB,OAAO,IAAI;AAAA;AAAA;AAAA,sBAGpB,CAAC,UAAU,MAAM,MAAM,OAAO,QAAQ,GAAG;AAAA;",
   "names": []
 }

package/dist/esm/useToolbarItemHandlers.js

@@ -20,7 +20,7 @@ const useToolbarItemHandlers = (toolbarItemId) => {
       const toolbarItemIndex = toolbarItems.findIndex((domElem) => domElem.id === toolbarItemId);
       const criteria = (item) => {
         const ref = itemReferences[item.id];
-        return !ref.current.disabled;
+        return !ref.current?.getAttribute("disabled");
       };
       if (["ArrowLeft", "ArrowRight"].includes(e.code)) {
         nextToolbarItemIndex = findInCircularList(

package/dist/esm/useToolbarItemHandlers.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../scripts/build/transpile/react-shim.js", "../../src/useToolbarItemHandlers.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import { useCallback, useContext } from 'react';\nimport { DSToolbarV2Context } from './DSToolbarV2Context.js';\n\nconst findInCircularList = (\n  list: Element[],\n  from: number,\n  criteria: (item: Element) => boolean,\n  step = 1,\n  // eslint-disable-next-line max-params\n): number => {\n  for (\n    let i = (from + step + list.length) % list.length;\n    i !== from && from > -1;\n    i = (i + step + list.length) % list.length\n  ) {\n    if (criteria(list[i])) return i;\n  }\n  return from; // return same item\n};\n\nexport const useToolbarItemHandlers = (\n  toolbarItemId: string,\n): {\n  onKeyDown: React.KeyboardEventHandler;\n  onFocus: React.FocusEventHandler;\n} => {\n  const { toolbarUid, itemReferences, setDndDraggingItem } = useContext(DSToolbarV2Context);\n\n  const onFocus: React.FocusEventHandler = useCallback(() => {\n    setDndDraggingItem(toolbarItemId);\n  }, [setDndDraggingItem, toolbarItemId]);\n\n  const onKeyDown: React.KeyboardEventHandler = useCallback(\n    (e) => {\n      const toolbarItems = [...document.querySelectorAll(`#${toolbarUid} .ds-toolbar-item`)];\n      let nextToolbarItemIndex = -1;\n      const toolbarItemIndex = toolbarItems.findIndex((domElem) => domElem.id === toolbarItemId);\n\n      const criteria = (item: Element) => {\n        const ref = itemReferences[item.id];\n\n        return !ref.current.disabled;\n      };\n\n      if (['ArrowLeft', 'ArrowRight'].includes(e.code)) {\n        nextToolbarItemIndex = findInCircularList(\n          toolbarItems,\n          toolbarItemIndex,\n          criteria,\n          e.code === 'ArrowLeft' ? -1 : 1,\n        );\n      } else if (e.code === 'Home') {\n        nextToolbarItemIndex = 0;\n      } else if (e.code === 'End') {\n        nextToolbarItemIndex = toolbarItems.length - 1;\n      }\n\n      if (nextToolbarItemIndex >= 0 && nextToolbarItemIndex < toolbarItems.length) {\n        e.preventDefault();\n        e.stopPropagation();\n        const ref = itemReferences[toolbarItems[nextToolbarItemIndex].id];\n        if (ref.current) ref.current.focus();\n      }\n    },\n    [toolbarUid, toolbarItemId, itemReferences],\n  );\n\n  return { onKeyDown, onFocus };\n};\n"],
-  "mappings": "AAAA,YAAY,WAAW;ACAvB,SAAS,aAAa,kBAAkB;AACxC,SAAS,0BAA0B;AAEnC,MAAM,qBAAqB,CACzB,MACA,MACA,UACA,OAAO,MAEI;AACX,WACM,KAAK,OAAO,OAAO,KAAK,UAAU,KAAK,QAC3C,MAAM,QAAQ,OAAO,IACrB,KAAK,IAAI,OAAO,KAAK,UAAU,KAAK,QACpC;AACA,QAAI,SAAS,KAAK,CAAC,CAAC;AAAG,aAAO;AAAA,EAChC;AACA,SAAO;AACT;AAEO,MAAM,yBAAyB,CACpC,kBAIG;AACH,QAAM,EAAE,YAAY,gBAAgB,mBAAmB,IAAI,WAAW,kBAAkB;AAExF,QAAM,UAAmC,YAAY,MAAM;AACzD,uBAAmB,aAAa;AAAA,EAClC,GAAG,CAAC,oBAAoB,aAAa,CAAC;AAEtC,QAAM,YAAwC;AAAA,IAC5C,CAAC,MAAM;AACL,YAAM,eAAe,CAAC,GAAG,SAAS,iBAAiB,IAAI,6BAA6B,CAAC;AACrF,UAAI,uBAAuB;AAC3B,YAAM,mBAAmB,aAAa,UAAU,CAAC,YAAY,QAAQ,OAAO,aAAa;AAEzF,YAAM,WAAW,CAAC,SAAkB;AAClC,cAAM,MAAM,eAAe,KAAK,EAAE;AAElC,eAAO,CAAC,IAAI,QAAQ;AAAA,MACtB;AAEA,UAAI,CAAC,aAAa,YAAY,EAAE,SAAS,EAAE,IAAI,GAAG;AAChD,+BAAuB;AAAA,UACrB;AAAA,UACA;AAAA,UACA;AAAA,UACA,EAAE,SAAS,cAAc,KAAK;AAAA,QAChC;AAAA,MACF,WAAW,EAAE,SAAS,QAAQ;AAC5B,+BAAuB;AAAA,MACzB,WAAW,EAAE,SAAS,OAAO;AAC3B,+BAAuB,aAAa,SAAS;AAAA,MAC/C;AAEA,UAAI,wBAAwB,KAAK,uBAAuB,aAAa,QAAQ;AAC3E,UAAE,eAAe;AACjB,UAAE,gBAAgB;AAClB,cAAM,MAAM,eAAe,aAAa,oBAAoB,EAAE,EAAE;AAChE,YAAI,IAAI;AAAS,cAAI,QAAQ,MAAM;AAAA,MACrC;AAAA,IACF;AAAA,IACA,CAAC,YAAY,eAAe,cAAc;AAAA,EAC5C;AAEA,SAAO,EAAE,WAAW,QAAQ;AAC9B;",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import { useCallback, useContext } from 'react';\nimport { DSToolbarV2Context } from './DSToolbarV2Context.js';\nconst findInCircularList = (\n  list: Element[],\n  from: number,\n  criteria: (item: Element) => boolean,\n  step = 1,\n  // eslint-disable-next-line max-params\n): number => {\n  for (\n    let i = (from + step + list.length) % list.length;\n    i !== from && from > -1;\n    i = (i + step + list.length) % list.length\n  ) {\n    if (criteria(list[i])) return i;\n  }\n  return from; // return same item\n};\n\nexport const useToolbarItemHandlers = (\n  toolbarItemId: string,\n): {\n  onKeyDown: React.KeyboardEventHandler;\n  onFocus: React.FocusEventHandler;\n} => {\n  const { toolbarUid, itemReferences, setDndDraggingItem } = useContext(DSToolbarV2Context);\n\n  const onFocus: React.FocusEventHandler = useCallback(() => {\n    setDndDraggingItem(toolbarItemId);\n  }, [setDndDraggingItem, toolbarItemId]);\n\n  const onKeyDown: React.KeyboardEventHandler = useCallback(\n    (e) => {\n      const toolbarItems = [...document.querySelectorAll(`#${toolbarUid} .ds-toolbar-item`)];\n      let nextToolbarItemIndex = -1;\n      const toolbarItemIndex = toolbarItems.findIndex((domElem) => domElem.id === toolbarItemId);\n\n      const criteria = (item: Element) => {\n        const ref = itemReferences[item.id];\n\n        return !ref.current?.getAttribute('disabled');\n      };\n\n      if (['ArrowLeft', 'ArrowRight'].includes(e.code)) {\n        nextToolbarItemIndex = findInCircularList(\n          toolbarItems,\n          toolbarItemIndex,\n          criteria,\n          e.code === 'ArrowLeft' ? -1 : 1,\n        );\n      } else if (e.code === 'Home') {\n        nextToolbarItemIndex = 0;\n      } else if (e.code === 'End') {\n        nextToolbarItemIndex = toolbarItems.length - 1;\n      }\n\n      if (nextToolbarItemIndex >= 0 && nextToolbarItemIndex < toolbarItems.length) {\n        e.preventDefault();\n        e.stopPropagation();\n        const ref = itemReferences[toolbarItems[nextToolbarItemIndex].id];\n        if (ref.current) ref.current.focus();\n      }\n    },\n    [toolbarUid, toolbarItemId, itemReferences],\n  );\n\n  return { onKeyDown, onFocus };\n};\n"],
+  "mappings": "AAAA,YAAY,WAAW;ACAvB,SAAS,aAAa,kBAAkB;AACxC,SAAS,0BAA0B;AACnC,MAAM,qBAAqB,CACzB,MACA,MACA,UACA,OAAO,MAEI;AACX,WACM,KAAK,OAAO,OAAO,KAAK,UAAU,KAAK,QAC3C,MAAM,QAAQ,OAAO,IACrB,KAAK,IAAI,OAAO,KAAK,UAAU,KAAK,QACpC;AACA,QAAI,SAAS,KAAK,CAAC,CAAC;AAAG,aAAO;AAAA,EAChC;AACA,SAAO;AACT;AAEO,MAAM,yBAAyB,CACpC,kBAIG;AACH,QAAM,EAAE,YAAY,gBAAgB,mBAAmB,IAAI,WAAW,kBAAkB;AAExF,QAAM,UAAmC,YAAY,MAAM;AACzD,uBAAmB,aAAa;AAAA,EAClC,GAAG,CAAC,oBAAoB,aAAa,CAAC;AAEtC,QAAM,YAAwC;AAAA,IAC5C,CAAC,MAAM;AACL,YAAM,eAAe,CAAC,GAAG,SAAS,iBAAiB,IAAI,6BAA6B,CAAC;AACrF,UAAI,uBAAuB;AAC3B,YAAM,mBAAmB,aAAa,UAAU,CAAC,YAAY,QAAQ,OAAO,aAAa;AAEzF,YAAM,WAAW,CAAC,SAAkB;AAClC,cAAM,MAAM,eAAe,KAAK,EAAE;AAElC,eAAO,CAAC,IAAI,SAAS,aAAa,UAAU;AAAA,MAC9C;AAEA,UAAI,CAAC,aAAa,YAAY,EAAE,SAAS,EAAE,IAAI,GAAG;AAChD,+BAAuB;AAAA,UACrB;AAAA,UACA;AAAA,UACA;AAAA,UACA,EAAE,SAAS,cAAc,KAAK;AAAA,QAChC;AAAA,MACF,WAAW,EAAE,SAAS,QAAQ;AAC5B,+BAAuB;AAAA,MACzB,WAAW,EAAE,SAAS,OAAO;AAC3B,+BAAuB,aAAa,SAAS;AAAA,MAC/C;AAEA,UAAI,wBAAwB,KAAK,uBAAuB,aAAa,QAAQ;AAC3E,UAAE,eAAe;AACjB,UAAE,gBAAgB;AAClB,cAAM,MAAM,eAAe,aAAa,oBAAoB,EAAE,EAAE;AAChE,YAAI,IAAI;AAAS,cAAI,QAAQ,MAAM;AAAA,MACrC;AAAA,IACF;AAAA,IACA,CAAC,YAAY,eAAe,cAAc;AAAA,EAC5C;AAEA,SAAO,EAAE,WAAW,QAAQ;AAC9B;",
   "names": []
 }

package/dist/types/DSToolbarV2Context.d.ts

@@ -1,6 +1,7 @@
 import type { MutableRefObject } from 'react';
+import { type DSToolbarItemT } from 'react-desc-prop-types';
 interface IDSToolbarV2Context {
-    registerReference: (uid: string, ref: MutableRefObject<HTMLElement | null>) => void;
+    registerReference: (uid: string, ref: React.MutableRefObject<DSToolbarItemT.RenderHTMLElementT>) => void;
     itemReferences: Record<string, MutableRefObject<HTMLElement | null>>;
     toolbarUid: string;
     dndDraggingItem: string;

package/dist/types/index.d.ts

@@ -1,5 +1,4 @@
-export * from './deprecated/index.js';
-export { default } from './deprecated/index.js';
+export * from '@elliemae/ds-toolbar-v1';
 export * from './DSToolbarV2.js';
 export * from './DSToolbarItemV2.js';
 export * from './DSToolbarSeparatorV2.js';