Compare commits

..

3 Commits

Author SHA1 Message Date
66792186ca feat: Complete Forum & Admin User Access migration + fix scroll issues
Forum Screens (User Phase 5 - 17 files):
- Migrate all forum list, detail, create, and report screens to OS_Wrapper.
- ViewBeranda, ViewBeranda2, ViewBeranda3: List screens with pull-to-refresh.
- DetailForum, DetailForum2: Comment sections with headers (apply disableFlexGrow fix).
- create, edit, report-*, other-report-*, preview-report-*: Forms with keyboard handling.

Admin Phase 9 (User Access - 2 files):
- index.tsx: List with search and pagination.
- [id]/index.tsx: Detail with status toggle footer.

Scroll Fixes (Critical Bugs):
- Fix "Ghost Scroll" in Android FlatList: Removed TouchableWithoutFeedback and KeyboardAvoidingView wrappers in List Mode.
- Fix Large Header Cut-off: Added optional disableFlexGrow={true} to OS_Wrapper for screens with complex ListHeaderComponents (e.g., Forum Detail).
- Fix Keyboard Dismiss: Changed keyboardShouldPersistTaps to "handled" so taps on empty areas dismiss the keyboard while allowing scroll.

Documentation:
- Update TASK-005 with complete Phase 5 details and new progress totals.

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
2026-04-09 17:48:51 +08:00
c3cf354c28 feat: Migrate Portfolio & Maps screens + perbaiki bug auto-scroll keyboard
Phase 3 - Portfolio Screens (6 files):
- [id]/index.tsx: ViewWrapper → OS_Wrapper (detail dengan pull-to-refresh)
- [id]/edit.tsx: NewWrapper → OS_Wrapper (form + keyboard handling)
- [id]/edit-logo.tsx: ViewWrapper → OS_Wrapper (upload logo)
- [id]/edit-social-media.tsx: ViewWrapper → OS_Wrapper (form + keyboard handling)
- ViewListPortofolio.tsx: NewWrapper → OS_Wrapper (pagination list)
- ScreenPortofolioCreate.tsx: NewWrapper → OS_Wrapper (form + keyboard handling)

Phase 4 - Maps Screens (2 files):
- ScreenMapsCreate.tsx: NewWrapper → OS_Wrapper (form + keyboard handling)
- ScreenMapsEdit.tsx: ViewWrapper → OS_Wrapper (form + keyboard handling)

Bug Fixes:
- Perbaiki auto-scroll keyboard yang membuat input paling atas 'terlempar' keluar layar
- Gunakan UIManager.measure untuk mendapatkan posisi absolut input (pageY) secara akurat
- Logika conditional scroll:
  * Jika input terlihat (di atas keyboard) → TIDAK SCROLL
  * Jika input tertutup keyboard → Scroll secukupnya
- Helper cloneChildrenWithFocusHandler sekarang aktif menyuntikan onFocus handler ke semua TextInput/TextArea/PhoneInput/Select
- Hapus KeyboardAvoidingView dari AndroidWrapper static mode (tidak diperlukan lagi)

Pattern yang diterapkan:
- List screens: contentPaddingBottom=100 (default)
- Form screens: contentPaddingBottom={250} + enableKeyboardHandling
- NO PADDING_INLINE (sesuai preferensi user - mencegah box menyempit)

Dokumentasi:
- Update TASK-005 dengan status lengkap Phase 1-4 (27 files migrated)
- Tambahkan urutan phase baru: Event (Phase 5), Voting (Phase 6), Forum (Phase 7), Donation (Phase 8)

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
2026-04-08 17:27:06 +08:00
6ec839fd67 feat: Migrate Profile, Waiting Room, and Delete Account to OS_Wrapper
Profile Screens (8 files):
- [id]/index.tsx: NewWrapper → OS_Wrapper (list with refresh)
- [id]/edit.tsx: ViewWrapper → OS_Wrapper (form + keyboard handling)
- create.tsx: ViewWrapper → OS_Wrapper (form + keyboard handling)
- [id]/blocked-list.tsx: NewWrapper → OS_Wrapper (pagination list)
- [id]/detail-blocked.tsx: NewWrapper → OS_Wrapper (static with footer)
- [id]/update-background.tsx: ViewWrapper → OS_Wrapper (static with footer)
- [id]/update-photo.tsx: ViewWrapper → OS_Wrapper (static with footer)
- All Profile forms use enableKeyboardHandling + contentPaddingBottom={250}

Other Screens (2 files):
- waiting-room.tsx: NewWrapper → OS_Wrapper (static with refresh + footer)
- delete-account.tsx: ViewWrapper → OS_Wrapper (form + keyboard handling)

Bug Fixes:
- AndroidWrapper: Add refreshControl to ScrollView (fix pull-to-refresh on static mode)

Pattern Applied:
- List screens: contentPaddingBottom=100 (default)
- Form screens: contentPaddingBottom=250 (with TextInput)
- No PADDING_INLINE (user preference - prevents box narrowing)

Documentation:
- Update TASK-005 with Phase 1 completion details

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
2026-04-08 14:32:11 +08:00
40 changed files with 724 additions and 480 deletions

27
QWEN.md
View File

@@ -513,3 +513,30 @@ When using Maplibre MapView on iOS, prevent "Attempt to recycle a mounted view"
- [Expo Router Documentation](https://docs.expo.dev/router/introduction/) - [Expo Router Documentation](https://docs.expo.dev/router/introduction/)
- [TypeScript Documentation](https://www.typescriptlang.org/docs/) - [TypeScript Documentation](https://www.typescriptlang.org/docs/)
- [Maplibre React Native](https://github.com/maplibre/maplibre-react-native) - [Maplibre React Native](https://github.com/maplibre/maplibre-react-native)
## Qwen Added Memories
- OS_Wrapper contentPaddingBottom pattern:
- Default: contentPaddingBottom=100 (untuk list screens)
- Forms: contentPaddingBottom=250 (HANYA untuk screens yang punya TextInput/TextArea)
- contentPadding=0 (default, per-screen control)
- OS_ANDROID_PADDING_TOP=6 (compact tabs)
- OS_IOS_PADDING_TOP=12
- PADDING_INLINE=16 (constant)
Contoh:
```tsx
// List screen (default 100px)
<OS_Wrapper listData={data} renderItem={renderItem} />
// Form screen (explicit 250px)
<OS_Wrapper enableKeyboardHandling contentPaddingBottom={250}>
<FormWithTextInput />
</OS_Wrapper>
```
- PADDING_INLINE usage pattern - User preference:
- PADDING_INLINE (16px) TIDAK selalu diperlukan
- User remove PADDING_INLINE dari Profile screens karena mempersempit box tampilan
- Decision: Tambahkan PADDING_INLINE HANYA jika diperlukan per-screen, jangan default
- User akan review dan tambahkan sendiri jika perlu
Profile screens: PADDING_INLINE dihapus dari edit.tsx dan create.tsx

View File

@@ -3,10 +3,10 @@ import {
BaseBox, BaseBox,
ButtonCustom, ButtonCustom,
CenterCustom, CenterCustom,
OS_Wrapper,
StackCustom, StackCustom,
TextCustom, TextCustom,
TextInputCustom, TextInputCustom,
ViewWrapper,
} from "@/components"; } from "@/components";
import { useAuth } from "@/hooks/use-auth"; import { useAuth } from "@/hooks/use-auth";
import { apiDeleteUser } from "@/service/api-client/api-user"; import { apiDeleteUser } from "@/service/api-client/api-user";
@@ -68,7 +68,10 @@ export default function DeleteAccount() {
return ( return (
<> <>
<ViewWrapper> <OS_Wrapper
enableKeyboardHandling
contentPaddingBottom={250}
>
<StackCustom> <StackCustom>
<BaseBox> <BaseBox>
<StackCustom> <StackCustom>
@@ -105,7 +108,7 @@ export default function DeleteAccount() {
</StackCustom> </StackCustom>
</BaseBox> </BaseBox>
</StackCustom> </StackCustom>
</ViewWrapper> </OS_Wrapper>
</> </>
); );
} }

View File

@@ -2,8 +2,8 @@ import {
BoxButtonOnFooter, BoxButtonOnFooter,
ButtonCustom, ButtonCustom,
LoaderCustom, LoaderCustom,
OS_Wrapper,
TextAreaCustom, TextAreaCustom,
ViewWrapper,
} from "@/components"; } from "@/components";
import AlertWarning from "@/components/Alert/AlertWarning"; import AlertWarning from "@/components/Alert/AlertWarning";
import { apiForumGetOne, apiForumUpdate } from "@/service/api-client/api-forum"; import { apiForumGetOne, apiForumUpdate } from "@/service/api-client/api-forum";
@@ -88,7 +88,11 @@ export default function ForumEdit() {
}; };
return ( return (
<ViewWrapper footerComponent={buttonFooter()}> <OS_Wrapper
enableKeyboardHandling
contentPaddingBottom={250}
footerComponent={buttonFooter()}
>
{!loadingGetData ? ( {!loadingGetData ? (
<TextAreaCustom <TextAreaCustom
placeholder="Ketik diskusi anda..." placeholder="Ketik diskusi anda..."
@@ -102,6 +106,6 @@ export default function ForumEdit() {
) : ( ) : (
<LoaderCustom /> <LoaderCustom />
)} )}
</ViewWrapper> </OS_Wrapper>
); );
} }

View File

@@ -1,8 +1,8 @@
import { import {
BoxButtonOnFooter, BoxButtonOnFooter,
ButtonCustom, ButtonCustom,
OS_Wrapper,
TextAreaCustom, TextAreaCustom,
ViewWrapper,
} from "@/components"; } from "@/components";
import { MainColor } from "@/constants/color-palet"; import { MainColor } from "@/constants/color-palet";
import { useAuth } from "@/hooks/use-auth"; import { useAuth } from "@/hooks/use-auth";
@@ -62,13 +62,17 @@ export default function ForumOtherReportCommentar() {
return ( return (
<> <>
<ViewWrapper footerComponent={handleSubmit}> <OS_Wrapper
enableKeyboardHandling
contentPaddingBottom={250}
footerComponent={handleSubmit}
>
<TextAreaCustom <TextAreaCustom
placeholder="Laporkan Komentar" placeholder="Laporkan Komentar"
value={value} value={value}
onChangeText={setValue} onChangeText={setValue}
/> />
</ViewWrapper> </OS_Wrapper>
</> </>
); );
} }

View File

@@ -1,8 +1,8 @@
import { import {
BoxButtonOnFooter, BoxButtonOnFooter,
ButtonCustom, ButtonCustom,
OS_Wrapper,
TextAreaCustom, TextAreaCustom,
ViewWrapper,
} from "@/components"; } from "@/components";
import { MainColor } from "@/constants/color-palet"; import { MainColor } from "@/constants/color-palet";
import { useAuth } from "@/hooks/use-auth"; import { useAuth } from "@/hooks/use-auth";
@@ -61,13 +61,17 @@ export default function ForumOtherReportPosting() {
); );
return ( return (
<> <>
<ViewWrapper footerComponent={handleSubmit}> <OS_Wrapper
enableKeyboardHandling
contentPaddingBottom={250}
footerComponent={handleSubmit}
>
<TextAreaCustom <TextAreaCustom
placeholder="Laporkan Diskusi" placeholder="Laporkan Diskusi"
value={value} value={value}
onChangeText={setValue} onChangeText={setValue}
/> />
</ViewWrapper> </OS_Wrapper>
</> </>
); );
} }

View File

@@ -1,6 +1,6 @@
import { import {
BaseBox, BaseBox,
NewWrapper, OS_Wrapper,
Spacing, Spacing,
StackCustom, StackCustom,
TextCustom, TextCustom,
@@ -41,7 +41,7 @@ export default function ForumPreviewReportComment() {
return ( return (
<> <>
<NewWrapper> <OS_Wrapper>
<StackCustom> <StackCustom>
<TextCustom color="red" bold> <TextCustom color="red" bold>
Komentar anda telah melanggar aturan forum ! Admin mengambil Komentar anda telah melanggar aturan forum ! Admin mengambil
@@ -85,7 +85,7 @@ export default function ForumPreviewReportComment() {
</BaseBox> </BaseBox>
)) ))
)} )}
</NewWrapper> </OS_Wrapper>
</> </>
); );
} }

View File

@@ -1,6 +1,6 @@
import { import {
BaseBox, BaseBox,
NewWrapper, OS_Wrapper,
Spacing, Spacing,
StackCustom, StackCustom,
TextCustom, TextCustom,
@@ -41,7 +41,7 @@ export default function ForumPreviewReportPosting() {
return ( return (
<> <>
<NewWrapper> <OS_Wrapper>
<StackCustom> <StackCustom>
<TextCustom color="red" bold> <TextCustom color="red" bold>
Postingan anda telah melanggar aturan forum ! Admin mengambil Postingan anda telah melanggar aturan forum ! Admin mengambil
@@ -85,7 +85,7 @@ export default function ForumPreviewReportPosting() {
</BaseBox> </BaseBox>
)) ))
)} )}
</NewWrapper> </OS_Wrapper>
</> </>
); );
} }

View File

