fix : ios dan tampilan

Deskripsi:
- modal crash
- input keyboard over lap
- detail pengumuman text color
- Scroll view tinggi 100 persen
- image user

nb : blm selesai semua
This commit is contained in:
2025-07-30 17:43:08 +08:00
parent 4394219f2a
commit 5898655fac
28 changed files with 545 additions and 441 deletions

View File

@@ -7,7 +7,7 @@ import { apiGetAnnouncementOne } from "@/lib/api";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { Entypo, MaterialIcons } from "@expo/vector-icons"; import { Entypo, MaterialIcons } from "@expo/vector-icons";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import { Dimensions, SafeAreaView, ScrollView, View } from "react-native"; import { Dimensions, SafeAreaView, ScrollView, View } from "react-native";
import RenderHTML from 'react-native-render-html'; import RenderHTML from 'react-native-render-html';
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
@@ -51,6 +51,11 @@ export default function DetailAnnouncement() {
handleLoad(true) handleLoad(true)
}, []) }, [])
function hasHtmlTags(text: string) {
const htmlRegex = /<[a-z][\s\S]*>/i;
return htmlRegex.test(text);
};
return ( return (
<SafeAreaView> <SafeAreaView>
<Stack.Screen <Stack.Screen
@@ -84,10 +89,15 @@ export default function DetailAnnouncement() {
<Text style={[Styles.textDefaultSemiBold]}>{data?.title}</Text> <Text style={[Styles.textDefaultSemiBold]}>{data?.title}</Text>
</View> </View>
<View style={[Styles.mt10]}> <View style={[Styles.mt10]}>
{
hasHtmlTags(data?.desc) ?
<RenderHTML <RenderHTML
contentWidth={contentWidth} contentWidth={contentWidth}
source={{ html: data?.desc }} source={{ html: data?.desc }}
/> />
:
<Text>{data?.desc}</Text>
}
</View> </View>
</> </>
} }

View File

@@ -119,7 +119,7 @@ export default function BannerList() {
onRefresh={handleRefresh} onRefresh={handleRefresh}
/> />
} }
style={[{height:'100%'}]} style={[Styles.h100]}
> >
<View style={[Styles.p15, Styles.mb100]}> <View style={[Styles.p15, Styles.mb100]}>
{entities.map((index: any, key: number) => ( {entities.map((index: any, key: number) => (

View File

@@ -6,6 +6,7 @@ import { InputForm } from "@/components/inputForm";
import LabelStatus from "@/components/labelStatus"; import LabelStatus from "@/components/labelStatus";
import Skeleton from "@/components/skeleton"; import Skeleton from "@/components/skeleton";
import SkeletonContent from "@/components/skeletonContent"; import SkeletonContent from "@/components/skeletonContent";
import Text from '@/components/Text';
import { ColorsStatus } from "@/constants/ColorsStatus"; import { ColorsStatus } from "@/constants/ColorsStatus";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiGetDiscussionGeneralOne, apiSendDiscussionGeneralCommentar } from "@/lib/api"; import { apiGetDiscussionGeneralOne, apiSendDiscussionGeneralCommentar } from "@/lib/api";
@@ -14,8 +15,7 @@ import { Ionicons, MaterialIcons } from "@expo/vector-icons";
import { firebase } from '@react-native-firebase/database'; import { firebase } from '@react-native-firebase/database';
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Pressable, ScrollView, View } from "react-native"; import { KeyboardAvoidingView, Platform, Pressable, ScrollView, View } from "react-native";
import Text from '@/components/Text';
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
type Props = { type Props = {
@@ -195,9 +195,12 @@ export default function DetailDiscussionGeneral() {
</View> </View>
</View> </View>
</ScrollView> </ScrollView>
<KeyboardAvoidingView
behavior={Platform.OS === 'ios' ? 'padding' : undefined}
keyboardVerticalOffset={110}
>
<View style={[ <View style={[
Styles.contentItemCenter, Styles.contentItemCenter,
Styles.absolute0,
Styles.w100, Styles.w100,
{ backgroundColor: "#f4f4f4" }, { backgroundColor: "#f4f4f4" },
]}> ]}>
@@ -219,6 +222,7 @@ export default function DetailDiscussionGeneral() {
} }
/> />
</View> </View>
</KeyboardAvoidingView>
</View > </View >
</> </>
) )

View File

@@ -114,7 +114,7 @@ export default function AddMemberDiscussionDetail() {
<ImageWithLabel <ImageWithLabel
key={index} key={index}
label={item.name} label={item.name}
src={item.img} src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
onClick={() => onChoose(item.idUser, item.name, item.img)} onClick={() => onChoose(item.idUser, item.name, item.img)}
/> />
)) ))

View File

@@ -101,9 +101,12 @@ export default function CreateDiscussionGeneral() {
dispatch(setUpdateDiscussionGeneralDetail(!update)) dispatch(setUpdateDiscussionGeneralDetail(!update))
Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', }) Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
router.back() router.back()
}else{
Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} }
} }

