Merge pull request #433 from renefitzke1/master

Fix edit-input-field to respect disabling format in label and placeholder
web-ridge · Nov 11, 2024 · 50137ef · 50137ef
2 parents 8573989 + 241ed16
commit 50137ef
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 0 deletions.
diff --git a/src/Date/CalendarEdit.tsx b/src/Date/CalendarEdit.tsx
@@ -24,6 +24,8 @@ function CalendarEdit({
   validRange,
   locale,
   inputEnabled,
+  withDateFormatInLabel,
+  placeholder,
 }: {
   mode: ModeType
   label?: string
@@ -35,6 +37,8 @@ function CalendarEdit({
   validRange: ValidRangeType | undefined
   locale: string
   inputEnabled?: boolean
+  withDateFormatInLabel?: boolean
+  placeholder?: string
 }) {
   const dateInput = useRef<TextInputNative | null>(null)
   const startInput = useRef<TextInputNative | null>(null)
@@ -93,6 +97,8 @@ function CalendarEdit({
           withModal={false}
           autoComplete={'off'}
           inputEnabled={inputEnabled}
+          withDateFormatInLabel={withDateFormatInLabel}
+          placeholder={placeholder}
         />
       ) : null}
       {mode === 'range' ? (
@@ -110,6 +116,8 @@ function CalendarEdit({
             withModal={false}
             autoComplete={'off'}
             inputEnabled={inputEnabled}
+            withDateFormatInLabel={withDateFormatInLabel}
+            placeholder={placeholder}
           />
           <View style={styles.separator} />
           <DatePickerInputWithoutModal
@@ -124,6 +132,8 @@ function CalendarEdit({
             withModal={false}
             autoComplete="off"
             inputEnabled={inputEnabled}
+            withDateFormatInLabel={withDateFormatInLabel}
+            placeholder={placeholder}
           />
         </View>
       ) : null}

diff --git a/src/Date/DatePickerInput.tsx b/src/Date/DatePickerInput.tsx
@@ -87,6 +87,8 @@ function DatePickerInput(
             presentationStyle={presentationStyle}
             label={rest.label as any}
             startWeekOnMonday={startWeekOnMonday}
+            withDateFormatInLabel={rest.withDateFormatInLabel}
+            placeholder={rest.placeholder}
           />
         ) : null
       }

diff --git a/src/Date/DatePickerModal.tsx b/src/Date/DatePickerModal.tsx
@@ -101,6 +101,8 @@ export function DatePickerModal(
               disableSafeTop={disableStatusBarPadding}
               disableStatusBar={disableStatusBar}
               statusBarOnTopOfBackdrop={isPageSheet || statusBarOnTopOfBackdrop}
+              withDateFormatInLabel={props.withDateFormatInLabel}
+              placeholder={props.placeholder}
             />
           </View>
         </View>

diff --git a/src/Date/DatePickerModalContent.tsx b/src/Date/DatePickerModalContent.tsx
@@ -212,6 +212,8 @@ export function DatePickerModalContent(
             validRange={validRange}
             locale={locale}
             inputEnabled={props.inputEnabled}
+            withDateFormatInLabel={props.withDateFormatInLabel}
+            placeholder={props.placeholder}
           />
         }
       />

diff --git a/src/Date/DatePickerModalContentHeader.tsx b/src/Date/DatePickerModalContentHeader.tsx
@@ -12,6 +12,8 @@ export interface HeaderPickProps {
   moreLabel?: string
   label?: string
   emptyLabel?: string
+  withDateFormatInLabel?: boolean
+  placeholder?: string
   saveLabel?: string
   uppercase?: boolean
   headerSeparator?: string