From 939076c572a7df7ad1ca4fde12695189746ab6c4 Mon Sep 17 00:00:00 2001 From: Diego Date: Mon, 28 Aug 2023 17:47:30 +0200 Subject: [PATCH 1/4] Fixed modal jump when is opened --- src/Date/DatePickerModal.tsx | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/Date/DatePickerModal.tsx b/src/Date/DatePickerModal.tsx index 7ff3f603..c9d05cea 100644 --- a/src/Date/DatePickerModal.tsx +++ b/src/Date/DatePickerModal.tsx @@ -15,8 +15,6 @@ import DatePickerModalContent, { DatePickerModalContentRangeProps, DatePickerModalContentSingleProps, } from './DatePickerModalContent' -import { useHeaderBackgroundColor, useHeaderColorIsLight } from '../utils' -import { useSafeAreaInsets } from 'react-native-safe-area-context' interface DatePickerModalProps { visible: boolean @@ -61,10 +59,6 @@ export function DatePickerModal( default: 'slide', }) - const isLight = useHeaderColorIsLight() - const headerBackgroundColor = useHeaderBackgroundColor() - const insets = useSafeAreaInsets() - return ( 650 ? styles.modalContentBig : null, ]} > - {disableStatusBar ? null : ( - - )} {disableStatusBarPadding ? null : ( From 302f74e9ac5e7697229e3f7890f914a37eb13b82 Mon Sep 17 00:00:00 2001 From: Diego Date: Mon, 28 Aug 2023 18:01:03 +0200 Subject: [PATCH 2/4] Added line removed by error --- src/Date/DatePickerModal.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Date/DatePickerModal.tsx b/src/Date/DatePickerModal.tsx index 5b49c5a3..c526ee60 100644 --- a/src/Date/DatePickerModal.tsx +++ b/src/Date/DatePickerModal.tsx @@ -64,6 +64,8 @@ export function DatePickerModal( default: 'slide', }) + const isTransparent = presentationStyle === 'pageSheet' ? false : true + return ( Date: Tue, 29 Aug 2023 18:02:08 +0200 Subject: [PATCH 3/4] Added Platform.Select to different devices and web --- src/Date/DatePickerModal.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Date/DatePickerModal.tsx b/src/Date/DatePickerModal.tsx index c526ee60..255082ac 100644 --- a/src/Date/DatePickerModal.tsx +++ b/src/Date/DatePickerModal.tsx @@ -14,6 +14,7 @@ import DatePickerModalContent, { DatePickerModalContentRangeProps, DatePickerModalContentSingleProps, } from './DatePickerModalContent' +import { useSafeAreaInsets } from 'react-native-safe-area-context' interface DatePickerModalProps { visible: boolean @@ -65,6 +66,7 @@ export function DatePickerModal( }) const isTransparent = presentationStyle === 'pageSheet' ? false : true + const insets = useSafeAreaInsets() return ( @@ -103,7 +105,11 @@ export function DatePickerModal( Date: Tue, 29 Aug 2023 18:08:55 +0200 Subject: [PATCH 4/4] Added Platform.Select to different devices and web COLORS --- src/Date/DatePickerModal.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Date/DatePickerModal.tsx b/src/Date/DatePickerModal.tsx index 255082ac..4304b03d 100644 --- a/src/Date/DatePickerModal.tsx +++ b/src/Date/DatePickerModal.tsx @@ -15,6 +15,7 @@ import DatePickerModalContent, { DatePickerModalContentSingleProps, } from './DatePickerModalContent' import { useSafeAreaInsets } from 'react-native-safe-area-context' +import { useHeaderBackgroundColor } from '../utils' interface DatePickerModalProps { visible: boolean @@ -66,6 +67,7 @@ export function DatePickerModal( }) const isTransparent = presentationStyle === 'pageSheet' ? false : true + const headerBackgroundColor = useHeaderBackgroundColor() const insets = useSafeAreaInsets() return ( @@ -110,7 +112,11 @@ export function DatePickerModal( android: StatusBar.currentHeight, web: insets.top, }), - backgroundColor: theme.colors.primary, + backgroundColor: Platform.select({ + ios: theme.colors.primary, + android: theme.colors.primary, + web: headerBackgroundColor, + }), }, ]} />