@deephaven/components 0.74.1-beta.5 → 0.75.0

package/dist/spectrum/picker/PickerNormalized.js

@@ -1,4 +1,4 @@
-var _excluded = ["normalizedItems", "tooltip", "selectedKey", "defaultSelectedKey", "disabledKeys", "UNSAFE_className", "getInitialScrollPosition", "onChange", "onOpenChange", "onScroll", "onSelectionChange"];
+var _excluded = ["normalizedItems", "tooltip", "selectedKey", "defaultSelectedKey", "disabledKeys", "showItemIcons", "UNSAFE_className", "getInitialScrollPosition", "onChange", "onOpenChange", "onScroll", "onSelectionChange"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -14,6 +14,7 @@ import { Section } from "../shared.js";
 import { getItemKey, isNormalizedSection, normalizeTooltipOptions, useRenderNormalizedItem, useStringifiedSelection } from "../utils/index.js";
 import usePickerScrollOnOpen from "./usePickerScrollOnOpen.js";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { createElement as _createElement } from "react";
 /**
  * Picker that takes an array of `NormalizedItem` or `NormalizedSection` items
  * as children and uses a render item function to render the items. This is
@@ -26,6 +27,7 @@ export function PickerNormalized(_ref) {
       selectedKey,
       defaultSelectedKey,
       disabledKeys,
+      showItemIcons,
       UNSAFE_className,
       getInitialScrollPosition,
       onChange,
@@ -35,7 +37,21 @@ export function PickerNormalized(_ref) {
     } = _ref,
     props = _objectWithoutProperties(_ref, _excluded);
   var tooltipOptions = useMemo(() => normalizeTooltipOptions(tooltip), [tooltip]);
-  var renderNormalizedItem = useRenderNormalizedItem(tooltipOptions);
+  var renderNormalizedItem = useRenderNormalizedItem({
+    itemIconSlot: 'icon',
+    // Descriptions introduce variable item heights which throws off calculation
+    // of initial scroll position and setting viewport on windowed data. For now
+    // not going to implement description support in Picker.
+    // https://github.com/deephaven/web-client-ui/issues/1958
+    showItemDescriptions: false,
+    showItemIcons,
+    tooltipOptions
+  });
+
+  // Spectrum doesn't re-render if only the `renderNormalizedItems` function
+  // changes, so we create a key from its dependencies that can be used to force
+  // re-render.
+  var forceRerenderKey = "".concat(showItemIcons, "-").concat(tooltipOptions === null || tooltipOptions === void 0 ? void 0 : tooltipOptions.placement);
   var {
     ref: scrollRef,
     onOpenChange: onOpenChangeInternal
@@ -60,9 +76,10 @@ export function PickerNormalized(_ref) {
     disabledKeys,
     onChange: onChange !== null && onChange !== void 0 ? onChange : onSelectionChange
   });
-  return /*#__PURE__*/_jsx(SpectrumPicker
+  return /*#__PURE__*/_createElement(SpectrumPicker
   // eslint-disable-next-line react/jsx-props-no-spreading
   , _objectSpread(_objectSpread({}, props), {}, {
+    key: forceRerenderKey,
     ref: scrollRef,
     UNSAFE_className: cl('dh-picker', 'dh-picker-normalized', UNSAFE_className),
     items: normalizedItems,
@@ -70,19 +87,18 @@ export function PickerNormalized(_ref) {
     defaultSelectedKey: defaultSelectedStringKey,
     disabledKeys: disabledStringKeys,
     onSelectionChange: onStringSelectionChange,
-    onOpenChange: onOpenChangeInternal,
-    children: itemOrSection => {
-      if (isNormalizedSection(itemOrSection)) {
-        var _itemOrSection$item, _itemOrSection$item2;
-        return /*#__PURE__*/_jsx(Section, {
-          title: (_itemOrSection$item = itemOrSection.item) === null || _itemOrSection$item === void 0 ? void 0 : _itemOrSection$item.title,
-          items: (_itemOrSection$item2 = itemOrSection.item) === null || _itemOrSection$item2 === void 0 ? void 0 : _itemOrSection$item2.items,
-          children: renderNormalizedItem
-        }, getItemKey(itemOrSection));
-      }
-      return renderNormalizedItem(itemOrSection);
+    onOpenChange: onOpenChangeInternal
+  }), itemOrSection => {
+    if (isNormalizedSection(itemOrSection)) {
+      var _itemOrSection$item, _itemOrSection$item2;
+      return /*#__PURE__*/_jsx(Section, {
+        title: (_itemOrSection$item = itemOrSection.item) === null || _itemOrSection$item === void 0 ? void 0 : _itemOrSection$item.title,
+        items: (_itemOrSection$item2 = itemOrSection.item) === null || _itemOrSection$item2 === void 0 ? void 0 : _itemOrSection$item2.items,
+        children: renderNormalizedItem
+      }, getItemKey(itemOrSection));
     }
-  }));
+    return renderNormalizedItem(itemOrSection);
+  });
 }
 export default PickerNormalized;
 //# sourceMappingURL=PickerNormalized.js.map

package/dist/spectrum/picker/PickerNormalized.js.map

