@tamagui/web 1.121.12 → 1.122.0

package/dist/esm/views/Theme.native.js

@@ -2,10 +2,10 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { isWeb } from "@tamagui/constants";
 import React, { Children, cloneElement, forwardRef, isValidElement, useRef } from "react";
 import { variableToString } from "../createVariable";
-import { ThemeManagerIDContext } from "../helpers/ThemeManagerContext";
+import { log } from "../helpers/log";
+import { ThemeManagerContext } from "../helpers/ThemeManagerContext";
 import { useChangeThemeEffect } from "../hooks/useTheme";
 import { ThemeDebug } from "./ThemeDebug";
-import { log } from "../helpers/log";
 var Theme = /* @__PURE__ */ forwardRef(function(param, ref) {
   var { children, ...props } = param;
   if (props.disable)
@@ -32,7 +32,6 @@ var Theme = /* @__PURE__ */ forwardRef(function(param, ref) {
   });
   return getThemedChildren(themeState, finalChildren, props, isRoot, stateRef);
 });
-Theme.displayName = "Theme";
 Theme.avoidForwardRef = !0;
 function getThemedChildren(themeState, children, props) {
   var isRoot = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !1, stateRef = arguments.length > 4 ? arguments[4] : void 0, { themeManager, isNewTheme } = themeState;
@@ -49,8 +48,8 @@ function getThemedChildren(themeState, children, props) {
       children: child.props.children
     })) : child;
   }));
