wenay-react2 1.0.19 → 1.0.20

package/lib/common/src/components/Dnd/DraggableOutlineDiv.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useRef, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 const ANIMATION_DURATION = 500; // длительность анимации в мс
 export function DraggableOutlineDiv() {
     const [isDragging, setIsDragging] = useState(false);
@@ -26,6 +26,8 @@ export function DraggableOutlineDiv() {
             timerRef.current = null;
         }
     };
+    useEffect(() => () => { if (timerRef.current)
+        window.clearTimeout(timerRef.current); }, []);
     return (_jsx("div", { className: `draggable-div ${isDragging ? 'outline-animation' : ''} ${animationFinished ? 'outline-complete' : ''}`, onMouseDown: handleMouseDown, onMouseUp: handleMouseUp, onMouseLeave: handleMouseUp, children: "\u0421\u043E\u0434\u0435\u0440\u0436\u0438\u043C\u043E\u0435 \u0434\u0438\u0432\u0430" }));
 }
 ;

package/lib/common/src/components/Dnd/RNDFunc3.js

@@ -356,8 +356,6 @@ export function Drag22({ children, onX, onY, x = 0, y = 0, right = false, last,
             x: posRef.current.x - e.clientX,
             y: posRef.current.y - e.clientY
         };
-        console.log("xxx");
-        console.log(offsetMouse.current.x, posRef.current.x, e.clientX);
         setDraggingMouse(true);
     };
     const handleTouchStart = (e) => {

package/lib/common/src/components/Input.js

@@ -20,10 +20,10 @@ export function InputFileModal({ callback, name, outClick, keyForSave = "InputFi
     return _jsx(ModalWrapper, { outClick: outClick, keyForSave: keyForSave, size: { height: 150, width: 300 }, position: { y: -150, x: -250 }, children: _jsx(InputFile, { callback: callback, name: name }) });
 }
 export function InputFile({ callback, name = "" }) {
-    let file = null;
+    const file = useRef(null);
     return _jsxs("div", { className: "maxSize", style: { padding: 20, }, children: [_jsx("label", { children: name }), _jsx("input", { type: "file", style: { width: "100%" }, onChange: (e) => {
-                    file = e.target.files?.[0] ?? null;
-                } }), _jsx("div", { style: { marginTop: 20 }, className: "msTradeAlt msTradeActive", onClick: () => { callback(file); }, children: "send" })] });
+                    file.current = e.target.files?.[0] ?? null;
+                } }), _jsx("div", { style: { marginTop: 20 }, className: "msTradeAlt msTradeActive", onClick: () => { callback(file.current); }, children: "send" })] });
 }
 export function PageModalFree({ outClick, children, zIndex, size = { height: 150, width: 300 }, keyForSave = "PageModalFree2" }) {
     return _jsx(ModalWrapper, { outClick: outClick, keyForSave: keyForSave, size: size, zIndex: zIndex, children: children });

package/lib/common/src/components/Menu/RightMenu.js

@@ -143,7 +143,12 @@ export function MenuRightApi() {
             render?.(elements);
         },
         delete(array) {
-            array.forEach((e) => elements.splice(elements.indexOf(e), 1));
+            array.forEach((e) => {
+                const i = elements.indexOf(e);
+                if (i !== -1)
+                    elements.splice(i, 1);
+            });
+            render?.([...elements]);
         },
         get() {
             return elements;

package/lib/common/src/components/Menu/StickerMenu.d.ts

@@ -1,5 +1,3 @@
 import React from 'react';
-interface StickerMenuProps {
-}
-declare const StickerMenu: React.FC<StickerMenuProps>;
+declare const StickerMenu: React.FC;
 export default StickerMenu;

package/lib/common/src/components/Modal/LeftModal.js

@@ -13,38 +13,6 @@ function useViewport() {
     }, []);
     return { width };
 }
