@deephaven/components 0.70.1-beta.1 → 0.70.1-beta.6

package/dist/spectrum/picker/Picker.d.ts

@@ -1,13 +1,15 @@
 /// <reference types="react" />
-import { NormalizedSpectrumPickerProps, PickerItemOrSection, PickerItemKey, TooltipOptions } from './PickerUtils';
+import { NormalizedSpectrumPickerProps, NormalizedPickerItem, PickerItemOrSection, TooltipOptions, PickerItemKey } from './PickerUtils';
 export type PickerProps = {
-    children: PickerItemOrSection | PickerItemOrSection[];
+    children: PickerItemOrSection | PickerItemOrSection[] | NormalizedPickerItem[];
     /** Can be set to true or a TooltipOptions to enable item tooltips */
     tooltip?: boolean | TooltipOptions;
     /** The currently selected key in the collection (controlled). */
     selectedKey?: PickerItemKey | null;
     /** The initial selected key in the collection (uncontrolled). */
     defaultSelectedKey?: PickerItemKey;
+    /** Function to retrieve initial scroll position when opening the picker */
+    getInitialScrollPosition?: () => Promise<number | null>;
     /**
      * Handler that is called when the selection change.
      * Note that under the hood, this is just an alias for Spectrum's
@@ -15,6 +17,8 @@ export type PickerProps = {
      * components.
      */
     onChange?: (key: PickerItemKey) => void;
+    /** Handler that is called when the picker is scrolled. */
+    onScroll?: (event: Event) => void;
     /**
      * Handler that is called when the selection changes.
      * @deprecated Use `onChange` instead
@@ -28,6 +32,6 @@ export type PickerProps = {
  * pass through props for the Spectrum Picker component.
  * See https://react-spectrum.adobe.com/react-spectrum/Picker.html
  */
-export declare function Picker({ children, tooltip, defaultSelectedKey, selectedKey, onChange, onSelectionChange, UNSAFE_className, ...spectrumPickerProps }: PickerProps): JSX.Element;
+export declare function Picker({ children, tooltip, defaultSelectedKey, selectedKey, getInitialScrollPosition, onChange, onOpenChange, onScroll, onSelectionChange, UNSAFE_className, ...spectrumPickerProps }: PickerProps): JSX.Element;
 export default Picker;
 //# sourceMappingURL=Picker.d.ts.map

package/dist/spectrum/picker/Picker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Picker.d.ts","sourceRoot":"","sources":["../../../src/spectrum/picker/Picker.tsx"],"names":[],"mappings":";AAKA,OAAO,EACL,6BAA6B,EAG7B,mBAAmB,EACnB,aAAa,EACb,cAAc,EAGf,MAAM,eAAe,CAAC;AAIvB,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,EAAE,mBAAmB,GAAG,mBAAmB,EAAE,CAAC;IACtD,qEAAqE;IACrE,OAAO,CAAC,EAAE,OAAO,GAAG,cAAc,CAAC;IACnC,iEAAiE;IACjE,WAAW,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IACnC,iEAAiE;IACjE,kBAAkB,CAAC,EAAE,aAAa,CAAC;IACnC;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,IAAI,CAAC;IACxC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,IAAI,CAAC;CAClD,GAKK,IAAI,CACR,6BAA6B,EAC3B,UAAU,GACV,OAAO,GACP,mBAAmB,GACnB,aAAa,GACb,oBAAoB,CACvB,CAAC;AAsBF;;;;;;GAMG;AACH,wBAAgB,MAAM,CAAC,EACrB,QAAQ,EACR,OAAc,EACd,kBAAkB,EAClB,WAAW,EACX,QAAQ,EACR,iBAAiB,EAEjB,gBAAgB,EAChB,GAAG,mBAAmB,EACvB,EAAE,WAAW,GAAG,GAAG,CAAC,OAAO,CAoE3B;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"Picker.d.ts","sourceRoot":"","sources":["../../../src/spectrum/picker/Picker.tsx"],"names":[],"mappings":";AAgBA,OAAO,EAEL,6BAA6B,EAG7B,oBAAoB,EACpB,mBAAmB,EACnB,cAAc,EACd,aAAa,EAEd,MAAM,eAAe,CAAC;AAIvB,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,EACJ,mBAAmB,GACnB,mBAAmB,EAAE,GACrB,oBAAoB,EAAE,CAAC;IAC3B,qEAAqE;IACrE,OAAO,CAAC,EAAE,OAAO,GAAG,cAAc,CAAC;IACnC,iEAAiE;IACjE,WAAW,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IACnC,iEAAiE;IACjE,kBAAkB,CAAC,EAAE,aAAa,CAAC;IACnC,2EAA2E;IAC3E,wBAAwB,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACxD;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,IAAI,CAAC;IAExC,0DAA0D;IAC1D,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAElC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,IAAI,CAAC;CAClD,GAKK,IAAI,CACR,6BAA6B,EAC3B,UAAU,GACV,OAAO,GACP,mBAAmB,GACnB,aAAa,GACb,oBAAoB,CACvB,CAAC;AAsBF;;;;;;GAMG;AACH,wBAAgB,MAAM,CAAC,EACrB,QAAQ,EACR,OAAc,EACd,kBAAkB,EAClB,WAAW,EACX,wBAAwB,EACxB,QAAQ,EACR,YAAY,EACZ,QAAyB,EACzB,iBAAiB,EAEjB,gBAAgB,EAChB,GAAG,mBAAmB,EACvB,EAAE,WAAW,GAAG,GAAG,CAAC,OAAO,CAoI3B;AAED,eAAe,MAAM,CAAC"}

package/dist/spectrum/picker/Picker.js

@@ -1,4 +1,4 @@
-var _excluded = ["children", "tooltip", "defaultSelectedKey", "selectedKey", "onChange", "onSelectionChange", "UNSAFE_className"];
+var _excluded = ["children", "tooltip", "defaultSelectedKey", "selectedKey", "getInitialScrollPosition", "onChange", "onOpenChange", "onScroll", "onSelectionChange", "UNSAFE_className"];
 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; }
@@ -8,13 +8,15 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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; }
 import { useCallback, useMemo } from 'react';
 import { Flex, Picker as SpectrumPicker, Text } from '@adobe/react-spectrum';
-import { isElementOfType } from '@deephaven/react-hooks';
+import { getPositionOfSelectedItem, findSpectrumPickerScrollArea, isElementOfType, usePopoverOnScrollRef } from '@deephaven/react-hooks';
+import { EMPTY_FUNCTION, PICKER_ITEM_HEIGHT, PICKER_TOP_OFFSET } from '@deephaven/utils';
 import cl from 'classnames';
 import { Tooltip } from "../../popper/index.js";
