Skip to content

fix: A few small cleanups for DateTimeInput #2062

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

Merged
mofojed merged 2 commits into from
Jun 10, 2024
Merged

fix: A few small cleanups for DateTimeInput #2062

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1ac7fb
fix: A few small cleanups for DateTimeInput
mofojed Jun 6, 2024
f0cdfd7
Update packages/components/src/DateTimeInput.tsx
mofojed Jun 7, 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
115 changes: 58 additions & 57 deletions packages/components/src/DateTimeInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ const DATE_VALUE_STRING = '2022-01-01';
const DEFAULT_VALUE_STRING = `${DATE_VALUE_STRING} 00:00:00.000000000`;
const FULL_DATE_FORMAT = 'YYYY-MM-DD HH:MM:SS.SSSSSSSSS';

type DateTimeInputProps = {
export type DateTimeInputProps = {
className?: string;
onChange?: (value?: string) => void;
onChange?: (value: string) => void;
defaultValue?: string;
onFocus?: () => void;
onBlur?: () => void;
Expand All @@ -43,64 +43,65 @@ function removeSeparators(value: string): string {

const EXAMPLES = [addSeparators(DEFAULT_VALUE_STRING)];

const DateTimeInput = React.forwardRef<HTMLInputElement, DateTimeInputProps>(
(props: DateTimeInputProps, ref) => {
const {
className = '',
onChange = () => undefined,
defaultValue = '',
onFocus = () => undefined,
onBlur = () => undefined,
onSubmit,
'data-testid': dataTestId,
} = props;
const [value, setValue] = useState(
defaultValue.length > 0 ? addSeparators(defaultValue) : ''
);
const [selection, setSelection] = useState<SelectionSegment>();
export const DateTimeInput = React.forwardRef<
HTMLInputElement,
DateTimeInputProps
>((props: DateTimeInputProps, ref) => {
Comment thread
mofojed marked this conversation as resolved.
Outdated
const {
className = '',
onChange = () => undefined,
defaultValue = '',
onFocus = () => undefined,
onBlur = () => undefined,
onSubmit,
'data-testid': dataTestId,
} = props;
const [value, setValue] = useState(
defaultValue.length > 0 ? addSeparators(defaultValue) : ''
);
const [selection, setSelection] = useState<SelectionSegment>();

const handleChange = useCallback(
(newValue: string): void => {
log.debug('handleChange', newValue);
setValue(newValue);
onChange(fixIncompleteValue(removeSeparators(newValue)));
},
[onChange]
);
const handleChange = useCallback(
(newValue: string): void => {
log.debug('handleChange', newValue);
setValue(newValue);
onChange(fixIncompleteValue(removeSeparators(newValue)));
},
[onChange]
);

const handleBlur = useCallback((): void => {
const prevValue = removeSeparators(value);
const fixedValue = fixIncompleteValue(prevValue);
// Update the value displayed in the input
// onChange with the fixed value already triggered in handleChange
if (fixedValue !== prevValue) {
setValue(addSeparators(fixedValue));
}
onBlur();
}, [value, onBlur]);
const handleBlur = useCallback((): void => {
const prevValue = removeSeparators(value);
const fixedValue = fixIncompleteValue(prevValue);
// Update the value displayed in the input
// onChange with the fixed value already triggered in handleChange
if (fixedValue !== prevValue) {
setValue(addSeparators(fixedValue));
}
onBlur();
}, [value, onBlur]);

return (
<div className="d-flex flex-row align-items-center">
<MaskedInput
ref={ref}
className={classNames(className)}
example={EXAMPLES}
getNextSegmentValue={getNextSegmentValue}
onChange={handleChange}
onSelect={setSelection}
onSubmit={onSubmit}
pattern={FULL_DATE_PATTERN}
placeholder={FULL_DATE_FORMAT}
selection={selection}
value={value}
onFocus={onFocus}
onBlur={handleBlur}
data-testid={dataTestId}
/>
</div>
);
}
);
return (
<div className="d-flex flex-row align-items-center">
<MaskedInput
ref={ref}
className={classNames(className)}
example={EXAMPLES}
getNextSegmentValue={getNextSegmentValue}
onChange={handleChange}
onSelect={setSelection}
onSubmit={onSubmit}
pattern={FULL_DATE_PATTERN}
placeholder={FULL_DATE_FORMAT}
selection={selection}
value={value}
onFocus={onFocus}
onBlur={handleBlur}
data-testid={dataTestId}
/>
</div>
);
});

DateTimeInput.displayName = 'DateTimeInput';

Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export { default as Checkbox } from './Checkbox';
export { default as ComboBox } from './ComboBox';
export { default as CopyButton } from './CopyButton';
export { default as CustomTimeSelect } from './CustomTimeSelect';
export { default as DateTimeInput } from './DateTimeInput';
export * from './DateTimeInput';
export { default as DateInput } from './DateInput';
export { default as DebouncedSearchInput } from './DebouncedSearchInput';
export * from './dialogs';
Expand Down
⚡