-// Custom hook for smooth snap scrolling animation
-function useSmoothSnapScroll() {
-    const animationState = useRef({ isAnimating: false });
-    const currentPosition = useRef({ x: 0, y: 0 });
-    const animateTo = async (target, onUpdate, onComplete) => {
-        animationState.current.isAnimating = true;
-        const step = 40;
-        const animate = async () => {
-            if (!animationState.current.isAnimating || currentPosition.current.x === target) {
-                return;
-            }
-            const direction = target > currentPosition.current.x ? 1 : -1;
-            await sleepAsync(10);
-            const nextPosition = currentPosition.current.x + direction * step;
-            if (Math.abs(target - nextPosition) < step) {
-                animationState.current.isAnimating = false;
-                currentPosition.current.x = target;
-                onUpdate(target);
-                onComplete?.();
-                return;
-            }
-            currentPosition.current.x = nextPosition;
-            onUpdate(nextPosition);
-            animate();
-        };
-        await animate();
-    };
-    const stopAnimation = () => {
-        animationState.current.isAnimating = false;
-    };
-    return { animateTo, stopAnimation, currentPosition };
-}
 const MENU_WIDTH_RATIO = 0.8;
 // Main sidebar menu component with snap scrolling behavior
 function SidebarMenuComponent({ y_, x_, api, arr, zIndex }) {
@@ -275,10 +243,10 @@ export function getApiLeftMenu() {
     };
 }
 export const ApiLeftMenu = getApiLeftMenu();
-ApiLeftMenu.setMenu([
-    { button: _jsx("div", { style: { width: 200, height: 50, background: "rgb(92,50,213)" }, children: "1" }), el: () => _jsx("div", { children: "1" }), color: "rgb(92,50,213)" },
-    { button: _jsx("div", { style: { width: 200, height: 50, background: "rgb(98,149,58)" }, children: "2" }), el: () => _jsx("div", { children: "2" }) },
-], "test");
 export function TestLeft333() {
-    return _jsx(ApiLeftMenu.Modal2, { zIndex: 20 });
+    // тест-меню перенесено сюда из уровня модуля — раньше ApiLeftMenu.setMenu(...) выполнялся при импорте и протекал всем потребителям
+    return _jsx(ApiLeftMenu.Modal2, { zIndex: 20, menu: [
+            { button: _jsx("div", { style: { width: 200, height: 50, background: "rgb(92,50,213)" }, children: "1" }), el: () => _jsx("div", { children: "1" }), color: "rgb(92,50,213)" },
+            { button: _jsx("div", { style: { width: 200, height: 50, background: "rgb(98,149,58)" }, children: "2" }), el: () => _jsx("div", { children: "2" }) },
+        ] });
 }

package/lib/common/src/components/Other.js

