npm - one - Versions diffs - 1.15.8 → 1.15.9 - Mend

one 1.15.8 → 1.15.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (348) hide show

package/dist/cjs/router/useScreens.cjs CHANGED Viewed

@@ -64,19 +64,13 @@ function hasMetaCharset(children) {
       if (!import_react.default.isValidElement(child)) return false;
       if (child.type === "meta") {
         const props = child.props;
-        if ("charSet" in props || "charset" in props) {
-          return true;
-        }
+        if ("charSet" in props || "charset" in props) return true;
       }
       const 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;
@@ -87,16 +81,13 @@ const {
 } = (0, import_core.createNavigatorFactory)({})();
 const cachedInlineCSSElements = typeof document !== "undefined" ? (() => {
   const elements = [];
-  const cssElements = document.querySelectorAll('style[id^="__one_css_"], link[rel="stylesheet"][data-one-css]');
-  cssElements.forEach((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((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 {
       const href = el.getAttribute("href");
       elements.push(/* @__PURE__ */(0, import_jsx_runtime.jsx)("link", {
         rel: "stylesheet",
@@ -133,13 +124,8 @@ function RootLayoutRenderer({
   } = head?.props || {};
   const serverContext = (0, import_one_server_only.useServerContext)();
   let finalChildren = children;
-  if (false) {
-    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.`);
-    }
+    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", {
@@ -148,9 +134,7 @@ function RootLayoutRenderer({
         dangerouslySetInnerHTML: {
           __html: `globalThis['global'] = globalThis`
         }
-      }), serverContext?.cssContents?.length || serverContext?.cssInlineCount ?
-      // inline/mixed CSS: render each entry as <style> (if content) or <link>
-      serverContext?.cssContents ? serverContext.cssContents.map((content, i) => content ? /* @__PURE__ */(0, import_jsx_runtime.jsx)("style", {
+      }), serverContext?.cssContents?.length || serverContext?.cssInlineCount ? serverContext?.cssContents ? serverContext.cssContents.map((content, i) => content ? /* @__PURE__ */(0, import_jsx_runtime.jsx)("style", {
         id: `__one_css_${i}`,
         dangerouslySetInnerHTML: {
           __html: content
@@ -170,25 +154,18 @@ function RootLayoutRenderer({
       })
     }, "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
-    })
-  );
+  return /* @__PURE__ */(0, import_jsx_runtime.jsx)("html", {
+    suppressHydrationWarning: true,
+    lang: "en-US",
+    ...htmlProps,
+    children: finalChildren
+  });
 }
 function getSortedChildren(children, order, initialRouteName, options) {
-  if (!order?.length) {
-    return children.sort((0, import_sortRoutes.sortRoutesWithInitial)(initialRouteName)).map(route => ({
-      route,
-      props: {}
-    }));
-  }
+  if (!order?.length) return children.sort((0, import_sortRoutes.sortRoutesWithInitial)(initialRouteName)).map(route => ({
+    route,
+    props: {}
+  }));
   const entries = [...children];
   const ordered = order.map(({
     name,
@@ -212,9 +189,7 @@ function getSortedChildren(children, order, initialRouteName, options) {
     const 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 {
@@ -227,51 +202,43 @@ function getSortedChildren(children, order, initialRouteName, options) {
       }
     };
   }).filter(Boolean);
-  if (!options?.onlyMatching) {
-    ordered.push(...entries.sort((0, import_sortRoutes.sortRoutesWithInitial)(initialRouteName)).map(route => ({
-      route,
-      props: {}
-    })));
-  }
+  if (!options?.onlyMatching) ordered.push(...entries.sort((0, import_sortRoutes.sortRoutesWithInitial)(initialRouteName)).map(route => ({
+    route,
+    props: {}
+  })));
   return ordered;
 }
 function useSortedScreens(order, options) {
   const node = (0, import_Route.useRouteNode)();
-  const sortedScreens = import_react.default.useMemo(() => {
-    const sorted = node?.children?.length ? getSortedChildren(node.children, order, node.initialRouteName, options) : [];
-    return sorted.filter(value => {
+  return import_react.default.useMemo(() => {
+    return (node?.children?.length ? getSortedChildren(node.children, order, node.initialRouteName, options) : []).filter(value => {
       const routeName = value.route.route;
       const normalized = routeName.replace(/\/index$/, "");
       return !(options?.protectedScreens?.has(routeName) || options?.protectedScreens?.has(normalized));
     }).map(value => routeToScreen(value.route, value.props));
   }, [node?.children, node?.initialRouteName, order, options?.protectedScreens]);
-  return sortedScreens;
 }
 function fromImport({
   ErrorBoundary,
   ...component
 }) {
-  if (ErrorBoundary) {
-    return {
-      default: import_react.default.forwardRef((props, ref) => {
-        const children = import_react.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: import_react.default.forwardRef((props, ref) => {
+      const children = import_react.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") {
     const exported = (0, import_getPageExport.getPageExport)(component);
-    if (exported && typeof exported === "object" && Object.keys(exported).length === 0) {
-      return {
-        default: import_EmptyRoute.EmptyRoute
-      };
-    }
+    if (exported && typeof exported === "object" && Object.keys(exported).length === 0) return {
+      default: import_EmptyRoute.EmptyRoute
+    };
   }
   return {
     default: (0, import_getPageExport.getPageExport)(component)
@@ -279,9 +246,7 @@ function fromImport({
 }
 const 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);
   const ScreenComponent = import_react.default.forwardRef((props, ref) => {
     if (process.env.NODE_ENV === "development" && true) {
       const [, setHmrKey] = (0, import_react.useState)(0);
@@ -291,14 +256,10 @@ function getQualifiedRouteComponent(value) {
         return () => window.removeEventListener("one-hmr-update", handler);
       }, []);
     }
-    const isSpaShell = (0, import_react.useContext)(import_SpaShellContext.SpaShellContext);
-    if (isSpaShell && props.segment !== "") {
-      const isServerRenderedLayout = value.children?.length && (value.layoutRenderMode === "ssg" || value.layoutRenderMode === "ssr");
-      if (!isServerRenderedLayout) {
-        return /* @__PURE__ */(0, import_jsx_runtime.jsx)("div", {
-          "data-one-spa-content": ""
-        });
-      }
+    if ((0, import_react.useContext)(import_SpaShellContext.SpaShellContext) && props.segment !== "") {
+      if (!(value.children?.length && (value.layoutRenderMode === "ssg" || value.layoutRenderMode === "ssr"))) return /* @__PURE__ */(0, import_jsx_runtime.jsx)("div", {
+        "data-one-spa-content": ""
+      });
     }
     const res = value.loadRoute();
     const Component = (0, import_getPageExport.getPageExport)(fromImport(res));
@@ -309,24 +270,18 @@ function getQualifiedRouteComponent(value) {
       console.groupEnd();
     }
     const slotProps = {};
-    if (value.slots && value.slots.size > 0) {
-      for (const [slotName] of value.slots) {
-        slotProps[slotName] = /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Navigator.NamedSlot, {
-          name: slotName,
-          layoutContextKey: value.contextKey
-        });
-      }
-    }
-    if (props.segment === "") {
-      return /* @__PURE__ */(0, import_jsx_runtime.jsx)(RootLayoutRenderer, {
-        LayoutComponent: Component,
-        layoutProps: {
-          ...props,
-          ...slotProps
-        },
-        forwardedRef: ref
-      });
-    }
+    if (value.slots && value.slots.size > 0) for (const [slotName] of value.slots) slotProps[slotName] = /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Navigator.NamedSlot, {
+      name: slotName,
+      layoutContextKey: value.contextKey
+    });
+    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, {
@@ -337,29 +292,15 @@ function getQualifiedRouteComponent(value) {
     });
   });
   const wrapSuspense = children => {
-    if (false) {
-      if (process.env.ONE_SUSPEND_ROUTES_NATIVE === "0" || globalThis.__ONE_DISABLE_SUSPENSE_ROUTES__ === true) {
-        return children;
-      }
-      return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_react.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_react.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_react.Suspense, {
+      fallback: null,
+      children
+    });
     return children;
   };
   const QualifiedRoute = import_react.default.forwardRef(({
-    // 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
   }, ref) => {
     return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Route.Route, {
@@ -367,13 +308,9 @@ function getQualifiedRouteComponent(value) {
       node: value,
       children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
         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
-          }
+          ...props,
+          ref,
+          segment: value.route
         }))
       })
     });
@@ -384,26 +321,14 @@ function getQualifiedRouteComponent(value) {
 }
 function createGetIdForRoute(route) {
   const include = /* @__PURE__ */new Map();
-  if (route.dynamic) {
-    for (const segment of route.dynamic) {
-      include.set(segment.name, segment);
-    }
-  }
+  if (route.dynamic) for (const segment of route.dynamic) include.set(segment.name, segment);
   return ({
     params = {}
   } = {}) => {
     const segments = [];
     for (const dynamic of include.values()) {
       const value = 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}]`);
     }
     return segments.join("/") ?? route.contextKey;
   };
@@ -494,7 +419,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",