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

Jump to bottom

[Autocomplete][Joy] Fix types #35153

Merged
merged 2 commits into from Nov 15, 2022
Merged

[Autocomplete][Joy] Fix types #35153

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
7ff052d
fix types
siriwatknp Nov 15, 2022
dda60fa
fix types with spec
siriwatknp Nov 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 25 additions & 0 deletions packages/mui-joy/src/Autocomplete/Autocomplete.spec.tsx
View file
Open in desktop
Expand Up @@ -16,3 +16,28 @@ const top100Films = [{ title: 'The Shawshank Redemption', year: 1994 }];
multiple
sx={{ width: '500px' }}
/>;

<Autocomplete
options={top100Films}
componentsProps={{
clearIndicator: {
color: 'danger',
variant: 'outlined',
size: 'sm',
},
popupIndicator: (ownerState) => ({
color: ownerState.inputFocused ? 'danger' : 'neutral',
variant: 'outlined',
size: 'sm',
}),
listbox: {
color: 'danger',
variant: 'outlined',
size: 'sm',
},
option: {
color: 'danger',
variant: 'outlined',
},
}}
/>;
3 changes: 1 addition & 2 deletions packages/mui-joy/src/Autocomplete/Autocomplete.tsx
View file
Open in desktop
Expand Up @@ -378,7 +378,6 @@ const Autocomplete = React.forwardRef(function Autocomplete(
const hasClearIcon = !disableClearable && !disabled && dirty && !readOnly;
const hasPopupIcon = (!freeSolo || forcePopupIcon === true) && forcePopupIcon !== false;

// If you modify this, make sure to keep the `AutocompleteOwnerState` type in sync.
const ownerState = {
...props,
value,
Expand All @@ -391,7 +390,7 @@ const Autocomplete = React.forwardRef(function Autocomplete(
size,
color,
variant,
} as OwnerState;
};

const classes = useUtilityClasses(ownerState);

Expand Down
52 changes: 23 additions & 29 deletions packages/mui-joy/src/Autocomplete/AutocompleteProps.ts
View file
Open in desktop
Expand Up @@ -2,7 +2,6 @@ import * as React from 'react';
import { OverridableStringUnion } from '@mui/types';
import { SlotComponentProps } from '@mui/base/utils';
import {
useAutocomplete,
AutocompleteValue,
AutocompleteChangeDetails,
AutocompleteChangeReason,
Expand All @@ -12,9 +11,6 @@ import {
} from '@mui/base/AutocompleteUnstyled';
import { PopperUnstyledOwnProps } from '@mui/base/PopperUnstyled';
import { ColorPaletteProp, VariantProp, SxProps } from '../styles/types';
import { IconButtonOwnerState } from '../IconButton/IconButtonProps';
import { AutocompleteListboxProps } from '../AutocompleteListbox/AutocompleteListboxProps';
import { AutocompleteOptionProps } from '../AutocompleteOption/AutocompleteOptionProps';

export type AutocompleteSlot = keyof ComponentsProps;

Expand Down Expand Up @@ -51,18 +47,6 @@ export interface AutocompleteRenderGroupParams {
children?: React.ReactNode;
}

export interface AutocompleteRenderInputParams {
placeholder?: string;
disabled: boolean;
size: OverridableStringUnion<'sm' | 'md' | 'lg', AutocompletePropsSizeOverrides>;
ref: React.Ref<any>;
startDecorator: React.ReactNode;
endDecorator?: React.ReactNode;
componentsProps: {
input: ReturnType<ReturnType<typeof useAutocomplete>['getInputProps']>;
};
}

interface ComponentsProps {
root?: SlotComponentProps<
'div',
Expand Down Expand Up @@ -91,35 +75,45 @@ interface ComponentsProps {
>;
clearIndicator?: SlotComponentProps<
'button',
{ component?: React.ElementType; sx?: SxProps } & Pick<
IconButtonOwnerState,
'color' | 'variant' | 'size'
>,
AutocompleteOwnerState<any, any, any, any> & IconButtonOwnerState
{
component?: React.ElementType;
sx?: SxProps;
color?: OverridableStringUnion<ColorPaletteProp, AutocompletePropsColorOverrides>;
variant?: OverridableStringUnion<VariantProp, AutocompletePropsVariantOverrides>;
size?: OverridableStringUnion<'sm' | 'md' | 'lg', AutocompletePropsSizeOverrides>;
},
AutocompleteOwnerState<any, any, any, any>
>;
popupIndicator?: SlotComponentProps<
'button',
{ component?: React.ElementType; sx?: SxProps } & Pick<
IconButtonOwnerState,
'color' | 'variant' | 'size'
>,
AutocompleteOwnerState<any, any, any, any> & IconButtonOwnerState
{
component?: React.ElementType;
sx?: SxProps;
color?: OverridableStringUnion<ColorPaletteProp, AutocompletePropsColorOverrides>;
variant?: OverridableStringUnion<VariantProp, AutocompletePropsVariantOverrides>;
size?: OverridableStringUnion<'sm' | 'md' | 'lg', AutocompletePropsSizeOverrides>;
},
AutocompleteOwnerState<any, any, any, any>
>;
listbox?: SlotComponentProps<
'ul',
{
component?: React.ElementType;
sx?: SxProps;
} & Omit<PopperUnstyledOwnProps, 'components' | 'componentsProps' | 'open'> &
Pick<AutocompleteListboxProps, 'color' | 'variant' | 'size'>,
color?: OverridableStringUnion<ColorPaletteProp, AutocompletePropsColorOverrides>;
variant?: OverridableStringUnion<VariantProp, AutocompletePropsVariantOverrides>;
size?: OverridableStringUnion<'sm' | 'md' | 'lg', AutocompletePropsSizeOverrides>;
} & Omit<PopperUnstyledOwnProps, 'components' | 'componentsProps' | 'open'>,
AutocompleteOwnerState<any, any, any, any>
>;
option?: SlotComponentProps<
'li',
{
component?: React.ElementType;
sx?: SxProps;
} & Pick<AutocompleteOptionProps, 'color' | 'variant'>,
color?: OverridableStringUnion<ColorPaletteProp, AutocompletePropsColorOverrides>;
variant?: OverridableStringUnion<VariantProp, AutocompletePropsVariantOverrides>;
},
AutocompleteOwnerState<any, any, any, any>
>;
loading?: SlotComponentProps<
Expand Down