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

Added a clear/reset button in InternalDateInput to reset/unschedule events #3154

Merged
merged 11 commits into from
Dec 29, 2023
Merged

Added a clear/reset button in InternalDateInput to reset/unschedule events #3154

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7429d20
Added a clear/reset button in InternalDateInput to reset/unschedule e…
atharvParlikar Dec 25, 2023
cf5692f
Merge branch 'twentyhq:main' into main
atharvParlikar Dec 28, 2023
04351ed
Added clearable prop to <InternalDateInput /> and fixed some design m…
atharvParlikar Dec 28, 2023
b4c95c0
Merge branch 'twentyhq:main' into main
atharvParlikar Dec 28, 2023
b89bbb5
Removed unnecessary code that was used during debugging
atharvParlikar Dec 28, 2023
f950dab
Replaced button with <MenuItem /> component
atharvParlikar Dec 28, 2023
e2d9b8b
Merge branch 'twentyhq:main' into main
atharvParlikar Dec 29, 2023
8a3f7b6
Fixed null date in ObjectFilterDropdownDateSearchInput
lucasbordeau Dec 29, 2023
cfa544a
Merge branch 'twentyhq:main' into main
atharvParlikar Dec 29, 2023
1393107
Moved clear context call from DateInput to DateFieldInput
atharvParlikar Dec 29, 2023
12f8000
Removed useless props
lucasbordeau Dec 29, 2023
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
Prev Previous commit
Next Next commit
Moved clear context call from DateInput to DateFieldInput
  • Loading branch information
@atharvParlikar
atharvParlikar committed Dec 29, 2023
commit 13931070a986e328d31a1409bbb76e7b3c7ca3b3
4 changes: 3 additions & 1 deletion ...enty-front/src/modules/object-record/field/meta-types/input/components/DateFieldInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@ export type DateFieldInputProps = {
onEscape?: FieldInputEvent;
onTab?: FieldInputEvent;
onShiftTab?: FieldInputEvent;
clearable?: boolean;
};

export const DateFieldInput = ({
onEnter,
onEscape,
onClickOutside,
}: DateFieldInputProps) => {
const { fieldValue, hotkeyScope } = useDateTimeField();
const { fieldValue, hotkeyScope, clearable } = useDateTimeField();

const persistField = usePersistField();

Expand Down Expand Up @@ -57,6 +58,7 @@ export const DateFieldInput = ({
onEnter={handleEnter}
onEscape={handleEscape}
value={dateValue}
clearable={clearable}
/>
);
};
5 changes: 2 additions & 3 deletions packages/twenty-front/src/modules/ui/field/input/components/DateInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { useTheme } from '@emotion/react';
import styled from '@emotion/styled';
import { flip, offset, useFloating } from '@floating-ui/react';

import { useDateTimeField } from '@/object-record/field/meta-types/hooks/useDateTimeField';
import { DateDisplay } from '@/ui/field/display/components/DateDisplay';
import { InternalDatePicker } from '@/ui/input/components/internal/date/components/InternalDatePicker';
import { Nullable } from '~/types/Nullable';
Expand Down Expand Up @@ -38,6 +37,7 @@ export type DateInputProps = {
newDate: Nullable<Date>,
) => void;
hotkeyScope: string;
clearable?: boolean;
};

export const DateInput = ({
Expand All @@ -46,6 +46,7 @@ export const DateInput = ({
onEnter,
onEscape,
onClickOutside,
clearable,
}: DateInputProps) => {
const theme = useTheme();

Expand Down Expand Up @@ -80,8 +81,6 @@ export const DateInput = ({
hotkeyScope,
});

const { clearable } = useDateTimeField();

return (
<div ref={wrapperRef}>
<div ref={refs.setReference}>
Expand Down