-import { normalizePickerItemList, normalizeTooltipOptions, isNormalizedPickerSection } from "./PickerUtils.js";
+import { isNormalizedPickerSection, normalizePickerItemList, normalizeTooltipOptions, getPickerItemKey } from "./PickerUtils.js";
 import { PickerItemContent } from "./PickerItemContent.js";
 import { Item, Section } from "../shared.js";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 /**
  * Create tooltip content optionally wrapping with a Flex column for array
@@ -47,7 +49,10 @@ export function Picker(_ref) {
       tooltip = true,
       defaultSelectedKey,
       selectedKey,
+      getInitialScrollPosition,
       onChange,
+      onOpenChange,
+      onScroll = EMPTY_FUNCTION,
       onSelectionChange,
       // eslint-disable-next-line camelcase
       UNSAFE_className
@@ -55,50 +60,87 @@ export function Picker(_ref) {
     spectrumPickerProps = _objectWithoutProperties(_ref, _excluded);
   var normalizedItems = useMemo(() => normalizePickerItemList(children), [children]);
   var tooltipOptions = useMemo(() => normalizeTooltipOptions(tooltip), [tooltip]);
-  var renderItem = useCallback(_ref2 => {
-    var {
-      key,
-      content,
-      textValue
-    } = _ref2;
-    return (
-      /*#__PURE__*/
+  var renderItem = useCallback(normalizedItem => {
+    var _normalizedItem$item$, _normalizedItem$item, _normalizedItem$item$2, _normalizedItem$item2;
+    var key = getPickerItemKey(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 : '';
+    return /*#__PURE__*/_jsx(Item
+    // Note that setting the `key` prop explicitly on `Item` elements
+    // causes the picker to expect `selectedKey` and `defaultSelectedKey`
+    // to be strings. It also passes the stringified value of the key to
+    // `onSelectionChange` handlers` regardless of the actual type of the
+    // key. We can't really get around setting in order to support Windowed
+    // data, so we'll need to do some manual conversion of keys to strings
+    // in other places of this component.
+    , {
       // The `textValue` prop gets used to provide the content of `<option>`
       // elements that back the Spectrum Picker. These are not visible in the UI,
       // but are used for accessibility purposes, so we set to an arbitrary
       // 'Empty' value so that they are not empty strings.
-      _jsxs(Item, {
-        textValue: textValue === '' || textValue == null ? 'Empty' : textValue,
+      textValue: textValue === '' ? 'Empty' : textValue,
+      children: /*#__PURE__*/_jsxs(_Fragment, {
         children: [/*#__PURE__*/_jsx(PickerItemContent, {
           children: content
         }), tooltipOptions == null || content === '' ? null : /*#__PURE__*/_jsx(Tooltip, {
           options: tooltipOptions,
           children: createTooltipContent(content)
         })]
-      }, key)
-    );
+      })
+    }, key);
   }, [tooltipOptions]);
