wenay-react2 1.0.7 → 1.0.10

package/lib/common/api.d.ts

@@ -1,9 +1,18 @@
 import "../style/menuRight.css";
 import "../style/style.css";
-export * from "./src/components";
+export * from "./updateBy";
 export * from "./src/hooks";
 export * from "./src/styles";
+export * from "./src/components/Dnd";
 export * from "./src/utils";
+export * from "./src/components/Buttons";
+export * from "./src/components/MyResizeObserver";
+export * from "./src/components/Other";
+export * from "./src/components/Parameters";
+export * from "./src/components/ParametersEngine";
+export * from "./src/components/Input";
+export * from "./src/components/Modal";
+export * from "./src/components/Menu";
 export * from "./src/menu/menu";
 export * from "./src/menu/menuMouse";
 export * from "./src/menu/menuR";
@@ -13,5 +22,4 @@ export * from "./src/logs/miniLogs";
 export * from "./src/myChart/1/myChart";
 export * from "./src/myChart/1/myChartTest";
 export * from "./src/myChart/chartEngine/chartEngineReact";
-export * from "./updateBy";
 export declare function test(): number;

package/lib/common/api.js

@@ -1,23 +1,42 @@
 // ... existing code ...
 import "../style/menuRight.css";
 import "../style/style.css";
-// Папки с index.ts
-export * from "./src/components";
+// 1. БАЗОВЫЙ СЛОЙ - никаких зависимостей внутри проекта
+export * from "./updateBy";
+// 2. ХУКИ - зависят только от updateBy
 export * from "./src/hooks";
+// 3. СТИЛИ - независимые
 export * from "./src/styles";
+// 4. DND компоненты - зависят от updateBy
+export * from "./src/components/Dnd";
+// 5. UTILS - теперь зависят от Dnd (mapMemory импортирует ExRNDMap3, mapResiReact)
 export * from "./src/utils";
-// Папки без index.ts, экспортируем каждый файл отдельно
+// 6. БАЗОВЫЕ КОМПОНЕНТЫ - зависят от hooks
+export * from "./src/components/Buttons";
+export * from "./src/components/MyResizeObserver";
+export * from "./src/components/Other";
+// 7. Parameters - зависит от utils
+export * from "./src/components/Parameters";
+// 8. ParametersEngine - зависит от Parameters и utils
+export * from "./src/components/ParametersEngine";
+// 9. Input - зависит от hooks и Dnd
+export * from "./src/components/Input";
+// 10. Modal - зависит от Input и updateBy
+export * from "./src/components/Modal";
+// 11. Menu - зависит от hooks, Dnd и Modal
+export * from "./src/components/Menu";
+// 12. МЕНЮ - зависят от компонентов
 export * from "./src/menu/menu";
 export * from "./src/menu/menuMouse";
 export * from "./src/menu/menuR";
+// 13. ЛОГИ - зависят от utils/mapMemory, menu и components/ParametersEngine
 export * from "./src/logs/logs";
 export * from "./src/logs/logs3";
 export * from "./src/logs/miniLogs";
+// 14. ГРАФИКИ - самый высокий уровень
 export * from "./src/myChart/1/myChart";
 export * from "./src/myChart/1/myChartTest";
 export * from "./src/myChart/chartEngine/chartEngineReact";
-// Файлы в корне src/common
-export * from "./updateBy";
 export function test() {
     return 5;
 }

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

