@deephaven/jsapi-components 0.74.0 → 0.74.1-alpha-listview-actions.30

package/dist/TableDropdown.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TableDropdown.d.ts","sourceRoot":"","sources":["../src/TableDropdown.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAoBtD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,gGAAgG;IAChG,KAAK,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;IAErB,0GAA0G;IAC1G,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC;IAEvB,wDAAwD;IACxD,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IAEnC,mCAAmC;IACnC,MAAM,CAAC,EAAE,SAAS,MAAM,CAAC,eAAe,EAAE,CAAC;IAE3C,mCAAmC;IACnC,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,sCAAsC;IACtC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,2CAA2C;IAC3C,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,wDAAwD;IACxD,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,CAAC;IAEzC,yCAAyC;IACzC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;GAEG;AACH,wBAAgB,aAAa,CAAC,EAC5B,MAAM,EACN,KAAK,EACL,MAAoB,EACpB,QAAQ,EACR,aAAa,EACb,QAAQ,EACR,SAAS,EACT,WAAgC,EAChC,OAAc,GACf,EAAE,kBAAkB,GAAG,GAAG,CAAC,OAAO,CAuElC;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"TableDropdown.d.ts","sourceRoot":"","sources":["../src/TableDropdown.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAoBtD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,gGAAgG;IAChG,KAAK,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;IAErB,0GAA0G;IAC1G,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC;IAEvB,wDAAwD;IACxD,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IAEnC,mCAAmC;IACnC,MAAM,CAAC,EAAE,SAAS,MAAM,CAAC,eAAe,EAAE,CAAC;IAE3C,mCAAmC;IACnC,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,sCAAsC;IACtC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,2CAA2C;IAC3C,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,wDAAwD;IACxD,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,CAAC;IAEzC,yCAAyC;IACzC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;GAEG;AACH,wBAAgB,aAAa,CAAC,EAC5B,MAAM,EACN,KAAK,EACL,MAAoB,EACpB,QAAQ,EACR,aAAa,EACb,QAAQ,EACR,SAAS,EACT,WAAgC,EAChC,OAAc,GACf,EAAE,kBAAkB,GAAG,GAAG,CAAC,OAAO,CA0ElC;AAED,eAAe,aAAa,CAAC"}

package/dist/TableDropdown.js

