@tamagui/core 1.1.2 → 1.1.4

package/dist/esm/helpers/useShallowSetState.js

@@ -1,33 +1,34 @@
 import { startTransition, useCallback } from "react";
-function useShallowSetState(setter, transition, debug, debugName) {
+function useShallowSetState(setter, debug, debugName) {
   return useCallback(
     (next) => {
-      const run = () => {
+      const shouldTransition = Object.keys(next).every(
+        (k) => transitionKeys.has(k)
+      );
+      const run = shouldTransition ? startTransition : (_) => _();
+      run(() => {
         setter((prev) => {
           for (const key in next) {
             if (prev[key] !== next[key]) {
-              if (process.env.NODE_ENV === "development") {
-                if (debug === "verbose") {
-                  console.log(` \u25B2 setState ${debugName}`, next);
-                }
+              if (process.env.NODE_ENV === "development" && debug === "verbose") {
+                console.log(` \u25B2 setState ${debugName}`, next);
               }
               return { ...prev, ...next };
             }
           }
           return prev;
         });
-      };
-      if (transition) {
-        startTransition(() => {
-          run();
-        });
-      } else {
-        run();
-      }
+      });
     },
     [setter]
   );
 }
+const transitionKeys = /* @__PURE__ */ new Set([
+  "press",
+  "pressIn",
+  "focus",
+  "unmounted"
+]);
 export {
   useShallowSetState
 };

package/dist/esm/helpers/useShallowSetState.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/useShallowSetState.tsx"],
-  "sourcesContent": ["import React, { startTransition, useCallback } from 'react'\n\nimport { DebugProp } from '../types'\n\nexport function useShallowSetState<State extends Object>(\n  setter: React.Dispatch<React.SetStateAction<State>>,\n  transition?: boolean,\n  debug?: DebugProp,\n  debugName?: string\n) {\n  return useCallback(\n    (next: Partial<State>) => {\n      const run = () => {\n        setter((prev) => {\n          for (const key in next) {\n            if (prev[key] !== next[key]) {\n              if (process.env.NODE_ENV === 'development') {\n                if (debug === 'verbose') {\n                  // eslint-disable-next-line no-console\n                  console.log(` \u25B2 setState ${debugName}`, next)\n                }\n              }\n              return { ...prev, ...next }\n            }\n          }\n          return prev\n        })\n      }\n      if (transition) {\n        startTransition(() => {\n          run()\n        })\n      } else {\n        run()\n      }\n    },\n    [setter]\n  )\n}\n"],
-  "mappings": "AAAA,SAAgB,iBAAiB,mBAAmB;AAI7C,SAAS,mBACd,QACA,YACA,OACA,WACA;AACA,SAAO;AAAA,IACL,CAAC,SAAyB;AACxB,YAAM,MAAM,MAAM;AAChB,eAAO,CAAC,SAAS;AACf,qBAAW,OAAO,MAAM;AACtB,gBAAI,KAAK,SAAS,KAAK,MAAM;AAC3B,kBAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,oBAAI,UAAU,WAAW;AAEvB,0BAAQ,IAAI,oBAAe,aAAa,IAAI;AAAA,gBAC9C;AAAA,cACF;AACA,qBAAO,EAAE,GAAG,MAAM,GAAG,KAAK;AAAA,YAC5B;AAAA,UACF;AACA,iBAAO;AAAA,QACT,CAAC;AAAA,MACH;AACA,UAAI,YAAY;AACd,wBAAgB,MAAM;AACpB,cAAI;AAAA,QACN,CAAC;AAAA,MACH,OAAO;AACL,YAAI;AAAA,MACN;AAAA,IACF;AAAA,IACA,CAAC,MAAM;AAAA,EACT;AACF;",
+  "sourcesContent": ["import React, { startTransition, useCallback } from 'react'\n\nimport { DebugProp } from '../types'\nimport { TamaguiComponentState } from '..'\n\nexport function useShallowSetState<State extends TamaguiComponentState>(\n  setter: React.Dispatch<React.SetStateAction<State>>,\n  debug?: DebugProp,\n  debugName?: string\n) {\n  return useCallback(\n    (next: Partial<State>) => {\n      const shouldTransition = Object.keys(next).every((k) =>\n        transitionKeys.has(k as any)\n      )\n      const run = shouldTransition ? startTransition : (_) => _()\n      run(() => {\n        setter((prev) => {\n          for (const key in next) {\n            if (prev[key] !== next[key]) {\n              if (process.env.NODE_ENV === 'development' && debug === 'verbose') {\n                // eslint-disable-next-line no-console\n                console.log(` \u25B2 setState ${debugName}`, next)\n              }\n              return { ...prev, ...next }\n            }\n          }\n          return prev\n        })\n      })\n    },\n    [setter]\n  )\n}\n\nconst transitionKeys = new Set<keyof TamaguiComponentState>([\n  'press',\n  'pressIn',\n  'focus',\n  'unmounted',\n])\n"],
+  "mappings": "AAAA,SAAgB,iBAAiB,mBAAmB;AAK7C,SAAS,mBACd,QACA,OACA,WACA;AACA,SAAO;AAAA,IACL,CAAC,SAAyB;AACxB,YAAM,mBAAmB,OAAO,KAAK,IAAI,EAAE;AAAA,QAAM,CAAC,MAChD,eAAe,IAAI,CAAQ;AAAA,MAC7B;AACA,YAAM,MAAM,mBAAmB,kBAAkB,CAAC,MAAM,EAAE;AAC1D,UAAI,MAAM;AACR,eAAO,CAAC,SAAS;AACf,qBAAW,OAAO,MAAM;AACtB,gBAAI,KAAK,SAAS,KAAK,MAAM;AAC3B,kBAAI,QAAQ,IAAI,aAAa,iBAAiB,UAAU,WAAW;AAEjE,wBAAQ,IAAI,oBAAe,aAAa,IAAI;AAAA,cAC9C;AACA,qBAAO,EAAE,GAAG,MAAM,GAAG,KAAK;AAAA,YAC5B;AAAA,UACF;AACA,iBAAO;AAAA,QACT,CAAC;AAAA,MACH,CAAC;AAAA,IACH;AAAA,IACA,CAAC,MAAM;AAAA,EACT;AACF;AAEA,MAAM,iBAAiB,oBAAI,IAAiC;AAAA,EAC1D;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,CAAC;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -30,22 +30,22 @@
     "reset.css"
   ],
   "dependencies": {
-    "@tamagui/compose-refs": "^1.1.2",
-    "@tamagui/constants": "^1.1.2",
-    "@tamagui/helpers": "^1.1.2",
-    "@tamagui/normalize-css-color": "^1.1.2",
-    "@tamagui/react-native-use-pressable": "^1.1.2",
-    "@tamagui/react-native-use-responder-events": "^1.1.2",
-    "@tamagui/use-did-finish-ssr": "^1.1.2",
-    "@tamagui/use-event": "^1.1.2",
-    "@tamagui/use-force-update": "^1.1.2"
+    "@tamagui/compose-refs": "^1.1.4",
+    "@tamagui/constants": "^1.1.4",
+    "@tamagui/helpers": "^1.1.4",
+    "@tamagui/normalize-css-color": "^1.1.4",
+    "@tamagui/react-native-use-pressable": "^1.1.4",
+    "@tamagui/react-native-use-responder-events": "^1.1.4",
+    "@tamagui/use-did-finish-ssr": "^1.1.4",
+    "@tamagui/use-event": "^1.1.4",
+    "@tamagui/use-force-update": "^1.1.4"
   },
   "peerDependencies": {
     "react": "*",
     "react-dom": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.1.2",
+    "@tamagui/build": "^1.1.4",
     "@testing-library/react": "^13.4.0",
     "csstype": "^3.0.10",
     "react": "^18.2.0",

package/src/createComponent.tsx

@@ -200,7 +200,7 @@ export function createComponent<
       ? { ...states[0], [propsIn.forceStyle]: true }
       : states[0]
     const setState = states[1]
-    const setStateShallow = useShallowSetState(setState, true, debugProp, componentName)
+    const setStateShallow = useShallowSetState(setState, debugProp, componentName)
 
     // conditional but if ever true stays true
     // [animated, inversed]

package/src/createTamagui.ts

@@ -215,7 +215,9 @@ export function createTamagui<Conf extends CreateTamaguiProps>(
     tokensParsed,
     parsed: true,
     getCSS: (separator = '\n') => {
-      return `.t_unmounted .t_will-mount {opacity:0;visibility:hidden;}
+      return `
+._ovs-contain {overscroll-behavior:contain;}
+.t_unmounted .t_will-mount {opacity:0;visibility:hidden;}
 .is_Text .is_Text {display:inline-flex;}
 ._dsp_contents {display:contents;}
 ${themeConfig.cssRuleSets.join(separator)}

package/src/helpers/useShallowSetState.tsx

@@ -1,39 +1,41 @@
 import React, { startTransition, useCallback } from 'react'
 
 import { DebugProp } from '../types'
+import { TamaguiComponentState } from '..'
 
-export function useShallowSetState<State extends Object>(
+export function useShallowSetState<State extends TamaguiComponentState>(
   setter: React.Dispatch<React.SetStateAction<State>>,
-  transition?: boolean,
   debug?: DebugProp,
   debugName?: string
 ) {
   return useCallback(
     (next: Partial<State>) => {
-      const run = () => {
+      const shouldTransition = Object.keys(next).every((k) =>
+        transitionKeys.has(k as any)
+      )
+      const run = shouldTransition ? startTransition : (_) => _()
+      run(() => {
         setter((prev) => {
           for (const key in next) {
             if (prev[key] !== next[key]) {
-              if (process.env.NODE_ENV === 'development') {
-                if (debug === 'verbose') {
-                  // eslint-disable-next-line no-console
-                  console.log(` ▲ setState ${debugName}`, next)
-                }
+              if (process.env.NODE_ENV === 'development' && debug === 'verbose') {
+                // eslint-disable-next-line no-console
+                console.log(` ▲ setState ${debugName}`, next)
               }
               return { ...prev, ...next }
             }
           }
           return prev
         })
-      }
-      if (transition) {
-        startTransition(() => {
-          run()
-        })
-      } else {
-        run()
-      }
+      })
     },
     [setter]
   )
 }
+
+const transitionKeys = new Set<keyof TamaguiComponentState>([
+  'press',
+  'pressIn',
+  'focus',
+  'unmounted',
+])

package/src/types.tsx

@@ -103,7 +103,7 @@ type Tokenify<A extends GenericTokens> = {
 }
 
 type TokenifyRecord<A extends CreateTokens[keyof CreateTokens]> = {
-  [Key in keyof A]: Variable<A[Key]>
+  [Key in keyof A]: A[Key] extends Variable ? A[Key] : Variable<A[Key]>
 }
 
 export type TamaguiBaseTheme = {

package/types/helpers/useShallowSetState.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
 import { DebugProp } from '../types';
-export declare function useShallowSetState<State extends Object>(setter: React.Dispatch<React.SetStateAction<State>>, transition?: boolean, debug?: DebugProp, debugName?: string): (next: Partial<State>) => void;
+import { TamaguiComponentState } from '..';
+export declare function useShallowSetState<State extends TamaguiComponentState>(setter: React.Dispatch<React.SetStateAction<State>>, debug?: DebugProp, debugName?: string): (next: Partial<State>) => void;
 //# sourceMappingURL=useShallowSetState.d.ts.map

package/types/types.d.ts

@@ -74,7 +74,7 @@ type Tokenify<A extends GenericTokens> = {
     zIndex: TokenifyRecord<A['zIndex']>;
 };
 type TokenifyRecord<A extends CreateTokens[keyof CreateTokens]> = {
-    [Key in keyof A]: Variable<A[Key]>;
+    [Key in keyof A]: A[Key] extends Variable ? A[Key] : Variable<A[Key]>;
 };
 export type TamaguiBaseTheme = {
     background: VariableColorVal;