-  var elementsWithContext = /* @__PURE__ */ _jsx(ThemeManagerIDContext.Provider, {
-    value: themeManager.id,
+  var elementsWithContext = /* @__PURE__ */ _jsx(ThemeManagerContext.Provider, {
+    value: themeManager,
     children: next
   });
   return forceClassName === !1 ? elementsWithContext : isWeb ? wrapThemeElements({

package/dist/esm/views/Theme.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/Users/n8/tamagui/code/core/web/src/views/Theme.tsx"],
-  "mappings": "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",
-  "names": ["isWeb", "React", "Children", "cloneElement", "forwardRef", "isValidElement", "useRef", "variableToString", "ThemeManagerIDContext", "useChangeThemeEffect", "ThemeDebug", "log", "Theme", "ref", "children", "props", "disable", "isRoot", "themeState", "disableDirectChildTheme", "finalChildren", "map", "child", "only", "process", "env", "NODE_ENV", "debug", "themeProps", "stateRef", "hasEverThemed", "getThemedChildren", "themeManager", "isNewTheme", "shallow", "forceClassName", "shouldRenderChildrenWithTheme", "current", "next", "toArray", "undefined", "name", "state", "parentName", "elementsWithContext", "Provider", "value", "id", "wrapThemeElements", "inverse", "inversed", "requiresExtraWrapper", "className", "style", "getThemeClassNameAndStyle", "themedChildren", "span", "inverseClassName", "startsWith", "emptyObj", "themeColor", "theme", "color", "replace"]
+  "mappings": "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",
+  "names": ["isWeb", "React", "Children", "cloneElement", "forwardRef", "isValidElement", "useRef", "variableToString", "log", "ThemeManagerContext", "useChangeThemeEffect", "ThemeDebug", "Theme", "ref", "children", "props", "disable", "isRoot", "themeState", "disableDirectChildTheme", "finalChildren", "map", "child", "only", "process", "env", "NODE_ENV", "debug", "themeProps", "stateRef", "hasEverThemed", "getThemedChildren", "themeManager", "isNewTheme", "shallow", "forceClassName", "shouldRenderChildrenWithTheme", "current", "next", "toArray", "undefined", "name", "state", "parentName", "elementsWithContext", "Provider", "value", "wrapThemeElements", "inverse", "inversed", "requiresExtraWrapper", "className", "style", "getThemeClassNameAndStyle", "themedChildren", "span", "inverseClassName", "startsWith", "emptyObj", "themeColor", "theme", "color", "replace"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/web",
-  "version": "1.121.12",
+  "version": "1.122.0",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -27,22 +27,22 @@
     "reset.css"
   ],
   "dependencies": {
-    "@tamagui/compose-refs": "1.121.12",
-    "@tamagui/constants": "1.121.12",
-    "@tamagui/helpers": "1.121.12",
-    "@tamagui/normalize-css-color": "1.121.12",
-    "@tamagui/timer": "1.121.12",
-    "@tamagui/types": "1.121.12",
-    "@tamagui/use-did-finish-ssr": "1.121.12",
-    "@tamagui/use-event": "1.121.12",
-    "@tamagui/use-force-update": "1.121.12"
+    "@tamagui/compose-refs": "1.122.0",
+    "@tamagui/constants": "1.122.0",
+    "@tamagui/helpers": "1.122.0",
+    "@tamagui/normalize-css-color": "1.122.0",
+    "@tamagui/timer": "1.122.0",
+    "@tamagui/types": "1.122.0",
+    "@tamagui/use-did-finish-ssr": "1.122.0",
+    "@tamagui/use-event": "1.122.0",
+    "@tamagui/use-force-update": "1.122.0"
   },
   "peerDependencies": {
     "react": "*",
     "react-dom": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.121.12",
+    "@tamagui/build": "1.122.0",
     "@testing-library/react": "^16.1.0",
     "csstype": "^3.0.10",
     "react": "*",

package/src/createComponent.tsx

@@ -50,7 +50,6 @@ import { ThemeDebug } from './views/ThemeDebug'
 /**
  * All things that need one-time setup after createTamagui is called
  */
-let tamaguiConfig: TamaguiInternalConfig
 let time: any
 
 let debugKeyListeners: Set<Function> | undefined
@@ -359,8 +358,6 @@ export function createComponent<
 
     const hasTextAncestor = !!(isWeb && isText ? componentContext.inText : false)
 
-    if (process.env.NODE_ENV === 'development' && time) time`use-context`
-
     const isTaggable = !Component || typeof Component === 'string'
     const tagProp = props.tag
     // default to tag, fallback to component (when both strings)
@@ -402,11 +399,9 @@ export function createComponent<
     if ('theme' in props) {
       themeStateProps.name = props.theme
     }
-
     if (typeof curStateRef.isListeningToTheme === 'boolean') {
-      themeStateProps.shouldUpdate = () => stateRef.current.isListeningToTheme
+      themeStateProps.needsUpdate = () => !!stateRef.current.isListeningToTheme
     }
-
     // on native we optimize theme changes if fastSchemeChange is enabled, otherwise deopt
     if (process.env.TAMAGUI_TARGET === 'native') {
       themeStateProps.deopt = willBeAnimated
@@ -467,11 +462,11 @@ export function createComponent<
 
     const [themeState, theme] = useThemeWithState(themeStateProps)
 
+    if (process.env.NODE_ENV === 'development' && time) time`theme`
+
     elementType = Component || elementType
     const isStringElement = typeof elementType === 'string'
 
-    if (process.env.NODE_ENV === 'development' && time) time`theme`
-
     const mediaState = useMedia(componentContext, debugProp)
 
     setDidGetVariableValue(false)
@@ -816,6 +811,7 @@ export function createComponent<
         attachHover,
         shouldAttach,
         needsHoverState,
+        pseudos,
       })
     }
 
@@ -998,15 +994,11 @@ export function createComponent<
 
     let useChildrenResult: any
     if (hooks.useChildren) {
-      useChildrenResult = hooks.useChildren(
-        elementType,
-        content,
-        viewProps,
-        events,
-        staticConfig
-      )
+      useChildrenResult = hooks.useChildren(elementType, content, viewProps)
     }
 
+    if (process.env.NODE_ENV === 'development' && time) time`use-children`
+
     if (useChildrenResult) {
       content = useChildrenResult
     } else {

package/src/helpers/ThemeManager.tsx

@@ -215,6 +215,7 @@ function getState(
   }
 
   const themes = getThemes()
+
   const [allManagers, componentManagers] = getManagers(manager)
 
   const isDirectParentAComponentTheme = !!manager?.state.isComponent

package/src/helpers/ThemeManagerContext.tsx

@@ -1,3 +1,4 @@
 import React from 'react'
+import type { ThemeManager } from './ThemeManager'
 
-export const ThemeManagerIDContext = React.createContext<number>(1)
+export const ThemeManagerContext = React.createContext<ThemeManager | null>(null)

package/src/helpers/expandStyle.ts

@@ -5,12 +5,12 @@
 
 import { isAndroid, isWeb } from '@tamagui/constants'
 
-import type { PropMappedValue } from '../types'
+import { getSetting } from '../config'
 import {
   webToNativeDynamicExpansion,
   webToNativeExpansion,
 } from '../constants/webToNativeProps'
-import { getConfig } from '../config'
+import type { PropMappedValue } from '../types'
 
 const neg1Flex = [
   ['flexGrow', 0],
@@ -27,7 +27,7 @@ export function expandStyle(key: string, value: any): PropMappedValue {
       return [
         ['flexGrow', value],
         ['flexShrink', 1],
-        ['flexBasis', getConfig().settings.styleCompat === 'react-native' ? 0 : 'auto'],
+        ['flexBasis', getSetting('styleCompat') === 'react-native' ? 0 : 'auto'],
       ]
     }
 

package/src/helpers/expandStyles.ts

@@ -1,5 +1,4 @@
 import { isWeb } from '@tamagui/constants'
-
 import { normalizeShadow } from './normalizeShadow'
 
 export function fixStyles(style: Record<string, any>) {