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: unset should unset readOnly date field from custom input component #8192

Merged
merged 4 commits into from
Jan 7, 2025
Merged

fix: unset should unset readOnly date field from custom input component #8192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d72b52
fix: unset should unset readOnly date field
EoinFalconer Jan 5, 2025
f32c71b
fix: make read only
EoinFalconer Jan 6, 2025
e11a664
Merge branch 'next' into fix/SAPP-1931
EoinFalconer Jan 6, 2025
94c768d
fix: resolve react issue
EoinFalconer Jan 6, 2025
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
5 changes: 1 addition & 4 deletions packages/sanity/src/core/form/inputs/DateInputs/CommonDateTimeInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* eslint-disable no-nested-ternary */

import {TextInput} from '@sanity/ui'
import {
type FocusEvent,
type ForwardedRef,
Expand Down Expand Up @@ -105,9 +104,7 @@ export const CommonDateTimeInput = forwardRef(function CommonDateTimeInput(
? formatInputValue(parseResult.date)
: value

return readOnly ? (
<TextInput value={inputValue} readOnly />
) : (
return (
<DateTimeInput
{...restProps}
calendarLabels={props.calendarLabels}
Expand Down
6 changes: 4 additions & 2 deletions packages/sanity/src/ui-components/inputs/DateInputs/DateTimeInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export const DateTimeInput = forwardRef(function DateTimeInput(
selectTime,
timeStep,
calendarLabels,
readOnly,
constrainSize = true,
...rest
} = props
Expand Down Expand Up @@ -77,7 +78,7 @@ export const DateTimeInput = forwardRef(function DateTimeInput(

const handleClick = useCallback(() => setPickerOpen(true), [])

const suffix = (
const suffix = readOnly ? null : (
<Flex style={{padding: '5px'}}>
<Button
aria-label={calendarLabels.ariaLabel}
Expand All @@ -96,6 +97,7 @@ export const DateTimeInput = forwardRef(function DateTimeInput(
<LazyTextInput
ref={ref}
{...rest}
readOnly={readOnly}
value={inputValue}
onChange={onInputChange}
suffix={
Expand Down Expand Up @@ -126,7 +128,7 @@ export const DateTimeInput = forwardRef(function DateTimeInput(
placement="bottom"
ref={popoverRef}
>
{suffix}
<>{suffix}</>
</Popover>
</LayerProvider>
) : (
Expand Down
Loading