From 7d33b94c09d361c1906006df9a205a6ff4ace06f Mon Sep 17 00:00:00 2001 From: shafi54 <108669266+shafi-aviz@users.noreply.github.com> Date: Tue, 13 Oct 2026 13:57:57 +0530 Subject: [PATCH] enh --- .../(drawer)/(tabs)/me/addresses/index.tsx | 4 +- apps/user-ui/src/components/AddressForm.tsx | 19 +++++---- change-log.txt | 41 +++++++++++++++++++ 3 files changed, 56 insertions(+), 8 deletions(-) create mode 100644 change-log.txt diff --git a/apps/user-ui/app/(drawer)/(tabs)/me/addresses/index.tsx b/apps/user-ui/app/(drawer)/(tabs)/me/addresses/index.tsx index 4b80e85..673b225 100644 --- a/apps/user-ui/app/(drawer)/(tabs)/me/addresses/index.tsx +++ b/apps/user-ui/app/(drawer)/(tabs)/me/addresses/index.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react'; import type { UserAddress } from '@packages/shared' -import { View, Alert } from 'react-native'; +import { View, Alert, Dimensions } from 'react-native'; import { useRouter } from 'expo-router'; import { AppContainer, MyText, tw, useMarkDataFetchers, MyFlatList, MyTouchableOpacity, BottomDialog, RawBottomDialog } from 'common-ui'; import { trpc } from '@/src/trpc-client'; @@ -243,6 +243,7 @@ export default function Addresses() { /> setModalVisible(false)}> + + ); diff --git a/apps/user-ui/src/components/AddressForm.tsx b/apps/user-ui/src/components/AddressForm.tsx index 6e758f2..e070792 100644 --- a/apps/user-ui/src/components/AddressForm.tsx +++ b/apps/user-ui/src/components/AddressForm.tsx @@ -1,12 +1,11 @@ import React, { useState } from 'react'; -import { View, ScrollView, Dimensions } from 'react-native'; +import { View, ScrollView, KeyboardAvoidingView, Platform } from 'react-native'; import { useMutation } from '@tanstack/react-query'; import { Formik } from 'formik'; import * as Yup from 'yup'; import { tw, MyText, MyTouchableOpacity , Checkbox , MyTextInput , LoadingDialog } from 'common-ui'; import { trpc } from '../trpc-client'; import LocationAttacher from './LocationAttacher'; -import {KeyboardAwareScrollView} from 'react-native-keyboard-aware-scroll-view'; import type { AddressFormProps } from '@packages/shared'; const AddressForm: React.FC = ({ onSuccess, initialValues, isEdit = false }) => { @@ -56,11 +55,16 @@ const AddressForm: React.FC = ({ onSuccess, initialValues, isE }); return ( - + {isEdit ? 'Edit Address' : 'Add Address'} {/* Service Area Notice */} @@ -248,7 +252,8 @@ const AddressForm: React.FC = ({ onSuccess, initialValues, isE open={isSubmitting} message={isEdit ? "Updating address..." : "Adding address..."} /> - + + ); }; diff --git a/change-log.txt b/change-log.txt new file mode 100644 index 0000000..439b97e --- /dev/null +++ b/change-log.txt @@ -0,0 +1,41 @@ +2026-10-13 13:54:47 AddressForm keyboard + layout fix (user-ui), re-applied on branch `main`. + Note: `main` is the pre-region base; its AddressForm is the older form (region dropdown + Google Maps URL paste). + These two fixes are self-contained and do not depend on the region work. + 1/2 apps/user-ui/src/components/AddressForm.tsx: + - import { View, ScrollView, Dimensions } from 'react-native'; + - import {KeyboardAwareScrollView} from 'react-native-keyboard-aware-scroll-view'; + + import { View, ScrollView, KeyboardAvoidingView, Platform } from 'react-native'; + - + + + + + ...content unchanged... + - + + + + + 2/2 apps/user-ui/app/(drawer)/(tabs)/me/addresses/index.tsx: + - import { View, Alert } from 'react-native'; + + import { View, Alert, Dimensions } from 'react-native'; + - + + + + + + + + + + + (RawBottomDialog renders children bare, so the form needs a bounded height.) + Why: AddressForm was the only form using react-native-keyboard-aware-scroll-view (0.9.5, pre-New-Architecture), + which mis-handles the keyboard on iOS (input focused but keyboard missing/off-screen); every other working form uses + KeyboardAvoidingView. The old `pb-32` (viewport padding) + hardcoded `maxHeight: 70%` also left a blank band and + clipped content. + No dependency added. No migration. No tests run.