@@ -1,5 +1,5 @@
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-import { Button } from "../../hooks";
+import { Button } from "../../hooks/useOutside";
 export function MiniButton({ name, arr, get, onClick, style }) {
     const data = get();
     const a = Object.values(data);

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

@@ -1,4 +1,4 @@
 export * from './DraggableOutlineDiv';
 export * from './RNDFunc';
-export * from './RNDFunc3';
 export * from './Resizable';
+export * from './RNDFunc3';

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

@@ -1,4 +1,4 @@
 export * from './DraggableOutlineDiv';
 export * from './RNDFunc';
-export * from './RNDFunc3';
 export * from './Resizable';
+export * from './RNDFunc3';

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

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useRef } from "react";
-import { DivOutsideClick } from "../hooks";
-import { DivRnd3 } from "./Dnd";
+import { DivOutsideClick } from "../hooks/useOutside";
+import { DivRnd3 } from "./Dnd/RNDFunc3";
 // Unified modal wrapper component
 function ModalWrapper({ outClick, children, zIndex, size = { height: 150, width: 300 }, keyForSave, position }) {
     const defaultPosition = position ?? { y: -(size.height / 2), x: -(size.width / 2) };
@@ -10,14 +10,14 @@ function ModalWrapper({ outClick, children, zIndex, size = { height: 150, width:
 export function InputPage({ callback, name = "", txt = "" }) {
     const txtName = useRef(txt);
     return _jsxs("div", { className: "maxSize", style: { padding: 20, }, children: [_jsx("label", { children: name }), _jsx("input", { type: "text", style: { width: "100%" }, defaultValue: txtName.current, onChange: (e) => {
-                    txtName.current = e.target.value; //?? txt
+                    txtName.current = e.target.value;
                 } }), _jsx("div", { style: { marginTop: 20 }, className: "msTradeAlt msTradeActive", onClick: () => { callback(txtName.current); }, children: "send" })] });
 }
 export function InputPageModal({ callback, name, outClick, keyForSave = "InputPage2", txt }) {
-    return _jsx(ModalWrapper, { outClick: outClick, keyForSave: keyForSave, size: { height: 150, width: 300 }, position: { y: -150, x: -250 }, children: InputPage({ callback, name, txt }) });
+    return _jsx(ModalWrapper, { outClick: outClick, keyForSave: keyForSave, size: { height: 150, width: 300 }, position: { y: -150, x: -250 }, children: _jsx(InputPage, { callback: callback, name: name, txt: txt }) });
 }
 export function InputFileModal({ callback, name, outClick, keyForSave = "InputFile2" }) {
-    return _jsx(ModalWrapper, { outClick: outClick, keyForSave: keyForSave, size: { height: 150, width: 300 }, position: { y: -150, x: -250 }, children: InputFile({ callback, name }) });
+    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;

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

@@ -1,9 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { sleepAsync } from 'wenay-common2';
-import { GetModalFuncJSX } from "../Modal";
-import { DivOutsideClick, useDraggable } from "../../hooks";
-import { DraggableOutlineDiv } from "../Dnd";
+import { useDraggable } from "../../hooks/useDraggable";
+import { DivOutsideClick } from "../../hooks/useOutside";
+import { DraggableOutlineDiv } from "../Dnd/DraggableOutlineDiv";
+import { GetModalFuncJSX } from "../Modal/Modal";
 export function DropdownMenu({ elements, style, position: initialPosition = 'right', position2: initialPos2 = 'top' }) {
     const [isOpen, setIsOpen] = useState(false);
     const [isFixed, setIsFixed] = useState(false);

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

@@ -1,2 +1,2 @@
-export * from './RightMenu';
 export * from './StickerMenu';
+export * from './RightMenu';

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

@@ -1,2 +1,2 @@
-export * from './RightMenu';
 export * from './StickerMenu';
+export * from './RightMenu';

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

@@ -1,9 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { colorGenerator2, sleepAsync } from "wenay-common2";
-import { Drag22 } from "../Dnd";
 import { renderBy, updateBy } from "../../../updateBy";
 import { GetModalJSX } from "./Modal";
+import { Drag22 } from "../Dnd/RNDFunc3";
 function useViewport() {
     const [width, setWidth] = useState(window.innerWidth);
     useEffect(() => {

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

@@ -1,6 +1,6 @@
 import { jsx as _jsx_1 } from "react/jsx-runtime";
-import { InputPageModal } from "../Input";
 import { renderBy, updateBy } from "../../../updateBy";
+import { InputPageModal } from "../Input";
 export function inputModal({ setModalJSX, func, name, txt }) {
     setModalJSX(_jsx_1(InputPageModal, { callback: txt => {
             func(txt);

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

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { createContext, useContext, useState } from 'react';
 import { createPortal } from 'react-dom';
-import { DivOutsideClick } from "../../hooks";
+import { DivOutsideClick } from "../../hooks/useOutside";
 // Контекст хранит только функцию setModal
 const ModalContext = createContext(() => { });
 export const ModalProvider = ({ children }) => {

package/lib/common/src/components/Modal/index.d.ts

@@ -1,3 +1,3 @@
 export * from './Modal';
-export * from './LeftModal';
 export * from './ModalContextProvider';
+export * from './LeftModal';

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

@@ -1,3 +1,3 @@
 export * from './Modal';
-export * from './LeftModal';
 export * from './ModalContextProvider';
+export * from './LeftModal';

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

@@ -27,12 +27,12 @@ function DivHover({ children, className, style }) {
 }
 function CheckBox(set, val, style) {
     return _jsx("input", { type: "checkbox", style: { marginTop: "auto", marginBottom: "auto", ...style }, checked: val, onChange: (a) => {
-            set(a.currentTarget.checked);
+            set(a.target.checked);
         } });
 }
 function InputString(set, val, style) {
     return _jsx("input", { type: "text", style: { marginTop: "auto", marginBottom: "auto", ...style }, value: val, onChange: (e) => {
-            set(e.currentTarget.value);
+            set(e.target.value);
         } });
 }
 function InputTime(set, value, range) {
@@ -82,8 +82,6 @@ function InputTime(set, value, range) {
                     }, onMouseLeave: () => {
                         _ref?.blur();
                     } }) }), _jsx("input", { required: true, className: "toNumberInput inputCan", type: "number", style: { width: 18, marginLeft: -13, marginRight: 0 }, min: toNum(min), max: toNum(max), step: step, value: toNum(value), onInput: (e) => {
-                    //console.log("value:",toNum(value),"->",e.currentTarget.value);
-                    //<input type="number" value={this.vvv ?? 99} onInput={(e)=>{console.log(this.vvv= e.currentTarget.value); this.Refresh(); }}/>
                     const target = e.currentTarget;
                     setVal(Number(target.value));
                 }, 
@@ -126,9 +124,10 @@ function InputNumber(set, value, range) {
     _inputNumStrMap.delete(range);
     let _ref;
     return _jsxs(_Fragment, { children: [_jsx("input", { type: "range", min: range.defaultMin ?? range.min, max: range.defaultMax ?? range.max, step: range.defaultStep ?? range.step, value: String(value), onInput: (e) => {
-                    set(Number(e.currentTarget.value));
+                    const current = e.currentTarget;
+                    set(Number(current.value));
                     if (_ref)
-                        _ref.step = e.currentTarget.step;
+                        _ref.step = current.step;
                 }, ref: (ref) => {
                     if (ref) {
                         setResizeableElement(ref);

package/lib/common/src/hooks/useOutside.d.ts

@@ -33,8 +33,8 @@ export declare const DivOutsideClick2: React.ForwardRefExoticComponent<React.HTM
     status?: boolean;
     zIndex?: number;
 } & React.RefAttributes<HTMLDivElement>>;
-export declare function Button({ keySave, statusDef, outClick, ...data }: tButton): string | number | bigint | boolean | Iterable<React.ReactNode> | Promise<string | number | bigint | boolean | React.ReactPortal | React.ReactElement<unknown, string | React.JSXElementConstructor<any>> | Iterable<React.ReactNode> | null | undefined> | import("react/jsx-runtime").JSX.Element | null | undefined;
+export declare function Button({ keySave, statusDef, outClick, ...data }: tButton): import("react/jsx-runtime").JSX.Element;
 export declare function ButtonHover(props: tButtonBase): import("react/jsx-runtime").JSX.Element;
 export declare const ButtonOutClick: typeof Button;
-export declare function ButtonAbs(...a: Parameters<typeof Button>): string | number | bigint | boolean | Iterable<React.ReactNode> | Promise<string | number | bigint | boolean | React.ReactPortal | React.ReactElement<unknown, string | React.JSXElementConstructor<any>> | Iterable<React.ReactNode> | null | undefined> | import("react/jsx-runtime").JSX.Element | null | undefined;
+export declare function ButtonAbs(props: Parameters<typeof Button>[0]): import("react/jsx-runtime").JSX.Element;
 export {};

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

@@ -42,16 +42,12 @@ export function Button({ keySave, statusDef, outClick, ...data }) {
     if (keySave && saveStatus[keySave])
         statusDef = saveStatus[keySave];
     const state = useState(statusDef ?? false);
-    return outClick ? DivOutsideClick({
-        status: state[0],
-        children: ButtonBase({ ...data, state }),
-        outsideClick: () => {
-            state[1](false);
-            if (typeof outClick == "function")
-                outClick();
-        }
-    })
-        : ButtonBase({ ...data, state });
+    const handleOutsideClick = () => {
+        state[1](false);
+        if (typeof outClick == "function")
+            outClick();
+    };
+    return outClick ? (_jsx(DivOutsideClick, { status: state[0], outsideClick: handleOutsideClick, children: _jsx(ButtonBase, { ...data, state: state }) })) : (_jsx(ButtonBase, { ...data, state: state }));
 }
 export function ButtonHover(props) {
     const [hover, setHover] = useState(false);
@@ -59,10 +55,10 @@ export function ButtonHover(props) {
                 _jsx("div", { style: { position: "absolute" }, children: typeof props.children == "function" ? props.children({ onClose: () => setHover(false) }) : props.children })] });
 }
 export const ButtonOutClick = ({ outClick = true, ...a }) => Button({ ...a, outClick });
-export function ButtonAbs(...a) {
+export function ButtonAbs(props) {
     const children = (api) => _jsx("div", { style: { position: "relative" }, children: _jsx("div", { style: {
                 position: "absolute",
-                zIndex: a[0]?.zIndex ?? 9
-            }, children: typeof a[0].children == "function" ? a[0].children(api) : a[0].children }) });
-    return Button({ ...a[0], children });
+                zIndex: props.zIndex ?? 9
+            }, children: typeof props.children == "function" ? props.children(api) : props.children }) });
+    return _jsx(Button, { ...props, children: children });
 }

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

@@ -4,8 +4,8 @@ import { useCallback, useEffect, useRef } from "react";
 import { copyToClipboard, Params, timeLocalToStr_hhmmss } from "wenay-common2";
 import { renderBy, updateBy } from "../../updateBy";
 import { mouseMenuApi } from "../menu/menuMouse";
-import { staticGetAdd } from "../utils";
-import { ParametersReact } from "../components";
+import { staticGetAdd } from "../utils/mapMemory";
+import { ParametersReact } from "../components/ParametersEngine";
 const cashLogs = new Map();
 const datumConst = {
     map: cashLogs,

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

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useEffect, useRef } from "react";
 import { MenuBase } from "./menu";
-import { DivOutsideClick } from "../hooks";
+import { DivOutsideClick } from "../hooks/useOutside";
 // Функция-обёртка для создания компонента MenuR и управления глобальной переменной `bb`
 export function GetMenuR() {
     let bb = false; // Глобальная переменная, предотвращающая множественное открытие меню (флаг активности)

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

@@ -1,4 +1,11 @@
-export declare function SetAutoStepForElement(element: HTMLInputElement, params?: {
+interface IStepInputElement extends HTMLElement {
+    value: string;
+    step: string;
+    min: string;
+    max: string;
+}
+export declare function SetAutoStepForElement(element: IStepInputElement, params?: {
     minStep?: number | undefined;
     maxStep?: number;
 }): void;
+export {};

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

@@ -1,5 +1,6 @@
 import { deepClone } from "wenay-common2";
-import { ExRNDMap3, mapResiReact } from "../components";
+import { ExRNDMap3 } from "../components/Dnd/RNDFunc3";
+import { mapResiReact } from "../components/Dnd/Resizable";
 const staticProps = new Map();
 export function staticSet(key, data) {
     if (!staticProps.has(key))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wenay-react2",
-  "version": "1.0.7",
+  "version": "1.0.10",
   "description": "Common react",
   "strict": true,
   "main": "dist/index.js",
@@ -22,8 +22,8 @@
     "re-resizable": "^6.11.2",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
-    "react-rnd": "^10.5.2",
-    "wenay-common2": "^1.0.17"
+    "react-rnd": "^10.5.3",
+    "wenay-common2": "^1.0.28"
   },
   "peerDependencies": {
     "react": "^19.2.0",

package/lib/common/src/components/index.d.ts

@@ -1,9 +0,0 @@
-export * from './Buttons';
-export * from './Dnd';
-export * from './Menu';
-export * from './Modal';
-export * from './Input';
-export * from './Parameters';
-export * from './ParametersEngine';
-export * from './MyResizeObserver';
-export * from './Other';

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

@@ -1,9 +0,0 @@
-export * from './Buttons';
-export * from './Dnd';
-export * from './Menu';
-export * from './Modal';
-export * from './Input';
-export * from './Parameters';
-export * from './ParametersEngine';
-export * from './MyResizeObserver';
-export * from './Other';