robinwobin.dev / witchsky.app
forked from jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
fork atom

Fix android datepicker height (#7804)

* fix datepicker height

* fix suffixtext clipping

authored by samuel.fm and committed by

GitHub e6bfeb1b 3b4f1e91

+11 -22
+5 -5
src/components/forms/DateField/index.shared.tsx
··· 1 1 import {Pressable, View} from 'react-native' 2 2 import {useLingui} from '@lingui/react' 3 3 4 - import {android, atoms as a, useTheme, web} from '#/alf' 4 + import {atoms as a, native, useTheme, web} from '#/alf' 5 5 import * as TextField from '#/components/forms/TextField' 6 6 import {useInteractionState} from '#/components/hooks/useInteractionState' 7 7 import {CalendarDays_Stroke2_Corner0_Rounded as CalendarDays} from '#/components/icons/CalendarDays' ··· 60 60 onBlur={onBlur} 61 61 style={[ 62 62 { 63 - paddingTop: 12, 64 - paddingBottom: 12, 65 63 paddingLeft: 14, 66 64 paddingRight: 14, 67 65 borderColor: 'transparent', 68 66 borderWidth: 2, 69 67 }, 70 - android({ 71 - minHeight: 57.5, 68 + native({ 69 + paddingTop: 10, 70 + paddingBottom: 10, 72 71 }), 72 + web(a.py_md), 73 73 a.flex_row, 74 74 a.flex_1, 75 75 a.w_full,
+6 -17
src/components/forms/TextField.tsx
··· 15 15 android, 16 16 applyFonts, 17 17 atoms as a, 18 + ios, 18 19 TextStyleProp, 19 20 useAlf, 20 21 useTheme, ··· 189 190 a.px_xs, 190 191 { 191 192 // paddingVertical doesn't work w/multiline - esb 192 - paddingTop: 12, 193 - paddingBottom: 13, 194 193 lineHeight: a.text_md.fontSize * 1.1875, 195 194 textAlignVertical: rest.multiline ? 'top' : undefined, 196 195 minHeight: rest.multiline ? 80 : undefined, 197 196 minWidth: 0, 198 197 }, 198 + ios({paddingTop: 12, paddingBottom: 13}), 199 + android(a.py_sm), 199 200 // fix for autofill styles covering border 200 201 web({ 201 202 paddingTop: 10, 202 203 paddingBottom: 11, 203 204 marginTop: 2, 204 205 marginBottom: 2, 205 - }), 206 - android({ 207 - paddingTop: 8, 208 - paddingBottom: 8, 209 206 }), 210 207 style, 211 208 ]) ··· 355 352 a.pr_sm, 356 353 a.text_md, 357 354 t.atoms.text_contrast_medium, 358 - { 359 - pointerEvents: 'none', 360 - }, 361 - web({ 362 - marginTop: -2, 363 - }), 364 - ctx.hovered || ctx.focused 365 - ? { 366 - color: t.palette.contrast_800, 367 - } 368 - : {}, 355 + a.pointer_events_none, 356 + web([{marginTop: -2}, a.leading_snug]), 357 + (ctx.hovered || ctx.focused) && {color: t.palette.contrast_800}, 369 358 style, 370 359 ]}> 371 360 {children}