From 8122aeaa8d1bcc8c59086c661d1fdc8a2d14fc58 Mon Sep 17 00:00:00 2001 From: Giap Tran Date: Tue, 13 Sep 2022 17:51:15 +0700 Subject: [PATCH 1/2] feat: add custom scroll and allow editing button --- src/Date/DatePickerModalContent.tsx | 1 + src/Date/DatePickerModalContentHeader.tsx | 6 ++++-- src/Date/YearPicker.tsx | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Date/DatePickerModalContent.tsx b/src/Date/DatePickerModalContent.tsx index 95d7fda3..e2fe80cb 100644 --- a/src/Date/DatePickerModalContent.tsx +++ b/src/Date/DatePickerModalContent.tsx @@ -165,6 +165,7 @@ export function DatePickerModalContent( locale={locale} editIcon={props.editIcon} calendarIcon={props.calendarIcon} + allowEditing={props.allowEditing || true} /> diff --git a/src/Date/DatePickerModalContentHeader.tsx b/src/Date/DatePickerModalContentHeader.tsx index e8e36cbc..ba4e0c07 100644 --- a/src/Date/DatePickerModalContentHeader.tsx +++ b/src/Date/DatePickerModalContentHeader.tsx @@ -19,6 +19,7 @@ export interface HeaderPickProps { editIcon?: string calendarIcon?: string closeIcon?: string + allowEditing?: boolean } export interface HeaderContentProps extends HeaderPickProps { @@ -60,12 +61,13 @@ export default function DatePickerModalContentHeader( uppercase, editIcon = 'pencil', calendarIcon = 'calendar', + allowEditing, } = props const label = getLabel(props.locale, props.mode, props.label) const color = useHeaderTextColor() - const allowEditing = mode !== 'multiple' + const isAllowEditing = allowEditing && mode !== 'multiple' return ( @@ -89,7 +91,7 @@ export default function DatePickerModalContentHeader( - {allowEditing ? ( + {isAllowEditing ? ( { + return + }} renderItem={({ item }) => ( Date: Fri, 3 Mar 2023 09:20:59 +0700 Subject: [PATCH 2/2] Update YearPicker.tsx merge resolve duplicated import --- src/Date/YearPicker.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Date/YearPicker.tsx b/src/Date/YearPicker.tsx index 657007b1..31785577 100644 --- a/src/Date/YearPicker.tsx +++ b/src/Date/YearPicker.tsx @@ -1,6 +1,5 @@ import * as React from 'react' import { FlatList, StyleSheet, View, ScrollView } from 'react-native' -import { Text, TouchableRipple, useTheme } from 'react-native-paper' import { MD2Theme, Text, TouchableRipple, useTheme } from 'react-native-paper' import { range } from '../utils'