tamagui 3.0.13 → 3.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tamagui",
-  "version": "3.0.13",
+  "version": "3.0.15",
   "license": "MIT",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "description": "Style and UI for React (web and native) meet an optimizing compiler",
@@ -315,73 +315,73 @@
     "check-circular-deps": "npx madge --circular ./src/index.ts"
   },
   "dependencies": {
-    "@tamagui/accordion": "3.0.13",
-    "@tamagui/adapt": "3.0.13",
-    "@tamagui/alert-dialog": "3.0.13",
-    "@tamagui/animate": "3.0.13",
-    "@tamagui/animate-presence": "3.0.13",
-    "@tamagui/avatar": "3.0.13",
-    "@tamagui/button": "3.0.13",
-    "@tamagui/card": "3.0.13",
-    "@tamagui/checkbox": "3.0.13",
-    "@tamagui/collapsible": "3.0.13",
-    "@tamagui/compose-refs": "3.0.13",
-    "@tamagui/constants": "3.0.13",
-    "@tamagui/context-menu": "3.0.13",
-    "@tamagui/core": "3.0.13",
-    "@tamagui/create-context": "3.0.13",
-    "@tamagui/create-menu": "3.0.13",
-    "@tamagui/dialog": "3.0.13",
-    "@tamagui/element": "3.0.13",
-    "@tamagui/fake-react-native": "3.0.13",
-    "@tamagui/field": "3.0.13",
-    "@tamagui/focusable": "3.0.13",
-    "@tamagui/font-size": "3.0.13",
-    "@tamagui/form": "3.0.13",
-    "@tamagui/get-font-sized": "3.0.13",
-    "@tamagui/get-token": "3.0.13",
-    "@tamagui/group": "3.0.13",
-    "@tamagui/helpers-tamagui": "3.0.13",
-    "@tamagui/image": "3.0.13",
-    "@tamagui/input": "3.0.13",
-    "@tamagui/label": "3.0.13",
-    "@tamagui/linear-gradient": "3.0.13",
-    "@tamagui/list-item": "3.0.13",
-    "@tamagui/menu": "3.0.13",
-    "@tamagui/polyfill-dev": "3.0.13",
-    "@tamagui/popover": "3.0.13",
-    "@tamagui/popper": "3.0.13",
-    "@tamagui/portal": "3.0.13",
-    "@tamagui/progress": "3.0.13",
-    "@tamagui/radio-group": "3.0.13",
-    "@tamagui/react-native-media-driver": "3.0.13",
-    "@tamagui/react-native-types": "3.0.13",
-    "@tamagui/scroll-view": "3.0.13",
-    "@tamagui/select": "3.0.13",
-    "@tamagui/separator": "3.0.13",
-    "@tamagui/shapes": "3.0.13",
-    "@tamagui/sheet": "3.0.13",
-    "@tamagui/slider": "3.0.13",
-    "@tamagui/spacer": "3.0.13",
-    "@tamagui/spinner": "3.0.13",
-    "@tamagui/stacks": "3.0.13",
-    "@tamagui/switch": "3.0.13",
-    "@tamagui/tabs": "3.0.13",
-    "@tamagui/text": "3.0.13",
-    "@tamagui/theme": "3.0.13",
-    "@tamagui/toast": "3.0.13",
-    "@tamagui/toggle-group": "3.0.13",
-    "@tamagui/tooltip": "3.0.13",
-    "@tamagui/ui": "3.0.13",
-    "@tamagui/use-controllable-state": "3.0.13",
-    "@tamagui/use-debounce": "3.0.13",
-    "@tamagui/use-force-update": "3.0.13",
-    "@tamagui/use-window-dimensions": "3.0.13",
-    "@tamagui/visually-hidden": "3.0.13",
-    "@tamagui/z-index-stack": "3.0.13"
+    "@tamagui/accordion": "3.0.15",
+    "@tamagui/adapt": "3.0.15",
+    "@tamagui/alert-dialog": "3.0.15",
+    "@tamagui/animate": "3.0.15",
+    "@tamagui/animate-presence": "3.0.15",
+    "@tamagui/avatar": "3.0.15",
+    "@tamagui/button": "3.0.15",
+    "@tamagui/card": "3.0.15",
+    "@tamagui/checkbox": "3.0.15",
+    "@tamagui/collapsible": "3.0.15",
+    "@tamagui/compose-refs": "3.0.15",
+    "@tamagui/constants": "3.0.15",
+    "@tamagui/context-menu": "3.0.15",
+    "@tamagui/core": "3.0.15",
+    "@tamagui/create-context": "3.0.15",
+    "@tamagui/create-menu": "3.0.15",
+    "@tamagui/dialog": "3.0.15",
+    "@tamagui/element": "3.0.15",
+    "@tamagui/fake-react-native": "3.0.15",
+    "@tamagui/field": "3.0.15",
+    "@tamagui/focusable": "3.0.15",
+    "@tamagui/font-size": "3.0.15",
+    "@tamagui/form": "3.0.15",
+    "@tamagui/get-font-sized": "3.0.15",
+    "@tamagui/get-token": "3.0.15",
+    "@tamagui/group": "3.0.15",
+    "@tamagui/helpers-tamagui": "3.0.15",
+    "@tamagui/image": "3.0.15",
+    "@tamagui/input": "3.0.15",
+    "@tamagui/label": "3.0.15",
+    "@tamagui/linear-gradient": "3.0.15",
+    "@tamagui/list-item": "3.0.15",
+    "@tamagui/menu": "3.0.15",
+    "@tamagui/polyfill-dev": "3.0.15",
+    "@tamagui/popover": "3.0.15",
+    "@tamagui/popper": "3.0.15",
+    "@tamagui/portal": "3.0.15",
+    "@tamagui/progress": "3.0.15",
+    "@tamagui/radio-group": "3.0.15",
+    "@tamagui/react-native-media-driver": "3.0.15",
+    "@tamagui/react-native-types": "3.0.15",
+    "@tamagui/scroll-view": "3.0.15",
+    "@tamagui/select": "3.0.15",
+    "@tamagui/separator": "3.0.15",
+    "@tamagui/shapes": "3.0.15",
+    "@tamagui/sheet": "3.0.15",
+    "@tamagui/slider": "3.0.15",
+    "@tamagui/spacer": "3.0.15",
+    "@tamagui/spinner": "3.0.15",
+    "@tamagui/stacks": "3.0.15",
+    "@tamagui/switch": "3.0.15",
+    "@tamagui/tabs": "3.0.15",
+    "@tamagui/text": "3.0.15",
+    "@tamagui/theme": "3.0.15",
+    "@tamagui/toast": "3.0.15",
+    "@tamagui/toggle-group": "3.0.15",
+    "@tamagui/tooltip": "3.0.15",
+    "@tamagui/ui": "3.0.15",
+    "@tamagui/use-controllable-state": "3.0.15",
+    "@tamagui/use-debounce": "3.0.15",
+    "@tamagui/use-force-update": "3.0.15",
+    "@tamagui/use-window-dimensions": "3.0.15",
+    "@tamagui/visually-hidden": "3.0.15",
+    "@tamagui/z-index-stack": "3.0.15"
   },
   "devDependencies": {
-    "@tamagui/build": "3.0.13",
+    "@tamagui/build": "3.0.15",
     "react": "19.2.3",
     "react-native": "0.87.1",
     "react-native-web": "~0.21.0"
@@ -400,5 +400,5 @@
   ],
   "module:jsx": "dist/jsx",
   "removeSideEffects": true,
