one 1.15.8 → 1.15.9

package/dist/cjs/router/useScreens.native.js

@@ -45,14 +45,14 @@ module.exports = __toCommonJS(useScreens_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
 var import_core = require("@react-navigation/core");
-var import_elements = require("@react-navigation/elements");
+require("@react-navigation/elements");
 var import_react2 = __toESM(require("react"), 1);
 var import_react_native = require("react-native");
-var import_ServerContextScript = require("../server/ServerContextScript.native.js");
+require("../server/ServerContextScript.native.js");
 var import_getPageExport = require("../utils/getPageExport.native.js");
 var import_EmptyRoute = require("../views/EmptyRoute.native.js");
 var import_Try = require("../views/Try.native.js");
-var import_DevHead = require("../vite/DevHead.native.js");
+require("../vite/DevHead.native.js");
 var import_one_server_only = require("../vite/one-server-only.native.js");
 var import_filterRootHTML = require("./filterRootHTML.native.js");
 var import_Route = require("./Route.native.js");
@@ -60,9 +60,7 @@ var import_SpaShellContext = require("./SpaShellContext.native.js");
 var import_Navigator = require("../views/Navigator.native.js");
 var import_sortRoutes = require("./sortRoutes.native.js");
 function _assert_this_initialized(self) {
-  if (self === void 0) {
-    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-  }
+  if (self === void 0) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
   return self;
 }
 function _call_super(_this, derived, args) {
@@ -70,9 +68,7 @@ function _call_super(_this, derived, args) {
   return _possible_constructor_return(_this, _is_native_reflect_construct() ? Reflect.construct(derived, args || [], _get_prototype_of(_this).constructor) : derived.apply(_this, args));
 }
 function _class_call_check(instance, Constructor) {
-  if (!(instance instanceof Constructor)) {
-    throw new TypeError("Cannot call a class as a function");
-  }
+  if (!(instance instanceof Constructor)) throw new TypeError("Cannot call a class as a function");
 }
 function _defineProperties(target, props) {
   for (var i = 0; i < props.length; i++) {
@@ -95,9 +91,7 @@ function _get_prototype_of(o) {
   return _get_prototype_of(o);
 }
 function _inherits(subClass, superClass) {
-  if (typeof superClass !== "function" && superClass !== null) {
-    throw new TypeError("Super expression must either be null or a function");
-  }
+  if (typeof superClass !== "function" && superClass !== null) throw new TypeError("Super expression must either be null or a function");
   subClass.prototype = Object.create(superClass && superClass.prototype, {
     constructor: {
       value: subClass,
@@ -108,16 +102,10 @@ function _inherits(subClass, superClass) {
   if (superClass) _set_prototype_of(subClass, superClass);
 }
 function _instanceof(left, right) {
-  if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-    return !!right[Symbol.hasInstance](left);
-  } else {
-    return left instanceof right;
-  }
+  if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) return !!right[Symbol.hasInstance](left);else return left instanceof right;
 }
 function _possible_constructor_return(self, call) {
-  if (call && (_type_of(call) === "object" || typeof call === "function")) {
-    return call;
-  }
+  if (call && (_type_of(call) === "object" || typeof call === "function")) return call;
   return _assert_this_initialized(self);
 }
 function _set_prototype_of(o, p) {
@@ -147,19 +135,13 @@ function hasMetaCharset(children) {
       if (! /* @__PURE__ */import_react2.default.isValidElement(child)) return false;
       if (child.type === "meta") {
         var props = child.props;
-        if ("charSet" in props || "charset" in props) {
-          return true;
-        }
+        if ("charSet" in props || "charset" in props) return true;
       }
       var childProps = child.props;
-      if (childProps.children) {
-        return hasMetaCharset(childProps.children);
-      }
+      if (childProps.children) return hasMetaCharset(childProps.children);
       return false;
     };
-    if (Array.isArray(children)) {
-      return children.some(checkElement);
-    }
+    if (Array.isArray(children)) return children.some(checkElement);
     return checkElement(children);
   }
   return true;
@@ -168,18 +150,15 @@ var {
   Screen,
   Group
 } = (0, import_core.createNavigatorFactory)({})();
-var cachedInlineCSSElements = typeof document !== "undefined" ? function () {
+typeof document !== "undefined" && function () {
   var elements = [];
-  var cssElements = document.querySelectorAll('style[id^="__one_css_"], link[rel="stylesheet"][data-one-css]');
-  cssElements.forEach(function (el, i) {
-    if (el.tagName === "STYLE") {
-      elements.push(/* @__PURE__ */(0, import_jsx_runtime.jsx)("style", {
-        id: el.id,
-        dangerouslySetInnerHTML: {
-          __html: el.innerHTML
-        }
-      }, `inline-css-${i}`));
-    } else {
+  document.querySelectorAll("style[id^=\"__one_css_\"], link[rel=\"stylesheet\"][data-one-css]").forEach(function (el, i) {
+    if (el.tagName === "STYLE") elements.push(/* @__PURE__ */(0, import_jsx_runtime.jsx)("style", {
+      id: el.id,
+      dangerouslySetInnerHTML: {
+        __html: el.innerHTML
+      }
+    }, `inline-css-${i}`));else {
       var href = el.getAttribute("href");
       elements.push(/* @__PURE__ */(0, import_jsx_runtime.jsx)("link", {
         rel: "stylesheet",
@@ -189,28 +168,14 @@ var cachedInlineCSSElements = typeof document !== "undefined" ? function () {
     }
   });
   return elements;
-}() : [];
+}();
 function RootLayoutRenderer(param) {
   var {
     LayoutComponent,
     layoutProps,
     forwardedRef
   } = param;
-  var _serverContext_cssContents, _serverContext_css;
-  if (process.env.NODE_ENV === "development" && false) {
-    var [, setHmrKey] = (0, import_react2.useState)(0);
-    (0, import_react2.useEffect)(function () {
-      var handler = function () {
-        return setHmrKey(function (k) {
-          return k + 1;
-        });
-      };
-      window.addEventListener("one-hmr-update", handler);
-      return function () {
-        return window.removeEventListener("one-hmr-update", handler);
-      };
-    }, []);
-  }
+  if (process.env.NODE_ENV === "development" && false) ;
   var out = LayoutComponent(layoutProps, forwardedRef);
   var {
     children,
@@ -222,71 +187,16 @@ function RootLayoutRenderer(param) {
     children: headChildren,
     ...headProps
   } = (head === null || head === void 0 ? void 0 : head.props) || {};
-  var serverContext = (0, import_one_server_only.useServerContext)();
-  var finalChildren = children;
-  if (true) {
-    return finalChildren;
-  }
-  if (process.env.NODE_ENV === "development") {
-    if (!hasMetaCharset(headChildren)) {
-      console.warn(`[one] Missing <meta charSet="utf-8" /> in your root _layout.tsx <head>. This can cause React hydration issues due to encoding mismatch. Add it as the first element in your <head> tag.`);
-    }
-  }
-  finalChildren = /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, {
-    children: [/* @__PURE__ */(0, import_jsx_runtime.jsxs)("head", {
-      ...headProps,
-      children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_DevHead.DevHead, {}), /* @__PURE__ */(0, import_jsx_runtime.jsx)("script", {
-        dangerouslySetInnerHTML: {
-          __html: `globalThis['global'] = globalThis`
-        }
-      }), (serverContext === null || serverContext === void 0 ? void 0 : (_serverContext_cssContents = serverContext.cssContents) === null || _serverContext_cssContents === void 0 ? void 0 : _serverContext_cssContents.length) || (serverContext === null || serverContext === void 0 ? void 0 : serverContext.cssInlineCount) ?
-      // inline/mixed CSS: render each entry as <style> (if content) or <link>
-      (serverContext === null || serverContext === void 0 ? void 0 : serverContext.cssContents) ? serverContext.cssContents.map(function (content, i) {
-        var _serverContext_css2;
-        return content ? /* @__PURE__ */(0, import_jsx_runtime.jsx)("style", {
-          id: `__one_css_${i}`,
-          dangerouslySetInnerHTML: {
-            __html: content
-          }
-        }, `inline-css-${i}`) : ((_serverContext_css2 = serverContext.css) === null || _serverContext_css2 === void 0 ? void 0 : _serverContext_css2[i]) ? /* @__PURE__ */(0, import_jsx_runtime.jsx)("link", {
-          rel: "stylesheet",
-          href: serverContext.css[i]
-        }, serverContext.css[i]) : null;
-      }) : cachedInlineCSSElements : serverContext === null || serverContext === void 0 ? void 0 : (_serverContext_css = serverContext.css) === null || _serverContext_css === void 0 ? void 0 : _serverContext_css.map(function (file) {
-        return /* @__PURE__ */(0, import_jsx_runtime.jsx)("link", {
-          rel: "stylesheet",
-          href: file
-        }, file);
-      }), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_ServerContextScript.ServerContextScript, {}), headChildren]
-    }, "head"), /* @__PURE__ */(0, import_jsx_runtime.jsx)("body", {
-      suppressHydrationWarning: true,
-      ...bodyProps,
-      children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_elements.SafeAreaProviderCompat, {
-        children: finalChildren
-      })
-    }, "body")]
-  });
-  return (
-    // tamagui and libraries can add className on hydration to have ssr safe styling
-    // so supress hydration warnings here
-    /* @__PURE__ */
-    (0, import_jsx_runtime.jsx)("html", {
-      suppressHydrationWarning: true,
-      lang: "en-US",
-      ...htmlProps,
-      children: finalChildren
-    })
-  );
+  (0, import_one_server_only.useServerContext)();
+  return children;
 }
 function getSortedChildren(children, order, initialRouteName, options) {
-  if (!(order === null || order === void 0 ? void 0 : order.length)) {
-    return children.sort((0, import_sortRoutes.sortRoutesWithInitial)(initialRouteName)).map(function (route) {
-      return {
-        route,
-        props: {}
-      };
-    });
-  }
+  if (!(order === null || order === void 0 ? void 0 : order.length)) return children.sort((0, import_sortRoutes.sortRoutesWithInitial)(initialRouteName)).map(function (route) {
+    return {
+      route,
+      props: {}
+    };
+  });
   var entries = [...children];
   var ordered = order.map(function (param) {
     var {
@@ -316,9 +226,7 @@ function getSortedChildren(children, order, initialRouteName, options) {
     var match = entries[matchIndex];
     entries.splice(matchIndex, 1);
     if (redirect) {
-      if (typeof redirect === "string") {
-        throw new Error(`Redirecting to a specific route is not supported yet.`);
-      }
+      if (typeof redirect === "string") throw new Error(`Redirecting to a specific route is not supported yet.`);
       return null;
     }
     return {
@@ -331,22 +239,19 @@ function getSortedChildren(children, order, initialRouteName, options) {
       }
     };
   }).filter(Boolean);
-  if (!(options === null || options === void 0 ? void 0 : options.onlyMatching)) {
-    ordered.push(...entries.sort((0, import_sortRoutes.sortRoutesWithInitial)(initialRouteName)).map(function (route) {
-      return {
-        route,
-        props: {}
-      };
-    }));
-  }
+  if (!(options === null || options === void 0 ? void 0 : options.onlyMatching)) ordered.push(...entries.sort((0, import_sortRoutes.sortRoutesWithInitial)(initialRouteName)).map(function (route) {
+    return {
+      route,
+      props: {}
+    };
+  }));
   return ordered;
 }
 function useSortedScreens(order, options) {
   var node = (0, import_Route.useRouteNode)();
-  var sortedScreens = import_react2.default.useMemo(function () {
+  return import_react2.default.useMemo(function () {
     var _node_children;
-    var sorted = (node === null || node === void 0 ? void 0 : (_node_children = node.children) === null || _node_children === void 0 ? void 0 : _node_children.length) ? getSortedChildren(node.children, order, node.initialRouteName, options) : [];
-    return sorted.filter(function (value) {
+    return ((node === null || node === void 0 ? void 0 : (_node_children = node.children) === null || _node_children === void 0 ? void 0 : _node_children.length) ? getSortedChildren(node.children, order, node.initialRouteName, options) : []).filter(function (value) {
       var _options_protectedScreens, _options_protectedScreens1;
       var routeName = value.route.route;
       var normalized = routeName.replace(/\/index$/, "");
@@ -355,34 +260,29 @@ function useSortedScreens(order, options) {
       return routeToScreen(value.route, value.props);
     });
   }, [node === null || node === void 0 ? void 0 : node.children, node === null || node === void 0 ? void 0 : node.initialRouteName, order, options === null || options === void 0 ? void 0 : options.protectedScreens]);
-  return sortedScreens;
 }
 function fromImport(param) {
   var {
     ErrorBoundary,
     ...component
   } = param;
-  if (ErrorBoundary) {
-    return {
-      default: /* @__PURE__ */import_react2.default.forwardRef(function (props, ref) {
-        var children = /* @__PURE__ */import_react2.default.createElement((0, import_getPageExport.getPageExport)(component) || import_EmptyRoute.EmptyRoute, {
-          ...props,
-          ref
-        });
-        return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Try.Try, {
-          catch: ErrorBoundary,
-          children
-        });
-      })
-    };
-  }
+  if (ErrorBoundary) return {
+    default: /* @__PURE__ */import_react2.default.forwardRef(function (props, ref) {
+      var children = /* @__PURE__ */import_react2.default.createElement((0, import_getPageExport.getPageExport)(component) || import_EmptyRoute.EmptyRoute, {
+        ...props,
+        ref
+      });
+      return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Try.Try, {
+        catch: ErrorBoundary,
+        children
+      });
+    })
+  };
   if (process.env.NODE_ENV !== "production") {
     var exported = (0, import_getPageExport.getPageExport)(component);
-    if (exported && (typeof exported === "undefined" ? "undefined" : _type_of(exported)) === "object" && Object.keys(exported).length === 0) {
-      return {
-        default: import_EmptyRoute.EmptyRoute
-      };
-    }
+    if (exported && (typeof exported === "undefined" ? "undefined" : _type_of(exported)) === "object" && Object.keys(exported).length === 0) return {
+      default: import_EmptyRoute.EmptyRoute
+    };
   }
   return {
     default: (0, import_getPageExport.getPageExport)(component)
@@ -390,33 +290,14 @@ function fromImport(param) {
 }
 var qualifiedStore = /* @__PURE__ */new WeakMap();
 function getQualifiedRouteComponent(value) {
-  if (value && qualifiedStore.has(value)) {
-    return qualifiedStore.get(value);
-  }
+  if (value && qualifiedStore.has(value)) return qualifiedStore.get(value);
   var ScreenComponent = /* @__PURE__ */import_react2.default.forwardRef(function (props, ref) {
-    if (process.env.NODE_ENV === "development" && false) {
-      var [, setHmrKey] = (0, import_react2.useState)(0);
-      (0, import_react2.useEffect)(function () {
-        var handler = function () {
-          return setHmrKey(function (k) {
-            return k + 1;
-          });
-        };
-        window.addEventListener("one-hmr-update", handler);
-        return function () {
-          return window.removeEventListener("one-hmr-update", handler);
-        };
-      }, []);
-    }
-    var isSpaShell = (0, import_react2.useContext)(import_SpaShellContext.SpaShellContext);
-    if (isSpaShell && props.segment !== "") {
+    if (process.env.NODE_ENV === "development" && false) ;
+    if ((0, import_react2.useContext)(import_SpaShellContext.SpaShellContext) && props.segment !== "") {
       var _value_children;
-      var isServerRenderedLayout = ((_value_children = value.children) === null || _value_children === void 0 ? void 0 : _value_children.length) && (value.layoutRenderMode === "ssg" || value.layoutRenderMode === "ssr");
-      if (!isServerRenderedLayout) {
-        return /* @__PURE__ */(0, import_jsx_runtime.jsx)("div", {
-          "data-one-spa-content": ""
-        });
-      }
+      if (!(((_value_children = value.children) === null || _value_children === void 0 ? void 0 : _value_children.length) && (value.layoutRenderMode === "ssg" || value.layoutRenderMode === "ssr"))) return /* @__PURE__ */(0, import_jsx_runtime.jsx)("div", {
+        "data-one-spa-content": ""
+      });
     }
     var res = value.loadRoute();
     var Component = (0, import_getPageExport.getPageExport)(fromImport(res));
@@ -444,26 +325,20 @@ function getQualifiedRouteComponent(value) {
         _iteratorError = err;
       } finally {
         try {
-          if (!_iteratorNormalCompletion && _iterator.return != null) {
-            _iterator.return();
-          }
+          if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
         } finally {
-          if (_didIteratorError) {
-            throw _iteratorError;
-          }
+          if (_didIteratorError) throw _iteratorError;
         }
       }
     }
-    if (props.segment === "") {
-      return /* @__PURE__ */(0, import_jsx_runtime.jsx)(RootLayoutRenderer, {
-        LayoutComponent: Component,
-        layoutProps: {
-          ...props,
-          ...slotProps
-        },
-        forwardedRef: ref
-      });
-    }
+    if (props.segment === "") return /* @__PURE__ */(0, import_jsx_runtime.jsx)(RootLayoutRenderer, {
+      LayoutComponent: Component,
+      layoutProps: {
+        ...props,
+        ...slotProps
+      },
+      forwardedRef: ref
+    });
     return /* @__PURE__ */(0, import_jsx_runtime.jsx)(RouteErrorBoundary, {
       routeName: value.route,
       children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(Component, {
@@ -474,30 +349,16 @@ function getQualifiedRouteComponent(value) {
     });
   });
   var wrapSuspense = function (children) {
-    if (true) {
-      if (process.env.ONE_SUSPEND_ROUTES_NATIVE === "0" || globalThis.__ONE_DISABLE_SUSPENSE_ROUTES__ === true) {
-        return children;
-      }
-      return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_react2.Suspense, {
-        fallback: null,
-        children
-      });
-    }
-    if (process.env.ONE_SUSPEND_ROUTES === "1" && globalThis.__ONE_DISABLE_SUSPENSE_ROUTES__ !== true) {
-      return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_react2.Suspense, {
-        fallback: null,
-        children
-      });
-    }
-    return children;
+    if (process.env.ONE_SUSPEND_ROUTES_NATIVE === "0" || globalThis.__ONE_DISABLE_SUSPENSE_ROUTES__ === true) return children;
+    return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_react2.Suspense, {
+      fallback: null,
+      children
+    });
   };
   var QualifiedRoute = /* @__PURE__ */import_react2.default.forwardRef(function (param, ref) {
     var {
-      // Remove these React Navigation props to
-      // enforce usage of router hooks (where the query params are correct).
       route,
       navigation,
-      // Pass all other props to the component
       ...props
     } = param;
     return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Route.Route, {
@@ -507,8 +368,6 @@ function getQualifiedRouteComponent(value) {
         children: wrapSuspense(/* @__PURE__ */(0, import_jsx_runtime.jsx)(ScreenComponent, {
           ...props,
           ref,
-          // Expose the template segment path, e.g. `(home)`, `[foo]`, `index`
-          // the intention is to make it possible to deduce shared routes.
           segment: value.route
         }))
       })
@@ -534,13 +393,9 @@ function createGetIdForRoute(route) {
       _iteratorError = err;
     } finally {
       try {
-        if (!_iteratorNormalCompletion && _iterator.return != null) {
-          _iterator.return();
-        }
+        if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
       } finally {
-        if (_didIteratorError) {
-          throw _iteratorError;
-        }
+        if (_didIteratorError) throw _iteratorError;
       }
     }
   }
@@ -557,28 +412,16 @@ function createGetIdForRoute(route) {
       for (var _iterator2 = include.values()[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
         var dynamic = _step2.value;
         var value = params === null || params === void 0 ? void 0 : params[dynamic.name];
-        if (Array.isArray(value) && value.length > 0) {
-          segments.push(value.join("/"));
-        } else if (value && !Array.isArray(value)) {
-          segments.push(value);
-        } else if (dynamic.deep) {
-          segments.push(`[...${dynamic.name}]`);
-        } else {
-          segments.push(`[${dynamic.name}]`);
-        }
+        if (Array.isArray(value) && value.length > 0) segments.push(value.join("/"));else if (value && !Array.isArray(value)) segments.push(value);else if (dynamic.deep) segments.push(`[...${dynamic.name}]`);else segments.push(`[${dynamic.name}]`);
       }
     } catch (err) {
       _didIteratorError2 = true;
       _iteratorError2 = err;
     } finally {
       try {
-        if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
-          _iterator2.return();
-        }
+        if (!_iteratorNormalCompletion2 && _iterator2.return != null) _iterator2.return();
       } finally {
-        if (_didIteratorError2) {
-          throw _iteratorError2;
-        }
+        if (_didIteratorError2) throw _iteratorError2;
       }
     }
     return (_segments_join = segments.join("/")) !== null && _segments_join !== void 0 ? _segments_join : route.contextKey;
@@ -590,7 +433,6 @@ function routeToScreen(route) {
     ...props
   } = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
   return /* @__PURE__ */(0, import_react.createElement)(Screen, {
-    // Users can override the screen getId function.
     getId: createGetIdForRoute(route),
     ...props,
     name: route.route,
@@ -615,19 +457,6 @@ function routeToScreen(route) {
       }
       return output;
     },
-    // this doesn't work, also probably better to wrap suspense only on root layout in useScreens
-    // but it doesnt seem to pick up our startTransitions which i wrapped in a few places.
-    // now i thought this was due to our use of useSyncExternalStore, but i replaced that with
-    // `use-sync-external-store/shim` and i also replaced the one in react-navigation that does
-    // `use-sync-external-store/with-selector` to `use-sync-external-store/shim/with-selector`
-    // but still it seems something else must be updating state outside a transition.
-    // layout={({ children }) => {
-    //   console.log('route.contextKey', route.contextKey)
-    //   if (route.contextKey === '') {
-    //     return <Suspense fallback={null}>{children}</Suspense>
-    //   }
-    //   return children
-    // }}
     getComponent: function () {
       return getQualifiedRouteComponent(route);
     }
@@ -644,8 +473,7 @@ var RouteErrorBoundary = /* @__PURE__ */function (_React_Component) {
   _inherits(RouteErrorBoundary2, _React_Component);
   function RouteErrorBoundary2(props) {
     _class_call_check(this, RouteErrorBoundary2);
-    var _this;
-    _this = _call_super(this, RouteErrorBoundary2, [props]);
+    var _this = _call_super(this, RouteErrorBoundary2, [props]);
     _this.state = ROUTE_ERROR_BOUNDARY_INITIAL_STATE;
     return _this;
   }
@@ -694,7 +522,7 @@ ${errorInfo.componentStack}`);
                 fontSize: 20,
                 fontFamily: "monospace"
               },
-              children: ['Error on route "', this.props.routeName, '"']
+              children: ["Error on route \"", this.props.routeName, "\""]
             }), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_react_native.Text, {
               style: {
                 color: "white",