RELEASING: Releasing 1 package(s)

Releases:
  @warkypublic/oranguru@0.0.16

[skip ci]

CHANGELOG.md

@@ -1,5 +1,11 @@
 # @warkypublic/zustandsyncstore
 
+## 0.0.16
+
+### Patch Changes
+
+- 5e922df: A Few fixes
+
 ## 0.0.15
 
 ### Patch Changes

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@warkypublic/oranguru",
   "author": "Warky Devs",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "type": "module",
   "scripts": {
     "dev": "vite",

src/Gridler/GridlerDataGrid.tsx

@@ -50,6 +50,7 @@ export const GridlerDataGrid = () => {
     headerHeight,
     heightProp,
     mounted,
+    onCellActivated,
     onCellClicked,
     onCellEdited,
     onColumnMoved,
@@ -80,6 +81,7 @@ export const GridlerDataGrid = () => {
     headerHeight: s.headerHeight,
     heightProp: s.height,
     mounted: s.mounted,
+    onCellActivated: s.onCellActivated,
     onCellClicked: s.onCellClicked,
     onCellEdited: s.onCellEdited,
     onColumnMoved: s.onColumnMoved,
@@ -178,6 +180,7 @@ export const GridlerDataGrid = () => {
             gridSelection={_gridSelection}
             headerHeight={headerHeight ?? 32}
             headerIcons={{ sort: SortSprite, sortdown: SortDownSprite, sortup: SortUpSprite }}
+            onCellActivated={onCellActivated}
             onCellClicked={onCellClicked}
             onCellContextMenu={(cell, event) => {
               event.preventDefault();
@@ -219,6 +222,15 @@ export const GridlerDataGrid = () => {
                   rows = rows.hasIndex(y) ? rows : rows.add(y);
                 }
               }
+              if (rows.length === 0) {
+                for (const r of currentSelection?.rows ?? []) {
+                  const validRowID = getRowBuffer ? getRowBuffer(r)?.[keyField] : null;
+                  if (!validRowID) {
+                    continue;
+                  }
+                  rows = rows.hasIndex(r) ? rows : rows.add(r);
+                }
+              }
 
               if (
                 JSON.stringify(currentSelection?.columns) !== JSON.stringify(selection.columns) ||

src/Gridler/components/GridlerStore.tsx

@@ -160,10 +160,11 @@ export interface GridlerState {
   getState: <K extends keyof GridlerStoreState>(key: K) => GridlerStoreState[K];
   hasLocalData: boolean;
   isEmpty: boolean;
-
   loadingData?: boolean;
+
   loadPage: (page: number, clearMode?: 'all' | 'page') => Promise<void>;
   mounted: boolean;
+  onCellActivated: (cell: Item) => void;
   onCellClicked: (cell: Item, event: CellClickedEventArgs) => void;
   onCellEdited: (cell: Item, newVal: EditableGridCell) => void;
   onColumnMoved: (from: number, to: number) => void;
@@ -400,7 +401,7 @@ const { Provider, useStore: useGridlerStore } = createSyncStore<GridlerStoreStat
             );
           })
           .catch((e) => {
-            console.warn('loadPage Error: ', page, e);
+            console.error('loadPage Error: ', page, e);
             state._events.dispatchEvent(
               new CustomEvent('loadPage_error', {
                 detail: { clearMode, error: e, page: pPage, state },
@@ -411,6 +412,17 @@ const { Provider, useStore: useGridlerStore } = createSyncStore<GridlerStoreStat
     },
     maxConcurrency: 1,
     mounted: false,
+    onCellActivated: (cell: Item): void => {
+      const state = get();
+      const [col, row] = cell;
+
+      state._events.dispatchEvent(
+        new CustomEvent('onCellActivated', {
+          detail: { cell, col, row, state },
+        })
+      );
+      state.glideProps?.onCellActivated?.(cell);
+    },
     onCellClicked: (cell: Item, event: CellClickedEventArgs) => {
       const state = get();
       const [col, row] = cell;

src/Gridler/components/RefHandler.tsx

@@ -15,14 +15,16 @@ function _GridlerRefHandler(props: PropsWithChildren, ref: Ref<GridlerRef> | und
       refresh: async (parms?: any) => {
         const refreshCells = getstate('refreshCells');
         const loadPage = getstate('loadPage');
-        loadPage?.(parms?.pageIndex ?? 0, 'all');
-        refreshCells?.();
+        loadPage?.(parms?.pageIndex ?? 0, 'all').then(() => {
+          refreshCells?.();
+        });
       },
       reload: async (parms?: any) => {
         const refreshCells = getstate('refreshCells');
         const loadPage = getstate('loadPage');
-        loadPage?.(parms?.pageIndex ?? 0, 'all');
-        refreshCells?.();
+        loadPage?.(parms?.pageIndex ?? 0, 'all').then(() => {
+          refreshCells?.();
+        });
       },
       reloadRow: async (key: number | string) => {
         const refreshCells = getstate('refreshCells');

src/Gridler/components/adaptors/GlidlerAPIAdaptorForGoLangv2.tsx

@@ -174,9 +174,10 @@ function _GlidlerAPIAdaptorForGoLangv2<T = unknown>(props: GlidlerAPIAdaptorForG
             ...(cv ?? []).filter((f) => f.page !== index),
           ]);
         }
-      } catch (e) {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      } catch (_e) {
         //console.log('APIAdaptorGoLangv2 error', e);
-        addError(`Error: ${e}`, 'api', props.url);
+        //addError(`Error: ${e}`, 'api', props.url);
       }
       setState('loadingData', false);
       return [];

src/Gridler/components/adaptors/GlidlerFormAdaptor.tsx

@@ -14,6 +14,7 @@ import type { GridlerColumn } from '../Column';
 import { type GridlerProps, type GridlerState, useGridlerStore } from '../GridlerStore';
 
 export function GlidlerFormAdaptor(props: {
+  changeOnActiveClick?: boolean;
   descriptionField?: ((data: Record<string, unknown>) => string) | string;
   getMenuItems?: GridlerProps['getMenuItems'];
   onReload?: () => void;
@@ -23,13 +24,36 @@ export function GlidlerFormAdaptor(props: {
   ) => void;
   showDescriptionInMenu?: boolean;
 }) {
-  const [getState, mounted, setState, reload] = useGridlerStore((s) => [
+  const [getState, mounted, setState, reload, _events] = useGridlerStore((s) => [
     s.getState,
     s.mounted,
     s.setState,
     s.reload,
+    s._events,
   ]);
 
+  useEffect(() => {
+    if (mounted && props.changeOnActiveClick) {
+      const evf = (event: CustomEvent<any>) => {
+        const { row, state } = event.detail;
+        const getRowBuffer = state.getRowBuffer as (row: number) => Record<string, unknown>;
+        if (getRowBuffer) {
+          const rowData = getRowBuffer(row);
+          if (!rowData) {
+            return;
+          }
+          props.onRequestForm('change', rowData);
+        }
+      };
+      _events?.addEventListener('onCellActivated', evf as any);
+      return () => {
+        if (evf) {
+          _events?.removeEventListener('onCellActivated', evf as any);
+        }
+      };
+    }
+  }, [props.changeOnActiveClick, mounted, _events]);
+
   const getMenuItems = useCallback(
     (
       id: string,

src/Gridler/stories/Examples.goapi.tsx

@@ -126,6 +126,7 @@ export const GridlerGoAPIExampleEventlog = () => {
           url={`${apiUrl}/public/process`}
         />
         <Gridler.FormAdaptor
+          changeOnActiveClick={true}
           descriptionField={'process'}
           onRequestForm={(request, data) => {
             console.log('Form requested', request, data);

src/MantineBetterMenu/MenuRenderer.tsx

@@ -120,7 +120,7 @@ const MenuItemRenderer = ({ children, label, ...props }: MantineBetterMenuInstan
         props.onClick?.(e);
         if (props.onClickAsync) {
           setLoading(true);
-          props.onClickAsync().finally(() => setLoading(false));
+          props.onClickAsync(e).finally(() => setLoading(false));
         }
       }}
       styles={{

src/MantineBetterMenu/Store.tsx

@@ -22,7 +22,7 @@ export interface MantineBetterMenuInstanceItem extends Partial<MenuItemProps> {
   items?: Array<MantineBetterMenuInstanceItem>;
   label?: string;
   onClick?: (e?: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;
-  onClickAsync?: () => Promise<void>;
+  onClickAsync?: (e?: React.MouseEvent<HTMLButtonElement, MouseEvent>) => Promise<void>;
   renderer?:
     | ((props: MantineBetterMenuInstanceItem & Record<string, unknown>) => ReactNode)
     | ReactNode;