@@ -39,7 +39,13 @@ export function TableDropdown(_ref) {
       var {
         detail
       } = event;
-      var newValues = detail.rows.map(row => row.get(tableColumn));
+      // Core JSAPI returns undefined for null table values,
+      // coalesce with null to differentiate null from no selection in the dropdown
+      // https://github.com/deephaven/deephaven-core/issues/5400
+      var newValues = detail.rows.map(row => {
+        var _row$get;
+        return (_row$get = row.get(tableColumn)) !== null && _row$get !== void 0 ? _row$get : null;
+      });
       setValues(newValues);
     });
     return () => {

package/dist/TableDropdown.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableDropdown.js","names":["React","useCallback","useEffect","useMemo","useState","Option","Select","useApi","EMPTY_ARRAY","jsx","_jsx","isJavaObject","value","equals","defaultFormatValue","concat","TableDropdown","_ref","column","table","filter","onChange","selectedValue","disabled","className","formatValue","maxSize","dh","values","setValues","undefined","tableColumn","columns","applyFilter","subscription","setViewport","addEventListener","Table","EVENT_UPDATED","event","detail","newValues","rows","map","row","get","close","allValues","selectedIndex","findIndex","handleChange","newSelectedIndex","children","i"],"sources":["../src/TableDropdown.tsx"],"sourcesContent":["import React, { useCallback, useEffect, useMemo, useState } from 'react';\nimport { Option, Select } from '@deephaven/components';\nimport { useApi } from '@deephaven/jsapi-bootstrap';\nimport { dh as DhType } from '@deephaven/jsapi-types';\nimport { EMPTY_ARRAY } from '@deephaven/utils';\n\ntype JavaObject = {\n  equals: (other: unknown) => boolean;\n};\n\nfunction isJavaObject(value: unknown): value is JavaObject {\n  return (\n    typeof value === 'object' &&\n    value != null &&\n    'equals' in value &&\n    typeof value.equals === 'function'\n  );\n}\n\nfunction defaultFormatValue(value: unknown): string {\n  return `${value}`;\n}\n\nexport type TableDropdownProps = {\n  /** Table to use as the source of data. Does not own the table, does not close it on unmount. */\n  table?: DhType.Table;\n\n  /** Column to read data from the table. Defaults to the first column in the table if it's not provided. */\n  column?: DhType.Column;\n\n  /** Triggered when the dropdown selection has changed */\n  onChange: (value: unknown) => void;\n\n  /** Filter to apply on the table */\n  filter?: readonly DhType.FilterCondition[];\n\n  /** The currently selected value */\n  selectedValue?: unknown;\n\n  /** Whether the control is disabled */\n  disabled?: boolean;\n\n  /** Class to apply to the select element */\n  className?: string;\n\n  /** Optional function to format the value for display */\n  formatValue?: (value: unknown) => string;\n\n  /** Maximum number of elements to load */\n  maxSize?: number;\n};\n\n/**\n * Dropdown that displays the values of a column in a table.\n */\nexport function TableDropdown({\n  column,\n  table,\n  filter = EMPTY_ARRAY,\n  onChange,\n  selectedValue,\n  disabled,\n  className,\n  formatValue = defaultFormatValue,\n  maxSize = 1000,\n}: TableDropdownProps): JSX.Element {\n  const dh = useApi();\n  const [values, setValues] = useState<unknown[]>([]);\n\n  useEffect(() => {\n    if (table == null) {\n      setValues([]);\n      return undefined;\n    }\n\n    const tableColumn = column ?? table.columns[0];\n    // Need to set a viewport on the table and start listening to get the values to populate the dropdown\n    table.applyFilter(filter as DhType.FilterCondition[]);\n    const subscription = table.setViewport(0, maxSize, [tableColumn]);\n\n    subscription.addEventListener(\n      dh.Table.EVENT_UPDATED,\n      (event: CustomEvent<DhType.ViewportData>) => {\n        const { detail } = event;\n        const newValues = detail.rows.map(row => row.get(tableColumn));\n        setValues(newValues);\n      }\n    );\n\n    return () => {\n      subscription.close();\n    };\n  }, [column, dh, filter, maxSize, table]);\n\n  // If the selected value is undefined, add a placeholder item\n  const allValues = useMemo(() => {\n    if (selectedValue === undefined) {\n      return [undefined, ...values];\n    }\n    return values;\n  }, [selectedValue, values]);\n\n  // Since values could be anything, not just strings, track the selected index based on the current data\n  const selectedIndex = useMemo(\n    // eslint-disable-next-line eqeqeq\n    () =>\n      allValues.findIndex(\n        value =>\n          value === selectedValue ||\n          (isJavaObject(value) && value.equals(selectedValue))\n      ),\n    [selectedValue, allValues]\n  );\n\n  const handleChange = useCallback(\n    newSelectedIndex => {\n      onChange(allValues[newSelectedIndex]);\n    },\n    [onChange, allValues]\n  );\n\n  return (\n    <Select\n      className={className}\n      value={selectedIndex}\n      onChange={handleChange}\n      disabled={disabled}\n    >\n      {allValues.map((value, i) => (\n        // eslint-disable-next-line react/no-array-index-key\n        <Option key={`${i}`} value={i}>\n          {formatValue(value)}\n        </Option>\n      ))}\n    </Select>\n  );\n}\n\nexport default TableDropdown;\n"],"mappings":"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"}
+{"version":3,"file":"TableDropdown.js","names":["React","useCallback","useEffect","useMemo","useState","Option","Select","useApi","EMPTY_ARRAY","jsx","_jsx","isJavaObject","value","equals","defaultFormatValue","concat","TableDropdown","_ref","column","table","filter","onChange","selectedValue","disabled","className","formatValue","maxSize","dh","values","setValues","undefined","tableColumn","columns","applyFilter","subscription","setViewport","addEventListener","Table","EVENT_UPDATED","event","detail","newValues","rows","map","row","_row$get","get","close","allValues","selectedIndex","findIndex","handleChange","newSelectedIndex","children","i"],"sources":["../src/TableDropdown.tsx"],"sourcesContent":["import React, { useCallback, useEffect, useMemo, useState } from 'react';\nimport { Option, Select } from '@deephaven/components';\nimport { useApi } from '@deephaven/jsapi-bootstrap';\nimport { dh as DhType } from '@deephaven/jsapi-types';\nimport { EMPTY_ARRAY } from '@deephaven/utils';\n\ntype JavaObject = {\n  equals: (other: unknown) => boolean;\n};\n\nfunction isJavaObject(value: unknown): value is JavaObject {\n  return (\n    typeof value === 'object' &&\n    value != null &&\n    'equals' in value &&\n    typeof value.equals === 'function'\n  );\n}\n\nfunction defaultFormatValue(value: unknown): string {\n  return `${value}`;\n}\n\nexport type TableDropdownProps = {\n  /** Table to use as the source of data. Does not own the table, does not close it on unmount. */\n  table?: DhType.Table;\n\n  /** Column to read data from the table. Defaults to the first column in the table if it's not provided. */\n  column?: DhType.Column;\n\n  /** Triggered when the dropdown selection has changed */\n  onChange: (value: unknown) => void;\n\n  /** Filter to apply on the table */\n  filter?: readonly DhType.FilterCondition[];\n\n  /** The currently selected value */\n  selectedValue?: unknown;\n\n  /** Whether the control is disabled */\n  disabled?: boolean;\n\n  /** Class to apply to the select element */\n  className?: string;\n\n  /** Optional function to format the value for display */\n  formatValue?: (value: unknown) => string;\n\n  /** Maximum number of elements to load */\n  maxSize?: number;\n};\n\n/**\n * Dropdown that displays the values of a column in a table.\n */\nexport function TableDropdown({\n  column,\n  table,\n  filter = EMPTY_ARRAY,\n  onChange,\n  selectedValue,\n  disabled,\n  className,\n  formatValue = defaultFormatValue,\n  maxSize = 1000,\n}: TableDropdownProps): JSX.Element {\n  const dh = useApi();\n  const [values, setValues] = useState<unknown[]>([]);\n\n  useEffect(() => {\n    if (table == null) {\n      setValues([]);\n      return undefined;\n    }\n\n    const tableColumn = column ?? table.columns[0];\n    // Need to set a viewport on the table and start listening to get the values to populate the dropdown\n    table.applyFilter(filter as DhType.FilterCondition[]);\n    const subscription = table.setViewport(0, maxSize, [tableColumn]);\n\n    subscription.addEventListener(\n      dh.Table.EVENT_UPDATED,\n      (event: CustomEvent<DhType.ViewportData>) => {\n        const { detail } = event;\n        // Core JSAPI returns undefined for null table values,\n        // coalesce with null to differentiate null from no selection in the dropdown\n        // https://github.com/deephaven/deephaven-core/issues/5400\n        const newValues = detail.rows.map(row => row.get(tableColumn) ?? null);\n        setValues(newValues);\n      }\n    );\n\n    return () => {\n      subscription.close();\n    };\n  }, [column, dh, filter, maxSize, table]);\n\n  // If the selected value is undefined, add a placeholder item\n  const allValues = useMemo(() => {\n    if (selectedValue === undefined) {\n      return [undefined, ...values];\n    }\n    return values;\n  }, [selectedValue, values]);\n\n  // Since values could be anything, not just strings, track the selected index based on the current data\n  const selectedIndex = useMemo(\n    // eslint-disable-next-line eqeqeq\n    () =>\n      allValues.findIndex(\n        value =>\n          value === selectedValue ||\n          (isJavaObject(value) && value.equals(selectedValue))\n      ),\n    [selectedValue, allValues]\n  );\n\n  const handleChange = useCallback(\n    newSelectedIndex => {\n      onChange(allValues[newSelectedIndex]);\n    },\n    [onChange, allValues]\n  );\n\n  return (\n    <Select\n      className={className}\n      value={selectedIndex}\n      onChange={handleChange}\n      disabled={disabled}\n    >\n      {allValues.map((value, i) => (\n        // eslint-disable-next-line react/no-array-index-key\n        <Option key={`${i}`} value={i}>\n          {formatValue(value)}\n        </Option>\n      ))}\n    </Select>\n  );\n}\n\nexport default TableDropdown;\n"],"mappings":"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"}

package/dist/spectrum/ListView.d.ts

@@ -1,13 +1,14 @@
 /// <reference types="react" />
-import { ListViewProps as ListViewPropsBase } from '@deephaven/components';
+import { ListViewNormalizedProps } from '@deephaven/components';
 import { dh as DhType } from '@deephaven/jsapi-types';
 import { Settings } from '@deephaven/jsapi-utils';
-export interface ListViewProps extends Omit<ListViewPropsBase, 'children'> {
+export interface ListViewProps extends ListViewNormalizedProps {
     table: DhType.Table;
     keyColumn?: string;
     labelColumn?: string;
+    iconColumn?: string;
     settings?: Settings;
 }
-export declare function ListView({ table, keyColumn: keyColumnName, labelColumn: labelColumnName, settings, ...props }: ListViewProps): JSX.Element;
+export declare function ListView({ table, keyColumn: keyColumnName, labelColumn: labelColumnName, iconColumn: iconColumnName, settings, ...props }: ListViewProps): JSX.Element;
 export default ListView;
 //# sourceMappingURL=ListView.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ListView.d.ts","sourceRoot":"","sources":["../../src/spectrum/ListView.tsx"],"names":[],"mappings":";AAAA,OAAO,EAEL,aAAa,IAAI,iBAAiB,EAGnC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAMlD,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,iBAAiB,EAAE,UAAU,CAAC;IACxE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;IAEpB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,WAAW,CAAC,EAAE,MAAM,CAAC;IAIrB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED,wBAAgB,QAAQ,CAAC,EACvB,KAAK,EACL,SAAS,EAAE,aAAa,EACxB,WAAW,EAAE,eAAe,EAC5B,QAAQ,EACR,GAAG,KAAK,EACT,EAAE,aAAa,GAAG,GAAG,CAAC,OAAO,CAgC7B;AAED,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"ListView.d.ts","sourceRoot":"","sources":["../../src/spectrum/ListView.tsx"],"names":[],"mappings":";AAAA,OAAO,EAEL,uBAAuB,EAGxB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAMlD,MAAM,WAAW,aAAc,SAAQ,uBAAuB;IAC5D,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;IAEpB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,WAAW,CAAC,EAAE,MAAM,CAAC;IAGrB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED,wBAAgB,QAAQ,CAAC,EACvB,KAAK,EACL,SAAS,EAAE,aAAa,EACxB,WAAW,EAAE,eAAe,EAC5B,UAAU,EAAE,cAAc,EAC1B,QAAQ,EACR,GAAG,KAAK,EACT,EAAE,aAAa,GAAG,GAAG,CAAC,OAAO,CAiC7B;AAED,eAAe,QAAQ,CAAC"}

package/dist/spectrum/ListView.js

@@ -1,4 +1,4 @@
-var _excluded = ["table", "keyColumn", "labelColumn", "settings"];
+var _excluded = ["table", "keyColumn", "labelColumn", "iconColumn", "settings"];
 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; }
@@ -6,7 +6,7 @@ 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); }
 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; }
-import { ListView as ListViewBase, useSpectrumThemeProvider } from '@deephaven/components';
+import { ListViewNormalized, useSpectrumThemeProvider } from '@deephaven/components';
 import { LIST_VIEW_ROW_HEIGHTS } from '@deephaven/utils';
 import useFormatter from "../useFormatter.js";
 import useViewportData from "../useViewportData.js";
@@ -18,6 +18,7 @@ export function ListView(_ref) {
       table,
       keyColumn: keyColumnName,
       labelColumn: labelColumnName,
+      iconColumn: iconColumnName,
       settings
     } = _ref,
     props = _objectWithoutProperties(_ref, _excluded);
@@ -30,6 +31,7 @@ export function ListView(_ref) {
   } = useFormatter(settings);
   var deserializeRow = useItemRowDeserializer({
     table,
+    iconColumnName,
     keyColumnName,
     labelColumnName,
     formatValue
@@ -43,11 +45,12 @@ export function ListView(_ref) {
     itemHeight,
     deserializeRow
   });
-  return /*#__PURE__*/_jsx(ListViewBase
+  return /*#__PURE__*/_jsx(ListViewNormalized
   // eslint-disable-next-line react/jsx-props-no-spreading
   , _objectSpread(_objectSpread({}, props), {}, {
-    onScroll: onScroll,
-    children: viewportData.items
+    normalizedItems: viewportData.items,
+    showItemIcons: iconColumnName != null,
+    onScroll: onScroll
   }));
 }
 export default ListView;

package/dist/spectrum/ListView.js.map

@@ -1 +1 @@
-{"version":3,"file":"ListView.js","names":["ListView","ListViewBase","useSpectrumThemeProvider","LIST_VIEW_ROW_HEIGHTS","useFormatter","useViewportData","useItemRowDeserializer","jsx","_jsx","_ref","_props$density","table","keyColumn","keyColumnName","labelColumn","labelColumnName","settings","props","_objectWithoutProperties","_excluded","scale","itemHeight","density","getFormattedString","formatValue","deserializeRow","viewportData","onScroll","reuseItemsOnTableResize","_objectSpread","children","items"],"sources":["../../src/spectrum/ListView.tsx"],"sourcesContent":["import {\n  ListView as ListViewBase,\n  ListViewProps as ListViewPropsBase,\n  NormalizedItemData,\n  useSpectrumThemeProvider,\n} from '@deephaven/components';\nimport { dh as DhType } from '@deephaven/jsapi-types';\nimport { Settings } from '@deephaven/jsapi-utils';\nimport { LIST_VIEW_ROW_HEIGHTS } from '@deephaven/utils';\nimport useFormatter from '../useFormatter';\nimport useViewportData from '../useViewportData';\nimport { useItemRowDeserializer } from './utils';\n\nexport interface ListViewProps extends Omit<ListViewPropsBase, 'children'> {\n  table: DhType.Table;\n  /* The column of values to use as item keys. Defaults to the first column. */\n  keyColumn?: string;\n  /* The column of values to display as primary text. Defaults to the `keyColumn` value. */\n  labelColumn?: string;\n\n  // TODO #1890 : descriptionColumn, iconColumn\n\n  settings?: Settings;\n}\n\nexport function ListView({\n  table,\n  keyColumn: keyColumnName,\n  labelColumn: labelColumnName,\n  settings,\n  ...props\n}: ListViewProps): JSX.Element {\n  const { scale } = useSpectrumThemeProvider();\n  const itemHeight = LIST_VIEW_ROW_HEIGHTS[props.density ?? 'regular'][scale];\n\n  const { getFormattedString: formatValue } = useFormatter(settings);\n\n  const deserializeRow = useItemRowDeserializer({\n    table,\n    keyColumnName,\n    labelColumnName,\n    formatValue,\n  });\n\n  const { viewportData, onScroll } = useViewportData<\n    NormalizedItemData,\n    DhType.Table\n  >({\n    reuseItemsOnTableResize: true,\n    table,\n    itemHeight,\n    deserializeRow,\n  });\n\n  return (\n    <ListViewBase\n      // eslint-disable-next-line react/jsx-props-no-spreading\n      {...props}\n      onScroll={onScroll}\n    >\n      {viewportData.items}\n    </ListViewBase>\n  );\n}\n\nexport default ListView;\n"],"mappings":";;;;;;;;AAAA,SACEA,QAAQ,IAAIC,YAAY,EAGxBC,wBAAwB,QACnB,uBAAuB;AAG9B,SAASC,qBAAqB,QAAQ,kBAAkB;AAAC,OAClDC,YAAY;AAAA,OACZC,eAAe;AAAA,SACbC,sBAAsB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAc/B,OAAO,SAASR,QAAQA,CAAAS,IAAA,EAMO;EAAA,IAAAC,cAAA;EAAA,IANN;MACvBC,KAAK;MACLC,SAAS,EAAEC,aAAa;MACxBC,WAAW,EAAEC,eAAe;MAC5BC;IAEa,CAAC,GAAAP,IAAA;IADXQ,KAAK,GAAAC,wBAAA,CAAAT,IAAA,EAAAU,SAAA;EAER,IAAM;IAAEC;EAAM,CAAC,GAAGlB,wBAAwB,CAAC,CAAC;EAC5C,IAAMmB,UAAU,GAAGlB,qBAAqB,EAAAO,cAAA,GAACO,KAAK,CAACK,OAAO,cAAAZ,cAAA,cAAAA,cAAA,GAAI,SAAS,CAAC,CAACU,KAAK,CAAC;EAE3E,IAAM;IAAEG,kBAAkB,EAAEC;EAAY,CAAC,GAAGpB,YAAY,CAACY,QAAQ,CAAC;EAElE,IAAMS,cAAc,GAAGnB,sBAAsB,CAAC;IAC5CK,KAAK;IACLE,aAAa;IACbE,eAAe;IACfS;EACF,CAAC,CAAC;EAEF,IAAM;IAAEE,YAAY;IAAEC;EAAS,CAAC,GAAGtB,eAAe,CAGhD;IACAuB,uBAAuB,EAAE,IAAI;IAC7BjB,KAAK;IACLU,UAAU;IACVI;EACF,CAAC,CAAC;EAEF,oBACEjB,IAAA,CAACP;EACC;EAAA,EAAA4B,aAAA,CAAAA,aAAA,KACIZ,KAAK;IACTU,QAAQ,EAAEA,QAAS;IAAAG,QAAA,EAElBJ,YAAY,CAACK;EAAK,EACP,CAAC;AAEnB;AAEA,eAAe/B,QAAQ"}
+{"version":3,"file":"ListView.js","names":["ListViewNormalized","useSpectrumThemeProvider","LIST_VIEW_ROW_HEIGHTS","useFormatter","useViewportData","useItemRowDeserializer","jsx","_jsx","ListView","_ref","_props$density","table","keyColumn","keyColumnName","labelColumn","labelColumnName","iconColumn","iconColumnName","settings","props","_objectWithoutProperties","_excluded","scale","itemHeight","density","getFormattedString","formatValue","deserializeRow","viewportData","onScroll","reuseItemsOnTableResize","_objectSpread","normalizedItems","items","showItemIcons"],"sources":["../../src/spectrum/ListView.tsx"],"sourcesContent":["import {\n  ListViewNormalized,\n  ListViewNormalizedProps,\n  NormalizedItemData,\n  useSpectrumThemeProvider,\n} from '@deephaven/components';\nimport { dh as DhType } from '@deephaven/jsapi-types';\nimport { Settings } from '@deephaven/jsapi-utils';\nimport { LIST_VIEW_ROW_HEIGHTS } from '@deephaven/utils';\nimport useFormatter from '../useFormatter';\nimport useViewportData from '../useViewportData';\nimport { useItemRowDeserializer } from './utils';\n\nexport interface ListViewProps extends ListViewNormalizedProps {\n  table: DhType.Table;\n  /* The column of values to use as item keys. Defaults to the first column. */\n  keyColumn?: string;\n  /* The column of values to display as primary text. Defaults to the `keyColumn` value. */\n  labelColumn?: string;\n\n  /* The column of values to map to icons. */\n  iconColumn?: string;\n\n  settings?: Settings;\n}\n\nexport function ListView({\n  table,\n  keyColumn: keyColumnName,\n  labelColumn: labelColumnName,\n  iconColumn: iconColumnName,\n  settings,\n  ...props\n}: ListViewProps): JSX.Element {\n  const { scale } = useSpectrumThemeProvider();\n  const itemHeight = LIST_VIEW_ROW_HEIGHTS[props.density ?? 'regular'][scale];\n\n  const { getFormattedString: formatValue } = useFormatter(settings);\n\n  const deserializeRow = useItemRowDeserializer({\n    table,\n    iconColumnName,\n    keyColumnName,\n    labelColumnName,\n    formatValue,\n  });\n\n  const { viewportData, onScroll } = useViewportData<\n    NormalizedItemData,\n    DhType.Table\n  >({\n    reuseItemsOnTableResize: true,\n    table,\n    itemHeight,\n    deserializeRow,\n  });\n\n  return (\n    <ListViewNormalized\n      // eslint-disable-next-line react/jsx-props-no-spreading\n      {...props}\n      normalizedItems={viewportData.items}\n      showItemIcons={iconColumnName != null}\n      onScroll={onScroll}\n    />\n  );\n}\n\nexport default ListView;\n"],"mappings":";;;;;;;;AAAA,SACEA,kBAAkB,EAGlBC,wBAAwB,QACnB,uBAAuB;AAG9B,SAASC,qBAAqB,QAAQ,kBAAkB;AAAC,OAClDC,YAAY;AAAA,OACZC,eAAe;AAAA,SACbC,sBAAsB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAe/B,OAAO,SAASC,QAAQA,CAAAC,IAAA,EAOO;EAAA,IAAAC,cAAA;EAAA,IAPN;MACvBC,KAAK;MACLC,SAAS,EAAEC,aAAa;MACxBC,WAAW,EAAEC,eAAe;MAC5BC,UAAU,EAAEC,cAAc;MAC1BC;IAEa,CAAC,GAAAT,IAAA;IADXU,KAAK,GAAAC,wBAAA,CAAAX,IAAA,EAAAY,SAAA;EAER,IAAM;IAAEC;EAAM,CAAC,GAAGrB,wBAAwB,CAAC,CAAC;EAC5C,IAAMsB,UAAU,GAAGrB,qBAAqB,EAAAQ,cAAA,GAACS,KAAK,CAACK,OAAO,cAAAd,cAAA,cAAAA,cAAA,GAAI,SAAS,CAAC,CAACY,KAAK,CAAC;EAE3E,IAAM;IAAEG,kBAAkB,EAAEC;EAAY,CAAC,GAAGvB,YAAY,CAACe,QAAQ,CAAC;EAElE,IAAMS,cAAc,GAAGtB,sBAAsB,CAAC;IAC5CM,KAAK;IACLM,cAAc;IACdJ,aAAa;IACbE,eAAe;IACfW;EACF,CAAC,CAAC;EAEF,IAAM;IAAEE,YAAY;IAAEC;EAAS,CAAC,GAAGzB,eAAe,CAGhD;IACA0B,uBAAuB,EAAE,IAAI;IAC7BnB,KAAK;IACLY,UAAU;IACVI;EACF,CAAC,CAAC;EAEF,oBACEpB,IAAA,CAACP;EACC;EAAA,EAAA+B,aAAA,CAAAA,aAAA,KACIZ,KAAK;IACTa,eAAe,EAAEJ,YAAY,CAACK,KAAM;IACpCC,aAAa,EAAEjB,cAAc,IAAI,IAAK;IACtCY,QAAQ,EAAEA;EAAS,EACpB,CAAC;AAEN;AAEA,eAAerB,QAAQ"}

package/dist/spectrum/Picker.d.ts

@@ -1,13 +1,14 @@
 /// <reference types="react" />
-import { PickerProps as PickerPropsBase } from '@deephaven/components';
+import { PickerProps as PickerBaseProps } from '@deephaven/components';
 import { dh as DhType } from '@deephaven/jsapi-types';
 import { Settings } from '@deephaven/jsapi-utils';
-export interface PickerProps extends Omit<PickerPropsBase, 'children'> {
+export interface PickerProps extends Omit<PickerBaseProps, 'children'> {
     table: DhType.Table;
     keyColumn?: string;
     labelColumn?: string;
+    iconColumn?: string;
     settings?: Settings;
 }
-export declare function Picker({ table, keyColumn: keyColumnName, labelColumn: labelColumnName, selectedKey, settings, ...props }: PickerProps): JSX.Element;
+export declare function Picker({ table, keyColumn: keyColumnName, labelColumn: labelColumnName, iconColumn: iconColumnName, settings, onChange, onSelectionChange, ...props }: PickerProps): JSX.Element;
 export default Picker;
 //# sourceMappingURL=Picker.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Picker.d.ts","sourceRoot":"","sources":["../../src/spectrum/Picker.tsx"],"names":[],"mappings":";AAAA,OAAO,EAGL,WAAW,IAAI,eAAe,EAC/B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAYlD,MAAM,WAAW,WAAY,SAAQ,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC;IACpE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;IAEpB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,WAAW,CAAC,EAAE,MAAM,CAAC;IAIrB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED,wBAAgB,MAAM,CAAC,EACrB,KAAK,EACL,SAAS,EAAE,aAAa,EACxB,WAAW,EAAE,eAAe,EAC5B,WAAW,EACX,QAAQ,EACR,GAAG,KAAK,EACT,EAAE,WAAW,GAAG,GAAG,CAAC,OAAO,CA6E3B;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"Picker.d.ts","sourceRoot":"","sources":["../../src/spectrum/Picker.tsx"],"names":[],"mappings":";AACA,OAAO,EAOL,WAAW,IAAI,eAAe,EAE/B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAWlD,MAAM,WAAW,WAAY,SAAQ,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC;IACpE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;IAEpB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,WAAW,CAAC,EAAE,MAAM,CAAC;IAGrB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED,wBAAgB,MAAM,CAAC,EACrB,KAAK,EACL,SAAS,EAAE,aAAa,EACxB,WAAW,EAAE,eAAe,EAC5B,UAAU,EAAE,cAAc,EAC1B,QAAQ,EACR,QAAQ,EACR,iBAAiB,EACjB,GAAG,KAAK,EACT,EAAE,WAAW,GAAG,GAAG,CAAC,OAAO,CA0G3B;AAED,eAAe,MAAM,CAAC"}

package/dist/spectrum/Picker.js

@@ -1,4 +1,4 @@
-var _excluded = ["table", "keyColumn", "labelColumn", "selectedKey", "settings"];
+var _excluded = ["table", "keyColumn", "labelColumn", "iconColumn", "settings", "onChange", "onSelectionChange"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -8,10 +8,10 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 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; }
-import { Picker as PickerBase } from '@deephaven/components';
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import { PickerNormalized, useSpectrumThemeProvider } from '@deephaven/components';
 import Log from '@deephaven/log';
-import { PICKER_ITEM_HEIGHT, PICKER_TOP_OFFSET } from '@deephaven/utils';
-import { useCallback, useEffect, useMemo } from 'react';
+import { PICKER_ITEM_HEIGHTS, PICKER_TOP_OFFSET } from '@deephaven/utils';
 import useFormatter from "../useFormatter.js";
 import useGetItemIndexByValue from "../useGetItemIndexByValue.js";
 import { useViewportData } from "../useViewportData.js";
@@ -24,16 +24,28 @@ export function Picker(_ref) {
       table,
       keyColumn: keyColumnName,
       labelColumn: labelColumnName,
-      selectedKey,
-      settings
+      iconColumn: iconColumnName,
+      settings,
+      onChange,
+      onSelectionChange
     } = _ref,
     props = _objectWithoutProperties(_ref, _excluded);
+  var {
+    scale
+  } = useSpectrumThemeProvider();
+  var itemHeight = PICKER_ITEM_HEIGHTS[scale];
   var {
     getFormattedString: formatValue
   } = useFormatter(settings);
+
+  // `null` is a valid value for `selectedKey` in controlled mode, so we check
+  // for explicit `undefined` to identify uncontrolled mode.
+  var isUncontrolled = props.selectedKey === undefined;
+  var [uncontrolledSelectedKey, setUncontrolledSelectedKey] = useState(props.defaultSelectedKey);
   var keyColumn = useMemo(() => getItemKeyColumn(table, keyColumnName), [keyColumnName, table]);
   var deserializeRow = useItemRowDeserializer({
     table,
+    iconColumnName,
     keyColumnName,
     labelColumnName,
     formatValue
@@ -41,15 +53,15 @@ export function Picker(_ref) {
   var getItemIndexByValue = useGetItemIndexByValue({
     table,
     columnName: keyColumn.name,
-    value: selectedKey
+    value: isUncontrolled ? uncontrolledSelectedKey : props.selectedKey
   });
   var getInitialScrollPosition = useCallback( /*#__PURE__*/_asyncToGenerator(function* () {
     var index = yield getItemIndexByValue();
     if (index == null) {
       return null;
     }
-    return index * PICKER_ITEM_HEIGHT + PICKER_TOP_OFFSET;
-  }), [getItemIndexByValue]);
+    return index * itemHeight + PICKER_TOP_OFFSET;
+  }), [getItemIndexByValue, itemHeight]);
   var {
     viewportData,
     onScroll,
@@ -57,9 +69,10 @@ export function Picker(_ref) {
   } = useViewportData({
     reuseItemsOnTableResize: true,
     table,
-    itemHeight: PICKER_ITEM_HEIGHT,
+    itemHeight,
     deserializeRow
   });
+  var normalizedItems = viewportData.items;
   useEffect(
   // Set viewport to include the selected item so that its data will load and
   // the real `key` will be available to show the selection in the UI.
@@ -77,13 +90,23 @@ export function Picker(_ref) {
       isCanceled = true;
     };
   }, [getItemIndexByValue, settings, setViewport]);
-  return /*#__PURE__*/_jsx(PickerBase
+  var onSelectionChangeInternal = useCallback(key => {
+    var _ref3;
+    // If our component is uncontrolled, track the selected key internally
+    // so that we can scroll to the selected item if the user re-opens
+    if (isUncontrolled) {
+      setUncontrolledSelectedKey(key);
+    }
+    (_ref3 = onChange !== null && onChange !== void 0 ? onChange : onSelectionChange) === null || _ref3 === void 0 ? void 0 : _ref3(key);
+  }, [isUncontrolled, onChange, onSelectionChange]);
+  return /*#__PURE__*/_jsx(PickerNormalized
   // eslint-disable-next-line react/jsx-props-no-spreading
   , _objectSpread(_objectSpread({}, props), {}, {
+    normalizedItems: normalizedItems,
+    showItemIcons: iconColumnName != null,
     getInitialScrollPosition: getInitialScrollPosition,
-    selectedKey: selectedKey,
-    onScroll: onScroll,
-    children: viewportData.items
+    onChange: onSelectionChangeInternal,
+    onScroll: onScroll
   }));
 }
 export default Picker;

package/dist/spectrum/Picker.js.map

@@ -1 +1 @@
-{"version":3,"file":"Picker.js","names":["Picker","PickerBase","Log","PICKER_ITEM_HEIGHT","PICKER_TOP_OFFSET","useCallback","useEffect","useMemo","useFormatter","useGetItemIndexByValue","useViewportData","getItemKeyColumn","useItemRowDeserializer","jsx","_jsx","log","module","_ref","table","keyColumn","keyColumnName","labelColumn","labelColumnName","selectedKey","settings","props","_objectWithoutProperties","_excluded","getFormattedString","formatValue","deserializeRow","getItemIndexByValue","columnName","name","value","getInitialScrollPosition","_asyncToGenerator","index","viewportData","onScroll","setViewport","reuseItemsOnTableResize","itemHeight","setViewportFromSelectedKey","isCanceled","then","catch","err","error","_objectSpread","children","items"],"sources":["../../src/spectrum/Picker.tsx"],"sourcesContent":["import {\n  NormalizedItemData,\n  Picker as PickerBase,\n  PickerProps as PickerPropsBase,\n} from '@deephaven/components';\nimport { dh as DhType } from '@deephaven/jsapi-types';\nimport { Settings } from '@deephaven/jsapi-utils';\nimport Log from '@deephaven/log';\nimport { PICKER_ITEM_HEIGHT, PICKER_TOP_OFFSET } from '@deephaven/utils';\nimport { useCallback, useEffect, useMemo } from 'react';\nimport useFormatter from '../useFormatter';\nimport useGetItemIndexByValue from '../useGetItemIndexByValue';\nimport { useViewportData } from '../useViewportData';\nimport { getItemKeyColumn } from './utils/itemUtils';\nimport { useItemRowDeserializer } from './utils/useItemRowDeserializer';\n\nconst log = Log.module('jsapi-components.Picker');\n\nexport interface PickerProps extends Omit<PickerPropsBase, 'children'> {\n  table: DhType.Table;\n  /* The column of values to use as item keys. Defaults to the first column. */\n  keyColumn?: string;\n  /* The column of values to display as primary text. Defaults to the `keyColumn` value. */\n  labelColumn?: string;\n\n  // TODO #1890 : descriptionColumn, iconColumn\n\n  settings?: Settings;\n}\n\nexport function Picker({\n  table,\n  keyColumn: keyColumnName,\n  labelColumn: labelColumnName,\n  selectedKey,\n  settings,\n  ...props\n}: PickerProps): JSX.Element {\n  const { getFormattedString: formatValue } = useFormatter(settings);\n\n  const keyColumn = useMemo(\n    () => getItemKeyColumn(table, keyColumnName),\n    [keyColumnName, table]\n  );\n\n  const deserializeRow = useItemRowDeserializer({\n    table,\n    keyColumnName,\n    labelColumnName,\n    formatValue,\n  });\n\n  const getItemIndexByValue = useGetItemIndexByValue({\n    table,\n    columnName: keyColumn.name,\n    value: selectedKey,\n  });\n\n  const getInitialScrollPosition = useCallback(async () => {\n    const index = await getItemIndexByValue();\n\n    if (index == null) {\n      return null;\n    }\n\n    return index * PICKER_ITEM_HEIGHT + PICKER_TOP_OFFSET;\n  }, [getItemIndexByValue]);\n\n  const { viewportData, onScroll, setViewport } = useViewportData<\n    NormalizedItemData,\n    DhType.Table\n  >({\n    reuseItemsOnTableResize: true,\n    table,\n    itemHeight: PICKER_ITEM_HEIGHT,\n    deserializeRow,\n  });\n\n  useEffect(\n    // Set viewport to include the selected item so that its data will load and\n    // the real `key` will be available to show the selection in the UI.\n    function setViewportFromSelectedKey() {\n      let isCanceled = false;\n\n      getItemIndexByValue()\n        .then(index => {\n          if (index == null || isCanceled) {\n            return;\n          }\n\n          setViewport(index);\n        })\n        .catch(err => {\n          log.error('Error setting viewport from selected key', err);\n        });\n\n      return () => {\n        isCanceled = true;\n      };\n    },\n    [getItemIndexByValue, settings, setViewport]\n  );\n\n  return (\n    <PickerBase\n      // eslint-disable-next-line react/jsx-props-no-spreading\n      {...props}\n      getInitialScrollPosition={getInitialScrollPosition}\n      selectedKey={selectedKey}\n      onScroll={onScroll}\n    >\n      {viewportData.items}\n    </PickerBase>\n  );\n}\n\nexport default Picker;\n"],"mappings":";;;;;;;;;;AAAA,SAEEA,MAAM,IAAIC,UAAU,QAEf,uBAAuB;AAG9B,OAAOC,GAAG,MAAM,gBAAgB;AAChC,SAASC,kBAAkB,EAAEC,iBAAiB,QAAQ,kBAAkB;AACxE,SAASC,WAAW,EAAEC,SAAS,EAAEC,OAAO,QAAQ,OAAO;AAAC,OACjDC,YAAY;AAAA,OACZC,sBAAsB;AAAA,SACpBC,eAAe;AAAA,SACfC,gBAAgB;AAAA,SAChBC,sBAAsB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAE/B,IAAMC,GAAG,GAAGb,GAAG,CAACc,MAAM,CAAC,yBAAyB,CAAC;AAcjD,OAAO,SAAShB,MAAMA,CAAAiB,IAAA,EAOO;EAAA,IAPN;MACrBC,KAAK;MACLC,SAAS,EAAEC,aAAa;MACxBC,WAAW,EAAEC,eAAe;MAC5BC,WAAW;MACXC;IAEW,CAAC,GAAAP,IAAA;IADTQ,KAAK,GAAAC,wBAAA,CAAAT,IAAA,EAAAU,SAAA;EAER,IAAM;IAAEC,kBAAkB,EAAEC;EAAY,CAAC,GAAGrB,YAAY,CAACgB,QAAQ,CAAC;EAElE,IAAML,SAAS,GAAGZ,OAAO,CACvB,MAAMI,gBAAgB,CAACO,KAAK,EAAEE,aAAa,CAAC,EAC5C,CAACA,aAAa,EAAEF,KAAK,CACvB,CAAC;EAED,IAAMY,cAAc,GAAGlB,sBAAsB,CAAC;IAC5CM,KAAK;IACLE,aAAa;IACbE,eAAe;IACfO;EACF,CAAC,CAAC;EAEF,IAAME,mBAAmB,GAAGtB,sBAAsB,CAAC;IACjDS,KAAK;IACLc,UAAU,EAAEb,SAAS,CAACc,IAAI;IAC1BC,KAAK,EAAEX;EACT,CAAC,CAAC;EAEF,IAAMY,wBAAwB,GAAG9B,WAAW,eAAA+B,iBAAA,CAAC,aAAY;IACvD,IAAMC,KAAK,SAASN,mBAAmB,CAAC,CAAC;IAEzC,IAAIM,KAAK,IAAI,IAAI,EAAE;MACjB,OAAO,IAAI;IACb;IAEA,OAAOA,KAAK,GAAGlC,kBAAkB,GAAGC,iBAAiB;EACvD,CAAC,GAAE,CAAC2B,mBAAmB,CAAC,CAAC;EAEzB,IAAM;IAAEO,YAAY;IAAEC,QAAQ;IAAEC;EAAY,CAAC,GAAG9B,eAAe,CAG7D;IACA+B,uBAAuB,EAAE,IAAI;IAC7BvB,KAAK;IACLwB,UAAU,EAAEvC,kBAAkB;IAC9B2B;EACF,CAAC,CAAC;EAEFxB,SAAS;EACP;EACA;EACA,SAASqC,0BAA0BA,CAAA,EAAG;IACpC,IAAIC,UAAU,GAAG,KAAK;IAEtBb,mBAAmB,CAAC,CAAC,CAClBc,IAAI,CAACR,KAAK,IAAI;MACb,IAAIA,KAAK,IAAI,IAAI,IAAIO,UAAU,EAAE;QAC/B;MACF;MAEAJ,WAAW,CAACH,KAAK,CAAC;IACpB,CAAC,CAAC,CACDS,KAAK,CAACC,GAAG,IAAI;MACZhC,GAAG,CAACiC,KAAK,CAAC,0CAA0C,EAAED,GAAG,CAAC;IAC5D,CAAC,CAAC;IAEJ,OAAO,MAAM;MACXH,UAAU,GAAG,IAAI;IACnB,CAAC;EACH,CAAC,EACD,CAACb,mBAAmB,EAAEP,QAAQ,EAAEgB,WAAW,CAC7C,CAAC;EAED,oBACE1B,IAAA,CAACb;EACC;EAAA,EAAAgD,aAAA,CAAAA,aAAA,KACIxB,KAAK;IACTU,wBAAwB,EAAEA,wBAAyB;IACnDZ,WAAW,EAAEA,WAAY;IACzBgB,QAAQ,EAAEA,QAAS;IAAAW,QAAA,EAElBZ,YAAY,CAACa;EAAK,EACT,CAAC;AAEjB;AAEA,eAAenD,MAAM"}
+{"version":3,"file":"Picker.js","names":["useCallback","useEffect","useMemo","useState","PickerNormalized","useSpectrumThemeProvider","Log","PICKER_ITEM_HEIGHTS","PICKER_TOP_OFFSET","useFormatter","useGetItemIndexByValue","useViewportData","getItemKeyColumn","useItemRowDeserializer","jsx","_jsx","log","module","Picker","_ref","table","keyColumn","keyColumnName","labelColumn","labelColumnName","iconColumn","iconColumnName","settings","onChange","onSelectionChange","props","_objectWithoutProperties","_excluded","scale","itemHeight","getFormattedString","formatValue","isUncontrolled","selectedKey","undefined","uncontrolledSelectedKey","setUncontrolledSelectedKey","defaultSelectedKey","deserializeRow","getItemIndexByValue","columnName","name","value","getInitialScrollPosition","_asyncToGenerator","index","viewportData","onScroll","setViewport","reuseItemsOnTableResize","normalizedItems","items","setViewportFromSelectedKey","isCanceled","then","catch","err","error","onSelectionChangeInternal","key","_ref3","_objectSpread","showItemIcons"],"sources":["../../src/spectrum/Picker.tsx"],"sourcesContent":["import { useCallback, useEffect, useMemo, useState } from 'react';\nimport {\n  ItemKey,\n  NormalizedItem,\n  NormalizedItemData,\n  NormalizedSection,\n  NormalizedSectionData,\n  PickerNormalized,\n  PickerProps as PickerBaseProps,\n  useSpectrumThemeProvider,\n} from '@deephaven/components';\nimport { dh as DhType } from '@deephaven/jsapi-types';\nimport { Settings } from '@deephaven/jsapi-utils';\nimport Log from '@deephaven/log';\nimport { PICKER_ITEM_HEIGHTS, PICKER_TOP_OFFSET } from '@deephaven/utils';\nimport useFormatter from '../useFormatter';\nimport useGetItemIndexByValue from '../useGetItemIndexByValue';\nimport { useViewportData } from '../useViewportData';\nimport { getItemKeyColumn } from './utils/itemUtils';\nimport { useItemRowDeserializer } from './utils/useItemRowDeserializer';\n\nconst log = Log.module('jsapi-components.Picker');\n\nexport interface PickerProps extends Omit<PickerBaseProps, 'children'> {\n  table: DhType.Table;\n  /* The column of values to use as item keys. Defaults to the first column. */\n  keyColumn?: string;\n  /* The column of values to display as primary text. Defaults to the `keyColumn` value. */\n  labelColumn?: string;\n\n  /* The column of values to map to icons. */\n  iconColumn?: string;\n\n  settings?: Settings;\n}\n\nexport function Picker({\n  table,\n  keyColumn: keyColumnName,\n  labelColumn: labelColumnName,\n  iconColumn: iconColumnName,\n  settings,\n  onChange,\n  onSelectionChange,\n  ...props\n}: PickerProps): JSX.Element {\n  const { scale } = useSpectrumThemeProvider();\n  const itemHeight = PICKER_ITEM_HEIGHTS[scale];\n\n  const { getFormattedString: formatValue } = useFormatter(settings);\n\n  // `null` is a valid value for `selectedKey` in controlled mode, so we check\n  // for explicit `undefined` to identify uncontrolled mode.\n  const isUncontrolled = props.selectedKey === undefined;\n  const [uncontrolledSelectedKey, setUncontrolledSelectedKey] = useState(\n    props.defaultSelectedKey\n  );\n\n  const keyColumn = useMemo(\n    () => getItemKeyColumn(table, keyColumnName),\n    [keyColumnName, table]\n  );\n\n  const deserializeRow = useItemRowDeserializer({\n    table,\n    iconColumnName,\n    keyColumnName,\n    labelColumnName,\n    formatValue,\n  });\n\n  const getItemIndexByValue = useGetItemIndexByValue({\n    table,\n    columnName: keyColumn.name,\n    value: isUncontrolled ? uncontrolledSelectedKey : props.selectedKey,\n  });\n\n  const getInitialScrollPosition = useCallback(async () => {\n    const index = await getItemIndexByValue();\n\n    if (index == null) {\n      return null;\n    }\n\n    return index * itemHeight + PICKER_TOP_OFFSET;\n  }, [getItemIndexByValue, itemHeight]);\n\n  const { viewportData, onScroll, setViewport } = useViewportData<\n    NormalizedItemData | NormalizedSectionData,\n    DhType.Table\n  >({\n    reuseItemsOnTableResize: true,\n    table,\n    itemHeight,\n    deserializeRow,\n  });\n\n  const normalizedItems = viewportData.items as (\n    | NormalizedItem\n    | NormalizedSection\n  )[];\n\n  useEffect(\n    // Set viewport to include the selected item so that its data will load and\n    // the real `key` will be available to show the selection in the UI.\n    function setViewportFromSelectedKey() {\n      let isCanceled = false;\n\n      getItemIndexByValue()\n        .then(index => {\n          if (index == null || isCanceled) {\n            return;\n          }\n\n          setViewport(index);\n        })\n        .catch(err => {\n          log.error('Error setting viewport from selected key', err);\n        });\n\n      return () => {\n        isCanceled = true;\n      };\n    },\n    [getItemIndexByValue, settings, setViewport]\n  );\n\n  const onSelectionChangeInternal = useCallback(\n    (key: ItemKey): void => {\n      // If our component is uncontrolled, track the selected key internally\n      // so that we can scroll to the selected item if the user re-opens\n      if (isUncontrolled) {\n        setUncontrolledSelectedKey(key);\n      }\n\n      (onChange ?? onSelectionChange)?.(key);\n    },\n    [isUncontrolled, onChange, onSelectionChange]\n  );\n\n  return (\n    <PickerNormalized\n      // eslint-disable-next-line react/jsx-props-no-spreading\n      {...props}\n      normalizedItems={normalizedItems}\n      showItemIcons={iconColumnName != null}\n      getInitialScrollPosition={getInitialScrollPosition}\n      onChange={onSelectionChangeInternal}\n      onScroll={onScroll}\n    />\n  );\n}\n\nexport default Picker;\n"],"mappings":"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"}

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

@@ -3,13 +3,17 @@ import { dh } from '@deephaven/jsapi-types';
 /**
  * Returns a function that deserializes a row into a normalized item data object.
  * @param table The table to get the key and label columns from
+ * @param descriptionColumnName The name of the column to use for description data
+ * @param iconColumnName The name of the column to use for icon data
  * @param keyColumnName The name of the column to use for key data
  * @param labelColumnName The name of the column to use for label data
  * @param formatValue Optional function to format the label value
  * @returns A function that deserializes a row into a normalized item data object
  */
-export declare function useItemRowDeserializer({ table, keyColumnName, labelColumnName, formatValue, }: {
+export declare function useItemRowDeserializer({ table, descriptionColumnName, iconColumnName, keyColumnName, labelColumnName, formatValue, }: {
     table: dh.Table;
+    descriptionColumnName?: string;
+    iconColumnName?: string;
     keyColumnName?: string;
     labelColumnName?: string;
     formatValue?: (value: unknown, columnType: string) => string;

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

@@ -1 +1 @@
-{"version":3,"file":"useItemRowDeserializer.d.ts","sourceRoot":"","sources":["../../../src/spectrum/utils/useItemRowDeserializer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAmB5C;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,EACrC,KAAK,EACL,aAAa,EACb,eAAe,EACf,WAAgC,GACjC,EAAE;IACD,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,KAAK,MAAM,CAAC;CAC9D,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,kBAAkB,CAyBtC;AAED,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"useItemRowDeserializer.d.ts","sourceRoot":"","sources":["../../../src/spectrum/utils/useItemRowDeserializer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAmB5C;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CAAC,EACrC,KAAK,EACL,qBAAqB,EACrB,cAAc,EACd,aAAa,EACb,eAAe,EACf,WAAgC,GACjC,EAAE;IACD,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC;IAChB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,KAAK,MAAM,CAAC;CAC9D,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,kBAAkB,CAgDtC;AAED,eAAe,sBAAsB,CAAC"}

package/dist/spectrum/utils/useItemRowDeserializer.js

@@ -13,6 +13,8 @@ function defaultFormatValue(value, _columnType) {
 /**
  * Returns a function that deserializes a row into a normalized item data object.
  * @param table The table to get the key and label columns from
+ * @param descriptionColumnName The name of the column to use for description data
+ * @param iconColumnName The name of the column to use for icon data
  * @param keyColumnName The name of the column to use for key data
  * @param labelColumnName The name of the column to use for label data
  * @param formatValue Optional function to format the label value
@@ -21,20 +23,29 @@ function defaultFormatValue(value, _columnType) {
 export function useItemRowDeserializer(_ref) {
   var {
     table,
+    descriptionColumnName,
+    iconColumnName,
     keyColumnName,
     labelColumnName,
     formatValue = defaultFormatValue
   } = _ref;
   var keyColumn = useMemo(() => getItemKeyColumn(table, keyColumnName), [keyColumnName, table]);
   var labelColumn = useMemo(() => getItemLabelColumn(table, keyColumn, labelColumnName), [keyColumn, labelColumnName, table]);
+  var descriptionColumn = useMemo(() => descriptionColumnName == null ? null : table.findColumn(descriptionColumnName), [descriptionColumnName, table]);
+  var iconColumn = useMemo(() => iconColumnName == null ? null : table.findColumn(iconColumnName), [iconColumnName, table]);
   var deserializeRow = useCallback(row => {
     var key = defaultFormatKey(row.get(keyColumn));
     var content = formatValue(row.get(labelColumn), labelColumn.type);
+    var description = descriptionColumn == null ? undefined : formatValue(row.get(descriptionColumn), descriptionColumn.type);
+    var icon = iconColumn == null ? undefined : row.get(iconColumn);
     return {
       key,
-      content
+      content,
+      textValue: content,
+      description,
+      icon
     };
-  }, [formatValue, keyColumn, labelColumn]);
+  }, [descriptionColumn, formatValue, iconColumn, keyColumn, labelColumn]);
   return deserializeRow;
 }
 export default useItemRowDeserializer;

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

@@ -1 +1 @@
-{"version":3,"file":"useItemRowDeserializer.js","names":["useCallback","useMemo","getItemKeyColumn","getItemLabelColumn","defaultFormatKey","value","String","defaultFormatValue","_columnType","useItemRowDeserializer","_ref","table","keyColumnName","labelColumnName","formatValue","keyColumn","labelColumn","deserializeRow","row","key","get","content","type"],"sources":["../../../src/spectrum/utils/useItemRowDeserializer.ts"],"sourcesContent":["import { useCallback, useMemo } from 'react';\nimport { NormalizedItemData } from '@deephaven/components';\nimport { dh } from '@deephaven/jsapi-types';\nimport { getItemKeyColumn, getItemLabelColumn } from './itemUtils';\n\nfunction defaultFormatKey(value: unknown): string | number | boolean {\n  if (\n    typeof value === 'string' ||\n    typeof value === 'number' ||\n    typeof value === 'boolean'\n  ) {\n    return value;\n  }\n\n  return String(value);\n}\n\nfunction defaultFormatValue(value: unknown, _columnType: string): string {\n  return String(value);\n}\n\n/**\n * Returns a function that deserializes a row into a normalized item data object.\n * @param table The table to get the key and label columns from\n * @param keyColumnName The name of the column to use for key data\n * @param labelColumnName The name of the column to use for label data\n * @param formatValue Optional function to format the label value\n * @returns A function that deserializes a row into a normalized item data object\n */\nexport function useItemRowDeserializer({\n  table,\n  keyColumnName,\n  labelColumnName,\n  formatValue = defaultFormatValue,\n}: {\n  table: dh.Table;\n  keyColumnName?: string;\n  labelColumnName?: string;\n  formatValue?: (value: unknown, columnType: string) => string;\n}): (row: dh.Row) => NormalizedItemData {\n  const keyColumn = useMemo(\n    () => getItemKeyColumn(table, keyColumnName),\n    [keyColumnName, table]\n  );\n\n  const labelColumn = useMemo(\n    () => getItemLabelColumn(table, keyColumn, labelColumnName),\n    [keyColumn, labelColumnName, table]\n  );\n\n  const deserializeRow = useCallback(\n    (row: dh.Row): NormalizedItemData => {\n      const key = defaultFormatKey(row.get(keyColumn));\n      const content = formatValue(row.get(labelColumn), labelColumn.type);\n\n      return {\n        key,\n        content,\n      };\n    },\n    [formatValue, keyColumn, labelColumn]\n  );\n\n  return deserializeRow;\n}\n\nexport default useItemRowDeserializer;\n"],"mappings":"AAAA,SAASA,WAAW,EAAEC,OAAO,QAAQ,OAAO;AAAC,SAGpCC,gBAAgB,EAAEC,kBAAkB;AAE7C,SAASC,gBAAgBA,CAACC,KAAc,EAA6B;EACnE,IACE,OAAOA,KAAK,KAAK,QAAQ,IACzB,OAAOA,KAAK,KAAK,QAAQ,IACzB,OAAOA,KAAK,KAAK,SAAS,EAC1B;IACA,OAAOA,KAAK;EACd;EAEA,OAAOC,MAAM,CAACD,KAAK,CAAC;AACtB;AAEA,SAASE,kBAAkBA,CAACF,KAAc,EAAEG,WAAmB,EAAU;EACvE,OAAOF,MAAM,CAACD,KAAK,CAAC;AACtB;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASI,sBAAsBA,CAAAC,IAAA,EAUE;EAAA,IAVD;IACrCC,KAAK;IACLC,aAAa;IACbC,eAAe;IACfC,WAAW,GAAGP;EAMhB,CAAC,GAAAG,IAAA;EACC,IAAMK,SAAS,GAAGd,OAAO,CACvB,MAAMC,gBAAgB,CAACS,KAAK,EAAEC,aAAa,CAAC,EAC5C,CAACA,aAAa,EAAED,KAAK,CACvB,CAAC;EAED,IAAMK,WAAW,GAAGf,OAAO,CACzB,MAAME,kBAAkB,CAACQ,KAAK,EAAEI,SAAS,EAAEF,eAAe,CAAC,EAC3D,CAACE,SAAS,EAAEF,eAAe,EAAEF,KAAK,CACpC,CAAC;EAED,IAAMM,cAAc,GAAGjB,WAAW,CAC/BkB,GAAW,IAAyB;IACnC,IAAMC,GAAG,GAAGf,gBAAgB,CAACc,GAAG,CAACE,GAAG,CAACL,SAAS,CAAC,CAAC;IAChD,IAAMM,OAAO,GAAGP,WAAW,CAACI,GAAG,CAACE,GAAG,CAACJ,WAAW,CAAC,EAAEA,WAAW,CAACM,IAAI,CAAC;IAEnE,OAAO;MACLH,GAAG;MACHE;IACF,CAAC;EACH,CAAC,EACD,CAACP,WAAW,EAAEC,SAAS,EAAEC,WAAW,CACtC,CAAC;EAED,OAAOC,cAAc;AACvB;AAEA,eAAeR,sBAAsB"}
+{"version":3,"file":"useItemRowDeserializer.js","names":["useCallback","useMemo","getItemKeyColumn","getItemLabelColumn","defaultFormatKey","value","String","defaultFormatValue","_columnType","useItemRowDeserializer","_ref","table","descriptionColumnName","iconColumnName","keyColumnName","labelColumnName","formatValue","keyColumn","labelColumn","descriptionColumn","findColumn","iconColumn","deserializeRow","row","key","get","content","type","description","undefined","icon","textValue"],"sources":["../../../src/spectrum/utils/useItemRowDeserializer.ts"],"sourcesContent":["import { useCallback, useMemo } from 'react';\nimport { NormalizedItemData } from '@deephaven/components';\nimport { dh } from '@deephaven/jsapi-types';\nimport { getItemKeyColumn, getItemLabelColumn } from './itemUtils';\n\nfunction defaultFormatKey(value: unknown): string | number | boolean {\n  if (\n    typeof value === 'string' ||\n    typeof value === 'number' ||\n    typeof value === 'boolean'\n  ) {\n    return value;\n  }\n\n  return String(value);\n}\n\nfunction defaultFormatValue(value: unknown, _columnType: string): string {\n  return String(value);\n}\n\n/**\n * Returns a function that deserializes a row into a normalized item data object.\n * @param table The table to get the key and label columns from\n * @param descriptionColumnName The name of the column to use for description data\n * @param iconColumnName The name of the column to use for icon data\n * @param keyColumnName The name of the column to use for key data\n * @param labelColumnName The name of the column to use for label data\n * @param formatValue Optional function to format the label value\n * @returns A function that deserializes a row into a normalized item data object\n */\nexport function useItemRowDeserializer({\n  table,\n  descriptionColumnName,\n  iconColumnName,\n  keyColumnName,\n  labelColumnName,\n  formatValue = defaultFormatValue,\n}: {\n  table: dh.Table;\n  descriptionColumnName?: string;\n  iconColumnName?: string;\n  keyColumnName?: string;\n  labelColumnName?: string;\n  formatValue?: (value: unknown, columnType: string) => string;\n}): (row: dh.Row) => NormalizedItemData {\n  const keyColumn = useMemo(\n    () => getItemKeyColumn(table, keyColumnName),\n    [keyColumnName, table]\n  );\n\n  const labelColumn = useMemo(\n    () => getItemLabelColumn(table, keyColumn, labelColumnName),\n    [keyColumn, labelColumnName, table]\n  );\n\n  const descriptionColumn = useMemo(\n    () =>\n      descriptionColumnName == null\n        ? null\n        : table.findColumn(descriptionColumnName),\n    [descriptionColumnName, table]\n  );\n\n  const iconColumn = useMemo(\n    () => (iconColumnName == null ? null : table.findColumn(iconColumnName)),\n    [iconColumnName, table]\n  );\n\n  const deserializeRow = useCallback(\n    (row: dh.Row): NormalizedItemData => {\n      const key = defaultFormatKey(row.get(keyColumn));\n      const content = formatValue(row.get(labelColumn), labelColumn.type);\n\n      const description =\n        descriptionColumn == null\n          ? undefined\n          : formatValue(row.get(descriptionColumn), descriptionColumn.type);\n\n      const icon = iconColumn == null ? undefined : row.get(iconColumn);\n\n      return {\n        key,\n        content,\n        textValue: content,\n        description,\n        icon,\n      };\n    },\n    [descriptionColumn, formatValue, iconColumn, keyColumn, labelColumn]\n  );\n\n  return deserializeRow;\n}\n\nexport default useItemRowDeserializer;\n"],"mappings":"AAAA,SAASA,WAAW,EAAEC,OAAO,QAAQ,OAAO;AAAC,SAGpCC,gBAAgB,EAAEC,kBAAkB;AAE7C,SAASC,gBAAgBA,CAACC,KAAc,EAA6B;EACnE,IACE,OAAOA,KAAK,KAAK,QAAQ,IACzB,OAAOA,KAAK,KAAK,QAAQ,IACzB,OAAOA,KAAK,KAAK,SAAS,EAC1B;IACA,OAAOA,KAAK;EACd;EAEA,OAAOC,MAAM,CAACD,KAAK,CAAC;AACtB;AAEA,SAASE,kBAAkBA,CAACF,KAAc,EAAEG,WAAmB,EAAU;EACvE,OAAOF,MAAM,CAACD,KAAK,CAAC;AACtB;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASI,sBAAsBA,CAAAC,IAAA,EAcE;EAAA,IAdD;IACrCC,KAAK;IACLC,qBAAqB;IACrBC,cAAc;IACdC,aAAa;IACbC,eAAe;IACfC,WAAW,GAAGT;EAQhB,CAAC,GAAAG,IAAA;EACC,IAAMO,SAAS,GAAGhB,OAAO,CACvB,MAAMC,gBAAgB,CAACS,KAAK,EAAEG,aAAa,CAAC,EAC5C,CAACA,aAAa,EAAEH,KAAK,CACvB,CAAC;EAED,IAAMO,WAAW,GAAGjB,OAAO,CACzB,MAAME,kBAAkB,CAACQ,KAAK,EAAEM,SAAS,EAAEF,eAAe,CAAC,EAC3D,CAACE,SAAS,EAAEF,eAAe,EAAEJ,KAAK,CACpC,CAAC;EAED,IAAMQ,iBAAiB,GAAGlB,OAAO,CAC/B,MACEW,qBAAqB,IAAI,IAAI,GACzB,IAAI,GACJD,KAAK,CAACS,UAAU,CAACR,qBAAqB,CAAC,EAC7C,CAACA,qBAAqB,EAAED,KAAK,CAC/B,CAAC;EAED,IAAMU,UAAU,GAAGpB,OAAO,CACxB,MAAOY,cAAc,IAAI,IAAI,GAAG,IAAI,GAAGF,KAAK,CAACS,UAAU,CAACP,cAAc,CAAE,EACxE,CAACA,cAAc,EAAEF,KAAK,CACxB,CAAC;EAED,IAAMW,cAAc,GAAGtB,WAAW,CAC/BuB,GAAW,IAAyB;IACnC,IAAMC,GAAG,GAAGpB,gBAAgB,CAACmB,GAAG,CAACE,GAAG,CAACR,SAAS,CAAC,CAAC;IAChD,IAAMS,OAAO,GAAGV,WAAW,CAACO,GAAG,CAACE,GAAG,CAACP,WAAW,CAAC,EAAEA,WAAW,CAACS,IAAI,CAAC;IAEnE,IAAMC,WAAW,GACfT,iBAAiB,IAAI,IAAI,GACrBU,SAAS,GACTb,WAAW,CAACO,GAAG,CAACE,GAAG,CAACN,iBAAiB,CAAC,EAAEA,iBAAiB,CAACQ,IAAI,CAAC;IAErE,IAAMG,IAAI,GAAGT,UAAU,IAAI,IAAI,GAAGQ,SAAS,GAAGN,GAAG,CAACE,GAAG,CAACJ,UAAU,CAAC;IAEjE,OAAO;MACLG,GAAG;MACHE,OAAO;MACPK,SAAS,EAAEL,OAAO;MAClBE,WAAW;MACXE;IACF,CAAC;EACH,CAAC,EACD,CAACX,iBAAiB,EAAEH,WAAW,EAAEK,UAAU,EAAEJ,SAAS,EAAEC,WAAW,CACrE,CAAC;EAED,OAAOI,cAAc;AACvB;AAEA,eAAeb,sBAAsB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deephaven/jsapi-components",
-  "version": "0.74.0",
+  "version": "0.74.1-alpha-listview-actions.30+d858dda5",
   "description": "Deephaven JSAPI Components",
   "author": "Deephaven Data Labs LLC",
   "license": "Apache-2.0",
@@ -22,13 +22,13 @@
     "build:sass": "sass --embed-sources --load-path=../../node_modules ./src:./dist"
   },
   "dependencies": {
-    "@deephaven/components": "^0.74.0",
-    "@deephaven/jsapi-bootstrap": "^0.74.0",
+    "@deephaven/components": "^0.74.1-alpha-listview-actions.30+d858dda5",
+    "@deephaven/jsapi-bootstrap": "^0.74.1-alpha-listview-actions.30+d858dda5",
     "@deephaven/jsapi-types": "1.0.0-dev0.33.1",
-    "@deephaven/jsapi-utils": "^0.74.0",
-    "@deephaven/log": "^0.74.0",
-    "@deephaven/react-hooks": "^0.74.0",
-    "@deephaven/utils": "^0.74.0",
+    "@deephaven/jsapi-utils": "^0.74.1-alpha-listview-actions.30+d858dda5",
+    "@deephaven/log": "^0.74.1-alpha-listview-actions.30+d858dda5",
+    "@deephaven/react-hooks": "^0.74.1-alpha-listview-actions.30+d858dda5",
+    "@deephaven/utils": "^0.74.1-alpha-listview-actions.30+d858dda5",
     "@types/js-cookie": "^3.0.3",
     "classnames": "^2.3.2",
     "js-cookie": "^3.0.5",
@@ -36,7 +36,7 @@
     "prop-types": "^15.8.1"
   },
   "devDependencies": {
-    "@deephaven/jsapi-shim": "^0.74.0",
+    "@deephaven/jsapi-shim": "^0.74.1-alpha-listview-actions.30+d858dda5",
     "react-test-renderer": "^17.0.2"
   },
   "peerDependencies": {
@@ -51,5 +51,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0dbf17d6c463cb59e4ff4193828fecb346031b3e"
+  "gitHead": "d858dda5e1d1b2b75cd395e615673edbae08728f"
 }