Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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/rare-spies-obey.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@cube-dev/ui-kit": patch
---

Unify the focused state in Menu component.
5 changes: 5 additions & 0 deletions .changeset/short-bottles-fold.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@cube-dev/ui-kit": patch
---

Fix errorMessage type.
2 changes: 1 addition & 1 deletion src/components/fields/Checkbox/CheckboxGroup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const CheckGroupElement = tasty({

export interface CubeCheckboxGroupProps
extends BaseProps,
AriaCheckboxGroupProps,
Omit<AriaCheckboxGroupProps, 'errorMessage'>,
FieldBaseProps,
ContainerStyleProps {
orientation?: 'vertical' | 'horizontal';
Expand Down
3 changes: 1 addition & 2 deletions src/components/fields/ComboBox/ComboBox.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { Meta, StoryFn } from '@storybook/react';
import { userEvent, within } from '@storybook/test';
import { IconCoin } from '@tabler/icons-react';

import { SELECTED_KEY_ARG } from '../../../stories/FormFieldArgs';
import { baseProps } from '../../../stories/lists/baseProps';
import { wait } from '../../../test/utils/wait';
import { Button } from '../../actions/index';
Expand All @@ -12,7 +11,7 @@ import { Flow } from '../../layout/Flow';
import { ComboBox, CubeComboBoxProps } from './ComboBox';

export default {
title: 'Pickers/ComboBox',
title: 'Forms/ComboBox',
component: ComboBox,
subcomponents: { Item: ComboBox.Item, Section: ComboBox.Section },
args: { id: 'name', width: '200px', label: 'Choose your favourite color' },
Expand Down
6 changes: 4 additions & 2 deletions src/components/fields/ComboBox/ComboBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { Section as BaseSection, Item, useComboBoxState } from 'react-stately';
import { useEvent } from '../../../_internal/index';
import { DownIcon, LoadingIcon } from '../../../icons';
import { useProviderProps } from '../../../provider';
import { FieldBaseProps } from '../../../shared';
import {
BASE_STYLES,
COLOR_STYLES,
Expand Down Expand Up @@ -96,8 +97,9 @@ export interface CubeComboBoxProps<T>
CubeSelectBaseProps<T>,
'onOpenChange' | 'onBlur' | 'onFocus' | 'validate' | 'onSelectionChange'
>,
AriaComboBoxProps<T>,
AriaTextFieldProps {
Omit<AriaComboBoxProps<T>, 'errorMessage'>,
Omit<AriaTextFieldProps, 'errorMessage'>,
FieldBaseProps {
defaultSelectedKey?: string | null;
selectedKey?: string | null;
onSelectionChange?: (selectedKey: string | null) => void;
Expand Down
2 changes: 1 addition & 1 deletion src/components/fields/DatePicker/DateInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { DEFAULT_DATE_PROPS } from './props';
import { formatSegments, useFocusManagerRef } from './utils';

export interface CubeDateInputProps<T extends DateValue = DateValue>
extends AriaDateFieldProps<T>,
extends Omit<AriaDateFieldProps<T>, 'errorMessage'>,
BaseProps,
ContainerStyleProps,
FieldBaseProps {
Expand Down
2 changes: 1 addition & 1 deletion src/components/fields/DatePicker/DatePicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import { DateFieldBase } from './types';
import { useFocusManagerRef } from './utils';

export interface CubeDatePickerProps<T extends DateValue = DateValue>
extends AriaDatePickerProps<T>,
extends Omit<AriaDatePickerProps<T>, 'errorMessage'>,
DateFieldBase<T>,
BaseProps,
ContainerStyleProps,
Expand Down
2 changes: 1 addition & 1 deletion src/components/fields/DatePicker/DatePickerInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const DateInputElement = tasty({
});

interface CubeDatePickerInputProps<T extends DateValue>
extends AriaDatePickerProps<T>,
extends Omit<AriaDatePickerProps<T>, 'errorMessage'>,
DateFieldBase<T> {
hideValidationIcon?: boolean;
maxGranularity?: Granularity;
Expand Down
2 changes: 1 addition & 1 deletion src/components/fields/DatePicker/DateRangePicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const DateRangeDash = tasty({
});

export interface CubeDateRangePickerProps<T extends DateValue = DateValue>
extends AriaDateRangePickerProps<T>,
extends Omit<AriaDateRangePickerProps<T>, 'errorMessage'>,
BaseProps,
DateFieldBase<T>,
ContainerStyleProps,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const DateRangeDash = tasty({

export interface CubeDateRangeSeparatedPickerProps<
T extends DateValue = DateValue,
> extends AriaDateRangePickerProps<T>,
> extends Omit<AriaDateRangePickerProps<T>, 'errorMessage'>,
BaseProps,
ContainerStyleProps,
DateFieldBase<T>,
Expand Down
2 changes: 1 addition & 1 deletion src/components/fields/DatePicker/TimeInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { Granularity } from './types';
import { useFocusManagerRef } from './utils';

export interface CubeTimeInputProps<T extends TimeValue = TimeValue>
extends AriaTimeFieldProps<T>,
extends Omit<AriaTimeFieldProps<T>, 'errorMessage'>,
BaseProps,
ContainerStyleProps,
FieldBaseProps {
Expand Down
Loading
Loading