@tamagui/web 1.95.3 → 1.97.0

package/dist/esm/views/Theme.mjs

@@ -20,15 +20,19 @@ const Theme = forwardRef(function ({
       ref
     });
   } catch {}
-  return process.env.NODE_ENV === "development" && props.debug === "visualize" && (finalChildren = /* @__PURE__ */jsx(ThemeDebug, {
+  process.env.NODE_ENV === "development" && props.debug === "visualize" && (finalChildren = /* @__PURE__ */jsx(ThemeDebug, {
     themeState,
     themeProps: props,
     children: finalChildren
-  })), getThemedChildren(themeState, finalChildren, props, isRoot);
+  }));
+  const stateRef = useRef({
+    hasEverThemed: !1
+  });
+  return getThemedChildren(themeState, finalChildren, props, isRoot, stateRef);
 });
 Theme.displayName = "Theme";
 Theme.avoidForwardRef = !0;
-function getThemedChildren(themeState, children, props, isRoot = !1) {
+function getThemedChildren(themeState, children, props, isRoot = !1, stateRef) {
   const {
     themeManager,
     isNewTheme
@@ -38,9 +42,8 @@ function getThemedChildren(themeState, children, props, isRoot = !1) {
       shallow,
       forceClassName
     } = props,
-    hasEverThemed = useRef(!1),
-    shouldRenderChildrenWithTheme = isNewTheme || props.inverse || hasEverThemed.current || forceClassName || isRoot;
-  if (shouldRenderChildrenWithTheme && (hasEverThemed.current = !0), !shouldRenderChildrenWithTheme) return children;
+    shouldRenderChildrenWithTheme = isNewTheme || "inverse" in props || "theme" in props || stateRef.current.hasEverThemed || forceClassName || isRoot;
+  if (shouldRenderChildrenWithTheme && (stateRef.current.hasEverThemed = !0), !shouldRenderChildrenWithTheme) return children;
   let next = children;
   shallow && (next = Children.toArray(children).map(child => isValidElement(child) ? cloneElement(child, void 0, /* @__PURE__ */jsx(Theme, {
     name: themeManager.state.parentName,

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

@@ -48,20 +48,24 @@ var Theme = /* @__PURE__ */ forwardRef(function(_param, ref) {
       });
     } catch {
     }
-  return process.env.NODE_ENV === "development" && props.debug === "visualize" && (finalChildren = /* @__PURE__ */ _jsx(ThemeDebug, {
+  process.env.NODE_ENV === "development" && props.debug === "visualize" && (finalChildren = /* @__PURE__ */ _jsx(ThemeDebug, {
     themeState,
     themeProps: props,
     children: finalChildren
-  })), getThemedChildren(themeState, finalChildren, props, isRoot);
+  }));
+  var stateRef = useRef({
+    hasEverThemed: !1
+  });
+  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, themeManager = themeState.themeManager, isNewTheme = themeState.isNewTheme;
+  var isRoot = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !1, stateRef = arguments.length > 4 ? arguments[4] : void 0, themeManager = themeState.themeManager, isNewTheme = themeState.isNewTheme;
   if (!themeManager)
     throw new Error(process.env.NODE_ENV === "development" ? "\u274C No theme found, either incorrect name, potential duplicate tamagui deps, or TamaguiProvider not providing themes." : "\u274C 005");
-  var shallow = props.shallow, forceClassName = props.forceClassName, hasEverThemed = useRef(!1), shouldRenderChildrenWithTheme = isNewTheme || props.inverse || hasEverThemed.current || forceClassName || isRoot;
-  if (shouldRenderChildrenWithTheme && (hasEverThemed.current = !0), !shouldRenderChildrenWithTheme)
+  var shallow = props.shallow, forceClassName = props.forceClassName, shouldRenderChildrenWithTheme = isNewTheme || "inverse" in props || "theme" in props || stateRef.current.hasEverThemed || forceClassName || isRoot;
+  if (shouldRenderChildrenWithTheme && (stateRef.current.hasEverThemed = !0), !shouldRenderChildrenWithTheme)
     return children;
   var next = children;
   shallow && (next = Children.toArray(children).map(function(child) {

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

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

package/package.json

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

package/reset.css

@@ -35,4 +35,4 @@ p, input, textarea, button, ul, ol, li, pre, dialog {
 
 a.is_Button, .is_Anchor:has(.is_Button) {
   text-decoration: none;
-}
+}

package/src/createComponent.tsx

@@ -40,7 +40,6 @@ import { hooks } from './setupHooks'
 import type {
   ComponentContextI,
   DebugProp,
-  DisposeFn,
   GroupState,
   GroupStateListener,
   LayoutEvent,
@@ -69,6 +68,7 @@ import { Slot } from './views/Slot'
 import { getThemedChildren } from './views/Theme'
 import { ThemeDebug } from './views/ThemeDebug'
 import { isDevTools } from './constants/isDevTools'
+import { setElementProps } from './helpers/setElementProps'
 
 /**
  * All things that need one-time setup after createTamagui is called
@@ -263,7 +263,7 @@ export const useComponentState = (
       if (process.env.NODE_ENV === 'development' && props.debug === 'verbose') {
         console.warn(`Animating presence EXIT "${exv}"`)
       }
-      props[exv] = exitVariant === enterExitVariant ? false : true
+      props[exv] = exitVariant !== enterExitVariant
     }
   }
 
@@ -875,7 +875,8 @@ export function createComponent<
     if (!curStateRef.composedRef) {
       curStateRef.composedRef = composeRefs<TamaguiElement>(
         (x) => (stateRef.current.host = x as TamaguiElement),
-        forwardedRef
+        forwardedRef,
+        setElementProps
       )
     }
 
@@ -1224,7 +1225,7 @@ export function createComponent<
     // disable theme prop is deterministic so conditional hook ok here
     content = disableTheme
       ? content
-      : getThemedChildren(themeState, content, themeStateProps, false)
+      : getThemedChildren(themeState, content, themeStateProps, false, stateRef)
 
     if (process.env.NODE_ENV === 'development' && time) time`themed-children`
 

package/src/helpers/createStyledContext.tsx

@@ -1,16 +1,23 @@
-import React, { createContext, useContext, useMemo } from 'react'
+import {
+  createContext,
+  useContext,
+  useMemo,
+  type Context,
+  type ProviderExoticComponent,
+  type ReactNode,
+} from 'react'
 
 import { objectIdentityKey } from './objectIdentityKey'
 
 export type StyledContext<Props extends Object = any> = Omit<
-  React.Context<Props>,
+  Context<Props>,
   'Provider'
 > & {
-  context: React.Context<Props>
+  context: Context<Props>
   props: Object | undefined
-  Provider: React.ProviderExoticComponent<
+  Provider: ProviderExoticComponent<
     Partial<Props | undefined> & {
-      children?: React.ReactNode
+      children?: ReactNode
       scope?: string
     }
   >
@@ -23,13 +30,13 @@ export function createStyledContext<VariantProps extends Record<string, any>>(
   const OGContext = createContext<VariantProps | undefined>(defaultValues)
   const OGProvider = OGContext.Provider
   const Context = OGContext as any as StyledContext<VariantProps>
-  const scopedContexts = new Map<string, React.Context<VariantProps | undefined>>()
+  const scopedContexts = new Map<string, Context<VariantProps | undefined>>()
 
   const Provider = ({
     children,
     scope,
     ...values
-  }: VariantProps & { children?: React.ReactNode; scope: string }) => {
+  }: VariantProps & { children?: ReactNode; scope: string }) => {
     const next = useMemo(() => {
       return {
         // this ! is a workaround for ts error
@@ -58,7 +65,7 @@ export function createStyledContext<VariantProps extends Record<string, any>>(
   // @ts-ignore
   Context.Provider = Provider
   Context.props = defaultValues
-  Context.context = OGContext as React.Context<VariantProps>
+  Context.context = OGContext as Context<VariantProps>
   Context.useStyledContext = useStyledContext
 
   return Context

package/src/helpers/getSplitStyles.tsx

@@ -16,13 +16,7 @@ import {
 import { useInsertionEffect } from 'react'
 
 import { getConfig, getFont } from '../config'
-import {
-  accessibilityDirectMap,
-  accessibilityWebRoleToNativeRole,
-  nativeAccessibilityState,
-  nativeAccessibilityValue,
-  webToNativeAccessibilityDirectMap,
-} from '../constants/accessibilityDirectMap'
+import { accessibilityDirectMap } from '../constants/accessibilityDirectMap'
 import { webViewFlexCompatStyles } from '../constants/constants'
 import { isDevTools } from '../constants/isDevTools'
 import {
@@ -64,7 +58,6 @@ import {
   shouldInsertStyleRules,
   updateRules,
 } from './insertStyleRule'
-import { isObj } from './isObj'
 import { log } from './log'
 import {
   normalizeValueWithProperty,
@@ -339,7 +332,7 @@ export const getSplitStyles: StyleSplitter = (
         // map userSelect to native prop
         if (keyInit === 'userSelect') {
           keyInit = 'selectable'
-          valInit = valInit === 'none' ? false : true
+          valInit = valInit !== 'none'
         } else if (keyInit.startsWith('data-')) {
           continue
         }

package/src/helpers/setElementProps.native.tsx

@@ -0,0 +1,9 @@
+export function setElementProps(element) {
+  if (element && !element.getBoundingClientRect) {
+    element.getBoundingClientRect = () => {
+      if (element.unstable_getBoundingClientRect != null) {
+        return element.unstable_getBoundingClientRect()
+      }
+    }
+  }
+}

package/src/helpers/setElementProps.tsx

@@ -0,0 +1 @@
+export const setElementProps = undefined as unknown as (element: HTMLElement) => void

package/src/helpers/skipProps.ts

@@ -36,6 +36,7 @@ if (process.env.TAMAGUI_TARGET === 'native') {
     outlineOffset: 1,
     outlineWidth: 1,
     outlineColor: 1,
+    scrollbarWidth: 1,
   })
 } else {
   if (process.env.NODE_ENV !== 'production') {

package/src/interfaces/TamaguiComponentPropsBaseBase.tsx

@@ -4,6 +4,8 @@ import type { DebugProp, ThemeName, GroupNames } from '../types'
 export type TamaguiComponentPropsBaseBase = {
   target?: string
 
+  htmlFor?: string
+
   /**
    * When truthy passes through all props to a single child element, and avoids rendering its own element.
    * Must pass just one child React element that will receive all the props.

package/src/types.tsx

@@ -1275,7 +1275,10 @@ interface ExtraStyleProps {
    * Web-only style property. Will be omitted on native.
    */
   userSelect?: Properties['userSelect']
-
+  /**
+   * Web-only style property. Will be omitted on native.
+   */
+  scrollbarWidth?: Properties['scrollbarWidth']
   pointerEvents?: ViewProps['pointerEvents']
 
   /**
@@ -2095,6 +2098,7 @@ export type TamaguiComponentStateRef = {
   hasMeasured?: boolean
   hasAnimated?: boolean
   themeShallow?: boolean
+  hasEverThemed?: boolean
   isListeningToTheme?: boolean
   unPress?: Function
   group?: {

package/src/views/Theme.tsx

@@ -1,6 +1,6 @@
 import { isWeb } from '@tamagui/constants'
+import type { MutableRefObject } from 'react'
 import React, { Children, cloneElement, forwardRef, isValidElement, useRef } from 'react'
-
 import { variableToString } from '../createVariable'
 import { ThemeManagerIDContext } from '../helpers/ThemeManagerContext'
 import type { ChangedThemeResponse } from '../hooks/useTheme'
@@ -43,7 +43,11 @@ export const Theme = forwardRef(function Theme({ children, ...props }: ThemeProp
     }
   }
 
-  return getThemedChildren(themeState, finalChildren, props, isRoot)
+  const stateRef = useRef({
+    hasEverThemed: false,
+  })
+
+  return getThemedChildren(themeState, finalChildren, props, isRoot, stateRef)
 })
 Theme['displayName'] = 'Theme'
 Theme['avoidForwardRef'] = true
@@ -52,7 +56,8 @@ export function getThemedChildren(
   themeState: ChangedThemeResponse,
   children: any,
   props: ThemeProps,
-  isRoot = false
+  isRoot = false,
+  stateRef: MutableRefObject<{ hasEverThemed?: boolean }>
 ) {
   const { themeManager, isNewTheme } = themeState
 
@@ -67,13 +72,17 @@ export function getThemedChildren(
 
   const { shallow, forceClassName } = props
 
-  // TODO remove hook and join with the parent stateRef in createComponent
-  const hasEverThemed = useRef(false)
-
+  // always be true if ever themed so we avoid re-parenting
   const shouldRenderChildrenWithTheme =
-    isNewTheme || props.inverse || hasEverThemed.current || forceClassName || isRoot
+    isNewTheme ||
+    'inverse' in props ||
+    'theme' in props ||
+    stateRef.current.hasEverThemed ||
+    forceClassName ||
+    isRoot
+
   if (shouldRenderChildrenWithTheme) {
-    hasEverThemed.current = true
+    stateRef.current.hasEverThemed = true
   }
 
   if (!shouldRenderChildrenWithTheme) {

package/types/createComponent.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { ComponentContextI, DebugProp, DisposeFn, SpaceDirection, SpaceValue, SpacerProps, SpacerStyleProps, StackNonStyleProps, StackProps, StaticConfig, TamaguiComponent, TamaguiComponentStateRef, TamaguiElement, TamaguiInternalConfig, TextProps } from './types';
+import type { ComponentContextI, DebugProp, SpaceDirection, SpaceValue, SpacerProps, SpacerStyleProps, StackNonStyleProps, StackProps, StaticConfig, TamaguiComponent, TamaguiComponentStateRef, TamaguiElement, TamaguiInternalConfig, TextProps } from './types';
 import type { TamaguiComponentState } from './interfaces/TamaguiComponentState';
 type ComponentSetState = React.Dispatch<React.SetStateAction<TamaguiComponentState>>;
 export declare const componentSetStates: Set<ComponentSetState>;
@@ -49,6 +49,6 @@ export declare const subscribeToContextGroup: ({ disabled, setStateShallow, pseu
     mediaGroups?: Set<string> | undefined;
     componentContext: ComponentContextI;
     state: TamaguiComponentState;
-}) => DisposeFn | undefined;
+}) => import("./types").DisposeFn | undefined;
 export {};
 //# sourceMappingURL=createComponent.d.ts.map

package/types/createComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAIA,OAAO,KAYN,MAAM,OAAO,CAAA;AAuBd,OAAO,KAAK,EACV,iBAAiB,EACjB,SAAS,EACT,SAAS,EAKT,cAAc,EACd,UAAU,EACV,WAAW,EACX,gBAAgB,EAChB,kBAAkB,EAClB,UAAU,EACV,YAAY,EAEZ,gBAAgB,EAChB,wBAAwB,EACxB,cAAc,EACd,qBAAqB,EACrB,SAAS,EAIV,MAAM,SAAS,CAAA;AAEhB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAA;AAgB/E,KAAK,iBAAiB,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC,CAAA;AAEpF,eAAO,MAAM,kBAAkB,wBAA+B,CAAA;AAkE9D,eAAO,MAAM,iBAAiB,UACrB,UAAU,GAAG,SAAS,GAAG,OAAO,MAAM,EAAE,GAAG,CAAC,+BACtB,iBAAiB,gBAChC,YAAY,UAClB,qBAAqB;;;;;;;;;;;;;;;;;;;CAuL9B,CAAA;AAuBD,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,EACnD,GAAG,SAAS,cAAc,GAAG,cAAc,EAC3C,SAAS,GAAG,KAAK,EACjB,UAAU,SAAS,MAAM,GAAG,KAAK,EACjC,YAAY,EAAE,YAAY,wEAohC3B;AAsBD,wBAAgB,QAAQ,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;CAAE,OAEjD;yBAFe,QAAQ;;;AAkBxB,eAAO,MAAM,MAAM,yFA0CjB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,UAAU,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,cAAc,GAAG,OAAO,CAAA;IACpC,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC3B,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,mBAiGxD;AAwDD,eAAO,MAAM,UAAU,UAAW,GAAG,QAQpC,CAAA;AAED,eAAO,MAAM,uBAAuB;;6BAST,QAAQ,qBAAqB,CAAC,GAAG,SAAS,KAAK,IAAI;;;sBAG1D,iBAAiB;WAC5B,qBAAqB;2BAsC7B,CAAA"}
+{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAIA,OAAO,KAYN,MAAM,OAAO,CAAA;AAuBd,OAAO,KAAK,EACV,iBAAiB,EACjB,SAAS,EAKT,cAAc,EACd,UAAU,EACV,WAAW,EACX,gBAAgB,EAChB,kBAAkB,EAClB,UAAU,EACV,YAAY,EAEZ,gBAAgB,EAChB,wBAAwB,EACxB,cAAc,EACd,qBAAqB,EACrB,SAAS,EAIV,MAAM,SAAS,CAAA;AAEhB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAA;AAiB/E,KAAK,iBAAiB,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC,CAAA;AAEpF,eAAO,MAAM,kBAAkB,wBAA+B,CAAA;AAkE9D,eAAO,MAAM,iBAAiB,UACrB,UAAU,GAAG,SAAS,GAAG,OAAO,MAAM,EAAE,GAAG,CAAC,+BACtB,iBAAiB,gBAChC,YAAY,UAClB,qBAAqB;;;;;;;;;;;;;;;;;;;CAuL9B,CAAA;AAuBD,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,EACnD,GAAG,SAAS,cAAc,GAAG,cAAc,EAC3C,SAAS,GAAG,KAAK,EACjB,UAAU,SAAS,MAAM,GAAG,KAAK,EACjC,YAAY,EAAE,YAAY,wEAqhC3B;AAsBD,wBAAgB,QAAQ,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;CAAE,OAEjD;yBAFe,QAAQ;;;AAkBxB,eAAO,MAAM,MAAM,yFA0CjB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,UAAU,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,cAAc,GAAG,OAAO,CAAA;IACpC,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC3B,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,mBAiGxD;AAwDD,eAAO,MAAM,UAAU,UAAW,GAAG,QAQpC,CAAA;AAED,eAAO,MAAM,uBAAuB;;6BAST,QAAQ,qBAAqB,CAAC,GAAG,SAAS,KAAK,IAAI;;;sBAG1D,iBAAiB;WAC5B,qBAAqB;6CAsC7B,CAAA"}

package/types/helpers/createStyledContext.d.ts

@@ -1,9 +1,9 @@
-import React from 'react';
-export type StyledContext<Props extends Object = any> = Omit<React.Context<Props>, 'Provider'> & {
-    context: React.Context<Props>;
+import { type Context, type ProviderExoticComponent, type ReactNode } from 'react';
+export type StyledContext<Props extends Object = any> = Omit<Context<Props>, 'Provider'> & {
+    context: Context<Props>;
     props: Object | undefined;
-    Provider: React.ProviderExoticComponent<Partial<Props | undefined> & {
-        children?: React.ReactNode;
+    Provider: ProviderExoticComponent<Partial<Props | undefined> & {
+        children?: ReactNode;
         scope?: string;
     }>;
     useStyledContext: (scope?: string) => Props;

package/types/helpers/createStyledContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createStyledContext.d.ts","sourceRoot":"","sources":["../../src/helpers/createStyledContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAA;AAIjE,MAAM,MAAM,aAAa,CAAC,KAAK,SAAS,MAAM,GAAG,GAAG,IAAI,IAAI,CAC1D,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EACpB,UAAU,CACX,GAAG;IACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IACzB,QAAQ,EAAE,KAAK,CAAC,uBAAuB,CACrC,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,GAAG;QAC3B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;QAC1B,KAAK,CAAC,EAAE,MAAM,CAAA;KACf,CACF,CAAA;IACD,gBAAgB,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,KAAK,CAAA;CAC5C,CAAA;AAED,wBAAgB,mBAAmB,CAAC,YAAY,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1E,aAAa,CAAC,EAAE,YAAY,GAC3B,aAAa,CAAC,YAAY,CAAC,CA2C7B;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,IAAI,CAAC,GAAG;KAAG,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM;CAAE,CAAA"}
+{"version":3,"file":"createStyledContext.d.ts","sourceRoot":"","sources":["../../src/helpers/createStyledContext.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,OAAO,EACZ,KAAK,uBAAuB,EAC5B,KAAK,SAAS,EACf,MAAM,OAAO,CAAA;AAId,MAAM,MAAM,aAAa,CAAC,KAAK,SAAS,MAAM,GAAG,GAAG,IAAI,IAAI,CAC1D,OAAO,CAAC,KAAK,CAAC,EACd,UAAU,CACX,GAAG;IACF,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;IACvB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IACzB,QAAQ,EAAE,uBAAuB,CAC/B,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,GAAG;QAC3B,QAAQ,CAAC,EAAE,SAAS,CAAA;QACpB,KAAK,CAAC,EAAE,MAAM,CAAA;KACf,CACF,CAAA;IACD,gBAAgB,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,KAAK,CAAA;CAC5C,CAAA;AAED,wBAAgB,mBAAmB,CAAC,YAAY,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1E,aAAa,CAAC,EAAE,YAAY,GAC3B,aAAa,CAAC,YAAY,CAAC,CA2C7B;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,IAAI,CAAC,GAAG;KAAG,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM;CAAE,CAAA"}

package/types/helpers/getSplitStyles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AAkCA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAChF,OAAO,KAAK,EAEV,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAOb,eAAe,EACf,YAAY,EAGZ,cAAc,EACd,WAAW,EAEZ,MAAM,UAAU,CAAA;AA0BjB,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAE3D,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAMhE,KAAK,aAAa,GAAG,CACnB,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,qBAAqB,EACrC,UAAU,EAAE,eAAe,EAC3B,iBAAiB,CAAC,EAAE,cAAc,GAAG,IAAI,EACzC,OAAO,CAAC,EAAE,iBAAiB,EAE3B,WAAW,CAAC,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,SAAS,EACjB,wBAAwB,CAAC,EAAE,OAAO,KAC/B,cAAc,CAAA;AAEnB,eAAO,MAAM,UAAU,MAAM,CAAA;AA8B7B,eAAO,MAAM,cAAc,EAAE,aAstC5B,CAAA;AAgED,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,wBACO,OAAO,KAC5B,cA2BF,CAAA;AAQD,eAAO,MAAM,cAAc,EAAE,aAU5B,CAAA"}
+{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAChF,OAAO,KAAK,EAEV,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAOb,eAAe,EACf,YAAY,EAGZ,cAAc,EACd,WAAW,EAEZ,MAAM,UAAU,CAAA;AAyBjB,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAE3D,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAMhE,KAAK,aAAa,GAAG,CACnB,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,qBAAqB,EACrC,UAAU,EAAE,eAAe,EAC3B,iBAAiB,CAAC,EAAE,cAAc,GAAG,IAAI,EACzC,OAAO,CAAC,EAAE,iBAAiB,EAE3B,WAAW,CAAC,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,SAAS,EACjB,wBAAwB,CAAC,EAAE,OAAO,KAC/B,cAAc,CAAA;AAEnB,eAAO,MAAM,UAAU,MAAM,CAAA;AA8B7B,eAAO,MAAM,cAAc,EAAE,aAstC5B,CAAA;AAgED,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,wBACO,OAAO,KAC5B,cA2BF,CAAA;AAQD,eAAO,MAAM,cAAc,EAAE,aAU5B,CAAA"}

package/types/helpers/setElementProps.d.ts

@@ -0,0 +1,2 @@
+export declare const setElementProps: (element: HTMLElement) => void;
+//# sourceMappingURL=setElementProps.d.ts.map

package/types/helpers/setElementProps.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setElementProps.d.ts","sourceRoot":"","sources":["../../src/helpers/setElementProps.tsx"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe,YAAqC,WAAW,KAAK,IAAI,CAAA"}

package/types/helpers/setElementProps.native.d.ts

@@ -0,0 +1,2 @@
+export declare function setElementProps(element: any): void;
+//# sourceMappingURL=setElementProps.native.d.ts.map

package/types/helpers/setElementProps.native.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setElementProps.native.d.ts","sourceRoot":"","sources":["../../src/helpers/setElementProps.native.tsx"],"names":[],"mappings":"AAAA,wBAAgB,eAAe,CAAC,OAAO,KAAA,QAQtC"}

package/types/interfaces/TamaguiComponentPropsBaseBase.d.ts

@@ -2,6 +2,7 @@ import type { Role } from './Role';
 import type { DebugProp, ThemeName, GroupNames } from '../types';
 export type TamaguiComponentPropsBaseBase = {
     target?: string;
+    htmlFor?: string;
     /**
      * When truthy passes through all props to a single child element, and avoids rendering its own element.
      * Must pass just one child React element that will receive all the props.

package/types/interfaces/TamaguiComponentPropsBaseBase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TamaguiComponentPropsBaseBase.d.ts","sourceRoot":"","sources":["../../src/interfaces/TamaguiComponentPropsBaseBase.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"TamaguiComponentPropsBaseBase.d.ts","sourceRoot":"","sources":["../../src/interfaces/TamaguiComponentPropsBaseBase.tsx"],"names":[],"mappings":"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"}

package/types/types.d.ts

@@ -704,6 +704,10 @@ interface ExtraStyleProps {
      * Web-only style property. Will be omitted on native.
      */
     userSelect?: Properties['userSelect'];
+    /**
+     * Web-only style property. Will be omitted on native.
+     */
+    scrollbarWidth?: Properties['scrollbarWidth'];
     pointerEvents?: ViewProps['pointerEvents'];
     /**
      * @deprecated Use `gap`
@@ -1147,6 +1151,7 @@ export type TamaguiComponentStateRef = {
     hasMeasured?: boolean;
     hasAnimated?: boolean;
     themeShallow?: boolean;
+    hasEverThemed?: boolean;
     isListeningToTheme?: boolean;
     unPress?: Function;
     group?: {