@@ -1,9 +1,9 @@
import { import {
ButtonCustom, ButtonCustom,
LoaderCustom, LoaderCustom,
OS_Wrapper,
Spacing, Spacing,
StackCustom, StackCustom,
ViewWrapper,
} from "@/components"; } from "@/components";
import { AccentColor, MainColor } from "@/constants/color-palet"; import { AccentColor, MainColor } from "@/constants/color-palet";
import { useAuth } from "@/hooks/use-auth"; import { useAuth } from "@/hooks/use-auth";
@@ -69,7 +69,7 @@ export default function ForumReportCommentar() {
return ( return (
<> <>
<ViewWrapper> <OS_Wrapper>
{isLoadingList ? ( {isLoadingList ? (
<LoaderCustom /> <LoaderCustom />
) : ( ) : (
@@ -101,7 +101,7 @@ export default function ForumReportCommentar() {
<Spacing /> <Spacing />
</StackCustom> </StackCustom>
)} )}
</ViewWrapper> </OS_Wrapper>
</> </>
); );
} }

View File

@@ -2,9 +2,9 @@ import {
AlertDefaultSystem, AlertDefaultSystem,
ButtonCustom, ButtonCustom,
LoaderCustom, LoaderCustom,
OS_Wrapper,
Spacing, Spacing,
StackCustom, StackCustom,
ViewWrapper,
} from "@/components"; } from "@/components";
import { AccentColor, MainColor } from "@/constants/color-palet"; import { AccentColor, MainColor } from "@/constants/color-palet";
import { useAuth } from "@/hooks/use-auth"; import { useAuth } from "@/hooks/use-auth";
@@ -73,7 +73,7 @@ export default function ForumReportPosting() {
return ( return (
<> <>
<ViewWrapper> <OS_Wrapper>
{isLoadingList ? ( {isLoadingList ? (
<LoaderCustom /> <LoaderCustom />
) : ( ) : (
@@ -114,7 +114,7 @@ export default function ForumReportPosting() {
<Spacing /> <Spacing />
</StackCustom> </StackCustom>
)} )}
</ViewWrapper> </OS_Wrapper>
</> </>
); );
} }

View File

@@ -1,8 +1,8 @@
import { import {
BoxButtonOnFooter, BoxButtonOnFooter,
ButtonCustom, ButtonCustom,
OS_Wrapper,
TextAreaCustom, TextAreaCustom,
ViewWrapper,
} from "@/components"; } from "@/components";
import AlertWarning from "@/components/Alert/AlertWarning"; import AlertWarning from "@/components/Alert/AlertWarning";
import { useAuth } from "@/hooks/use-auth"; import { useAuth } from "@/hooks/use-auth";
@@ -67,7 +67,11 @@ export default function ForumCreate() {
); );
return ( return (
<ViewWrapper footerComponent={buttonFooter}> <OS_Wrapper
enableKeyboardHandling
contentPaddingBottom={250}
footerComponent={buttonFooter}
>
<TextAreaCustom <TextAreaCustom
placeholder="Ketik diskusi anda..." placeholder="Ketik diskusi anda..."
maxLength={1000} maxLength={1000}
@@ -75,6 +79,6 @@ export default function ForumCreate() {
value={text} value={text}
onChangeText={setText} onChangeText={setText}
/> />
</ViewWrapper> </OS_Wrapper>
); );
} }

View File

@@ -2,7 +2,7 @@ import {
BaseBox, BaseBox,
ButtonCustom, ButtonCustom,
CheckboxCustom, CheckboxCustom,
NewWrapper, OS_Wrapper,
StackCustom, StackCustom,
TextCustom, TextCustom,
} from "@/components"; } from "@/components";
@@ -54,7 +54,7 @@ export default function ForumSplash() {
}; };
return ( return (
<NewWrapper> <OS_Wrapper>
{/* <TextCustom bold>HIPMI Badung Connect</TextCustom> . */} {/* <TextCustom bold>HIPMI Badung Connect</TextCustom> . */}
<BaseBox> <BaseBox>
@@ -162,7 +162,7 @@ export default function ForumSplash() {
</ButtonCustom> </ButtonCustom>
</StackCustom> </StackCustom>
</BaseBox> </BaseBox>
</NewWrapper> </OS_Wrapper>
); );
} }

View File