+  var getInitialScrollPositionInternal = useCallback(() => getInitialScrollPosition == null ? getPositionOfSelectedItem({
+    keyedItems: normalizedItems,
+    // TODO: #1890 & deephaven-plugins#371 add support for sections and
+    // items with descriptions since they impact the height calculations
+    itemHeight: PICKER_ITEM_HEIGHT,
+    selectedKey,
+    topOffset: PICKER_TOP_OFFSET
+  }) : getInitialScrollPosition(), [getInitialScrollPosition, normalizedItems, selectedKey]);
+  var {
+    ref: scrollRef,
+    onOpenChange: popoverOnOpenChange
+  } = usePopoverOnScrollRef(findSpectrumPickerScrollArea, onScroll, getInitialScrollPositionInternal);
+  var onOpenChangeInternal = useCallback(isOpen => {
+    // Attach scroll event handling
+    popoverOnOpenChange(isOpen);
+    onOpenChange === null || onOpenChange === void 0 ? void 0 : onOpenChange(isOpen);
+  }, [onOpenChange, popoverOnOpenChange]);
+  var onSelectionChangeInternal = useCallback(key => {
+    var _getPickerItemKey, _ref2;
+    // The `key` arg will always be a string due to us setting the `Item` key
+    // prop in `renderItem`. We need to find the matching item to determine
+    // the actual key.
+    var selectedItem = normalizedItems.find(item => String(getPickerItemKey(item)) === key);
+    var actualKey = (_getPickerItemKey = getPickerItemKey(selectedItem)) !== null && _getPickerItemKey !== void 0 ? _getPickerItemKey : key;
+    (_ref2 = onChange !== null && onChange !== void 0 ? onChange : onSelectionChange) === null || _ref2 === void 0 ? void 0 : _ref2(actualKey);
+  }, [normalizedItems, onChange, onSelectionChange]);
   return /*#__PURE__*/_jsx(SpectrumPicker
   // eslint-disable-next-line react/jsx-props-no-spreading
   , _objectSpread(_objectSpread({}, spectrumPickerProps), {}, {
+    // The `ref` prop type defined by React Spectrum is incorrect here
+    ref: scrollRef,
+    onOpenChange: onOpenChangeInternal,
     UNSAFE_className: cl('dh-picker', UNSAFE_className),
     items: normalizedItems
-    // Type assertions are necessary for `selectedKey`, `defaultSelectedKey`,
-    // and `onSelectionChange` due to Spectrum types not accounting for
-    // `boolean` keys
+    // Spectrum Picker treats keys as strings if the `key` prop is explicitly
+    // set on `Item` elements. Since we do this in `renderItem`, we need to
+    // ensure that `selectedKey` and `defaultSelectedKey` are strings in order
+    // for selection to work.
     ,
-    selectedKey: selectedKey,
-    defaultSelectedKey: defaultSelectedKey
+    selectedKey: selectedKey === null || selectedKey === void 0 ? void 0 : selectedKey.toString(),
+    defaultSelectedKey: defaultSelectedKey === null || defaultSelectedKey === void 0 ? void 0 : defaultSelectedKey.toString()
     // `onChange` is just an alias for `onSelectionChange`
     ,
-    onSelectionChange: onChange !== null && onChange !== void 0 ? onChange : onSelectionChange,
+    onSelectionChange: onSelectionChangeInternal,
     children: itemOrSection => {
       if (isNormalizedPickerSection(itemOrSection)) {
+        var _itemOrSection$item, _itemOrSection$item2;
         return /*#__PURE__*/_jsx(Section, {
-          title: itemOrSection.title,
-          items: itemOrSection.items,
+          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: renderItem
-        }, itemOrSection.key);
+        }, getPickerItemKey(itemOrSection));
       }
       return renderItem(itemOrSection);
     }

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

@@ -1 +1 @@
-{"version":3,"file":"Picker.js","names":["useCallback","useMemo","Flex","Picker","SpectrumPicker","Text","isElementOfType","cl","Tooltip","normalizePickerItemList","normalizeTooltipOptions","isNormalizedPickerSection","PickerItemContent","Item","Section","jsx","_jsx","jsxs","_jsxs","createTooltipContent","content","String","Array","isArray","direction","alignItems","children","filter","node","_ref","tooltip","defaultSelectedKey","selectedKey","onChange","onSelectionChange","UNSAFE_className","spectrumPickerProps","_objectWithoutProperties","_excluded","normalizedItems","tooltipOptions","renderItem","_ref2","key","textValue","options","_objectSpread","items","itemOrSection","title"],"sources":["../../../src/spectrum/picker/Picker.tsx"],"sourcesContent":["import { Key, ReactNode, useCallback, useMemo } from 'react';\nimport { Flex, Picker as SpectrumPicker, Text } from '@adobe/react-spectrum';\nimport { isElementOfType } from '@deephaven/react-hooks';\nimport cl from 'classnames';\nimport { Tooltip } from '../../popper';\nimport {\n  NormalizedSpectrumPickerProps,\n  normalizePickerItemList,\n  normalizeTooltipOptions,\n  PickerItemOrSection,\n  PickerItemKey,\n  TooltipOptions,\n  NormalizedPickerItem,\n  isNormalizedPickerSection,\n} from './PickerUtils';\nimport { PickerItemContent } from './PickerItemContent';\nimport { Item, Section } from '../shared';\n\nexport type PickerProps = {\n  children: PickerItemOrSection | PickerItemOrSection[];\n  /** Can be set to true or a TooltipOptions to enable item tooltips */\n  tooltip?: boolean | TooltipOptions;\n  /** The currently selected key in the collection (controlled). */\n  selectedKey?: PickerItemKey | null;\n  /** The initial selected key in the collection (uncontrolled). */\n  defaultSelectedKey?: PickerItemKey;\n  /**\n   * Handler that is called when the selection change.\n   * Note that under the hood, this is just an alias for Spectrum's\n   * `onSelectionChange`. We are renaming for better consistency with other\n   * components.\n   */\n  onChange?: (key: PickerItemKey) => void;\n  /**\n   * Handler that is called when the selection changes.\n   * @deprecated Use `onChange` instead\n   */\n  onSelectionChange?: (key: PickerItemKey) => void;\n} /*\n * Support remaining SpectrumPickerProps.\n * Note that `selectedKey`, `defaultSelectedKey`, and `onSelectionChange` are\n * re-defined above to account for boolean types which aren't included in the\n * React `Key` type, but are actually supported by the Spectrum Picker component.\n */ & Omit<\n  NormalizedSpectrumPickerProps,\n  | 'children'\n  | 'items'\n  | 'onSelectionChange'\n  | 'selectedKey'\n  | 'defaultSelectedKey'\n>;\n\n/**\n * Create tooltip content optionally wrapping with a Flex column for array\n * content. This is needed for Items containing description `Text` elements.\n */\nfunction createTooltipContent(content: ReactNode) {\n  if (typeof content === 'boolean') {\n    return String(content);\n  }\n\n  if (Array.isArray(content)) {\n    return (\n      <Flex direction=\"column\" alignItems=\"start\">\n        {content.filter(node => isElementOfType(node, Text))}\n      </Flex>\n    );\n  }\n\n  return content;\n}\n\n/**\n * Picker component for selecting items from a list of items. Items can be\n * provided via the `items` prop or as children. Each item can be a string,\n * number, boolean, or a Spectrum <Item> element. The remaining props are just\n * pass through props for the Spectrum Picker component.\n * See https://react-spectrum.adobe.com/react-spectrum/Picker.html\n */\nexport function Picker({\n  children,\n  tooltip = true,\n  defaultSelectedKey,\n  selectedKey,\n  onChange,\n  onSelectionChange,\n  // eslint-disable-next-line camelcase\n  UNSAFE_className,\n  ...spectrumPickerProps\n}: PickerProps): JSX.Element {\n  const normalizedItems = useMemo(\n    () => normalizePickerItemList(children),\n    [children]\n  );\n\n  const tooltipOptions = useMemo(\n    () => normalizeTooltipOptions(tooltip),\n    [tooltip]\n  );\n\n  const renderItem = useCallback(\n    ({ key, content, textValue }: NormalizedPickerItem) => (\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      // 'Empty' value so that they are not empty strings.\n      <Item\n        key={key as Key}\n        textValue={textValue === '' || textValue == null ? 'Empty' : textValue}\n      >\n        <PickerItemContent>{content}</PickerItemContent>\n        {tooltipOptions == null || content === '' ? null : (\n          <Tooltip options={tooltipOptions}>\n            {createTooltipContent(content)}\n          </Tooltip>\n        )}\n      </Item>\n    ),\n    [tooltipOptions]\n  );\n\n  return (\n    <SpectrumPicker\n      // eslint-disable-next-line react/jsx-props-no-spreading\n      {...spectrumPickerProps}\n      UNSAFE_className={cl('dh-picker', UNSAFE_className)}\n      items={normalizedItems}\n      // Type assertions are necessary for `selectedKey`, `defaultSelectedKey`,\n      // and `onSelectionChange` due to Spectrum types not accounting for\n      // `boolean` keys\n      selectedKey={selectedKey as NormalizedSpectrumPickerProps['selectedKey']}\n      defaultSelectedKey={\n        defaultSelectedKey as NormalizedSpectrumPickerProps['defaultSelectedKey']\n      }\n      // `onChange` is just an alias for `onSelectionChange`\n      onSelectionChange={\n        (onChange ??\n          onSelectionChange) as NormalizedSpectrumPickerProps['onSelectionChange']\n      }\n    >\n      {itemOrSection => {\n        if (isNormalizedPickerSection(itemOrSection)) {\n          return (\n            <Section\n              key={itemOrSection.key}\n              title={itemOrSection.title}\n              items={itemOrSection.items}\n            >\n              {renderItem}\n            </Section>\n          );\n        }\n\n        return renderItem(itemOrSection);\n      }}\n    </SpectrumPicker>\n  );\n}\n\nexport default Picker;\n"],"mappings":"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"}
+{"version":3,"file":"Picker.js","names":["useCallback","useMemo","Flex","Picker","SpectrumPicker","Text","getPositionOfSelectedItem","findSpectrumPickerScrollArea","isElementOfType","usePopoverOnScrollRef","EMPTY_FUNCTION","PICKER_ITEM_HEIGHT","PICKER_TOP_OFFSET","cl","Tooltip","isNormalizedPickerSection","normalizePickerItemList","normalizeTooltipOptions","getPickerItemKey","PickerItemContent","Item","Section","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","createTooltipContent","content","String","Array","isArray","direction","alignItems","children","filter","node","_ref","tooltip","defaultSelectedKey","selectedKey","getInitialScrollPosition","onChange","onOpenChange","onScroll","onSelectionChange","UNSAFE_className","spectrumPickerProps","_objectWithoutProperties","_excluded","normalizedItems","tooltipOptions","renderItem","normalizedItem","_normalizedItem$item$","_normalizedItem$item","_normalizedItem$item$2","_normalizedItem$item2","key","item","textValue","options","getInitialScrollPositionInternal","keyedItems","itemHeight","topOffset","ref","scrollRef","popoverOnOpenChange","onOpenChangeInternal","isOpen","onSelectionChangeInternal","_getPickerItemKey","_ref2","selectedItem","find","actualKey","_objectSpread","items","toString","itemOrSection","_itemOrSection$item","_itemOrSection$item2","title"],"sources":["../../../src/spectrum/picker/Picker.tsx"],"sourcesContent":["import { Key, ReactNode, useCallback, useMemo } from 'react';\nimport { DOMRef } from '@react-types/shared';\nimport { Flex, Picker as SpectrumPicker, Text } from '@adobe/react-spectrum';\nimport {\n  getPositionOfSelectedItem,\n  findSpectrumPickerScrollArea,\n  isElementOfType,\n  usePopoverOnScrollRef,\n} from '@deephaven/react-hooks';\nimport {\n  EMPTY_FUNCTION,\n  PICKER_ITEM_HEIGHT,\n  PICKER_TOP_OFFSET,\n} from '@deephaven/utils';\nimport cl from 'classnames';\nimport { Tooltip } from '../../popper';\nimport {\n  isNormalizedPickerSection,\n  NormalizedSpectrumPickerProps,\n  normalizePickerItemList,\n  normalizeTooltipOptions,\n  NormalizedPickerItem,\n  PickerItemOrSection,\n  TooltipOptions,\n  PickerItemKey,\n  getPickerItemKey,\n} from './PickerUtils';\nimport { PickerItemContent } from './PickerItemContent';\nimport { Item, Section } from '../shared';\n\nexport type PickerProps = {\n  children:\n    | PickerItemOrSection\n    | PickerItemOrSection[]\n    | NormalizedPickerItem[];\n  /** Can be set to true or a TooltipOptions to enable item tooltips */\n  tooltip?: boolean | TooltipOptions;\n  /** The currently selected key in the collection (controlled). */\n  selectedKey?: PickerItemKey | null;\n  /** The initial selected key in the collection (uncontrolled). */\n  defaultSelectedKey?: PickerItemKey;\n  /** Function to retrieve initial scroll position when opening the picker */\n  getInitialScrollPosition?: () => Promise<number | null>;\n  /**\n   * Handler that is called when the selection change.\n   * Note that under the hood, this is just an alias for Spectrum's\n   * `onSelectionChange`. We are renaming for better consistency with other\n   * components.\n   */\n  onChange?: (key: PickerItemKey) => void;\n\n  /** Handler that is called when the picker is scrolled. */\n  onScroll?: (event: Event) => void;\n\n  /**\n   * Handler that is called when the selection changes.\n   * @deprecated Use `onChange` instead\n   */\n  onSelectionChange?: (key: PickerItemKey) => void;\n} /*\n * Support remaining SpectrumPickerProps.\n * Note that `selectedKey`, `defaultSelectedKey`, and `onSelectionChange` are\n * re-defined above to account for boolean types which aren't included in the\n * React `Key` type, but are actually supported by the Spectrum Picker component.\n */ & Omit<\n  NormalizedSpectrumPickerProps,\n  | 'children'\n  | 'items'\n  | 'onSelectionChange'\n  | 'selectedKey'\n  | 'defaultSelectedKey'\n>;\n\n/**\n * Create tooltip content optionally wrapping with a Flex column for array\n * content. This is needed for Items containing description `Text` elements.\n */\nfunction createTooltipContent(content: ReactNode) {\n  if (typeof content === 'boolean') {\n    return String(content);\n  }\n\n  if (Array.isArray(content)) {\n    return (\n      <Flex direction=\"column\" alignItems=\"start\">\n        {content.filter(node => isElementOfType(node, Text))}\n      </Flex>\n    );\n  }\n\n  return content;\n}\n\n/**\n * Picker component for selecting items from a list of items. Items can be\n * provided via the `items` prop or as children. Each item can be a string,\n * number, boolean, or a Spectrum <Item> element. The remaining props are just\n * pass through props for the Spectrum Picker component.\n * See https://react-spectrum.adobe.com/react-spectrum/Picker.html\n */\nexport function Picker({\n  children,\n  tooltip = true,\n  defaultSelectedKey,\n  selectedKey,\n  getInitialScrollPosition,\n  onChange,\n  onOpenChange,\n  onScroll = EMPTY_FUNCTION,\n  onSelectionChange,\n  // eslint-disable-next-line camelcase\n  UNSAFE_className,\n  ...spectrumPickerProps\n}: PickerProps): JSX.Element {\n  const normalizedItems = useMemo(\n    () => normalizePickerItemList(children),\n    [children]\n  );\n\n  const tooltipOptions = useMemo(\n    () => normalizeTooltipOptions(tooltip),\n    [tooltip]\n  );\n\n  const renderItem = useCallback(\n    (normalizedItem: NormalizedPickerItem) => {\n      const key = getPickerItemKey(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 places of this component.\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          // 'Empty' value so that they are not empty strings.\n          textValue={textValue === '' ? 'Empty' : textValue}\n        >\n          <>\n            <PickerItemContent>{content}</PickerItemContent>\n            {tooltipOptions == null || content === '' ? null : (\n              <Tooltip options={tooltipOptions}>\n                {createTooltipContent(content)}\n              </Tooltip>\n            )}\n          </>\n        </Item>\n      );\n    },\n    [tooltipOptions]\n  );\n\n  const getInitialScrollPositionInternal = useCallback(\n    () =>\n      getInitialScrollPosition == null\n        ? getPositionOfSelectedItem({\n            keyedItems: normalizedItems,\n            // TODO: #1890 & deephaven-plugins#371 add support for sections and\n            // items with descriptions since they impact the height calculations\n            itemHeight: PICKER_ITEM_HEIGHT,\n            selectedKey,\n            topOffset: PICKER_TOP_OFFSET,\n          })\n        : getInitialScrollPosition(),\n    [getInitialScrollPosition, normalizedItems, selectedKey]\n  );\n\n  const { ref: scrollRef, onOpenChange: popoverOnOpenChange } =\n    usePopoverOnScrollRef(\n      findSpectrumPickerScrollArea,\n      onScroll,\n      getInitialScrollPositionInternal\n    );\n\n  const onOpenChangeInternal = useCallback(\n    (isOpen: boolean): void => {\n      // Attach scroll event handling\n      popoverOnOpenChange(isOpen);\n\n      onOpenChange?.(isOpen);\n    },\n    [onOpenChange, popoverOnOpenChange]\n  );\n\n  const onSelectionChangeInternal = useCallback(\n    (key: PickerItemKey): void => {\n      // The `key` arg will always be a string due to us setting the `Item` key\n      // prop in `renderItem`. We need to find the matching item to determine\n      // the actual key.\n      const selectedItem = normalizedItems.find(\n        item => String(getPickerItemKey(item)) === key\n      );\n\n      const actualKey = getPickerItemKey(selectedItem) ?? key;\n\n      (onChange ?? onSelectionChange)?.(actualKey);\n    },\n    [normalizedItems, onChange, onSelectionChange]\n  );\n\n  return (\n    <SpectrumPicker\n      // eslint-disable-next-line react/jsx-props-no-spreading\n      {...spectrumPickerProps}\n      // The `ref` prop type defined by React Spectrum is incorrect here\n      ref={scrollRef as unknown as DOMRef<HTMLDivElement>}\n      onOpenChange={onOpenChangeInternal}\n      UNSAFE_className={cl('dh-picker', UNSAFE_className)}\n      items={normalizedItems}\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      // ensure that `selectedKey` and `defaultSelectedKey` are strings in order\n      // for selection to work.\n      selectedKey={selectedKey?.toString()}\n      defaultSelectedKey={defaultSelectedKey?.toString()}\n      // `onChange` is just an alias for `onSelectionChange`\n      onSelectionChange={\n        onSelectionChangeInternal as NormalizedSpectrumPickerProps['onSelectionChange']\n      }\n    >\n      {itemOrSection => {\n        if (isNormalizedPickerSection(itemOrSection)) {\n          return (\n            <Section\n              key={getPickerItemKey(itemOrSection)}\n              title={itemOrSection.item?.title}\n              items={itemOrSection.item?.items}\n            >\n              {renderItem}\n            </Section>\n          );\n        }\n\n        return renderItem(itemOrSection);\n      }}\n    </SpectrumPicker>\n  );\n}\n\nexport default Picker;\n"],"mappings":"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"}

package/dist/spectrum/picker/PickerUtils.d.ts

@@ -1,6 +1,7 @@
 import { Key, ReactElement, ReactNode } from 'react';
 import { SpectrumPickerProps } from '@adobe/react-spectrum';
 import type { ItemRenderer } from '@react-types/shared';
+import { KeyedItem } from '@deephaven/utils';
 import { ItemProps, SectionProps } from '../shared';
 import { PopperOptions } from '../../popper';
 export declare const INVALID_PICKER_ITEM_ERROR_MESSAGE = "Picker items must be strings, numbers, booleans, <Item> or <Section> elements:";
@@ -29,26 +30,39 @@ export type PickerItemKey = Key | boolean;
  * reflect it.
  */
 export type PickerSelectionChangeHandler = (key: PickerItemKey) => void;
-/**
- * The Picker supports a variety of item types, including strings, numbers,
- * booleans, and more complex React elements. This type represents a normalized
- * form to make rendering items simpler and keep the logic of transformation
- * in separate util methods.
- */
-export interface NormalizedPickerItem {
+export interface NormalizedPickerItemData {
     key?: PickerItemKey;
     content: ReactNode;
     textValue?: string;
 }
-export interface NormalizedPickerSection {
+export interface NormalizedPickerSectionData {
     key?: Key;
     title?: ReactNode;
     items: NormalizedPickerItem[];
 }
+/**
+ * The Picker supports a variety of item types, including strings, numbers,
+ * booleans, and more complex React elements. This type represents a normalized
+ * form to make rendering items simpler and keep the logic of transformation
+ * in separate util methods. It also adheres to the `KeyedItem` interface to
+ * be compatible with Windowed data utils (e.g. `useViewportData`).
+ */
+export type NormalizedPickerItem = KeyedItem<NormalizedPickerItemData, PickerItemKey | undefined>;
+export type NormalizedPickerSection = KeyedItem<NormalizedPickerSectionData, Key | undefined>;
 export type NormalizedSpectrumPickerProps = SpectrumPickerProps<NormalizedPickerItem>;
 export type TooltipOptions = {
     placement: PopperOptions['placement'];
 };
+/**
+ * Picker uses a normalized item that includes a `key` prop and an optional
+ * `item` prop. This is mostly to support Windowed data where items are created
+ * before their data has been loaded (data gets set in the `item` prop). If
+ * data has loaded, return its `key`. If not, return the top-level `key` on the
+ * normalized item.
+ * @param item The normalized picker item or section
+ * @returns The `key` of the item or section
+ */
+export declare function getPickerItemKey<TItem extends NormalizedPickerItem | NormalizedPickerSection, TKey extends TItem extends NormalizedPickerItem ? PickerItemKey | undefined : TItem extends NormalizedPickerSection ? Key | undefined : undefined>(item: TItem | null | undefined): TKey;
 /**
  * Determine if a node is a Section element.
  * @param node The node to check
@@ -62,24 +76,31 @@ export declare function isSectionElement<T>(node: ReactNode): node is ReactEleme
  */
 export declare function isItemElement<T>(node: ReactNode): node is ReactElement<ItemProps<T>>;
 /**
- * Determine if a node is a Picker item or section. Valid types include strings,
- * numbers, booleans, Item elements, and Section elements.
+ * Determine if a node is an array containing normalized items with keys.
+ * Note that this only checks the first node in the array.
  * @param node The node to check
- * @returns True if the node is a Picker item or section
+ * @returns True if the node is a normalized item with keys array
  */
-export declare function isPickerItemOrSection(node: ReactNode): node is PickerItemOrSection;
+export declare function isNormalizedItemsWithKeysList(node: PickerItemOrSection | PickerItemOrSection[] | (NormalizedPickerItem | NormalizedPickerSection)[]): node is (NormalizedPickerItem | NormalizedPickerSection)[];
 /**
  * Determine if an object is a normalized Picker section.
  * @param maybeNormalizedPickerSection The object to check
  * @returns True if the object is a normalized Picker section
  */
 export declare function isNormalizedPickerSection(maybeNormalizedPickerSection: NormalizedPickerItem | NormalizedPickerSection): maybeNormalizedPickerSection is NormalizedPickerSection;
+/**
+ * Determine if a node is a Picker item or section. Valid types include strings,
+ * numbers, booleans, Item elements, and Section elements.
+ * @param node The node to check
+ * @returns True if the node is a Picker item or section
+ */
+export declare function isPickerItemOrSection(node: ReactNode): node is PickerItemOrSection;
 /**
  * Get normalized picker items from a picker item or array of picker items.
  * @param itemsOrSections A picker item or array of picker items
  * @returns An array of normalized picker items
  */
-export declare function normalizePickerItemList(itemsOrSections: PickerItemOrSection | PickerItemOrSection[]): (NormalizedPickerItem | NormalizedPickerSection)[];
+export declare function normalizePickerItemList(itemsOrSections: PickerItemOrSection | PickerItemOrSection[] | NormalizedPickerItem[]): (NormalizedPickerItem | NormalizedPickerSection)[];
 /**
  * Returns a TooltipOptions object or null if options is false or null.
  * @param options

package/dist/spectrum/picker/PickerUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PickerUtils.d.ts","sourceRoot":"","sources":["../../../src/spectrum/picker/PickerUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,GAAG,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAQ,SAAS,EAAW,YAAY,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAI7C,eAAO,MAAM,iCAAiC,mFACoC,CAAC;AAEnF;;;;GAIG;AACH,KAAK,0BAA0B,CAAC,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,GAAG;IACvE,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;CACjE,CAAC;AAEF,KAAK,WAAW,GAAG,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;AACpD,KAAK,cAAc,GAAG,YAAY,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC,CAAC;AAExE,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,WAAW,CAAC;AACjE,MAAM,MAAM,aAAa,GAAG,cAAc,CAAC;AAC3C,MAAM,MAAM,mBAAmB,GAAG,UAAU,GAAG,aAAa,CAAC;AAE7D;;;;GAIG;AACH,MAAM,MAAM,aAAa,GAAG,GAAG,GAAG,OAAO,CAAC;AAE1C;;;;GAIG;AACH,MAAM,MAAM,4BAA4B,GAAG,CAAC,GAAG,EAAE,aAAa,KAAK,IAAI,CAAC;AAExE;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC,GAAG,CAAC,EAAE,aAAa,CAAC;IACpB,OAAO,EAAE,SAAS,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,uBAAuB;IACtC,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,KAAK,EAAE,oBAAoB,EAAE,CAAC;CAC/B;AAED,MAAM,MAAM,6BAA6B,GACvC,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;AAE5C,MAAM,MAAM,cAAc,GAAG;IAAE,SAAS,EAAE,aAAa,CAAC,WAAW,CAAC,CAAA;CAAE,CAAC;AAEvE;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAChC,IAAI,EAAE,SAAS,GACd,IAAI,IAAI,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAEvC;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAC7B,IAAI,EAAE,SAAS,GACd,IAAI,IAAI,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAEpC;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,SAAS,GACd,IAAI,IAAI,mBAAmB,CAQ7B;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,4BAA4B,EAAE,oBAAoB,GAAG,uBAAuB,GAC3E,4BAA4B,IAAI,uBAAuB,CAEzD;AAqGD;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,eAAe,EAAE,mBAAmB,GAAG,mBAAmB,EAAE,GAC3D,CAAC,oBAAoB,GAAG,uBAAuB,CAAC,EAAE,CAKpD;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,CAAC,EAAE,OAAO,GAAG,cAAc,GAAG,IAAI,GACxC,cAAc,GAAG,IAAI,CAUvB"}
+{"version":3,"file":"PickerUtils.d.ts","sourceRoot":"","sources":["../../../src/spectrum/picker/PickerUtils.ts"],"names":[],"mappings":"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"}

package/dist/spectrum/picker/PickerUtils.js

@@ -26,9 +26,24 @@ export var INVALID_PICKER_ITEM_ERROR_MESSAGE = 'Picker items must be strings, nu
  * The Picker supports a variety of item types, including strings, numbers,
  * booleans, and more complex React elements. This type represents a normalized
  * form to make rendering items simpler and keep the logic of transformation
- * in separate util methods.
+ * in separate util methods. It also adheres to the `KeyedItem` interface to
+ * be compatible with Windowed data utils (e.g. `useViewportData`).
  */
 
+/**
+ * Picker uses a normalized item that includes a `key` prop and an optional
+ * `item` prop. This is mostly to support Windowed data where items are created
+ * before their data has been loaded (data gets set in the `item` prop). If
+ * data has loaded, return its `key`. If not, return the top-level `key` on the
+ * normalized item.
+ * @param item The normalized picker item or section
+ * @returns The `key` of the item or section
+ */
+export function getPickerItemKey(item) {
+  var _item$item$key, _item$item;
+  return (_item$item$key = item === null || item === void 0 ? void 0 : (_item$item = item.item) === null || _item$item === void 0 ? void 0 : _item$item.key) !== null && _item$item$key !== void 0 ? _item$item$key : item === null || item === void 0 ? void 0 : item.key;
+}
+
 /**
  * Determine if a node is a Section element.
  * @param node The node to check
@@ -48,13 +63,19 @@ export function isItemElement(node) {
 }
 
 /**
- * Determine if a node is a Picker item or section. Valid types include strings,
- * numbers, booleans, Item elements, and Section elements.
+ * Determine if a node is an array containing normalized items with keys.
+ * Note that this only checks the first node in the array.
  * @param node The node to check
- * @returns True if the node is a Picker item or section
+ * @returns True if the node is a normalized item with keys array
  */
-export function isPickerItemOrSection(node) {
-  return typeof node === 'string' || typeof node === 'number' || typeof node === 'boolean' || isItemElement(node) || isSectionElement(node);
+export function isNormalizedItemsWithKeysList(node) {
+  if (!Array.isArray(node)) {
+    return false;
+  }
+  if (node.length === 0) {
+    return true;
+  }
+  return !isPickerItemOrSection(node[0]) && 'key' in node[0];
 }
 
 /**
@@ -63,7 +84,17 @@ export function isPickerItemOrSection(node) {
  * @returns True if the object is a normalized Picker section
  */
 export function isNormalizedPickerSection(maybeNormalizedPickerSection) {
-  return 'items' in maybeNormalizedPickerSection;
+  return maybeNormalizedPickerSection.item != null && 'items' in maybeNormalizedPickerSection.item;
+}
+
+/**
+ * Determine if a node is a Picker item or section. Valid types include strings,
+ * numbers, booleans, Item elements, and Section elements.
+ * @param node The node to check
+ * @returns True if the node is a Picker item or section
+ */
+export function isPickerItemOrSection(node) {
+  return typeof node === 'string' || typeof node === 'number' || typeof node === 'boolean' || isItemElement(node) || isSectionElement(node);
 }
 
 /**
@@ -130,18 +161,22 @@ function normalizePickerItem(itemOrSection) {
     // We don't support nested section elements
     childItem => !isSectionElement(childItem));
     return {
-      key: _key,
-      title,
-      items
+      item: {
+        key: _key,
+        title,
+        items
+      }
     };
   }
   var key = normalizeItemKey(itemOrSection);
   var content = isItemElement(itemOrSection) ? itemOrSection.props.children : itemOrSection;
   var textValue = normalizeTextValue(itemOrSection);
   return {
-    key,
-    content,
-    textValue
+    item: {
+      key,
+      content,
+      textValue
+    }
   };
 }
 
@@ -151,6 +186,10 @@ function normalizePickerItem(itemOrSection) {
  * @returns An array of normalized picker items
  */
 export function normalizePickerItemList(itemsOrSections) {
+  // If already normalized, just return as-is
+  if (isNormalizedItemsWithKeysList(itemsOrSections)) {
+    return itemsOrSections;
+  }
   var itemsArray = Array.isArray(itemsOrSections) ? itemsOrSections : [itemsOrSections];
   return itemsArray.map(normalizePickerItem);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"PickerUtils.js","names":["isValidElement","Log","Item","Section","log","module","INVALID_PICKER_ITEM_ERROR_MESSAGE","isSectionElement","node","type","isItemElement","isPickerItemOrSection","isNormalizedPickerSection","maybeNormalizedPickerSection","normalizeItemKey","itemOrSection","_itemOrSection$props$","key","props","title","undefined","textValue","children","normalizeTextValue","item","String","normalizePickerItem","debug","Error","items","normalizePickerItemList","filter","childItem","content","itemsOrSections","itemsArray","Array","isArray","map","normalizeTooltipOptions","options","placement"],"sources":["../../../src/spectrum/picker/PickerUtils.ts"],"sourcesContent":["import { isValidElement, Key, ReactElement, ReactNode } from 'react';\nimport { SpectrumPickerProps } from '@adobe/react-spectrum';\nimport type { ItemRenderer } from '@react-types/shared';\nimport Log from '@deephaven/log';\nimport { Item, ItemProps, Section, SectionProps } from '../shared';\nimport { PopperOptions } from '../../popper';\n\nconst log = Log.module('PickerUtils');\n\nexport const INVALID_PICKER_ITEM_ERROR_MESSAGE =\n  'Picker 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\ntype ItemElement = ReactElement<ItemProps<unknown>>;\ntype SectionElement = ReactElement<SectionPropsNoItemRenderer<unknown>>;\n\nexport type PickerItem = number | string | boolean | ItemElement;\nexport type PickerSection = SectionElement;\nexport type PickerItemOrSection = PickerItem | PickerSection;\n\n/**\n * Augment the Spectrum selection key type to include boolean values.\n * The Spectrum Picker already supports this, but the built in types don't\n * reflect it.\n */\nexport type PickerItemKey = Key | boolean;\n\n/**\n * Augment the Spectrum selection change handler type to include boolean keys.\n * The Spectrum Picker already supports this, but the built in types don't\n * reflect it.\n */\nexport type PickerSelectionChangeHandler = (key: PickerItemKey) => void;\n\n/**\n * The Picker supports a variety of item types, including strings, numbers,\n * booleans, and more complex React elements. This type represents a normalized\n * form to make rendering items simpler and keep the logic of transformation\n * in separate util methods.\n */\nexport interface NormalizedPickerItem {\n  key?: PickerItemKey;\n  content: ReactNode;\n  textValue?: string;\n}\n\nexport interface NormalizedPickerSection {\n  key?: Key;\n  title?: ReactNode;\n  items: NormalizedPickerItem[];\n}\n\nexport type NormalizedSpectrumPickerProps =\n  SpectrumPickerProps<NormalizedPickerItem>;\n\nexport type TooltipOptions = { placement: PopperOptions['placement'] };\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 isValidElement<SectionProps<T>>(node) && node.type === 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 isValidElement<ItemProps<T>>(node) && node.type === Item;\n}\n\n/**\n * Determine if a node is a Picker 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 a Picker item or section\n */\nexport function isPickerItemOrSection(\n  node: ReactNode\n): node is PickerItemOrSection {\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 if an object is a normalized Picker section.\n * @param maybeNormalizedPickerSection The object to check\n * @returns True if the object is a normalized Picker section\n */\nexport function isNormalizedPickerSection(\n  maybeNormalizedPickerSection: NormalizedPickerItem | NormalizedPickerSection\n): maybeNormalizedPickerSection is NormalizedPickerSection {\n  return 'items' in maybeNormalizedPickerSection;\n}\n\n/**\n * Determine the `key` of a picker item or section.\n * @param itemOrSection The picker item or section\n * @returns A `PickerItemKey` for the picker item or undefined if a key can't be determined\n */\nfunction normalizeItemKey(item: PickerItem): PickerItemKey | undefined;\nfunction normalizeItemKey(section: PickerSection): Key | undefined;\nfunction normalizeItemKey(\n  itemOrSection: PickerItem | PickerSection\n): Key | PickerItemKey | 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 a picker item ensuring it is a string.\n * @param item The picker item\n * @returns A string `textValue` for the picker item\n */\nfunction normalizeTextValue(item: PickerItem): 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 a picker item to an object form.\n * @param itemOrSection item to normalize\n * @returns NormalizedPickerItem object\n */\nfunction normalizePickerItem(\n  itemOrSection: PickerItemOrSection\n): NormalizedPickerItem | NormalizedPickerSection {\n  if (!isPickerItemOrSection(itemOrSection)) {\n    log.debug(INVALID_PICKER_ITEM_ERROR_MESSAGE, itemOrSection);\n    throw new Error(INVALID_PICKER_ITEM_ERROR_MESSAGE);\n  }\n\n  if (isSectionElement(itemOrSection)) {\n    const key = normalizeItemKey(itemOrSection);\n    const { title } = itemOrSection.props;\n\n    const items = normalizePickerItemList(itemOrSection.props.children).filter(\n      // We don't support nested section elements\n      childItem => !isSectionElement(childItem)\n    ) as NormalizedPickerItem[];\n\n    return {\n      key,\n      title,\n      items,\n    };\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    key,\n    content,\n    textValue,\n  };\n}\n\n/**\n * Get normalized picker items from a picker item or array of picker items.\n * @param itemsOrSections A picker item or array of picker items\n * @returns An array of normalized picker items\n */\nexport function normalizePickerItemList(\n  itemsOrSections: PickerItemOrSection | PickerItemOrSection[]\n): (NormalizedPickerItem | NormalizedPickerSection)[] {\n  const itemsArray = Array.isArray(itemsOrSections)\n    ? itemsOrSections\n    : [itemsOrSections];\n  return itemsArray.map(normalizePickerItem);\n}\n\n/**\n * Returns a TooltipOptions object or null if options is false or null.\n * @param options\n * @returns TooltipOptions or null\n */\nexport function normalizeTooltipOptions(\n  options?: boolean | TooltipOptions | null\n): TooltipOptions | null {\n  if (options == null || options === false) {\n    return null;\n  }\n\n  if (options === true) {\n    return { placement: 'right' };\n  }\n\n  return options;\n}\n"],"mappings":"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"}
+{"version":3,"file":"PickerUtils.js","names":["isValidElement","Log","Item","Section","log","module","INVALID_PICKER_ITEM_ERROR_MESSAGE","getPickerItemKey","item","_item$item$key","_item$item","key","isSectionElement","node","type","isItemElement","isNormalizedItemsWithKeysList","Array","isArray","length","isPickerItemOrSection","isNormalizedPickerSection","maybeNormalizedPickerSection","normalizeItemKey","itemOrSection","_itemOrSection$props$","props","title","undefined","textValue","children","normalizeTextValue","String","normalizePickerItem","debug","Error","items","normalizePickerItemList","filter","childItem","content","itemsOrSections","itemsArray","map","normalizeTooltipOptions","options","placement"],"sources":["../../../src/spectrum/picker/PickerUtils.ts"],"sourcesContent":["import { isValidElement, Key, ReactElement, ReactNode } from 'react';\nimport { SpectrumPickerProps } from '@adobe/react-spectrum';\nimport type { ItemRenderer } from '@react-types/shared';\nimport Log from '@deephaven/log';\nimport { KeyedItem } from '@deephaven/utils';\nimport { Item, ItemProps, Section, SectionProps } from '../shared';\nimport { PopperOptions } from '../../popper';\n\nconst log = Log.module('PickerUtils');\n\nexport const INVALID_PICKER_ITEM_ERROR_MESSAGE =\n  'Picker 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\ntype ItemElement = ReactElement<ItemProps<unknown>>;\ntype SectionElement = ReactElement<SectionPropsNoItemRenderer<unknown>>;\n\nexport type PickerItem = number | string | boolean | ItemElement;\nexport type PickerSection = SectionElement;\nexport type PickerItemOrSection = PickerItem | PickerSection;\n\n/**\n * Augment the Spectrum selection key type to include boolean values.\n * The Spectrum Picker already supports this, but the built in types don't\n * reflect it.\n */\nexport type PickerItemKey = Key | boolean;\n\n/**\n * Augment the Spectrum selection change handler type to include boolean keys.\n * The Spectrum Picker already supports this, but the built in types don't\n * reflect it.\n */\nexport type PickerSelectionChangeHandler = (key: PickerItemKey) => void;\n\nexport interface NormalizedPickerItemData {\n  key?: PickerItemKey;\n  content: ReactNode;\n  textValue?: string;\n}\n\nexport interface NormalizedPickerSectionData {\n  key?: Key;\n  title?: ReactNode;\n  items: NormalizedPickerItem[];\n}\n\n/**\n * The Picker supports a variety of item types, including strings, numbers,\n * booleans, and more complex React elements. This type represents a normalized\n * form to make rendering items simpler and keep the logic of transformation\n * in separate util methods. It also adheres to the `KeyedItem` interface to\n * be compatible with Windowed data utils (e.g. `useViewportData`).\n */\nexport type NormalizedPickerItem = KeyedItem<\n  NormalizedPickerItemData,\n  PickerItemKey | undefined\n>;\n\nexport type NormalizedPickerSection = KeyedItem<\n  NormalizedPickerSectionData,\n  Key | undefined\n>;\n\nexport type NormalizedSpectrumPickerProps =\n  SpectrumPickerProps<NormalizedPickerItem>;\n\nexport type TooltipOptions = { placement: PopperOptions['placement'] };\n\n/**\n * Picker uses a normalized item that includes a `key` prop and an optional\n * `item` prop. This is mostly to support Windowed data where items are created\n * before their data has been loaded (data gets set in the `item` prop). If\n * data has loaded, return its `key`. If not, return the top-level `key` on the\n * normalized item.\n * @param item The normalized picker item or section\n * @returns The `key` of the item or section\n */\nexport function getPickerItemKey<\n  TItem extends NormalizedPickerItem | NormalizedPickerSection,\n  TKey extends TItem extends NormalizedPickerItem\n    ? PickerItemKey | undefined\n    : TItem extends NormalizedPickerSection\n    ? Key | undefined\n    : undefined,\n>(item: TItem | null | undefined): TKey {\n  return (item?.item?.key ?? item?.key) as TKey;\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 isValidElement<SectionProps<T>>(node) && node.type === 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 isValidElement<ItemProps<T>>(node) && node.type === Item;\n}\n\n/**\n * Determine if a node is an array containing normalized items with keys.\n * 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 with keys array\n */\nexport function isNormalizedItemsWithKeysList(\n  node:\n    | PickerItemOrSection\n    | PickerItemOrSection[]\n    | (NormalizedPickerItem | NormalizedPickerSection)[]\n): node is (NormalizedPickerItem | NormalizedPickerSection)[] {\n  if (!Array.isArray(node)) {\n    return false;\n  }\n\n  if (node.length === 0) {\n    return true;\n  }\n\n  return !isPickerItemOrSection(node[0]) && 'key' in node[0];\n}\n\n/**\n * Determine if an object is a normalized Picker section.\n * @param maybeNormalizedPickerSection The object to check\n * @returns True if the object is a normalized Picker section\n */\nexport function isNormalizedPickerSection(\n  maybeNormalizedPickerSection: NormalizedPickerItem | NormalizedPickerSection\n): maybeNormalizedPickerSection is NormalizedPickerSection {\n  return (\n    maybeNormalizedPickerSection.item != null &&\n    'items' in maybeNormalizedPickerSection.item\n  );\n}\n\n/**\n * Determine if a node is a Picker 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 a Picker item or section\n */\nexport function isPickerItemOrSection(\n  node: ReactNode\n): node is PickerItemOrSection {\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 a picker item or section.\n * @param itemOrSection The picker item or section\n * @returns A `PickerItemKey` for the picker item or undefined if a key can't be determined\n */\nfunction normalizeItemKey(item: PickerItem): PickerItemKey | undefined;\nfunction normalizeItemKey(section: PickerSection): Key | undefined;\nfunction normalizeItemKey(\n  itemOrSection: PickerItem | PickerSection\n): Key | PickerItemKey | 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 a picker item ensuring it is a string.\n * @param item The picker item\n * @returns A string `textValue` for the picker item\n */\nfunction normalizeTextValue(item: PickerItem): 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 a picker item to an object form.\n * @param itemOrSection item to normalize\n * @returns NormalizedPickerItem object\n */\nfunction normalizePickerItem(\n  itemOrSection: PickerItemOrSection\n): NormalizedPickerItem | NormalizedPickerSection {\n  if (!isPickerItemOrSection(itemOrSection)) {\n    log.debug(INVALID_PICKER_ITEM_ERROR_MESSAGE, itemOrSection);\n    throw new Error(INVALID_PICKER_ITEM_ERROR_MESSAGE);\n  }\n\n  if (isSectionElement(itemOrSection)) {\n    const key = normalizeItemKey(itemOrSection);\n    const { title } = itemOrSection.props;\n\n    const items = normalizePickerItemList(itemOrSection.props.children).filter(\n      // We don't support nested section elements\n      childItem => !isSectionElement(childItem)\n    ) as NormalizedPickerItem[];\n\n    return {\n      item: { key, title, items },\n    };\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  };\n}\n\n/**\n * Get normalized picker items from a picker item or array of picker items.\n * @param itemsOrSections A picker item or array of picker items\n * @returns An array of normalized picker items\n */\nexport function normalizePickerItemList(\n  itemsOrSections:\n    | PickerItemOrSection\n    | PickerItemOrSection[]\n    | NormalizedPickerItem[]\n): (NormalizedPickerItem | NormalizedPickerSection)[] {\n  // If already normalized, just return as-is\n  if (isNormalizedItemsWithKeysList(itemsOrSections)) {\n    return itemsOrSections;\n  }\n\n  const itemsArray = Array.isArray(itemsOrSections)\n    ? itemsOrSections\n    : [itemsOrSections];\n\n  return itemsArray.map(normalizePickerItem);\n}\n\n/**\n * Returns a TooltipOptions object or null if options is false or null.\n * @param options\n * @returns TooltipOptions or null\n */\nexport function normalizeTooltipOptions(\n  options?: boolean | TooltipOptions | null\n): TooltipOptions | null {\n  if (options == null || options === false) {\n    return null;\n  }\n\n  if (options === true) {\n    return { placement: 'right' };\n  }\n\n  return options;\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deephaven/components",
-  "version": "0.70.1-beta.1+b49b5069",
+  "version": "0.70.1-beta.6+bfbf7b12",
   "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.70.1-beta.1+b49b5069",
-    "@deephaven/log": "^0.70.1-beta.1+b49b5069",
-    "@deephaven/react-hooks": "^0.70.1-beta.1+b49b5069",
-    "@deephaven/utils": "^0.70.1-beta.1+b49b5069",
+    "@deephaven/icons": "^0.70.1-beta.6+bfbf7b12",
+    "@deephaven/log": "^0.70.1-beta.6+bfbf7b12",
+    "@deephaven/react-hooks": "^0.70.1-beta.6+bfbf7b12",
+    "@deephaven/utils": "^0.70.1-beta.6+bfbf7b12",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@react-spectrum/theme-default": "^3.5.1",
@@ -54,7 +54,7 @@
     "react-dom": ">=16.8.0"
   },
   "devDependencies": {
-    "@deephaven/mocks": "^0.70.1-beta.1+b49b5069"
+    "@deephaven/mocks": "^0.70.1-beta.6+bfbf7b12"
   },
   "files": [
     "dist",
@@ -68,5 +68,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b49b5069d637ac136578ce839d9fc0416f468adf"
+  "gitHead": "bfbf7b128f0be0a82c7dd33e9023ff7df3f480fc"
 }