@linzjs/step-ag-grid 27.1.0 → 27.2.1

package/dist/src/components/gridForm/GridFormDropDown.d.ts

@@ -1,18 +1,19 @@
 import { ReactElement } from 'react';
 import { GridBaseRow } from '../Grid';
 import { CellEditorCommon } from '../GridCell';
-export interface GridPopoutEditDropDownSelectedItem<TData extends GridBaseRow, TValue> {
+export interface GridPopoutEditDropDownSelectedItem<TData extends GridBaseRow, TOption> {
     selectedRows: TData[];
     selectedRowIds: TData['id'][];
-    value: TValue;
+    value: TOption;
     subComponentValue?: any;
 }
-interface FinalSelectOption {
-    value: any;
+interface FinalSelectOption<TOptionValue> {
+    value: TOptionValue;
     label?: ReactElement | string;
     disabled?: boolean | string;
     subComponent?: (props: any, ref: any) => any;
 }
+export declare const primitiveToSelectOption: <T>(value: T) => SelectOption<T>;
 export declare const MenuSeparatorString = "_____MENU_SEPARATOR_____";
 export declare const MenuSeparator: Readonly<{
     value: "_____MENU_SEPARATOR_____";
@@ -22,17 +23,18 @@ export declare const MenuHeaderItem: (title: string) => {
     label: string;
     value: string;
 };
-export type SelectOption = null | string | FinalSelectOption;
-export interface GridFormDropDownProps<TData extends GridBaseRow, TValue = any> extends CellEditorCommon {
+export type SelectOption<TOptionValue = any> = FinalSelectOption<TOptionValue>;
+export type MaybePromise<T> = T | Promise<T>;
+export interface GridFormDropDownProps<TData extends GridBaseRow, TOptionValue> extends CellEditorCommon {
     className?: 'GridPopoverEditDropDown-containerSmall' | 'GridPopoverEditDropDown-containerMedium' | 'GridPopoverEditDropDown-containerLarge' | 'GridPopoverEditDropDown-containerUnlimited' | 'GridPopoverEditDropDown-containerAutoWidth' | string | undefined;
     filtered?: 'local' | 'reload';
     filterDefaultValue?: string;
     filterPlaceholder?: string;
     filterHelpText?: string;
     noOptionsMessage?: string;
-    onSelectedItem?: (props: GridPopoutEditDropDownSelectedItem<TData, TValue>) => Promise<void> | void;
-    onSelectFilter?: (props: GridPopoutEditDropDownSelectedItem<TData, TValue>) => Promise<void> | void;
-    options: SelectOption[] | ((selectedRows: TData[], filter?: string) => Promise<SelectOption[] | undefined> | SelectOption[] | undefined) | undefined;
+    onSelectedItem?: (props: GridPopoutEditDropDownSelectedItem<TData, TOptionValue>) => Promise<void> | void;
+    onSelectFilter?: (props: GridPopoutEditDropDownSelectedItem<TData, TOptionValue>) => Promise<void> | void;
+    options: FinalSelectOption<TOptionValue>[] | ((selectedRows: TData[], filter?: string) => MaybePromise<FinalSelectOption<TOptionValue>[] | undefined>) | undefined;
 }
-export declare const GridFormDropDown: <TData extends GridBaseRow, TValue>(props: GridFormDropDownProps<TData, TValue>) => import("react/jsx-runtime").JSX.Element;
+export declare const GridFormDropDown: <TData extends GridBaseRow, TOptionValue>(props: GridFormDropDownProps<TData, TOptionValue>) => import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/src/components/gridPopoverEdit/GridPopoverEditDropDown.d.ts

@@ -2,4 +2,4 @@ import { GridBaseRow } from '../Grid';
 import { ColDefT, GenericCellEditorProps } from '../GridCell';
 import { GridFormDropDownProps } from '../gridForm/GridFormDropDown';
 import { GenericCellColDef } from '../gridRender/GridRenderGenericCell';
-export declare const GridPopoverEditDropDown: <TData extends GridBaseRow, TValue = any>(colDef: GenericCellColDef<TData, TValue>, props: GenericCellEditorProps<GridFormDropDownProps<TData, TValue>>) => ColDefT<TData, TValue>;
+export declare const GridPopoverEditDropDown: <TData extends GridBaseRow, TValue = any, TOptionValue = any>(colDef: GenericCellColDef<TData, TValue>, props: GenericCellEditorProps<GridFormDropDownProps<TData, TOptionValue>>) => ColDefT<TData, TValue>;

package/dist/step-ag-grid.cjs

@@ -2161,7 +2161,7 @@ const ControlledMenuFr = ({ 'aria-label': ariaLabel, className, containerProps,
             block: menuContainerClass,
             modifiers,
             className,
-        }), style: { ...containerProps?.style, position: 'relative' }, ref: containerRef, children: state && (jsxRuntime.jsx(SettingsContext.Provider, { value: settings, children: jsxRuntime.jsx(ItemSettingsContext.Provider, { value: itemSettings, children: jsxRuntime.jsx(EventHandlersContext.Provider, { value: eventHandlers, children: jsxRuntime.jsx(MenuList, { ...restProps, ariaLabel: ariaLabel || 'Menu', externalRef: externalRef, containerRef: containerRef, onClose: onClose, onBlur: () => console.log('blur') }) }) }) })) }));
+        }), style: { ...containerProps?.style, position: 'relative' }, ref: containerRef, children: state && (jsxRuntime.jsx(SettingsContext.Provider, { value: settings, children: jsxRuntime.jsx(ItemSettingsContext.Provider, { value: itemSettings, children: jsxRuntime.jsx(EventHandlersContext.Provider, { value: eventHandlers, children: jsxRuntime.jsx(MenuList, { ...restProps, ariaLabel: ariaLabel || 'Menu', externalRef: externalRef, containerRef: containerRef, onClose: onClose }) }) }) })) }));
     if (portal === true && anchorRef?.current != null) {
         if (hasParentClass('react-menu-inline-test', anchorRef.current)) {
             portal = false;
@@ -3947,6 +3947,12 @@ const useGridPopoverHook = (props) => {
     };
 };
 
+const primitiveToSelectOption = (value) => {
+    return {
+        value: value,
+        label: value ? String(value) : '',
+    };
+};
 const MenuSeparatorString = '_____MENU_SEPARATOR_____';
 const MenuSeparator = Object.freeze({ value: MenuSeparatorString });
 const MenuHeaderString = '_____MENU_HEADER_____';
@@ -3995,14 +4001,7 @@ const GridFormDropDown = (props) => {
                 optionsConf = await optionsConf(selectedRows, filter);
             }
             if (optionsConf !== undefined) {
-                const optionsList = optionsConf?.map((item) => item == null || typeof item === 'string'
-                    ? {
-                        value: item,
-                        label: item,
-                        disabled: false,
-                    }
-                    : item);
-                setOptions(optionsList);
+                setOptions(optionsConf);
             }
         })();
     }, [filter, options, props, selectedRows]);