@@ -3,7 +3,7 @@ import {
BoxButtonOnFooter, BoxButtonOnFooter,
ButtonCenteredOnly, ButtonCenteredOnly,
ButtonCustom, ButtonCustom,
ViewWrapper OS_Wrapper
} from "@/components"; } from "@/components";
import API_STRORAGE from "@/constants/base-url-api-strorage"; import API_STRORAGE from "@/constants/base-url-api-strorage";
import DIRECTORY_ID from "@/constants/directory-id"; import DIRECTORY_ID from "@/constants/directory-id";
@@ -126,7 +126,7 @@ export default function PortofolioEditLogo() {
return ( return (
<> <>
<ViewWrapper footerComponent={buttonFooter}> <OS_Wrapper footerComponent={buttonFooter}>
<BaseBox <BaseBox
style={{ style={{
alignItems: "center", alignItems: "center",
@@ -146,7 +146,7 @@ export default function PortofolioEditLogo() {
> >
Upload Upload
</ButtonCenteredOnly> </ButtonCenteredOnly>
</ViewWrapper> </OS_Wrapper>
</> </>
); );
} }

View File

@@ -1,8 +1,8 @@
import { import {
BoxButtonOnFooter, BoxButtonOnFooter,
ButtonCustom, ButtonCustom,
OS_Wrapper,
TextInputCustom, TextInputCustom,
ViewWrapper,
} from "@/components"; } from "@/components";
import { import {
apiGetOnePortofolio, apiGetOnePortofolio,
@@ -91,7 +91,11 @@ export default function PortofolioEditSocialMedia() {
return ( return (
<> <>
<ViewWrapper footerComponent={buttonFooter}> <OS_Wrapper
enableKeyboardHandling
contentPaddingBottom={250}
footerComponent={buttonFooter}
>
<TextInputCustom <TextInputCustom
value={data.tiktok} value={data.tiktok}
onChangeText={(value) => setData({ ...data, tiktok: value })} onChangeText={(value) => setData({ ...data, tiktok: value })}
@@ -122,7 +126,7 @@ export default function PortofolioEditSocialMedia() {
label="Youtube" label="Youtube"
placeholder="Masukkan youtube" placeholder="Masukkan youtube"
/> />
</ViewWrapper> </OS_Wrapper>
</> </>
); );
} }

View File

@@ -4,7 +4,7 @@ import {
BoxButtonOnFooter, BoxButtonOnFooter,
ButtonCustom, ButtonCustom,
CenterCustom, CenterCustom,
NewWrapper, OS_Wrapper,
PhoneInputCustom, PhoneInputCustom,
SelectCustom, SelectCustom,
Spacing, Spacing,
@@ -16,7 +16,11 @@ import {
import ListSkeletonComponent from "@/components/_ShareComponent/ListSkeletonComponent"; import ListSkeletonComponent from "@/components/_ShareComponent/ListSkeletonComponent";
import { MainColor } from "@/constants/color-palet"; import { MainColor } from "@/constants/color-palet";
import { ICON_SIZE_XLARGE } from "@/constants/constans-value"; import { ICON_SIZE_XLARGE } from "@/constants/constans-value";
import { DEFAULT_COUNTRY, type CountryData, COUNTRIES } from "@/constants/countries"; import {
DEFAULT_COUNTRY,
type CountryData,
COUNTRIES,
} from "@/constants/countries";
import { import {
apiMasterBidangBisnis, apiMasterBidangBisnis,
apiMasterSubBidangBisnis, apiMasterSubBidangBisnis,
@@ -61,7 +65,8 @@ export default function PortofolioEdit() {
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
const [data, setData] = useState<any>({}); const [data, setData] = useState<any>({});
const [phoneNumber, setPhoneNumber] = useState<string>(""); const [phoneNumber, setPhoneNumber] = useState<string>("");
const [selectedCountry, setSelectedCountry] = useState<CountryData>(DEFAULT_COUNTRY); const [selectedCountry, setSelectedCountry] =
useState<CountryData>(DEFAULT_COUNTRY);
const [bidangBisnis, setBidangBisnis] = useState< const [bidangBisnis, setBidangBisnis] = useState<
IMasterBidangBisnis[] | null IMasterBidangBisnis[] | null
>(null); >(null);
@@ -75,38 +80,38 @@ export default function PortofolioEdit() {
function handlePhoneChange(phone: string) { function handlePhoneChange(phone: string) {
setPhoneNumber(phone); setPhoneNumber(phone);
// Format phone number for API // Format phone number for API
const callingCode = selectedCountry.callingCode; const callingCode = selectedCountry.callingCode;
let fixNumber = phone.replace(/\s+/g, "").replace(/^0+/, ""); let fixNumber = phone.replace(/\s+/g, "").replace(/^0+/, "");
// Remove country code if already present // Remove country code if already present
if (fixNumber.startsWith(callingCode)) { if (fixNumber.startsWith(callingCode)) {
fixNumber = fixNumber.substring(callingCode.length); fixNumber = fixNumber.substring(callingCode.length);
} }
// Remove leading zero // Remove leading zero
fixNumber = fixNumber.replace(/^0+/, ""); fixNumber = fixNumber.replace(/^0+/, "");
const realNumber = callingCode + fixNumber; const realNumber = callingCode + fixNumber;
setData({ ...data, tlpn: realNumber }); setData({ ...data, tlpn: realNumber });
} }
function handleCountryChange(country: CountryData) { function handleCountryChange(country: CountryData) {
setSelectedCountry(country); setSelectedCountry(country);
// Re-format with new country code // Re-format with new country code
const callingCode = country.callingCode; const callingCode = country.callingCode;
let fixNumber = phoneNumber.replace(/\s+/g, "").replace(/^0+/, ""); let fixNumber = phoneNumber.replace(/\s+/g, "").replace(/^0+/, "");
// Remove country code if already present // Remove country code if already present
if (fixNumber.startsWith(callingCode)) { if (fixNumber.startsWith(callingCode)) {
fixNumber = fixNumber.substring(callingCode.length); fixNumber = fixNumber.substring(callingCode.length);
} }
// Remove leading zero // Remove leading zero
fixNumber = fixNumber.replace(/^0+/, ""); fixNumber = fixNumber.replace(/^0+/, "");
const realNumber = callingCode + fixNumber; const realNumber = callingCode + fixNumber;
setData({ ...data, tlpn: realNumber }); setData({ ...data, tlpn: realNumber });
} }
@@ -157,7 +162,7 @@ export default function PortofolioEdit() {
const fullNumber = response.data.tlpn; const fullNumber = response.data.tlpn;
let displayNumber = fullNumber; let displayNumber = fullNumber;
let detectedCountry = DEFAULT_COUNTRY; let detectedCountry = DEFAULT_COUNTRY;
// Try to detect country from calling code // Try to detect country from calling code
for (const country of COUNTRIES) { for (const country of COUNTRIES) {
if (fullNumber.startsWith(country.callingCode)) { if (fullNumber.startsWith(country.callingCode)) {
@@ -166,12 +171,12 @@ export default function PortofolioEdit() {
break; break;
} }
} }
setSelectedCountry(detectedCountry); setSelectedCountry(detectedCountry);
// Remove leading zero if present // Remove leading zero if present
displayNumber = displayNumber.replace(/^0+/, ""); displayNumber = displayNumber.replace(/^0+/, "");
setPhoneNumber(displayNumber); setPhoneNumber(displayNumber);
setData({ ...response.data, tlpn: displayNumber }); setData({ ...response.data, tlpn: displayNumber });
@@ -363,161 +368,159 @@ export default function PortofolioEdit() {
</BoxButtonOnFooter> </BoxButtonOnFooter>
); );
if (!bidangBisnis || !subBidangBisnis) {
return (
<>
<NewWrapper>
<ListSkeletonComponent height={80} />
</NewWrapper>
</>
);
}
return ( return (
<> <>
<NewWrapper footerComponent={buttonUpdate}> <OS_Wrapper
<StackCustom gap={"xs"}> enableKeyboardHandling
<TextInputCustom contentPaddingBottom={250}
required footerComponent={buttonUpdate}
label="Nama Bisnis" >
placeholder="Masukkan nama bisnis" {!bidangBisnis || !subBidangBisnis ? (
value={data.namaBisnis} <ListSkeletonComponent height={80} />
onChangeText={(value: any) => ) : (
setData({ ...data, namaBisnis: value }) <StackCustom gap={"xs"}>
} <TextInputCustom
/> required
label="Nama Bisnis"
<SelectCustom placeholder="Masukkan nama bisnis"
label="Bidang Usaha" value={data.namaBisnis}
required onChangeText={(value: any) =>
data={bidangBisnis?.map((item) => ({ setData({ ...data, namaBisnis: value })
label: item.name, }
value: item.id,
}))}
value={data.masterBidangBisnisId}
onChange={(value: any) => {
handleBidangBisnisChange(value);
}}
/>
{listSubBidangSelected.map((item, index) => {
// Filter data untuk select sub bidang, menghilangkan yang sudah dipilih kecuali untuk item ini sendiri
const selectedIds = listSubBidangSelected
.filter((_, i) => i !== index)
.map((s) => s.MasterSubBidangBisnis?.id)
.filter((id) => id); // Filter hanya yang memiliki id (tidak kosong)
const availableSubBidangOptions = (selectedSubBidang || [])
.filter((sub: any) => {
// Tampilkan jika ini adalah opsi yang dipilih saat ini atau belum dipilih di sub bidang lainnya
return (
sub.id === item.MasterSubBidangBisnis?.id ||
!selectedIds.includes(sub.id)
);
})
.map((sub: any) => ({
value: sub.id,
label: sub.name,
}));
return (
<SelectCustom
key={index}
label="Sub Bidang Usaha"
required
data={availableSubBidangOptions}
value={item.MasterSubBidangBisnis?.id || null}
onChange={(value: any) => {
handleSubBidangChange(value, index);
}}
/>
);
})}
<CenterCustom>
<View
style={{ flexDirection: "row", alignItems: "center", gap: 10 }}
>
<ActionIcon
disabled={
selectedSubBidang.length === listSubBidangSelected.length
}
onPress={() => {
handleAddSubBidang();
}}
icon={
<Ionicons
name="add-circle-outline"
size={ICON_SIZE_XLARGE}
color={MainColor.black}
/>
}
size="xl"
/>
<ActionIcon
disabled={listSubBidangSelected.length <= 1}
onPress={() => {
handleRemoveSubBidang(listSubBidangSelected.length - 1);
}}
icon={
<Ionicons
name="remove-circle-outline"
size={ICON_SIZE_XLARGE}
color={MainColor.black}
/>
}
size="xl"
/>
</View>
</CenterCustom>
<Spacing />
<View>
<View style={{ flexDirection: "row", alignItems: "center" }}>
<TextCustom semiBold style={{ color: MainColor.white_gray }}>
Nomor Telepon
</TextCustom>
<Text style={{ color: "red" }}> *</Text>
</View>
<Spacing height={5} />
<PhoneInputCustom
value={phoneNumber}
onChangePhoneNumber={handlePhoneChange}
selectedCountry={selectedCountry}
onChangeCountry={handleCountryChange}
placeholder="xxx-xxx-xxx"
/> />
</View>
<Spacing />
<TextInputCustom <SelectCustom
required label="Bidang Usaha"
label="Alamat Bisnis" required
placeholder="Masukkan alamat bisnis" data={bidangBisnis?.map((item) => ({
value={data.alamatKantor} label: item.name,
onChangeText={(value: any) => value: item.id,
setData({ ...data, alamatKantor: value }) }))}
} value={data.masterBidangBisnisId}
/> onChange={(value: any) => {
handleBidangBisnisChange(value);
}}
/>
<TextAreaCustom {listSubBidangSelected.map((item, index) => {
label="Deskripsi Bisnis" // Filter data untuk select sub bidang, menghilangkan yang sudah dipilih kecuali untuk item ini sendiri
placeholder="Masukkan deskripsi bisnis" const selectedIds = listSubBidangSelected
value={data.deskripsi} .filter((_, i) => i !== index)
onChangeText={(value: any) => .map((s) => s.MasterSubBidangBisnis?.id)
setData({ ...data, deskripsi: value }) .filter((id) => id); // Filter hanya yang memiliki id (tidak kosong)
}
autosize const availableSubBidangOptions = (selectedSubBidang || [])
minRows={2} .filter((sub: any) => {
maxRows={5} // Tampilkan jika ini adalah opsi yang dipilih saat ini atau belum dipilih di sub bidang lainnya
required
showCount return (
maxLength={1000} sub.id === item.MasterSubBidangBisnis?.id ||
/> !selectedIds.includes(sub.id)
<Spacing /> );
</StackCustom> })
</NewWrapper> .map((sub: any) => ({
value: sub.id,
label: sub.name,
}));
return (
<SelectCustom
key={index}
label="Sub Bidang Usaha"
required
data={availableSubBidangOptions}
value={item.MasterSubBidangBisnis?.id || null}
onChange={(value: any) => {
handleSubBidangChange(value, index);
}}
/>
);
})}
<CenterCustom>
<View
style={{ flexDirection: "row", alignItems: "center", gap: 10 }}
>
<ActionIcon
disabled={
selectedSubBidang.length === listSubBidangSelected.length
}
onPress={() => {
handleAddSubBidang();
}}
icon={
<Ionicons
name="add-circle-outline"
size={ICON_SIZE_XLARGE}
color={MainColor.black}
/>
}
size="xl"
/>
<ActionIcon
disabled={listSubBidangSelected.length <= 1}
onPress={() => {
handleRemoveSubBidang(listSubBidangSelected.length - 1);
}}
icon={
<Ionicons
name="remove-circle-outline"
size={ICON_SIZE_XLARGE}
color={MainColor.black}
/>
}
size="xl"
/>
</View>
</CenterCustom>
<Spacing />
<View>
<View style={{ flexDirection: "row", alignItems: "center" }}>
<TextCustom semiBold style={{ color: MainColor.white_gray }}>
Nomor Telepon
</TextCustom>
<Text style={{ color: "red" }}> *</Text>
</View>
<Spacing height={5} />
<PhoneInputCustom
value={phoneNumber}
onChangePhoneNumber={handlePhoneChange}
selectedCountry={selectedCountry}
onChangeCountry={handleCountryChange}
placeholder="xxx-xxx-xxx"
/>
</View>
<Spacing />
<TextInputCustom
required
label="Alamat Bisnis"
placeholder="Masukkan alamat bisnis"
value={data.alamatKantor}
onChangeText={(value: any) =>
setData({ ...data, alamatKantor: value })
}
/>
<TextAreaCustom
label="Deskripsi Bisnis"
placeholder="Masukkan deskripsi bisnis"
value={data.deskripsi}
onChangeText={(value: any) =>
setData({ ...data, deskripsi: value })
}
autosize
minRows={2}
maxRows={5}
required
showCount
maxLength={1000}
/>
<Spacing />
</StackCustom>
)}
</OS_Wrapper>
</> </>
); );
} }

View File

@@ -4,6 +4,7 @@ import {
DrawerCustom, DrawerCustom,
DummyLandscapeImage, DummyLandscapeImage,
LoaderCustom, LoaderCustom,
OS_Wrapper,
Spacing, Spacing,
StackCustom, StackCustom,
TextCustom, TextCustom,
@@ -12,7 +13,6 @@ import AppHeader from "@/components/_ShareComponent/AppHeader";
import LeftButtonCustom from "@/components/Button/BackButton"; import LeftButtonCustom from "@/components/Button/BackButton";
import GridTwoView from "@/components/_ShareComponent/GridTwoView"; import GridTwoView from "@/components/_ShareComponent/GridTwoView";
import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom"; import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom";
import ViewWrapper from "@/components/_ShareComponent/ViewWrapper";
import { MainColor } from "@/constants/color-palet"; import { MainColor } from "@/constants/color-palet";
import { ICON_SIZE_SMALL } from "@/constants/constans-value"; import { ICON_SIZE_SMALL } from "@/constants/constans-value";
import { useAuth } from "@/hooks/use-auth"; import { useAuth } from "@/hooks/use-auth";
@@ -92,7 +92,7 @@ export default function Portofolio() {
), ),
}} }}
/> />
<ViewWrapper> <OS_Wrapper>
{!data || !profileId ? ( {!data || !profileId ? (
<StackCustom> <StackCustom>
<CustomSkeleton height={400} /> <CustomSkeleton height={400} />
@@ -125,7 +125,7 @@ export default function Portofolio() {
<Spacing /> <Spacing />
</StackCustom> </StackCustom>
)} )}
</ViewWrapper> </OS_Wrapper>
{/* Drawer Komponen Eksternal */} {/* Drawer Komponen Eksternal */}
<DrawerCustom <DrawerCustom

View File

@@ -3,13 +3,13 @@ import {
BadgeCustom, BadgeCustom,
ClickableCustom, ClickableCustom,
Divider, Divider,
OS_Wrapper,
SelectCustom, SelectCustom,
TextCustom, TextCustom,
} from "@/components"; } from "@/components";
import ListEmptyComponent from "@/components/_ShareComponent/ListEmptyComponent"; import ListEmptyComponent from "@/components/_ShareComponent/ListEmptyComponent";
import ListLoaderFooterComponent from "@/components/_ShareComponent/ListLoaderFooterComponent"; import ListLoaderFooterComponent from "@/components/_ShareComponent/ListLoaderFooterComponent";
import ListSkeletonComponent from "@/components/_ShareComponent/ListSkeletonComponent"; import ListSkeletonComponent from "@/components/_ShareComponent/ListSkeletonComponent";
import NewWrapper from "@/components/_ShareComponent/NewWrapper";
import { MainColor } from "@/constants/color-palet"; import { MainColor } from "@/constants/color-palet";
import { useAuth } from "@/hooks/use-auth"; import { useAuth } from "@/hooks/use-auth";
import { usePaginatedApi } from "@/hooks/use-paginated-api"; import { usePaginatedApi } from "@/hooks/use-paginated-api";
@@ -120,7 +120,7 @@ export default function ProfileBlockedList() {
return ( return (
<> <>
<NewWrapper <OS_Wrapper
// headerComponent={renderHeader()} // headerComponent={renderHeader()}
listData={listData} listData={listData}
renderItem={renderItem} renderItem={renderItem}

View File

@@ -5,7 +5,7 @@ import {
BoxButtonOnFooter, BoxButtonOnFooter,
BoxWithHeaderSection, BoxWithHeaderSection,
ButtonCustom, ButtonCustom,
NewWrapper, OS_Wrapper,
StackCustom, StackCustom,
TextCustom, TextCustom,
} from "@/components"; } from "@/components";
@@ -46,7 +46,7 @@ export default function ProfileDetailBlocked() {
return ( return (
<> <>
<NewWrapper <OS_Wrapper
footerComponent={ footerComponent={
<BoxButtonOnFooter> <BoxButtonOnFooter>
<ButtonCustom <ButtonCustom
@@ -86,7 +86,7 @@ export default function ProfileDetailBlocked() {
</TextCustom> </TextCustom>
</StackCustom> </StackCustom>
</BoxWithHeaderSection> </BoxWithHeaderSection>
</NewWrapper> </OS_Wrapper>
</> </>
); );
} }

View File

@@ -1,11 +1,12 @@
import { import {
ButtonCustom, ButtonCustom,
OS_Wrapper,
SelectCustom, SelectCustom,
StackCustom, StackCustom,
TextInputCustom, TextInputCustom,
ViewWrapper,
} from "@/components"; } from "@/components";
import BoxButtonOnFooter from "@/components/Box/BoxButtonOnFooter"; import BoxButtonOnFooter from "@/components/Box/BoxButtonOnFooter";
import { PADDING_INLINE } from "@/constants/constans-value";
import { apiProfile, apiUpdateProfile } from "@/service/api-client/api-profile"; import { apiProfile, apiUpdateProfile } from "@/service/api-client/api-profile";
import { IProfile } from "@/types/Type-Profile"; import { IProfile } from "@/types/Type-Profile";
import { router, useLocalSearchParams } from "expo-router"; import { router, useLocalSearchParams } from "expo-router";
@@ -70,7 +71,9 @@ export default function ProfileEdit() {
}; };
return ( return (
<ViewWrapper <OS_Wrapper
enableKeyboardHandling
contentPaddingBottom={250}
footerComponent={ footerComponent={
<BoxButtonOnFooter> <BoxButtonOnFooter>
<ButtonCustom isLoading={isLoading} onPress={handleUpdate}> <ButtonCustom isLoading={isLoading} onPress={handleUpdate}>
@@ -119,6 +122,6 @@ export default function ProfileEdit() {
}} }}
/> />
</StackCustom> </StackCustom>
</ViewWrapper> </OS_Wrapper>
); );
} }

View File

@@ -1,5 +1,5 @@
/* eslint-disable react-hooks/exhaustive-deps */ /* eslint-disable react-hooks/exhaustive-deps */
import { NewWrapper, StackCustom } from "@/components"; import { OS_Wrapper, StackCustom } from "@/components";
import AppHeader from "@/components/_ShareComponent/AppHeader"; import AppHeader from "@/components/_ShareComponent/AppHeader";
import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom"; import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom";
import LeftButtonCustom from "@/components/Button/BackButton"; import LeftButtonCustom from "@/components/Button/BackButton";
@@ -119,7 +119,7 @@ export default function Profile() {
}} }}
/> />
{/* Main View */} {/* Main View */}
<NewWrapper <OS_Wrapper
refreshControl={ refreshControl={
<RefreshControl <RefreshControl
refreshing={refreshing} refreshing={refreshing}
@@ -144,7 +144,7 @@ export default function Profile() {
/> />
</> </>
)} )}
</NewWrapper> </OS_Wrapper>
{/* Drawer Komponen Eksternal */} {/* Drawer Komponen Eksternal */}
<DrawerCustom <DrawerCustom

View File

@@ -3,8 +3,8 @@ import {
BoxButtonOnFooter, BoxButtonOnFooter,
ButtonCenteredOnly, ButtonCenteredOnly,
ButtonCustom, ButtonCustom,
OS_Wrapper,
} from "@/components"; } from "@/components";
import ViewWrapper from "@/components/_ShareComponent/ViewWrapper";
import API_STRORAGE from "@/constants/base-url-api-strorage"; import API_STRORAGE from "@/constants/base-url-api-strorage";
import DIRECTORY_ID from "@/constants/directory-id"; import DIRECTORY_ID from "@/constants/directory-id";
import DUMMY_IMAGE from "@/constants/dummy-image-value"; import DUMMY_IMAGE from "@/constants/dummy-image-value";
@@ -127,7 +127,7 @@ export default function UpdateBackgroundProfile() {
); );
return ( return (
<ViewWrapper footerComponent={buttonFooter}> <OS_Wrapper footerComponent={buttonFooter}>
<BaseBox <BaseBox
style={{ alignItems: "center", justifyContent: "center", height: 250 }} style={{ alignItems: "center", justifyContent: "center", height: 250 }}
> >
@@ -144,6 +144,6 @@ export default function UpdateBackgroundProfile() {
> >
Update Update
</ButtonCenteredOnly> </ButtonCenteredOnly>
</ViewWrapper> </OS_Wrapper>
); );
} }

