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

Fixing datepicker ref #4005

Merged
merged 2 commits into from
Jul 12, 2024
Merged

Fixing datepicker ref #4005

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
3f726d5
Fixing datepicker
OsamaAbdellateef Jul 12, 2024
f3ee1a0
fixing lint
OsamaAbdellateef Jul 12, 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
5 changes: 5 additions & 0 deletions .changeset/new-glasses-stare.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@marigold/components': patch
---

Add ref to datepicker
118 changes: 65 additions & 53 deletions packages/components/src/DatePicker/DatePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import React from 'react';
import { DatePicker, type DateValue } from 'react-aria-components';
import type RAC from 'react-aria-components';

Expand Down Expand Up @@ -60,61 +61,72 @@ export interface DatePickerProps
width?: WidthProp['width'];
}

const _DatePicker = ({
disabled,
required,
readOnly,
error,
variant,
size,
open,
granularity = 'day',
...rest
}: DatePickerProps) => {
const props: RAC.DatePickerProps<DateValue> = {
isDisabled: disabled,
isReadOnly: readOnly,
isRequired: required,
isInvalid: error,
isOpen: open,
granularity,
...rest,
};
const _DatePicker = React.forwardRef<HTMLDivElement, DatePickerProps>(
(
{
disabled,
required,
readOnly,
error,
variant,
size,
open,
granularity = 'day',
...rest
},
ref
) => {
const props: RAC.DatePickerProps<DateValue> = {
isDisabled: disabled,
isReadOnly: readOnly,
isRequired: required,
isInvalid: error,
isOpen: open,
granularity,
...rest,
};

const classNames = useClassNames({
component: 'DatePicker',
size,
variant,
});
const classNames = useClassNames({
component: 'DatePicker',
size,
variant,
});

return (
<FieldBase as={DatePicker} variant={variant} size={size} {...props}>
<DateInput
action={
<div className={classNames.container}>
<Button
size="small"
disabled={disabled}
className={classNames.button}
>
<svg
data-testid="action"
viewBox="0 0 24 24"
width={24}
height={24}
fill="currentColor"
return (
<FieldBase
as={DatePicker}
variant={variant}
size={size}
{...props}
ref={ref}
>
<DateInput
action={
<div className={classNames.container}>
<Button
size="small"
disabled={disabled}
className={classNames.button}
>
<path d="M20.0906 19.2V6.6C20.0906 5.61 19.2806 4.8 18.2906 4.8H17.3906V3H15.5906V4.8H8.39062V3H6.59062V4.8H5.69063C4.69163 4.8 3.89962 5.61 3.89962 6.6L3.89062 19.2C3.89062 20.19 4.69163 21 5.69063 21H18.2906C19.2806 21 20.0906 20.19 20.0906 19.2ZM9.29062 11.1001H7.49061V12.9001H9.29062V11.1001ZM5.69062 8.40009H18.2906V6.60008H5.69062V8.40009ZM18.2906 10.2V19.2H5.69062V10.2H18.2906ZM14.6906 12.9001H16.4906V11.1001H14.6906V12.9001ZM12.8906 12.9001H11.0906V11.1001H12.8906V12.9001Z"></path>
</svg>
</Button>
</div>
}
/>
<Popover>
<Calendar disabled={disabled} />
</Popover>
</FieldBase>
);
};
<svg
data-testid="action"
viewBox="0 0 24 24"
width={24}
height={24}
fill="currentColor"
>
<path d="M20.0906 19.2V6.6C20.0906 5.61 19.2806 4.8 18.2906 4.8H17.3906V3H15.5906V4.8H8.39062V3H6.59062V4.8H5.69063C4.69163 4.8 3.89962 5.61 3.89962 6.6L3.89062 19.2C3.89062 20.19 4.69163 21 5.69063 21H18.2906C19.2806 21 20.0906 20.19 20.0906 19.2ZM9.29062 11.1001H7.49061V12.9001H9.29062V11.1001ZM5.69062 8.40009H18.2906V6.60008H5.69062V8.40009ZM18.2906 10.2V19.2H5.69062V10.2H18.2906ZM14.6906 12.9001H16.4906V11.1001H14.6906V12.9001ZM12.8906 12.9001H11.0906V11.1001H12.8906V12.9001Z"></path>
</svg>
</Button>
</div>
}
/>
<Popover>
<Calendar disabled={disabled} />
</Popover>
</FieldBase>
);
}
);

export { _DatePicker as DatePicker };
Loading