@linzjs/step-ag-grid 29.1.4 → 29.1.6

package/dist/src/components/Grid.d.ts

@@ -88,4 +88,4 @@ export interface GridProps<TData extends GridBaseRow = GridBaseRow> {
 /**
  * Wrapper for AgGrid to add commonly used functionality.
  */
-export declare const Grid: <TData extends GridBaseRow = GridBaseRow>({ "data-testid": dataTestId, defaultPostSort, rowSelection, suppressColumnVirtualization, theme, sizeColumns, selectColumnPinned, contextMenuSelectRow, singleClickEdit, rowData, rowHeight, selectable, ...params }: GridProps<TData>) => ReactElement;
+export declare const Grid: <TData extends GridBaseRow = GridBaseRow>({ "data-testid": dataTestId, defaultPostSort, rowSelection, suppressColumnVirtualization, theme, sizeColumns, selectColumnPinned, contextMenuSelectRow, singleClickEdit, rowData, rowHeight, selectable, onCellFocused: paramsOnCellFocused, ...params }: GridProps<TData>) => ReactElement;

package/dist/src/components/GridPopoverHook.d.ts

@@ -10,5 +10,4 @@ export declare const CancelPromise: () => Promise<boolean>;
 export declare const useGridPopoverHook: <TData extends GridBaseRow>({ className, save, invalid, dontSaveOnExternalClick, }: GridPopoverHookProps<TData>) => {
     popoverWrapper: (children: ReactElement) => import("react/jsx-runtime").JSX.Element;
     triggerSave: (reason?: string) => Promise<void>;
-    gridPopoverOpen: boolean;
 };

package/dist/src/contexts/GridContext.d.ts

@@ -11,6 +11,10 @@ export interface AutoSizeColumnsProps {
 export type AutoSizeColumnsResult = {
     width: number;
 } | null;
+export interface StartCellEditingProps {
+    rowId: number;
+    colId: string;
+}
 export interface GridContextType<TData extends GridBaseRow> {
     gridReady: boolean;
     gridRenderState: () => null | 'empty' | 'rows-visible';
@@ -37,10 +41,7 @@ export interface GridContextType<TData extends GridBaseRow> {
     getFirstRowId: () => number;
     autoSizeColumns: (props?: AutoSizeColumnsProps) => AutoSizeColumnsResult;
     sizeColumnsToFit: () => void;
-    startCellEditing: ({ rowId, colId }: {
-        rowId: number;
-        colId: string;
-    }) => Promise<void>;
+    startCellEditing: ({ rowId, colId }: StartCellEditingProps) => Promise<void>;
     resetFocusedCellAfterCellEditing: () => void;
     updatingCells: (props: {
         selectedRows: GridBaseRow[];

package/dist/step-ag-grid.cjs

@@ -2762,7 +2762,7 @@ agGridCommunity.ModuleRegistry.registerModules([agGridCommunity.AllCommunityModu
 /**
  * Wrapper for AgGrid to add commonly used functionality.
  */
-const Grid = ({ 'data-testid': dataTestId, defaultPostSort = true, rowSelection = 'multiple', suppressColumnVirtualization = true, theme = 'ag-theme-step-default', sizeColumns = 'auto', selectColumnPinned = 'left', contextMenuSelectRow = false, singleClickEdit = false, rowData, rowHeight = theme === 'ag-theme-step-default' ? 40 : theme === 'ag-theme-step-compact' ? 36 : 40, selectable, ...params }) => {
+const Grid = ({ 'data-testid': dataTestId, defaultPostSort = true, rowSelection = 'multiple', suppressColumnVirtualization = true, theme = 'ag-theme-step-default', sizeColumns = 'auto', selectColumnPinned = 'left', contextMenuSelectRow = false, singleClickEdit = false, rowData, rowHeight = theme === 'ag-theme-step-default' ? 40 : theme === 'ag-theme-step-compact' ? 36 : 40, selectable, onCellFocused: paramsOnCellFocused, ...params }) => {
     const { gridReady, gridRenderState, setApis, ensureRowVisible, getFirstRowId, selectRowsById, focusByRowById, ensureSelectedRowIsVisible, autoSizeColumns, sizeColumnsToFit, externallySelectedItemsAreInSync, setExternallySelectedItemsAreInSync, isExternalFilterPresent, doesExternalFilterPass, setOnBulkEditingComplete, getColDef, showNoRowsOverlay, prePopupOps, startCellEditing, } = useGridContext();
     const { updatedDep, updatingCols } = React.useContext(GridUpdatingContext);
     const gridDivRef = React.useRef(null);
@@ -3158,7 +3158,7 @@ const Grid = ({ 'data-testid': dataTestId, defaultPostSort = true, rowSelection
         }
     }, [clearHighlightRowClasses]);
     const onCellFocused = React.useCallback((event) => {
-        if (!params.onCellFocused || event.rowIndex == null) {
+        if (!paramsOnCellFocused || event.rowIndex == null) {
             return;
         }
         const api = event.api;
@@ -3172,8 +3172,16 @@ const Grid = ({ 'data-testid': dataTestId, defaultPostSort = true, rowSelection
         if (!colDef || typeof colDef === 'string') {
             return;
         }
-        params.onCellFocused({ colDef, data });
-    }, [params]);
+        // Prevent repeated callbacks to cell focus when it focus didn't change
+        const { sourceEvent } = event;
+        if (sourceEvent) {
+            if (window.__stepaggrid_lastfocuseventtarget === sourceEvent.target) {
+                return;
+            }
+            window.__stepaggrid_lastfocuseventtarget = sourceEvent.target;
+        }
+        paramsOnCellFocused({ colDef, data });
+    }, [paramsOnCellFocused]);
     const onRowDragEnd = React.useCallback((event) => {
         clearHighlightRowClasses();
         gridElementRef.current = undefined;
@@ -3256,7 +3264,7 @@ const Grid = ({ 'data-testid': dataTestId, defaultPostSort = true, rowSelection
                             enableClickSelection: params.enableClickSelection ?? false,
                             mode: rowSelection == 'single' ? 'singleRow' : 'multiRow',
                         }
-                        : undefined, rowHeight: rowHeight, animateRows: params.animateRows ?? false, rowClassRules: params.rowClassRules, getRowId: getRowId, onGridSizeChanged: onGridSizeChanged, suppressColumnVirtualisation: suppressColumnVirtualization, suppressClickEdit: true, onColumnVisible: setInitialContentSize, onRowDataUpdated: onRowDataChanged, onCellFocused: onCellFocused, onCellKeyDown: onCellKeyPress, onCellClicked: onCellClicked, onCellDoubleClicked: onCellDoubleClick, domLayout: params.domLayout, onColumnResized: onColumnResized, defaultColDef: defaultColDef, columnDefs: columnDefsAdjusted, selectionColumnDef: selectionColumnDef, rowData: rowData, postSortRows: params.onRowDragEnd || !defaultPostSort ? undefined : postSortRows, onModelUpdated: onModelUpdated, onGridReady: onGridReady, onSortChanged: ensureSelectedRowIsVisible, quickFilterParser: quickFilterParser, onSelectionChanged: synchroniseExternalStateToGridSelection, onColumnMoved: params.onColumnMoved, noRowsOverlayComponent: noRowsOverlayComponent, alwaysShowVerticalScroll: params.alwaysShowVerticalScroll, isExternalFilterPresent: isExternalFilterPresent, doesExternalFilterPass: doesExternalFilterPass, maintainColumnOrder: true, preventDefaultOnContextMenu: true, onCellContextMenu: gridContextMenu.cellContextMenu, rowDragText: params.rowDragText, onRowDragCancel: clearHighlightRowClasses, onRowDragMove: onRowDragMove, onRowDragEnd: onRowDragEnd, suppressCellFocus: params.suppressCellFocus, pinnedTopRowData: params.pinnedTopRowData, pinnedBottomRowData: params.pinnedBottomRowData, onRowClicked: params.onRowClicked, onRowDoubleClicked: params.onRowDoubleClicked }) })] }));
+                        : undefined, rowHeight: rowHeight, animateRows: params.animateRows ?? false, rowClassRules: params.rowClassRules, getRowId: getRowId, onGridSizeChanged: onGridSizeChanged, suppressColumnVirtualisation: suppressColumnVirtualization, suppressClickEdit: true, onColumnVisible: setInitialContentSize, onRowDataUpdated: onRowDataChanged, onCellFocused: onCellFocused, onCellKeyDown: onCellKeyPress, onCellClicked: onCellClicked, onCellDoubleClicked: onCellDoubleClick, domLayout: params.domLayout, onColumnResized: onColumnResized, defaultColDef: defaultColDef, columnDefs: columnDefsAdjusted, selectionColumnDef: selectionColumnDef, rowData: rowData, postSortRows: params.onRowDragEnd || !defaultPostSort ? undefined : postSortRows, onModelUpdated: onModelUpdated, onGridReady: onGridReady, onSortChanged: ensureSelectedRowIsVisible, quickFilterParser: quickFilterParser, onSelectionChanged: synchroniseExternalStateToGridSelection, onColumnMoved: params.onColumnMoved, noRowsOverlayComponent: noRowsOverlayComponent, alwaysShowVerticalScroll: params.alwaysShowVerticalScroll, isExternalFilterPresent: isExternalFilterPresent, doesExternalFilterPass: doesExternalFilterPass, maintainColumnOrder: true, preventDefaultOnContextMenu: true, onCellContextMenu: gridContextMenu.cellContextMenu, rowDragText: params.rowDragText, onRowDragCancel: clearHighlightRowClasses, onRowDragMove: onRowDragMove, onRowDragEnd: onRowDragEnd, suppressCellFocus: params.suppressCellFocus, pinnedTopRowData: params.pinnedTopRowData, pinnedBottomRowData: params.pinnedBottomRowData, onRowClicked: params.onRowClicked, onRowDoubleClicked: params.onRowDoubleClicked, suppressStartEditOnTab: true }) })] }));
 };
 const quickFilterParser = (filterStr) => {
     // filter is exact matches exactly groups separated by commas
@@ -3401,14 +3409,10 @@ const GridCell = (props, custom) => {
         resizable: true,
         valueSetter: custom?.editor ? blockValueSetter : undefined,
         editable: props.editable ?? !!custom?.editor,
-        ...(custom?.editor
-            ? {
-                cellClassRules: GridCellMultiSelectClassRules,
-                cellEditor: GenericCellEditorComponentWrapper(custom?.editor),
-            }
-            : {
-                cellEditor: CellEditorToBlockEditing,
-            }),
+        ...(custom?.editor && {
+            cellClassRules: GridCellMultiSelectClassRules,
+            cellEditor: GenericCellEditorComponentWrapper(custom?.editor),
+        }),
         suppressKeyboardEvent: suppressCellKeyboardEvents,
         ...(custom?.editorParams
             ? {
@@ -3435,19 +3439,6 @@ const GridCell = (props, custom) => {
         },
     };
 };
-/**
- * Ag-grid will start its own editor if editable is true and there is no cell editor
- * like in the case of a cell that is editable because it triggers a modal.
- * This will block that editor.
- */
-const CellEditorToBlockEditing = ({ stopEditing }) => {
-    React.useEffect(() => {
-        lodashEs.defer(() => {
-            stopEditing();
-        });
-    }, [stopEditing]);
-    return jsxRuntime.jsx(jsxRuntime.Fragment, {});
-};
 const GenericCellEditorComponentWrapper = (editor) => {
     const obj = { editor };
     return React.forwardRef(function GenericCellEditorComponentFr(cellEditorParams, _) {
@@ -4010,7 +4001,6 @@ const useGridPopoverHook = ({ className, save, invalid, dontSaveOnExternalClick,
     return {
         popoverWrapper,
         triggerSave,
-        gridPopoverOpen: isOpen,
     };
 };
 
@@ -4035,7 +4025,7 @@ const GridFormDropDown = (props) => {
     // Save triggers during async action processing which triggers another selectItem(), this ref blocks that
     const [filter, setFilter] = React.useState(props.filterDefaultValue ?? '');
     const [filteredValues, setFilteredValues] = React.useState();
-    const [options, setOptions] = React.useState(null);
+    const [options, setOptions] = React.useState(!!propOptions && typeof propOptions !== 'function' ? propOptions : null);
     const subComponentIsValid = React.useRef(false);
     const subComponentInitialValue = React.useRef(null);
     const [subSelectedValue, setSubSelectedValue] = React.useState(null);
@@ -4102,55 +4092,58 @@ const GridFormDropDown = (props) => {
         selectedRows,
         subSelectedValue,
     ]);
-    const { popoverWrapper, gridPopoverOpen } = useGridPopoverHook({
+    const { popoverWrapper } = useGridPopoverHook({
         className: props.className,
         invalid: () => !options || !!(selectedItem && !subComponentIsValid.current),
         save,
         dontSaveOnExternalClick: true,
     });
     // Load up options list if it's async function
-    const prevIsOpen = usePrevious(gridPopoverOpen);
-    const prevFilter = usePrevious(filter);
     React.useEffect(() => {
-        if ((gridPopoverOpen !== prevIsOpen || filter !== prevFilter) && gridPopoverOpen) {
-            let optionsConf = propOptions;
-            void (async () => {
-                if (typeof optionsConf === 'function') {
-                    optionsConf = await optionsConf(selectedRows, filter);
-                }
-                if (optionsConf !== undefined) {
-                    setOptions(optionsConf);
-                }
-            })();
+        // If options is null then we need to load/reload
+        // Options will be set to null during a reload based filter, or on open popup
+        if (options !== null) {
+            return;
+        }
+        // propOptions is a const list
+        if (typeof propOptions !== 'function') {
+            if (propOptions) {
+                setOptions(propOptions);
+            }
+            return;
         }
-    }, [filter, gridPopoverOpen, options, prevFilter, prevIsOpen, propOptions, selectedRows]);
+        // propOptions is function, probably loading from web
+        void (async () => {
+            const r = await propOptions(selectedRows, filter);
+            setOptions(r ?? []);
+        })();
+    }, [filter, options, propOptions, selectedRows]);
     // Local filtering.
     React.useEffect(() => {
-        if (props.filtered == 'local') {
-            if (options == null)
-                return;
-            setFilteredValues(options
-                .map((option) => {
-                if (option.label != null && typeof option.label !== 'string') {
-                    console.error('Cannot filter non-string labels', option);
-                    return undefined;
-                }
-                return textMatch(option.label || '', filter) ? option : undefined;
-            })
-                .filter((r) => r !== undefined));
+        if (props.filtered !== 'local') {
+            return;
+        }
+        if (options == null) {
+            setFilteredValues([]);
+            return;
         }
+        setFilteredValues(lodashEs.compact(options.map((option) => {
+            if (option.label != null && typeof option.label !== 'string') {
+                console.warn('GridFormDropDown: Cannot filter non-string labels', option);
+                return undefined;
+            }
+            return textMatch(option.label || '', filter) ? option : undefined;
+        })));
     }, [props.filtered, filter, options]);
     const reSearchOnFilterChange = React.useMemo(() => debounce(() => {
         setOptions(null);
     }, 500), []);
-    const previousFilter = React.useRef(filter);
-    // Reload filtering.
+    const previousFilter = usePrevious(filter);
     React.useEffect(() => {
-        if (previousFilter.current != filter && props.filtered == 'reload') {
-            previousFilter.current = filter;
+        if (previousFilter != null && previousFilter != filter && props.filtered === 'reload') {
             void reSearchOnFilterChange();
         }
-    }, [filter, props, reSearchOnFilterChange]);
+    }, [filter, previousFilter, props.filtered, reSearchOnFilterChange]);
     let lastHeader = null;
     let showHeader = null;
     return popoverWrapper(jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [props.filtered && (jsxRuntime.jsxs("div", { className: 'GridFormDropDown-filter', children: [jsxRuntime.jsx(FocusableItem, { className: 'filter-item', onFocus: () => {
@@ -5539,12 +5532,9 @@ const GridContextProvider = (props) => {
             const preRow = gridApi.getFocusedCell();
             // If we don't do this ag-grid will do its own continuation of an edit on tab, we don't want that as
             // we are managing it ourselves
-            gridApi.stopEditing();
-            if (tabDirection === 1) {
-                gridApi.tabToNextCell();
-            }
-            else {
-                gridApi.tabToPreviousCell();
+            const didTab = tabDirection === 1 ? gridApi.tabToNextCell() : gridApi.tabToPreviousCell();
+            if (!didTab) {
+                break;
             }
             if (gridApi.isDestroyed()) {
                 return true;