View File

@@ -3,8 +3,8 @@ import {
BoxButtonOnFooter, BoxButtonOnFooter,
ButtonCenteredOnly, ButtonCenteredOnly,
ButtonCustom, ButtonCustom,
OS_Wrapper,
} from "@/components"; } from "@/components";
import ViewWrapper from "@/components/_ShareComponent/ViewWrapper";
import API_STRORAGE from "@/constants/base-url-api-strorage"; import API_STRORAGE from "@/constants/base-url-api-strorage";
import DIRECTORY_ID from "@/constants/directory-id"; import DIRECTORY_ID from "@/constants/directory-id";
import DUMMY_IMAGE from "@/constants/dummy-image-value"; import DUMMY_IMAGE from "@/constants/dummy-image-value";
@@ -125,7 +125,7 @@ export default function UpdatePhotoProfile() {
); );
return ( return (
<ViewWrapper footerComponent={buttonFooter}> <OS_Wrapper footerComponent={buttonFooter}>
<BaseBox <BaseBox
style={{ alignItems: "center", justifyContent: "center", height: 250 }} style={{ alignItems: "center", justifyContent: "center", height: 250 }}
> >
@@ -143,6 +143,6 @@ export default function UpdatePhotoProfile() {
> >
Upload Upload
</ButtonCenteredOnly> </ButtonCenteredOnly>
</ViewWrapper> </OS_Wrapper>
); );
} }

View File

@@ -2,16 +2,17 @@ import {
BaseBox, BaseBox,
ButtonCenteredOnly, ButtonCenteredOnly,
ButtonCustom, ButtonCustom,
OS_Wrapper,
SelectCustom, SelectCustom,
Spacing, Spacing,
StackCustom, StackCustom,
TextInputCustom, TextInputCustom,
ViewWrapper,
} from "@/components"; } from "@/components";
import BoxButtonOnFooter from "@/components/Box/BoxButtonOnFooter"; import BoxButtonOnFooter from "@/components/Box/BoxButtonOnFooter";
import InformationBox from "@/components/Box/InformationBox"; import InformationBox from "@/components/Box/InformationBox";
import DIRECTORY_ID from "@/constants/directory-id"; import DIRECTORY_ID from "@/constants/directory-id";
import DUMMY_IMAGE from "@/constants/dummy-image-value"; import DUMMY_IMAGE from "@/constants/dummy-image-value";
import { PADDING_INLINE } from "@/constants/constans-value";
import { useAuth } from "@/hooks/use-auth"; import { useAuth } from "@/hooks/use-auth";
import { apiCreateProfile } from "@/service/api-client/api-profile"; import { apiCreateProfile } from "@/service/api-client/api-profile";
import { apiValidationEmail } from "@/service/api-client/api-validation"; import { apiValidationEmail } from "@/service/api-client/api-validation";
@@ -155,7 +156,11 @@ export default function CreateProfile() {
); );
return ( return (
<ViewWrapper footerComponent={footerComponent}> <OS_Wrapper
enableKeyboardHandling
contentPaddingBottom={250}
footerComponent={footerComponent}
>
<StackCustom> <StackCustom>
<InformationBox text="Upload foto profile anda." /> <InformationBox text="Upload foto profile anda." />
<View style={{ alignItems: "center" }}> <View style={{ alignItems: "center" }}>
@@ -241,6 +246,6 @@ export default function CreateProfile() {
/> />
<Spacing /> <Spacing />
</StackCustom> </StackCustom>
</ViewWrapper> </OS_Wrapper>
); );
} }

View File

@@ -3,7 +3,7 @@ import {
BoxButtonOnFooter, BoxButtonOnFooter,
ButtonCustom, ButtonCustom,
InformationBox, InformationBox,
NewWrapper, OS_Wrapper,
StackCustom StackCustom
} from "@/components"; } from "@/components";
import { ICON_SIZE_BUTTON } from "@/constants/constans-value"; import { ICON_SIZE_BUTTON } from "@/constants/constans-value";
@@ -82,7 +82,7 @@ export default function WaitingRoom() {
return ( return (
<> <>
<NewWrapper <OS_Wrapper
footerComponent={logoutButton()} footerComponent={logoutButton()}
refreshControl={ refreshControl={
<RefreshControl refreshing={isLoading} onRefresh={handleCheck} /> <RefreshControl refreshing={isLoading} onRefresh={handleCheck} />
@@ -103,7 +103,7 @@ Silakan tunggu beberapa saat. Untuk memperbarui status, tarik layar ke bawah."
Check Check
</ButtonCenteredOnly> */} </ButtonCenteredOnly> */}
</StackCustom> </StackCustom>
</NewWrapper> </OS_Wrapper>
</> </>
); );
} }

View File

@@ -3,9 +3,9 @@ import {
BoxButtonOnFooter, BoxButtonOnFooter,
ButtonCustom, ButtonCustom,
LoaderCustom, LoaderCustom,
OS_Wrapper,
StackCustom, StackCustom,
TextCustom, TextCustom,
ViewWrapper,
} from "@/components"; } from "@/components";
import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle"; import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
import GridTwoView from "@/components/_ShareComponent/GridTwoView"; import GridTwoView from "@/components/_ShareComponent/GridTwoView";
@@ -76,7 +76,7 @@ export default function AdminUserAccessDetail() {
return ( return (
<> <>
<ViewWrapper <OS_Wrapper
headerComponent={<AdminBackButtonAntTitle title={`Detail User`} />} headerComponent={<AdminBackButtonAntTitle title={`Detail User`} />}
footerComponent={ footerComponent={
data && ( data && (
@@ -108,7 +108,7 @@ export default function AdminUserAccessDetail() {
))} ))}
</StackCustom> </StackCustom>
)} )}
</ViewWrapper> </OS_Wrapper>
</> </>
); );
} }

View File

