wenay-react2 1.0.19 → 1.0.21

package/lib/common/api.d.ts

@@ -1,10 +1,22 @@
 import "../style/menuRight.css";
 import "../style/style.css";
+import * as hooksV2 from "./src/hooks";
+import * as dndV2 from "./src/components/Dnd";
+import * as utilsV2 from "./src/utils";
+import * as gridV2 from "./src/grid/agGrid4";
+import * as modalV2 from "./src/components/Modal";
+import * as menuV2 from "./src/menu/menu";
+import * as menuMouseV2 from "./src/menu/menuMouse";
+import * as menuRV2 from "./src/menu/menuR";
+import * as logsV2 from "./src/logs/logs";
+import * as updateByV2 from "./updateBy";
 export * from "./src/styles/styleGrid";
+export * from "./src/styles/tokens";
 export * from "./updateBy";
 export * from "./src/hooks";
 export * from "./src/components/Dnd";
 export * from "./src/utils";
+export * from "./src/grid/agGrid4";
 export * from "./src/components/Buttons";
 export * from "./src/components/MyResizeObserver";
 export * from "./src/components/Other";
@@ -23,3 +35,19 @@ export * from "./src/myChart/1/myChart";
 export * from "./src/myChart/1/myChartTest";
 export * from "./src/myChart/chartEngine/chartEngineReact";
 export declare function test(): number;
+export declare const v2: {
+    readonly hooks: typeof hooksV2;
+    readonly dnd: typeof dndV2;
+    readonly utils: typeof utilsV2;
+    readonly grid: typeof gridV2;
+    readonly modal: typeof modalV2;
+    readonly menu: {
+        readonly mouse: typeof menuMouseV2;
+        readonly rightClick: typeof menuRV2;
+        readonly MenuBase: typeof menuV2.MenuBase;
+        readonly TimeNum: typeof menuV2.TimeNum;
+        readonly MenuElement: typeof menuV2.MenuElement;
+    };
+    readonly logs: typeof logsV2;
+    readonly updateBy: typeof updateByV2;
+};

package/lib/common/api.js

@@ -1,43 +1,68 @@
-// ... existing code ...
 import "../style/menuRight.css";
 import "../style/style.css";
-// 0. СТИЛИ - независимые
+import * as hooksV2 from "./src/hooks";
+import * as dndV2 from "./src/components/Dnd";
+import * as utilsV2 from "./src/utils";
+import * as gridV2 from "./src/grid/agGrid4";
+import * as modalV2 from "./src/components/Modal";
+import * as menuV2 from "./src/menu/menu";
+import * as menuMouseV2 from "./src/menu/menuMouse";
+import * as menuRV2 from "./src/menu/menuR";
+import * as logsV2 from "./src/logs/logs";
+import * as updateByV2 from "./updateBy";
+// 0. STYLES - independent
 export * from "./src/styles/styleGrid";
-// 1. БАЗОВЫЙ СЛОЙ - никаких зависимостей внутри проекта
+export * from "./src/styles/tokens";
+// 1. BASE LAYER - no internal project dependencies
 export * from "./updateBy";
-// 2. ХУКИ - зависят только от updateBy
+// 2. HOOKS - depend only on updateBy
 export * from "./src/hooks";
-// 4. DND компоненты - зависят от updateBy
+// 4. DND components - depend on updateBy
 export * from "./src/components/Dnd";
-// 5. UTILS - теперь зависят от Dnd (mapMemory импортирует ExRNDMap3, mapResiReact)
+// 5. UTILS - now depend on Dnd (mapMemory imports ExRNDMap3, mapResiReact)
 export * from "./src/utils";
-// 6. БАЗОВЫЕ КОМПОНЕНТЫ - зависят от hooks
+// 5b. GRID (agGrid4): core buffer + headless hook + AgGridMy. New path instead of applyTransactionAsyncUpdate
+export * from "./src/grid/agGrid4";
+// 6. BASE COMPONENTS - depend on hooks
 export * from "./src/components/Buttons";
 export * from "./src/components/MyResizeObserver";
 export * from "./src/components/Other";
-// 7. Parameters - зависит от utils
+// 7. Parameters - depends on utils
 export * from "./src/components/Parameters";