View File

@@ -144,7 +144,9 @@ export default function CalendarDivision() {
refreshing={refreshing} refreshing={refreshing}
onRefresh={handleRefresh} onRefresh={handleRefresh}
/> />
}> }
style={[Styles.h100]}
>
<View style={[Styles.p15]}> <View style={[Styles.p15]}>
<View style={[Styles.wrapPaper, Styles.p10]}> <View style={[Styles.wrapPaper, Styles.p10]}>
<Datepicker <Datepicker

View File

@@ -351,7 +351,7 @@ export default function DocumentDivision() {
/> />
<ModalLoading isVisible={loadingOpen} setVisible={setLoadingOpen} /> <ModalLoading isVisible={loadingOpen} setVisible={setLoadingOpen} />
<ScrollView <ScrollView
style={{ height: "100%" }} style={[Styles.h100]}
refreshControl={ refreshControl={
<RefreshControl <RefreshControl
refreshing={refreshing} refreshing={refreshing}

View File

@@ -4,6 +4,7 @@ import InputSearch from "@/components/inputSearch";
import PaperGridContent from "@/components/paperGridContent"; import PaperGridContent from "@/components/paperGridContent";
import Skeleton from "@/components/skeleton"; import Skeleton from "@/components/skeleton";
import SkeletonTwoItem from "@/components/skeletonTwoItem"; import SkeletonTwoItem from "@/components/skeletonTwoItem";
import Text from "@/components/Text";
import { ColorsStatus } from "@/constants/ColorsStatus"; import { ColorsStatus } from "@/constants/ColorsStatus";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiGetDivision } from "@/lib/api"; import { apiGetDivision } from "@/lib/api";
@@ -18,7 +19,6 @@ import {
import { router, useLocalSearchParams } from "expo-router"; import { router, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Pressable, RefreshControl, View, VirtualizedList } from "react-native"; import { Pressable, RefreshControl, View, VirtualizedList } from "react-native";
import Text from "@/components/Text";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
type Props = { type Props = {
@@ -218,7 +218,7 @@ export default function ListDivision() {
</View> </View>
) : ( ) : (
isList ? ( isList ? (
<View style={[Styles.mb50]}> <View style={[Styles.h100]}>
<VirtualizedList <VirtualizedList
data={data} data={data}
style={[{ paddingBottom: 100 }]} style={[{ paddingBottom: 100 }]}
@@ -253,7 +253,7 @@ export default function ListDivision() {
/> />
</View> </View>
) : ( ) : (
<View> <View style={[Styles.h100]}>
<VirtualizedList <VirtualizedList
data={data} data={data}
style={[{ paddingBottom: 100 }]} style={[{ paddingBottom: 100 }]}

View File

@@ -112,14 +112,6 @@ export default function Index() {
return ( return (
<SafeAreaView> <SafeAreaView>
<ScrollView
refreshControl={
<RefreshControl
refreshing={refreshing}
onRefresh={handleRefresh}
/>
}
>
<View style={[Styles.p15]}> <View style={[Styles.p15]}>
<View style={[Styles.wrapBtnTab]}> <View style={[Styles.wrapBtnTab]}>
<ButtonTab <ButtonTab
@@ -138,6 +130,15 @@ export default function Index() {
n={2} /> n={2} />
</View> </View>
<InputSearch onChange={setSearch} /> <InputSearch onChange={setSearch} />
<ScrollView
refreshControl={
<RefreshControl
refreshing={refreshing}
onRefresh={handleRefresh}
/>
}
style={[Styles.h100]}
>
<View> <View>
{ {
@@ -173,8 +174,8 @@ export default function Index() {
<Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text> <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
} }
</View> </View>
</View>
</ScrollView> </ScrollView>
</View>
<DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title={titleChoose}> <DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title={titleChoose}>
<View style={Styles.rowItemsCenter}> <View style={Styles.rowItemsCenter}>
@@ -203,7 +204,7 @@ export default function Index() {
</View> </View>
</DrawerBottom> </DrawerBottom>
<DrawerBottom animation="none" height={30} isVisible={isVisibleEdit} setVisible={() => setVisibleEdit(false)} title="Edit Lembaga Desa"> <DrawerBottom animation="none" keyboard height={30} isVisible={isVisibleEdit} setVisible={() => setVisibleEdit(false)} title="Edit Lembaga Desa">
<View style={{ flex: 1 }}> <View style={{ flex: 1 }}>
<View> <View>
<InputForm type="default" placeholder="Nama Lembaga Desa" required label="Lembaga Desa" value={titleChoose} onChange={setTitleChoose} /> <InputForm type="default" placeholder="Nama Lembaga Desa" required label="Lembaga Desa" value={titleChoose} onChange={setTitleChoose} />

View File

@@ -9,7 +9,7 @@ import Styles from "@/constants/Styles";
import { apiGetProfile } from "@/lib/api"; import { apiGetProfile } from "@/lib/api";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { SafeAreaView, ScrollView, View } from "react-native"; import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
type Props = { type Props = {
@@ -34,10 +34,11 @@ export default function MemberDetail() {
const [isEdit, setEdit] = useState(true) const [isEdit, setEdit] = useState(true)
const arrSkeleton = Array.from({ length: 5 }, (_, index) => index) const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
const [loading, setLoading] = useState(true) const [loading, setLoading] = useState(true)
const [refreshing, setRefreshing] = useState(false)
async function handleLoad() { async function handleLoad(loading: boolean) {
try { try {
setLoading(true) setLoading(loading)
const response = await apiGetProfile({ id: id }) const response = await apiGetProfile({ id: id })
setData(response.data) setData(response.data)
setEdit(valueRoleUser.filter((v) => v.login == entityUser.role)[0]?.data.some((i: any) => i.id == response.data.idUserRole)) setEdit(valueRoleUser.filter((v) => v.login == entityUser.role)[0]?.data.some((i: any) => i.id == response.data.idUserRole))
@@ -50,9 +51,17 @@ export default function MemberDetail() {
useEffect(() => { useEffect(() => {
handleLoad() handleLoad(true)
}, []); }, []);
const handleRefresh = async () => {
setRefreshing(true)
handleLoad(false)
await new Promise(resolve => setTimeout(resolve, 2000));
setRefreshing(false)
};
return ( return (
<SafeAreaView> <SafeAreaView>
<Stack.Screen <Stack.Screen
@@ -64,9 +73,16 @@ export default function MemberDetail() {
headerShadowVisible: false headerShadowVisible: false
}} }}
/> />
<ScrollView> <ScrollView
<View style={{ flexDirection: 'column' }}> style={[Styles.h100]}
<View style={[Styles.wrapHeadViewMember]}> refreshControl={
<RefreshControl
refreshing={refreshing}
onRefresh={handleRefresh}
/>
}
>
<View style={[Styles.wrapHeadViewMember,]}>
{ {
loading ? loading ?
<> <>
@@ -106,7 +122,6 @@ export default function MemberDetail() {
} }
</View> </View>
</View>
</ScrollView> </ScrollView>
</SafeAreaView> </SafeAreaView>
) )

View File

@@ -15,6 +15,8 @@ import { router, Stack } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { import {
Image, Image,
KeyboardAvoidingView,
Platform,
Pressable, Pressable,
SafeAreaView, SafeAreaView,
ScrollView, ScrollView,
@@ -213,8 +215,13 @@ export default function CreateMember() {
), ),
}} }}
/> />
<KeyboardAvoidingView
style={[Styles.h100]}
behavior={Platform.OS === 'ios' ? 'padding' : undefined}
keyboardVerticalOffset={110}
>
<ScrollView> <ScrollView>
<View style={[Styles.p15, Styles.mb100]}> <View style={[Styles.p15]}>
<View style={{ justifyContent: "center", alignItems: "center" }}> <View style={{ justifyContent: "center", alignItems: "center" }}>
{selectedImage != undefined ? ( {selectedImage != undefined ? (
<Pressable onPress={pickImageAsync}> <Pressable onPress={pickImageAsync}>
@@ -335,10 +342,12 @@ export default function CreateMember() {
/> />
</View> </View>
</ScrollView> </ScrollView>
</KeyboardAvoidingView>
<ModalSelect <ModalSelect
category={valSelect} category={valSelect}
close={setSelect} close={() => { setSelect(false) }}
onSelect={(value) => { onSelect={(value) => {
validationForm(valSelect, value.val, value.label); validationForm(valSelect, value.val, value.label);
}} }}

View File

@@ -13,6 +13,8 @@ import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { import {
Image, Image,
KeyboardAvoidingView,
Platform,
Pressable, Pressable,
SafeAreaView, SafeAreaView,
ScrollView, ScrollView,
@@ -249,6 +251,12 @@ export default function EditMember() {
), ),
}} }}
/> />
<KeyboardAvoidingView
style={[Styles.h100]}
behavior={Platform.OS === 'ios' ? 'padding' : undefined}
keyboardVerticalOffset={110}
>
<ScrollView> <ScrollView>
<View style={[Styles.p15, Styles.mb100]}> <View style={[Styles.p15, Styles.mb100]}>
<View style={{ justifyContent: "center", alignItems: "center" }}> <View style={{ justifyContent: "center", alignItems: "center" }}>
@@ -374,6 +382,7 @@ export default function EditMember() {
/> />
</View> </View>
</ScrollView> </ScrollView>
</KeyboardAvoidingView>
<ModalSelect <ModalSelect
category={valSelect} category={valSelect}

View File

@@ -131,14 +131,6 @@ export default function Index() {
return ( return (
<SafeAreaView> <SafeAreaView>
<ScrollView
style={{ height: '100%' }}
refreshControl={
<RefreshControl
refreshing={refreshing}
onRefresh={handleRefresh}
/>
}>
<View style={[Styles.p15]}> <View style={[Styles.p15]}>
<View style={[Styles.wrapBtnTab]}> <View style={[Styles.wrapBtnTab]}>
<ButtonTab <ButtonTab
@@ -163,6 +155,14 @@ export default function Index() {
<Text>Filter : {nameGroup}</Text> <Text>Filter : {nameGroup}</Text>
</View> </View>
} }
<ScrollView
style={[Styles.h100]}
refreshControl={
<RefreshControl
refreshing={refreshing}
onRefresh={handleRefresh}
/>
}>
<View> <View>
{ {
loading ? loading ?
@@ -193,8 +193,8 @@ export default function Index() {
<Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text> <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
} }
</View> </View>
</View>
</ScrollView> </ScrollView>
</View>
<DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title={chooseData.name}> <DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title={chooseData.name}>
<View style={Styles.rowItemsCenter}> <View style={Styles.rowItemsCenter}>
@@ -224,7 +224,7 @@ export default function Index() {
</DrawerBottom> </DrawerBottom>
<DrawerBottom animation="none" height={30} backdropPressable={false} isVisible={isVisibleEdit} setVisible={() => setVisibleEdit(false)} title="Edit Jabatan"> <DrawerBottom animation="none" keyboard height={30} backdropPressable={false} isVisible={isVisibleEdit} setVisible={() => setVisibleEdit(false)} title="Edit Jabatan">
<View style={{ justifyContent: 'space-between', flex: 1 }}> <View style={{ justifyContent: 'space-between', flex: 1 }}>
<View> <View>
<InputForm <InputForm

View File

@@ -10,7 +10,7 @@ import { apiGetProjectOne } from "@/lib/api";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { SafeAreaView, ScrollView, View } from "react-native"; import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
@@ -37,6 +37,7 @@ export default function DetailProject() {
const update = useSelector((state: any) => state.projectUpdate) const update = useSelector((state: any) => state.projectUpdate)
const [isMember, setIsMember] = useState(false) const [isMember, setIsMember] = useState(false)
const entityUser = useSelector((state: any) => state.user) const entityUser = useSelector((state: any) => state.user)
const [refreshing, setRefreshing] = useState(false)
async function handleLoad(cat: 'data' | 'progress') { async function handleLoad(cat: 'data' | 'progress') {
try { try {
@@ -79,6 +80,14 @@ export default function DetailProject() {
}, []) }, [])
const handleRefresh = async () => {
setRefreshing(true)
await handleLoad('data')
await handleLoad('progress')
await new Promise(resolve => setTimeout(resolve, 2000));
setRefreshing(false)
};
return ( return (
<SafeAreaView> <SafeAreaView>
<Stack.Screen <Stack.Screen
@@ -89,15 +98,22 @@ export default function DetailProject() {
headerRight: () => (entityUser.role == "user" || entityUser.role == "coadmin") && !isMember ? null : <HeaderRightProjectDetail id={id} status={data?.status} />, headerRight: () => (entityUser.role == "user" || entityUser.role == "coadmin") && !isMember ? null : <HeaderRightProjectDetail id={id} status={data?.status} />,
}} }}
/> />
<ScrollView> <ScrollView
refreshControl={
<RefreshControl
refreshing={refreshing}
onRefresh={handleRefresh}
/>
}
>
<View style={[Styles.p15, Styles.mb100]}> <View style={[Styles.p15, Styles.mb100]}>
{ {
data?.reason != null && data?.reason != "" && <SectionCancel text={data?.reason} /> data?.reason != null && data?.reason != "" && <SectionCancel text={data?.reason} />
} }
<SectionProgress text={`Kemajuan Kegiatan ${progress}%`} progress={progress} /> <SectionProgress text={`Kemajuan Kegiatan ${progress}%`} progress={progress} />
<SectionTanggalTugasProject status={data?.status} member={isMember} /> <SectionTanggalTugasProject status={data?.status} member={isMember} refreshing={refreshing}/>
<SectionFile status={data?.status} member={isMember} /> <SectionFile status={data?.status} member={isMember} refreshing={refreshing} />
<SectionMember status={data?.status} /> <SectionMember status={data?.status} refreshing={refreshing} />
</View> </View>
</ScrollView> </ScrollView>
</SafeAreaView> </SafeAreaView>

View File

@@ -220,7 +220,7 @@ export default function ListProject() {
data.length > 0 data.length > 0
? ?
isList ? ( isList ? (
<View> <View style={[Styles.h100]}>
<VirtualizedList <VirtualizedList
data={data} data={data}
getItemCount={() => data.length} getItemCount={() => data.length}
@@ -280,7 +280,7 @@ export default function ListProject() {
} */} } */}
</View> </View>
) : ( ) : (
<View> <View style={[Styles.h100]}>
<VirtualizedList <VirtualizedList
data={data} data={data}
getItemCount={() => data.length} getItemCount={() => data.length}

View File

@@ -17,7 +17,7 @@ export default function ButtonTab({ active, value, onPress, label, n, icon }: Pr
return ( return (
<TouchableOpacity style={[Styles.btnTab, (active == value) && ColorsStatus.orange, { width: n == 2 ? '50%' : 'auto' }]} onPress={() => { onPress() }}> <TouchableOpacity style={[Styles.btnTab, (active == value) && ColorsStatus.orange, { width: n == 2 ? '50%' : 'auto' }]} onPress={() => { onPress() }}>
{icon} {icon}
<Text style={[Styles.textMediumSemiBold, Styles.ml10, { color: active == value ? 'white' : 'black' }]}>{label}</Text> <Text numberOfLines={1} style={[Styles.textMediumSemiBold, Styles.ml10, { color: active == value ? 'white' : 'black' }]}>{label}</Text>
</TouchableOpacity> </TouchableOpacity>
) )
} }

View File

@@ -34,7 +34,9 @@ export default function HeaderDiscussionGeneral() {
title="Filter" title="Filter"
onPress={() => { onPress={() => {
setVisible(false) setVisible(false)
setTimeout(() => {
setFilter(true) setFilter(true)
}, 600)
}} }}
/> />
} }

View File

@@ -37,7 +37,9 @@ export default function HeaderRightDivisionList() {
title="Filter" title="Filter"
onPress={() => { onPress={() => {
setVisible(false) setVisible(false)
setTimeout(() => {
setFilter(true) setFilter(true)
}, 600);
}} }}
/> />
} }

View File

@@ -1,8 +1,8 @@
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { MaterialIcons } from "@expo/vector-icons"; import { MaterialIcons } from "@expo/vector-icons";
import { Pressable, View } from "react-native"; import { Dimensions, KeyboardAvoidingView, Platform, Pressable, View } from "react-native";
import Text from "./Text";
import Modal from 'react-native-modal'; import Modal from 'react-native-modal';
import Text from "./Text";
type Props = { type Props = {
isVisible: boolean isVisible: boolean
@@ -12,28 +12,15 @@ type Props = {
animation?: 'slide' | 'none' | 'fade' animation?: 'slide' | 'none' | 'fade'
height?: number height?: number
backdropPressable?: boolean backdropPressable?: boolean
keyboard?: boolean
} }
export default function DrawerBottom({ isVisible, setVisible, title, children, animation, height, backdropPressable = true }: Props) { export default function DrawerBottom({ isVisible, setVisible, title, children, animation, height, backdropPressable = true, keyboard = false }: Props) {
return ( const tinggiScreen = Dimensions.get("window").height;
// <Modal const tinggiInput = height != undefined ? height : 25
// animationType={animation} const tinggiFix = tinggiScreen * tinggiInput / 100;
// transparent={true} visible={isVisible}>
// <View style={[Styles.modalBgTransparant]}>
// <View style={[Styles.modalContent, height != undefined && { height: `${height}%` }]}>
// <View style={Styles.titleContainer}>
// <Text style={Styles.textDefault}>{title}</Text>
// <Pressable onPress={() => setVisible(false)}>
// <MaterialIcons name="close" color="black" size={22} />
// </Pressable>
// </View>
// <View style={Styles.contentContainer}>
// {children}
// </View>
// </View>
// </View>
// </Modal>
return (
<Modal <Modal
animationIn={"slideInUp"} animationIn={"slideInUp"}
animationOut={"slideOutDown"} animationOut={"slideOutDown"}
@@ -49,7 +36,13 @@ export default function DrawerBottom({ isVisible, setVisible, title, children, a
backdropTransitionOutTiming={500} backdropTransitionOutTiming={500}
useNativeDriverForBackdrop={true} useNativeDriverForBackdrop={true}
> >
<View style={[Styles.modalContentNew, height != undefined ? { height: `${height}%` } : { height: '25%' }]}> {
keyboard ?
<KeyboardAvoidingView
behavior={Platform.OS === 'ios' ? 'padding' : undefined}
keyboardVerticalOffset={0}
>
<View style={[Styles.modalContentNew, { height: tinggiFix }]}>
<View style={[Styles.titleContainerNew]}> <View style={[Styles.titleContainerNew]}>
<Text style={Styles.textDefault}>{title}</Text> <Text style={Styles.textDefault}>{title}</Text>
<Pressable onPress={() => setVisible(false)}> <Pressable onPress={() => setVisible(false)}>
@@ -60,6 +53,20 @@ export default function DrawerBottom({ isVisible, setVisible, title, children, a
{children} {children}
</View> </View>
</View> </View>
</KeyboardAvoidingView>
:
<View style={[Styles.modalContentNew, { height: tinggiFix }]}>
<View style={[Styles.titleContainerNew]}>
<Text style={Styles.textDefault}>{title}</Text>
<Pressable onPress={() => setVisible(false)}>
<MaterialIcons name="close" color="black" size={22} />
</Pressable>
</View>
<View style={Styles.contentContainer}>
{children}
</View>
</View>
}
</Modal> </Modal>
) )
} }

View File

@@ -78,7 +78,7 @@ export default function HeaderRightGroupList() {
</View> </View>
</DrawerBottom> </DrawerBottom>
<DrawerBottom animation="none" height={30} isVisible={isVisibleTambah} setVisible={() => setVisibleTambah(false)} title="Tambah Lembaga Desa"> <DrawerBottom animation="none" keyboard height={30} isVisible={isVisibleTambah} setVisible={() => setVisibleTambah(false)} title="Tambah Lembaga Desa">
<View style={{ flex: 1 }}> <View style={{ flex: 1 }}>
<View> <View>
<InputForm <InputForm

View File

@@ -17,7 +17,7 @@ export default function HeaderMemberList() {
return ( return (
<> <>
<ButtonMenuHeader onPress={() => { setVisible(true) }} /> <ButtonMenuHeader onPress={() => { setVisible(true) }} />
<DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu"> <DrawerBottom animation="slide" isVisible={isVisible} setVisible={() => setVisible(false)} title="Menu">
<View style={Styles.rowItemsCenter}> <View style={Styles.rowItemsCenter}>
<MenuItemRow <MenuItemRow
icon={<AntDesign name="pluscircle" color="black" size={25} />} icon={<AntDesign name="pluscircle" color="black" size={25} />}
@@ -34,7 +34,9 @@ export default function HeaderMemberList() {
title="Filter" title="Filter"
onPress={() => { onPress={() => {
setVisible(false) setVisible(false)
setTimeout(() => {
setFilter(true) setFilter(true)
}, 600)
}} }}
/> />
} }

View File

@@ -126,7 +126,7 @@ export default function ModalSelect({ open, close, title, category, idParent, on
} }
return ( return (
<DrawerBottom animation="none" isVisible={open} setVisible={close} title={title} height={(category == 'gender' || category == 'status-task') ? 25 : category == 'member' ? 100 : 75}> <DrawerBottom animation="none" isVisible={open} setVisible={close} title={title} height={(category == 'gender' || category == 'status-task') ? 25 : category == 'member' ? 90 : 75}>
{ {
category == 'member' && category == 'member' &&
<> <>

View File

@@ -123,7 +123,7 @@ export default function HeaderRightPositionList() {
</View> </View>
</DrawerBottom> </DrawerBottom>
<DrawerBottom animation="slide" height={45} isVisible={isVisibleTambah} setVisible={() => setVisibleTambah(false)} title="Tambah Jabatan"> <DrawerBottom animation="slide" height={45} keyboard isVisible={isVisibleTambah} setVisible={() => setVisibleTambah(false)} title="Tambah Jabatan">
<View style={{ flex: 1, justifyContent: 'space-between' }}> <View style={{ flex: 1, justifyContent: 'space-between' }}>
<View> <View>
{ {

View File

@@ -37,7 +37,9 @@ export default function HeaderRightProjectList() {
title="Filter" title="Filter"
onPress={() => { onPress={() => {
setVisible(false) setVisible(false)
setTimeout(() => {
setFilter(true) setFilter(true)
}, 600)
}} }}
/> />
} }

View File

@@ -28,7 +28,7 @@ type Props = {
idStorage: string idStorage: string
} }
export default function SectionFile({ status, member }: { status: number | undefined, member: boolean }) { export default function SectionFile({ status, member, refreshing }: { status: number | undefined, member: boolean, refreshing?: boolean }) {
const entityUser = useSelector((state: any) => state.user) const entityUser = useSelector((state: any) => state.user)
const [isModal, setModal] = useState(false) const [isModal, setModal] = useState(false)
const { token, decryptToken } = useAuthSession(); const { token, decryptToken } = useAuthSession();
@@ -62,6 +62,11 @@ export default function SectionFile({ status, member }: { status: number | undef
handleLoad(false); handleLoad(false);
}, [update.file]); }, [update.file]);
useEffect(() => {
if (refreshing)
handleLoad(false);
}, [refreshing]);
useEffect(() => { useEffect(() => {
handleLoad(true); handleLoad(true);

View File

@@ -25,7 +25,7 @@ type Props = {
position: string; position: string;
}; };
export default function SectionMember({ status }: { status: number | undefined }) { export default function SectionMember({ status, refreshing }: { status: number | undefined, refreshing?: boolean }) {
const dispatch = useDispatch() const dispatch = useDispatch()
const entityUser = useSelector((state: any) => state.user) const entityUser = useSelector((state: any) => state.user)
const update = useSelector((state: any) => state.projectUpdate) const update = useSelector((state: any) => state.projectUpdate)
@@ -62,6 +62,11 @@ export default function SectionMember({ status }: { status: number | undefined }
handleLoad(false); handleLoad(false);
}, [update.member]); }, [update.member]);
useEffect(() => {
if (refreshing)
handleLoad(false);
}, [refreshing]);
useEffect(() => { useEffect(() => {
handleLoad(true); handleLoad(true);
}, []); }, []);
@@ -75,7 +80,7 @@ export default function SectionMember({ status }: { status: number | undefined }
}, id) }, id)
if (response.success) { if (response.success) {
Toast.show({ type: 'small', text1: 'Berhasil menghapus anggota', }) Toast.show({ type: 'small', text1: 'Berhasil menghapus anggota', })
dispatch(setUpdateProject({ ...update, member: !update.progress })) dispatch(setUpdateProject({ ...update, member: !update.member }))
setModal(false); setModal(false);
} }
} catch (error) { } catch (error) {

View File

@@ -26,7 +26,7 @@ type Props = {
createdAt: string; createdAt: string;
}; };
export default function SectionTanggalTugasProject({ status, member }: { status: number | undefined, member: boolean }) { export default function SectionTanggalTugasProject({ status, member, refreshing }: { status: number | undefined, member: boolean, refreshing?: boolean }) {
const entityUser = useSelector((state: any) => state.user) const entityUser = useSelector((state: any) => state.user)
const dispatch = useDispatch() const dispatch = useDispatch()
const update = useSelector((state: any) => state.projectUpdate) const update = useSelector((state: any) => state.projectUpdate)
@@ -63,6 +63,11 @@ export default function SectionTanggalTugasProject({ status, member }: { status:
handleLoad(false); handleLoad(false);
}, [update.task]); }, [update.task]);
useEffect(() => {
if (refreshing)
handleLoad(false);
}, [refreshing]);
useEffect(() => { useEffect(() => {
handleLoad(true); handleLoad(true);
}, []); }, []);
@@ -163,7 +168,9 @@ export default function SectionTanggalTugasProject({ status, member }: { status:
title="Update Status" title="Update Status"
onPress={() => { onPress={() => {
setModal(false); setModal(false);
setTimeout(() => {
setSelect(true); setSelect(true);
}, 600)
}} }}
/> />
<MenuItemRow <MenuItemRow
@@ -198,7 +205,7 @@ export default function SectionTanggalTugasProject({ status, member }: { status:
<ModalSelect <ModalSelect
category="status-task" category="status-task"
close={setSelect} close={() => { setSelect(false) }}
onSelect={(value) => { onSelect={(value) => {
handleUpdate(Number(value.val)) handleUpdate(Number(value.val))
}} }}

View File

@@ -188,6 +188,9 @@ const Styles = StyleSheet.create({
round10: { round10: {
borderRadius: 10 borderRadius: 10
}, },
h100: {
height: '100%'
},
w100: { w100: {
width: '100%' width: '100%'
}, },