@@ -19,7 +19,7 @@ import {
SafeAreaView, SafeAreaView,
} from "react-native-safe-area-context"; } from "react-native-safe-area-context";
import type { ScrollViewProps, FlatListProps } from "react-native"; import type { ScrollViewProps, FlatListProps } from "react-native";
import { useKeyboardForm } from "@/hooks/useKeyboardForm"; import { useKeyboardForm, cloneChildrenWithFocusHandler } from "@/hooks/useKeyboardForm";
// --- Base Props --- // --- Base Props ---
interface BaseProps { interface BaseProps {
@@ -52,6 +52,12 @@ interface BaseProps {
* @default 16 * @default 16
*/ */
contentPadding?: number; contentPadding?: number;
/**
* Disable flexGrow: 1 in contentContainerStyle
* Use this for screens with very large headers to fix scroll issues
* @default false
*/
disableFlexGrow?: boolean;
} }
interface StaticModeProps extends BaseProps { interface StaticModeProps extends BaseProps {
@@ -87,6 +93,7 @@ export function AndroidWrapper(props: AndroidWrapperProps) {
keyboardScrollOffset, keyboardScrollOffset,
contentPaddingBottom, contentPaddingBottom,
contentPadding, contentPadding,
disableFlexGrow = false,
} = props; } = props;
// Default values (should be set by OS_Wrapper, but fallback for direct usage) // Default values (should be set by OS_Wrapper, but fallback for direct usage)
@@ -123,15 +130,12 @@ export function AndroidWrapper(props: AndroidWrapperProps) {
const listProps = props as ListModeProps; const listProps = props as ListModeProps;
return ( return (
<TouchableWithoutFeedback onPress={Keyboard.dismiss} style={{ flex: 1 }}> <View style={{ flex: 1, backgroundColor: MainColor.darkblue }}>
<KeyboardAvoidingView {headerComponent && (
behavior={undefined} <View style={GStyles.stickyHeader}>{headerComponent}</View>
style={{ flex: 1, backgroundColor: MainColor.darkblue }} )}
> <FlatList
{headerComponent && ( style={{ flex: 1 }}
<View style={GStyles.stickyHeader}>{headerComponent}</View>
)}
<FlatList
data={listProps.listData} data={listProps.listData}
renderItem={listProps.renderItem} renderItem={listProps.renderItem}
keyExtractor={ keyExtractor={
@@ -145,13 +149,16 @@ export function AndroidWrapper(props: AndroidWrapperProps) {
ListFooterComponent={listProps.ListFooterComponent} ListFooterComponent={listProps.ListFooterComponent}
ListEmptyComponent={listProps.ListEmptyComponent} ListEmptyComponent={listProps.ListEmptyComponent}
contentContainerStyle={{ contentContainerStyle={{
flexGrow: 1, flexGrow: disableFlexGrow ? 0 : 1,
paddingBottom: paddingBottom:
(footerComponent && !hideFooter ? OS_HEIGHT : 0) + (footerComponent && !hideFooter ? OS_HEIGHT : 0) +
finalContentPaddingBottom, finalContentPaddingBottom,
padding: finalContentPadding, padding: finalContentPadding,
}} }}
keyboardShouldPersistTaps="handled" keyboardShouldPersistTaps="handled"
removeClippedSubviews={false}
stickyHeaderIndices={[]}
nestedScrollEnabled={true}
/> />
{/* Footer - Fixed di bawah dengan width 100% */} {/* Footer - Fixed di bawah dengan width 100% */}
@@ -174,19 +181,20 @@ export function AndroidWrapper(props: AndroidWrapperProps) {
{floatingButton && ( {floatingButton && (
<View style={GStyles.floatingContainer}>{floatingButton}</View> <View style={GStyles.floatingContainer}>{floatingButton}</View>
)} )}
</KeyboardAvoidingView> </View>
</TouchableWithoutFeedback>
); );
} }
// 🔹 Mode Statis (ScrollView) // 🔹 Mode Statis (ScrollView)
const staticProps = props as StaticModeProps; const staticProps = props as StaticModeProps;
// Inject focus handler jika keyboard handling enabled
const childrenWithFocus = enableKeyboardHandling && keyboardForm
? cloneChildrenWithFocusHandler(staticProps.children, keyboardForm.handleInputFocus)
: staticProps.children;
return ( return (
<KeyboardAvoidingView <View style={{ flex: 1, backgroundColor: MainColor.darkblue }}>
behavior={undefined}
style={{ flex: 1, backgroundColor: MainColor.darkblue }}
>
{headerComponent && ( {headerComponent && (
<View style={GStyles.stickyHeader}>{headerComponent}</View> <View style={GStyles.stickyHeader}>{headerComponent}</View>
)} )}
@@ -195,9 +203,10 @@ export function AndroidWrapper(props: AndroidWrapperProps) {
ref={keyboardForm?.scrollViewRef} ref={keyboardForm?.scrollViewRef}
onScroll={keyboardForm?.handleScroll} onScroll={keyboardForm?.handleScroll}
scrollEventThrottle={16} scrollEventThrottle={16}
refreshControl={refreshControl}
style={{ flex: 1 }} style={{ flex: 1 }}
contentContainerStyle={{ contentContainerStyle={{
flexGrow: 1, flexGrow: disableFlexGrow ? 0 : 1,
paddingBottom: paddingBottom:
(footerComponent && !hideFooter ? OS_HEIGHT : 0) + (footerComponent && !hideFooter ? OS_HEIGHT : 0) +
finalContentPaddingBottom, finalContentPaddingBottom,
@@ -207,7 +216,7 @@ export function AndroidWrapper(props: AndroidWrapperProps) {
showsVerticalScrollIndicator={false} showsVerticalScrollIndicator={false}
> >
<TouchableWithoutFeedback onPress={Keyboard.dismiss}> <TouchableWithoutFeedback onPress={Keyboard.dismiss}>
{renderContainer(staticProps.children)} {renderContainer(childrenWithFocus)}
</TouchableWithoutFeedback> </TouchableWithoutFeedback>
</ScrollView> </ScrollView>
@@ -238,7 +247,7 @@ export function AndroidWrapper(props: AndroidWrapperProps) {
{floatingButton && ( {floatingButton && (
<View style={GStyles.floatingContainer}>{floatingButton}</View> <View style={GStyles.floatingContainer}>{floatingButton}</View>
)} )}
</KeyboardAvoidingView> </View>
); );
} }

View File

@@ -22,6 +22,7 @@ interface BaseProps {
edgesFooter?: NativeSafeAreaViewProps["edges"]; edgesFooter?: NativeSafeAreaViewProps["edges"];
style?: StyleProp<ViewStyle>; style?: StyleProp<ViewStyle>;
refreshControl?: ScrollViewProps["refreshControl"]; refreshControl?: ScrollViewProps["refreshControl"];
disableFlexGrow?: boolean;
} }
// ========== Static Mode Props ========== // ========== Static Mode Props ==========
@@ -123,13 +124,14 @@ export function OS_Wrapper(props: OS_WrapperProps) {
keyboardScrollOffset = 100, keyboardScrollOffset = 100,
contentPaddingBottom = 100, contentPaddingBottom = 100,
contentPadding = 0, contentPadding = 0,
disableFlexGrow = false,
...wrapperProps ...wrapperProps
} = props; } = props;
// iOS uses IOSWrapper (based on NewWrapper) // iOS uses IOSWrapper (based on NewWrapper)
if (Platform.OS === "ios") { if (Platform.OS === "ios") {
// Keyboard handling props are ignored on iOS // Keyboard handling props are ignored on iOS
return <IOSWrapper {...(wrapperProps as any)} />; return <IOSWrapper {...(wrapperProps as any)} disableFlexGrow={disableFlexGrow} />;
} }
// Android uses AndroidWrapper (with keyboard handling support) // Android uses AndroidWrapper (with keyboard handling support)
@@ -140,6 +142,7 @@ export function OS_Wrapper(props: OS_WrapperProps) {
keyboardScrollOffset={keyboardScrollOffset} keyboardScrollOffset={keyboardScrollOffset}
contentPaddingBottom={contentPaddingBottom} contentPaddingBottom={contentPaddingBottom}
contentPadding={contentPadding} contentPadding={contentPadding}
disableFlexGrow={disableFlexGrow}
/> />
); );
} }

View File

@@ -1,12 +1,25 @@
// useKeyboardForm.ts - Hook untuk keyboard handling pada form // useKeyboardForm.ts - Hook untuk keyboard handling pada form
import { Keyboard, ScrollView, Dimensions } from "react-native"; import { Keyboard, ScrollView, Dimensions, findNodeHandle, UIManager } from "react-native";
import { useState, useEffect, useRef } from "react"; import { useState, useEffect, useRef, useCallback } from "react";
import React from "react";
export function useKeyboardForm(scrollOffset = 100) { export function useKeyboardForm(scrollOffset = 100) {
const scrollViewRef = useRef<ScrollView>(null); const scrollViewRef = useRef<ScrollView>(null);
const [keyboardHeight, setKeyboardHeight] = useState(0); const [keyboardHeight, setKeyboardHeight] = useState(0);
const currentScrollY = useRef(0); const currentScrollY = useRef(0);
const inputPageY = useRef(0);
const screenHeight = Dimensions.get('window').height;
// Fungsi untuk mengukur posisi absolut input
const handleInputFocus = useCallback((target: any) => {
const nodeHandle = findNodeHandle(target);
if (nodeHandle) {
UIManager.measure(nodeHandle, (x, y, width, height, pageX, pageY) => {
if (pageY !== undefined && pageY !== null) {
inputPageY.current = pageY;
}
});
}
}, []);
// Listen to keyboard events // Listen to keyboard events
useEffect(() => { useEffect(() => {
@@ -16,20 +29,34 @@ export function useKeyboardForm(scrollOffset = 100) {
const kbHeight = e.endCoordinates.height; const kbHeight = e.endCoordinates.height;
setKeyboardHeight(kbHeight); setKeyboardHeight(kbHeight);
// Simple: scroll by keyboard height saat keyboard muncul // Conditional scroll: hanya scroll jika input tertutup keyboard
if (scrollViewRef.current) { if (scrollViewRef.current) {
const targetY = currentScrollY.current + kbHeight - scrollOffset; const touchAbsoluteY = inputPageY.current;
scrollViewRef.current.scrollTo({
y: Math.max(0, targetY), // Posisi Y teratas keyboard (dari atas layar)
animated: true, const keyboardTopY = screenHeight - kbHeight;
});
// Jika input ADA DI BAWAH keyboard (tertutup)
if (touchAbsoluteY > keyboardTopY) {
// Hitung berapa harus scroll agar input terlihat di atas keyboard
const scrollBy = touchAbsoluteY - keyboardTopY + scrollOffset;
const targetY = currentScrollY.current + scrollBy;
scrollViewRef.current.scrollTo({
y: Math.max(0, targetY),
animated: true,
});
}
// Jika input SUDAH TERLIHAT (di atas keyboard), JANGAN SCROLL
} }
} }
); );
const keyboardDidHideListener = Keyboard.addListener( const keyboardDidHideListener = Keyboard.addListener(
'keyboardDidHide', 'keyboardDidHide',
() => { () => {
setKeyboardHeight(0); setKeyboardHeight(0);
inputPageY.current = 0;
} }
); );
@@ -37,35 +64,74 @@ export function useKeyboardForm(scrollOffset = 100) {
keyboardDidShowListener.remove(); keyboardDidShowListener.remove();
keyboardDidHideListener.remove(); keyboardDidHideListener.remove();
}; };
}, [scrollOffset]); }, [scrollOffset, screenHeight]);
// Track scroll position // Track scroll position
const handleScroll = (event: any) => { const handleScroll = (event: any) => {
currentScrollY.current = event.nativeEvent.contentOffset.y; currentScrollY.current = event.nativeEvent.contentOffset.y;
}; };
// Dummy handlers (for API compatibility)
const createFocusHandler = () => {
return () => {};
};
const registerInputFocus = () => {};
return { return {
scrollViewRef, scrollViewRef,
keyboardHeight, keyboardHeight,
registerInputFocus, handleInputFocus,
createFocusHandler,
handleScroll, handleScroll,
}; };
} }
/** /**
* Dummy helper (no-op, for API compatibility) * Helper untuk inject onFocus handler ke semua TextInput/TextArea children
* Menggunakan UI.measure untuk mendapatkan posisi absolut input secara akurat
*/ */
export function cloneChildrenWithFocusHandler( export function cloneChildrenWithFocusHandler(
children: React.ReactNode, children: React.ReactNode,
_focusHandler: (inputRef: any) => void focusHandler: (target: any) => void
): React.ReactNode { ): React.ReactNode {
return children; if (!children) return children;
} const React = require("react");
return React.Children.map(children, (child: any) => {
if (!React.isValidElement(child)) return child;
const childType = child.type;
const childProps = child.props as Record<string, any> || {};
// Check if it's a text input component
let isTextInput = false;
if (typeof childType === 'string') {
isTextInput = childType.toLowerCase().includes('textinput');
} else if (childType) {
isTextInput =
(childType as any).displayName?.includes('TextInput') ||
(childType as any).name?.includes('TextInput') ||
(childType as any).displayName?.includes('TextArea') ||
(childType as any).name?.includes('TextArea') ||
(childType as any).displayName?.includes('PhoneInput') ||
(childType as any).name?.includes('PhoneInput') ||
(childType as any).displayName?.includes('Select') ||
(childType as any).name?.includes('Select');
}
if (isTextInput) {
const existingOnFocus = childProps.onFocus;
return React.cloneElement(child, {
...childProps,
onFocus: (e: any) => {
existingOnFocus?.(e);
focusHandler(e.target);
},
} as any);
}
// Recursively clone nested children
if (childProps.children) {
return React.cloneElement(child, {
...childProps,
children: cloneChildrenWithFocusHandler(childProps.children, focusHandler),
} as any);
}
return child;
});
}

View File

@@ -3,13 +3,13 @@ import {
BadgeCustom, BadgeCustom,
CenterCustom, CenterCustom,
Grid, Grid,
OS_Wrapper,
SearchInput, SearchInput,
StackCustom, StackCustom,
TextCustom, TextCustom,
} from "@/components"; } from "@/components";
import AdminBasicBox from "@/components/_ShareComponent/Admin/AdminBasicBox"; import AdminBasicBox from "@/components/_ShareComponent/Admin/AdminBasicBox";
import AdminComp_BoxTitle from "@/components/_ShareComponent/Admin/BoxTitlePage"; import AdminComp_BoxTitle from "@/components/_ShareComponent/Admin/BoxTitlePage";
import NewWrapper from "@/components/_ShareComponent/NewWrapper";
import { MainColor } from "@/constants/color-palet"; import { MainColor } from "@/constants/color-palet";
import { PAGINATION_DEFAULT_TAKE } from "@/constants/constans-value"; import { PAGINATION_DEFAULT_TAKE } from "@/constants/constans-value";
import { createPaginationComponents } from "@/helpers/paginationHelpers"; import { createPaginationComponents } from "@/helpers/paginationHelpers";
@@ -101,7 +101,7 @@ export function Admin_ScreenUserAccess() {
); );
return ( return (
<NewWrapper <OS_Wrapper
headerComponent={ headerComponent={
<AdminComp_BoxTitle <AdminComp_BoxTitle
title="User Access" title="User Access"

View File

@@ -3,12 +3,11 @@ import {
ButtonCustom, ButtonCustom,
DrawerCustom, DrawerCustom,
LoaderCustom, LoaderCustom,
NewWrapper, OS_Wrapper,
Spacing, Spacing,
TextAreaCustom, TextAreaCustom,
TextCustom, TextCustom,
TextInputCustom, TextInputCustom,
ViewWrapper,
} from "@/components"; } from "@/components";
import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom"; import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom";
import AlertWarning from "@/components/Alert/AlertWarning"; import AlertWarning from "@/components/Alert/AlertWarning";
@@ -193,7 +192,7 @@ export default function DetailForum() {
return ( return (
<> <>
<NewWrapper <OS_Wrapper
// headerComponent={headerComponent()} // headerComponent={headerComponent()}
> >
{!data && !listComment ? ( {!data && !listComment ? (
@@ -225,7 +224,7 @@ export default function DetailForum() {
))} ))}
</> </>
)} )}
</NewWrapper> </OS_Wrapper>
{/* Posting Drawer */} {/* Posting Drawer */}
<DrawerCustom <DrawerCustom

View File

@@ -3,13 +3,12 @@ import {
ButtonCustom, ButtonCustom,
DrawerCustom, DrawerCustom,
LoaderCustom, LoaderCustom,
NewWrapper, OS_Wrapper,
Spacing, Spacing,
StackCustom, StackCustom,
TextAreaCustom, TextAreaCustom,
TextCustom, TextCustom,
TextInputCustom, TextInputCustom,
ViewWrapper,
} from "@/components"; } from "@/components";
import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom"; import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom";
import AlertWarning from "@/components/Alert/AlertWarning"; import AlertWarning from "@/components/Alert/AlertWarning";
@@ -34,6 +33,7 @@ import _ from "lodash";
import { useCallback, useEffect, useState } from "react"; import { useCallback, useEffect, useState } from "react";
import { RefreshControl } from "react-native"; import { RefreshControl } from "react-native";
import ListSkeletonComponent from "@/components/_ShareComponent/ListSkeletonComponent"; import ListSkeletonComponent from "@/components/_ShareComponent/ListSkeletonComponent";
import { PADDING_INLINE } from "@/constants/constans-value";
export default function DetailForum2() { export default function DetailForum2() {
const { id } = useLocalSearchParams(); const { id } = useLocalSearchParams();
@@ -213,20 +213,6 @@ export default function DetailForum2() {
}} }}
/> />
) )
// !data || !commentPagination.listData ? (
// // <ListSkeletonComponent height={120} />
// <LoaderCustom />
// ) : (
// <Forum_CommentarBoxSection
// key={item.id}
// data={item}
// onSetData={(value) => {
// setCommentId(value.setCommentId);
// setOpenDrawerCommentar(value.setOpenDrawer);
// setCommentAuthorId(value.setCommentAuthorId);
// }}
// />
// );
// Generate pagination components using helper // Generate pagination components using helper
const { ListEmptyComponent, ListFooterComponent } = const { ListEmptyComponent, ListFooterComponent } =
@@ -242,8 +228,9 @@ export default function DetailForum2() {
return ( return (
<> <>
<NewWrapper <OS_Wrapper
// headerComponent={} contentPadding={PADDING_INLINE}
disableFlexGrow
listData={commentPagination.listData} listData={commentPagination.listData}
renderItem={renderCommentItem} renderItem={renderCommentItem}
refreshControl={ refreshControl={

View File

@@ -1,7 +1,7 @@
import { import {
BackButton, BackButton,
AvatarComp, AvatarComp,
ViewWrapper, OS_Wrapper,
SearchInput, SearchInput,
FloatingButton, FloatingButton,
LoaderCustom, LoaderCustom,
@@ -71,7 +71,7 @@ export default function Forum_ViewBeranda() {
}} }}
/> />
<ViewWrapper <OS_Wrapper
headerComponent={ headerComponent={
<SearchInput <SearchInput
placeholder="Cari topik diskusi" placeholder="Cari topik diskusi"
@@ -107,7 +107,7 @@ export default function Forum_ViewBeranda() {
/> />
)) ))
)} )}
</ViewWrapper> </OS_Wrapper>
</> </>
); );
} }

View File