-// 8. ParametersEngine - зависит от Parameters и utils
+// 8. ParametersEngine - depends on Parameters and utils
 export * from "./src/components/ParametersEngine";
-// 9. Input - зависит от hooks и Dnd
+// 9. Input - depends on hooks and Dnd
 export * from "./src/components/Input";
-// 10. Modal - зависит от Input и updateBy
+// 10. Modal - depends on Input and updateBy
 export * from "./src/components/Modal";
-// 11. Menu - зависит от hooks, Dnd и Modal
+// 11. Menu - depends on hooks, Dnd, and Modal
 export * from "./src/components/Menu";
-// 12. МЕНЮ - зависят от компонентов
+// 12. MENU - depends on components
 export * from "./src/menu/menu";
 export * from "./src/menu/menuMouse";
 export * from "./src/menu/menuR";
-// 13. ЛОГИ - зависят от utils/mapMemory, menu и components/ParametersEngine
+// 13. LOGS - depend on utils/mapMemory, menu, and components/ParametersEngine
 export * from "./src/logs/logs";
 export * from "./src/logs/logs3";
 export * from "./src/logs/miniLogs";
-// 14. ГРАФИКИ - самый высокий уровень
+// 14. CHARTS - highest level
 export * from "./src/myChart/1/myChart";
 export * from "./src/myChart/1/myChartTest";
 export * from "./src/myChart/chartEngine/chartEngineReact";
 export function test() {
     return 5;
 }
-// ... existing code ...
+export const v2 = {
+    hooks: hooksV2,
+    dnd: dndV2,
+    utils: utilsV2,
+    grid: gridV2,
+    modal: modalV2,
+    menu: {
+        ...menuV2,
+        mouse: menuMouseV2,
+        rightClick: menuRV2,
+    },
+    logs: logsV2,
+    updateBy: updateByV2,
+};

package/lib/common/src/components/Buttons/MiniButton.d.ts

@@ -14,4 +14,5 @@ export declare function MiniButton2({ name, children, statusDef, className }: {
     children: React.ReactElement | (() => React.ReactElement);
     className?: string;
 }): import("react/jsx-runtime").JSX.Element;
+/** @deprecated Use MiniButton2 instead */
 export declare const MiniButton3: typeof MiniButton2;

package/lib/common/src/components/Buttons/MiniButton.js

@@ -8,11 +8,11 @@ export function MiniButton({ name, arr, get, onClick, style }) {
                         const t = data;
                         t[k] = !(t[k] ?? false);
                         onClick(i);
-                    }, children: k }, i)) }) }) });
+                    }, children: k }, k)) }) }) });
 }
 export function MiniButton2({ name, children, statusDef, className = "newButtonSimple" }) {
     const content = typeof children === 'function' ? children() : children;
     return _jsx(Button, { className: className, statusDef: statusDef, button: (e) => _jsx("div", { className: e ? "msTradeAlt msTradeActive" : "msTradeAlt", children: name }), children: content });
 }
-// Deprecated: Use MiniButton2 instead
+/** @deprecated Use MiniButton2 instead */
 export const MiniButton3 = MiniButton2;

package/lib/common/src/components/Dnd/DraggableOutlineDiv.d.ts

@@ -1 +1,2 @@
+/** @deprecated Demo component with hardcoded content; used only by the test SubMenu. Will be removed in a major version. */
 export declare function DraggableOutlineDiv(): import("react/jsx-runtime").JSX.Element;

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

@@ -1,31 +1,34 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useRef, useState } from "react";
-const ANIMATION_DURATION = 500; // длительность анимации в мс
+import { useEffect, useRef, useState } from "react";
+const ANIMATION_DURATION = 500; // animation duration in ms
+/** @deprecated Demo component with hardcoded content; used only by the test SubMenu. Will be removed in a major version. */
 export function DraggableOutlineDiv() {
     const [isDragging, setIsDragging] = useState(false);
     const [animationFinished, setAnimationFinished] = useState(false);
     const timerRef = useRef(null);
     const handleMouseDown = (e) => {
-        // Проверяем, что нажата именно левая кнопка мыши
+        // Check that the left mouse button was pressed
         if (e.button !== 0)
             return;
         setIsDragging(true);
         setAnimationFinished(false);
-        // Запускаем анимацию - по истечении времени флаг animationFinished становится true
+        // Start the animation - after the timeout, animationFinished becomes true
         timerRef.current = window.setTimeout(() => {
-            setAnimationFinished(true); // Анимация завершена – обводка остается
+            setAnimationFinished(true); // Animation is complete - the outline remains
             timerRef.current = null;
         }, ANIMATION_DURATION);
     };
     const handleMouseUp = () => {
         setIsDragging(false);
         setAnimationFinished(false);
-        // Если анимация еще не завершилась, отменяем таймер и убираем обводку
+        // If the animation has not finished yet, cancel the timer and remove the outline
         if (timerRef.current) {
             window.clearTimeout(timerRef.current);
             timerRef.current = null;
         }
     };
-    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" }));
+    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: "Div content" }));
 }
 ;

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

