Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix edit-input-field to respect disabling format in label and placeholder #433

Merged
merged 2 commits into from
Nov 11, 2024
Merged

Fix edit-input-field to respect disabling format in label and placeholder #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef8a089
Respect disabling the format in label
renefitzke1 Nov 5, 2024
241ed16
Pass placeholder through to edit input-field
renefitzke1 Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/Date/CalendarEdit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ function CalendarEdit({
validRange,
locale,
inputEnabled,
withDateFormatInLabel,
placeholder,
}: {
mode: ModeType
label?: string
Expand All @@ -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)
Expand Down Expand Up @@ -93,6 +97,8 @@ function CalendarEdit({
withModal={false}
autoComplete={'off'}
inputEnabled={inputEnabled}
withDateFormatInLabel={withDateFormatInLabel}
placeholder={placeholder}
/>
) : null}
{mode === 'range' ? (
Expand All @@ -110,6 +116,8 @@ function CalendarEdit({
withModal={false}
autoComplete={'off'}
inputEnabled={inputEnabled}
withDateFormatInLabel={withDateFormatInLabel}
placeholder={placeholder}
/>
<View style={styles.separator} />
<DatePickerInputWithoutModal
Expand All @@ -124,6 +132,8 @@ function CalendarEdit({
withModal={false}
autoComplete="off"
inputEnabled={inputEnabled}
withDateFormatInLabel={withDateFormatInLabel}
placeholder={placeholder}
/>
</View>
) : null}
Expand Down
2 changes: 2 additions & 0 deletions src/Date/DatePickerInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ function DatePickerInput(
presentationStyle={presentationStyle}
label={rest.label as any}
startWeekOnMonday={startWeekOnMonday}
withDateFormatInLabel={rest.withDateFormatInLabel}
placeholder={rest.placeholder}
/>
) : null
}
Expand Down
2 changes: 2 additions & 0 deletions src/Date/DatePickerModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ export function DatePickerModal(
disableSafeTop={disableStatusBarPadding}
disableStatusBar={disableStatusBar}
statusBarOnTopOfBackdrop={isPageSheet || statusBarOnTopOfBackdrop}
withDateFormatInLabel={props.withDateFormatInLabel}
placeholder={props.placeholder}
/>
</View>
</View>
Expand Down
2 changes: 2 additions & 0 deletions src/Date/DatePickerModalContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,8 @@ export function DatePickerModalContent(
validRange={validRange}
locale={locale}
inputEnabled={props.inputEnabled}
withDateFormatInLabel={props.withDateFormatInLabel}
placeholder={props.placeholder}
/>
}
/>
Expand Down
2 changes: 2 additions & 0 deletions src/Date/DatePickerModalContentHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ export interface HeaderPickProps {
moreLabel?: string
label?: string
emptyLabel?: string
withDateFormatInLabel?: boolean
placeholder?: string
saveLabel?: string
uppercase?: boolean
headerSeparator?: string
Expand Down
Loading