@fairys/taro-tools-react 1.0.17 → 1.0.18

package/esm/utils/valtio/context.d.ts

@@ -0,0 +1,7 @@
+import { ReactNode } from 'react';
+export declare const ValtioContext: import("react").Context<any>;
+export declare function ValtioContextProvider<T>({ value, children }: {
+    value: T;
+    children?: ReactNode;
+}): import("react/jsx-runtime").JSX.Element;
+export declare function useValtioContext<T>(): T;

package/esm/utils/valtio/context.js

@@ -0,0 +1,15 @@
+import { jsx } from "react/jsx-runtime";
+import { createContext, useContext } from "react";
+const ValtioContext = /*#__PURE__*/ createContext(void 0);
+function ValtioContextProvider({ value, children }) {
+    return /*#__PURE__*/ jsx(ValtioContext.Provider, {
+        value: value,
+        children: children
+    });
+}
+function useValtioContext() {
+    const context = useContext(ValtioContext);
+    if (!context) throw new Error('useValtioContext must be used within a ValtioContextProvider');
+    return context;
+}
+export { ValtioContext, ValtioContextProvider, useValtioContext };

package/esm/utils/valtio/index.d.ts

@@ -1,13 +1,14 @@
 import { ProxyInstanceObjectBase } from './instance';
 export * from './instance';
+export * from './context';
 /**创建简单的状态管理*/
-export declare const useValtioState: <T extends object>(inital?: T) => readonly [import("valtio").Snapshot<T>, ProxyInstanceObjectBase<T>, any];
+export declare const useValtioState: <T extends object>(inital?: T) => [T, ProxyInstanceObjectBase<T>, any];
 export declare const useValtioInstaceState: <T extends object = any, K extends ProxyInstanceObjectBase<T> = ProxyInstanceObjectBase<T>, M extends {
     new (...args: any[]): K;
 } = {
     new (...args: any[]): K;
-}>(Instance: M) => readonly [import("valtio").Snapshot<T>, K, any];
+}>(Instance: M) => [T, K, any];
 /**
  * 创建valtio proxy 状态管理
  */
-export declare const useValtioProxyState: <T extends object>(inital?: T) => readonly [import("valtio").Snapshot<T>, T, any];
+export declare const useValtioProxyState: <T extends object>(inital?: T) => [T, T, any];

package/esm/utils/valtio/index.js

@@ -1,9 +1,10 @@
 import { useRef } from "react";
 import { proxy, useSnapshot } from "valtio";
-import { ProxyInstanceObjectBase } from "./instance.js";
+import { useProxyInstanceObjectBase } from "./instance.js";
 export * from "./instance.js";
