@tamagui/use-did-finish-ssr 1.46.2 → 1.47.0

package/dist/cjs/index.js

@@ -22,29 +22,20 @@ __export(src_exports, {
   useDidFinishSSR: () => useDidFinishSSR
 });
 module.exports = __toCommonJS(src_exports);
-var import_constants = require("@tamagui/constants");
 var import_react = require("react");
-function useDidFinishSSR() {
-  if (import_constants.isServer) {
-    return false;
-  }
-  const [did, setDid] = (0, import_react.useState)(false);
-  (0, import_constants.useIsomorphicLayoutEffect)(() => {
-    (0, import_react.startTransition)(() => {
-      setDid(true);
-    });
-  }, []);
-  return did;
+const emptyFn = () => {
+};
+const emptyFnFn = () => emptyFn;
+function useDidFinishSSR(value) {
+  return (0, import_react.useSyncExternalStore)(
+    emptyFnFn,
+    () => value == void 0 ? true : value,
+    () => false
+  );
 }
 function useClientValue(value) {
-  if (import_constants.isServer) {
-    return;
-  }
-  const [v, setV] = (0, import_react.useState)(void 0);
-  (0, import_constants.useIsomorphicLayoutEffect)(() => {
-    setV(value);
-  }, []);
-  return v;
+  const done = useDidFinishSSR();
+  return !done ? void 0 : typeof value === "function" ? value() : value;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/index.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/index.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAoD;AACpD,mBAA0C;AAEnC,SAAS,kBAAkB;AAEhC,MAAI,2BAAU;AACZ,WAAO;AAAA,EACT;AAEA,QAAM,CAAC,KAAK,MAAM,QAAI,uBAAkB,KAAK;AAE7C,kDAA0B,MAAM;AAC9B,sCAAgB,MAAM;AACpB,aAAO,IAAI;AAAA,IACb,CAAC;AAAA,EACH,GAAG,CAAC,CAAC;AAEL,SAAO;AACT;AAIO,SAAS,eACd,OACoC;AACpC,MAAI,2BAAU;AACZ;AAAA,EACF;AAEA,QAAM,CAAC,GAAG,IAAI,QAAI,uBAA6C,MAAS;AAExE,kDAA0B,MAAM;AAE9B,SAAK,KAAK;AAAA,EACZ,GAAG,CAAC,CAAC;AAEL,SAAO;AACT;",
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAqC;AAErC,MAAM,UAAU,MAAM;AAAC;AACvB,MAAM,YAAY,MAAM;AAEjB,SAAS,gBAAyC,OAAsB;AAC7E,aAAO;AAAA,IACL;AAAA,IACA,MAAO,SAAS,SAAY,OAAO;AAAA,IACnC,MAAM;AAAA,EACR;AACF;AAIO,SAAS,eACd,OACoC;AACpC,QAAM,OAAO,gBAAgB;AAC7B,SAAO,CAAC,OAAO,SAAY,OAAO,UAAU,aAAa,MAAM,IAAI;AACrE;",
   "names": []
 }

package/dist/esm/index.js

@@ -1,26 +1,17 @@
-import { isServer, useIsomorphicLayoutEffect } from "@tamagui/constants";
-import { startTransition, useState } from "react";
-function useDidFinishSSR() {
-  if (isServer) {
-    return false;
-  }
-  const [did, setDid] = useState(false);
-  useIsomorphicLayoutEffect(() => {
-    startTransition(() => {
-      setDid(true);
-    });
-  }, []);
-  return did;
+import { useSyncExternalStore } from "react";
+const emptyFn = () => {
+};
+const emptyFnFn = () => emptyFn;
+function useDidFinishSSR(value) {
+  return useSyncExternalStore(
+    emptyFnFn,
+    () => value == void 0 ? true : value,
+    () => false
+  );
 }
 function useClientValue(value) {
-  if (isServer) {
-    return;
-  }
-  const [v, setV] = useState(void 0);
-  useIsomorphicLayoutEffect(() => {
-    setV(value);
-  }, []);
-  return v;
+  const done = useDidFinishSSR();
+  return !done ? void 0 : typeof value === "function" ? value() : value;
 }
 export {
   useClientValue,

package/dist/esm/index.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/index.ts"],
-  "mappings": "AAAA,SAAS,UAAU,iCAAiC;AACpD,SAAS,iBAAiB,gBAAgB;AAEnC,SAAS,kBAAkB;AAEhC,MAAI,UAAU;AACZ,WAAO;AAAA,EACT;AAEA,QAAM,CAAC,KAAK,MAAM,IAAI,SAAkB,KAAK;AAE7C,4BAA0B,MAAM;AAC9B,oBAAgB,MAAM;AACpB,aAAO,IAAI;AAAA,IACb,CAAC;AAAA,EACH,GAAG,CAAC,CAAC;AAEL,SAAO;AACT;AAIO,SAAS,eACd,OACoC;AACpC,MAAI,UAAU;AACZ;AAAA,EACF;AAEA,QAAM,CAAC,GAAG,IAAI,IAAI,SAA6C,MAAS;AAExE,4BAA0B,MAAM;AAE9B,SAAK,KAAK;AAAA,EACZ,GAAG,CAAC,CAAC;AAEL,SAAO;AACT;",
+  "mappings": "AAAA,SAAS,4BAA4B;AAErC,MAAM,UAAU,MAAM;AAAC;AACvB,MAAM,YAAY,MAAM;AAEjB,SAAS,gBAAyC,OAAsB;AAC7E,SAAO;AAAA,IACL;AAAA,IACA,MAAO,SAAS,SAAY,OAAO;AAAA,IACnC,MAAM;AAAA,EACR;AACF;AAIO,SAAS,eACd,OACoC;AACpC,QAAM,OAAO,gBAAgB;AAC7B,SAAO,CAAC,OAAO,SAAY,OAAO,UAAU,aAAa,MAAM,IAAI;AACrE;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/use-did-finish-ssr",
-  "version": "1.46.2",
+  "version": "1.47.0",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -26,10 +26,10 @@
     }
   },
   "dependencies": {
-    "@tamagui/constants": "1.46.2"
+    "@tamagui/constants": "1.47.0"
   },
   "devDependencies": {
-    "@tamagui/build": "1.46.2",
+    "@tamagui/build": "1.47.0",
     "react": "^18.2.0"
   },
   "peerDependencies": {

package/src/index.ts

@@ -1,21 +1,14 @@
-import { isServer, useIsomorphicLayoutEffect } from '@tamagui/constants'
-import { startTransition, useState } from 'react'
+import { useSyncExternalStore } from 'react'
 
-export function useDidFinishSSR() {
-  // conditional hook because it never changes if already true
-  if (isServer) {
-    return false
-  }
+const emptyFn = () => {}
+const emptyFnFn = () => emptyFn
 
-  const [did, setDid] = useState<boolean>(false)
-
-  useIsomorphicLayoutEffect(() => {
-    startTransition(() => {
-      setDid(true)
-    })
-  }, [])
-
-  return did
+export function useDidFinishSSR<A extends any = boolean>(value?: A): A | false {
+  return useSyncExternalStore(
+    emptyFnFn,
+    () => (value == undefined ? true : value),
+    () => false as any
+  )
 }
 
 type FunctionOrValue<Value> = Value extends () => infer X ? X : Value
@@ -23,16 +16,6 @@ type FunctionOrValue<Value> = Value extends () => infer X ? X : Value
 export function useClientValue<Value extends any>(
   value?: Value
 ): FunctionOrValue<Value> | undefined {
-  if (isServer) {
-    return
-  }
-
-  const [v, setV] = useState<FunctionOrValue<Value> | undefined>(undefined)
-
-  useIsomorphicLayoutEffect(() => {
-    // @ts-expect-error (this works with a function)
-    setV(value)
-  }, [])
-
-  return v
+  const done = useDidFinishSSR()
+  return !done ? undefined : typeof value === 'function' ? value() : value
 }

package/types/index.d.ts

@@ -1,4 +1,4 @@
-export declare function useDidFinishSSR(): boolean;
+export declare function useDidFinishSSR<A extends any = boolean>(value?: A): A | false;
 type FunctionOrValue<Value> = Value extends () => infer X ? X : Value;
 export declare function useClientValue<Value extends any>(value?: Value): FunctionOrValue<Value> | undefined;
 export {};

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,wBAAgB,eAAe,YAe9B;AAED,KAAK,eAAe,CAAC,KAAK,IAAI,KAAK,SAAS,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;AAErE,wBAAgB,cAAc,CAAC,KAAK,SAAS,GAAG,EAC9C,KAAK,CAAC,EAAE,KAAK,GACZ,eAAe,CAAC,KAAK,CAAC,GAAG,SAAS,CAapC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,wBAAgB,eAAe,CAAC,CAAC,SAAS,GAAG,GAAG,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,CAM7E;AAED,KAAK,eAAe,CAAC,KAAK,IAAI,KAAK,SAAS,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;AAErE,wBAAgB,cAAc,CAAC,KAAK,SAAS,GAAG,EAC9C,KAAK,CAAC,EAAE,KAAK,GACZ,eAAe,CAAC,KAAK,CAAC,GAAG,SAAS,CAGpC"}