@deephaven/components 0.74.1-beta.5 → 0.75.0

package/dist/spectrum/utils/itemWrapperUtils.js

@@ -5,9 +5,38 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typ
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { cloneElement } from 'react';
 import { Item } from '@adobe/react-spectrum';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { dh as dhIcons } from '@deephaven/icons';
 import { isElementOfType } from '@deephaven/react-hooks';
+import { ensureArray, NON_BREAKING_SPACE } from '@deephaven/utils';
 import { isItemElement, isSectionElement, ITEM_EMPTY_STRING_TEXT_VALUE } from "./itemUtils.js";
-import ItemContent from "../ItemContent.js";
+import { ItemContent } from "../ItemContent.js";
+import { Icon } from "../icons.js";
+import { Text } from "../Text.js";
+/**
+ * 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
+ */
+import { jsx as _jsx } from "react/jsx-runtime";
+export function wrapIcon(maybeIconKey, slot) {
+  var _maybeIconKey, _dhIcons$maybeIconKey;
+  // eslint-disable-next-line no-param-reassign
+  maybeIconKey = (_maybeIconKey = maybeIconKey) !== null && _maybeIconKey !== void 0 ? _maybeIconKey : '';
+  if (typeof maybeIconKey !== 'string') {
+    return maybeIconKey;
+  }
+  return /*#__PURE__*/_jsx(Icon, {
+    slot: slot,
+    children: /*#__PURE__*/_jsx(FontAwesomeIcon, {
+      icon: (_dhIcons$maybeIconKey = dhIcons[maybeIconKey]) !== null && _dhIcons$maybeIconKey !== void 0 ? _dhIcons$maybeIconKey : dhIcons.vsBlank
+    })
+  });
+}
+
 /**
  * Ensure all primitive children are wrapped in `Item` elements and that all
  * `Item` element content is wrapped in `ItemContent` elements to handle text
@@ -16,10 +45,9 @@ import ItemContent from "../ItemContent.js";
  * @param tooltipOptions The tooltip options to use when wrapping items
  * @returns The wrapped items or sections
  */
