diff --git a/app/(application)/discussion/member/[id].tsx b/app/(application)/discussion/member/[id].tsx index 948fe8b..be66170 100644 --- a/app/(application)/discussion/member/[id].tsx +++ b/app/(application)/discussion/member/[id].tsx @@ -137,6 +137,7 @@ export default function MemberDiscussionDetail() { icon={} title="Keluarkan" onPress={() => { + setModal(false) AlertKonfirmasi({ title: 'Konfirmasi', desc: 'Apakah Anda yakin ingin mengeluarkan anggota?', diff --git a/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/index.tsx b/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/index.tsx index 7dccd56..a9b56a8 100644 --- a/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/index.tsx +++ b/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/index.tsx @@ -259,6 +259,7 @@ export default function DetailEventCalendar() { icon={} title="Keluarkan" onPress={() => { + setModalMember(false) AlertKonfirmasi({ title: 'Konfirmasi', desc: 'Apakah Anda yakin ingin mengeluarkan anggota?', diff --git a/app/(application)/division/[id]/info.tsx b/app/(application)/division/[id]/info.tsx index ed2386a..36fb2ac 100644 --- a/app/(application)/division/[id]/info.tsx +++ b/app/(application)/division/[id]/info.tsx @@ -52,6 +52,7 @@ export default function InformationDivision() { }) function handleMemberOut() { + setModal(false) AlertKonfirmasi({ title: 'Konfirmasi', desc: 'Apakah anda yakin ingin mengeluarkan anggota?', diff --git a/app/(application)/group/index.tsx b/app/(application)/group/index.tsx index 7a9b41a..e31e36e 100644 --- a/app/(application)/group/index.tsx +++ b/app/(application)/group/index.tsx @@ -180,6 +180,7 @@ export default function Index() { icon={} title={activeChoose ? "Non Aktifkan" : "Aktifkan"} onPress={() => { + setModal(false) AlertKonfirmasi({ title: 'Konfirmasi', desc: activeChoose ? 'Apakah anda yakin ingin menonaktifkan data?' : 'Apakah anda yakin ingin mengaktifkan data?', diff --git a/app/(application)/position/index.tsx b/app/(application)/position/index.tsx index a6b0cf4..2462fba 100644 --- a/app/(application)/position/index.tsx +++ b/app/(application)/position/index.tsx @@ -198,6 +198,7 @@ export default function Index() { icon={} title={chooseData.active ? 'Non Aktifkan' : "Aktifkan"} onPress={() => { + setModal(false) AlertKonfirmasi({ title: 'Konfirmasi', desc: chooseData.active ? 'Apakah anda yakin ingin menonaktifkan data?' : 'Apakah anda yakin ingin mengaktifkan data?', @@ -208,7 +209,10 @@ export default function Index() { } title="Edit" - onPress={() => { setVisibleEdit(true) }} + onPress={() => { + setModal(false) + setVisibleEdit(true) + }} /> diff --git a/components/announcement/headerAnnouncementDetail.tsx b/components/announcement/headerAnnouncementDetail.tsx index 747b447..15c122f 100644 --- a/components/announcement/headerAnnouncementDetail.tsx +++ b/components/announcement/headerAnnouncementDetail.tsx @@ -56,6 +56,7 @@ export default function HeaderRightAnnouncementDetail({ id }: Props) { icon={} title="Hapus" onPress={() => { + setVisible(false) AlertKonfirmasi({ title: 'Konfirmasi', desc: 'Apakah anda yakin ingin menghapus pengumuman ini?', diff --git a/components/calendar/headerCalendarDetail.tsx b/components/calendar/headerCalendarDetail.tsx index e173af9..f9a26a1 100644 --- a/components/calendar/headerCalendarDetail.tsx +++ b/components/calendar/headerCalendarDetail.tsx @@ -67,6 +67,7 @@ export default function HeaderRightCalendarDetail({ id, idReminder }: Props) { icon={} title="Hapus" onPress={() => { + setVisible(false) AlertKonfirmasi({ title: 'Konfirmasi', desc: 'Apakah anda yakin ingin menghapus data ini? Data ini akan mempengaruhi semua data yang terkait', diff --git a/components/discussion/headerDiscussionDetail.tsx b/components/discussion/headerDiscussionDetail.tsx index b2dc428..be6813a 100644 --- a/components/discussion/headerDiscussionDetail.tsx +++ b/components/discussion/headerDiscussionDetail.tsx @@ -82,6 +82,7 @@ export default function HeaderRightDiscussionDetail({ id, status, isActive }: Pr icon={} title={status == 1 ? 'Tutup Diskusi' : 'Buka Diskusi'} onPress={() => { + setVisible(false) AlertKonfirmasi({ title: 'Konfirmasi', desc: `Apakah anda yakin ingin ${status == 1 ? 'menutup' : 'membuka'} diskusi?`, @@ -97,6 +98,7 @@ export default function HeaderRightDiscussionDetail({ id, status, isActive }: Pr icon={} title={isActive ? 'Arsipkan' : 'Aktifkan Diskusi'} onPress={() => { + setVisible(false) AlertKonfirmasi({ title: 'Konfirmasi', desc: isActive ? 'Apakah anda yakin ingin mengarsipkan diskusi?' : 'Apakah anda yakin ingin mengaktifkan diskusi?', diff --git a/components/discussion_general/headerDiscussionDetail.tsx b/components/discussion_general/headerDiscussionDetail.tsx index 9122ce1..39a6929 100644 --- a/components/discussion_general/headerDiscussionDetail.tsx +++ b/components/discussion_general/headerDiscussionDetail.tsx @@ -84,6 +84,7 @@ export default function HeaderRightDiscussionGeneralDetail({ id, active, status icon={} title={status == 1 ? 'Tutup Diskusi' : 'Buka Diskusi'} onPress={() => { + setVisible(false) AlertKonfirmasi({ title: 'Konfirmasi', desc: status == 1 ? 'Apakah anda yakin ingin menutup diskusi?' : 'Apakah anda yakin ingin membuka diskusi?', @@ -100,6 +101,7 @@ export default function HeaderRightDiscussionGeneralDetail({ id, active, status icon={} title="Aktifkan Diskusi" onPress={() => { + setVisible(false) AlertKonfirmasi({ title: 'Konfirmasi', desc: 'Apakah anda yakin ingin mengaktifkan diskusi ini?', @@ -119,6 +121,7 @@ export default function HeaderRightDiscussionGeneralDetail({ id, active, status icon={} title="Arsipkan" onPress={() => { + setVisible(false) AlertKonfirmasi({ title: 'Konfirmasi', desc: 'Apakah anda yakin ingin mengarsipkan diskusi?', diff --git a/components/division/headerDivisionInfo.tsx b/components/division/headerDivisionInfo.tsx index 796d433..8c8c76f 100644 --- a/components/division/headerDivisionInfo.tsx +++ b/components/division/headerDivisionInfo.tsx @@ -58,6 +58,7 @@ export default function HeaderRightDivisionInfo({ id, active }: Props) { icon={} title={active ? "Non Aktifkan" : "Aktifkan"} onPress={() => { + setVisible(false) AlertKonfirmasi({ title: 'Konfirmasi', desc: active ? 'Apakah anda yakin ingin menonaktifkan divisi?' : 'Apakah anda yakin ingin mengaktifkan divisi?', diff --git a/components/drawerBottom.tsx b/components/drawerBottom.tsx index 7dc5b53..267a9f9 100644 --- a/components/drawerBottom.tsx +++ b/components/drawerBottom.tsx @@ -42,6 +42,11 @@ export default function DrawerBottom({ isVisible, setVisible, title, children, a hideModalContentWhileAnimating={true} onBackdropPress={() => { setVisible(!backdropPressable) }} style={[{ justifyContent: 'flex-end', margin: 0 }]} + animationOutTiming={500} + animationInTiming={500} + backdropTransitionInTiming={500} + backdropTransitionOutTiming={500} + useNativeDriverForBackdrop={true} > diff --git a/components/member/headerMemberDetail.tsx b/components/member/headerMemberDetail.tsx index 48ccf64..8001c11 100644 --- a/components/member/headerMemberDetail.tsx +++ b/components/member/headerMemberDetail.tsx @@ -50,6 +50,7 @@ export default function HeaderRightMemberDetail({ active, id }: Props) { icon={} title={active ? "Non Aktifkan" : "Aktifkan"} onPress={() => { + setVisible(false) AlertKonfirmasi({ title: 'Konfirmasi', desc: active ? 'Apakah anda yakin ingin menonaktifkan user?' : 'Apakah anda yakin ingin mengaktifkan user?', diff --git a/components/position/headerRightPositionList.tsx b/components/position/headerRightPositionList.tsx index 0e2c233..5ae7359 100644 --- a/components/position/headerRightPositionList.tsx +++ b/components/position/headerRightPositionList.tsx @@ -109,7 +109,10 @@ export default function HeaderRightPositionList() { } title="Filter" - onPress={() => { setFilter(true) }} + onPress={() => { + setVisible(false) + setFilter(true) + }} /> } diff --git a/components/project/headerProjectDetail.tsx b/components/project/headerProjectDetail.tsx index 5721221..1371961 100644 --- a/components/project/headerProjectDetail.tsx +++ b/components/project/headerProjectDetail.tsx @@ -101,6 +101,7 @@ export default function HeaderRightProjectDetail({ id, status }: Props) { icon={} title="Hapus" onPress={() => { + setVisible(false) AlertKonfirmasi({ title: 'Konfirmasi', desc: 'Apakah Anda yakin ingin menghapus kegiatan ini? Kegiatan yang dihapus tidak dapat dikembalikan', diff --git a/components/project/sectionFile.tsx b/components/project/sectionFile.tsx index ea373fc..e6cf54d 100644 --- a/components/project/sectionFile.tsx +++ b/components/project/sectionFile.tsx @@ -181,6 +181,7 @@ export default function SectionFile({ status, member }: { status: number | undef disabled={status == 3} onPress={() => { if (status == 3) return + setModal(false) AlertKonfirmasi({ title: 'Konfirmasi', desc: 'Apakah Anda yakin ingin menghapus file ini? File yang dihapus tidak dapat dikembalikan', diff --git a/components/project/sectionMember.tsx b/components/project/sectionMember.tsx index 28e97cd..5625d52 100644 --- a/components/project/sectionMember.tsx +++ b/components/project/sectionMember.tsx @@ -157,6 +157,7 @@ export default function SectionMember({ status }: { status: number | undefined } } title="Keluarkan" onPress={() => { + setModal(false) AlertKonfirmasi({ title: "Konfirmasi", desc: "Apakah Anda yakin ingin mengeluarkan anggota?", diff --git a/components/project/sectionTanggalTugas.tsx b/components/project/sectionTanggalTugas.tsx index 7a6109b..4e0c21b 100644 --- a/components/project/sectionTanggalTugas.tsx +++ b/components/project/sectionTanggalTugas.tsx @@ -183,6 +183,7 @@ export default function SectionTanggalTugasProject({ status, member }: { status: icon={} title="Hapus Tugas" onPress={() => { + setModal(false) AlertKonfirmasi({ title: "Konfirmasi", desc: "Apakah anda yakin ingin menghapus data ini?", diff --git a/components/task/headerTaskDetail.tsx b/components/task/headerTaskDetail.tsx index bbf507b..0950559 100644 --- a/components/task/headerTaskDetail.tsx +++ b/components/task/headerTaskDetail.tsx @@ -140,6 +140,7 @@ export default function HeaderRightTaskDetail({ id, division, status }: Props) { icon={} title="Hapus" onPress={() => { + setVisible(false) AlertKonfirmasi({ title: 'Konfirmasi', desc: 'Apakah Anda yakin ingin menghapus tugas ini? Tugas yang dihapus tidak dapat dikembalikan', diff --git a/components/task/sectionFileTask.tsx b/components/task/sectionFileTask.tsx index 44af086..26ec81e 100644 --- a/components/task/sectionFileTask.tsx +++ b/components/task/sectionFileTask.tsx @@ -162,6 +162,7 @@ export default function SectionFileTask() { icon={} title="Hapus" onPress={() => { + setModal(false) AlertKonfirmasi({ title: 'Konfirmasi', desc: 'Apakah Anda yakin ingin menghapus file ini? File yang dihapus tidak dapat dikembalikan', diff --git a/components/task/sectionMemberTask.tsx b/components/task/sectionMemberTask.tsx index 3ef0325..ea9af73 100644 --- a/components/task/sectionMemberTask.tsx +++ b/components/task/sectionMemberTask.tsx @@ -170,6 +170,7 @@ export default function SectionMemberTask() { } title="Keluarkan" onPress={() => { + setModal(false) AlertKonfirmasi({ title: "Konfirmasi", desc: "Apakah Anda yakin ingin mengeluarkan anggota?", diff --git a/components/task/sectionTanggalTugasTask.tsx b/components/task/sectionTanggalTugasTask.tsx index 2ef9cf0..a11d066 100644 --- a/components/task/sectionTanggalTugasTask.tsx +++ b/components/task/sectionTanggalTugasTask.tsx @@ -167,6 +167,7 @@ export default function SectionTanggalTugasTask() { icon={} title="Hapus Tugas" onPress={() => { + setModal(false) AlertKonfirmasi({ title: 'Konfirmasi', desc: 'Apakah anda yakin ingin menghapus data ini?',