@xfe-repo/web-register 1.3.4 → 1.3.5

package/dist/index.js

@@ -4,9 +4,6 @@ function _array_like_to_array(arr, len) {
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
     return arr2;
 }
-function _array_with_holes(arr) {
-    if (Array.isArray(arr)) return arr;
-}
 function _array_without_holes(arr) {
     if (Array.isArray(arr)) return _array_like_to_array(arr);
 }
@@ -81,33 +78,6 @@ function _instanceof(left, right) {
 function _iterable_to_array(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
-function _iterable_to_array_limit(arr, i) {
-    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
-    if (_i == null) return;
-    var _arr = [];
-    var _n = true;
-    var _d = false;
-    var _s, _e;
-    try {
-        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
-            _arr.push(_s.value);
-            if (i && _arr.length === i) break;
-        }
-    } catch (err) {
-        _d = true;
-        _e = err;
-    } finally{
-        try {
-            if (!_n && _i["return"] != null) _i["return"]();
-        } finally{
-            if (_d) throw _e;
-        }
-    }
-    return _arr;
-}
-function _non_iterable_rest() {
-    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
 function _non_iterable_spread() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
@@ -150,9 +120,6 @@ function _object_spread_props(target, source) {
     }
     return target;
 }
-function _sliced_to_array(arr, i) {
-    return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
-}
 function _to_consumable_array(arr) {
     return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
 }
@@ -334,33 +301,47 @@ module.exports = __toCommonJS(src_exports);
 var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
 // src/Register.tsx
 var import_react = require("react");
+var import_react_use = require("react-use");
 var import_react_helmet = require("react-helmet");
 var import_query_string = __toESM(require("query-string"));
 var import_jsx_runtime = require("react/jsx-runtime");
 var createRegisterComponent = function(config, getContext, WrappedComponent) {
     var RegisterComponent = (0, import_react.memo)(function(props) {
         var context = getContext();
-        var isPreload = context.isPreload;
+        var _getContext = getContext(), isPreload = _getContext.isPreload, error = _getContext.error;
         var name = config.name, ErrorFullback = config.ErrorFullback, LoadFullback = config.LoadFullback, renderTitle = config.renderTitle, getQuery = config.getQuery;
-        var query = (0, import_react.useMemo)(function() {
-            var query2 = (getQuery === null || getQuery === void 0 ? void 0 : getQuery(context)) || "";
-            var isParsed = typeof query2 === "object";
-            return isParsed ? query2 : import_query_string.default.parse(query2, {
-                parseBooleans: true,
-                parseNumbers: true
-            });
-        }, []);
-        var _ref = _sliced_to_array((0, import_react.useState)(!isPreload), 2), needLoad = _ref[0], setNeedLoad = _ref[1];
-        var _ref1 = _sliced_to_array((0, import_react.useState)(), 2), loadError = _ref1[0], setLoadError = _ref1[1];
-        var isLeave = false;
+        var forceUpdate = (0, import_react_use.useUpdate)();
+        var registerStateRef = (0, import_react.useRef)({
+            isPreload: !!isPreload,
+            isLeaved: false,
+            hasError: !!error,
+            loading: !isPreload
+        });
+        var showError = registerStateRef.current.hasError && ErrorFullback;
+        var showLoading = registerStateRef.current.loading && LoadFullback;
         var emitLoad = (0, import_react.useCallback)(/*#__PURE__*/ _async_to_generator(function() {
-            var _WrappedComponent_emitOnLoad, error;
+            var _WrappedComponent_emitOnLoad, _registerStateRef_current, hasError, isPreload2, isLeaved, queryFromContext, isParsed, query, _ref, error2, needUpdate;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
-                        if (!needLoad || loadError) return [
+                        _registerStateRef_current = registerStateRef.current, hasError = _registerStateRef_current.hasError, isPreload2 = _registerStateRef_current.isPreload, isLeaved = _registerStateRef_current.isLeaved;
+                        if (hasError) {
+                            registerStateRef.current.hasError = false;
+                            delete getContext().error;
+                        }
+                        if (isPreload2) {
+                            registerStateRef.current.isPreload = false;
+                            delete getContext().isPreload;
+                        }
+                        if (hasError || isPreload2 || isLeaved) return [
                             2
                         ];
+                        queryFromContext = (getQuery === null || getQuery === void 0 ? void 0 : getQuery(context)) || "";
+                        isParsed = typeof queryFromContext === "object";
+                        query = isParsed ? queryFromContext : import_query_string.default.parse(queryFromContext, {
+                            parseBooleans: true,
+                            parseNumbers: true
+                        });
                         return [
                             4,
                             (_WrappedComponent_emitOnLoad = WrappedComponent.emitOnLoad) === null || _WrappedComponent_emitOnLoad === void 0 ? void 0 : _WrappedComponent_emitOnLoad.call(WrappedComponent, {
@@ -368,35 +349,29 @@ var createRegisterComponent = function(config, getContext, WrappedComponent) {
                             })
                         ];
                     case 1:
-                        error = (_state.sent() || {}).error;
-                        if (isLeave) return [
-                            2
-                        ];
-                        ErrorFullback && setLoadError(error);
-                        LoadFullback && setNeedLoad(false);
+                        _ref = _state.sent() || {}, error2 = _ref.error;
+                        if (error2) registerStateRef.current.hasError = true;
+                        needUpdate = false;
+                        if (registerStateRef.current.hasError && ErrorFullback) needUpdate = true;
+                        if (registerStateRef.current.loading && LoadFullback) needUpdate = true;
+                        if (needUpdate) forceUpdate();
                         return [
                             2
                         ];
                 }
             });
-        }), [
-            needLoad,
-            loadError
-        ]);
+        }), []);
         void emitLoad();