-  "releaseSourceCommit": "b8e55707cda1d4eb264d3a71b30b6d0ed3841919"
+  "releaseSourceCommit": "181782eb92d59e1a0c5b235070f58003af6a1280"
 }

package/src/components/Input.tsx

@@ -17,34 +17,46 @@ import { Input as UiInput, TextArea as UiTextArea } from '@tamagui/input'
 export type InputSize = ComponentSize | boolean
 
 const inputSize = {
-  xs: { paddingInline: '2', paddingBlock: '1', borderRadius: 'sm', fontSize: 'xs' },
-  sm: { paddingInline: '3', paddingBlock: '1.5', borderRadius: 'md', fontSize: 'sm' },
-  md: { paddingInline: '4', paddingBlock: '2', borderRadius: 'md', fontSize: 'sm' },
-  lg: { paddingInline: '6', paddingBlock: '2', borderRadius: 'md', fontSize: 'base' },
-  xl: { paddingInline: '8', paddingBlock: '2.5', borderRadius: 'lg', fontSize: 'lg' },
-} as const
-
-const inputLineHeight = {
-  xs: 'xs',
-  sm: 'sm',
-  md: 'sm',
-  lg: 'base',
-  xl: 'lg',
+  xs: {
+    paddingInline: '2',
+    paddingBlock: '1',
+    borderRadius: 'sm',
+    fontSize: 'xs',
+    lineHeight: isWeb ? 'xs' : undefined,
+  },
+  sm: {
+    paddingInline: '3',
+    paddingBlock: '1.5',
+    borderRadius: 'md',
+    fontSize: 'sm',
+    lineHeight: isWeb ? 'sm' : undefined,
+  },
+  md: {
+    paddingInline: '4',
+    paddingBlock: '2',
+    borderRadius: 'md',
+    fontSize: 'sm',
+    lineHeight: isWeb ? 'sm' : undefined,
+  },
+  lg: {
+    paddingInline: '6',
+    paddingBlock: '2',
+    borderRadius: 'md',
+    fontSize: 'base',
+    lineHeight: isWeb ? 'base' : undefined,
+  },
+  xl: {
+    paddingInline: '8',
+    paddingBlock: '2.5',
+    borderRadius: 'lg',
+    fontSize: 'lg',
+    lineHeight: isWeb ? 'lg' : undefined,
+  },
 } as const
 