@@ -6,29 +6,40 @@ export function Drag2({ children, onY, onX, x = 0, y = 0, last, onStart, onStop,
     const lastT = useRef(null);
     const [a, setA] = useState(false);
     const [b, setB] = useState(false);
-    const lastD = useRef(last?.current ?? { y: x, x: y });
-    // Обновляем значения `lastD` при изменении `x` или `y`
+    // Default was {y: x, x: y} - coordinates were swapped; fixed (K3, see CHANGELOG/plan)
+    const lastD = useRef(last?.current ?? { x, y });
+    const wasDragging = useRef(false);
+    // callbacks via ref: with them in the effect deps an inline callback from the consumer
+    // resubscribed document listeners and re-fired onStart on every drag tick
+    const callbacksRef = useRef({ onX, onY, onStart, onStop });
+    callbacksRef.current = { onX, onY, onStart, onStop };
+    // Update `lastD` values when `x` or `y` changes
     useLayoutEffect(() => {
         lastD.current.x = x;
         lastD.current.y = y;
     }, [x, y]);
-    // Основная логика обработки событий перемещения
+    // Main movement event handling logic
     useEffect(() => {
         if (!(a || b)) {
-            onStop?.();
+            // onStop only after a real drag - previously it also fired on initial mount
+            if (wasDragging.current) {
+                wasDragging.current = false;
+                callbacksRef.current.onStop?.();
+            }
             return;
         }
+        wasDragging.current = true;
         if (a) {
             const handleMouseMove = (e) => {
-                if (!lastC.current) {
-                    lastC.current = { x: e.clientX, y: e.clientY };
-                }
+                // mousedown always sets lastC before this subscription exists
+                if (!lastC.current)
+                    return;
                 const data = lastC.current;
-                // Вычисляем и обновляем координаты
+                // Calculate and update coordinates
                 lastD.current.x = e.clientX + data.x;
                 lastD.current.y = e.clientY + data.y;
-                onX?.(lastD.current.x);
-                onY?.(lastD.current.y);
+                callbacksRef.current.onX?.(lastD.current.x);
+                callbacksRef.current.onY?.(lastD.current.y);
                 e.stopPropagation();
             };
             const handleMouseUp = () => {
@@ -39,7 +50,7 @@ export function Drag2({ children, onY, onX, x = 0, y = 0, last, onStart, onStop,
             };
             document.body.addEventListener("mousemove", handleMouseMove);
             document.body.addEventListener("mouseup", handleMouseUp);
-            onStart?.();
+            callbacksRef.current.onStart?.();
             return () => {
                 document.body.removeEventListener("mousemove", handleMouseMove);
                 document.body.removeEventListener("mouseup", handleMouseUp);
@@ -53,11 +64,11 @@ export function Drag2({ children, onY, onX, x = 0, y = 0, last, onStart, onStop,
                 const touch = Array.from(e.changedTouches).find((t) => t.identifier === data.id);
                 if (!touch)
                     return;
-                // Вычисляем и обновляем координаты
+                // Calculate and update coordinates
                 lastD.current.x = touch.clientX + data.x;
                 lastD.current.y = touch.clientY + data.y;
-                onX?.(lastD.current.x);
-                onY?.(lastD.current.y);
+                callbacksRef.current.onX?.(lastD.current.x);
+                callbacksRef.current.onY?.(lastD.current.y);
                 e.stopPropagation();
             };
             const handleTouchEnd = (e) => {
@@ -76,14 +87,14 @@ export function Drag2({ children, onY, onX, x = 0, y = 0, last, onStart, onStop,
             };
             document.body.addEventListener("touchmove", handleTouchMove);
             document.body.addEventListener("touchend", handleTouchEnd);
-            onStart?.();
+            callbacksRef.current.onStart?.();
             return () => {
                 document.body.removeEventListener("touchmove", handleTouchMove);
                 document.body.removeEventListener("touchend", handleTouchEnd);
             };
         }
-    }, [a, b, onX, onY, onStart, onStop]);
-    // Создаем элемент для перемещения
+    }, [a, b]);
+    // Create an element for dragging
     return useMemo(() => (_jsx("div", { style: {
             width: "auto",
             height: "auto",

package/lib/common/src/components/Dnd/RNDFunc3.d.ts

@@ -11,11 +11,21 @@ type tRND = {
     position: tPosition;
     size: tSize;
 };
+export type tRndUpdate = {
+    e: MouseEvent | TouchEvent;
+    dir: string;
+    elementRef: HTMLElement;
+    delta: {
+        width: number;
+        height: number;
+    };
+    position: tPosition;
+};
 type tDivRndBase = {
     zIndex?: number;
     disableDragging?: () => boolean;
     keyForSave?: string;
-    onUpdate?: (data: any) => void;
+    onUpdate?: (data: tRndUpdate) => void;
     position?: tPosition;
     size?: tSize;
     moveOnlyHeader?: boolean;
@@ -39,43 +49,43 @@ type tDivRndBase = {
 export declare const ExRNDMap3: Map<string, tRND>;
 export declare const DivRnd3: typeof DivRndBase3;
 /**
- * Компонент-обёртка над react-rnd.
- * Обеспечивает перетаскивание и изменение размеров, опциональный заголовок и кнопку закрытия.
+ * Wrapper component around react-rnd.
+ * Provides dragging and resizing, an optional header, and a close button.
  */
 export declare function DivRndBase3({ children, keyForSave: ks, position, size, overflow, zIndex, onUpdate, disableDragging, className, header, moveOnlyHeader, limit, onCLickClose, sizeByWindow }: tDivRndBase): import("react/jsx-runtime").JSX.Element;
 export type Drag2Props = {
-    /** Элемент-«ребёнок», который хотим сделать перетаскиваемым */
+    /** Child element that should be draggable */
     children: ReactNode;
-    /** Коллбек при изменении координаты X */
+    /** Callback when the X coordinate changes */
     onX?: (val: number) => void;
-    /** Коллбек при изменении координаты Y */
+    /** Callback when the Y coordinate changes */
     onY?: (val: number) => void;
-    /** Начальное (или контролируемое) значение X */
+    /** Initial (or controlled) X value */
     x?: number;
-    /** Начальное (или контролируемое) значение Y */
+    /** Initial (or controlled) Y value */
     y?: number;
-    /** вести отчет с правого края*/
+    /** Count from the right edge */
     right?: boolean;
     /**
-     * Внешний ref для хранения координат.
-     * Если передан, компонент будет обновлять ref при каждом движении.
+     * External ref for storing coordinates.
+     * If provided, the component updates the ref on each movement.
      */
     last?: React.RefObject<{
         x: number;
         y: number;
     }>;
-    /** Вызывается при начале перетаскивания (мышь или touch) */
+    /** Called when dragging starts (mouse or touch) */
     onStart?: () => void;
-    /** Вызывается при окончании перетаскивания (мышь и touch) */
+    /** Called when dragging ends (mouse and touch) */
     onStop?: () => void;
     dragging?: boolean;
 };
 /**
- * Компонент-обёртка, позволяющий перетаскивать вложенный элемент
- * как мышью, так и касаниями (touch).
+ * Wrapper component that lets a nested element be dragged
+ * with both mouse and touch input.
  *
- * Функция исключительно как хук на изменения параметров при движении - хоть и имеет свой компонент (для отсчета)
- * возвращает пройденное расстояние при перемещении дочернего элемента
+ * Function only as a hook for parameter changes during movement, although it has its own component (for offset counting).
+ * Returns the distance traveled when moving the child element.
  */
 export declare function Drag22({ children, onX, onY, x, y, right, last, dragging, onStart, onStop }: Drag2Props): import("react/jsx-runtime").JSX.Element;
 export {};