+export * from "./context.js";
 const useValtioState = (inital)=>{
-    const instance = useRef(new ProxyInstanceObjectBase()._ctor(inital)).current;
+    const instance = useProxyInstanceObjectBase(inital);
     const state = useSnapshot(instance.store);
     return [
         state,
@@ -11,8 +12,13 @@ const useValtioState = (inital)=>{
         state.__defaultValue
     ];
 };
+const usNewInstance = (Instance)=>{
+    const ref = useRef();
+    if (!ref.current) ref.current = new Instance();
+    return ref.current;
+};
 const useValtioInstaceState = (Instance)=>{
-    const instance = useRef(new Instance()).current;
+    const instance = usNewInstance(Instance);
     const state = useSnapshot(instance.store);
     return [
         state,
@@ -21,11 +27,12 @@ const useValtioInstaceState = (Instance)=>{
     ];
 };
 const useValtioProxyState = (inital)=>{
-    const instance = useRef(proxy(inital || {})).current;
-    const state = useSnapshot(instance);
+    const instance = useRef();
+    if (!instance.current) instance.current = proxy(inital || {});
+    const state = useSnapshot(instance.current);
     return [
         state,
-        instance,
+        instance.current,
         state.__defaultValue
     ];
 };

package/esm/utils/valtio/instance.d.ts

@@ -15,3 +15,7 @@ export declare class ProxyInstanceObjectBase<T extends Object = any> {
     /**创建 ref 对象 (ref对象不做监听更新)*/
     _createRef: <K extends Object = any>(inital?: K) => K;
 }
+/**
+ * 创建单个proxy对象数据基础实例封装
+ */
+export declare const useProxyInstanceObjectBase: <T extends object>(inital?: T) => ProxyInstanceObjectBase<T>;

package/esm/utils/valtio/instance.js

@@ -1,5 +1,5 @@
-import { proxy, ref } from "valtio";
-import react from "react";
+import { proxy, ref as external_valtio_ref } from "valtio";
+import react, { useRef } from "react";
 class ProxyInstanceObjectBase {
     notRefFields = [];
     store = proxy({});
@@ -13,8 +13,8 @@ class ProxyInstanceObjectBase {
             const value = values[key];
             if (Array.isArray(fields) && fields.includes(key)) this.store[key] = values[key];
             else if (Array.isArray(this.notRefFields) && this.notRefFields.includes(key)) this.store[key] = value;
-            else if (react.isValidElement(value) || 'function' == typeof value) this.store[key] = ref(values[key]);
-            else if ('object' == typeof value && null !== value) this.store[key] = ref(values[key]);
+            else if (react.isValidElement(value) || 'function' == typeof value) this.store[key] = external_valtio_ref(values[key]);
+            else if ('object' == typeof value && null !== value) this.store[key] = external_valtio_ref(values[key]);
             else this.store[key] = values[key];
         });
         return this;
@@ -31,6 +31,11 @@ class ProxyInstanceObjectBase {
         } else delete this.store[names];
         return this;
     };
-    _createRef = (inital)=>ref(inital || {});
+    _createRef = (inital)=>external_valtio_ref(inital || {});
 }
-export { ProxyInstanceObjectBase };
+const useProxyInstanceObjectBase = (inital)=>{
+    const ref = useRef();
+    if (!ref.current) ref.current = new ProxyInstanceObjectBase()._ctor(inital);
+    return ref.current;
+};
+export { ProxyInstanceObjectBase, useProxyInstanceObjectBase };

package/lib/context/index.js