@@ -1 +1 @@
-{"version":3,"file":"PickerNormalized.js","names":["useMemo","Picker","SpectrumPicker","cl","EMPTY_FUNCTION","Section","getItemKey","isNormalizedSection","normalizeTooltipOptions","useRenderNormalizedItem","useStringifiedSelection","usePickerScrollOnOpen","jsx","_jsx","PickerNormalized","_ref","normalizedItems","tooltip","selectedKey","defaultSelectedKey","disabledKeys","UNSAFE_className","getInitialScrollPosition","onChange","onOpenChange","onScroll","onSelectionChange","props","_objectWithoutProperties","_excluded","tooltipOptions","renderNormalizedItem","ref","scrollRef","onOpenChangeInternal","selectedStringKey","defaultSelectedStringKey","disabledStringKeys","onStringSelectionChange","_objectSpread","items","children","itemOrSection","_itemOrSection$item","_itemOrSection$item2","title","item"],"sources":["../../../src/spectrum/picker/PickerNormalized.tsx"],"sourcesContent":["import { useMemo } from 'react';\nimport { Picker as SpectrumPicker } from '@adobe/react-spectrum';\nimport type { DOMRef } from '@react-types/shared';\nimport cl from 'classnames';\nimport { EMPTY_FUNCTION } from '@deephaven/utils';\nimport { Section } from '../shared';\nimport type { PickerProps as PickerBaseProps } from './Picker';\n\nimport {\n  getItemKey,\n  isNormalizedSection,\n  NormalizedItem,\n  NormalizedSection,\n  normalizeTooltipOptions,\n  useRenderNormalizedItem,\n  useStringifiedSelection,\n} from '../utils';\nimport usePickerScrollOnOpen from './usePickerScrollOnOpen';\n\nexport interface PickerNormalizedProps\n  extends Omit<PickerBaseProps, 'children'> {\n  normalizedItems: (NormalizedItem | NormalizedSection)[];\n  getInitialScrollPosition?: () => Promise<number | null | undefined>;\n  onScroll?: (event: Event) => void;\n}\n\n/**\n * Picker that takes an array of `NormalizedItem` or `NormalizedSection` items\n * as children and uses a render item function to render the items. This is\n * necessary to support windowed data.\n */\nexport function PickerNormalized({\n  normalizedItems,\n  tooltip = true,\n  selectedKey,\n  defaultSelectedKey,\n  disabledKeys,\n  UNSAFE_className,\n  getInitialScrollPosition,\n  onChange,\n  onOpenChange,\n  onScroll = EMPTY_FUNCTION,\n  onSelectionChange,\n  ...props\n}: PickerNormalizedProps): JSX.Element {\n  const tooltipOptions = useMemo(\n    () => normalizeTooltipOptions(tooltip),\n    [tooltip]\n  );\n\n  const renderNormalizedItem = useRenderNormalizedItem(tooltipOptions);\n\n  const { ref: scrollRef, onOpenChange: onOpenChangeInternal } =\n    usePickerScrollOnOpen({\n      getInitialScrollPosition,\n      onScroll,\n      onOpenChange,\n    });\n\n  // Spectrum Picker treats keys as strings if the `key` prop is explicitly\n  // set on `Item` elements. Since we do this in `renderItem`, we need to\n  // map original key types to and from strings so that selection works.\n  const {\n    selectedStringKey,\n    defaultSelectedStringKey,\n    disabledStringKeys,\n    onStringSelectionChange,\n  } = useStringifiedSelection({\n    normalizedItems,\n    selectedKey,\n    defaultSelectedKey,\n    disabledKeys,\n    onChange: onChange ?? onSelectionChange,\n  });\n\n  return (\n    <SpectrumPicker\n      // eslint-disable-next-line react/jsx-props-no-spreading\n      {...props}\n      ref={scrollRef as DOMRef<HTMLDivElement>}\n      UNSAFE_className={cl(\n        'dh-picker',\n        'dh-picker-normalized',\n        UNSAFE_className\n      )}\n      items={normalizedItems}\n      selectedKey={selectedStringKey}\n      defaultSelectedKey={defaultSelectedStringKey}\n      disabledKeys={disabledStringKeys}\n      onSelectionChange={onStringSelectionChange}\n      onOpenChange={onOpenChangeInternal}\n    >\n      {itemOrSection => {\n        if (isNormalizedSection(itemOrSection)) {\n          return (\n            <Section\n              key={getItemKey(itemOrSection)}\n              title={itemOrSection.item?.title}\n              items={itemOrSection.item?.items}\n            >\n              {renderNormalizedItem}\n            </Section>\n          );\n        }\n\n        return renderNormalizedItem(itemOrSection);\n      }}\n    </SpectrumPicker>\n  );\n}\n\nexport default PickerNormalized;\n"],"mappings":";;;;;;;;AAAA,SAASA,OAAO,QAAQ,OAAO;AAC/B,SAASC,MAAM,IAAIC,cAAc,QAAQ,uBAAuB;AAEhE,OAAOC,EAAE,MAAM,YAAY;AAC3B,SAASC,cAAc,QAAQ,kBAAkB;AAAC,SACzCC,OAAO;AAAA,SAIdC,UAAU,EACVC,mBAAmB,EAGnBC,uBAAuB,EACvBC,uBAAuB,EACvBC,uBAAuB;AAAA,OAElBC,qBAAqB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAS5B;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,gBAAgBA,CAAAC,IAAA,EAaO;EAAA,IAbN;MAC/BC,eAAe;MACfC,OAAO,GAAG,IAAI;MACdC,WAAW;MACXC,kBAAkB;MAClBC,YAAY;MACZC,gBAAgB;MAChBC,wBAAwB;MACxBC,QAAQ;MACRC,YAAY;MACZC,QAAQ,GAAGrB,cAAc;MACzBsB;IAEqB,CAAC,GAAAX,IAAA;IADnBY,KAAK,GAAAC,wBAAA,CAAAb,IAAA,EAAAc,SAAA;EAER,IAAMC,cAAc,GAAG9B,OAAO,CAC5B,MAAMQ,uBAAuB,CAACS,OAAO,CAAC,EACtC,CAACA,OAAO,CACV,CAAC;EAED,IAAMc,oBAAoB,GAAGtB,uBAAuB,CAACqB,cAAc,CAAC;EAEpE,IAAM;IAAEE,GAAG,EAAEC,SAAS;IAAET,YAAY,EAAEU;EAAqB,CAAC,GAC1DvB,qBAAqB,CAAC;IACpBW,wBAAwB;IACxBG,QAAQ;IACRD;EACF,CAAC,CAAC;;EAEJ;EACA;EACA;EACA,IAAM;IACJW,iBAAiB;IACjBC,wBAAwB;IACxBC,kBAAkB;IAClBC;EACF,CAAC,GAAG5B,uBAAuB,CAAC;IAC1BM,eAAe;IACfE,WAAW;IACXC,kBAAkB;IAClBC,YAAY;IACZG,QAAQ,EAAEA,QAAQ,aAARA,QAAQ,cAARA,QAAQ,GAAIG;EACxB,CAAC,CAAC;EAEF,oBACEb,IAAA,CAACX;EACC;EAAA,EAAAqC,aAAA,CAAAA,aAAA,KACIZ,KAAK;IACTK,GAAG,EAAEC,SAAoC;IACzCZ,gBAAgB,EAAElB,EAAE,CAClB,WAAW,EACX,sBAAsB,EACtBkB,gBACF,CAAE;IACFmB,KAAK,EAAExB,eAAgB;IACvBE,WAAW,EAAEiB,iBAAkB;IAC/BhB,kBAAkB,EAAEiB,wBAAyB;IAC7ChB,YAAY,EAAEiB,kBAAmB;IACjCX,iBAAiB,EAAEY,uBAAwB;IAC3Cd,YAAY,EAAEU,oBAAqB;IAAAO,QAAA,EAElCC,aAAa,IAAI;MAChB,IAAInC,mBAAmB,CAACmC,aAAa,CAAC,EAAE;QAAA,IAAAC,mBAAA,EAAAC,oBAAA;QACtC,oBACE/B,IAAA,CAACR,OAAO;UAENwC,KAAK,GAAAF,mBAAA,GAAED,aAAa,CAACI,IAAI,cAAAH,mBAAA,uBAAlBA,mBAAA,CAAoBE,KAAM;UACjCL,KAAK,GAAAI,oBAAA,GAAEF,aAAa,CAACI,IAAI,cAAAF,oBAAA,uBAAlBA,oBAAA,CAAoBJ,KAAM;UAAAC,QAAA,EAEhCV;QAAoB,GAJhBzB,UAAU,CAACoC,aAAa,CAKtB,CAAC;MAEd;MAEA,OAAOX,oBAAoB,CAACW,aAAa,CAAC;IAC5C;EAAC,EACa,CAAC;AAErB;AAEA,eAAe5B,gBAAgB"}
+{"version":3,"file":"PickerNormalized.js","names":["useMemo","Picker","SpectrumPicker","cl","EMPTY_FUNCTION","Section","getItemKey","isNormalizedSection","normalizeTooltipOptions","useRenderNormalizedItem","useStringifiedSelection","usePickerScrollOnOpen","jsx","_jsx","createElement","_createElement","PickerNormalized","_ref","normalizedItems","tooltip","selectedKey","defaultSelectedKey","disabledKeys","showItemIcons","UNSAFE_className","getInitialScrollPosition","onChange","onOpenChange","onScroll","onSelectionChange","props","_objectWithoutProperties","_excluded","tooltipOptions","renderNormalizedItem","itemIconSlot","showItemDescriptions","forceRerenderKey","concat","placement","ref","scrollRef","onOpenChangeInternal","selectedStringKey","defaultSelectedStringKey","disabledStringKeys","onStringSelectionChange","_objectSpread","key","items","itemOrSection","_itemOrSection$item","_itemOrSection$item2","title","item","children"],"sources":["../../../src/spectrum/picker/PickerNormalized.tsx"],"sourcesContent":["import { useMemo } from 'react';\nimport { Picker as SpectrumPicker } from '@adobe/react-spectrum';\nimport type { DOMRef } from '@react-types/shared';\nimport cl from 'classnames';\nimport { EMPTY_FUNCTION } from '@deephaven/utils';\nimport { Section } from '../shared';\nimport type { PickerProps as PickerBaseProps } from './Picker';\n\nimport {\n  getItemKey,\n  isNormalizedSection,\n  NormalizedItem,\n  NormalizedSection,\n  normalizeTooltipOptions,\n  useRenderNormalizedItem,\n  useStringifiedSelection,\n} from '../utils';\nimport usePickerScrollOnOpen from './usePickerScrollOnOpen';\n\nexport interface PickerNormalizedProps\n  extends Omit<PickerBaseProps, 'children'> {\n  normalizedItems: (NormalizedItem | NormalizedSection)[];\n  showItemIcons: boolean;\n  getInitialScrollPosition?: () => Promise<number | null | undefined>;\n  onScroll?: (event: Event) => void;\n}\n\n/**\n * Picker that takes an array of `NormalizedItem` or `NormalizedSection` items\n * as children and uses a render item function to render the items. This is\n * necessary to support windowed data.\n */\nexport function PickerNormalized({\n  normalizedItems,\n  tooltip = true,\n  selectedKey,\n  defaultSelectedKey,\n  disabledKeys,\n  showItemIcons,\n  UNSAFE_className,\n  getInitialScrollPosition,\n  onChange,\n  onOpenChange,\n  onScroll = EMPTY_FUNCTION,\n  onSelectionChange,\n  ...props\n}: PickerNormalizedProps): JSX.Element {\n  const tooltipOptions = useMemo(\n    () => normalizeTooltipOptions(tooltip),\n    [tooltip]\n  );\n\n  const renderNormalizedItem = useRenderNormalizedItem({\n    itemIconSlot: 'icon',\n    // Descriptions introduce variable item heights which throws off calculation\n    // of initial scroll position and setting viewport on windowed data. For now\n    // not going to implement description support in Picker.\n    // https://github.com/deephaven/web-client-ui/issues/1958\n    showItemDescriptions: false,\n    showItemIcons,\n    tooltipOptions,\n  });\n\n  // Spectrum doesn't re-render if only the `renderNormalizedItems` function\n  // changes, so we create a key from its dependencies that can be used to force\n  // re-render.\n  const forceRerenderKey = `${showItemIcons}-${tooltipOptions?.placement}`;\n\n  const { ref: scrollRef, onOpenChange: onOpenChangeInternal } =\n    usePickerScrollOnOpen({\n      getInitialScrollPosition,\n      onScroll,\n      onOpenChange,\n    });\n\n  // Spectrum Picker treats keys as strings if the `key` prop is explicitly\n  // set on `Item` elements. Since we do this in `renderItem`, we need to\n  // map original key types to and from strings so that selection works.\n  const {\n    selectedStringKey,\n    defaultSelectedStringKey,\n    disabledStringKeys,\n    onStringSelectionChange,\n  } = useStringifiedSelection({\n    normalizedItems,\n    selectedKey,\n    defaultSelectedKey,\n    disabledKeys,\n    onChange: onChange ?? onSelectionChange,\n  });\n\n  return (\n    <SpectrumPicker\n      // eslint-disable-next-line react/jsx-props-no-spreading\n      {...props}\n      key={forceRerenderKey}\n      ref={scrollRef as DOMRef<HTMLDivElement>}\n      UNSAFE_className={cl(\n        'dh-picker',\n        'dh-picker-normalized',\n        UNSAFE_className\n      )}\n      items={normalizedItems}\n      selectedKey={selectedStringKey}\n      defaultSelectedKey={defaultSelectedStringKey}\n      disabledKeys={disabledStringKeys}\n      onSelectionChange={onStringSelectionChange}\n      onOpenChange={onOpenChangeInternal}\n    >\n      {itemOrSection => {\n        if (isNormalizedSection(itemOrSection)) {\n          return (\n            <Section\n              key={getItemKey(itemOrSection)}\n              title={itemOrSection.item?.title}\n              items={itemOrSection.item?.items}\n            >\n              {renderNormalizedItem}\n            </Section>\n          );\n        }\n\n        return renderNormalizedItem(itemOrSection);\n      }}\n    </SpectrumPicker>\n  );\n}\n\nexport default PickerNormalized;\n"],"mappings":";;;;;;;;AAAA,SAASA,OAAO,QAAQ,OAAO;AAC/B,SAASC,MAAM,IAAIC,cAAc,QAAQ,uBAAuB;AAEhE,OAAOC,EAAE,MAAM,YAAY;AAC3B,SAASC,cAAc,QAAQ,kBAAkB;AAAC,SACzCC,OAAO;AAAA,SAIdC,UAAU,EACVC,mBAAmB,EAGnBC,uBAAuB,EACvBC,uBAAuB,EACvBC,uBAAuB;AAAA,OAElBC,qBAAqB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAAA,SAAAC,aAAA,IAAAC,cAAA;AAU5B;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,gBAAgBA,CAAAC,IAAA,EAcO;EAAA,IAdN;MAC/BC,eAAe;MACfC,OAAO,GAAG,IAAI;MACdC,WAAW;MACXC,kBAAkB;MAClBC,YAAY;MACZC,aAAa;MACbC,gBAAgB;MAChBC,wBAAwB;MACxBC,QAAQ;MACRC,YAAY;MACZC,QAAQ,GAAGxB,cAAc;MACzByB;IAEqB,CAAC,GAAAZ,IAAA;IADnBa,KAAK,GAAAC,wBAAA,CAAAd,IAAA,EAAAe,SAAA;EAER,IAAMC,cAAc,GAAGjC,OAAO,CAC5B,MAAMQ,uBAAuB,CAACW,OAAO,CAAC,EACtC,CAACA,OAAO,CACV,CAAC;EAED,IAAMe,oBAAoB,GAAGzB,uBAAuB,CAAC;IACnD0B,YAAY,EAAE,MAAM;IACpB;IACA;IACA;IACA;IACAC,oBAAoB,EAAE,KAAK;IAC3Bb,aAAa;IACbU;EACF,CAAC,CAAC;;EAEF;EACA;EACA;EACA,IAAMI,gBAAgB,MAAAC,MAAA,CAAMf,aAAa,OAAAe,MAAA,CAAIL,cAAc,aAAdA,cAAc,uBAAdA,cAAc,CAAEM,SAAS,CAAE;EAExE,IAAM;IAAEC,GAAG,EAAEC,SAAS;IAAEd,YAAY,EAAEe;EAAqB,CAAC,GAC1D/B,qBAAqB,CAAC;IACpBc,wBAAwB;IACxBG,QAAQ;IACRD;EACF,CAAC,CAAC;;EAEJ;EACA;EACA;EACA,IAAM;IACJgB,iBAAiB;IACjBC,wBAAwB;IACxBC,kBAAkB;IAClBC;EACF,CAAC,GAAGpC,uBAAuB,CAAC;IAC1BQ,eAAe;IACfE,WAAW;IACXC,kBAAkB;IAClBC,YAAY;IACZI,QAAQ,EAAEA,QAAQ,aAARA,QAAQ,cAARA,QAAQ,GAAIG;EACxB,CAAC,CAAC;EAEF,oBACEd,cAAA,CAACb;EACC;EAAA,EAAA6C,aAAA,CAAAA,aAAA,KACIjB,KAAK;IACTkB,GAAG,EAAEX,gBAAiB;IACtBG,GAAG,EAAEC,SAAoC;IACzCjB,gBAAgB,EAAErB,EAAE,CAClB,WAAW,EACX,sBAAsB,EACtBqB,gBACF,CAAE;IACFyB,KAAK,EAAE/B,eAAgB;IACvBE,WAAW,EAAEuB,iBAAkB;IAC/BtB,kBAAkB,EAAEuB,wBAAyB;IAC7CtB,YAAY,EAAEuB,kBAAmB;IACjChB,iBAAiB,EAAEiB,uBAAwB;IAC3CnB,YAAY,EAAEe;EAAqB,IAElCQ,aAAa,IAAI;IAChB,IAAI3C,mBAAmB,CAAC2C,aAAa,CAAC,EAAE;MAAA,IAAAC,mBAAA,EAAAC,oBAAA;MACtC,oBACEvC,IAAA,CAACR,OAAO;QAENgD,KAAK,GAAAF,mBAAA,GAAED,aAAa,CAACI,IAAI,cAAAH,mBAAA,uBAAlBA,mBAAA,CAAoBE,KAAM;QACjCJ,KAAK,GAAAG,oBAAA,GAAEF,aAAa,CAACI,IAAI,cAAAF,oBAAA,uBAAlBA,oBAAA,CAAoBH,KAAM;QAAAM,QAAA,EAEhCrB;MAAoB,GAJhB5B,UAAU,CAAC4C,aAAa,CAKtB,CAAC;IAEd;IAEA,OAAOhB,oBAAoB,CAACgB,aAAa,CAAC;EAC5C,CACc,CAAC;AAErB;AAEA,eAAelC,gBAAgB"}