-const resolveInputSize = (size: InputSize | undefined): keyof typeof inputSize =>
-  typeof size === 'string' && size in inputSize ? (size as keyof typeof inputSize) : 'md'
-
-// line height ships only on web: on native the platform default applies, so an
-// input's height stays padding plus line height on both platforms
-const resolveInputLineHeight = (props: { size?: InputSize; lineHeight?: unknown }) => {
-  if (!isWeb || props.lineHeight != null) return
-  const lineHeight = inputLineHeight[resolveInputSize(props.size)]
-  if (lineHeight) return { lineHeight }
-}
-
 const inputSkin = {
   fontFamily: 'body',
+  lineHeight: isWeb ? 'sm' : undefined,
   color: 'color',
   backgroundColor: 'background',
   borderColor: 'border-color hover:border-color-hover focus:border-color-focus',
@@ -67,7 +79,7 @@ const InputFrame = styled(UiInput, {
   defaultVariants: {
     size: 'md',
   },
-}).resolve((props) => resolveInputLineHeight(props as any))
+})
 
 const TextAreaFrame = styled(UiTextArea, {
   displayName: 'TextArea',
@@ -82,7 +94,7 @@ const TextAreaFrame = styled(UiTextArea, {
   defaultVariants: {
     size: 'md',
   },
-}).resolve((props) => resolveInputLineHeight(props as any))
+})
 
 export const Input = createStyledHOC(
   InputFrame,

package/types/components/Input.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Input.d.ts","sourceRoot":"","sources":["../../src/components/Input.tsx"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,aAAa,EAElB,KAAK,QAAQ,EAKd,MAAM,eAAe,CAAA;AAGtB,MAAM,MAAM,SAAS,GAAG,aAAa,GAAG,OAAO,CAAA;AAsE/C,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CAWjB,CAAA;AAED,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CAWpB,CAAA;AAED,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,KAAK,CAAC,CAAA;AAC/C,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,QAAQ,CAAC,CAAA"}
+{"version":3,"file":"Input.d.ts","sourceRoot":"","sources":["../../src/components/Input.tsx"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,aAAa,EAElB,KAAK,QAAQ,EAKd,MAAM,eAAe,CAAA;AAGtB,MAAM,MAAM,SAAS,GAAG,aAAa,GAAG,OAAO,CAAA;AAkF/C,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CAWjB,CAAA;AAED,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CAWpB,CAAA;AAED,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,KAAK,CAAC,CAAA;AAC/C,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,QAAQ,CAAC,CAAA"}