@@ -6,7 +6,7 @@ export function EditParams2({ onSave, params: paramsDef }) {
         paramsDef().then(e => {
             setParamsD(e);
         });
-    }, [true]);
+    }, []);
     const [paramsD, setParamsD] = useState(null);
     const params = useRef(null);
     return _jsxs("div", { className: "maxSize", children: [paramsD && _jsx(ParametersReact, { params: paramsD, onChange: e => params.current = e }), onSave && _jsx("div", { className: "msTradeActive msTradeAlt", onClick: async () => {
@@ -20,10 +20,10 @@ export function EditParams3({ onSave, params: paramsDef }) {
         paramsDef().then(e => {
             setParams(e);
         });
-    }, [true]);
+    }, []);
     const [params, setParams] = useState(null);
     return _jsxs("div", { className: "maxSize", children: [params && params.map((z, i) => _jsx(ParametersReact, { params: z, onChange: e => {
-                    params[i] = z;
+                    params[i] = e;
                     setParams(params);
                 } }, i)), onSave && _jsx("div", { className: "msTradeActive msTradeAlt", onClick: async () => {
                     params && onSave?.(params);

package/lib/common/src/components/Parameters.js

@@ -8,7 +8,7 @@ export function FButton(name) {
 export function FNameButton(type, name) { return FButton(_jsx("p", { className: "toPTextIndicator", children: (type ? "▼ " : "▶ ") + name })); }
 export function CParameter(props) {
     const [hovered, setHovered] = React.useState(false); // Состояние для отслеживания наведения мышки
-    return (_jsxs("div", { className: "toLine LeftMenuParameters toIndicatorMenuButton", style: { position: "relative" }, children: [_jsx("div", { className: "toLine", style: { width: "auto", ...props.style }, onMouseEnter: () => setHovered(true), onMouseLeave: () => setHovered(false), children: props.name }), _jsx("div", { className: "toLine toRight", style: props.enabled === false ? { opacity: 0.5 } : {}, children: props.children }), hovered && props.commentary?.length && (_jsx("div", { className: "commentary", style: {
+    return (_jsxs("div", { className: "toLine LeftMenuParameters toIndicatorMenuButton", style: { position: "relative" }, children: [_jsx("div", { className: "toLine", style: { width: "auto", ...props.style }, onMouseEnter: () => setHovered(true), onMouseLeave: () => setHovered(false), children: props.name }), _jsx("div", { className: "toLine toRight", style: props.enabled === false ? { opacity: 0.5 } : {}, children: props.children }), hovered && props.commentary && props.commentary.length > 0 && (_jsx("div", { className: "commentary", style: {
                     marginTop: "5px",
                     fontSize: "12px",
                     color: "gray",

package/lib/common/src/components/ParametersEngine.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { deepCloneMutable, isDate, TF, timeLocalToStr_yyyymmdd, timeLocalToStr_yyyymmdd_hhmm, timeLocalToStr_yyyymmdd_hhmmss, timeLocalToStr_yyyymmdd_hhmmss_ms } from "wenay-common2";
-import { setResizeableElement } from "./MyResizeObserver";
+import { setResizeableElement, removeResizeableElement } from "./MyResizeObserver";
 import { CParameter, FNameButton } from "./Parameters";
 import { SetAutoStepForElement } from "../utils";
 function timeToStr(time, step) {
@@ -72,6 +72,7 @@ function InputTime(set, value, range) {
                 }, ref: (ref) => {
                     if (ref) {
                         setResizeableElement(ref);
+                        return () => removeResizeableElement(ref);
                     }
                 } }), _jsx("div", { children: _jsx("input", { type: step % TF.D1.msec == 0 ? "date" : "datetime-local", style: { width: "calc(100% - 13px)", marginTop: 5 }, onInput: (e) => {
                         set(e.currentTarget.value);
@@ -108,6 +109,7 @@ function InputList(set, value, range, rangeLabels) {
         }, ref: (ref) => {
             if (ref) {
                 setResizeableElement(ref);
+                return () => removeResizeableElement(ref);
             }
         }, children: range.map((a, i) => {
             return _jsx("option", { value: toString(a), label: rangeLabels?.at(i) ?? toString(a), children: toString(a) }, toString(a));
@@ -131,6 +133,7 @@ function InputNumber(set, value, range) {
                 }, ref: (ref) => {
                     if (ref) {
                         setResizeableElement(ref);
+                        return () => removeResizeableElement(ref);
                     }
                 } }), _jsx("input", { required: true, className: "toNumberInput inputCan", type: "number", min: min, max: max, step: step, value: val, onInput: (e) => {
                     const target = e.currentTarget;
@@ -175,6 +178,7 @@ function InputListArray(set, values, range, rangeLabels) {
         }, multiple: true, ref: (ref) => {
             if (ref) {
                 setResizeableElement(ref);
+                return () => removeResizeableElement(ref);
             }
         }, children: range.map((a, i) => {
             return _jsx("option", { value: String(a), label: rangeLabels?.at(i) ?? String(a), children: a }, String(a));
@@ -198,14 +202,16 @@ function ParametersBaseReact(data) {
         myParams.current = p;
         Refresh();
     }, [p]);
-    let timeoutId = null;
+    const timeoutId = useRef(null);
+    useEffect(() => () => { if (timeoutId.current != null)
+        clearTimeout(timeoutId.current); }, []);
     function refreshIndicator() {
         data.onChange(myParams.current);
     }
     function refreshIndicatorDelayed() {
-        if (timeoutId != null)
-            clearTimeout(timeoutId);
-        timeoutId = setTimeout(() => {
+        if (timeoutId.current != null)
+            clearTimeout(timeoutId.current);
+        timeoutId.current = setTimeout(() => {
             refreshIndicator();
         }, 200);
     }

package/lib/common/src/hooks/useAddDownAnyKey.js

@@ -6,7 +6,6 @@ export const KeyDown = {
 export function useAddDownAnyKey() {
     useEffect(() => {
         const func = (ev) => {
-            console.log(ev);
             KeyDown.key = ev.key;
             renderBy(KeyDown);
         };
@@ -14,7 +13,7 @@ export function useAddDownAnyKey() {
         return () => {
             document.removeEventListener("keydown", func);
         };
-    }, [true]);
+    }, []);
 }
 // Backward-compatible name.
 export function addDownAnyKey() {

package/lib/common/src/hooks/useOutside.js

@@ -2,18 +2,20 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useEffect, useRef, useState } from "react";
 export const StyleOtherRow = { display: "flex", flexDirection: "row", flex: "auto 1 1" };
 export const StyleOtherColum = { display: "flex", flexDirection: "column", flex: "auto 0 1" };
-export function useOutside({ outsideClick, ref = useRef(null), status = true }) {
+export function useOutside({ outsideClick, ref, status = true }) {
+    const internalRef = useRef(null); // useRef всегда в теле, не в дефолте параметра — иначе нарушаются Rules of Hooks
+    const r = ref ?? internalRef;
     useEffect(() => {
         if (status) {
             function handleClickOutside(event) {
-                if (ref.current && event.target instanceof Node && !ref.current.contains(event.target))
+                if (r.current && event.target instanceof Node && !r.current.contains(event.target))
                     outsideClick();
             }
             document.addEventListener("mousedown", handleClickOutside);
             return () => document.removeEventListener("mousedown", handleClickOutside);
         }
-    }, [ref, status, outsideClick]);
-    return ref;
+    }, [r, status, outsideClick]);
+    return r;
 }
 export const DivOutsideClick = React.forwardRef(({ children, outsideClick, zIndex, style = {}, status = true, ...other }, forwardedRef) => {
     const style2 = zIndex ? { ...style, zIndex } : style;

package/lib/common/src/logs/logs.js

@@ -39,8 +39,9 @@ export function getLogsApi(setting) {
         } });
     return {
         addLogs(a) {
-            addToArr(datumMiniConst.last, { ...a, num: num++ }, 50);
-            addToArr(datumConst.map.get(a.id) ?? datumConst.map.set(a.id, []).get(a.id), { ...a, num: num++ }, setting.limitPer);
+            const item = { ...a, num: num++ };
+            addToArr(datumMiniConst.last, item, 50);
+            addToArr(datumConst.map.get(a.id) ?? datumConst.map.set(a.id, []).get(a.id), item, setting.limitPer);
             renderBy(datumConst);
             renderBy(datumMiniConst);
         },
@@ -100,7 +101,6 @@ export function PageLogs({ update }) {
     });
     updateBy(datum, () => {
         const data = datum.last[0];
-        console.log({ data });
         if (data) { // data.time timeLocalToStr_yyyymmdd_hhmmss_ms
             apiGrid.current?.api.applyTransactionAsync({
                 add: [
@@ -118,7 +118,7 @@ export function PageLogs({ update }) {
                 field: "time",
                 sort: "desc",
                 width: 50,
-                valueFormatter: (e) => e.value.time ? timeLocalToStr_hhmmss(e.value.time) : e.value.time
+                valueFormatter: (e) => e.value ? timeLocalToStr_hhmmss(e.value) : e.value
             },
             {
                 field: "id",

package/lib/common/src/logs/logs3.js

@@ -204,7 +204,7 @@ export function LogsNotifications() {
                                     border: 0,
                                     height: 1,
                                     margin: 0
-                                } }), _jsx("div", { style: { textAlign: 'right', marginRight: 10 }, children: typeof log.txt === 'object' ? JSON.stringify(log.txt) : log.txt }), _jsx("p", { style: { textAlign: 'right', marginRight: 10 }, children: log.time.toLocaleDateString() })] }, id));
+                                } }), _jsx("div", { style: { textAlign: 'right', marginRight: 10 }, children: typeof log.txt === 'object' ? JSON.stringify(log.txt) : log.txt }), _jsx("p", { style: { textAlign: 'right', marginRight: 10 }, children: new Date(log.time).toLocaleDateString() })] }, id));
                 }) })] }));
 }
 /** -----------------------------

package/lib/common/src/logs/miniLogs.js

@@ -9,7 +9,7 @@ export function MiniLogs({ data, onClick }) {
             field: "time",
             sort: "desc",
             width: 50,
-            valueFormatter: (e) => e.value.time ? timeLocalToStr_hhmmss(e.value.time) : e.value.time
+            valueFormatter: (e) => e.value ? timeLocalToStr_hhmmss(e.value) : e.value
         },
         {
             field: "id",

package/lib/common/src/menu/menu.js

@@ -184,7 +184,7 @@ const MenuItemWrapper = ({ item, index, update, className, isLeftAligned, leftPo
                             } }) }))] })] }));
 };
 export function MenuBase({ coordinate = { x: 0, y: 0, toLeft: false, left: 0 }, data, zIndex, menu, className, menuElement, }) {
-    const [_, forceUpdate] = useState(false);
+    const [, forceUpdate] = useState(false);
     const update = () => forceUpdate((p) => !p);
     const refMenu = useRef(null);
     const dataMemo = useMemo(() => data.filter((e) => e), [data, data.length]);

package/lib/common/src/menu/menuMouse.d.ts

@@ -9,12 +9,13 @@ export declare const mouseMenuApi: {
             clicks: number;
         };
     };
-    ReactMouse: (agr: Parameters<({ children, other, statusOn, onUnClick, zIndex, className }: {
+    ReactMouse: (agr: Parameters<({ children, other, statusOn, onUnClick, onConsume, zIndex, className }: {
         children: React.ReactElement;
         zIndex?: number;
         other?: () => (tMenuReact)[];
         statusOn?: boolean;
         onUnClick?: (e: boolean) => void;
+        onConsume?: () => void;
         className?: (active?: boolean) => string;
     }) => import("react/jsx-runtime").JSX.Element>[0]) => import("react/jsx-runtime").JSX.Element;
     ReactMenu: typeof MenuBase;

package/lib/common/src/menu/menuMouse.js

@@ -11,7 +11,7 @@ function GetMouseMenuApi(data) {
         name,
         get value() { return value; }
     };
-    const map = new Map;
+    const map = new Map();
     function other() {
         if (map.has("only"))
             return map.get("only");
@@ -21,9 +21,7 @@ function GetMouseMenuApi(data) {
     }
     function ReactMouse(agr) {
         const datum = menuMouse.value; //staticGetAdd(menuMouse.name, menuMouse.value
-        return MenuR({ ...(agr ?? {}), other: agr.other ? agr.other : other, statusOn: datum.status, onUnClick: () => {
-                map.clear();
-            } });
+        return MenuR({ ...(agr ?? {}), other: agr.other ? agr.other : other, statusOn: datum.status, onConsume: () => { map.clear(); } });
     }
     return {
         bb, get map() { return map; }, get menuMouse() { return menuMouse; }, ReactMouse, ReactMenu: MenuBase

package/lib/common/src/menu/menuR.d.ts

@@ -6,12 +6,13 @@ export declare function GetMenuR(): {
      * открытие меню.
      */
     bb(b?: boolean): boolean | undefined;
-    MenuR: ({ children, other, statusOn, onUnClick, zIndex, className }: {
+    MenuR: ({ children, other, statusOn, onUnClick, onConsume, zIndex, className }: {
         children: React.ReactElement;
         zIndex?: number;
         other?: () => (tMenuReact)[];
         statusOn?: boolean;
         onUnClick?: (e: boolean) => void;
+        onConsume?: () => void;
         className?: (active?: boolean) => string;
     }) => import("react/jsx-runtime").JSX.Element;
 };

package/lib/common/src/menu/menuR.js

@@ -6,7 +6,7 @@ import { DivOutsideClick } from "../hooks/useOutside";
 export function GetMenuR() {
     let bb = false; // Глобальная переменная, предотвращающая множественное открытие меню (флаг активности)
     // Основной компонент MenuR
-    function MenuR({ children, other = () => [], statusOn = true, onUnClick, zIndex, className }) {
+    function MenuR({ children, other = () => [], statusOn = true, onUnClick, onConsume, zIndex, className }) {
         const data = { x: 0, y: 0 }; // Текущая позиция элемента, где происходит взаимодействие
         const [show, setShow] = React.useState({ status: false });
         useEffect(() => {
@@ -61,9 +61,11 @@ export function GetMenuR() {
                         if (bb)
                             return; // Если меню уже активно, выходим
                         bb = true;
+                        const menu = other().filter(el => el);
+                        onConsume?.();
                         setShow({
                             status: true,
-                            // Устанавливаем координаты меню относительно элемента
+                            menu,
                             coordinate: {
                                 x: e.changedTouches[0].clientX - data.x,
                                 y: e.changedTouches[0].clientY - data.y
@@ -83,7 +85,9 @@ export function GetMenuR() {
                         if (bb)
                             return; // Если меню уже активно, ничего не делаем
                         bb = true;
-                        setShow({ status: true, coordinate: { x: event.clientX - data.x, y: event.clientY - data.y } });
+                        const menu = other().filter(el => el);
+                        onConsume?.();
+                        setShow({ status: true, menu, coordinate: { x: event.clientX - data.x, y: event.clientY - data.y } });
                     }
                 }
             }, children: [children /* Дочерний элемент, внутри которого отслеживаются события */, show.status && statusOn && (
@@ -96,7 +100,7 @@ export function GetMenuR() {
                         setShow({ status: false }); // Скрываем меню
                     }, children: _jsx(MenuBase, { className: className, data: [
                             ...(show.plusMenu ?? []),
-                            ...other().filter(e => e)
+                            ...(show.menu ?? [])
                         ], coordinate: { ...show.coordinate }, zIndex: zIndex }) }))] }));
     }
     return {

package/lib/common/src/myChart/chartEngine/chartEngineReact.js

@@ -314,13 +314,33 @@ export function createRenderer() {
             return;
         const result = [];
         let lastPixX = -1;
+        let minPt = null;
+        let maxPt = null;
+        const flush = () => {
+            if (!minPt || !maxPt)
+                return;
+            const a = minPt.x <= maxPt.x ? minPt : maxPt;
+            const b = a === minPt ? maxPt : minPt;
+            result.push(a);
+            if (b !== a)
+                result.push(b);
+        };
         for (const pt of visible) {
             const px = Math.round(xToPixX(pt.x, transform, panel));
             if (px !== lastPixX) {
-                result.push(pt);
+                flush();
+                minPt = pt;
+                maxPt = pt;
                 lastPixX = px;
             }
+            else {
+                if (pt.y < minPt.y)
+                    minPt = pt;
+                if (pt.y > maxPt.y)
+                    maxPt = pt;
+            }
         }
+        flush();
         if (result.length < 2)
             return;
         ctx.save();
@@ -700,6 +720,8 @@ export function createChartEngine(canvas) {
         resizeObserver = null;
     }
     function attachToContainer(container) {
+        if (resizeObserver)
+            resizeObserver.disconnect();
         containerEl = container;
         resizeObserver = new ResizeObserver((entries) => {
             for (const entry of entries) {

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

@@ -27,19 +27,20 @@ function applyTransactionAsyncUpdate3({ getId, bufTable, option, newData, grid,
         grid.api.applyTransaction({
             add: op.add ? arrNew : [],
             update: op.update ? arr : [],
+            remove: remove,
         });
         return;
     }
-    if (arrNew.length && op.add)
-        grid.api.applyTransaction({ add: arrNew, remove: remove }); // для удаления важно только получить ид
+    // remove применяем один раз и независимо: иначе при пустых add/update удаление терялось, а при обоих — дублировалось
+    if ((arrNew.length && op.add) || remove?.length)
+        grid.api.applyTransaction({ add: (arrNew.length && op.add) ? arrNew : [], remove: remove });
     if (arr.length && op.update)
-        grid.api.applyTransactionAsync({ update: arr, remove: remove });
+        grid.api.applyTransactionAsync({ update: arr });
 }
 // тут нет удаления но эта версия может использовать где то
 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) {
     return {};
 }
@@ -91,13 +92,11 @@ export function applyTransactionAsyncUpdate2(params) {
                 if (existing)
                     toRemove.push(existing);
             });
-            if (newData?.length)
-                applyTransactionAsyncUpdate3({ grid: g, newData, getId, bufTable, option: op, remove: toRemove });
+            if (newData?.length || toRemove.length)
+                applyTransactionAsyncUpdate3({ grid: g, newData: newData ?? [], getId, bufTable, option: op, remove: toRemove });
         }
     }
     else {
-        if (!map.has(bufTable))
-            map.set(bufTable, new Set());
         newData?.forEach(e => {
             const id = getId(e);
             bufTable[id] = { ...(bufTable[id] ?? {}), ...e };

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

@@ -29,7 +29,6 @@ export class CSaveToCache {
 }
 export class CSaveToLocalStorage {
     async set(key, value) {
-        const t = new Response(JSON.stringify(value));
         if (window.localStorage) {
             await localStorage.setItem(key, JSON.stringify(value));
             return true;
@@ -39,8 +38,14 @@ export class CSaveToLocalStorage {
     async get(key) {
         if (window.localStorage) {
             const st = await localStorage.getItem(key);
-            if (st)
-                return JSON.parse(st);
+            if (st) {
+                try {
+                    return JSON.parse(st);
+                }
+                catch {
+                    return null;
+                }
+            }
         }
         return null;
     }

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

@@ -36,7 +36,7 @@ export function deepMergeWithMap(target, source, visited = new Map()) {
     }
     return target;
 }
-const map = new Map;
+const map = new Map();
 export function staticGetAdd(key, def, options = { reversDeep: false }) {
     if (options.deepAutoMerge && !map.get(def)) {
         map.set(def, true);
@@ -53,12 +53,13 @@ export function staticGetAdd(key, def, options = { reversDeep: false }) {
     return t; // Object.assign(def, t) // t //
 }
 export function staticGetById(key, def, id) {
-    const t = map.get(key);
-    const el = { __id: id, data: def };
-    if ((el && el.__id != id) || !el) {
-        return staticGetAdd(key, el, { abs: true }).data;
+    const stored = staticProps.get(key);
+    if (!stored || stored.__id !== id) {
+        const fresh = { __id: id, data: def };
+        staticProps.set(key, fresh);
+        return fresh.data;
     }
-    return el.data;
+    return stored.data;
 }
 export const Cash = CacheFuncMap([
     ["mapResiReact", mapResiReact],

package/lib/common/updateBy.js

@@ -87,103 +87,3 @@ export function useUpdateBy(a, f) {
 export function updateBy(a, f) {
     useUpdateBy(a, f);
 }
-// import {useLayoutEffect, useState} from "react";
-// import {waitRun} from "wenay-common2";
-//
-// type tFunc2 = Map<object, (a?: any) => void>
-// export const map3 = new WeakMap<object, tFunc2>();
-// export const mapWait = new Map<object, ReturnType<typeof waitRun>>();
-//
-//
-// export function renderBy(a: object, ms?: number) {
-//     const t = () => map3.get(a)?.forEach(e=>e(a))
-//     if (ms) {
-//         (mapWait.get(a) || mapWait.set(a, waitRun()).get(a)!)
-//             .refreshAsync(ms, ()=> {
-//                 mapWait.delete(a)
-//                 t()})
-//     }
-//     else t()
-// }
-//
-// export function renderByRevers(a: object, ms?: number, reverse = true) {
-//     const ar: ((a?: any) => void)[] = []
-//     map3.get(a)?.forEach(e=>ar.push(e))
-//     const t = reverse ? () => ar.reverse().forEach(e=>e(a))
-//         : () => ar.forEach(e=>e(a))
-//     if (ms) {
-//         (mapWait.get(a) || mapWait.set(a, waitRun()).get(a)!)
-//             .refreshAsync(ms, ()=> {
-//                 mapWait.delete(a)
-//                 t()})
-//     }
-//     else t()
-// }
-//
-// export function renderByLast(a: object, ms?: number) {
-//     const ar: ((a?: any) => void)[] = []
-//     map3.get(a)?.forEach(e=>ar.push(e))
-//     const t =  () => ar.at(-1)?.()
-//     if (ms) {
-//         (mapWait.get(a) || mapWait.set(a, waitRun()).get(a)!)
-//             .refreshAsync(ms, ()=> {
-//                 mapWait.delete(a)
-//                 t()})
-//     }
-//     else t()
-// }
-//
-// // Главная функция
-// export function useUpdateBy<T extends object>(
-//     a: T,
-//     f?: React.Dispatch<React.SetStateAction<T>> | ((a: T) => void)
-// ) {
-//     const [_, setCounter] = useState(0); // Состояние счётчика для обновлений
-//
-//     // Эффект для работы с объектом и картой
-//     useLayoutEffect(() => {
-//         // Если передан второй аргумент `f`, используем его, иначе создаём default-функцию
-//         const func = f ?? (() => {
-//             setCounter(prev => prev + 1);
-//         });
-//
-//         // Получаем карту из глобальной переменной map3 или создаём новую для объекта `a`
-//         const funcMap = map3.get(a) || map3.set(a, new Map()).get(a)!;
-//         funcMap.set(func, func); // Привязываем функцию обновления к объекту `a`
-//
-//         // Возвращаем функцию очистки (cleanup), чтобы удалить привязки
-//         return () => {
-//             funcMap.delete(func); // Удаляем функцию из карты
-//             if (funcMap.size === 0) {
-//                 map3.delete(a); // Удаляем объект из `map3`, если он больше не нужен
-//             }
-//         };
-//     }, [a, f]); // Указываем зависимости: объект `a` и функция `f`
-// }
-//
-// // Backward-compatible name (hook rules are the same).
-// export function updateBy<T extends object>(
-//     a: T,
-//     f?: React.Dispatch<React.SetStateAction<T>> | ((a: T) => void)
-// ) {
-//     return useUpdateBy(a, f);
-// }
-//
-// // export function updateBy<T extends object>(a: T, f?: React.Dispatch<React.SetStateAction<T>> | ((a: T) => void)) {
-// //     const t = useState(0)
-// //     useLayoutEffect(() => {
-// //         const func = f ?? ((a: T) =>{
-// //             // без особых причин только для первого рендера - необходима два вызова, иначе - вызов не проходит
-// //             if (t[0] == 0) {
-// //                 t[1](t[0]++)
-// //                 // t[1](t[0]++)
-// //             }
-// //             else t[1](t[0]++)
-// //         })
-// //         const r = (map3.get(a) || map3.set(a, new Map()).get(a)!)
-// //         r.set(func, func)
-// //         return ()=> {
-// //             r?.delete(func)
-// //         }
-// //     },[true])
-// // }

package/package.json

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