-        if (isPreload) delete context.isPreload;
-        (0, import_react.useEffect)(function() {
-            return function() {
-                var _WrappedComponent_emitOnLeave;
-                isLeave = true;
-                (_WrappedComponent_emitOnLeave = WrappedComponent.emitOnLeave) === null || _WrappedComponent_emitOnLeave === void 0 ? void 0 : _WrappedComponent_emitOnLeave.call(WrappedComponent);
-            };
-        }, []);
+        (0, import_react_use.useUnmount)(function() {
+            var _WrappedComponent_emitOnLeave;
+            registerStateRef.current.isLeaved = true;
+            (_WrappedComponent_emitOnLeave = WrappedComponent.emitOnLeave) === null || _WrappedComponent_emitOnLeave === void 0 ? void 0 : _WrappedComponent_emitOnLeave.call(WrappedComponent);
+        });
         var content = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(WrappedComponent, _object_spread_props(_object_spread({}, props), {
             context: context
         }));
-        if (loadError && ErrorFullback) content = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ErrorFullback, {});
-        if (needLoad && LoadFullback) content = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LoadFullback, {});
+        if (showError) content = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ErrorFullback, {});
+        if (showLoading) content = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LoadFullback, {});
         return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_react.Fragment, {
             children: [
                 renderTitle && name && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_helmet.Helmet, {
@@ -531,7 +506,7 @@ var createRegister = function(options) {
                         ];
                     case 12:
                         e = _state.sent();
-                        context.error = _instanceof(e, Error) ? e : new Error("register onLoad error");
+                        context.error = _instanceof(e, Error) ? e : new Error(String(e) || "register onLoad error");
                         onError ? onError(e) : console.error(e);
                         return [
                             3,

package/dist/index.mjs

@@ -4,9 +4,6 @@ function _array_like_to_array(arr, len) {
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
     return arr2;
 }
-function _array_with_holes(arr) {
-    if (Array.isArray(arr)) return arr;
-}
 function _array_without_holes(arr) {
     if (Array.isArray(arr)) return _array_like_to_array(arr);
 }
@@ -81,33 +78,6 @@ function _instanceof(left, right) {
 function _iterable_to_array(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
-function _iterable_to_array_limit(arr, i) {
-    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
-    if (_i == null) return;
-    var _arr = [];
-    var _n = true;
-    var _d = false;
-    var _s, _e;
-    try {
-        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
-            _arr.push(_s.value);
-            if (i && _arr.length === i) break;
-        }
-    } catch (err) {
-        _d = true;
-        _e = err;
-    } finally{
-        try {
-            if (!_n && _i["return"] != null) _i["return"]();
-        } finally{
-            if (_d) throw _e;
-        }
-    }
-    return _arr;
-}
-function _non_iterable_rest() {
-    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
 function _non_iterable_spread() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
@@ -150,9 +120,6 @@ function _object_spread_props(target, source) {
     }
     return target;
 }
-function _sliced_to_array(arr, i) {
-    return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
-}
 function _to_consumable_array(arr) {
     return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
 }
@@ -261,34 +228,48 @@ function _ts_generator(thisArg, body) {
 }
 import hoistNonReactStatic from "hoist-non-react-statics";
 // src/Register.tsx
-import { memo, Fragment, useEffect, useState, useCallback, useMemo } from "react";
+import { memo, Fragment, useRef, useCallback } from "react";
+import { useUpdate, useUnmount } from "react-use";
 import { Helmet } from "react-helmet";
 import queryString from "query-string";
 import { jsx, jsxs } from "react/jsx-runtime";
 var createRegisterComponent = function(config, getContext, WrappedComponent) {
     var RegisterComponent = memo(function(props) {
         var context = getContext();
-        var isPreload = context.isPreload;
+        var _getContext = getContext(), isPreload = _getContext.isPreload, error = _getContext.error;
         var name = config.name, ErrorFullback = config.ErrorFullback, LoadFullback = config.LoadFullback, renderTitle = config.renderTitle, getQuery = config.getQuery;
-        var query = useMemo(function() {
-            var query2 = (getQuery === null || getQuery === void 0 ? void 0 : getQuery(context)) || "";
-            var isParsed = typeof query2 === "object";
-            return isParsed ? query2 : queryString.parse(query2, {
-                parseBooleans: true,
-                parseNumbers: true
-            });
-        }, []);
-        var _useState = _sliced_to_array(useState(!isPreload), 2), needLoad = _useState[0], setNeedLoad = _useState[1];
-        var _useState1 = _sliced_to_array(useState(), 2), loadError = _useState1[0], setLoadError = _useState1[1];
-        var isLeave = false;
+        var forceUpdate = useUpdate();
+        var registerStateRef = useRef({
+            isPreload: !!isPreload,
+            isLeaved: false,
+            hasError: !!error,
+            loading: !isPreload
+        });
+        var showError = registerStateRef.current.hasError && ErrorFullback;
+        var showLoading = registerStateRef.current.loading && LoadFullback;
         var emitLoad = useCallback(/*#__PURE__*/ _async_to_generator(function() {
-            var _WrappedComponent_emitOnLoad, error;
+            var _WrappedComponent_emitOnLoad, _registerStateRef_current, hasError, isPreload2, isLeaved, queryFromContext, isParsed, query, _ref, error2, needUpdate;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
-                        if (!needLoad || loadError) return [
+                        _registerStateRef_current = registerStateRef.current, hasError = _registerStateRef_current.hasError, isPreload2 = _registerStateRef_current.isPreload, isLeaved = _registerStateRef_current.isLeaved;
+                        if (hasError) {
+                            registerStateRef.current.hasError = false;
+                            delete getContext().error;
+                        }
+                        if (isPreload2) {
+                            registerStateRef.current.isPreload = false;
+                            delete getContext().isPreload;
+                        }
+                        if (hasError || isPreload2 || isLeaved) return [
                             2
                         ];
+                        queryFromContext = (getQuery === null || getQuery === void 0 ? void 0 : getQuery(context)) || "";
+                        isParsed = typeof queryFromContext === "object";
+                        query = isParsed ? queryFromContext : queryString.parse(queryFromContext, {
+                            parseBooleans: true,
+                            parseNumbers: true
+                        });
                         return [
                             4,
                             (_WrappedComponent_emitOnLoad = WrappedComponent.emitOnLoad) === null || _WrappedComponent_emitOnLoad === void 0 ? void 0 : _WrappedComponent_emitOnLoad.call(WrappedComponent, {
@@ -296,35 +277,29 @@ var createRegisterComponent = function(config, getContext, WrappedComponent) {
                             })
                         ];
                     case 1:
-                        error = (_state.sent() || {}).error;
-                        if (isLeave) return [
-                            2
-                        ];
-                        ErrorFullback && setLoadError(error);
-                        LoadFullback && setNeedLoad(false);
+                        _ref = _state.sent() || {}, error2 = _ref.error;
+                        if (error2) registerStateRef.current.hasError = true;
+                        needUpdate = false;
+                        if (registerStateRef.current.hasError && ErrorFullback) needUpdate = true;
+                        if (registerStateRef.current.loading && LoadFullback) needUpdate = true;
+                        if (needUpdate) forceUpdate();
                         return [
                             2
                         ];
                 }
             });
-        }), [
-            needLoad,
-            loadError
-        ]);
+        }), []);
         void emitLoad();
-        if (isPreload) delete context.isPreload;
-        useEffect(function() {
-            return function() {
-                var _WrappedComponent_emitOnLeave;
-                isLeave = true;
-                (_WrappedComponent_emitOnLeave = WrappedComponent.emitOnLeave) === null || _WrappedComponent_emitOnLeave === void 0 ? void 0 : _WrappedComponent_emitOnLeave.call(WrappedComponent);
-            };
-        }, []);
+        useUnmount(function() {
+            var _WrappedComponent_emitOnLeave;
+            registerStateRef.current.isLeaved = true;
+            (_WrappedComponent_emitOnLeave = WrappedComponent.emitOnLeave) === null || _WrappedComponent_emitOnLeave === void 0 ? void 0 : _WrappedComponent_emitOnLeave.call(WrappedComponent);
+        });
         var content = /* @__PURE__ */ jsx(WrappedComponent, _object_spread_props(_object_spread({}, props), {
             context: context
         }));
-        if (loadError && ErrorFullback) content = /* @__PURE__ */ jsx(ErrorFullback, {});
-        if (needLoad && LoadFullback) content = /* @__PURE__ */ jsx(LoadFullback, {});
+        if (showError) content = /* @__PURE__ */ jsx(ErrorFullback, {});
+        if (showLoading) content = /* @__PURE__ */ jsx(LoadFullback, {});
         return /* @__PURE__ */ jsxs(Fragment, {
             children: [
                 renderTitle && name && /* @__PURE__ */ jsx(Helmet, {
@@ -460,7 +435,7 @@ var createRegister = function(options) {
                         ];
                     case 12:
                         e = _state.sent();
-                        context.error = _instanceof(e, Error) ? e : new Error("register onLoad error");
+                        context.error = _instanceof(e, Error) ? e : new Error(String(e) || "register onLoad error");
                         onError ? onError(e) : console.error(e);
                         return [
                             3,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfe-repo/web-register",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "sideEffects": false,
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,7 +22,8 @@
   "dependencies": {
     "hoist-non-react-statics": "^3.3.2",
     "query-string": "^7.1.3",
-    "react-helmet": "^6.1.0"
+    "react-helmet": "^6.1.0",
+    "react-use": "^17.6.0"
   },
   "devDependencies": {
     "@types/hoist-non-react-statics": "^3.3.5",