diff --git a/docs/data/joy/components/chip/DeleteButtonChip.js b/docs/data/joy/components/chip/DeleteButtonChip.js index e4859c2e1dac41..4d8230a43fd020 100644 --- a/docs/data/joy/components/chip/DeleteButtonChip.js +++ b/docs/data/joy/components/chip/DeleteButtonChip.js @@ -6,14 +6,18 @@ import * as React from 'react'; export default function DeleteButtonChip() { return ( - }> - Remove - } + endDecorator={} > + Remove + + }> + Delete + + }> Delete diff --git a/docs/data/joy/components/chip/DeleteButtonChip.tsx b/docs/data/joy/components/chip/DeleteButtonChip.tsx index e4859c2e1dac41..4d8230a43fd020 100644 --- a/docs/data/joy/components/chip/DeleteButtonChip.tsx +++ b/docs/data/joy/components/chip/DeleteButtonChip.tsx @@ -6,14 +6,18 @@ import * as React from 'react'; export default function DeleteButtonChip() { return ( - }> - Remove - } + endDecorator={} > + Remove + + }> + Delete + + }> Delete diff --git a/docs/data/joy/components/chip/DeleteButtonChip.tsx.preview b/docs/data/joy/components/chip/DeleteButtonChip.tsx.preview index d90c717a00932e..f422aedbec814a 100644 --- a/docs/data/joy/components/chip/DeleteButtonChip.tsx.preview +++ b/docs/data/joy/components/chip/DeleteButtonChip.tsx.preview @@ -1,10 +1,14 @@ -}> - Remove - } + endDecorator={} > + Remove + +}> + Delete + +}> Delete \ No newline at end of file diff --git a/docs/data/joy/components/divider/DividerChildPosition.js b/docs/data/joy/components/divider/DividerChildPosition.js index f984695bcee606..159525bc38cdb8 100644 --- a/docs/data/joy/components/divider/DividerChildPosition.js +++ b/docs/data/joy/components/divider/DividerChildPosition.js @@ -22,6 +22,7 @@ export default function DividerChildPosition() { max={100} step={1} valueLabelDisplay="on" + valueLabelFormat={(value) => `${value}%`} onChange={(event, value) => setPosition(value)} /> diff --git a/docs/data/joy/components/radio/ExampleTiers.js b/docs/data/joy/components/radio/ExampleTiers.js index 347bf2910df2ae..7796ec6322b3f9 100644 --- a/docs/data/joy/components/radio/ExampleTiers.js +++ b/docs/data/joy/components/radio/ExampleTiers.js @@ -20,7 +20,7 @@ export default function ExampleTiers() { name="tiers" sx={{ gap: 1, '& > div': { p: 1, flexDirection: 'row', gap: 2 } }} > - +
Small @@ -38,7 +38,7 @@ export default function ExampleTiers() {
- +
Large diff --git a/docs/data/joy/components/select/SelectDecorators.js b/docs/data/joy/components/select/SelectDecorators.js index 14bc12add8f252..ea9f053598d8ae 100644 --- a/docs/data/joy/components/select/SelectDecorators.js +++ b/docs/data/joy/components/select/SelectDecorators.js @@ -10,7 +10,7 @@ export default function SelectDecorators() { placeholder="Select a pet…" startDecorator={} endDecorator={ - + +5 } diff --git a/packages/mui-joy/src/Button/Button.tsx b/packages/mui-joy/src/Button/Button.tsx index 8d72ae83844aff..45103d8514dd57 100644 --- a/packages/mui-joy/src/Button/Button.tsx +++ b/packages/mui-joy/src/Button/Button.tsx @@ -90,6 +90,7 @@ export const ButtonRoot = styled('button', { paddingBlock: '0.375rem', paddingInline: '1.5rem', }), + WebkitTapHighlightColor: 'transparent', borderRadius: `var(--Button-radius, ${theme.vars.radius.sm})`, // to be controlled by other components, eg. Input margin: `var(--Button-margin)`, // to be controlled by other components, eg. Input border: 'none', diff --git a/packages/mui-joy/src/Button/ButtonProps.ts b/packages/mui-joy/src/Button/ButtonProps.ts index b1a5a2c25765be..76ec8a6186575e 100644 --- a/packages/mui-joy/src/Button/ButtonProps.ts +++ b/packages/mui-joy/src/Button/ButtonProps.ts @@ -104,7 +104,7 @@ export interface ButtonOwnerState extends ButtonProps { /** * If `true`, the button's focus is visible. */ - focusVisible: boolean; + focusVisible?: boolean; } export type ExtendButton = (( diff --git a/packages/mui-joy/src/Checkbox/CheckboxProps.ts b/packages/mui-joy/src/Checkbox/CheckboxProps.ts index cc59a12fd89ab9..b43a79a6fbccdd 100644 --- a/packages/mui-joy/src/Checkbox/CheckboxProps.ts +++ b/packages/mui-joy/src/Checkbox/CheckboxProps.ts @@ -112,5 +112,5 @@ export interface CheckboxOwnerState extends CheckboxProps { /** * If `true`, the checkbox's focus is visible. */ - focusVisible: boolean; + focusVisible?: boolean; } diff --git a/packages/mui-joy/src/Chip/Chip.tsx b/packages/mui-joy/src/Chip/Chip.tsx index 849ad117f00f8f..e41a634f20ca28 100644 --- a/packages/mui-joy/src/Chip/Chip.tsx +++ b/packages/mui-joy/src/Chip/Chip.tsx @@ -57,24 +57,24 @@ const ChipRoot = styled('div', { '--Chip-gap': '0.25rem', '--Chip-paddingInline': '0.5rem', '--Chip-decorator-childHeight': - 'calc(min(1.5rem, var(--Chip-minHeight)) - 2 * var(--variant-borderWidth))', - '--Icon-fontSize': '0.875rem', + 'calc(min(1.125rem, var(--Chip-minHeight)) - 2 * var(--variant-borderWidth))', + '--Icon-fontSize': 'calc(var(--Chip-minHeight, 1.5rem) / 1.714)', // 0.875rem by default '--Chip-minHeight': '1.5rem', fontSize: theme.vars.fontSize.xs, }), ...(ownerState.size === 'md' && { '--Chip-gap': '0.375rem', '--Chip-paddingInline': '0.75rem', - '--Chip-decorator-childHeight': 'min(1.5rem, var(--Chip-minHeight))', - '--Icon-fontSize': '1.125rem', + '--Chip-decorator-childHeight': 'min(1.375rem, var(--Chip-minHeight))', + '--Icon-fontSize': 'calc(var(--Chip-minHeight, 2rem) / 1.778)', // 1.125rem by default '--Chip-minHeight': '2rem', fontSize: theme.vars.fontSize.sm, }), ...(ownerState.size === 'lg' && { '--Chip-gap': '0.5rem', '--Chip-paddingInline': '1rem', - '--Chip-decorator-childHeight': 'min(2rem, var(--Chip-minHeight))', - '--Icon-fontSize': '1.25rem', + '--Chip-decorator-childHeight': 'min(1.75rem, var(--Chip-minHeight))', + '--Icon-fontSize': 'calc(var(--Chip-minHeight, 2.5rem) / 2)', // 1.25rem by default '--Chip-minHeight': '2.5rem', fontSize: theme.vars.fontSize.md, }), diff --git a/packages/mui-joy/src/Chip/ChipProps.ts b/packages/mui-joy/src/Chip/ChipProps.ts index b021e0028e406d..9ef5020cf985e1 100644 --- a/packages/mui-joy/src/Chip/ChipProps.ts +++ b/packages/mui-joy/src/Chip/ChipProps.ts @@ -86,5 +86,5 @@ export interface ChipOwnerState extends ChipProps { /** * If `true`, the action slot's focus is visible. */ - focusVisible: boolean; + focusVisible?: boolean; } diff --git a/packages/mui-joy/src/ChipDelete/ChipDelete.tsx b/packages/mui-joy/src/ChipDelete/ChipDelete.tsx index d4a708b8b323d4..ae77b64ae334c7 100644 --- a/packages/mui-joy/src/ChipDelete/ChipDelete.tsx +++ b/packages/mui-joy/src/ChipDelete/ChipDelete.tsx @@ -6,7 +6,7 @@ import { unstable_composeClasses as composeClasses, useButton } from '@mui/base' import { useSlotProps } from '@mui/base/utils'; import { useThemeProps } from '../styles'; import styled from '../styles/styled'; -import Close from '../internal/svg-icons/Close'; +import Cancel from '../internal/svg-icons/Cancel'; import chipDeleteClasses, { getChipDeleteUtilityClass } from './chipDeleteClasses'; import { ChipDeleteProps, ChipDeleteOwnerState, ChipDeleteTypeMap } from './ChipDeleteProps'; import ChipContext from '../Chip/ChipContext'; @@ -113,7 +113,7 @@ const ChipDelete = React.forwardRef(function ChipDelete(inProps, ref) { className: classes.root, }); - return {children ?? }; + return {children ?? }; }) as OverridableComponent; ChipDelete.propTypes /* remove-proptypes */ = { diff --git a/packages/mui-joy/src/ChipDelete/ChipDeleteProps.ts b/packages/mui-joy/src/ChipDelete/ChipDeleteProps.ts index d9c7f0c6c9d9f1..efdb0a9d84b34f 100644 --- a/packages/mui-joy/src/ChipDelete/ChipDeleteProps.ts +++ b/packages/mui-joy/src/ChipDelete/ChipDeleteProps.ts @@ -45,5 +45,5 @@ export interface ChipDeleteOwnerState extends ChipDeleteProps { /** * If `true`, the element's focus is visible. */ - focusVisible: boolean; + focusVisible?: boolean; } diff --git a/packages/mui-joy/src/FormControl/FormControl.test.tsx b/packages/mui-joy/src/FormControl/FormControl.test.tsx index 86b743fe277fdd..f01f1e41aabf5f 100644 --- a/packages/mui-joy/src/FormControl/FormControl.test.tsx +++ b/packages/mui-joy/src/FormControl/FormControl.test.tsx @@ -152,6 +152,18 @@ describe('', () => { expect(getByLabelText('label')).toBeVisible(); }); + it('should labeledby form label', () => { + const { container, getByRole } = render( + + label +