package/dist/spectrum/shared.d.ts

@@ -1,12 +1,16 @@
+/// <reference types="react" />
+import type { ItemElement, ItemRenderer, SectionProps as SpectrumSectionProps } from '@react-types/shared';
+export { Item } from '@adobe/react-spectrum';
+export type { ItemProps } from '@react-types/shared';
+export type ItemElementOrPrimitive<T = unknown> = number | string | boolean | ItemElement<T>;
 /**
- * Wrapping Spectrum `Item` and `Section` components will break functionality
- * due to the way they are consumed by collection components. They are only used
- * to pass data and don't render anything on their own, so they don't need to be
- * wrapped. If we do ever need to wrap them for whatever reason, the static
- * `getCollectionNode` method will need to be implemented.
- * See https://github.com/adobe/react-spectrum/blob/main/packages/%40react-stately/collections/src/Item.ts#L17
- *     https://github.com/adobe/react-spectrum/blob/main/packages/%40react-stately/collections/src/Section.ts#L18
+ * Spectrum SectionProps augmented with support for primitive item children.
  */
-export { Item, Section } from '@adobe/react-spectrum';
-export type { ItemProps, SectionProps } from '@react-types/shared';
+export type SectionProps<T> = Omit<SpectrumSectionProps<T>, 'children'> & {
+    children: ItemElementOrPrimitive<T> | ItemElementOrPrimitive<T>[] | ItemRenderer<T>;
+};
+/**
+ * Re-export Spectrum Section component with augmented props type.
+ */
+export declare const Section: <T>(props: SectionProps<T>) => JSX.Element;
 //# sourceMappingURL=shared.d.ts.map

package/dist/spectrum/shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/spectrum/shared.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACtD,YAAY,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/spectrum/shared.ts"],"names":[],"mappings":";AAUA,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,YAAY,IAAI,oBAAoB,EACrC,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,YAAY,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAMrD,MAAM,MAAM,sBAAsB,CAAC,CAAC,GAAG,OAAO,IAC1C,MAAM,GACN,MAAM,GACN,OAAO,GACP,WAAW,CAAC,CAAC,CAAC,CAAC;AAEnB;;GAEG;AACH,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,GAAG;IACxE,QAAQ,EACJ,sBAAsB,CAAC,CAAC,CAAC,GACzB,sBAAsB,CAAC,CAAC,CAAC,EAAE,GAC3B,YAAY,CAAC,CAAC,CAAC,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,OAAO,iCAEf,WAAW,CAAC"}

package/dist/spectrum/shared.js

@@ -7,5 +7,20 @@
  * See https://github.com/adobe/react-spectrum/blob/main/packages/%40react-stately/collections/src/Item.ts#L17
  *     https://github.com/adobe/react-spectrum/blob/main/packages/%40react-stately/collections/src/Section.ts#L18
  */