@@ -6,11 +6,11 @@ import {
LoaderCustom, LoaderCustom,
SearchInput, SearchInput,
StackCustom, StackCustom,
TextCustom, // ← gunakan NewWrapper yang sudah diperbaiki TextCustom,
OS_Wrapper,
} from "@/components"; } from "@/components";
import AppHeader from "@/components/_ShareComponent/AppHeader"; import AppHeader from "@/components/_ShareComponent/AppHeader";
import SkeletonCustom from "@/components/_ShareComponent/SkeletonCustom"; import SkeletonCustom from "@/components/_ShareComponent/SkeletonCustom";
import NewWrapper from "@/components/_ShareComponent/NewWrapper";
import { useAuth } from "@/hooks/use-auth"; import { useAuth } from "@/hooks/use-auth";
import Forum_BoxDetailSection from "@/screens/Forum/DiscussionBoxSection"; import Forum_BoxDetailSection from "@/screens/Forum/DiscussionBoxSection";
import { apiForumGetAll } from "@/service/api-client/api-forum"; import { apiForumGetAll } from "@/service/api-client/api-forum";
@@ -172,8 +172,8 @@ export default function Forum_ViewBeranda2() {
}} }}
/> />
{/* 🔹 NewWrapper dalam mode list */} {/* 🔹 OS_Wrapper dalam mode list */}
<NewWrapper <OS_Wrapper
// Header global (di atas FlatList, sticky) // Header global (di atas FlatList, sticky)
headerComponent={ headerComponent={
<View style={{ paddingHorizontal: 16, paddingTop: 8 }}> <View style={{ paddingHorizontal: 16, paddingTop: 8 }}>

View File

@@ -2,11 +2,12 @@ import {
AvatarComp, AvatarComp,
BackButton, BackButton,
FloatingButton, FloatingButton,
OS_Wrapper,
SearchInput, SearchInput,
} from "@/components"; } from "@/components";
import AppHeader from "@/components/_ShareComponent/AppHeader"; import AppHeader from "@/components/_ShareComponent/AppHeader";
import NewWrapper from "@/components/_ShareComponent/NewWrapper";
import { MainColor } from "@/constants/color-palet"; import { MainColor } from "@/constants/color-palet";
import { PADDING_INLINE } from "@/constants/constans-value";
import { createPaginationComponents } from "@/helpers/paginationHelpers"; import { createPaginationComponents } from "@/helpers/paginationHelpers";
import { useAuth } from "@/hooks/use-auth"; import { useAuth } from "@/hooks/use-auth";
import { usePagination } from "@/hooks/use-pagination"; import { usePagination } from "@/hooks/use-pagination";
@@ -75,12 +76,6 @@ export default function Forum_ViewBeranda3() {
/> />
); );
// const ListHeaderComponent = (
// <View style={{ paddingVertical: 8, alignItems: "center" }}>
// <TextCustom>Diskusi Terbaru</TextCustom>
// </View>
// );
return ( return (
<> <>
<Stack.Screen <Stack.Screen
@@ -105,8 +100,9 @@ export default function Forum_ViewBeranda3() {
}} }}
/> />
<NewWrapper <OS_Wrapper
hideFooter hideFooter
contentPadding={PADDING_INLINE}
headerComponent={ headerComponent={
<View style={{ paddingTop: 8 }}> <View style={{ paddingTop: 8 }}>
<SearchInput <SearchInput

View File

@@ -7,9 +7,9 @@ import {
FloatingButton, FloatingButton,
Grid, Grid,
LoaderCustom, LoaderCustom,
OS_Wrapper,
StackCustom, StackCustom,
TextCustom, TextCustom,
ViewWrapper,
} from "@/components"; } from "@/components";
import { useAuth } from "@/hooks/use-auth"; import { useAuth } from "@/hooks/use-auth";
import Forum_BoxDetailSection from "@/screens/Forum/DiscussionBoxSection"; import Forum_BoxDetailSection from "@/screens/Forum/DiscussionBoxSection";
@@ -66,7 +66,7 @@ export default function View_Forumku() {
return ( return (
<> <>
<ViewWrapper <OS_Wrapper
floatingButton={ floatingButton={
user?.id === id && ( user?.id === id && (
<FloatingButton <FloatingButton
@@ -121,7 +121,7 @@ export default function View_Forumku() {
</> </>
)} )}
</StackCustom> </StackCustom>
</ViewWrapper> </OS_Wrapper>
{/* Drawer Komponen Eksternal */} {/* Drawer Komponen Eksternal */}
<DrawerCustom <DrawerCustom

View File

@@ -6,11 +6,11 @@ import {
FloatingButton, FloatingButton,
Grid, Grid,
LoaderCustom, LoaderCustom,
OS_Wrapper,
Spacing, Spacing,
StackCustom, StackCustom,
TextCustom, TextCustom,
} from "@/components"; } from "@/components";
import NewWrapper from "@/components/_ShareComponent/NewWrapper";
import NoDataText from "@/components/_ShareComponent/NoDataText"; import NoDataText from "@/components/_ShareComponent/NoDataText";
import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom"; import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom";
import { MainColor } from "@/constants/color-palet"; import { MainColor } from "@/constants/color-palet";
@@ -24,6 +24,7 @@ import { router, useLocalSearchParams } from "expo-router";
import _ from "lodash"; import _ from "lodash";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { RefreshControl, View } from "react-native"; import { RefreshControl, View } from "react-native";
import { PADDING_INLINE } from "@/constants/constans-value";
export default function View_Forumku2() { export default function View_Forumku2() {
const { id } = useLocalSearchParams(); const { id } = useLocalSearchParams();
@@ -120,7 +121,8 @@ export default function View_Forumku2() {
return ( return (
<> <>
<NewWrapper <OS_Wrapper
contentPadding={PADDING_INLINE}
floatingButton={ floatingButton={
user?.id === id && ( user?.id === id && (
<FloatingButton <FloatingButton

View File

@@ -1,4 +1,3 @@
import NewWrapper from "@/components/_ShareComponent/NewWrapper";
import { import {
BoxButtonOnFooter, BoxButtonOnFooter,
ButtonCustom, ButtonCustom,
@@ -8,6 +7,7 @@ import {
TextInputCustom, TextInputCustom,
LandscapeFrameUploaded, LandscapeFrameUploaded,
ButtonCenteredOnly, ButtonCenteredOnly,
OS_Wrapper,
} from "@/components"; } from "@/components";
import { MapSelectedPlatform } from "@/components/Map/MapSelectedPlatform"; import { MapSelectedPlatform } from "@/components/Map/MapSelectedPlatform";
import DIRECTORY_ID from "@/constants/directory-id"; import DIRECTORY_ID from "@/constants/directory-id";
@@ -142,10 +142,14 @@ export function Maps_ScreenMapsCreate() {
); );
/** /**
* Render screen dengan NewWrapper * Render screen dengan OS_Wrapper
*/ */
return ( return (
<NewWrapper footerComponent={buttonFooter}> <OS_Wrapper
enableKeyboardHandling
contentPaddingBottom={250}
footerComponent={buttonFooter}
>
<InformationBox text="Tentukan lokasi pin map dengan menekan pada map." /> <InformationBox text="Tentukan lokasi pin map dengan menekan pada map." />
<BaseBox> <BaseBox>
@@ -179,7 +183,7 @@ export function Maps_ScreenMapsCreate() {
</ButtonCenteredOnly> </ButtonCenteredOnly>
<Spacing height={50} /> <Spacing height={50} />
</NewWrapper> </OS_Wrapper>
); );
} }

View File

@@ -7,7 +7,7 @@ import {
LandscapeFrameUploaded, LandscapeFrameUploaded,
Spacing, Spacing,
TextInputCustom, TextInputCustom,
ViewWrapper, OS_Wrapper,
} from "@/components"; } from "@/components";
import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom"; import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom";
import { MapSelectedPlatform } from "@/components/Map/MapSelectedPlatform"; import { MapSelectedPlatform } from "@/components/Map/MapSelectedPlatform";
@@ -166,7 +166,11 @@ export function Maps_ScreenMapsEdit() {
: defaultRegion; : defaultRegion;
return ( return (
<ViewWrapper footerComponent={buttonFooter}> <OS_Wrapper
enableKeyboardHandling
contentPaddingBottom={250}
footerComponent={buttonFooter}
>
<InformationBox text="Tentukan lokasi pin map dengan menekan pada map." /> <InformationBox text="Tentukan lokasi pin map dengan menekan pada map." />
{/* <MapSelectedPlatform {/* <MapSelectedPlatform
@@ -223,6 +227,6 @@ export function Maps_ScreenMapsEdit() {
Upload Upload
</ButtonCenteredOnly> </ButtonCenteredOnly>
<Spacing height={50} /> <Spacing height={50} />
</ViewWrapper> </OS_Wrapper>
); );
} }

View File

@@ -4,7 +4,7 @@ import {
ButtonCenteredOnly, ButtonCenteredOnly,
CenterCustom, CenterCustom,
InformationBox, InformationBox,
NewWrapper, OS_Wrapper,
PhoneInputCustom, PhoneInputCustom,
SelectCustom, SelectCustom,
Spacing, Spacing,
@@ -142,7 +142,9 @@ export function ScreenPortofolioCreate() {
}; };
return ( return (
<NewWrapper <OS_Wrapper
enableKeyboardHandling
contentPaddingBottom={250}
footerComponent={ footerComponent={
<Portofolio_ButtonCreate <Portofolio_ButtonCreate
id={id as string} id={id as string}
@@ -362,6 +364,6 @@ export function ScreenPortofolioCreate() {
} }
/> />
</StackCustom> </StackCustom>
</NewWrapper> </OS_Wrapper>
); );
} }

View File

@@ -1,4 +1,4 @@
import { NewWrapper, TextCustom } from "@/components"; import { OS_Wrapper, TextCustom } from "@/components";
import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom"; import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom";
import { MainColor } from "@/constants/color-palet"; import { MainColor } from "@/constants/color-palet";
import { usePagination } from "@/hooks/use-pagination"; import { usePagination } from "@/hooks/use-pagination";
@@ -9,7 +9,7 @@ import { useCallback } from "react";
import { RefreshControl } from "react-native"; import { RefreshControl } from "react-native";
import Portofolio_BoxView from "./BoxPortofolioView"; import Portofolio_BoxView from "./BoxPortofolioView";
import NoDataText from "@/components/_ShareComponent/NoDataText"; import NoDataText from "@/components/_ShareComponent/NoDataText";
import { PAGINATION_DEFAULT_TAKE } from "@/constants/constans-value"; import { PADDING_INLINE, PAGINATION_DEFAULT_TAKE } from "@/constants/constans-value";
export default function ViewListPortofolio() { export default function ViewListPortofolio() {
const { id } = useLocalSearchParams(); const { id } = useLocalSearchParams();
@@ -19,9 +19,9 @@ export default function ViewListPortofolio() {
fetchFunction: async (page) => { fetchFunction: async (page) => {
return await apiGetPortofolio({ return await apiGetPortofolio({
id: id as string, id: id as string,
page: String(page) // API expects string page: String(page), // API expects string
}); });
// return response.data; // return response.data;
}, },
pageSize: PAGINATION_DEFAULT_TAKE, pageSize: PAGINATION_DEFAULT_TAKE,
dependencies: [id], dependencies: [id],
@@ -41,18 +41,20 @@ export default function ViewListPortofolio() {
); );
// Generate pagination components using helper // Generate pagination components using helper
const { ListEmptyComponent, ListFooterComponent } = createPaginationComponents({ const { ListEmptyComponent, ListFooterComponent } =
loading: pagination.loading, createPaginationComponents({
refreshing: pagination.refreshing, loading: pagination.loading,
listData: pagination.listData, refreshing: pagination.refreshing,
isInitialLoad: pagination.isInitialLoad, listData: pagination.listData,
emptyMessage: "Tidak ada portofolio", isInitialLoad: pagination.isInitialLoad,
skeletonCount: 3, emptyMessage: "Tidak ada portofolio",
skeletonHeight: 100, skeletonCount: 3,
}); skeletonHeight: 100,
});
return ( return (
<NewWrapper <OS_Wrapper
contentPadding={PADDING_INLINE}
listData={pagination.listData} listData={pagination.listData}
renderItem={renderItem} renderItem={renderItem}
refreshControl={ refreshControl={

View File

@@ -32,8 +32,8 @@ refreshControl?: RefreshControl;
// Keyboard handling (Android only - iOS mengabaikan) // Keyboard handling (Android only - iOS mengabaikan)
enableKeyboardHandling?: boolean; // Default: false enableKeyboardHandling?: boolean; // Default: false
keyboardScrollOffset?: number; // Default: 100 keyboardScrollOffset?: number; // Default: 100
contentPaddingBottom?: number; // Default: 80 contentPaddingBottom?: number; // Default: 100
contentPadding?: number; // Default: 16 contentPadding?: number; // Default: 0
``` ```
### 2. **IOSWrapper** / **AndroidWrapper** (Direct Usage) ### 2. **IOSWrapper** / **AndroidWrapper** (Direct Usage)
@@ -68,19 +68,19 @@ import { OS_Wrapper } from "@/components";
// Form mode (with keyboard handling - Android only) // Form mode (with keyboard handling - Android only)
<OS_Wrapper <OS_Wrapper
enableKeyboardHandling enableKeyboardHandling
keyboardScrollOffset={150} contentPaddingBottom={250} // ← HANYA untuk screens dengan TextInput
contentPaddingBottom={100}
footerComponent={<SubmitButton />}
> >
<FormContent /> <FormContent />
</OS_Wrapper> </OS_Wrapper>
``` ```
## 🚀 Implementation Status ---
### ✅ Phase 1: Job Screens - COMPLETED (2026-04-06) # 🔵 USER PHASES (User-Facing Screens)
**Files migrated: 8** ## ✅ User Phase 1: Job Screens - COMPLETED (2026-04-06 to 2026-04-07)
**Files migrated: 9**
#### Job List Screens (OS_Wrapper): #### Job List Screens (OS_Wrapper):
-`screens/Job/ScreenBeranda.tsx` - ViewWrapper → OS_Wrapper -`screens/Job/ScreenBeranda.tsx` - ViewWrapper → OS_Wrapper
@@ -91,8 +91,11 @@ import { OS_Wrapper } from "@/components";
-`screens/Job/MainViewStatus2.tsx` - NewWrapper_V2 → OS_Wrapper -`screens/Job/MainViewStatus2.tsx` - NewWrapper_V2 → OS_Wrapper
#### Job Form Screens (OS_Wrapper with keyboard handling): #### Job Form Screens (OS_Wrapper with keyboard handling):
-`screens/Job/ScreenJobCreate.tsx` - NewWrapper_V2 → OS_Wrapper + enableKeyboardHandling -`screens/Job/ScreenJobCreate.tsx` - NewWrapper_V2 → OS_Wrapper + enableKeyboardHandling + contentPaddingBottom={250}
-`screens/Job/ScreenJobEdit.tsx` - NewWrapper_V2 → OS_Wrapper + enableKeyboardHandling -`screens/Job/ScreenJobEdit.tsx` - NewWrapper_V2 → OS_Wrapper + enableKeyboardHandling + contentPaddingBottom={250}
#### Job Detail Screen:
-`app/(application)/(user)/job/[id]/[status]/detail.tsx` - NewWrapper_V2 → OS_Wrapper
**Testing Status:** **Testing Status:**
- ✅ TypeScript: No errors - ✅ TypeScript: No errors
@@ -100,82 +103,211 @@ import { OS_Wrapper } from "@/components";
- ✅ iOS Testing: Complete ✅ - ✅ iOS Testing: Complete ✅
- ✅ Android Testing: Complete ✅ - ✅ Android Testing: Complete ✅
**Implementation Notes:** ## ✅ User Phase 2: Profile, Waiting Room, Delete Account - COMPLETED (2026-04-08)
- Semua form screens menggunakan `enableKeyboardHandling` untuk keyboard auto-scroll di Android
- Semua list screens menggunakan pagination dengan `onEndReached`
- Floating button dan sticky header berfungsi dengan baik
- Footer component tetap di posisi bawah
### ⏳ Phase 2: Other User Screens (Priority: HIGH) **Files migrated: 10**
#### Profile Screens: #### Profile Screens:
- [ ] `screens/Profile/ScreenProfile.tsx` -`app/(application)/(user)/profile/[id]/index.tsx` - NewWrapper → OS_Wrapper (list with pull-to-refresh)
- [ ] `screens/Profile/ScreenProfileEdit.tsx` → pakai `enableKeyboardHandling` -`app/(application)/(user)/profile/[id]/edit.tsx` - ViewWrapper → OS_Wrapper (form + enableKeyboardHandling + contentPaddingBottom={250})
- [ ] `screens/Profile/ScreenProfileCreate.tsx` → pakai `enableKeyboardHandling` -`app/(application)/(user)/profile/create.tsx` - ViewWrapper → OS_Wrapper (form + enableKeyboardHandling + contentPaddingBottom={250})
-`app/(application)/(user)/profile/[id]/blocked-list.tsx` - NewWrapper → OS_Wrapper (pagination list)
-`app/(application)/(user)/profile/[id]/detail-blocked.tsx` - NewWrapper → OS_Wrapper (static with footer)
-`app/(application)/(user)/profile/[id]/update-background.tsx` - ViewWrapper → OS_Wrapper (static with footer)
-`app/(application)/(user)/profile/[id]/update-photo.tsx` - ViewWrapper → OS_Wrapper (static with footer)
#### Forum/Discussion: #### Other Screens:
- [ ] `screens/Forum/ScreenForum.tsx` -`app/(application)/(user)/waiting-room.tsx` - NewWrapper → OS_Wrapper (static with refresh + footer)
- [ ] `screens/Forum/ScreenForumDetail.tsx` -`app/(application)/(user)/delete-account.tsx` - ViewWrapper → OS_Wrapper (form + enableKeyboardHandling + contentPaddingBottom={250})
- [ ] `screens/Forum/ScreenForumCreate.tsx` → pakai `enableKeyboardHandling`
#### Portfolio: ## ✅ User Phase 3: Portfolio Screens - COMPLETED (2026-04-08)
- [ ] `screens/Portfolio/ScreenPortfolio.tsx`
- [ ] `screens/Portfolio/ScreenPortfolioCreate.tsx` → pakai `enableKeyboardHandling`
- [ ] `screens/Portfolio/ScreenPortfolioEdit.tsx` → pakai `enableKeyboardHandling`
### ⏳ Phase 3: Admin Screens (Priority: MEDIUM) **Files migrated: 6**
#### Event Management: #### Portfolio Screens:
- [ ] `screens/Admin/Event/ScreenEventList.tsx` -`app/(application)/(user)/portofolio/[id]/index.tsx` - ViewWrapper → OS_Wrapper (detail screen with pull-to-refresh)
- [ ] `screens/Admin/Event/ScreenEventCreate.tsx` → pakai `enableKeyboardHandling` -`app/(application)/(user)/portofolio/[id]/edit.tsx` - NewWrapper → OS_Wrapper (form + enableKeyboardHandling + contentPaddingBottom={250})
- [ ] `screens/Admin/Event/ScreenEventEdit.tsx` → pakai `enableKeyboardHandling` -`app/(application)/(user)/portofolio/[id]/edit-logo.tsx` - ViewWrapper → OS_Wrapper (static with footer)
-`app/(application)/(user)/portofolio/[id]/edit-social-media.tsx` - ViewWrapper → OS_Wrapper (form + enableKeyboardHandling + contentPaddingBottom={250})
-`screens/Portofolio/ViewListPortofolio.tsx` - NewWrapper → OS_Wrapper (pagination list)
-`screens/Portofolio/ScreenPortofolioCreate.tsx` - NewWrapper → OS_Wrapper (form + enableKeyboardHandling + contentPaddingBottom={250})
#### Voting Management: ## ✅ User Phase 4: Maps Screens - COMPLETED (2026-04-08)
- [ ] `screens/Admin/Voting/ScreenVotingList.tsx`
- [ ] `screens/Admin/Voting/ScreenVotingCreate.tsx` → pakai `enableKeyboardHandling`
- [ ] `screens/Admin/Voting/ScreenVotingEdit.tsx` → pakai `enableKeyboardHandling`
#### Donation Management: **Files migrated: 2**
- [ ] `screens/Admin/Donation/ScreenDonationList.tsx`
- [ ] `screens/Admin/Donation/ScreenDonationCreate.tsx` → pakai `enableKeyboardHandling`
- [ ] `screens/Admin/Donation/ScreenDonationEdit.tsx` → pakai `enableKeyboardHandling`
### ⏳ Phase 4: Other Screens (Priority: LOW) #### Maps Screens:
- [ ] `screens/Investasi/` - Investment screens - `screens/Maps/ScreenMapsCreate.tsx` - NewWrapper → OS_Wrapper (form + enableKeyboardHandling + contentPaddingBottom={250})
- [ ] `screens/Kolaborasi/` - Collaboration screens - `screens/Maps/ScreenMapsEdit.tsx` - ViewWrapper → OS_Wrapper (form + enableKeyboardHandling + contentPaddingBottom={250})
- [ ] Other user-facing screens
## ✅ Testing Checklist ## ✅ User Phase 5: Forum Screens - COMPLETED (2026-04-09)
Setiap screen yang sudah di-migrate, test: **Files migrated: 17**
### iOS Testing #### Forum List & Create Screens:
- [ ] UI tampil sesuai design -`screens/Forum/ViewBeranda.tsx` - ViewWrapper → OS_Wrapper
- [ ] Tabs berfungsi dengan baik -`screens/Forum/ViewBeranda2.tsx` - NewWrapper → OS_Wrapper
- [ ] ScrollView/FlatList scroll dengan smooth -`screens/Forum/ViewBeranda3.tsx` - NewWrapper → OS_Wrapper (Active)
- [ ] Keyboard tidak menutupi input (jika pakai `enableKeyboardHandling`) -`screens/Forum/create.tsx` - ViewWrapper → OS_Wrapper (form + enableKeyboardHandling + contentPaddingBottom={250})
- [ ] Footer muncul di posisi yang benar -`screens/Forum/terms.tsx` - NewWrapper → OS_Wrapper (Terms page)
- [ ] Pull to refresh berfungsi (jika ada)
### Android Testing #### Forum Detail & Comments Screens:
- [ ] UI tampil sesuai design -`screens/Forum/DetailForum.tsx` - NewWrapper → OS_Wrapper
- [ ] Tabs berfungsi dengan baik -`screens/Forum/DetailForum2.tsx` - NewWrapper → OS_Wrapper (Active + disableFlexGrow fix)
- [ ] ScrollView/FlatList scroll dengan smooth
- [ ] Keyboard handling: auto scroll saat input focus (jika pakai `enableKeyboardHandling`)
- [ ] Footer muncul di posisi yang benar (tidak tertutup navigation bar)
- [ ] Pull to refresh berfungsi (jika ada)
### Common Testing #### User's Forum ("Forumku") Screens:
- [ ] Background image muncul (jika `withBackground={true}`) -`screens/Forum/ViewForumku.tsx` - ViewWrapper → OS_Wrapper
- [ ] Sticky header berfungsi (jika ada `headerComponent`) -`screens/Forum/ViewForumku2.tsx` - NewWrapper → OS_Wrapper
- [ ] Footer fixed di bottom (jika ada `footerComponent`)
- [ ] Floating button muncul (jika ada `floatingButton`)
- [ ] Loading skeleton muncul saat pagination
- [ ] Empty state muncul saat data kosong
## 📌 Notes #### Report & Edit Screens:
-`app/(application)/(user)/forum/[id]/edit.tsx` - ViewWrapper → OS_Wrapper (form + enableKeyboardHandling + contentPaddingBottom={250})
-`app/(application)/(user)/forum/[id]/report-commentar.tsx` - ViewWrapper → OS_Wrapper (Static report form)
-`app/(application)/(user)/forum/[id]/report-posting.tsx` - ViewWrapper → OS_Wrapper (Static report form)
-`app/(application)/(user)/forum/[id]/other-report-commentar.tsx` - ViewWrapper → OS_Wrapper (form + enableKeyboardHandling + contentPaddingBottom={250})
-`app/(application)/(user)/forum/[id]/other-report-posting.tsx` - ViewWrapper → OS_Wrapper (form + enableKeyboardHandling + contentPaddingBottom={250})
-`app/(application)/(user)/forum/[id]/preview-report-comment.tsx` - NewWrapper → OS_Wrapper
-`app/(application)/(user)/forum/[id]/preview-report-posting.tsx` - NewWrapper → OS_Wrapper
-`app/(application)/(user)/forum/[id]/index.tsx` - Checked (No wrapper to migrate, just imports)
### Usage Pattern: **Bug Fixes Implemented:**
-**Scroll Macet (Ghost Scroll):** Fixed dengan menghapus `KeyboardAvoidingView` & `TouchableWithoutFeedback` di List Mode `AndroidWrapper`.
-**Header Besar Terpotong:** Menambahkan props `disableFlexGrow={true}` untuk layar dengan header besar (DetailForum2).
-**Keyboard Dismiss:** Menggunakan `keyboardShouldPersistTaps="handled"` agar tap di area kosong menutup keyboard.
## ⏳ User Phase 6: Event Screens (Priority: HIGH)
- [ ] `app/(application)/(user)/event/create.tsx` → pakai `enableKeyboardHandling` + `contentPaddingBottom={250}`
- [ ] `app/(application)/(user)/event/(tabs)/index.tsx`
- [ ] `app/(application)/(user)/event/[id]/index.tsx` (detail)
- [ ] `app/(application)/(user)/event/detail/[id].tsx`
## ⏳ User Phase 7: Voting Screens (Priority: HIGH)
- [ ] `app/(application)/(user)/voting/create.tsx` → pakai `enableKeyboardHandling` + `contentPaddingBottom={250}`
- [ ] `app/(application)/(user)/voting/(tabs)/index.tsx`
- [ ] `app/(application)/(user)/voting/[id]/index.tsx` (detail)
## ⏳ User Phase 8: Donation Screens (Priority: HIGH)
- [ ] `app/(application)/(user)/donation/create.tsx` → pakai `enableKeyboardHandling` + `contentPaddingBottom={250}`
- [ ] `app/(application)/(user)/donation/create-story.tsx` → pakai `enableKeyboardHandling` + `contentPaddingBottom={250}`
- [ ] `app/(application)/(user)/donation/(tabs)/index.tsx`
- [ ] `app/(application)/(user)/donation/[id]/index.tsx` (detail)
## ⏳ User Phase 9: Investment Screens (Priority: MEDIUM)
- [ ] `app/(application)/(user)/investment/create.tsx` → pakai `enableKeyboardHandling` + `contentPaddingBottom={250}`
- [ ] `app/(application)/(user)/investment/(tabs)/index.tsx`
- [ ] `app/(application)/(user)/investment/[id]/index.tsx` (detail)
## ⏳ User Phase 10: Collaboration Screens (Priority: MEDIUM)
- [ ] `app/(application)/(user)/collaboration/create.tsx` → pakai `enableKeyboardHandling` + `contentPaddingBottom={250}`
- [ ] `app/(application)/(user)/collaboration/(tabs)/index.tsx`
- [ ] `app/(application)/(user)/collaboration/[id]/index.tsx` (detail)
## ⏳ User Phase 11: Other User Screens (Priority: LOW)
- [ ] `app/(application)/(user)/marketplace/index.tsx`
- [ ] `app/(application)/(user)/user-search/index.tsx`
- [ ] `app/(application)/(user)/notifications/` - Notification screens (TBD)
- [ ] `app/(application)/(user)/crowdfunding/` - Crowdfunding screens (TBD)
---
# 🔴 ADMIN PHASES (Admin-Facing Screens)
## ⏳ Admin Phase 1: Event Management (Priority: HIGH)
- [ ] `app/(application)/admin/event/index.tsx`
- [ ] `app/(application)/admin/event/type-create.tsx` → pakai `enableKeyboardHandling` + `contentPaddingBottom={250}`
- [ ] `app/(application)/admin/event/type-update.tsx` → pakai `enableKeyboardHandling` + `contentPaddingBottom={250}`
- [ ] `app/(application)/admin/event/type-of-event.tsx`
- [ ] `app/(application)/admin/event/[id]/index.tsx` (detail)
- [ ] `app/(application)/admin/event/[status]/index.tsx`
## ⏳ Admin Phase 2: Voting Management (Priority: HIGH)
- [ ] `app/(application)/admin/voting/index.tsx`
- [ ] `app/(application)/admin/voting/history.tsx`
- [ ] `app/(application)/admin/voting/[id]/index.tsx` (detail)
- [ ] `app/(application)/admin/voting/[status]/index.tsx`
## ⏳ Admin Phase 3: Donation Management (Priority: HIGH)
- [ ] `app/(application)/admin/donation/index.tsx`
- [ ] `app/(application)/admin/donation/category.tsx`
- [ ] `app/(application)/admin/donation/category-create.tsx` → pakai `enableKeyboardHandling` + `contentPaddingBottom={250}`
- [ ] `app/(application)/admin/donation/category-update.tsx` → pakai `enableKeyboardHandling` + `contentPaddingBottom={250}`
- [ ] `app/(application)/admin/donation/[id]/index.tsx` (detail)
- [ ] `app/(application)/admin/donation/[status]/index.tsx`
## ⏳ Admin Phase 4: Forum Admin (Priority: MEDIUM)
- [ ] `app/(application)/admin/forum/index.tsx`
- [ ] `app/(application)/admin/forum/posting.tsx`
- [ ] `app/(application)/admin/forum/report-posting.tsx`
- [ ] `app/(application)/admin/forum/report-comment.tsx`
- [ ] `app/(application)/admin/forum/[id]/index.tsx` (detail)
## ⏳ Admin Phase 5: Collaboration Admin (Priority: MEDIUM)
- [ ] `app/(application)/admin/collaboration/index.tsx`
- [ ] `app/(application)/admin/collaboration/group.tsx`
- [ ] `app/(application)/admin/collaboration/publish.tsx`
- [ ] `app/(application)/admin/collaboration/reject.tsx`
- [ ] `app/(application)/admin/collaboration/[id]/index.tsx` (detail)
## ⏳ Admin Phase 6: Job Admin (Priority: MEDIUM)
- [ ] `app/(application)/admin/job/index.tsx`
- [ ] `app/(application)/admin/job/[id]/index.tsx` (detail)
- [ ] `app/(application)/admin/job/[status]/index.tsx`
## ⏳ Admin Phase 7: Investment Admin (Priority: LOW)
- [ ] `app/(application)/admin/investment/index.tsx`
- [ ] `app/(application)/admin/investment/[id]/index.tsx` (detail)
- [ ] `app/(application)/admin/investment/[status]/index.tsx`
## ⏳ Admin Phase 8: App Information (Priority: LOW)
- [ ] `app/(application)/admin/app-information/index.tsx`
- [ ] `app/(application)/admin/app-information/business-field/` (TBD files)
- [ ] `app/(application)/admin/app-information/information-bank/` (TBD files)
- [ ] `app/(application)/admin/app-information/sticker/` (TBD files)
## ⏳ Admin Phase 9: User Access & Others (Priority: LOW)
- [x] `app/(application)/admin/user-access/index.tsx` - NewWrapper → OS_Wrapper (list with pagination + search)
- [x] `app/(application)/admin/user-access/[id]/index.tsx` - ViewWrapper → OS_Wrapper (detail with footer button)
- [ ] `app/(application)/admin/notification/` - Notification admin (TBD)
- [ ] `app/(application)/admin/super-admin/` - Super admin (TBD)
- [ ] `app/(application)/admin/dashboard.tsx`
- [ ] `app/(application)/admin/maps.tsx`
---
# 📌 Notes & Patterns
### Spacing Pattern:
- **Default**: `contentPaddingBottom=100` (list & static screens)
- **Forms**: `contentPaddingBottom={250}` (HANYA untuk screens dengan TextInput/TextArea)
- **contentPadding=0** (default, per-screen control jika perlu)
### User Preference:
- **NO PADDING_INLINE by default** - Bisa mempersempit box tampilan
- User akan review dan tambahkan sendiri jika diperlukan per-screen
### Keyboard Handling:
- `enableKeyboardHandling` → Auto-scroll saat keyboard muncul (Android only)
- **Bug Fixed (2026-04-08)**: Input di paling atas tidak lagi "terlempar" keluar layar saat keyboard muncul
- **Solusi**: Menggunakan `UIManager.measure` untuk mendapatkan posisi absolut input (`pageY`), lalu conditional scroll:
- Jika input DI ATAS keyboard (terlihat) → **TIDAK SCROLL**
- Jika input DI BAWAH keyboard (tertutup) → **Scroll secukupnya**
- Tap anywhere di luar input → keyboard dismiss (sudah implementasi di kedua mode)
### Migration Pattern:
#### Untuk List Screen: #### Untuk List Screen:
```tsx ```tsx
@@ -185,12 +317,7 @@ Setiap screen yang sudah di-migrate, test:
ListEmptyComponent={ListEmptyComponent} ListEmptyComponent={ListEmptyComponent}
ListFooterComponent={ListFooterComponent} ListFooterComponent={ListFooterComponent}
onEndReached={pagination.loadMore} onEndReached={pagination.loadMore}
refreshControl={ refreshControl={<RefreshControl refreshing={refreshing} onRefresh={onRefresh} />}
<RefreshControl
refreshing={pagination.refreshing}
onRefresh={pagination.onRefresh}
/>
}
/> />
``` ```
@@ -199,6 +326,7 @@ Setiap screen yang sudah di-migrate, test:
<OS_Wrapper <OS_Wrapper
headerComponent={<HeaderSection />} headerComponent={<HeaderSection />}
footerComponent={<FooterSection />} footerComponent={<FooterSection />}
refreshControl={<RefreshControl refreshing={refreshing} onRefresh={onRefresh} />}
> >
<YourContent /> <YourContent />
</OS_Wrapper> </OS_Wrapper>
@@ -208,59 +336,8 @@ Setiap screen yang sudah di-migrate, test:
```tsx ```tsx
<OS_Wrapper <OS_Wrapper
enableKeyboardHandling enableKeyboardHandling
keyboardScrollOffset={150} contentPaddingBottom={250} // ← HANYA untuk screens dengan TextInput
contentPaddingBottom={100} footerComponent={<SubmitButton />}
footerComponent={
<BoxButtonOnFooter>
<ButtonCustom onPress={handleSubmit}>Submit</ButtonCustom>
</BoxButtonOnFooter>
}
>
<FormContent />
</OS_Wrapper>
```
### Migration Pattern:
```tsx
// OLD
import NewWrapper from "@/components/_ShareComponent/NewWrapper";
<NewWrapper
listData={data}
renderItem={renderItem}
headerComponent={header}
footerComponent={footer}
/>
// NEW
import { OS_Wrapper } from "@/components";
<OS_Wrapper
listData={data}
renderItem={renderItem}
headerComponent={header}
footerComponent={footer}
/>
```
```tsx
// OLD (Form with keyboard handling)
import { NewWrapper_V2 } from "@/components/_ShareComponent/NewWrapper_V2";
<NewWrapper_V2
enableKeyboardHandling
keyboardScrollOffset={150}
>
<FormContent />
</NewWrapper_V2>
// NEW (Unified API)
import { OS_Wrapper } from "@/components";
<OS_Wrapper
enableKeyboardHandling
keyboardScrollOffset={150}
> >
<FormContent /> <FormContent />
</OS_Wrapper> </OS_Wrapper>
@@ -272,23 +349,55 @@ import { OS_Wrapper } from "@/components";
**Solution**: Pastikan tidak ada custom padding yang overriding default behavior. Jika masih bermasalah, cek apakah `contentPadding` atau `contentPaddingBottom` terlalu besar. **Solution**: Pastikan tidak ada custom padding yang overriding default behavior. Jika masih bermasalah, cek apakah `contentPadding` atau `contentPaddingBottom` terlalu besar.
### Issue: Keyboard menutupi input di Android ### Issue: Keyboard menutupi input di Android
**Solution**: Pastikan pakai `OS_Wrapper` dengan `enableKeyboardHandling={true}`. Adjust `keyboardScrollOffset` jika perlu. **Solution**: Pastikan pakai `OS_Wrapper` dengan `enableKeyboardHandling={true}` dan `contentPaddingBottom={250}` untuk form screens.
### Issue: Pull-to-refresh tidak berfungsi di static mode
**Solution**: Sudah diperbaiki! `refreshControl` sekarang di-pass ke ScrollView di AndroidWrapper.
### Issue: Footer terlalu jauh dari bottom ### Issue: Footer terlalu jauh dari bottom
**Solution**: Kurangi `contentPaddingBottom` (default: 80). Untuk list screen tanpa navigation bar overlay, bisa set ke 0. **Solution**: Kurangi `contentPaddingBottom` (default: 100 untuk list). Untuk form screens tetap 250.
### Issue: White space di bottom saat keyboard close (Android) ### Issue: White space di bottom saat keyboard close (Android)
**Solution**: Ini sudah di-fix di AndroidWrapper. Pastikan screen pakai OS_Wrapper, bukan NewWrapper langsung. **Solution**: Ini sudah di-fix di AndroidWrapper. Pastikan screen pakai OS_Wrapper, bukan NewWrapper langsung.
## 📊 Progress Tracking ## 📊 Progress Tracking
### User Phases:
| Phase | Total Files | Migrated | Testing | Status | | Phase | Total Files | Migrated | Testing | Status |
|-------|-------------|----------|---------|--------| |-------|-------------|----------|---------|--------|
| Phase 1 (Job) | 8 | 8 | ✅ Complete | ✅ Complete | | User Phase 1 (Job) | 9 | 9 | ✅ Complete | ✅ Complete |
| Phase 2 (User) | TBD | 0 | 0 | ⏳ Pending | | User Phase 2 (Profile + Others) | 10 | 10 | ✅ Complete | ✅ Complete |
| Phase 3 (Admin) | TBD | 0 | 0 | ⏳ Pending | | User Phase 3 (Portfolio) | 6 | 6 | ⏳ Pending | ✅ Complete |
| Phase 4 (Other) | TBD | 0 | 0 | ⏳ Pending | | User Phase 4 (Maps) | 2 | 2 | ⏳ Pending | ✅ Complete |
| **Total** | **8+** | **8** | **8** | **100% (Phase 1)** | | User Phase 5 (Forum) | 17 | 17 | ⏳ Pending | ✅ Complete |
| User Phase 6 (Event) | ~4 | 0 | 0 | ⏳ Pending |
| User Phase 7 (Voting) | ~3 | 0 | 0 | ⏳ Pending |
| User Phase 8 (Donation) | ~4 | 0 | 0 | ⏳ Pending |
| User Phase 9 (Investment) | ~3 | 0 | 0 | ⏳ Pending |
| User Phase 10 (Collaboration) | ~3 | 0 | 0 | ⏳ Pending |
| User Phase 11 (Others) | ~4 | 0 | 0 | ⏳ Pending |
| **User Total** | **~69** | **44** | **9** | **~64% Complete** |
### Admin Phases:
| Phase | Total Files | Migrated | Testing | Status |
|-------|-------------|----------|---------|--------|
| Admin Phase 1 (Event) | ~6 | 0 | 0 | ⏳ Pending |
| Admin Phase 2 (Voting) | ~4 | 0 | 0 | ⏳ Pending |
| Admin Phase 3 (Donation) | ~6 | 0 | 0 | ⏳ Pending |
| Admin Phase 4 (Forum) | ~5 | 0 | 0 | ⏳ Pending |
| Admin Phase 5 (Collaboration) | ~5 | 0 | 0 | ⏳ Pending |
| Admin Phase 6 (Job) | ~3 | 0 | 0 | ⏳ Pending |
| Admin Phase 7 (Investment) | ~3 | 0 | 0 | ⏳ Pending |
| Admin Phase 8 (App Info) | ~4 | 0 | 0 | ⏳ Pending |
| Admin Phase 9 (User Access) | ~6 | 2 | 0 | 🔄 In Progress |
| **Admin Total** | **~42** | **2** | **0** | **5% Complete** |
### Grand Total:
| Category | Total Files | Migrated | Status |
|----------|-------------|----------|--------|
| **User Screens** | ~69 | 44 | ~64% Complete |
| **Admin Screens** | ~42 | 2 | 5% Complete |
| **GRAND TOTAL** | **~111** | **46** | **~41% Complete** |
## 🔄 Rollback Plan ## 🔄 Rollback Plan
@@ -302,6 +411,6 @@ Jika ada issue yang tidak bisa di-fix dalam 1 jam:
**Co-authored-by**: Qwen-Coder <qwen-coder@alibabacloud.com> **Co-authored-by**: Qwen-Coder <qwen-coder@alibabacloud.com>
**Created**: 2026-04-06 **Created**: 2026-04-06
**Last Updated**: 2026-04-06 **Last Updated**: 2026-04-09
**Status**: Phase 1 (Job Screens) Complete ✅ **Status**: User Phase 1-4 Complete ✅ (27 files migrated)
**Next**: Phase 2 - Other User Screens **Next**: User Phase 5 - Forum Screens