@tamagui/use-window-dimensions 1.0.1-beta.188 → 1.0.1-beta.190

package/dist/cjs/index.js

@@ -21,7 +21,8 @@ __export(src_exports, {
   useWindowDimensions: () => useWindowDimensions
 });
 module.exports = __toCommonJS(src_exports);
-var import_use_did_finish_ssr = require("@tamagui/use-did-finish-ssr");
+var import_constants = require("@tamagui/constants");
+var import_react = require("react");
 var import_react_native = require("react-native");
 const initialValue = {
   fontScale: 1,
@@ -30,9 +31,12 @@ const initialValue = {
   scale: 1
 };
 function useWindowDimensions() {
+  const [state, setState] = (0, import_react.useState)(initialValue);
   const current = (0, import_react_native.useWindowDimensions)();
-  const didFinishSSR = (0, import_use_did_finish_ssr.useDidFinishSSR)();
-  return didFinishSSR ? current : initialValue;
+  (0, import_constants.useIsomorphicLayoutEffect)(() => {
+    setState(current);
+  }, [current.height, current.width, current.fontScale, current.scale]);
+  return state;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/index.ts"],
-  "sourcesContent": ["import { useDidFinishSSR } from '@tamagui/use-did-finish-ssr'\nimport { ScaledSize, useWindowDimensions as useWindowDimensionsRN } from 'react-native'\n\n/**\n * SSR safe useWindowDimensions\n */\n\nconst initialValue: ScaledSize = {\n  fontScale: 1,\n  height: 800,\n  width: 600,\n  scale: 1,\n}\n\nexport function useWindowDimensions() {\n  const current = useWindowDimensionsRN()\n  const didFinishSSR = useDidFinishSSR()\n  return didFinishSSR ? current : initialValue\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gCAAgC;AAChC,0BAAyE;AAMzE,MAAM,eAA2B;AAAA,EAC/B,WAAW;AAAA,EACX,QAAQ;AAAA,EACR,OAAO;AAAA,EACP,OAAO;AACT;AAEO,SAAS,sBAAsB;AACpC,QAAM,cAAU,oBAAAA,qBAAsB;AACtC,QAAM,mBAAe,2CAAgB;AACrC,SAAO,eAAe,UAAU;AAClC;",
+  "sourcesContent": ["import { useIsomorphicLayoutEffect } from '@tamagui/constants'\nimport { useState } from 'react'\nimport { ScaledSize, useWindowDimensions as useWindowDimensionsRN } from 'react-native'\n\n/**\n * SSR safe useWindowDimensions\n */\n\nconst initialValue: ScaledSize = {\n  fontScale: 1,\n  height: 800,\n  width: 600,\n  scale: 1,\n}\n\nexport function useWindowDimensions() {\n  const [state, setState] = useState(initialValue)\n  const current = useWindowDimensionsRN()\n\n  useIsomorphicLayoutEffect(() => {\n    setState(current)\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [current.height, current.width, current.fontScale, current.scale])\n\n  return state\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA0C;AAC1C,mBAAyB;AACzB,0BAAyE;AAMzE,MAAM,eAA2B;AAAA,EAC/B,WAAW;AAAA,EACX,QAAQ;AAAA,EACR,OAAO;AAAA,EACP,OAAO;AACT;AAEO,SAAS,sBAAsB;AACpC,QAAM,CAAC,OAAO,QAAQ,QAAI,uBAAS,YAAY;AAC/C,QAAM,cAAU,oBAAAA,qBAAsB;AAEtC,kDAA0B,MAAM;AAC9B,aAAS,OAAO;AAAA,EAElB,GAAG,CAAC,QAAQ,QAAQ,QAAQ,OAAO,QAAQ,WAAW,QAAQ,KAAK,CAAC;AAEpE,SAAO;AACT;",
   "names": ["useWindowDimensionsRN"]
 }

package/dist/esm/index.js

@@ -1,4 +1,5 @@
-import { useDidFinishSSR } from "@tamagui/use-did-finish-ssr";
+import { useIsomorphicLayoutEffect } from "@tamagui/constants";
+import { useState } from "react";
 import { useWindowDimensions as useWindowDimensionsRN } from "react-native";
 const initialValue = {
   fontScale: 1,
@@ -7,9 +8,12 @@ const initialValue = {
   scale: 1
 };
 function useWindowDimensions() {
+  const [state, setState] = useState(initialValue);
   const current = useWindowDimensionsRN();
-  const didFinishSSR = useDidFinishSSR();
-  return didFinishSSR ? current : initialValue;
+  useIsomorphicLayoutEffect(() => {
+    setState(current);
+  }, [current.height, current.width, current.fontScale, current.scale]);
+  return state;
 }
 export {
   useWindowDimensions

package/dist/esm/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/index.ts"],
-  "sourcesContent": ["import { useDidFinishSSR } from '@tamagui/use-did-finish-ssr'\nimport { ScaledSize, useWindowDimensions as useWindowDimensionsRN } from 'react-native'\n\n/**\n * SSR safe useWindowDimensions\n */\n\nconst initialValue: ScaledSize = {\n  fontScale: 1,\n  height: 800,\n  width: 600,\n  scale: 1,\n}\n\nexport function useWindowDimensions() {\n  const current = useWindowDimensionsRN()\n  const didFinishSSR = useDidFinishSSR()\n  return didFinishSSR ? current : initialValue\n}\n"],
-  "mappings": "AAAA,SAAS,uBAAuB;AAChC,SAAqB,uBAAuB,6BAA6B;AAMzE,MAAM,eAA2B;AAAA,EAC/B,WAAW;AAAA,EACX,QAAQ;AAAA,EACR,OAAO;AAAA,EACP,OAAO;AACT;AAEO,SAAS,sBAAsB;AACpC,QAAM,UAAU,sBAAsB;AACtC,QAAM,eAAe,gBAAgB;AACrC,SAAO,eAAe,UAAU;AAClC;",
+  "sourcesContent": ["import { useIsomorphicLayoutEffect } from '@tamagui/constants'\nimport { useState } from 'react'\nimport { ScaledSize, useWindowDimensions as useWindowDimensionsRN } from 'react-native'\n\n/**\n * SSR safe useWindowDimensions\n */\n\nconst initialValue: ScaledSize = {\n  fontScale: 1,\n  height: 800,\n  width: 600,\n  scale: 1,\n}\n\nexport function useWindowDimensions() {\n  const [state, setState] = useState(initialValue)\n  const current = useWindowDimensionsRN()\n\n  useIsomorphicLayoutEffect(() => {\n    setState(current)\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [current.height, current.width, current.fontScale, current.scale])\n\n  return state\n}\n"],
+  "mappings": "AAAA,SAAS,iCAAiC;AAC1C,SAAS,gBAAgB;AACzB,SAAqB,uBAAuB,6BAA6B;AAMzE,MAAM,eAA2B;AAAA,EAC/B,WAAW;AAAA,EACX,QAAQ;AAAA,EACR,OAAO;AAAA,EACP,OAAO;AACT;AAEO,SAAS,sBAAsB;AACpC,QAAM,CAAC,OAAO,QAAQ,IAAI,SAAS,YAAY;AAC/C,QAAM,UAAU,sBAAsB;AAEtC,4BAA0B,MAAM;AAC9B,aAAS,OAAO;AAAA,EAElB,GAAG,CAAC,QAAQ,QAAQ,QAAQ,OAAO,QAAQ,WAAW,QAAQ,KAAK,CAAC;AAEpE,SAAO;AACT;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/use-window-dimensions",
-  "version": "1.0.1-beta.188",
+  "version": "1.0.1-beta.190",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -18,11 +18,11 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/use-did-finish-ssr": "^1.0.1-beta.188",
+    "@tamagui/constants": "^1.0.1-beta.190",
     "react": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.0.1-beta.188",
+    "@tamagui/build": "^1.0.1-beta.190",
     "@types/react": "^18.0.15",
     "react-native": "*"
   },

package/src/index.ts

@@ -1,4 +1,5 @@
-import { useDidFinishSSR } from '@tamagui/use-did-finish-ssr'
+import { useIsomorphicLayoutEffect } from '@tamagui/constants'
+import { useState } from 'react'
 import { ScaledSize, useWindowDimensions as useWindowDimensionsRN } from 'react-native'
 
 /**
@@ -13,7 +14,13 @@ const initialValue: ScaledSize = {
 }
 
 export function useWindowDimensions() {
+  const [state, setState] = useState(initialValue)
   const current = useWindowDimensionsRN()
-  const didFinishSSR = useDidFinishSSR()
-  return didFinishSSR ? current : initialValue
+
+  useIsomorphicLayoutEffect(() => {
+    setState(current)
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [current.height, current.width, current.fontScale, current.scale])
+
+  return state
 }