-export { Item, Section } from '@adobe/react-spectrum';
+import { Section as SpectrumSection } from '@adobe/react-spectrum';
+export { Item } from '@adobe/react-spectrum';
+
+/*
+ * We support primitive values as shorthand for `Item` elements in certain
+ * components. This type represents this augmentation of the Spectrum types.
+ */
+
+/**
+ * Spectrum SectionProps augmented with support for primitive item children.
+ */
+
+/**
+ * Re-export Spectrum Section component with augmented props type.
+ */
+export var Section = SpectrumSection;
 //# sourceMappingURL=shared.js.map

package/dist/spectrum/shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared.js","names":["Item","Section"],"sources":["../../src/spectrum/shared.ts"],"sourcesContent":["/**\n * Wrapping Spectrum `Item` and `Section` components will break functionality\n * due to the way they are consumed by collection components. They are only used\n * to pass data and don't render anything on their own, so they don't need to be\n * wrapped. If we do ever need to wrap them for whatever reason, the static\n * `getCollectionNode` method will need to be implemented.\n * See https://github.com/adobe/react-spectrum/blob/main/packages/%40react-stately/collections/src/Item.ts#L17\n *     https://github.com/adobe/react-spectrum/blob/main/packages/%40react-stately/collections/src/Section.ts#L18\n */\nexport { Item, Section } from '@adobe/react-spectrum';\nexport type { ItemProps, SectionProps } from '@react-types/shared';\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,IAAI,EAAEC,OAAO,QAAQ,uBAAuB"}
+{"version":3,"file":"shared.js","names":["Section","SpectrumSection","Item"],"sources":["../../src/spectrum/shared.ts"],"sourcesContent":["/**\n * Wrapping Spectrum `Item` and `Section` components will break functionality\n * due to the way they are consumed by collection components. They are only used\n * to pass data and don't render anything on their own, so they don't need to be\n * wrapped. If we do ever need to wrap them for whatever reason, the static\n * `getCollectionNode` method will need to be implemented.\n * See https://github.com/adobe/react-spectrum/blob/main/packages/%40react-stately/collections/src/Item.ts#L17\n *     https://github.com/adobe/react-spectrum/blob/main/packages/%40react-stately/collections/src/Section.ts#L18\n */\nimport { Section as SpectrumSection } from '@adobe/react-spectrum';\nimport type {\n  ItemElement,\n  ItemRenderer,\n  SectionProps as SpectrumSectionProps,\n} from '@react-types/shared';\n\nexport { Item } from '@adobe/react-spectrum';\nexport type { ItemProps } from '@react-types/shared';\n\n/*\n * We support primitive values as shorthand for `Item` elements in certain\n * components. This type represents this augmentation of the Spectrum types.\n */\nexport type ItemElementOrPrimitive<T = unknown> =\n  | number\n  | string\n  | boolean\n  | ItemElement<T>;\n\n/**\n * Spectrum SectionProps augmented with support for primitive item children.\n */\nexport type SectionProps<T> = Omit<SpectrumSectionProps<T>, 'children'> & {\n  children:\n    | ItemElementOrPrimitive<T>\n    | ItemElementOrPrimitive<T>[]\n    | ItemRenderer<T>;\n};\n\n/**\n * Re-export Spectrum Section component with augmented props type.\n */\nexport const Section = SpectrumSection as <T>(\n  props: SectionProps<T>\n) => JSX.Element;\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,OAAO,IAAIC,eAAe,QAAQ,uBAAuB;AAOlE,SAASC,IAAI,QAAQ,uBAAuB;;AAG5C;AACA;AACA;AACA;;AAOA;AACA;AACA;;AAQA;AACA;AACA;AACA,OAAO,IAAMF,OAAO,GAAGC,eAEP"}

package/dist/spectrum/utils/index.d.ts

@@ -1,5 +1,6 @@
 export * from './itemUtils';
 export * from './itemWrapperUtils';
+export * from './propsUtils';
 export * from './themeUtils';
 export * from './useRenderNormalizedItem';
 export * from './useStringifiedMultiSelection';

package/dist/spectrum/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/spectrum/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,oBAAoB,CAAC;AACnC,cAAc,cAAc,CAAC;AAC7B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,2BAA2B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/spectrum/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,oBAAoB,CAAC;AACnC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,2BAA2B,CAAC"}

package/dist/spectrum/utils/index.js

@@ -1,5 +1,6 @@
 export * from "./itemUtils.js";
 export * from "./itemWrapperUtils.js";
+export * from "./propsUtils.js";
 export * from "./themeUtils.js";
 export * from "./useRenderNormalizedItem.js";
 export * from "./useStringifiedMultiSelection.js";

package/dist/spectrum/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../../src/spectrum/utils/index.ts"],"sourcesContent":["export * from './itemUtils';\nexport * from './itemWrapperUtils';\nexport * from './themeUtils';\nexport * from './useRenderNormalizedItem';\nexport * from './useStringifiedMultiSelection';\nexport * from './useStringifiedSelection';\n"],"mappings":""}
+{"version":3,"file":"index.js","names":[],"sources":["../../../src/spectrum/utils/index.ts"],"sourcesContent":["export * from './itemUtils';\nexport * from './itemWrapperUtils';\nexport * from './propsUtils';\nexport * from './themeUtils';\nexport * from './useRenderNormalizedItem';\nexport * from './useStringifiedMultiSelection';\nexport * from './useStringifiedSelection';\n"],"mappings":""}

package/dist/spectrum/utils/itemUtils.d.ts

@@ -2,14 +2,13 @@ import { Key, ReactElement, ReactNode } from 'react';
 import { SpectrumPickerProps } from '@adobe/react-spectrum';
 import type { ItemRenderer } from '@react-types/shared';
 import { KeyedItem, SelectionT } from '@deephaven/utils';
-import { ItemProps, SectionProps } from '../shared';
+import { ItemElementOrPrimitive, ItemProps, SectionProps } from '../shared';
 import { PopperOptions } from '../../popper';
 /**
  * `Item.textValue` prop needs to be a non-empty string for accessibility
  * purposes. This is not displayed in the UI.
  */
 export declare const ITEM_EMPTY_STRING_TEXT_VALUE = "Empty";
-export declare const INVALID_ITEM_ERROR_MESSAGE = "Items must be strings, numbers, booleans, <Item> or <Section> elements:";
 /**
  * React Spectrum <Section> supports an `ItemRenderer` function as a child. The
  * DH picker makes use of this internally, but we don't want to support it as
@@ -18,10 +17,10 @@ export declare const INVALID_ITEM_ERROR_MESSAGE = "Items must be strings, number
 type SectionPropsNoItemRenderer<T> = Omit<SectionProps<T>, 'children'> & {
     children: Exclude<SectionProps<T>['children'], ItemRenderer<T>>;
 };
-export type ItemElement = ReactElement<ItemProps<unknown>>;
-export type SectionElement = ReactElement<SectionPropsNoItemRenderer<unknown>>;
-export type ItemElementOrPrimitive = number | string | boolean | ItemElement;
-export type ItemOrSection = ItemElementOrPrimitive | SectionElement;
+export type ItemElement<T = unknown> = ReactElement<ItemProps<T>>;
+export type SectionElement<T = unknown> = ReactElement<SectionPropsNoItemRenderer<T>>;
+export type ItemOrSection<T = unknown> = ItemElementOrPrimitive<T> | SectionElement<T>;
+export type ItemIconSlot = 'icon' | 'image' | 'illustration';
 /**
  * Augment the Spectrum selection key type to include boolean values.
  * Spectrum collection components already supports this, but the built in types
@@ -38,6 +37,8 @@ export type ItemSelectionChangeHandler = (key: ItemKey) => void;
 export interface NormalizedItemData {
     key?: ItemKey;
     content: ReactNode;
+    description?: ReactNode;
+    icon?: ReactNode;
     textValue: string | undefined;
 }
 export interface NormalizedSectionData {
@@ -89,13 +90,13 @@ export declare function getPositionOfSelectedItemElement<TKey extends string | n
  * @param node The node to check
  * @returns True if the node is a Section element
  */
-export declare function isSectionElement<T>(node: ReactNode): node is ReactElement<SectionProps<T>>;
+export declare function isSectionElement<T>(node: ReactNode): node is SectionElement<T>;
 /**
  * Determine if a node is an Item element.
  * @param node The node to check
  * @returns True if the node is an Item element
  */
-export declare function isItemElement<T>(node: ReactNode): node is ReactElement<ItemProps<T>>;
+export declare function isItemElement<T>(node: ReactNode): node is ItemElement<T>;
 /**
  * Determine if a node is an Item element containing a child `Text` element with
  * a `slot` prop set to `description`.
@@ -123,12 +124,6 @@ export declare function isNormalizedSection(maybeNormalizedSection: NormalizedIt
  * @returns True if the node is an item or section
  */
 export declare function isItemOrSection(node: ReactNode): node is ItemOrSection;
-/**
- * Normalize an item or section or a list of items or sections.
- * @param itemsOrSections An item or section or array of items or sections
- * @returns An array of normalized items or sections
- */
-export declare function normalizeItemList<TItemOrSection extends ItemOrSection>(itemsOrSections: TItemOrSection | TItemOrSection[] | NormalizedItem[]): NormalizedItemOrSection<TItemOrSection>[];
 /**
  * Returns a TooltipOptions object or null if options is false or null.
  * @param options Tooltip options

package/dist/spectrum/utils/itemUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"itemUtils.d.ts","sourceRoot":"","sources":["../../../src/spectrum/utils/itemUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"itemUtils.d.ts","sourceRoot":"","sources":["../../../src/spectrum/utils/itemUtils.ts"],"names":[],"mappings":"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"}

package/dist/spectrum/utils/itemUtils.js

@@ -1,18 +1,15 @@
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-import Log from '@deephaven/log';
 import { isElementOfType } from '@deephaven/react-hooks';
+import { ensureArray } from '@deephaven/utils';
 import { Item, Section } from "../shared.js";
 import { Text } from "../Text.js";
 import ItemContent from "../ItemContent.js";
-var log = Log.module('itemUtils');
-
 /**
  * `Item.textValue` prop needs to be a non-empty string for accessibility
  * purposes. This is not displayed in the UI.
  */
 export var ITEM_EMPTY_STRING_TEXT_VALUE = 'Empty';
-export var INVALID_ITEM_ERROR_MESSAGE = 'Items must be strings, numbers, booleans, <Item> or <Section> elements:';
 
 /**
  * React Spectrum <Section> supports an `ItemRenderer` function as a child. The
@@ -20,18 +17,19 @@ export var INVALID_ITEM_ERROR_MESSAGE = 'Items must be strings, numbers, boolean
  * an incoming prop.
  */
 
+// Picker uses `icon` slot. ListView can use `image` or `illustration` slots.
+// https://github.com/adobe/react-spectrum/blob/main/packages/%40react-spectrum/picker/src/Picker.tsx#L194
+// https://github.com/adobe/react-spectrum/blob/main/packages/%40react-spectrum/list/src/ListViewItem.tsx#L266-L267
 /**
  * Augment the Spectrum selection key type to include boolean values.
  * Spectrum collection components already supports this, but the built in types
  * don't reflect it.
  */
-
 /**
  * Augment the Spectrum selection change handler type to include boolean keys.
  * Spectrum components already supports this, but the built in types don't
  * reflect it.
  */
-
 /**
  * Spectrum collection components support a variety of item types, including
  * strings, numbers, booleans, and more complex React elements. This type
@@ -40,7 +38,6 @@ export var INVALID_ITEM_ERROR_MESSAGE = 'Items must be strings, numbers, boolean
  * `KeyedItem` interface to be compatible with Windowed data utils
  * (e.g. `useViewportData`).
  */
-
 /**
  * DH wrappers of Spectrum collection components use a normalized item that
  * includes a `key` prop and an optional `item` prop. This is mostly to support
@@ -85,8 +82,8 @@ function _getPositionOfSelectedItemElement() {
       return position;
     }
     for (var i = 0; i < items.length; i += 1) {
-      var _item = items[i];
-      if (_item.key === selectedKey) {
+      var item = items[i];
+      if (item.key === selectedKey) {
         return position;
       }
       position += itemHeight;
@@ -121,10 +118,10 @@ export function isItemElementWithDescription(node) {
 
   // If children are wrapped in `ItemContent`, go down 1 level
   var children = isElementOfType(node.props.children, ItemContent) ? node.props.children.props.children : node.props.children;
-  var childrenArray = Array.isArray(children) ? children : [children];
+  var childrenArray = ensureArray(children);
   var result = childrenArray.some(child => {
     var _child$props;
-    return ((_child$props = child.props) === null || _child$props === void 0 ? void 0 : _child$props.slot) === 'description' && isElementOfType(child, Text);
+    return isElementOfType(child, Text) && ((_child$props = child.props) === null || _child$props === void 0 ? void 0 : _child$props.slot) === 'description';
   });
   return result;
 }
@@ -164,103 +161,6 @@ export function isItemOrSection(node) {
   return typeof node === 'string' || typeof node === 'number' || typeof node === 'boolean' || isItemElement(node) || isSectionElement(node);
 }
 
-/**
- * Determine the `key` of an item or section.
- * @param itemOrSection The item or section
- * @returns A `ItemKey` for the item or undefined if a key can't be determined
- */
-
-function normalizeItemKey(itemOrSection) {
-  var _itemOrSection$props$;
-  // string, number, or boolean
-  if (typeof itemOrSection !== 'object') {
-    return itemOrSection;
-  }
-
-  // If `key` prop is explicitly set
-  if (itemOrSection.key != null) {
-    return itemOrSection.key;
-  }
-
-  // Section element
-  if (isSectionElement(itemOrSection)) {
-    return typeof itemOrSection.props.title === 'string' ? itemOrSection.props.title : undefined;
-  }
-
-  // Item element
-  return (_itemOrSection$props$ = itemOrSection.props.textValue) !== null && _itemOrSection$props$ !== void 0 ? _itemOrSection$props$ : typeof itemOrSection.props.children === 'string' ? itemOrSection.props.children : undefined;
-}
-
-/**
- * Get a normalized `textValue` for an item ensuring it is a string.
- * @param item The item
- * @returns A string `textValue` for the item
- */
-function normalizeTextValue(item) {
-  if (typeof item !== 'object') {
-    return String(item);
-  }
-  if (item.props.textValue != null) {
-    return item.props.textValue;
-  }
-  if (typeof item.props.children === 'string') {
-    return item.props.children;
-  }
-  return undefined;
-}
-
-/**
- * Normalize an item or section to an object form.
- * @param itemOrSection item to normalize
- * @returns NormalizedItem or NormalizedSection object
- */
-function normalizeItem(itemOrSection) {
-  if (!isItemOrSection(itemOrSection)) {
-    log.debug(INVALID_ITEM_ERROR_MESSAGE, itemOrSection);
-    throw new Error(INVALID_ITEM_ERROR_MESSAGE);
-  }
-  if (isSectionElement(itemOrSection)) {
-    var _key = normalizeItemKey(itemOrSection);
-    var {
-      title
-    } = itemOrSection.props;
-    var items = normalizeItemList(itemOrSection.props.children).filter(
-    // We don't support nested section elements
-    childItem => !isSectionElement(childItem));
-    return {
-      item: {
-        key: _key,
-        title,
-        items
-      }
-    };
-  }
-  var key = normalizeItemKey(itemOrSection);
-  var content = isItemElement(itemOrSection) ? itemOrSection.props.children : itemOrSection;
-  var textValue = normalizeTextValue(itemOrSection);
-  return {
-    item: {
-      key,
-      content,
-      textValue
-    }
-  };
-}
-
-/**
- * Normalize an item or section or a list of items or sections.
- * @param itemsOrSections An item or section or array of items or sections
- * @returns An array of normalized items or sections
- */
-export function normalizeItemList(itemsOrSections) {
-  // If already normalized, just return as-is
-  if (isNormalizedItemsWithKeysList(itemsOrSections)) {
-    return itemsOrSections;
-  }
-  var itemsArray = Array.isArray(itemsOrSections) ? itemsOrSections : [itemsOrSections];
-  return itemsArray.map(normalizeItem);
-}
-
 /**
  * Returns a TooltipOptions object or null if options is false or null.
  * @param options Tooltip options

package/dist/spectrum/utils/itemUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"itemUtils.js","names":["Log","isElementOfType","Item","Section","Text","ItemContent","log","module","ITEM_EMPTY_STRING_TEXT_VALUE","INVALID_ITEM_ERROR_MESSAGE","getItemKey","item","_item$item$key","_item$item","key","getPositionOfSelectedItemElement","_x","_getPositionOfSelectedItemElement","apply","arguments","_asyncToGenerator","_ref","items","itemHeight","selectedKey","topOffset","position","i","length","isSectionElement","node","isItemElement","isItemElementWithDescription","children","props","childrenArray","Array","isArray","result","some","child","_child$props","slot","isNormalizedItemsWithKeysList","isItemOrSection","isNormalizedSection","maybeNormalizedSection","normalizeItemKey","itemOrSection","_itemOrSection$props$","title","undefined","textValue","normalizeTextValue","String","normalizeItem","debug","Error","normalizeItemList","filter","childItem","content","itemsOrSections","itemsArray","map","normalizeTooltipOptions","options","placement","itemSelectionToStringSet","itemKeys","Set"],"sources":["../../../src/spectrum/utils/itemUtils.ts"],"sourcesContent":["import { Key, ReactElement, ReactNode } from 'react';\nimport { SpectrumPickerProps } from '@adobe/react-spectrum';\nimport type { ItemRenderer } from '@react-types/shared';\nimport Log from '@deephaven/log';\nimport { isElementOfType } from '@deephaven/react-hooks';\nimport { KeyedItem, SelectionT } from '@deephaven/utils';\nimport { Item, ItemProps, Section, SectionProps } from '../shared';\nimport { PopperOptions } from '../../popper';\nimport { Text } from '../Text';\nimport ItemContent from '../ItemContent';\n\nconst log = Log.module('itemUtils');\n\n/**\n * `Item.textValue` prop needs to be a non-empty string for accessibility\n * purposes. This is not displayed in the UI.\n */\nexport const ITEM_EMPTY_STRING_TEXT_VALUE = 'Empty';\n\nexport const INVALID_ITEM_ERROR_MESSAGE =\n  'Items must be strings, numbers, booleans, <Item> or <Section> elements:';\n\n/**\n * React Spectrum <Section> supports an `ItemRenderer` function as a child. The\n * DH picker makes use of this internally, but we don't want to support it as\n * an incoming prop.\n */\ntype SectionPropsNoItemRenderer<T> = Omit<SectionProps<T>, 'children'> & {\n  children: Exclude<SectionProps<T>['children'], ItemRenderer<T>>;\n};\n\nexport type ItemElement = ReactElement<ItemProps<unknown>>;\nexport type SectionElement = ReactElement<SectionPropsNoItemRenderer<unknown>>;\n\nexport type ItemElementOrPrimitive = number | string | boolean | ItemElement;\nexport type ItemOrSection = ItemElementOrPrimitive | SectionElement;\n\n/**\n * Augment the Spectrum selection key type to include boolean values.\n * Spectrum collection components already supports this, but the built in types\n * don't reflect it.\n */\nexport type ItemKey = Key | boolean;\n\nexport type ItemSelection = SelectionT<ItemKey>;\n\n/**\n * Augment the Spectrum selection change handler type to include boolean keys.\n * Spectrum components already supports this, but the built in types don't\n * reflect it.\n */\nexport type ItemSelectionChangeHandler = (key: ItemKey) => void;\n\nexport interface NormalizedItemData {\n  key?: ItemKey;\n  content: ReactNode;\n  textValue: string | undefined;\n}\n\nexport interface NormalizedSectionData {\n  key?: Key;\n  title?: ReactNode;\n  items: NormalizedItem[];\n}\n\n/**\n * Spectrum collection components support a variety of item types, including\n * strings, numbers, booleans, and more complex React elements. This type\n * represents a normalized form to make rendering items simpler and keep the\n * logic of transformation in separate util methods. It also adheres to the\n * `KeyedItem` interface to be compatible with Windowed data utils\n * (e.g. `useViewportData`).\n */\nexport type NormalizedItem = KeyedItem<NormalizedItemData, ItemKey | undefined>;\n\nexport type NormalizedSection = KeyedItem<\n  NormalizedSectionData,\n  Key | undefined\n>;\n\nexport type NormalizedItemOrSection<TItemOrSection extends ItemOrSection> =\n  TItemOrSection extends SectionElement ? NormalizedSection : NormalizedItem;\n\nexport type NormalizedSpectrumPickerProps = SpectrumPickerProps<NormalizedItem>;\n\nexport type TooltipOptions = { placement: PopperOptions['placement'] };\n\n/**\n * DH wrappers of Spectrum collection components use a normalized item that\n * includes a `key` prop and an optional `item` prop. This is mostly to support\n * Windowed data where items are created before their data has been loaded (data\n * gets set in the `item` prop). If data has loaded, return its `key`. If not,\n * return the top-level `key` on the normalized item.\n * @param item The normalized item or section\n * @returns The `key` of the item or section\n */\nexport function getItemKey<\n  TItem extends NormalizedItem | NormalizedSection,\n  TKey extends TItem extends NormalizedItem\n    ? ItemKey | undefined\n    : TItem extends NormalizedSection\n    ? Key | undefined\n    : undefined,\n>(item: TItem | null | undefined): TKey {\n  return (item?.item?.key ?? item?.key) as TKey;\n}\n\n/**\n * Get the position of the item with the given selected key in a list of items.\n * @param items The items to search\n * @param itemHeight The height of each item\n * @param selectedKey The key of the selected item\n * @param topOffset The top offset of the list\n * @returns The position of the selected item or the top offset if not found\n */\nexport async function getPositionOfSelectedItemElement<\n  TKey extends string | number | boolean | undefined,\n>({\n  items,\n  itemHeight,\n  selectedKey,\n  topOffset,\n}: {\n  items: ItemElement[];\n  selectedKey: TKey | null | undefined;\n  itemHeight: number;\n  topOffset: number;\n}): Promise<number> {\n  let position = topOffset;\n\n  if (selectedKey == null) {\n    return position;\n  }\n\n  for (let i = 0; i < items.length; i += 1) {\n    const item = items[i];\n    if (item.key === selectedKey) {\n      return position;\n    }\n\n    position += itemHeight;\n  }\n\n  return topOffset;\n}\n\n/**\n * Determine if a node is a Section element.\n * @param node The node to check\n * @returns True if the node is a Section element\n */\nexport function isSectionElement<T>(\n  node: ReactNode\n): node is ReactElement<SectionProps<T>> {\n  return isElementOfType(node, Section);\n}\n\n/**\n * Determine if a node is an Item element.\n * @param node The node to check\n * @returns True if the node is an Item element\n */\nexport function isItemElement<T>(\n  node: ReactNode\n): node is ReactElement<ItemProps<T>> {\n  return isElementOfType(node, Item);\n}\n\n/**\n * Determine if a node is an Item element containing a child `Text` element with\n * a `slot` prop set to `description`.\n * @param node The node to check\n * @returns True if the node is an Item element with a description\n */\nexport function isItemElementWithDescription<T>(\n  node: ReactNode\n): node is ReactElement<ItemProps<T>> {\n  if (!isItemElement(node)) {\n    return false;\n  }\n\n  // If children are wrapped in `ItemContent`, go down 1 level\n  const children = isElementOfType(node.props.children, ItemContent)\n    ? node.props.children.props.children\n    : node.props.children;\n\n  const childrenArray = Array.isArray(children) ? children : [children];\n\n  const result = childrenArray.some(\n    child => child.props?.slot === 'description' && isElementOfType(child, Text)\n  );\n\n  return result;\n}\n\n/**\n * Determine if a node is an array containing normalized items or sections with\n * keys. Note that this only checks the first node in the array.\n * @param node The node to check\n * @returns True if the node is a normalized item or section with keys array\n */\nexport function isNormalizedItemsWithKeysList<\n  TItemOrSection extends ItemOrSection,\n>(\n  node:\n    | TItemOrSection\n    | TItemOrSection[]\n    | NormalizedItemOrSection<TItemOrSection>[]\n): node is NormalizedItemOrSection<TItemOrSection>[] {\n  if (!Array.isArray(node)) {\n    return false;\n  }\n\n  if (node.length === 0) {\n    return true;\n  }\n\n  return !isItemOrSection(node[0]) && 'key' in node[0];\n}\n\n/**\n * Determine if an object is a normalized section.\n * @param maybeNormalizedSection The object to check\n * @returns True if the object is a normalized section\n */\nexport function isNormalizedSection(\n  maybeNormalizedSection: NormalizedItem | NormalizedSection\n): maybeNormalizedSection is NormalizedSection {\n  return (\n    maybeNormalizedSection.item != null &&\n    'items' in maybeNormalizedSection.item\n  );\n}\n\n/**\n * Determine if a node is an item or section. Valid types include strings,\n * numbers, booleans, Item elements, and Section elements.\n * @param node The node to check\n * @returns True if the node is an item or section\n */\nexport function isItemOrSection(node: ReactNode): node is ItemOrSection {\n  return (\n    typeof node === 'string' ||\n    typeof node === 'number' ||\n    typeof node === 'boolean' ||\n    isItemElement(node) ||\n    isSectionElement(node)\n  );\n}\n\n/**\n * Determine the `key` of an item or section.\n * @param itemOrSection The item or section\n * @returns A `ItemKey` for the item or undefined if a key can't be determined\n */\nfunction normalizeItemKey(item: ItemElementOrPrimitive): ItemKey | undefined;\nfunction normalizeItemKey(section: SectionElement): Key | undefined;\nfunction normalizeItemKey(\n  itemOrSection: ItemElementOrPrimitive | SectionElement\n): Key | ItemKey | undefined {\n  // string, number, or boolean\n  if (typeof itemOrSection !== 'object') {\n    return itemOrSection;\n  }\n\n  // If `key` prop is explicitly set\n  if (itemOrSection.key != null) {\n    return itemOrSection.key;\n  }\n\n  // Section element\n  if (isSectionElement(itemOrSection)) {\n    return typeof itemOrSection.props.title === 'string'\n      ? itemOrSection.props.title\n      : undefined;\n  }\n\n  // Item element\n  return (\n    itemOrSection.props.textValue ??\n    (typeof itemOrSection.props.children === 'string'\n      ? itemOrSection.props.children\n      : undefined)\n  );\n}\n\n/**\n * Get a normalized `textValue` for an item ensuring it is a string.\n * @param item The item\n * @returns A string `textValue` for the item\n */\nfunction normalizeTextValue(item: ItemElementOrPrimitive): string | undefined {\n  if (typeof item !== 'object') {\n    return String(item);\n  }\n\n  if (item.props.textValue != null) {\n    return item.props.textValue;\n  }\n\n  if (typeof item.props.children === 'string') {\n    return item.props.children;\n  }\n\n  return undefined;\n}\n\n/**\n * Normalize an item or section to an object form.\n * @param itemOrSection item to normalize\n * @returns NormalizedItem or NormalizedSection object\n */\nfunction normalizeItem<TItemOrSection extends ItemOrSection>(\n  itemOrSection: TItemOrSection\n): NormalizedItemOrSection<TItemOrSection> {\n  if (!isItemOrSection(itemOrSection)) {\n    log.debug(INVALID_ITEM_ERROR_MESSAGE, itemOrSection);\n    throw new Error(INVALID_ITEM_ERROR_MESSAGE);\n  }\n\n  if (isSectionElement(itemOrSection)) {\n    const key = normalizeItemKey(itemOrSection);\n    const { title } = itemOrSection.props;\n\n    const items = normalizeItemList(itemOrSection.props.children).filter(\n      // We don't support nested section elements\n      childItem => !isSectionElement(childItem)\n    ) as NormalizedItem[];\n\n    return {\n      item: { key, title, items },\n    } as NormalizedItemOrSection<TItemOrSection>;\n  }\n\n  const key = normalizeItemKey(itemOrSection);\n  const content = isItemElement(itemOrSection)\n    ? itemOrSection.props.children\n    : itemOrSection;\n  const textValue = normalizeTextValue(itemOrSection);\n\n  return {\n    item: { key, content, textValue },\n  } as NormalizedItemOrSection<TItemOrSection>;\n}\n\n/**\n * Normalize an item or section or a list of items or sections.\n * @param itemsOrSections An item or section or array of items or sections\n * @returns An array of normalized items or sections\n */\nexport function normalizeItemList<TItemOrSection extends ItemOrSection>(\n  itemsOrSections: TItemOrSection | TItemOrSection[] | NormalizedItem[]\n): NormalizedItemOrSection<TItemOrSection>[] {\n  // If already normalized, just return as-is\n  if (isNormalizedItemsWithKeysList(itemsOrSections)) {\n    return itemsOrSections as NormalizedItemOrSection<TItemOrSection>[];\n  }\n\n  const itemsArray: TItemOrSection[] = Array.isArray(itemsOrSections)\n    ? itemsOrSections\n    : [itemsOrSections];\n\n  return itemsArray.map(normalizeItem);\n}\n\n/**\n * Returns a TooltipOptions object or null if options is false or null.\n * @param options Tooltip options\n * @param placement Default placement for the tooltip if `options` is set\n * explicitly to `true`\n * @returns TooltipOptions or null\n */\nexport function normalizeTooltipOptions(\n  options?: boolean | TooltipOptions | null,\n  placement: TooltipOptions['placement'] = 'right'\n): TooltipOptions | null {\n  if (options == null || options === false) {\n    return null;\n  }\n\n  if (options === true) {\n    return { placement };\n  }\n\n  return options;\n}\n\n/**\n * Convert a selection of `ItemKey`s to a selection of strings.\n * @param itemKeys The selection of `ItemKey`s\n * @returns The selection of strings\n */\nexport function itemSelectionToStringSet<\n  TKeys extends 'all' | Iterable<ItemKey> | undefined,\n  TResult extends TKeys extends 'all'\n    ? 'all'\n    : TKeys extends Iterable<ItemKey>\n    ? Set<string>\n    : undefined,\n>(itemKeys: TKeys): TResult {\n  if (itemKeys == null || itemKeys === 'all') {\n    return itemKeys as undefined | 'all' as TResult;\n  }\n\n  return new Set([...itemKeys].map(String)) as TResult;\n}\n"],"mappings":"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"}
+{"version":3,"file":"itemUtils.js","names":["isElementOfType","ensureArray","Item","Section","Text","ItemContent","ITEM_EMPTY_STRING_TEXT_VALUE","getItemKey","item","_item$item$key","_item$item","key","getPositionOfSelectedItemElement","_x","_getPositionOfSelectedItemElement","apply","arguments","_asyncToGenerator","_ref","items","itemHeight","selectedKey","topOffset","position","i","length","isSectionElement","node","isItemElement","isItemElementWithDescription","children","props","childrenArray","result","some","child","_child$props","slot","isNormalizedItemsWithKeysList","Array","isArray","isItemOrSection","isNormalizedSection","maybeNormalizedSection","normalizeTooltipOptions","options","placement","undefined","itemSelectionToStringSet","itemKeys","Set","map","String"],"sources":["../../../src/spectrum/utils/itemUtils.ts"],"sourcesContent":["import { Key, ReactElement, ReactNode } from 'react';\nimport { SpectrumPickerProps } from '@adobe/react-spectrum';\nimport type { ItemRenderer } from '@react-types/shared';\nimport { isElementOfType } from '@deephaven/react-hooks';\nimport { ensureArray, KeyedItem, SelectionT } from '@deephaven/utils';\nimport {\n  Item,\n  ItemElementOrPrimitive,\n  ItemProps,\n  Section,\n  SectionProps,\n} from '../shared';\nimport { PopperOptions } from '../../popper';\nimport { Text } from '../Text';\nimport ItemContent from '../ItemContent';\n\n/**\n * `Item.textValue` prop needs to be a non-empty string for accessibility\n * purposes. This is not displayed in the UI.\n */\nexport const ITEM_EMPTY_STRING_TEXT_VALUE = 'Empty';\n\n/**\n * React Spectrum <Section> supports an `ItemRenderer` function as a child. The\n * DH picker makes use of this internally, but we don't want to support it as\n * an incoming prop.\n */\ntype SectionPropsNoItemRenderer<T> = Omit<SectionProps<T>, 'children'> & {\n  children: Exclude<SectionProps<T>['children'], ItemRenderer<T>>;\n};\n\nexport type ItemElement<T = unknown> = ReactElement<ItemProps<T>>;\nexport type SectionElement<T = unknown> = ReactElement<\n  SectionPropsNoItemRenderer<T>\n>;\n\nexport type ItemOrSection<T = unknown> =\n  | ItemElementOrPrimitive<T>\n  | SectionElement<T>;\n\n// Picker uses `icon` slot. ListView can use `image` or `illustration` slots.\n// https://github.com/adobe/react-spectrum/blob/main/packages/%40react-spectrum/picker/src/Picker.tsx#L194\n// https://github.com/adobe/react-spectrum/blob/main/packages/%40react-spectrum/list/src/ListViewItem.tsx#L266-L267\nexport type ItemIconSlot = 'icon' | 'image' | 'illustration';\n\n/**\n * Augment the Spectrum selection key type to include boolean values.\n * Spectrum collection components already supports this, but the built in types\n * don't reflect it.\n */\nexport type ItemKey = Key | boolean;\n\nexport type ItemSelection = SelectionT<ItemKey>;\n\n/**\n * Augment the Spectrum selection change handler type to include boolean keys.\n * Spectrum components already supports this, but the built in types don't\n * reflect it.\n */\nexport type ItemSelectionChangeHandler = (key: ItemKey) => void;\n\nexport interface NormalizedItemData {\n  key?: ItemKey;\n  content: ReactNode;\n  description?: ReactNode;\n  icon?: ReactNode;\n  textValue: string | undefined;\n}\n\nexport interface NormalizedSectionData {\n  key?: Key;\n  title?: ReactNode;\n  items: NormalizedItem[];\n}\n\n/**\n * Spectrum collection components support a variety of item types, including\n * strings, numbers, booleans, and more complex React elements. This type\n * represents a normalized form to make rendering items simpler and keep the\n * logic of transformation in separate util methods. It also adheres to the\n * `KeyedItem` interface to be compatible with Windowed data utils\n * (e.g. `useViewportData`).\n */\nexport type NormalizedItem = KeyedItem<NormalizedItemData, ItemKey | undefined>;\n\nexport type NormalizedSection = KeyedItem<\n  NormalizedSectionData,\n  Key | undefined\n>;\n\nexport type NormalizedItemOrSection<TItemOrSection extends ItemOrSection> =\n  TItemOrSection extends SectionElement ? NormalizedSection : NormalizedItem;\n\nexport type NormalizedSpectrumPickerProps = SpectrumPickerProps<NormalizedItem>;\n\nexport type TooltipOptions = { placement: PopperOptions['placement'] };\n\n/**\n * DH wrappers of Spectrum collection components use a normalized item that\n * includes a `key` prop and an optional `item` prop. This is mostly to support\n * Windowed data where items are created before their data has been loaded (data\n * gets set in the `item` prop). If data has loaded, return its `key`. If not,\n * return the top-level `key` on the normalized item.\n * @param item The normalized item or section\n * @returns The `key` of the item or section\n */\nexport function getItemKey<\n  TItem extends NormalizedItem | NormalizedSection,\n  TKey extends TItem extends NormalizedItem\n    ? ItemKey | undefined\n    : TItem extends NormalizedSection\n    ? Key | undefined\n    : undefined,\n>(item: TItem | null | undefined): TKey {\n  return (item?.item?.key ?? item?.key) as TKey;\n}\n\n/**\n * Get the position of the item with the given selected key in a list of items.\n * @param items The items to search\n * @param itemHeight The height of each item\n * @param selectedKey The key of the selected item\n * @param topOffset The top offset of the list\n * @returns The position of the selected item or the top offset if not found\n */\nexport async function getPositionOfSelectedItemElement<\n  TKey extends string | number | boolean | undefined,\n>({\n  items,\n  itemHeight,\n  selectedKey,\n  topOffset,\n}: {\n  items: ItemElement[];\n  selectedKey: TKey | null | undefined;\n  itemHeight: number;\n  topOffset: number;\n}): Promise<number> {\n  let position = topOffset;\n\n  if (selectedKey == null) {\n    return position;\n  }\n\n  for (let i = 0; i < items.length; i += 1) {\n    const item = items[i];\n    if (item.key === selectedKey) {\n      return position;\n    }\n\n    position += itemHeight;\n  }\n\n  return topOffset;\n}\n\n/**\n * Determine if a node is a Section element.\n * @param node The node to check\n * @returns True if the node is a Section element\n */\nexport function isSectionElement<T>(\n  node: ReactNode\n): node is SectionElement<T> {\n  return isElementOfType(node, Section);\n}\n\n/**\n * Determine if a node is an Item element.\n * @param node The node to check\n * @returns True if the node is an Item element\n */\nexport function isItemElement<T>(node: ReactNode): node is ItemElement<T> {\n  return isElementOfType(node, Item);\n}\n\n/**\n * Determine if a node is an Item element containing a child `Text` element with\n * a `slot` prop set to `description`.\n * @param node The node to check\n * @returns True if the node is an Item element with a description\n */\nexport function isItemElementWithDescription<T>(\n  node: ReactNode\n): node is ReactElement<ItemProps<T>> {\n  if (!isItemElement(node)) {\n    return false;\n  }\n\n  // If children are wrapped in `ItemContent`, go down 1 level\n  const children = isElementOfType(node.props.children, ItemContent)\n    ? node.props.children.props.children\n    : node.props.children;\n\n  const childrenArray = ensureArray(children);\n\n  const result = childrenArray.some(\n    child => isElementOfType(child, Text) && child.props?.slot === 'description'\n  );\n\n  return result;\n}\n\n/**\n * Determine if a node is an array containing normalized items or sections with\n * keys. Note that this only checks the first node in the array.\n * @param node The node to check\n * @returns True if the node is a normalized item or section with keys array\n */\nexport function isNormalizedItemsWithKeysList<\n  TItemOrSection extends ItemOrSection,\n>(\n  node:\n    | TItemOrSection\n    | TItemOrSection[]\n    | NormalizedItemOrSection<TItemOrSection>[]\n): node is NormalizedItemOrSection<TItemOrSection>[] {\n  if (!Array.isArray(node)) {\n    return false;\n  }\n\n  if (node.length === 0) {\n    return true;\n  }\n\n  return !isItemOrSection(node[0]) && 'key' in node[0];\n}\n\n/**\n * Determine if an object is a normalized section.\n * @param maybeNormalizedSection The object to check\n * @returns True if the object is a normalized section\n */\nexport function isNormalizedSection(\n  maybeNormalizedSection: NormalizedItem | NormalizedSection\n): maybeNormalizedSection is NormalizedSection {\n  return (\n    maybeNormalizedSection.item != null &&\n    'items' in maybeNormalizedSection.item\n  );\n}\n\n/**\n * Determine if a node is an item or section. Valid types include strings,\n * numbers, booleans, Item elements, and Section elements.\n * @param node The node to check\n * @returns True if the node is an item or section\n */\nexport function isItemOrSection(node: ReactNode): node is ItemOrSection {\n  return (\n    typeof node === 'string' ||\n    typeof node === 'number' ||\n    typeof node === 'boolean' ||\n    isItemElement(node) ||\n    isSectionElement(node)\n  );\n}\n\n/**\n * Returns a TooltipOptions object or null if options is false or null.\n * @param options Tooltip options\n * @param placement Default placement for the tooltip if `options` is set\n * explicitly to `true`\n * @returns TooltipOptions or null\n */\nexport function normalizeTooltipOptions(\n  options?: boolean | TooltipOptions | null,\n  placement: TooltipOptions['placement'] = 'right'\n): TooltipOptions | null {\n  if (options == null || options === false) {\n    return null;\n  }\n\n  if (options === true) {\n    return { placement };\n  }\n\n  return options;\n}\n\n/**\n * Convert a selection of `ItemKey`s to a selection of strings.\n * @param itemKeys The selection of `ItemKey`s\n * @returns The selection of strings\n */\nexport function itemSelectionToStringSet<\n  TKeys extends 'all' | Iterable<ItemKey> | undefined,\n  TResult extends TKeys extends 'all'\n    ? 'all'\n    : TKeys extends Iterable<ItemKey>\n    ? Set<string>\n    : undefined,\n>(itemKeys: TKeys): TResult {\n  if (itemKeys == null || itemKeys === 'all') {\n    return itemKeys as undefined | 'all' as TResult;\n  }\n\n  return new Set([...itemKeys].map(String)) as TResult;\n}\n"],"mappings":"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"}

package/dist/spectrum/utils/itemWrapperUtils.d.ts

@@ -1,4 +1,14 @@
-import { ItemElement, ItemOrSection, SectionElement, TooltipOptions } from './itemUtils';
+import { ReactNode } from 'react';
+import { ItemElement, ItemIconSlot, ItemOrSection, SectionElement, TooltipOptions } from './itemUtils';
+/**
+ * If the given content is a string, wrap it in an Icon component. Otherwise,
+ * return the original content. If the key is not found in the dhIcons object,
+ * the vsBlank icon will be used.
+ * @param maybeIconKey The content to wrap
+ * @param slot The slot to use for the Icon component
+ * @returns The wrapped content or original content if not a string
+ */
+export declare function wrapIcon(maybeIconKey: ReactNode, slot: ItemIconSlot): ReactNode;
 /**
  * Ensure all primitive children are wrapped in `Item` elements and that all
  * `Item` element content is wrapped in `ItemContent` elements to handle text
@@ -7,6 +17,12 @@ import { ItemElement, ItemOrSection, SectionElement, TooltipOptions } from './it
  * @param tooltipOptions The tooltip options to use when wrapping items
  * @returns The wrapped items or sections
  */
-export declare function wrapItemChildren(itemsOrSections: ItemOrSection | ItemOrSection[], tooltipOptions: TooltipOptions | null): (ItemElement | SectionElement)[];
-export default wrapItemChildren;
+export declare function wrapItemChildren(itemsOrSections: ItemOrSection | ItemOrSection[], tooltipOptions: TooltipOptions | null): ItemElement | SectionElement | (ItemElement | SectionElement)[];
+/**
+ * If the given content is a primitive type, wrap it in a Text component.
+ * @param content The content to wrap
+ * @param slot The slot to use for the Text component
+ * @returns The wrapped content or original content if not a primitive type
+ */
+export declare function wrapPrimitiveWithText(content?: ReactNode, slot?: string): ReactNode;
 //# sourceMappingURL=itemWrapperUtils.d.ts.map

package/dist/spectrum/utils/itemWrapperUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"itemWrapperUtils.d.ts","sourceRoot":"","sources":["../../../src/spectrum/utils/itemWrapperUtils.tsx"],"names":[],"mappings":"AAGA,OAAO,EAGL,WAAW,EACX,aAAa,EAEb,cAAc,EACd,cAAc,EACf,MAAM,aAAa,CAAC;AAIrB;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,eAAe,EAAE,aAAa,GAAG,aAAa,EAAE,EAChD,cAAc,EAAE,cAAc,GAAG,IAAI,GACpC,CAAC,WAAW,GAAG,cAAc,CAAC,EAAE,CA8DlC;AAED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"itemWrapperUtils.d.ts","sourceRoot":"","sources":["../../../src/spectrum/utils/itemWrapperUtils.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA8B,SAAS,EAAE,MAAM,OAAO,CAAC;AAM9D,OAAO,EAGL,WAAW,EACX,YAAY,EACZ,aAAa,EAEb,cAAc,EACd,cAAc,EACf,MAAM,aAAa,CAAC;AAMrB;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CACtB,YAAY,EAAE,SAAS,EACvB,IAAI,EAAE,YAAY,GACjB,SAAS,CAaX;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,eAAe,EAAE,aAAa,GAAG,aAAa,EAAE,EAChD,cAAc,EAAE,cAAc,GAAG,IAAI,GACpC,WAAW,GAAG,cAAc,GAAG,CAAC,WAAW,GAAG,cAAc,CAAC,EAAE,CAuDjE;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,CAAC,EAAE,SAAS,EACnB,IAAI,CAAC,EAAE,MAAM,GACZ,SAAS,CAeX"}