wenay-react2 1.0.18 → 1.0.19

package/lib/common/src/utils/applyTransactionAsyncUpdate.d.ts

@@ -25,10 +25,12 @@ type params<T> = CommonParams<T> & ({
     synchronization?: never;
     gridRef?: React.RefObject<GridReadyEvent<T, any> | null | undefined>;
     grid?: GridReadyEvent<T, any> | null | undefined;
+    onlyMemo?: boolean;
 } | ({
     newData?: never;
     removeData?: never;
     synchronization: true;
+    onlyMemo?: never;
 } & ({
     grid: GridReadyEvent<T, any> | null | undefined;
     gridRef?: never;

package/lib/common/src/utils/applyTransactionAsyncUpdate.js

@@ -1,13 +1,15 @@
+// обертка для упрощения работы с гридом через точку памяти
 const optionsDef = {
     update: true,
     add: true,
     updateBuffer: true,
     sync: false,
 };
-export function applyTransactionAsyncUpdate(grid, newData, getId, bufTable, option) {
+function applyTransactionAsyncUpdate3({ getId, bufTable, option, newData, grid, remove }) {
     const op = { ...optionsDef, ...(option ?? {}) };
     if (!grid?.api.getRowNode)
         return;
+    // определяем какие строки надо добавить, а какие только обновить
     const arrNew = [];
     const arr = newData.map(e => {
         const id = getId(e);
@@ -29,9 +31,13 @@ export function applyTransactionAsyncUpdate(grid, newData, getId, bufTable, opti
         return;
     }
     if (arrNew.length && op.add)
-        grid.api.applyTransaction({ add: arrNew });
+        grid.api.applyTransaction({ add: arrNew, remove: remove }); // для удаления важно только получить ид
     if (arr.length && op.update)
-        grid.api.applyTransactionAsync({ update: arr });
+        grid.api.applyTransactionAsync({ update: arr, remove: remove });
+}
+// тут нет удаления но эта версия может использовать где то
+export function applyTransactionAsyncUpdate(grid, newData, getId, bufTable, option) {
+    return applyTransactionAsyncUpdate3({ getId, option, newData, grid, bufTable });
 }
 const map = new WeakMap();
 export function getUpdateTable(grid, newData, getId, bufTable, option) {
@@ -40,16 +46,15 @@ export function getUpdateTable(grid, newData, getId, bufTable, option) {
 function resolveGrid(params) {
     if (params.grid?.api?.getRowNode)
         return params.grid;
-    const ref = ('gridRef' in params) ? params.gridRef : undefined;
-    if (ref?.current?.api?.getRowNode)
-        return ref.current;
+    if (params.gridRef?.current?.api?.getRowNode)
+        return params.gridRef.current;
     return null;
 }
 export function applyTransactionAsyncUpdate2(params) {
-    const { getId, bufTable } = params;
+    const { getId, bufTable, newData, removeData } = params;
     const op = { ...optionsDef, ...(params.option ?? {}) };
     const g = resolveGrid(params);
-    if (g) {
+    if (g && params.onlyMemo != true) {
         if (params.synchronization) {
             // === СИНХРОНИЗАЦИЯ: bufTable — истина ===
             const bufIds = new Set(Object.keys(bufTable));
@@ -78,45 +83,28 @@ export function applyTransactionAsyncUpdate2(params) {
                 });
         }
         else {
-            const newData = 'newData' in params ? params.newData : undefined;
-            const removeData = 'removeData' in params ? params.removeData : undefined;
-            // Сначала удаляем — чтобы async update не конфликтовал
-            if (removeData?.length) {
-                const toRemove = [];
-                removeData.forEach(e => {
-                    const id = getId(e);
-                    delete bufTable[id];
-                    const existing = g.api.getRowNode(id)?.data;
-                    if (existing)
-                        toRemove.push(existing);
-                });
-                if (toRemove.length)
-                    g.api.applyTransaction({ remove: toRemove });
-            }
+            const toRemove = [];
+            removeData?.forEach(e => {
+                const id = getId(e);
+                delete bufTable[id];
+                const existing = g.api.getRowNode(id)?.data;
+                if (existing)
+                    toRemove.push(existing);
+            });
             if (newData?.length)
-                applyTransactionAsyncUpdate(g, newData, getId, bufTable, op);
+                applyTransactionAsyncUpdate3({ grid: g, newData, getId, bufTable, option: op, remove: toRemove });
         }
     }
     else {
-        // === ГРИД НЕ ГОТОВ — работаем только с буфером ===
         if (!map.has(bufTable))
             map.set(bufTable, new Set());
-        const m = map.get(bufTable);
-        const newData = 'newData' in params ? params.newData : undefined;
-        const removeData = 'removeData' in params ? params.removeData : undefined;
-        if (newData)
-            newData.forEach(e => {
-                const id = getId(e);
-                m?.add(id);
-                if (op.updateBuffer)
-                    bufTable[id] = { ...(bufTable[id] ?? {}), ...e };
-            });
-        if (removeData)
-            removeData.forEach(e => {
-                const id = getId(e);
-                m?.delete(id);
-                delete bufTable[id];
-            });
+        newData?.forEach(e => {
+            const id = getId(e);
+            bufTable[id] = { ...(bufTable[id] ?? {}), ...e };
+        });
+        removeData?.forEach(e => {
+            delete bufTable[getId(e)];
+        });
     }
 }
 export function getComparatorGrid(func) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wenay-react2",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "description": "Common react",
   "strict": true,
   "main": "dist/index.js",