@@ -6,7 +6,7 @@ var __webpack_modules__ = {
     "./global.message.data.instance": function(module) {
         module.exports = require("./global.message.data.instance.js");
     },
-    "./global.setting.data.instance": function(module) {
+    "context/global.setting.data.instance": function(module) {
         module.exports = require("./global.setting.data.instance.js");
     },
     "./page.data.instance": function(module) {
@@ -83,7 +83,7 @@ var __webpack_exports__ = {};
         return _auth_data_instance__WEBPACK_IMPORTED_MODULE_3__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
-    var _global_setting_data_instance__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./global.setting.data.instance");
+    var _global_setting_data_instance__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("context/global.setting.data.instance");
     var __WEBPACK_REEXPORT_OBJECT__ = {};
     for(var __WEBPACK_IMPORT_KEY__ in _global_setting_data_instance__WEBPACK_IMPORTED_MODULE_4__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
         return _global_setting_data_instance__WEBPACK_IMPORTED_MODULE_4__[key];

package/lib/index.js

@@ -3,7 +3,7 @@ var __webpack_modules__ = {
     "./components": function(module) {
         module.exports = require("./components/index.js");
     },
-    "./context": function(module) {
+    "./context?4a23": function(module) {
         module.exports = require("./context/index.js");
     },
     "./utils": function(module) {
@@ -59,7 +59,7 @@ var __webpack_exports__ = {};
         return _components__WEBPACK_IMPORTED_MODULE_0__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
-    var _context__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./context");
+    var _context__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./context?4a23");
     var __WEBPACK_REEXPORT_OBJECT__ = {};
     for(var __WEBPACK_IMPORT_KEY__ in _context__WEBPACK_IMPORTED_MODULE_1__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
         return _context__WEBPACK_IMPORTED_MODULE_1__[key];

package/lib/utils/valtio/context.d.ts

@@ -0,0 +1,7 @@
+import { ReactNode } from 'react';
+export declare const ValtioContext: import("react").Context<any>;
+export declare function ValtioContextProvider<T>({ value, children }: {
+    value: T;
+    children?: ReactNode;
+}): import("react/jsx-runtime").JSX.Element;
+export declare function useValtioContext<T>(): T;

package/lib/utils/valtio/context.js

@@ -0,0 +1,55 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ('undefined' != typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    ValtioContext: ()=>ValtioContext,
+    ValtioContextProvider: ()=>ValtioContextProvider,
+    useValtioContext: ()=>useValtioContext
+});
+const jsx_runtime_namespaceObject = require("react/jsx-runtime");
+const external_react_namespaceObject = require("react");
+const ValtioContext = /*#__PURE__*/ (0, external_react_namespaceObject.createContext)(void 0);
+function ValtioContextProvider({ value, children }) {
+    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(ValtioContext.Provider, {
+        value: value,
+        children: children
+    });
+}
+function useValtioContext() {
+    const context = (0, external_react_namespaceObject.useContext)(ValtioContext);
+    if (!context) throw new Error('useValtioContext must be used within a ValtioContextProvider');
+    return context;
+}
+exports.ValtioContext = __webpack_exports__.ValtioContext;
+exports.ValtioContextProvider = __webpack_exports__.ValtioContextProvider;
+exports.useValtioContext = __webpack_exports__.useValtioContext;
+for(var __webpack_i__ in __webpack_exports__)if (-1 === [
+    "ValtioContext",
+    "ValtioContextProvider",
+    "useValtioContext"
+].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/lib/utils/valtio/index.d.ts

@@ -1,13 +1,14 @@
 import { ProxyInstanceObjectBase } from './instance';
 export * from './instance';
+export * from './context';
 /**创建简单的状态管理*/
-export declare const useValtioState: <T extends object>(inital?: T) => readonly [import("valtio").Snapshot<T>, ProxyInstanceObjectBase<T>, any];
+export declare const useValtioState: <T extends object>(inital?: T) => [T, ProxyInstanceObjectBase<T>, any];
 export declare const useValtioInstaceState: <T extends object = any, K extends ProxyInstanceObjectBase<T> = ProxyInstanceObjectBase<T>, M extends {
     new (...args: any[]): K;
 } = {
     new (...args: any[]): K;
-}>(Instance: M) => readonly [import("valtio").Snapshot<T>, K, any];
+}>(Instance: M) => [T, K, any];
 /**
  * 创建valtio proxy 状态管理
  */
-export declare const useValtioProxyState: <T extends object>(inital?: T) => readonly [import("valtio").Snapshot<T>, T, any];
+export declare const useValtioProxyState: <T extends object>(inital?: T) => [T, T, any];

package/lib/utils/valtio/index.js

@@ -1,5 +1,8 @@
 "use strict";
 var __webpack_modules__ = {
+    "./context?fe51": function(module) {
+        module.exports = require("./context.js");
+    },
     "./instance": function(module) {
         module.exports = require("./instance.js");
     },
@@ -71,8 +74,19 @@ var __webpack_exports__ = {};
         return _instance__WEBPACK_IMPORTED_MODULE_2__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
+    var _context__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./context?fe51");
+    var __WEBPACK_REEXPORT_OBJECT__ = {};
+    for(var __WEBPACK_IMPORT_KEY__ in _context__WEBPACK_IMPORTED_MODULE_3__)if ([
+        "useValtioProxyState",
+        "default",
+        "useValtioInstaceState",
+        "useValtioState"
+    ].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
+        return _context__WEBPACK_IMPORTED_MODULE_3__[key];
+    }).bind(0, __WEBPACK_IMPORT_KEY__);
+    __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
     const useValtioState = (inital)=>{
-        const instance = (0, react__WEBPACK_IMPORTED_MODULE_0__.useRef)(new _instance__WEBPACK_IMPORTED_MODULE_2__.ProxyInstanceObjectBase()._ctor(inital)).current;
+        const instance = (0, _instance__WEBPACK_IMPORTED_MODULE_2__.useProxyInstanceObjectBase)(inital);
         const state = (0, valtio__WEBPACK_IMPORTED_MODULE_1__.useSnapshot)(instance.store);
         return [
             state,
@@ -80,8 +94,13 @@ var __webpack_exports__ = {};
             state.__defaultValue
         ];
     };
+    const usNewInstance = (Instance)=>{
+        const ref = (0, react__WEBPACK_IMPORTED_MODULE_0__.useRef)();
+        if (!ref.current) ref.current = new Instance();
+        return ref.current;
+    };
     const useValtioInstaceState = (Instance)=>{
-        const instance = (0, react__WEBPACK_IMPORTED_MODULE_0__.useRef)(new Instance()).current;
+        const instance = usNewInstance(Instance);
         const state = (0, valtio__WEBPACK_IMPORTED_MODULE_1__.useSnapshot)(instance.store);
         return [
             state,
@@ -90,11 +109,12 @@ var __webpack_exports__ = {};
         ];
     };
     const useValtioProxyState = (inital)=>{
-        const instance = (0, react__WEBPACK_IMPORTED_MODULE_0__.useRef)((0, valtio__WEBPACK_IMPORTED_MODULE_1__.proxy)(inital || {})).current;
-        const state = (0, valtio__WEBPACK_IMPORTED_MODULE_1__.useSnapshot)(instance);
+        const instance = (0, react__WEBPACK_IMPORTED_MODULE_0__.useRef)();
+        if (!instance.current) instance.current = (0, valtio__WEBPACK_IMPORTED_MODULE_1__.proxy)(inital || {});
+        const state = (0, valtio__WEBPACK_IMPORTED_MODULE_1__.useSnapshot)(instance.current);
         return [
             state,
-            instance,
+            instance.current,
             state.__defaultValue
         ];
     };

package/lib/utils/valtio/instance.d.ts

@@ -15,3 +15,7 @@ export declare class ProxyInstanceObjectBase<T extends Object = any> {
     /**创建 ref 对象 (ref对象不做监听更新)*/
     _createRef: <K extends Object = any>(inital?: K) => K;
 }
+/**
+ * 创建单个proxy对象数据基础实例封装
+ */
+export declare const useProxyInstanceObjectBase: <T extends object>(inital?: T) => ProxyInstanceObjectBase<T>;

package/lib/utils/valtio/instance.js

@@ -33,7 +33,8 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    ProxyInstanceObjectBase: ()=>ProxyInstanceObjectBase
+    ProxyInstanceObjectBase: ()=>ProxyInstanceObjectBase,
+    useProxyInstanceObjectBase: ()=>useProxyInstanceObjectBase
 });
 const external_valtio_namespaceObject = require("valtio");
 const external_react_namespaceObject = require("react");
@@ -71,9 +72,16 @@ class ProxyInstanceObjectBase {
     };
     _createRef = (inital)=>(0, external_valtio_namespaceObject.ref)(inital || {});
 }
+const useProxyInstanceObjectBase = (inital)=>{
+    const ref = (0, external_react_namespaceObject.useRef)();
+    if (!ref.current) ref.current = new ProxyInstanceObjectBase()._ctor(inital);
+    return ref.current;
+};
 exports.ProxyInstanceObjectBase = __webpack_exports__.ProxyInstanceObjectBase;
+exports.useProxyInstanceObjectBase = __webpack_exports__.useProxyInstanceObjectBase;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
-    "ProxyInstanceObjectBase"
+    "ProxyInstanceObjectBase",
+    "useProxyInstanceObjectBase"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/package.json

@@ -3,7 +3,7 @@
   "author": "SunLxy <1011771396@qq.com>",
   "description": "框架组件库",
   "homepage": "https://github.com/autumn-fairy-tales/fairys-taro-react",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "main": "esm/index.js",
   "types": "esm/index.d.ts",
   "module": "esm/index.js",

package/src/utils/valtio/context.tsx

@@ -0,0 +1,15 @@
+import { createContext, ReactNode, useContext } from 'react';
+
+export const ValtioContext = createContext(undefined);
+
+export function ValtioContextProvider<T>({ value, children }: { value: T; children?: ReactNode }) {
+  return <ValtioContext.Provider value={value}>{children}</ValtioContext.Provider>;
+}
+
+export function useValtioContext<T>() {
+  const context = useContext<T>(ValtioContext);
+  if (!context) {
+    throw new Error('useValtioContext must be used within a ValtioContextProvider');
+  }
+  return context;
+}

package/src/utils/valtio/index.ts

@@ -1,13 +1,28 @@
 import { useRef } from 'react';
 import { useSnapshot, proxy } from 'valtio';
-import { ProxyInstanceObjectBase } from './instance';
+import { ProxyInstanceObjectBase, useProxyInstanceObjectBase } from './instance';
 export * from './instance';
+export * from './context';
 
 /**创建简单的状态管理*/
 export const useValtioState = <T extends object>(inital?: T) => {
-  const instance = useRef(new ProxyInstanceObjectBase<T>()._ctor(inital)).current;
+  const instance = useProxyInstanceObjectBase(inital);
   const state = useSnapshot(instance.store);
-  return [state, instance, (state as any).__defaultValue] as const;
+  return [state, instance, (state as any).__defaultValue] as [T, ProxyInstanceObjectBase<T>, any];
+};
+
+const usNewInstance = <
+  T extends object = any,
+  K extends ProxyInstanceObjectBase<T> = ProxyInstanceObjectBase<T>,
+  M extends { new (...args: any[]): K } = { new (...args: any[]): K },
+>(
+  Instance: M,
+) => {
+  const ref = useRef<K>();
+  if (!ref.current) {
+    ref.current = new Instance();
+  }
+  return ref.current;
 };
 
 export const useValtioInstaceState = <
@@ -17,16 +32,19 @@ export const useValtioInstaceState = <
 >(
   Instance: M,
 ) => {
-  const instance = useRef(new Instance()).current;
+  const instance = usNewInstance<T, K, M>(Instance);
   const state = useSnapshot(instance.store);
-  return [state, instance, (state as any).__defaultValue] as const;
+  return [state, instance, (state as any).__defaultValue] as [T, K, any];
 };
 
 /**
  * 创建valtio proxy 状态管理
  */
 export const useValtioProxyState = <T extends object>(inital?: T) => {
-  const instance = useRef(proxy(inital || ({} as T))).current;
-  const state = useSnapshot(instance);
-  return [state, instance, (state as any).__defaultValue] as const;
+  const instance = useRef<T>();
+  if (!instance.current) {
+    instance.current = proxy(inital || ({} as T));
+  }
+  const state = useSnapshot(instance.current);
+  return [state, instance.current, (state as any).__defaultValue] as [T, T, any];
 };

package/src/utils/valtio/instance.ts

@@ -1,5 +1,5 @@
 import { proxy, ref } from 'valtio';
-import React from 'react';
+import React, { useRef } from 'react';
 
 /**
  * 单个proxy对象数据基础实例封装
@@ -59,3 +59,14 @@ export class ProxyInstanceObjectBase<T extends Object = any> {
     return ref<K>(inital || ({} as K)) as K;
   };
 }
+
+/**
+ * 创建单个proxy对象数据基础实例封装
+ */
+export const useProxyInstanceObjectBase = <T extends object>(inital?: T) => {
+  const ref = useRef<ProxyInstanceObjectBase<T>>();
+  if (!ref.current) {
+    ref.current = new ProxyInstanceObjectBase<T>()._ctor(inital);
+  }
+  return ref.current;
+};