@@ -4099,7 +4098,7 @@ const GridFormDropDown = (props) => {
                                                     }
                                                 }, onClick: (e) => {
                                                     e.keepOpen = !!item.subComponent;
-                                                }, children: [item.label ?? (item.value == null ? `<${item.value}>` : `${item.value}`), item.subComponent ? '...' : ''] }, `${fieldToString(field)}-${index}`), item.subComponent && selectedItem === item && (jsxRuntime.jsx(FocusableItem, { className: 'LuiDeprecatedForms', children: () => (jsxRuntime.jsx(GridSubComponentContext.Provider, { value: {
+                                                }, children: [item.label ?? (item.value == null ? `<${String(item.value)}>` : `${String(item.value)}`), item.subComponent ? '...' : ''] }, `${fieldToString(field)}-${index}`), item.subComponent && selectedItem === item && (jsxRuntime.jsx(FocusableItem, { className: 'LuiDeprecatedForms', children: () => (jsxRuntime.jsx(GridSubComponentContext.Provider, { value: {
                                                         context: { options },
                                                         data,
                                                         value: subSelectedValue,
@@ -5061,7 +5060,7 @@ const GridContextProvider = (props) => {
         if (!noApiFn) {
             noApiFn = (() => { });
         }
-        return gridApi ? hasApiFn(gridApi) : noApiFn();
+        return gridApi && !gridApi.isDestroyed() ? hasApiFn(gridApi) : noApiFn();
     }, [gridApi]);
     /**
      * Scroll row into view by Id.
@@ -5226,9 +5225,9 @@ const GridContextProvider = (props) => {
                         // as they will start to edit the cell before this stuff has a chance to run
                         colId &&
                             lodashEs.delay(() => {
-                                if (lodashEs.isEmpty(gridApi.getEditingCells()) &&
-                                    (!ifNoCellFocused || gridApi.getFocusedCell() == null) &&
-                                    !gridApi.isDestroyed()) {
+                                if (!gridApi.isDestroyed() &&
+                                    lodashEs.isEmpty(gridApi.getEditingCells()) &&
+                                    (!ifNoCellFocused || gridApi.getFocusedCell() == null)) {
                                     gridApi.setFocusedCell(rowIndex, colId);
                                     // It may be that the first cell is the selection cell, this doesn't exist as a colDef
                                     // so instead, I just try and select it.  If it doesn't exist selection will stay on the
@@ -5333,7 +5332,9 @@ const GridContextProvider = (props) => {
      * Resize columns to fit container
      */
     const sizeColumnsToFit = React.useCallback(() => {
-        gridApi?.sizeColumnsToFit();
+        if (gridApi && !gridApi?.isDestroyed()) {
+            gridApi.sizeColumnsToFit();
+        }
     }, [gridApi]);
     const stopEditing = React.useCallback(() => {
         if (!gridApi || gridApi.isDestroyed()) {
@@ -5480,6 +5481,9 @@ const GridContextProvider = (props) => {
             // I've left them here just in case they are
             // async processes need to refresh their own rows
             // gridApi.refreshCells({ rowNodes: selectedRows as RowNode[], force: true });
+            if (gridApi.isDestroyed()) {
+                return ok;
+            }
             if (ok) {
                 const cell = gridApi.getFocusedCell();
                 if (cell && gridApi.getFocusedCell() == null) {
@@ -5888,6 +5892,7 @@ exports.hasParentClass = hasParentClass;
 exports.isFloat = isFloat;
 exports.isGridCellFiller = isGridCellFiller;
 exports.isNotEmpty = isNotEmpty;
+exports.primitiveToSelectOption = primitiveToSelectOption;
 exports.sanitiseFileName = sanitiseFileName;
 exports.stringByteLengthIsInvalid = stringByteLengthIsInvalid;
 exports.suppressCellKeyboardEvents = suppressCellKeyboardEvents;