-import { jsx as _jsx } from "react/jsx-runtime";
 export function wrapItemChildren(itemsOrSections, tooltipOptions) {
-  var itemsOrSectionsArray = Array.isArray(itemsOrSections) ? itemsOrSections : [itemsOrSections];
-  return itemsOrSectionsArray.map(item => {
+  var itemsOrSectionsArray = ensureArray(itemsOrSections);
+  var result = itemsOrSectionsArray.map(item => {
     if (isItemElement(item)) {
       var _item$key;
       // Item content is already wrapped
@@ -27,13 +55,13 @@ export function wrapItemChildren(itemsOrSections, tooltipOptions) {
         return item;
       }
       var key = (_item$key = item.key) !== null && _item$key !== void 0 ? _item$key : item.props.textValue;
-      var textValue = item.props.textValue === '' ? ITEM_EMPTY_STRING_TEXT_VALUE : item.props.textValue;
+      var _textValue = item.props.textValue === '' ? ITEM_EMPTY_STRING_TEXT_VALUE : item.props.textValue;
 
       // Wrap in `ItemContent` so we can support tooltips and handle text
       // overflow
       return /*#__PURE__*/cloneElement(item, _objectSpread(_objectSpread({}, item.props), {}, {
         key,
-        textValue,
+        textValue: _textValue,
         children: /*#__PURE__*/_jsx(ItemContent, {
           tooltipOptions: tooltipOptions,
           children: item.props.children
@@ -47,19 +75,37 @@ export function wrapItemChildren(itemsOrSections, tooltipOptions) {
         children: wrapItemChildren(item.props.children, tooltipOptions)
       }));
     }
-    if (typeof item === 'string' || typeof item === 'number' || typeof item === 'boolean') {
-      var text = String(item);
-      var _textValue = text === '' ? ITEM_EMPTY_STRING_TEXT_VALUE : text;
-      return /*#__PURE__*/_jsx(Item, {
-        textValue: _textValue,
-        children: /*#__PURE__*/_jsx(ItemContent, {
-          tooltipOptions: tooltipOptions,
-          children: text
-        })
-      }, text);
-    }
-    return item;
+    var text = String(item);
+    var textValue = text === '' ? ITEM_EMPTY_STRING_TEXT_VALUE : text;
+    return /*#__PURE__*/_jsx(Item, {
+      textValue: textValue,
+      children: /*#__PURE__*/_jsx(ItemContent, {
+        tooltipOptions: tooltipOptions,
+        children: text
+      })
+    }, text);
   });
+
+  // Keep consistent with original data structure as array or single node
+  return Array.isArray(itemsOrSections) ? result : result[0];
+}
+
+/**
+ * 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 function wrapPrimitiveWithText(content, slot) {
+  var _content;
+  // eslint-disable-next-line no-param-reassign
+  content = (_content = content) !== null && _content !== void 0 ? _content : '';
+  if (['string', 'boolean', 'number'].includes(typeof content)) {
+    return /*#__PURE__*/_jsx(Text, {
+      slot: slot,
+      children: content === '' ? NON_BREAKING_SPACE : String(content)
+    });
+  }
+  return content;
 }
-export default wrapItemChildren;
 //# sourceMappingURL=itemWrapperUtils.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"itemWrapperUtils.js","names":["cloneElement","Item","isElementOfType","isItemElement","isSectionElement","ITEM_EMPTY_STRING_TEXT_VALUE","ItemContent","jsx","_jsx","wrapItemChildren","itemsOrSections","tooltipOptions","itemsOrSectionsArray","Array","isArray","map","item","_item$key","props","children","key","textValue","_objectSpread","_item$key2","title","undefined","text","String"],"sources":["../../../src/spectrum/utils/itemWrapperUtils.tsx"],"sourcesContent":["import { cloneElement, ReactElement } from 'react';\nimport { Item } from '@adobe/react-spectrum';\nimport { isElementOfType } from '@deephaven/react-hooks';\nimport {\n  isItemElement,\n  isSectionElement,\n  ItemElement,\n  ItemOrSection,\n  ITEM_EMPTY_STRING_TEXT_VALUE,\n  SectionElement,\n  TooltipOptions,\n} from './itemUtils';\nimport { ItemProps } from '../shared';\nimport ItemContent from '../ItemContent';\n\n/**\n * Ensure all primitive children are wrapped in `Item` elements and that all\n * `Item` element content is wrapped in `ItemContent` elements to handle text\n * overflow consistently and to support tooltips.\n * @param itemsOrSections The items or sections to wrap\n * @param tooltipOptions The tooltip options to use when wrapping items\n * @returns The wrapped items or sections\n */\nexport function wrapItemChildren(\n  itemsOrSections: ItemOrSection | ItemOrSection[],\n  tooltipOptions: TooltipOptions | null\n): (ItemElement | SectionElement)[] {\n  const itemsOrSectionsArray = Array.isArray(itemsOrSections)\n    ? itemsOrSections\n    : [itemsOrSections];\n\n  return itemsOrSectionsArray.map(item => {\n    if (isItemElement(item)) {\n      // Item content is already wrapped\n      if (isElementOfType(item.props.children, ItemContent)) {\n        return item;\n      }\n\n      const key = item.key ?? item.props.textValue;\n      const textValue =\n        item.props.textValue === ''\n          ? ITEM_EMPTY_STRING_TEXT_VALUE\n          : item.props.textValue;\n\n      // Wrap in `ItemContent` so we can support tooltips and handle text\n      // overflow\n      return cloneElement(item, {\n        ...item.props,\n        key,\n        textValue,\n        children: (\n          <ItemContent tooltipOptions={tooltipOptions}>\n            {item.props.children}\n          </ItemContent>\n        ),\n      });\n    }\n\n    if (isSectionElement(item)) {\n      return cloneElement(item, {\n        ...item.props,\n        key:\n          item.key ??\n          (typeof item.props.title === 'string' ? item.props.title : undefined),\n        children: wrapItemChildren(\n          item.props.children,\n          tooltipOptions\n        ) as ReactElement<ItemProps<unknown>>[],\n      });\n    }\n\n    if (\n      typeof item === 'string' ||\n      typeof item === 'number' ||\n      typeof item === 'boolean'\n    ) {\n      const text = String(item);\n      const textValue = text === '' ? ITEM_EMPTY_STRING_TEXT_VALUE : text;\n\n      return (\n        <Item key={text} textValue={textValue}>\n          <ItemContent tooltipOptions={tooltipOptions}>{text}</ItemContent>\n        </Item>\n      );\n    }\n\n    return item;\n  });\n}\n\nexport default wrapItemChildren;\n"],"mappings":";;;;;AAAA,SAASA,YAAY,QAAsB,OAAO;AAClD,SAASC,IAAI,QAAQ,uBAAuB;AAC5C,SAASC,eAAe,QAAQ,wBAAwB;AAAC,SAEvDC,aAAa,EACbC,gBAAgB,EAGhBC,4BAA4B;AAAA,OAKvBC,WAAW;AAElB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAPA,SAAAC,GAAA,IAAAC,IAAA;AAQA,OAAO,SAASC,gBAAgBA,CAC9BC,eAAgD,EAChDC,cAAqC,EACH;EAClC,IAAMC,oBAAoB,GAAGC,KAAK,CAACC,OAAO,CAACJ,eAAe,CAAC,GACvDA,eAAe,GACf,CAACA,eAAe,CAAC;EAErB,OAAOE,oBAAoB,CAACG,GAAG,CAACC,IAAI,IAAI;IACtC,IAAIb,aAAa,CAACa,IAAI,CAAC,EAAE;MAAA,IAAAC,SAAA;MACvB;MACA,IAAIf,eAAe,CAACc,IAAI,CAACE,KAAK,CAACC,QAAQ,EAAEb,WAAW,CAAC,EAAE;QACrD,OAAOU,IAAI;MACb;MAEA,IAAMI,GAAG,IAAAH,SAAA,GAAGD,IAAI,CAACI,GAAG,cAAAH,SAAA,cAAAA,SAAA,GAAID,IAAI,CAACE,KAAK,CAACG,SAAS;MAC5C,IAAMA,SAAS,GACbL,IAAI,CAACE,KAAK,CAACG,SAAS,KAAK,EAAE,GACvBhB,4BAA4B,GAC5BW,IAAI,CAACE,KAAK,CAACG,SAAS;;MAE1B;MACA;MACA,oBAAOrB,YAAY,CAACgB,IAAI,EAAAM,aAAA,CAAAA,aAAA,KACnBN,IAAI,CAACE,KAAK;QACbE,GAAG;QACHC,SAAS;QACTF,QAAQ,eACNX,IAAA,CAACF,WAAW;UAACK,cAAc,EAAEA,cAAe;UAAAQ,QAAA,EACzCH,IAAI,CAACE,KAAK,CAACC;QAAQ,CACT;MACd,EACF,CAAC;IACJ;IAEA,IAAIf,gBAAgB,CAACY,IAAI,CAAC,EAAE;MAAA,IAAAO,UAAA;MAC1B,oBAAOvB,YAAY,CAACgB,IAAI,EAAAM,aAAA,CAAAA,aAAA,KACnBN,IAAI,CAACE,KAAK;QACbE,GAAG,GAAAG,UAAA,GACDP,IAAI,CAACI,GAAG,cAAAG,UAAA,cAAAA,UAAA,GACP,OAAOP,IAAI,CAACE,KAAK,CAACM,KAAK,KAAK,QAAQ,GAAGR,IAAI,CAACE,KAAK,CAACM,KAAK,GAAGC,SAAU;QACvEN,QAAQ,EAAEV,gBAAgB,CACxBO,IAAI,CAACE,KAAK,CAACC,QAAQ,EACnBR,cACF;MAAuC,EACxC,CAAC;IACJ;IAEA,IACE,OAAOK,IAAI,KAAK,QAAQ,IACxB,OAAOA,IAAI,KAAK,QAAQ,IACxB,OAAOA,IAAI,KAAK,SAAS,EACzB;MACA,IAAMU,IAAI,GAAGC,MAAM,CAACX,IAAI,CAAC;MACzB,IAAMK,UAAS,GAAGK,IAAI,KAAK,EAAE,GAAGrB,4BAA4B,GAAGqB,IAAI;MAEnE,oBACElB,IAAA,CAACP,IAAI;QAAYoB,SAAS,EAAEA,UAAU;QAAAF,QAAA,eACpCX,IAAA,CAACF,WAAW;UAACK,cAAc,EAAEA,cAAe;UAAAQ,QAAA,EAAEO;QAAI,CAAc;MAAC,GADxDA,IAEL,CAAC;IAEX;IAEA,OAAOV,IAAI;EACb,CAAC,CAAC;AACJ;AAEA,eAAeP,gBAAgB"}
+{"version":3,"file":"itemWrapperUtils.js","names":["cloneElement","Item","FontAwesomeIcon","dh","dhIcons","isElementOfType","ensureArray","NON_BREAKING_SPACE","isItemElement","isSectionElement","ITEM_EMPTY_STRING_TEXT_VALUE","ItemContent","Icon","Text","jsx","_jsx","wrapIcon","maybeIconKey","slot","_maybeIconKey","_dhIcons$maybeIconKey","children","icon","vsBlank","wrapItemChildren","itemsOrSections","tooltipOptions","itemsOrSectionsArray","result","map","item","_item$key","props","key","textValue","_objectSpread","_item$key2","title","undefined","text","String","Array","isArray","wrapPrimitiveWithText","content","_content","includes"],"sources":["../../../src/spectrum/utils/itemWrapperUtils.tsx"],"sourcesContent":["import { cloneElement, ReactElement, ReactNode } from 'react';\nimport { Item } from '@adobe/react-spectrum';\nimport { FontAwesomeIcon } from '@fortawesome/react-fontawesome';\nimport { dh as dhIcons } from '@deephaven/icons';\nimport { isElementOfType } from '@deephaven/react-hooks';\nimport { ensureArray, NON_BREAKING_SPACE } from '@deephaven/utils';\nimport {\n  isItemElement,\n  isSectionElement,\n  ItemElement,\n  ItemIconSlot,\n  ItemOrSection,\n  ITEM_EMPTY_STRING_TEXT_VALUE,\n  SectionElement,\n  TooltipOptions,\n} from './itemUtils';\nimport { ItemProps } from '../shared';\nimport { ItemContent } from '../ItemContent';\nimport { Icon } from '../icons';\nimport { Text } from '../Text';\n\n/**\n * If the given content is a string, wrap it in an Icon component. Otherwise,\n * return the original content. If the key is not found in the dhIcons object,\n * the vsBlank icon will be used.\n * @param maybeIconKey The content to wrap\n * @param slot The slot to use for the Icon component\n * @returns The wrapped content or original content if not a string\n */\nexport function wrapIcon(\n  maybeIconKey: ReactNode,\n  slot: ItemIconSlot\n): ReactNode {\n  // eslint-disable-next-line no-param-reassign\n  maybeIconKey = maybeIconKey ?? '';\n\n  if (typeof maybeIconKey !== 'string') {\n    return maybeIconKey;\n  }\n\n  return (\n    <Icon slot={slot}>\n      <FontAwesomeIcon icon={dhIcons[maybeIconKey] ?? dhIcons.vsBlank} />\n    </Icon>\n  );\n}\n\n/**\n * Ensure all primitive children are wrapped in `Item` elements and that all\n * `Item` element content is wrapped in `ItemContent` elements to handle text\n * overflow consistently and to support tooltips.\n * @param itemsOrSections The items or sections to wrap\n * @param tooltipOptions The tooltip options to use when wrapping items\n * @returns The wrapped items or sections\n */\nexport function wrapItemChildren(\n  itemsOrSections: ItemOrSection | ItemOrSection[],\n  tooltipOptions: TooltipOptions | null\n): ItemElement | SectionElement | (ItemElement | SectionElement)[] {\n  const itemsOrSectionsArray = ensureArray(itemsOrSections);\n\n  const result = itemsOrSectionsArray.map(item => {\n    if (isItemElement(item)) {\n      // Item content is already wrapped\n      if (isElementOfType(item.props.children, ItemContent)) {\n        return item;\n      }\n\n      const key = item.key ?? item.props.textValue;\n      const textValue =\n        item.props.textValue === ''\n          ? ITEM_EMPTY_STRING_TEXT_VALUE\n          : item.props.textValue;\n\n      // Wrap in `ItemContent` so we can support tooltips and handle text\n      // overflow\n      return cloneElement(item, {\n        ...item.props,\n        key,\n        textValue,\n        children: (\n          <ItemContent tooltipOptions={tooltipOptions}>\n            {item.props.children}\n          </ItemContent>\n        ),\n      });\n    }\n\n    if (isSectionElement(item)) {\n      return cloneElement(item, {\n        ...item.props,\n        key:\n          item.key ??\n          (typeof item.props.title === 'string' ? item.props.title : undefined),\n        children: wrapItemChildren(\n          item.props.children,\n          tooltipOptions\n        ) as ReactElement<ItemProps<unknown>>[],\n      });\n    }\n\n    const text = String(item);\n    const textValue = text === '' ? ITEM_EMPTY_STRING_TEXT_VALUE : text;\n\n    return (\n      <Item key={text} textValue={textValue}>\n        <ItemContent tooltipOptions={tooltipOptions}>{text}</ItemContent>\n      </Item>\n    );\n  });\n\n  // Keep consistent with original data structure as array or single node\n  return Array.isArray(itemsOrSections) ? result : result[0];\n}\n\n/**\n * If the given content is a primitive type, wrap it in a Text component.\n * @param content The content to wrap\n * @param slot The slot to use for the Text component\n * @returns The wrapped content or original content if not a primitive type\n */\nexport function wrapPrimitiveWithText(\n  content?: ReactNode,\n  slot?: string\n): ReactNode {\n  // eslint-disable-next-line no-param-reassign\n  content = content ?? '';\n\n  if (['string', 'boolean', 'number'].includes(typeof content)) {\n    return (\n      <Text slot={slot}>\n        {/* Non-breaking space is needed to avoid the Text element's height \n        collapsing when content is empty */}\n        {content === '' ? NON_BREAKING_SPACE : String(content)}\n      </Text>\n    );\n  }\n\n  return content;\n}\n"],"mappings":";;;;;AAAA,SAASA,YAAY,QAAiC,OAAO;AAC7D,SAASC,IAAI,QAAQ,uBAAuB;AAC5C,SAASC,eAAe,QAAQ,gCAAgC;AAChE,SAASC,EAAE,IAAIC,OAAO,QAAQ,kBAAkB;AAChD,SAASC,eAAe,QAAQ,wBAAwB;AACxD,SAASC,WAAW,EAAEC,kBAAkB,QAAQ,kBAAkB;AAAC,SAEjEC,aAAa,EACbC,gBAAgB,EAIhBC,4BAA4B;AAAA,SAKrBC,WAAW;AAAA,SACXC,IAAI;AAAA,SACJC,IAAI;AAEb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAPA,SAAAC,GAAA,IAAAC,IAAA;AAQA,OAAO,SAASC,QAAQA,CACtBC,YAAuB,EACvBC,IAAkB,EACP;EAAA,IAAAC,aAAA,EAAAC,qBAAA;EACX;EACAH,YAAY,IAAAE,aAAA,GAAGF,YAAY,cAAAE,aAAA,cAAAA,aAAA,GAAI,EAAE;EAEjC,IAAI,OAAOF,YAAY,KAAK,QAAQ,EAAE;IACpC,OAAOA,YAAY;EACrB;EAEA,oBACEF,IAAA,CAACH,IAAI;IAACM,IAAI,EAAEA,IAAK;IAAAG,QAAA,eACfN,IAAA,CAACb,eAAe;MAACoB,IAAI,GAAAF,qBAAA,GAAEhB,OAAO,CAACa,YAAY,CAAC,cAAAG,qBAAA,cAAAA,qBAAA,GAAIhB,OAAO,CAACmB;IAAQ,CAAE;EAAC,CAC/D,CAAC;AAEX;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,gBAAgBA,CAC9BC,eAAgD,EAChDC,cAAqC,EAC4B;EACjE,IAAMC,oBAAoB,GAAGrB,WAAW,CAACmB,eAAe,CAAC;EAEzD,IAAMG,MAAM,GAAGD,oBAAoB,CAACE,GAAG,CAACC,IAAI,IAAI;IAC9C,IAAItB,aAAa,CAACsB,IAAI,CAAC,EAAE;MAAA,IAAAC,SAAA;MACvB;MACA,IAAI1B,eAAe,CAACyB,IAAI,CAACE,KAAK,CAACX,QAAQ,EAAEV,WAAW,CAAC,EAAE;QACrD,OAAOmB,IAAI;MACb;MAEA,IAAMG,GAAG,IAAAF,SAAA,GAAGD,IAAI,CAACG,GAAG,cAAAF,SAAA,cAAAA,SAAA,GAAID,IAAI,CAACE,KAAK,CAACE,SAAS;MAC5C,IAAMA,UAAS,GACbJ,IAAI,CAACE,KAAK,CAACE,SAAS,KAAK,EAAE,GACvBxB,4BAA4B,GAC5BoB,IAAI,CAACE,KAAK,CAACE,SAAS;;MAE1B;MACA;MACA,oBAAOlC,YAAY,CAAC8B,IAAI,EAAAK,aAAA,CAAAA,aAAA,KACnBL,IAAI,CAACE,KAAK;QACbC,GAAG;QACHC,SAAS,EAATA,UAAS;QACTb,QAAQ,eACNN,IAAA,CAACJ,WAAW;UAACe,cAAc,EAAEA,cAAe;UAAAL,QAAA,EACzCS,IAAI,CAACE,KAAK,CAACX;QAAQ,CACT;MACd,EACF,CAAC;IACJ;IAEA,IAAIZ,gBAAgB,CAACqB,IAAI,CAAC,EAAE;MAAA,IAAAM,UAAA;MAC1B,oBAAOpC,YAAY,CAAC8B,IAAI,EAAAK,aAAA,CAAAA,aAAA,KACnBL,IAAI,CAACE,KAAK;QACbC,GAAG,GAAAG,UAAA,GACDN,IAAI,CAACG,GAAG,cAAAG,UAAA,cAAAA,UAAA,GACP,OAAON,IAAI,CAACE,KAAK,CAACK,KAAK,KAAK,QAAQ,GAAGP,IAAI,CAACE,KAAK,CAACK,KAAK,GAAGC,SAAU;QACvEjB,QAAQ,EAAEG,gBAAgB,CACxBM,IAAI,CAACE,KAAK,CAACX,QAAQ,EACnBK,cACF;MAAuC,EACxC,CAAC;IACJ;IAEA,IAAMa,IAAI,GAAGC,MAAM,CAACV,IAAI,CAAC;IACzB,IAAMI,SAAS,GAAGK,IAAI,KAAK,EAAE,GAAG7B,4BAA4B,GAAG6B,IAAI;IAEnE,oBACExB,IAAA,CAACd,IAAI;MAAYiC,SAAS,EAAEA,SAAU;MAAAb,QAAA,eACpCN,IAAA,CAACJ,WAAW;QAACe,cAAc,EAAEA,cAAe;QAAAL,QAAA,EAAEkB;MAAI,CAAc;IAAC,GADxDA,IAEL,CAAC;EAEX,CAAC,CAAC;;EAEF;EACA,OAAOE,KAAK,CAACC,OAAO,CAACjB,eAAe,CAAC,GAAGG,MAAM,GAAGA,MAAM,CAAC,CAAC,CAAC;AAC5D;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASe,qBAAqBA,CACnCC,OAAmB,EACnB1B,IAAa,EACF;EAAA,IAAA2B,QAAA;EACX;EACAD,OAAO,IAAAC,QAAA,GAAGD,OAAO,cAAAC,QAAA,cAAAA,QAAA,GAAI,EAAE;EAEvB,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,CAACC,QAAQ,CAAC,OAAOF,OAAO,CAAC,EAAE;IAC5D,oBACE7B,IAAA,CAACF,IAAI;MAACK,IAAI,EAAEA,IAAK;MAAAG,QAAA,EAGduB,OAAO,KAAK,EAAE,GAAGrC,kBAAkB,GAAGiC,MAAM,CAACI,OAAO;IAAC,CAClD,CAAC;EAEX;EAEA,OAAOA,OAAO;AAChB"}

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

@@ -0,0 +1,14 @@
+import type { AriaLabelingProps, StyleProps } from '@react-types/shared';
+/**
+ * Separate props for Spectrum components into AriaLabelingProps, StyleProps, and
+ * any remaining props.
+ * @param props The props to separate
+ * @returns The separated props
+ */
+export declare function separateSpectrumProps<T extends AriaLabelingProps & StyleProps>(props: T): {
+    ariaLabelProps: AriaLabelingProps;
+    styleProps: StyleProps;
+    componentProps: Omit<T, keyof (AriaLabelingProps & StyleProps)>;
+};
+export default separateSpectrumProps;
+//# sourceMappingURL=propsUtils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"propsUtils.d.ts","sourceRoot":"","sources":["../../../src/spectrum/utils/propsUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEzE;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,SAAS,iBAAiB,GAAG,UAAU,EAC5E,KAAK,EAAE,CAAC,GACP;IACD,cAAc,EAAE,iBAAiB,CAAC;IAClC,UAAU,EAAE,UAAU,CAAC;IACvB,cAAc,EAAE,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,iBAAiB,GAAG,UAAU,CAAC,CAAC,CAAC;CACjE,CAsFA;AAED,eAAe,qBAAqB,CAAC"}

package/dist/spectrum/utils/propsUtils.js

@@ -0,0 +1,93 @@
+var _excluded = ["aria-label", "aria-labelledby", "aria-describedby", "aria-details", "marginX", "marginY", "width", "height", "minWidth", "minHeight", "maxWidth", "maxHeight", "flex", "flexGrow", "flexShrink", "flexBasis", "justifySelf", "alignSelf", "order", "gridArea", "gridColumn", "gridRow", "gridColumnStart", "gridColumnEnd", "gridRowStart", "gridRowEnd", "position", "zIndex", "top", "bottom", "start", "end", "left", "right", "isHidden"];
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+/**
+ * Separate props for Spectrum components into AriaLabelingProps, StyleProps, and
+ * any remaining props.
+ * @param props The props to separate
+ * @returns The separated props
+ */
+export function separateSpectrumProps(props) {
+  var {
+      'aria-label': ariaLabel,
+      'aria-labelledby': ariaLabelledby,
+      'aria-describedby': ariaDescribedby,
+      'aria-details': ariaHidden,
+      marginX,
+      marginY,
+      width,
+      height,
+      minWidth,
+      minHeight,
+      maxWidth,
+      maxHeight,
+      flex,
+      flexGrow,
+      flexShrink,
+      flexBasis,
+      justifySelf,
+      alignSelf,
+      order,
+      gridArea,
+      gridColumn,
+      gridRow,
+      gridColumnStart,
+      gridColumnEnd,
+      gridRowStart,
+      gridRowEnd,
+      position,
+      zIndex,
+      top,
+      bottom,
+      start,
+      end,
+      left,
+      right,
+      isHidden
+    } = props,
+    componentProps = _objectWithoutProperties(props, _excluded);
+  return {
+    ariaLabelProps: {
+      'aria-label': ariaLabel,
+      'aria-labelledby': ariaLabelledby,
+      'aria-describedby': ariaDescribedby,
+      'aria-details': ariaHidden
+    },
+    styleProps: {
+      marginX,
+      marginY,
+      width,
+      height,
+      minWidth,
+      minHeight,
+      maxWidth,
+      maxHeight,
+      flex,
+      flexGrow,
+      flexShrink,
+      flexBasis,
+      justifySelf,
+      alignSelf,
+      order,
+      gridArea,
+      gridColumn,
+      gridRow,
+      gridColumnStart,
+      gridColumnEnd,
+      gridRowStart,
+      gridRowEnd,
+      position,
+      zIndex,
+      top,
+      bottom,
+      start,
+      end,
+      left,
+      right,
+      isHidden
+    },
+    componentProps: componentProps
+  };
+}
+export default separateSpectrumProps;
+//# sourceMappingURL=propsUtils.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"propsUtils.js","names":["separateSpectrumProps","props","ariaLabel","ariaLabelledby","ariaDescribedby","ariaHidden","marginX","marginY","width","height","minWidth","minHeight","maxWidth","maxHeight","flex","flexGrow","flexShrink","flexBasis","justifySelf","alignSelf","order","gridArea","gridColumn","gridRow","gridColumnStart","gridColumnEnd","gridRowStart","gridRowEnd","position","zIndex","top","bottom","start","end","left","right","isHidden","componentProps","_objectWithoutProperties","_excluded","ariaLabelProps","styleProps"],"sources":["../../../src/spectrum/utils/propsUtils.ts"],"sourcesContent":["import type { AriaLabelingProps, StyleProps } from '@react-types/shared';\n\n/**\n * Separate props for Spectrum components into AriaLabelingProps, StyleProps, and\n * any remaining props.\n * @param props The props to separate\n * @returns The separated props\n */\nexport function separateSpectrumProps<T extends AriaLabelingProps & StyleProps>(\n  props: T\n): {\n  ariaLabelProps: AriaLabelingProps;\n  styleProps: StyleProps;\n  componentProps: Omit<T, keyof (AriaLabelingProps & StyleProps)>;\n} {\n  const {\n    'aria-label': ariaLabel,\n    'aria-labelledby': ariaLabelledby,\n    'aria-describedby': ariaDescribedby,\n    'aria-details': ariaHidden,\n\n    marginX,\n    marginY,\n    width,\n    height,\n    minWidth,\n    minHeight,\n    maxWidth,\n    maxHeight,\n    flex,\n    flexGrow,\n    flexShrink,\n    flexBasis,\n    justifySelf,\n    alignSelf,\n    order,\n    gridArea,\n    gridColumn,\n    gridRow,\n    gridColumnStart,\n    gridColumnEnd,\n    gridRowStart,\n    gridRowEnd,\n    position,\n    zIndex,\n    top,\n    bottom,\n    start,\n    end,\n    left,\n    right,\n    isHidden,\n    ...componentProps\n  } = props;\n\n  return {\n    ariaLabelProps: {\n      'aria-label': ariaLabel,\n      'aria-labelledby': ariaLabelledby,\n      'aria-describedby': ariaDescribedby,\n      'aria-details': ariaHidden,\n    },\n    styleProps: {\n      marginX,\n      marginY,\n      width,\n      height,\n      minWidth,\n      minHeight,\n      maxWidth,\n      maxHeight,\n      flex,\n      flexGrow,\n      flexShrink,\n      flexBasis,\n      justifySelf,\n      alignSelf,\n      order,\n      gridArea,\n      gridColumn,\n      gridRow,\n      gridColumnStart,\n      gridColumnEnd,\n      gridRowStart,\n      gridRowEnd,\n      position,\n      zIndex,\n      top,\n      bottom,\n      start,\n      end,\n      left,\n      right,\n      isHidden,\n    },\n    componentProps: componentProps as Omit<\n      T,\n      keyof (AriaLabelingProps & StyleProps)\n    >,\n  };\n}\n\nexport default separateSpectrumProps;\n"],"mappings":";;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,qBAAqBA,CACnCC,KAAQ,EAKR;EACA,IAAM;MACJ,YAAY,EAAEC,SAAS;MACvB,iBAAiB,EAAEC,cAAc;MACjC,kBAAkB,EAAEC,eAAe;MACnC,cAAc,EAAEC,UAAU;MAE1BC,OAAO;MACPC,OAAO;MACPC,KAAK;MACLC,MAAM;MACNC,QAAQ;MACRC,SAAS;MACTC,QAAQ;MACRC,SAAS;MACTC,IAAI;MACJC,QAAQ;MACRC,UAAU;MACVC,SAAS;MACTC,WAAW;MACXC,SAAS;MACTC,KAAK;MACLC,QAAQ;MACRC,UAAU;MACVC,OAAO;MACPC,eAAe;MACfC,aAAa;MACbC,YAAY;MACZC,UAAU;MACVC,QAAQ;MACRC,MAAM;MACNC,GAAG;MACHC,MAAM;MACNC,KAAK;MACLC,GAAG;MACHC,IAAI;MACJC,KAAK;MACLC;IAEF,CAAC,GAAGnC,KAAK;IADJoC,cAAc,GAAAC,wBAAA,CACfrC,KAAK,EAAAsC,SAAA;EAET,OAAO;IACLC,cAAc,EAAE;MACd,YAAY,EAAEtC,SAAS;MACvB,iBAAiB,EAAEC,cAAc;MACjC,kBAAkB,EAAEC,eAAe;MACnC,cAAc,EAAEC;IAClB,CAAC;IACDoC,UAAU,EAAE;MACVnC,OAAO;MACPC,OAAO;MACPC,KAAK;MACLC,MAAM;MACNC,QAAQ;MACRC,SAAS;MACTC,QAAQ;MACRC,SAAS;MACTC,IAAI;MACJC,QAAQ;MACRC,UAAU;MACVC,SAAS;MACTC,WAAW;MACXC,SAAS;MACTC,KAAK;MACLC,QAAQ;MACRC,UAAU;MACVC,OAAO;MACPC,eAAe;MACfC,aAAa;MACbC,YAAY;MACZC,UAAU;MACVC,QAAQ;MACRC,MAAM;MACNC,GAAG;MACHC,MAAM;MACNC,KAAK;MACLC,GAAG;MACHC,IAAI;MACJC,KAAK;MACLC;IACF,CAAC;IACDC,cAAc,EAAEA;EAIlB,CAAC;AACH;AAEA,eAAerC,qBAAqB"}

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

@@ -1,11 +1,20 @@
 /// <reference types="react" />
-import { NormalizedItem, TooltipOptions } from './itemUtils';
+import { ItemIconSlot, NormalizedItem, TooltipOptions } from './itemUtils';
+export interface UseRenderNormalizedItemOptions {
+    itemIconSlot: ItemIconSlot;
+    showItemDescriptions: boolean;
+    showItemIcons: boolean;
+    tooltipOptions: TooltipOptions | null;
+}
 /**
  * Returns a render function that can be used to render a normalized item in
  * collection components.
+ * @param itemIconSlot Slot to use for item icons
+ * @param showItemDescriptions Whether to show item descriptions
+ * @param showItemIcons Whether to show item icons
  * @param tooltipOptions Tooltip options to use when rendering the item
  * @returns Render function for normalized items
  */
-export declare function useRenderNormalizedItem(tooltipOptions: TooltipOptions | null): (normalizedItem: NormalizedItem) => JSX.Element;
+export declare function useRenderNormalizedItem({ itemIconSlot, showItemDescriptions, showItemIcons, tooltipOptions, }: UseRenderNormalizedItemOptions): (normalizedItem: NormalizedItem) => JSX.Element;
 export default useRenderNormalizedItem;
 //# sourceMappingURL=useRenderNormalizedItem.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useRenderNormalizedItem.d.ts","sourceRoot":"","sources":["../../../src/spectrum/utils/useRenderNormalizedItem.tsx"],"names":[],"mappings":";AAGA,OAAO,EAGL,cAAc,EACd,cAAc,EACf,MAAM,aAAa,CAAC;AAErB;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,cAAc,GAAG,IAAI,GACpC,CAAC,cAAc,EAAE,cAAc,KAAK,GAAG,CAAC,OAAO,CA+BjD;AAED,eAAe,uBAAuB,CAAC"}
+{"version":3,"file":"useRenderNormalizedItem.d.ts","sourceRoot":"","sources":["../../../src/spectrum/utils/useRenderNormalizedItem.tsx"],"names":[],"mappings":";AAGA,OAAO,EAEL,YAAY,EAEZ,cAAc,EACd,cAAc,EACf,MAAM,aAAa,CAAC;AAGrB,MAAM,WAAW,8BAA8B;IAC7C,YAAY,EAAE,YAAY,CAAC;IAC3B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,aAAa,EAAE,OAAO,CAAC;IACvB,cAAc,EAAE,cAAc,GAAG,IAAI,CAAC;CACvC;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,EACtC,YAAY,EACZ,oBAAoB,EACpB,aAAa,EACb,cAAc,GACf,EAAE,8BAA8B,GAAG,CAClC,cAAc,EAAE,cAAc,KAC3B,GAAG,CAAC,OAAO,CA2Cf;AAED,eAAe,uBAAuB,CAAC"}

package/dist/spectrum/utils/useRenderNormalizedItem.js

@@ -2,19 +2,32 @@ import { useCallback } from 'react';
 import { ItemContent } from "../ItemContent.js";
 import { Item } from "../shared.js";
 import { getItemKey, ITEM_EMPTY_STRING_TEXT_VALUE } from "./itemUtils.js";
+import { wrapIcon, wrapPrimitiveWithText } from "./itemWrapperUtils.js";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * Returns a render function that can be used to render a normalized item in
  * collection components.
+ * @param itemIconSlot Slot to use for item icons
+ * @param showItemDescriptions Whether to show item descriptions
+ * @param showItemIcons Whether to show item icons
  * @param tooltipOptions Tooltip options to use when rendering the item
  * @returns Render function for normalized items
  */
-import { jsx as _jsx } from "react/jsx-runtime";
-export function useRenderNormalizedItem(tooltipOptions) {
+export function useRenderNormalizedItem(_ref) {
+  var {
+    itemIconSlot,
+    showItemDescriptions,
+    showItemIcons,
+    tooltipOptions
+  } = _ref;
   return useCallback(normalizedItem => {
-    var _normalizedItem$item$, _normalizedItem$item, _normalizedItem$item$2, _normalizedItem$item2;
+    var _normalizedItem$item, _normalizedItem$item$, _normalizedItem$item2, _normalizedItem$item3, _normalizedItem$item4;
     var key = getItemKey(normalizedItem);
-    var content = (_normalizedItem$item$ = (_normalizedItem$item = normalizedItem.item) === null || _normalizedItem$item === void 0 ? void 0 : _normalizedItem$item.content) !== null && _normalizedItem$item$ !== void 0 ? _normalizedItem$item$ : '';
-    var textValue = (_normalizedItem$item$2 = (_normalizedItem$item2 = normalizedItem.item) === null || _normalizedItem$item2 === void 0 ? void 0 : _normalizedItem$item2.textValue) !== null && _normalizedItem$item$2 !== void 0 ? _normalizedItem$item$2 : '';
+    var content = wrapPrimitiveWithText((_normalizedItem$item = normalizedItem.item) === null || _normalizedItem$item === void 0 ? void 0 : _normalizedItem$item.content);
+    var textValue = (_normalizedItem$item$ = (_normalizedItem$item2 = normalizedItem.item) === null || _normalizedItem$item2 === void 0 ? void 0 : _normalizedItem$item2.textValue) !== null && _normalizedItem$item$ !== void 0 ? _normalizedItem$item$ : '';
+    var description = showItemDescriptions ? wrapPrimitiveWithText((_normalizedItem$item3 = normalizedItem.item) === null || _normalizedItem$item3 === void 0 ? void 0 : _normalizedItem$item3.description, 'description') : null;
+    var icon = showItemIcons ? wrapIcon((_normalizedItem$item4 = normalizedItem.item) === null || _normalizedItem$item4 === void 0 ? void 0 : _normalizedItem$item4.icon, itemIconSlot) : null;
     return /*#__PURE__*/_jsx(Item
     // Note that setting the `key` prop explicitly on `Item` elements
     // causes the picker to expect `selectedKey` and `defaultSelectedKey`
@@ -29,12 +42,12 @@ export function useRenderNormalizedItem(tooltipOptions) {
       // but are used for accessibility purposes, so we set to an arbitrary
       // `ITEM_EMPTY_STRING_TEXT_VALUE` value so that they are not empty strings.
       textValue: textValue === '' ? ITEM_EMPTY_STRING_TEXT_VALUE : textValue,
-      children: /*#__PURE__*/_jsx(ItemContent, {
+      children: /*#__PURE__*/_jsxs(ItemContent, {
         tooltipOptions: tooltipOptions,
-        children: content
+        children: [icon, content, description]
       })
     }, key);
-  }, [tooltipOptions]);
+  }, [itemIconSlot, showItemDescriptions, showItemIcons, tooltipOptions]);
 }
 export default useRenderNormalizedItem;
 //# sourceMappingURL=useRenderNormalizedItem.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useRenderNormalizedItem.js","names":["useCallback","ItemContent","Item","getItemKey","ITEM_EMPTY_STRING_TEXT_VALUE","jsx","_jsx","useRenderNormalizedItem","tooltipOptions","normalizedItem","_normalizedItem$item$","_normalizedItem$item","_normalizedItem$item$2","_normalizedItem$item2","key","content","item","textValue","children"],"sources":["../../../src/spectrum/utils/useRenderNormalizedItem.tsx"],"sourcesContent":["import { Key, useCallback } from 'react';\nimport { ItemContent } from '../ItemContent';\nimport { Item } from '../shared';\nimport {\n  getItemKey,\n  ITEM_EMPTY_STRING_TEXT_VALUE,\n  NormalizedItem,\n  TooltipOptions,\n} from './itemUtils';\n\n/**\n * Returns a render function that can be used to render a normalized item in\n * collection components.\n * @param tooltipOptions Tooltip options to use when rendering the item\n * @returns Render function for normalized items\n */\nexport function useRenderNormalizedItem(\n  tooltipOptions: TooltipOptions | null\n): (normalizedItem: NormalizedItem) => JSX.Element {\n  return useCallback(\n    (normalizedItem: NormalizedItem) => {\n      const key = getItemKey(normalizedItem);\n      const content = normalizedItem.item?.content ?? '';\n      const textValue = normalizedItem.item?.textValue ?? '';\n\n      return (\n        <Item\n          // Note that setting the `key` prop explicitly on `Item` elements\n          // causes the picker to expect `selectedKey` and `defaultSelectedKey`\n          // to be strings. It also passes the stringified value of the key to\n          // `onSelectionChange` handlers` regardless of the actual type of the\n          // key. We can't really get around setting in order to support Windowed\n          // data, so we'll need to do some manual conversion of keys to strings\n          // in other components that use this hook.\n          key={key as Key}\n          // The `textValue` prop gets used to provide the content of `<option>`\n          // elements that back the Spectrum Picker. These are not visible in the UI,\n          // but are used for accessibility purposes, so we set to an arbitrary\n          // `ITEM_EMPTY_STRING_TEXT_VALUE` value so that they are not empty strings.\n          textValue={\n            textValue === '' ? ITEM_EMPTY_STRING_TEXT_VALUE : textValue\n          }\n        >\n          <ItemContent tooltipOptions={tooltipOptions}>{content}</ItemContent>\n        </Item>\n      );\n    },\n    [tooltipOptions]\n  );\n}\n\nexport default useRenderNormalizedItem;\n"],"mappings":"AAAA,SAAcA,WAAW,QAAQ,OAAO;AAAC,SAChCC,WAAW;AAAA,SACXC,IAAI;AAAA,SAEXC,UAAU,EACVC,4BAA4B;AAK9B;AACA;AACA;AACA;AACA;AACA;AALA,SAAAC,GAAA,IAAAC,IAAA;AAMA,OAAO,SAASC,uBAAuBA,CACrCC,cAAqC,EACY;EACjD,OAAOR,WAAW,CACfS,cAA8B,IAAK;IAAA,IAAAC,qBAAA,EAAAC,oBAAA,EAAAC,sBAAA,EAAAC,qBAAA;IAClC,IAAMC,GAAG,GAAGX,UAAU,CAACM,cAAc,CAAC;IACtC,IAAMM,OAAO,IAAAL,qBAAA,IAAAC,oBAAA,GAAGF,cAAc,CAACO,IAAI,cAAAL,oBAAA,uBAAnBA,oBAAA,CAAqBI,OAAO,cAAAL,qBAAA,cAAAA,qBAAA,GAAI,EAAE;IAClD,IAAMO,SAAS,IAAAL,sBAAA,IAAAC,qBAAA,GAAGJ,cAAc,CAACO,IAAI,cAAAH,qBAAA,uBAAnBA,qBAAA,CAAqBI,SAAS,cAAAL,sBAAA,cAAAA,sBAAA,GAAI,EAAE;IAEtD,oBACEN,IAAA,CAACJ;IACC;IACA;IACA;IACA;IACA;IACA;IACA;IAAA;MAEA;MACA;MACA;MACA;MACAe,SAAS,EACPA,SAAS,KAAK,EAAE,GAAGb,4BAA4B,GAAGa,SACnD;MAAAC,QAAA,eAEDZ,IAAA,CAACL,WAAW;QAACO,cAAc,EAAEA,cAAe;QAAAU,QAAA,EAAEH;MAAO,CAAc;IAAC,GAT/DD,GAUD,CAAC;EAEX,CAAC,EACD,CAACN,cAAc,CACjB,CAAC;AACH;AAEA,eAAeD,uBAAuB"}
+{"version":3,"file":"useRenderNormalizedItem.js","names":["useCallback","ItemContent","Item","getItemKey","ITEM_EMPTY_STRING_TEXT_VALUE","wrapIcon","wrapPrimitiveWithText","jsxs","_jsxs","jsx","_jsx","useRenderNormalizedItem","_ref","itemIconSlot","showItemDescriptions","showItemIcons","tooltipOptions","normalizedItem","_normalizedItem$item","_normalizedItem$item$","_normalizedItem$item2","_normalizedItem$item3","_normalizedItem$item4","key","content","item","textValue","description","icon","children"],"sources":["../../../src/spectrum/utils/useRenderNormalizedItem.tsx"],"sourcesContent":["import { Key, useCallback } from 'react';\nimport { ItemContent } from '../ItemContent';\nimport { Item } from '../shared';\nimport {\n  getItemKey,\n  ItemIconSlot,\n  ITEM_EMPTY_STRING_TEXT_VALUE,\n  NormalizedItem,\n  TooltipOptions,\n} from './itemUtils';\nimport { wrapIcon, wrapPrimitiveWithText } from './itemWrapperUtils';\n\nexport interface UseRenderNormalizedItemOptions {\n  itemIconSlot: ItemIconSlot;\n  showItemDescriptions: boolean;\n  showItemIcons: boolean;\n  tooltipOptions: TooltipOptions | null;\n}\n\n/**\n * Returns a render function that can be used to render a normalized item in\n * collection components.\n * @param itemIconSlot Slot to use for item icons\n * @param showItemDescriptions Whether to show item descriptions\n * @param showItemIcons Whether to show item icons\n * @param tooltipOptions Tooltip options to use when rendering the item\n * @returns Render function for normalized items\n */\nexport function useRenderNormalizedItem({\n  itemIconSlot,\n  showItemDescriptions,\n  showItemIcons,\n  tooltipOptions,\n}: UseRenderNormalizedItemOptions): (\n  normalizedItem: NormalizedItem\n) => JSX.Element {\n  return useCallback(\n    (normalizedItem: NormalizedItem) => {\n      const key = getItemKey(normalizedItem);\n      const content = wrapPrimitiveWithText(normalizedItem.item?.content);\n      const textValue = normalizedItem.item?.textValue ?? '';\n\n      const description = showItemDescriptions\n        ? wrapPrimitiveWithText(normalizedItem.item?.description, 'description')\n        : null;\n\n      const icon = showItemIcons\n        ? wrapIcon(normalizedItem.item?.icon, itemIconSlot)\n        : null;\n\n      return (\n        <Item\n          // Note that setting the `key` prop explicitly on `Item` elements\n          // causes the picker to expect `selectedKey` and `defaultSelectedKey`\n          // to be strings. It also passes the stringified value of the key to\n          // `onSelectionChange` handlers` regardless of the actual type of the\n          // key. We can't really get around setting in order to support Windowed\n          // data, so we'll need to do some manual conversion of keys to strings\n          // in other components that use this hook.\n          key={key as Key}\n          // The `textValue` prop gets used to provide the content of `<option>`\n          // elements that back the Spectrum Picker. These are not visible in the UI,\n          // but are used for accessibility purposes, so we set to an arbitrary\n          // `ITEM_EMPTY_STRING_TEXT_VALUE` value so that they are not empty strings.\n          textValue={\n            textValue === '' ? ITEM_EMPTY_STRING_TEXT_VALUE : textValue\n          }\n        >\n          <ItemContent tooltipOptions={tooltipOptions}>\n            {icon}\n            {content}\n            {description}\n          </ItemContent>\n        </Item>\n      );\n    },\n    [itemIconSlot, showItemDescriptions, showItemIcons, tooltipOptions]\n  );\n}\n\nexport default useRenderNormalizedItem;\n"],"mappings":"AAAA,SAAcA,WAAW,QAAQ,OAAO;AAAC,SAChCC,WAAW;AAAA,SACXC,IAAI;AAAA,SAEXC,UAAU,EAEVC,4BAA4B;AAAA,SAIrBC,QAAQ,EAAEC,qBAAqB;AAAA,SAAAC,IAAA,IAAAC,KAAA;AAAA,SAAAC,GAAA,IAAAC,IAAA;AASxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,uBAAuBA,CAAAC,IAAA,EAOtB;EAAA,IAPuB;IACtCC,YAAY;IACZC,oBAAoB;IACpBC,aAAa;IACbC;EAC8B,CAAC,GAAAJ,IAAA;EAG/B,OAAOZ,WAAW,CACfiB,cAA8B,IAAK;IAAA,IAAAC,oBAAA,EAAAC,qBAAA,EAAAC,qBAAA,EAAAC,qBAAA,EAAAC,qBAAA;IAClC,IAAMC,GAAG,GAAGpB,UAAU,CAACc,cAAc,CAAC;IACtC,IAAMO,OAAO,GAAGlB,qBAAqB,EAAAY,oBAAA,GAACD,cAAc,CAACQ,IAAI,cAAAP,oBAAA,uBAAnBA,oBAAA,CAAqBM,OAAO,CAAC;IACnE,IAAME,SAAS,IAAAP,qBAAA,IAAAC,qBAAA,GAAGH,cAAc,CAACQ,IAAI,cAAAL,qBAAA,uBAAnBA,qBAAA,CAAqBM,SAAS,cAAAP,qBAAA,cAAAA,qBAAA,GAAI,EAAE;IAEtD,IAAMQ,WAAW,GAAGb,oBAAoB,GACpCR,qBAAqB,EAAAe,qBAAA,GAACJ,cAAc,CAACQ,IAAI,cAAAJ,qBAAA,uBAAnBA,qBAAA,CAAqBM,WAAW,EAAE,aAAa,CAAC,GACtE,IAAI;IAER,IAAMC,IAAI,GAAGb,aAAa,GACtBV,QAAQ,EAAAiB,qBAAA,GAACL,cAAc,CAACQ,IAAI,cAAAH,qBAAA,uBAAnBA,qBAAA,CAAqBM,IAAI,EAAEf,YAAY,CAAC,GACjD,IAAI;IAER,oBACEH,IAAA,CAACR;IACC;IACA;IACA;IACA;IACA;IACA;IACA;IAAA;MAEA;MACA;MACA;MACA;MACAwB,SAAS,EACPA,SAAS,KAAK,EAAE,GAAGtB,4BAA4B,GAAGsB,SACnD;MAAAG,QAAA,eAEDrB,KAAA,CAACP,WAAW;QAACe,cAAc,EAAEA,cAAe;QAAAa,QAAA,GACzCD,IAAI,EACJJ,OAAO,EACPG,WAAW;MAAA,CACD;IAAC,GAbTJ,GAcD,CAAC;EAEX,CAAC,EACD,CAACV,YAAY,EAAEC,oBAAoB,EAAEC,aAAa,EAAEC,cAAc,CACpE,CAAC;AACH;AAEA,eAAeL,uBAAuB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deephaven/components",
-  "version": "0.74.1-beta.5+c6bcc155",
+  "version": "0.75.0",
   "description": "Deephaven React component library",
   "author": "Deephaven Data Labs LLC",
   "license": "Apache-2.0",
@@ -25,10 +25,10 @@
   },
   "dependencies": {
     "@adobe/react-spectrum": "^3.34.1",
-    "@deephaven/icons": "^0.74.1-beta.5+c6bcc155",
-    "@deephaven/log": "^0.74.1-beta.5+c6bcc155",
-    "@deephaven/react-hooks": "^0.74.1-beta.5+c6bcc155",
-    "@deephaven/utils": "^0.74.1-beta.5+c6bcc155",
+    "@deephaven/icons": "^0.75.0",
+    "@deephaven/log": "^0.75.0",
+    "@deephaven/react-hooks": "^0.75.0",
+    "@deephaven/utils": "^0.75.0",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@react-spectrum/theme-default": "^3.5.1",
@@ -55,7 +55,7 @@
     "react-dom": ">=16.8.0"
   },
   "devDependencies": {
-    "@deephaven/mocks": "^0.74.1-beta.5+c6bcc155"
+    "@deephaven/mocks": "^0.75.0"
   },
   "files": [
     "dist",
@@ -69,5 +69,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c6bcc1556311fa90e4e128025b9dff20f0d49648"
+  "gitHead": "cabfaf42c5c7e0b83561d10ba41cbeb305d1076e"
 }