@tamagui/web 1.110.2 → 1.110.3

package/package.json

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

package/src/createComponent.tsx

@@ -477,11 +477,13 @@ export function createComponent<
           propsIn[inverseShorthands[key]] ??
           defaultProps?.[key] ??
           defaultProps?.[inverseShorthands[key]]
+
         // if not set, use context
         if (propVal === undefined) {
-          if (contextValue) {
+          const val = contextValue?.[key]
+          if (val !== undefined) {
             styledContextProps ||= {}
-            styledContextProps[key] = contextValue[key]
+            styledContextProps[key] = val
           }
         }
         // if set in props, update context

package/src/views/Slot.tsx

@@ -4,7 +4,7 @@ import { composeRefs } from '@tamagui/compose-refs'
 import { isWeb } from '@tamagui/constants'
 import { composeEventHandlers } from '@tamagui/helpers'
 import type { ReactNode } from 'react'
-import { Children, cloneElement, forwardRef, isValidElement, version } from 'react'
+import { Children, cloneElement, forwardRef, isValidElement, version, memo } from 'react'
 
 /* -------------------------------------------------------------------------------------------------
  * Slot
@@ -16,29 +16,29 @@ interface SlotProps {
 
 const is19 = version.startsWith('19.')
 
-export const Slot = forwardRef<any, SlotProps>(function Slot(props, forwardedRef) {
-  const { children, ...slotProps } = props
-
-  if (isValidElement(children)) {
-    const mergedProps = mergeSlotProps(children, slotProps)
-    return cloneElement(
-      children,
-      children.type['avoidForwardRef']
-        ? mergedProps
-        : {
-            ...mergedProps,
-            ref: composeRefs(
-              forwardedRef,
-              is19 ? (children as any).props.ref : (children as any).ref
-            ),
-          }
-    )
-  }
-
-  return Children.count(children) > 1 ? Children.only(null) : null
-})
+export const Slot = memo(
+  forwardRef<any, SlotProps>(function Slot(props, forwardedRef) {
+    const { children, ...slotProps } = props
+
+    if (isValidElement(children)) {
+      const mergedProps = mergeSlotProps(children, slotProps)
+      return cloneElement(
+        children,
+        children.type['avoidForwardRef']
+          ? mergedProps
+          : {
+              ...mergedProps,
+              ref: composeRefs(
+                forwardedRef,
+                is19 ? (children as any).props.ref : (children as any).ref
+              ),
+            }
+      )
+    }
 
-Slot['displayName'] = 'Slot'
+    return Children.count(children) > 1 ? Children.only(null) : null
+  })
+)
 
 /* -------------------------------------------------------------------------------------------------
  * Slottable

package/types/createComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAkCzB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAA;AAG/E,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;AAchB,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,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,+BACtB,iBAAiB,gBAChC,YAAY,UAClB,qBAAqB;;;;;;;;;;;;;;;;;;;CAuN9B,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,wEAgmC3B;AAoBD,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,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,mBAiGxD;AA6CD,eAAO,MAAM,UAAU,UAAW,GAAG,QAQpC,CAAA;AAED,eAAO,MAAM,uBAAuB,uFAOjC;IACD,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,eAAe,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,GAAG,SAAS,KAAK,IAAI,CAAA;IAC5E,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAC1B,WAAW,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACzB,gBAAgB,EAAE,iBAAiB,CAAA;IACnC,KAAK,EAAE,qBAAqB,CAAA;CAC7B,4CAqCA,CAAA"}
+{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAkCzB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAA;AAG/E,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;AAchB,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,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,+BACtB,iBAAiB,gBAChC,YAAY,UAClB,qBAAqB;;;;;;;;;;;;;;;;;;;CAuN9B,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,wEAkmC3B;AAoBD,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,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,mBAiGxD;AA6CD,eAAO,MAAM,UAAU,UAAW,GAAG,QAQpC,CAAA;AAED,eAAO,MAAM,uBAAuB,uFAOjC;IACD,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,eAAe,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,GAAG,SAAS,KAAK,IAAI,CAAA;IAC5E,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAC1B,WAAW,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACzB,gBAAgB,EAAE,iBAAiB,CAAA;IACnC,KAAK,EAAE,qBAAqB,CAAA;CAC7B,4CAqCA,CAAA"}

package/types/views/Slot.d.ts

@@ -2,7 +2,7 @@ import type { ReactNode } from 'react';
 interface SlotProps {
     children: ReactNode;
 }
-export declare const Slot: import("react").ForwardRefExoticComponent<SlotProps & import("react").RefAttributes<any>>;
+export declare const Slot: import("react").MemoExoticComponent<import("react").ForwardRefExoticComponent<SlotProps & import("react").RefAttributes<any>>>;
 export declare const Slottable: {
     ({ children }: {
         children: ReactNode;

package/types/views/Slot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Slot.d.ts","sourceRoot":"","sources":["../../src/views/Slot.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAOtC,UAAU,SAAS;IACjB,QAAQ,EAAE,SAAS,CAAA;CACpB;AAID,eAAO,MAAM,IAAI,2FAoBf,CAAA;AAQF,eAAO,MAAM,SAAS;mBAAkB;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE;;CAE9D,CAAA"}
+{"version":3,"file":"Slot.d.ts","sourceRoot":"","sources":["../../src/views/Slot.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAOtC,UAAU,SAAS;IACjB,QAAQ,EAAE,SAAS,CAAA;CACpB;AAID,eAAO,MAAM,IAAI,gIAsBhB,CAAA;AAMD,eAAO,MAAM,SAAS;mBAAkB;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE;;CAE9D,CAAA"}