@tamagui/web 2.3.3 → 2.4.0
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.
- package/.turbo/turbo-build.log +1 -1
- package/dist/cjs/createComponent.native.js +1 -1
- package/dist/cjs/createComponent.native.js.map +1 -1
- package/dist/cjs/helpers/getSplitStyles.cjs +5 -0
- package/dist/cjs/helpers/getSplitStyles.native.js +9 -0
- package/dist/cjs/helpers/getSplitStyles.native.js.map +1 -1
- package/dist/cjs/helpers/pointerEvents.native.js +26 -20
- package/dist/cjs/helpers/pointerEvents.native.js.map +1 -1
- package/dist/cjs/hooks/useComponentState.cjs +25 -1
- package/dist/cjs/hooks/useComponentState.native.js +25 -1
- package/dist/cjs/hooks/useComponentState.native.js.map +1 -1
- package/dist/cjs/hooks/useMedia.cjs +107 -42
- package/dist/cjs/hooks/useMedia.native.js +149 -60
- package/dist/cjs/hooks/useMedia.native.js.map +1 -1
- package/dist/cjs/hooks/useTheme.cjs +17 -4
- package/dist/cjs/hooks/useTheme.native.js +18 -4
- package/dist/cjs/hooks/useTheme.native.js.map +1 -1
- package/dist/cjs/hooks/useThemeState.cjs +132 -67
- package/dist/cjs/hooks/useThemeState.native.js +144 -70
- package/dist/cjs/hooks/useThemeState.native.js.map +1 -1
- package/dist/cjs/index.cjs +2 -0
- package/dist/cjs/index.native.js +2 -0
- package/dist/cjs/index.native.js.map +1 -1
- package/dist/cjs/views/Theme.cjs +1 -1
- package/dist/cjs/views/Theme.native.js +1 -1
- package/dist/cjs/views/Theme.native.js.map +1 -1
- package/dist/esm/createComponent.native.js +2 -2
- package/dist/esm/createComponent.native.js.map +1 -1
- package/dist/esm/helpers/getSplitStyles.mjs +5 -0
- package/dist/esm/helpers/getSplitStyles.mjs.map +1 -1
- package/dist/esm/helpers/getSplitStyles.native.js +9 -0
- package/dist/esm/helpers/getSplitStyles.native.js.map +1 -1
- package/dist/esm/helpers/pointerEvents.native.js +26 -20
- package/dist/esm/helpers/pointerEvents.native.js.map +1 -1
- package/dist/esm/hooks/useComponentState.mjs +26 -2
- package/dist/esm/hooks/useComponentState.mjs.map +1 -1
- package/dist/esm/hooks/useComponentState.native.js +26 -2
- package/dist/esm/hooks/useComponentState.native.js.map +1 -1
- package/dist/esm/hooks/useMedia.mjs +108 -43
- package/dist/esm/hooks/useMedia.mjs.map +1 -1
- package/dist/esm/hooks/useMedia.native.js +150 -61
- package/dist/esm/hooks/useMedia.native.js.map +1 -1
- package/dist/esm/hooks/useTheme.mjs +17 -4
- package/dist/esm/hooks/useTheme.mjs.map +1 -1
- package/dist/esm/hooks/useTheme.native.js +18 -4
- package/dist/esm/hooks/useTheme.native.js.map +1 -1
- package/dist/esm/hooks/useThemeState.mjs +133 -68
- package/dist/esm/hooks/useThemeState.mjs.map +1 -1
- package/dist/esm/hooks/useThemeState.native.js +145 -71
- package/dist/esm/hooks/useThemeState.native.js.map +1 -1
- package/dist/esm/index.js +3 -3
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/index.mjs +3 -3
- package/dist/esm/index.mjs.map +1 -1
- package/dist/esm/index.native.js +3 -3
- package/dist/esm/index.native.js.map +1 -1
- package/dist/esm/views/Theme.mjs +1 -1
- package/dist/esm/views/Theme.mjs.map +1 -1
- package/dist/esm/views/Theme.native.js +1 -1
- package/dist/esm/views/Theme.native.js.map +1 -1
- package/package.json +13 -13
- package/src/createComponent.tsx +8 -2
- package/src/helpers/getSplitStyles.tsx +33 -0
- package/src/helpers/pointerEvents.native.ts +26 -19
- package/src/hooks/useComponentState.ts +39 -2
- package/src/hooks/useMedia.tsx +147 -42
- package/src/hooks/useTheme.tsx +27 -5
- package/src/hooks/useThemeState.ts +263 -137
- package/src/index.ts +7 -1
- package/src/types.tsx +53 -5
- package/src/views/Theme.tsx +4 -1
- package/types/createComponent.d.ts.map +1 -1
- package/types/helpers/getSplitStyles.d.ts.map +1 -1
- package/types/helpers/pointerEvents.native.d.ts.map +1 -1
- package/types/hooks/useComponentState.d.ts +1 -1
- package/types/hooks/useComponentState.d.ts.map +1 -1
- package/types/hooks/useMedia.d.ts.map +1 -1
- package/types/hooks/useTheme.d.ts +1 -1
- package/types/hooks/useTheme.d.ts.map +1 -1
- package/types/hooks/useThemeState.d.ts +1 -1
- package/types/hooks/useThemeState.d.ts.map +1 -1
- package/types/index.d.ts +2 -2
- package/types/index.d.ts.map +1 -1
- package/types/types.d.ts +3 -1
- package/types/types.d.ts.map +1 -1
- package/types/views/Theme.d.ts.map +1 -1
package/dist/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["autoVariables","mutatedAutoVariables","insertStyleRules","getConfig","getSetting","getStyleCompat","getThemes","getToken","getTokens","getTokenValue","loadAnimationDriver","setConfig","setupDev","updateConfig","setNonce","_disableMediaTouch","configureMedia","mediaKeyMatch","useMedia","mediaObjectToString","getMedia","mediaQueryConfig","mediaState","forceUpdateThemes"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,SAASA,aAAA,EAAeC,oBAAA,QAA4B;AACpD,SAASC,gBAAA,QAAwB;AACjC,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAOd,cAAc;AAEd,SACEC,SAAA,EACAC,UAAA,EACAC,cAAA,EACAC,SAAA,EACAC,QAAA,EACAC,SAAA,EACAC,aAAA,EACAC,mBAAA,EACAC,SAAA,EACAC,QAAA,EACAC,YAAA,QAEK;AAEP,SAASC,QAAA,QAAgB;AAEzB,cAAc;AAEd,cAAc;AACd,SACEC,kBAAA,EACAC,cAAA,EACAC,aAAA,EACAC,QAAA,QACK;AACP,SAASC,mBAAA,QAA2B;AACpC,
|
|
1
|
+
{"version":3,"names":["autoVariables","mutatedAutoVariables","insertStyleRules","getConfig","getSetting","getStyleCompat","getThemes","getToken","getTokens","getTokenValue","loadAnimationDriver","setConfig","setupDev","updateConfig","setNonce","_disableMediaTouch","configureMedia","mediaKeyMatch","updateMediaListeners","useMedia","mediaObjectToString","getMedia","mediaQueryConfig","mediaState","setMediaState","forceUpdateThemes"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,SAASA,aAAA,EAAeC,oBAAA,QAA4B;AACpD,SAASC,gBAAA,QAAwB;AACjC,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAOd,cAAc;AAEd,SACEC,SAAA,EACAC,UAAA,EACAC,cAAA,EACAC,SAAA,EACAC,QAAA,EACAC,SAAA,EACAC,aAAA,EACAC,mBAAA,EACAC,SAAA,EACAC,QAAA,EACAC,YAAA,QAEK;AAEP,SAASC,QAAA,QAAgB;AAEzB,cAAc;AAEd,cAAc;AACd,SACEC,kBAAA,EACAC,cAAA,EACAC,aAAA,EACAC,oBAAA,EACAC,QAAA,QACK;AACP,SAASC,mBAAA,QAA2B;AACpC,SACEC,QAAA,EACAC,gBAAA,EACAC,UAAA,EACAC,aAAA,QACK;AACP,cAAc;AACd,cAAc;AACd,cAAc;AACd,SAASC,iBAAA,QAAyB;AAElC,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc","ignoreList":[]}
|
package/dist/esm/index.mjs
CHANGED
|
@@ -48,9 +48,9 @@ import { getConfig, getSetting, getStyleCompat, getThemes, getToken, getTokens,
|
|
|
48
48
|
import { setNonce } from "./helpers/insertStyleRule.mjs";
|
|
49
49
|
export * from "./constants/constants.mjs";
|
|
50
50
|
export * from "./hooks/useIsTouchDevice.mjs";
|
|
51
|
-
import { _disableMediaTouch, configureMedia, mediaKeyMatch, useMedia } from "./hooks/useMedia.mjs";
|
|
51
|
+
import { _disableMediaTouch, configureMedia, mediaKeyMatch, updateMediaListeners, useMedia } from "./hooks/useMedia.mjs";
|
|
52
52
|
import { mediaObjectToString } from "./helpers/mediaObjectToString.mjs";
|
|
53
|
-
import { getMedia, mediaQueryConfig, mediaState } from "./helpers/mediaState.mjs";
|
|
53
|
+
import { getMedia, mediaQueryConfig, mediaState, setMediaState } from "./helpers/mediaState.mjs";
|
|
54
54
|
export * from "./hooks/useProps.mjs";
|
|
55
55
|
export * from "./hooks/useTheme.mjs";
|
|
56
56
|
export * from "./hooks/useThemeName.mjs";
|
|
@@ -70,5 +70,5 @@ export * from "@tamagui/helpers";
|
|
|
70
70
|
export * from "@tamagui/use-did-finish-ssr";
|
|
71
71
|
export * from "@tamagui/use-event";
|
|
72
72
|
export * from "./setupHooks.mjs";
|
|
73
|
-
export { _disableMediaTouch, autoVariables, configureMedia, forceUpdateThemes, getConfig, getMedia, getSetting, getStyleCompat, getThemes, getToken, getTokenValue, getTokens, insertStyleRules, loadAnimationDriver, mediaKeyMatch, mediaObjectToString, mediaQueryConfig, mediaState, mutatedAutoVariables, setConfig, setNonce, setupDev, updateConfig, useMedia };
|
|
73
|
+
export { _disableMediaTouch, autoVariables, configureMedia, forceUpdateThemes, getConfig, getMedia, getSetting, getStyleCompat, getThemes, getToken, getTokenValue, getTokens, insertStyleRules, loadAnimationDriver, mediaKeyMatch, mediaObjectToString, mediaQueryConfig, mediaState, mutatedAutoVariables, setConfig, setMediaState, setNonce, setupDev, updateConfig, updateMediaListeners, useMedia };
|
|
74
74
|
//# sourceMappingURL=index.mjs.map
|
package/dist/esm/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["autoVariables","mutatedAutoVariables","insertStyleRules","getConfig","getSetting","getStyleCompat","getThemes","getToken","getTokens","getTokenValue","loadAnimationDriver","setConfig","setupDev","updateConfig","setNonce","_disableMediaTouch","configureMedia","mediaKeyMatch","useMedia","mediaObjectToString","getMedia","mediaQueryConfig","mediaState","forceUpdateThemes"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,SAASA,aAAA,EAAeC,oBAAA,QAA4B;AACpD,SAASC,gBAAA,QAAwB;AACjC,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAOd,cAAc;AAEd,SACEC,SAAA,EACAC,UAAA,EACAC,cAAA,EACAC,SAAA,EACAC,QAAA,EACAC,SAAA,EACAC,aAAA,EACAC,mBAAA,EACAC,SAAA,EACAC,QAAA,EACAC,YAAA,QAEK;AAEP,SAASC,QAAA,QAAgB;AAEzB,cAAc;AAEd,cAAc;AACd,SACEC,kBAAA,EACAC,cAAA,EACAC,aAAA,EACAC,QAAA,QACK;AACP,SAASC,mBAAA,QAA2B;AACpC,
|
|
1
|
+
{"version":3,"names":["autoVariables","mutatedAutoVariables","insertStyleRules","getConfig","getSetting","getStyleCompat","getThemes","getToken","getTokens","getTokenValue","loadAnimationDriver","setConfig","setupDev","updateConfig","setNonce","_disableMediaTouch","configureMedia","mediaKeyMatch","updateMediaListeners","useMedia","mediaObjectToString","getMedia","mediaQueryConfig","mediaState","setMediaState","forceUpdateThemes"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,SAASA,aAAA,EAAeC,oBAAA,QAA4B;AACpD,SAASC,gBAAA,QAAwB;AACjC,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAOd,cAAc;AAEd,SACEC,SAAA,EACAC,UAAA,EACAC,cAAA,EACAC,SAAA,EACAC,QAAA,EACAC,SAAA,EACAC,aAAA,EACAC,mBAAA,EACAC,SAAA,EACAC,QAAA,EACAC,YAAA,QAEK;AAEP,SAASC,QAAA,QAAgB;AAEzB,cAAc;AAEd,cAAc;AACd,SACEC,kBAAA,EACAC,cAAA,EACAC,aAAA,EACAC,oBAAA,EACAC,QAAA,QACK;AACP,SAASC,mBAAA,QAA2B;AACpC,SACEC,QAAA,EACAC,gBAAA,EACAC,UAAA,EACAC,aAAA,QACK;AACP,cAAc;AACd,cAAc;AACd,cAAc;AACd,SAASC,iBAAA,QAAyB;AAElC,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc","ignoreList":[]}
|
package/dist/esm/index.native.js
CHANGED
|
@@ -48,9 +48,9 @@ import { getConfig, getSetting, getStyleCompat, getThemes, getToken, getTokens,
|
|
|
48
48
|
import { setNonce } from "./helpers/insertStyleRule.native.js";
|
|
49
49
|
export * from "./constants/constants.native.js";
|
|
50
50
|
export * from "./hooks/useIsTouchDevice.native.js";
|
|
51
|
-
import { _disableMediaTouch, configureMedia, mediaKeyMatch, useMedia } from "./hooks/useMedia.native.js";
|
|
51
|
+
import { _disableMediaTouch, configureMedia, mediaKeyMatch, updateMediaListeners, useMedia } from "./hooks/useMedia.native.js";
|
|
52
52
|
import { mediaObjectToString } from "./helpers/mediaObjectToString.native.js";
|
|
53
|
-
import { getMedia, mediaQueryConfig, mediaState } from "./helpers/mediaState.native.js";
|
|
53
|
+
import { getMedia, mediaQueryConfig, mediaState, setMediaState } from "./helpers/mediaState.native.js";
|
|
54
54
|
export * from "./hooks/useProps.native.js";
|
|
55
55
|
export * from "./hooks/useTheme.native.js";
|
|
56
56
|
export * from "./hooks/useThemeName.native.js";
|
|
@@ -70,5 +70,5 @@ export * from "@tamagui/helpers";
|
|
|
70
70
|
export * from "@tamagui/use-did-finish-ssr";
|
|
71
71
|
export * from "@tamagui/use-event";
|
|
72
72
|
export * from "./setupHooks.native.js";
|
|
73
|
-
export { _disableMediaTouch, autoVariables, configureMedia, forceUpdateThemes, getConfig, getMedia, getSetting, getStyleCompat, getThemes, getToken, getTokenValue, getTokens, insertStyleRules, loadAnimationDriver, mediaKeyMatch, mediaObjectToString, mediaQueryConfig, mediaState, mutatedAutoVariables, setConfig, setNonce, setupDev, updateConfig, useMedia };
|
|
73
|
+
export { _disableMediaTouch, autoVariables, configureMedia, forceUpdateThemes, getConfig, getMedia, getSetting, getStyleCompat, getThemes, getToken, getTokenValue, getTokens, insertStyleRules, loadAnimationDriver, mediaKeyMatch, mediaObjectToString, mediaQueryConfig, mediaState, mutatedAutoVariables, setConfig, setMediaState, setNonce, setupDev, updateConfig, updateMediaListeners, useMedia };
|
|
74
74
|
//# sourceMappingURL=index.native.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["autoVariables","mutatedAutoVariables","insertStyleRules","getConfig","getSetting","getStyleCompat","getThemes","getToken","getTokens","getTokenValue","loadAnimationDriver","setConfig","setupDev","updateConfig","setNonce","_disableMediaTouch","configureMedia","mediaKeyMatch","useMedia","mediaObjectToString","getMedia","mediaQueryConfig","mediaState","forceUpdateThemes"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,SAASA,aAAA,EAAeC,oBAAA,QAA4B;AACpD,SAASC,gBAAA,QAAwB;AACjC,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAOd,cAAc;AAEd,SAAAC,SAAA,EAAAC,UAAA,EAAAC,cAAA,EAAAC,SAAA,EAAAC,QAAA,EAAAC,SAAA,EAAAC,aAAA,EAAAC,mBAAA,EAAAC,SAAA,EAAAC,QAAA,EAAAC,YAAA;AAAA,SACEC,QAAA;AAAA,cACA;AAAA,cACA;AAAA,SACAC,kBAAA,EAAAC,cAAA,EAAAC,aAAA,EAAAC,QAAA;AAAA,SACAC,mBAAA;AAAA,SACAC,QAAA,EAAAC,gBAAA,EAAAC,UAAA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,SACAC,iBAAA;AAAA,cACA;AAAA,cAEK;AAEP,cAAS,gCAAgB;AAEzB,cAAc;AAEd,cAAc;AACd;AAAA,cACE;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACK;AACP,cAAS
|
|
1
|
+
{"version":3,"names":["autoVariables","mutatedAutoVariables","insertStyleRules","getConfig","getSetting","getStyleCompat","getThemes","getToken","getTokens","getTokenValue","loadAnimationDriver","setConfig","setupDev","updateConfig","setNonce","_disableMediaTouch","configureMedia","mediaKeyMatch","updateMediaListeners","useMedia","mediaObjectToString","getMedia","mediaQueryConfig","mediaState","setMediaState","forceUpdateThemes"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,SAASA,aAAA,EAAeC,oBAAA,QAA4B;AACpD,SAASC,gBAAA,QAAwB;AACjC,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAOd,cAAc;AAEd,SAAAC,SAAA,EAAAC,UAAA,EAAAC,cAAA,EAAAC,SAAA,EAAAC,QAAA,EAAAC,SAAA,EAAAC,aAAA,EAAAC,mBAAA,EAAAC,SAAA,EAAAC,QAAA,EAAAC,YAAA;AAAA,SACEC,QAAA;AAAA,cACA;AAAA,cACA;AAAA,SACAC,kBAAA,EAAAC,cAAA,EAAAC,aAAA,EAAAC,oBAAA,EAAAC,QAAA;AAAA,SACAC,mBAAA;AAAA,SACAC,QAAA,EAAAC,gBAAA,EAAAC,UAAA,EAAAC,aAAA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,SACAC,iBAAA;AAAA,cACA;AAAA,cAEK;AAEP,cAAS,gCAAgB;AAEzB,cAAc;AAEd,cAAc;AACd;AAAA,cACE;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACK;AACP,cAAS,6BAA2B;AACpC;AAAA,cACE;AAAA,SAEAV,kBAAA,EACAf,aAAA,EAAAgB,cACK,EACPS,iBAAc,EACdtB,SAAA,EACAkB,QAAA,EACAjB,UAAS,EAETC,cAAc,EACdC,SAAA,EACAC,QAAA,EACAE,aAAc,EACdD,SAAA,EACAN,gBAAc,EACdQ,mBAAc,EACdO,aAAc,EACdG,mBAAc,EAEdE,gBAAc,EACdC,UAAA,EACAtB,oBAAc,EACdU,SAAA,EACAa,aAAc,EAEdV,QAAA,E","ignoreList":[]}
|
package/dist/esm/views/Theme.mjs
CHANGED
|
@@ -15,7 +15,7 @@ const Theme = forwardRef(function Theme2(props, ref) {
|
|
|
15
15
|
passThrough
|
|
16
16
|
} = props;
|
|
17
17
|
const isRoot = !!props["_isRoot"];
|
|
18
|
-
const [_, themeState] = useThemeWithState(props, isRoot);
|
|
18
|
+
const [_, themeState] = useThemeWithState(props, isRoot, true);
|
|
19
19
|
const disableDirectChildTheme = props["disable-child-theme"];
|
|
20
20
|
let finalChildren = disableDirectChildTheme ? Children.map(props.children, child => passThrough || !isValidElement(child) ? child : cloneElement(child, {
|
|
21
21
|
["data-disable-theme"]: true
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["isWeb","React","Children","cloneElement","forwardRef","isValidElement","useRef","variableToString","useThemeWithState","getThemeState","hasThemeUpdatingProps","ThemeStateContext","ThemeDebug","jsx","Theme","Theme2","props","ref","disable","children","passThrough","isRoot","_","themeState","disableDirectChildTheme","finalChildren","map","child","only","stateRef","hasEverThemed","getThemedChildren","shallow","forceClassName","state","current","shouldRenderChildrenWithTheme","isNew","process","env","NODE_ENV","debug","themeProps","Provider","value","id","isInverse","name","requiresExtraWrapper","parentId","parentState","Error","toArray","console","warn","themeSpanProps","getThemeClassNameAndColor","baseStyle","contain","inertContainedStyle","inertStyle","className","color","style","startsWith","className2","display","empty","themeColor","theme","themeClassName","replace","schemePrefix","themeNameParts","split","themeClasses","length","hierarchyClasses","i","push","slice","join"],"sources":["../../../src/views/Theme.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,KAAA,QAAa;AAEtB,OAAOC,KAAA,IAASC,QAAA,EAAUC,YAAA,EAAcC,UAAA,EAAYC,cAAA,EAAgBC,MAAA,QAAc;AAElF,SAASC,gBAAA,QAAwB;AACjC,SAASC,iBAAA,QAAyB;AAClC,SACEC,aAAA,EACAC,qBAAA,EACAC,iBAAA,QACK;AAEP,SAASC,UAAA,QAAkB;
|
|
1
|
+
{"version":3,"names":["isWeb","React","Children","cloneElement","forwardRef","isValidElement","useRef","variableToString","useThemeWithState","getThemeState","hasThemeUpdatingProps","ThemeStateContext","ThemeDebug","jsx","Theme","Theme2","props","ref","disable","children","passThrough","isRoot","_","themeState","disableDirectChildTheme","finalChildren","map","child","only","stateRef","hasEverThemed","getThemedChildren","shallow","forceClassName","state","current","shouldRenderChildrenWithTheme","isNew","process","env","NODE_ENV","debug","themeProps","Provider","value","id","isInverse","name","requiresExtraWrapper","parentId","parentState","Error","toArray","console","warn","themeSpanProps","getThemeClassNameAndColor","baseStyle","contain","inertContainedStyle","inertStyle","className","color","style","startsWith","className2","display","empty","themeColor","theme","themeClassName","replace","schemePrefix","themeNameParts","split","themeClasses","length","hierarchyClasses","i","push","slice","join"],"sources":["../../../src/views/Theme.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -15,7 +15,7 @@ var Theme = /* @__PURE__ */forwardRef(function Theme2(props, ref) {
|
|
|
15
15
|
passThrough
|
|
16
16
|
} = props;
|
|
17
17
|
var isRoot = !!props["_isRoot"];
|
|
18
|
-
var [_, themeState] = useThemeWithState(props, isRoot);
|
|
18
|
+
var [_, themeState] = useThemeWithState(props, isRoot, true);
|
|
19
19
|
var disableDirectChildTheme = props["disable-child-theme"];
|
|
20
20
|
var finalChildren = disableDirectChildTheme ? Children.map(props.children, function (child) {
|
|
21
21
|
return passThrough || ! /* @__PURE__ */isValidElement(child) ? child : /* @__PURE__ */cloneElement(child, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["jsx","_jsx","isWeb","React","Children","cloneElement","forwardRef","isValidElement","useRef","variableToString","useThemeWithState","getThemeState","hasThemeUpdatingProps","ThemeStateContext","ThemeDebug","Theme","Theme2","props","ref","disable","children","passThrough","isRoot","_","themeState","disableDirectChildTheme","finalChildren","map","child","only","e","stateRef","hasEverThemed","getThemedChildren","arguments","length","shallow","forceClassName","state","current","shouldRenderChildrenWithTheme","isNew","process","env","NODE_ENV","debug","themeProps","Provider","value","id","isInverse","name","requiresExtraWrapper","parentId","parentState","Error","toArray","console","warn","themeSpanProps","getThemeClassNameAndColor","baseStyle","contain","inertContainedStyle","inertStyle","className","color","style","className1","startsWith","display","empty","themeColor","theme","themeClassName","replace","schemePrefix","themeNameParts","split","themeClasses","hierarchyClasses","i","push","slice","join"],"sources":["../../../src/views/Theme.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,GAAA,IAAAC,IAAA,QAAa;AAEtB,SAAOC,KAAA,QAAS,oBAAwB;AAExC,OAAAC,KAAS,IAAAC,QAAA,EAAAC,YAAwB,EAAAC,UAAA,EAAAC,cAAA,EAAAC,MAAA;AACjC,SAASC,gBAAA,qCAAyB;AAClC,SAAAC,iBAAA;AAAA,SACEC,aAAA,EAAAC,qBAAA,EAAAC,iBAAA;AAAA,SACAC,UAAA;AAAA,IACAC,KAAA,kBAAAT,UAAA,UAAAU,OAAAC,KAAA,EAAAC,GAAA;EAAA,aACK;;EAEP,IAAAD,KAAS,CAAAE,OAAA;
|
|
1
|
+
{"version":3,"names":["jsx","_jsx","isWeb","React","Children","cloneElement","forwardRef","isValidElement","useRef","variableToString","useThemeWithState","getThemeState","hasThemeUpdatingProps","ThemeStateContext","ThemeDebug","Theme","Theme2","props","ref","disable","children","passThrough","isRoot","_","themeState","disableDirectChildTheme","finalChildren","map","child","only","e","stateRef","hasEverThemed","getThemedChildren","arguments","length","shallow","forceClassName","state","current","shouldRenderChildrenWithTheme","isNew","process","env","NODE_ENV","debug","themeProps","Provider","value","id","isInverse","name","requiresExtraWrapper","parentId","parentState","Error","toArray","console","warn","themeSpanProps","getThemeClassNameAndColor","baseStyle","contain","inertContainedStyle","inertStyle","className","color","style","className1","startsWith","display","empty","themeColor","theme","themeClassName","replace","schemePrefix","themeNameParts","split","themeClasses","hierarchyClasses","i","push","slice","join"],"sources":["../../../src/views/Theme.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/web",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.4.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "Nate Wienert"
|
|
@@ -51,20 +51,20 @@
|
|
|
51
51
|
"test:web": "vitest --typecheck --run"
|
|
52
52
|
},
|
|
53
53
|
"dependencies": {
|
|
54
|
-
"@tamagui/compose-refs": "2.
|
|
55
|
-
"@tamagui/constants": "2.
|
|
56
|
-
"@tamagui/helpers": "2.
|
|
57
|
-
"@tamagui/is-equal-shallow": "2.
|
|
58
|
-
"@tamagui/native": "2.
|
|
59
|
-
"@tamagui/normalize-css-color": "2.
|
|
60
|
-
"@tamagui/timer": "2.
|
|
61
|
-
"@tamagui/types": "2.
|
|
62
|
-
"@tamagui/use-did-finish-ssr": "2.
|
|
63
|
-
"@tamagui/use-event": "2.
|
|
64
|
-
"@tamagui/use-force-update": "2.
|
|
54
|
+
"@tamagui/compose-refs": "2.4.0",
|
|
55
|
+
"@tamagui/constants": "2.4.0",
|
|
56
|
+
"@tamagui/helpers": "2.4.0",
|
|
57
|
+
"@tamagui/is-equal-shallow": "2.4.0",
|
|
58
|
+
"@tamagui/native": "2.4.0",
|
|
59
|
+
"@tamagui/normalize-css-color": "2.4.0",
|
|
60
|
+
"@tamagui/timer": "2.4.0",
|
|
61
|
+
"@tamagui/types": "2.4.0",
|
|
62
|
+
"@tamagui/use-did-finish-ssr": "2.4.0",
|
|
63
|
+
"@tamagui/use-event": "2.4.0",
|
|
64
|
+
"@tamagui/use-force-update": "2.4.0"
|
|
65
65
|
},
|
|
66
66
|
"devDependencies": {
|
|
67
|
-
"@tamagui/build": "2.
|
|
67
|
+
"@tamagui/build": "2.4.0",
|
|
68
68
|
"@testing-library/react": "^16.1.0",
|
|
69
69
|
"csstype": "^3.0.10",
|
|
70
70
|
"react": ">=19",
|
package/src/createComponent.tsx
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { composeRefs } from '@tamagui/compose-refs'
|
|
2
2
|
import {
|
|
3
3
|
getPlatformDriver,
|
|
4
|
+
isAndroid,
|
|
4
5
|
isClient,
|
|
5
6
|
isNativeDesktop,
|
|
6
7
|
isServer,
|
|
@@ -302,9 +303,14 @@ export function createComponent<
|
|
|
302
303
|
// On Android, skip RNGH GestureDetector inside native menus (zeego) and use
|
|
303
304
|
// direct press events instead — GestureDetector consumes touches before they
|
|
304
305
|
// reach MenuView's native handler, preventing the menu from opening
|
|
306
|
+
// NativeMenuContext only affects Android RNGH press arbitration inside zeego
|
|
307
|
+
// menus (see eventHandling.native.ts:182). isAndroid is constant for the whole
|
|
308
|
+
// app run, so on iOS we skip this context read for every component — the branch
|
|
309
|
+
// never flips at runtime, so hook order stays stable (rules-of-hooks safe).
|
|
305
310
|
const isInsideNativeMenu =
|
|
306
|
-
process.env.TAMAGUI_TARGET === 'native'
|
|
307
|
-
?
|
|
311
|
+
process.env.TAMAGUI_TARGET === 'native' && isAndroid
|
|
312
|
+
? // eslint-disable-next-line react-hooks/rules-of-hooks
|
|
313
|
+
React.useContext(NativeMenuContext)
|
|
308
314
|
: false
|
|
309
315
|
|
|
310
316
|
if (
|
|
@@ -153,6 +153,15 @@ function isValidStyleKey(
|
|
|
153
153
|
return key in validStyles ? true : accept && key in accept
|
|
154
154
|
}
|
|
155
155
|
|
|
156
|
+
function shouldSkipNativeHoverProp(key: string, isMedia: false | boolean | string) {
|
|
157
|
+
if (process.env.TAMAGUI_TARGET !== 'native') return false
|
|
158
|
+
if (key === 'hoverStyle') return true
|
|
159
|
+
if (isMedia === 'group') {
|
|
160
|
+
return getGroupPropParts(key.slice(1)).pseudo === 'hover'
|
|
161
|
+
}
|
|
162
|
+
return false
|
|
163
|
+
}
|
|
164
|
+
|
|
156
165
|
export const getSplitStyles: StyleSplitter = (
|
|
157
166
|
props,
|
|
158
167
|
staticConfig,
|
|
@@ -305,6 +314,18 @@ export const getSplitStyles: StyleSplitter = (
|
|
|
305
314
|
continue
|
|
306
315
|
}
|
|
307
316
|
|
|
317
|
+
// native: data-* attributes never become native props (they're stripped
|
|
318
|
+
// further down anyway), and the compiler-emitted data-disable-theme/-media
|
|
319
|
+
// flags are already consumed in createComponent. skip them before any per-prop
|
|
320
|
+
// work so they don't pay the isValidStyleKey + handling cost on the hot path.
|
|
321
|
+
if (
|
|
322
|
+
process.env.TAMAGUI_TARGET === 'native' &&
|
|
323
|
+
keyInit[0] === 'd' &&
|
|
324
|
+
keyInit.startsWith('data-')
|
|
325
|
+
) {
|
|
326
|
+
continue
|
|
327
|
+
}
|
|
328
|
+
|
|
308
329
|
if (
|
|
309
330
|
process.env.NODE_ENV === 'development' &&
|
|
310
331
|
(debug === 'profile' || (globalThis as any).time)
|
|
@@ -481,6 +502,10 @@ export const getSplitStyles: StyleSplitter = (
|
|
|
481
502
|
|
|
482
503
|
const isStyleProp = isValidStyleKeyInit || isMediaOrPseudo || (isVariant && !noExpand)
|
|
483
504
|
|
|
505
|
+
if (shouldSkipNativeHoverProp(keyInit, isMedia)) {
|
|
506
|
+
continue
|
|
507
|
+
}
|
|
508
|
+
|
|
484
509
|
if (isStyleProp && (asChild === 'except-style' || asChild === 'except-style-web')) {
|
|
485
510
|
continue
|
|
486
511
|
}
|
|
@@ -625,6 +650,10 @@ export const getSplitStyles: StyleSplitter = (
|
|
|
625
650
|
key = normalizeGroupKey(key, groupContext)
|
|
626
651
|
}
|
|
627
652
|
|
|
653
|
+
if (shouldSkipNativeHoverProp(key, isMedia)) {
|
|
654
|
+
return
|
|
655
|
+
}
|
|
656
|
+
|
|
628
657
|
if (
|
|
629
658
|
inlineProps?.has(key) ||
|
|
630
659
|
(process.env.IS_STATIC === 'is_static' && inlineWhenUnflattened?.has(key))
|
|
@@ -948,6 +977,10 @@ export const getSplitStyles: StyleSplitter = (
|
|
|
948
977
|
const groupPseudoKey = groupInfo.pseudo
|
|
949
978
|
const groupMediaKey = groupInfo.media
|
|
950
979
|
|
|
980
|
+
if (process.env.TAMAGUI_TARGET === 'native' && groupPseudoKey === 'hover') {
|
|
981
|
+
return
|
|
982
|
+
}
|
|
983
|
+
|
|
951
984
|
if (!groupState) {
|
|
952
985
|
if (process.env.NODE_ENV === 'development' && debug) {
|
|
953
986
|
log(`No parent with group prop, skipping styles: ${groupName}`)
|
|
@@ -25,13 +25,20 @@ export function usePointerEvents(props: any, viewProps: any) {
|
|
|
25
25
|
onPointerEnter ||
|
|
26
26
|
onPointerLeave
|
|
27
27
|
|
|
28
|
-
//
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
28
|
+
// single ref-bag (was three separate useRef slots) — one hook slot per
|
|
29
|
+
// component instead of three. isInside = pointer within bounds (enter/leave),
|
|
30
|
+
// layout = measured bounds, isCaptured = setPointerCapture state for moves.
|
|
31
|
+
const ref = useRef<{
|
|
32
|
+
isInside: boolean
|
|
33
|
+
layout: { width: number; height: number }
|
|
34
|
+
isCaptured: boolean
|
|
35
|
+
} | null>(null)
|
|
36
|
+
if (!ref.current) {
|
|
37
|
+
ref.current = { isInside: false, layout: { width: 0, height: 0 }, isCaptured: false }
|
|
38
|
+
}
|
|
33
39
|
|
|
34
40
|
if (!hasPointerEvents) return
|
|
41
|
+
const bag = ref.current
|
|
35
42
|
|
|
36
43
|
// create normalized event with setPointerCapture support
|
|
37
44
|
const createNormalizedEvent = (e: any) => {
|
|
@@ -49,10 +56,10 @@ export function usePointerEvents(props: any, viewProps: any) {
|
|
|
49
56
|
nativeEvent: touch,
|
|
50
57
|
target: {
|
|
51
58
|
setPointerCapture: (_pointerId: number) => {
|
|
52
|
-
|
|
59
|
+
bag.isCaptured = true
|
|
53
60
|
},
|
|
54
61
|
releasePointerCapture: (_pointerId: number) => {
|
|
55
|
-
|
|
62
|
+
bag.isCaptured = false
|
|
56
63
|
},
|
|
57
64
|
},
|
|
58
65
|
}
|
|
@@ -69,7 +76,7 @@ export function usePointerEvents(props: any, viewProps: any) {
|
|
|
69
76
|
// pointer up
|
|
70
77
|
if (onPointerUp) {
|
|
71
78
|
viewProps.onTouchEnd = composeEventHandlers(viewProps.onTouchEnd, (e: any) => {
|
|
72
|
-
|
|
79
|
+
bag.isCaptured = false // auto-release on up
|
|
73
80
|
onPointerUp(createNormalizedEvent(e))
|
|
74
81
|
})
|
|
75
82
|
}
|
|
@@ -78,12 +85,12 @@ export function usePointerEvents(props: any, viewProps: any) {
|
|
|
78
85
|
if (onPointerMove) {
|
|
79
86
|
viewProps.onTouchMove = composeEventHandlers(viewProps.onTouchMove, (e: any) => {
|
|
80
87
|
const { locationX, locationY } = e.nativeEvent
|
|
81
|
-
const { width, height } =
|
|
88
|
+
const { width, height } = bag.layout
|
|
82
89
|
const isInBounds =
|
|
83
90
|
locationX >= 0 && locationX <= width && locationY >= 0 && locationY <= height
|
|
84
91
|
|
|
85
92
|
// fire if captured OR in bounds (matches web behavior)
|
|
86
|
-
if (
|
|
93
|
+
if (bag.isCaptured || isInBounds) {
|
|
87
94
|
onPointerMove(createNormalizedEvent(e))
|
|
88
95
|
}
|
|
89
96
|
})
|
|
@@ -92,7 +99,7 @@ export function usePointerEvents(props: any, viewProps: any) {
|
|
|
92
99
|
// pointer cancel
|
|
93
100
|
if (onPointerCancel) {
|
|
94
101
|
viewProps.onTouchCancel = composeEventHandlers(viewProps.onTouchCancel, (e: any) => {
|
|
95
|
-
|
|
102
|
+
bag.isCaptured = false
|
|
96
103
|
onPointerCancel(createNormalizedEvent(e))
|
|
97
104
|
})
|
|
98
105
|
}
|
|
@@ -101,7 +108,7 @@ export function usePointerEvents(props: any, viewProps: any) {
|
|
|
101
108
|
if (onPointerEnter || onPointerLeave || onPointerMove) {
|
|
102
109
|
// track layout for bounds checking
|
|
103
110
|
viewProps.onLayout = composeEventHandlers(viewProps.onLayout, (e: any) => {
|
|
104
|
-
|
|
111
|
+
bag.layout = {
|
|
105
112
|
width: e.nativeEvent.layout.width,
|
|
106
113
|
height: e.nativeEvent.layout.height,
|
|
107
114
|
}
|
|
@@ -112,9 +119,9 @@ export function usePointerEvents(props: any, viewProps: any) {
|
|
|
112
119
|
if (onPointerEnter) {
|
|
113
120
|
viewProps.onTouchStart = composeEventHandlers(viewProps.onTouchStart, (e: any) => {
|
|
114
121
|
const { locationX, locationY } = e.nativeEvent
|
|
115
|
-
const { width, height } =
|
|
122
|
+
const { width, height } = bag.layout
|
|
116
123
|
if (locationX >= 0 && locationX <= width && locationY >= 0 && locationY <= height) {
|
|
117
|
-
|
|
124
|
+
bag.isInside = true
|
|
118
125
|
onPointerEnter(createNormalizedEvent(e))
|
|
119
126
|
}
|
|
120
127
|
})
|
|
@@ -124,18 +131,18 @@ export function usePointerEvents(props: any, viewProps: any) {
|
|
|
124
131
|
if (onPointerLeave) {
|
|
125
132
|
viewProps.onTouchMove = composeEventHandlers(viewProps.onTouchMove, (e: any) => {
|
|
126
133
|
const { locationX, locationY } = e.nativeEvent
|
|
127
|
-
const { width, height } =
|
|
134
|
+
const { width, height } = bag.layout
|
|
128
135
|
const isInside =
|
|
129
136
|
locationX >= 0 && locationX <= width && locationY >= 0 && locationY <= height
|
|
130
|
-
if (
|
|
131
|
-
|
|
137
|
+
if (bag.isInside && !isInside) {
|
|
138
|
+
bag.isInside = false
|
|
132
139
|
onPointerLeave(createNormalizedEvent(e))
|
|
133
140
|
}
|
|
134
141
|
})
|
|
135
142
|
|
|
136
143
|
viewProps.onTouchEnd = composeEventHandlers(viewProps.onTouchEnd, (e: any) => {
|
|
137
|
-
if (
|
|
138
|
-
|
|
144
|
+
if (bag.isInside) {
|
|
145
|
+
bag.isInside = false
|
|
139
146
|
onPointerLeave(createNormalizedEvent(e))
|
|
140
147
|
}
|
|
141
148
|
})
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { getPlatformDriver, isServer, isWeb } from '@tamagui/constants'
|
|
2
|
-
import {
|
|
2
|
+
import { mergeIfNotShallowEqual } from '@tamagui/is-equal-shallow'
|
|
3
3
|
import { useDidFinishSSR, useIsClientOnly } from '@tamagui/use-did-finish-ssr'
|
|
4
4
|
import { useRef, useState } from 'react'
|
|
5
5
|
import { getSetting } from '../config'
|
|
@@ -176,7 +176,44 @@ export const useComponentState = (
|
|
|
176
176
|
|
|
177
177
|
const groupName = props.group as any as string | undefined
|
|
178
178
|
|
|
179
|
-
|
|
179
|
+
// hoisted shallow-set closure: created once per component instance and
|
|
180
|
+
// reused every render. drops the useCallback hook that useCreateShallowSetState
|
|
181
|
+
// would otherwise add. setState from useState is stable per instance so we
|
|
182
|
+
// can safely capture it. debug is read off stateRef at call time.
|
|
183
|
+
//
|
|
184
|
+
// important: this lives on `baseSetStateShallow`, not `setStateShallow`.
|
|
185
|
+
// createComponent's avoidReRenders path overwrites `stateRef.current.setStateShallow`
|
|
186
|
+
// with an emitter wrapper and captures this base as its real-re-render escape hatch.
|
|
187
|
+
// if the base shared the `setStateShallow` field, on the 2nd+ render this hook would
|
|
188
|
+
// read back the wrapper, the wrapper's escape hatch would point at itself, and a real
|
|
189
|
+
// re-render (e.g. unmounted 'should-enter' -> false) would never reach React, leaving
|
|
190
|
+
// enter animations stuck at opacity 0.
|
|
191
|
+
if (!stateRef.current.baseSetStateShallow) {
|
|
192
|
+
const r = stateRef.current
|
|
193
|
+
r.baseSetStateShallow = (stateOrGetState: any) => {
|
|
194
|
+
setState((prev: any) => {
|
|
195
|
+
const next =
|
|
196
|
+
typeof stateOrGetState === 'function' ? stateOrGetState(prev) : stateOrGetState
|
|
197
|
+
const update = mergeIfNotShallowEqual(prev, next)
|
|
198
|
+
if (process.env.NODE_ENV === 'development') {
|
|
199
|
+
const dbg = (r as any).__debug
|
|
200
|
+
if (dbg && update !== prev) {
|
|
201
|
+
console.groupCollapsed(`setStateShallow CHANGE`, '=>', update)
|
|
202
|
+
console.info(`previously`, prev)
|
|
203
|
+
console.trace()
|
|
204
|
+
console.groupEnd()
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
return update
|
|
208
|
+
})
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
if (process.env.NODE_ENV === 'development') {
|
|
212
|
+
;(stateRef.current as any).__debug = props.debug
|
|
213
|
+
}
|
|
214
|
+
const setStateShallow = stateRef.current.baseSetStateShallow!
|
|
215
|
+
if (process.env.NODE_ENV === 'development' && globalThis.time)
|
|
216
|
+
globalThis.time`state-useCreateShallowSetState`
|
|
180
217
|
|
|
181
218
|
// set enter/exit variants onto our new props object
|
|
182
219
|
if (presenceState && isAnimated && isHydrated && staticConfig.variants) {
|