From 97951cc8d3808a86ea16036f9bd020205714aef1 Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Mon, 8 Jul 2024 17:36:05 +0200 Subject: [PATCH 01/16] Remove V1-related code --- .../src/custom-select-control/index.js | 240 ------- .../stories/index.story.tsx | 127 ---- .../src/custom-select-control/style.scss | 75 -- .../src/custom-select-control/test/index.js | 665 ------------------ packages/components/src/private-apis.ts | 4 - 5 files changed, 1111 deletions(-) delete mode 100644 packages/components/src/custom-select-control/index.js delete mode 100644 packages/components/src/custom-select-control/stories/index.story.tsx delete mode 100644 packages/components/src/custom-select-control/style.scss delete mode 100644 packages/components/src/custom-select-control/test/index.js diff --git a/packages/components/src/custom-select-control/index.js b/packages/components/src/custom-select-control/index.js deleted file mode 100644 index 58ca5a961a138..0000000000000 --- a/packages/components/src/custom-select-control/index.js +++ /dev/null @@ -1,240 +0,0 @@ -// @ts-nocheck -/** - * External dependencies - */ -import { useSelect } from 'downshift'; -import clsx from 'clsx'; - -/** - * WordPress dependencies - */ -import { Icon, check } from '@wordpress/icons'; -import { __, sprintf } from '@wordpress/i18n'; -import { useCallback } from '@wordpress/element'; - -/** - * Internal dependencies - */ -import { VisuallyHidden } from '../visually-hidden'; -import { Select as SelectControlSelect } from '../select-control/styles/select-control-styles'; -import SelectControlChevronDown from '../select-control/chevron-down'; -import { StyledLabel } from '../base-control/styles/base-control-styles'; -import { useDeprecated36pxDefaultSizeProp } from '../utils/use-deprecated-props'; -import InputBase from '../input-control/input-base'; - -const itemToString = ( item ) => item?.name; -// This is needed so that in Windows, where -// the menu does not necessarily open on -// key up/down, you can still switch between -// options with the menu closed. -const stateReducer = ( - { selectedItem }, - { type, changes, props: { items } } -) => { - switch ( type ) { - case useSelect.stateChangeTypes.ToggleButtonKeyDownArrowDown: - // If we already have a selected item, try to select the next one, - // without circular navigation. Otherwise, select the first item. - return { - selectedItem: - items[ - selectedItem - ? Math.min( - items.indexOf( selectedItem ) + 1, - items.length - 1 - ) - : 0 - ], - }; - case useSelect.stateChangeTypes.ToggleButtonKeyDownArrowUp: - // If we already have a selected item, try to select the previous one, - // without circular navigation. Otherwise, select the last item. - return { - selectedItem: - items[ - selectedItem - ? Math.max( items.indexOf( selectedItem ) - 1, 0 ) - : items.length - 1 - ], - }; - default: - return changes; - } -}; - -export default function CustomSelectControl( props ) { - const { - /** Start opting into the larger default height that will become the default size in a future version. */ - __next40pxDefaultSize = false, - className, - hideLabelFromVision, - label, - describedBy, - options: items, - onChange: onSelectedItemChange, - /** @type {import('../select-control/types').SelectControlProps.size} */ - size = 'default', - value: _selectedItem, - onMouseOver, - onMouseOut, - onFocus, - onBlur, - __experimentalShowSelectedHint = false, - } = useDeprecated36pxDefaultSizeProp( props ); - - const { - getLabelProps, - getToggleButtonProps, - getMenuProps, - getItemProps, - isOpen, - highlightedIndex, - selectedItem, - } = useSelect( { - initialSelectedItem: items[ 0 ], - items, - itemToString, - onSelectedItemChange, - ...( typeof _selectedItem !== 'undefined' && _selectedItem !== null - ? { selectedItem: _selectedItem } - : undefined ), - stateReducer, - } ); - - function getDescribedBy() { - if ( describedBy ) { - return describedBy; - } - - if ( ! selectedItem ) { - return __( 'No selection' ); - } - - // translators: %s: The selected option. - return sprintf( __( 'Currently selected: %s' ), selectedItem.name ); - } - - let menuProps = getMenuProps( { - className: 'components-custom-select-control__menu', - 'aria-hidden': ! isOpen, - } ); - - const onKeyDownHandler = useCallback( - ( e ) => { - e.stopPropagation(); - menuProps?.onKeyDown?.( e ); - }, - [ menuProps ] - ); - - // We need this here, because the null active descendant is not fully ARIA compliant. - if ( - menuProps[ 'aria-activedescendant' ]?.startsWith( 'downshift-null' ) - ) { - const { - 'aria-activedescendant': ariaActivedescendant, - ...restMenuProps - } = menuProps; - menuProps = restMenuProps; - } - return ( -
- { hideLabelFromVision ? ( - - { label } - - ) : ( - /* eslint-disable-next-line jsx-a11y/label-has-associated-control, jsx-a11y/label-has-for */ - - { label } - - ) } - } - > - - { itemToString( selectedItem ) } - { __experimentalShowSelectedHint && - selectedItem.__experimentalHint && ( - - { selectedItem.__experimentalHint } - - ) } - -
- { /* eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions */ } -
    - { isOpen && - items.map( ( item, index ) => ( -
  • - { item.name } - { item.__experimentalHint && ( - - { item.__experimentalHint } - - ) } - { item === selectedItem && ( - - ) } -
    • - ) ) } -
-
- -
- ); -} - -export function StableCustomSelectControl( props ) { - return ( - - ); -} diff --git a/packages/components/src/custom-select-control/stories/index.story.tsx b/packages/components/src/custom-select-control/stories/index.story.tsx deleted file mode 100644 index 8ff9a023c5821..0000000000000 --- a/packages/components/src/custom-select-control/stories/index.story.tsx +++ /dev/null @@ -1,127 +0,0 @@ -/** - * External dependencies - */ -import type { StoryFn } from '@storybook/react'; - -/** - * WordPress dependencies - */ -import { useState } from '@wordpress/element'; - -/** - * Internal dependencies - */ -import CustomSelectControl from '..'; - -export default { - title: 'Components/CustomSelectControl', - component: CustomSelectControl, - argTypes: { - __next40pxDefaultSize: { control: { type: 'boolean' } }, - __experimentalShowSelectedHint: { control: { type: 'boolean' } }, - size: { - options: [ 'small', 'default', '__unstable-large' ], - control: { - type: 'radio', - }, - }, - onChange: { control: { type: null } }, - value: { control: { type: null } }, - }, - parameters: { - actions: { argTypesRegex: '^on.*' }, - }, -}; - -const Template: StoryFn< typeof CustomSelectControl > = ( props ) => { - const [ value, setValue ] = useState( props.options[ 0 ] ); - - const onChange: React.ComponentProps< - typeof CustomSelectControl - >[ 'onChange' ] = ( changeObject: { selectedItem: any } ) => { - setValue( changeObject.selectedItem ); - props.onChange?.( changeObject ); - }; - - return ( - - ); -}; - -export const Default: StoryFn = Template.bind( {} ); -Default.args = { - label: 'Label', - options: [ - { - key: 'small', - name: 'Small', - style: { fontSize: '50%' }, - }, - { - key: 'normal', - name: 'Normal', - style: { fontSize: '100%' }, - className: 'can-apply-custom-class-to-option', - }, - { - key: 'large', - name: 'Large', - style: { fontSize: '200%' }, - }, - { - key: 'huge', - name: 'Huge', - style: { fontSize: '300%' }, - }, - ], -}; - -export const WithLongLabels: StoryFn = Template.bind( {} ); -WithLongLabels.args = { - ...Default.args, - options: [ - { - key: 'reallylonglabel1', - name: 'Really long labels are good for stress testing', - }, - { - key: 'reallylonglabel2', - name: 'But they can take a long time to type.', - }, - { - key: 'reallylonglabel3', - name: 'That really is ok though because you should stress test your UIs.', - }, - ], -}; - -export const WithHints: StoryFn = Template.bind( {} ); -WithHints.args = { - ...Default.args, - options: [ - { - key: 'thumbnail', - name: 'Thumbnail', - __experimentalHint: '150x150', - }, - { - key: 'medium', - name: 'Medium', - __experimentalHint: '250x250', - }, - { - key: 'large', - name: 'Large', - __experimentalHint: '1024x1024', - }, - { - key: 'full', - name: 'Full Size', - __experimentalHint: '1600x1600', - }, - ], -}; diff --git a/packages/components/src/custom-select-control/style.scss b/packages/components/src/custom-select-control/style.scss deleted file mode 100644 index 8fcfe8e5ce2f0..0000000000000 --- a/packages/components/src/custom-select-control/style.scss +++ /dev/null @@ -1,75 +0,0 @@ -.components-custom-select-control { - position: relative; - font-size: $default-font-size; -} - -.components-custom-select-control__button { - position: relative; - text-align: left; - outline: 0; // focus ring is handled elsewhere -} - -.components-custom-select-control__hint { - color: $gray-600; - margin-left: 10px; -} - -.components-custom-select-control__menu-wrapper { - position: absolute; - min-width: 100%; - bottom: 0; -} - -.components-custom-select-control__menu { - // Hide when collapsed. - &[aria-hidden="true"] { - display: none; - } - - // Block UI appearance. - border: $border-width solid $gray-900; - background-color: $white; - border-radius: $radius-block-ui; - outline: none; - transition: none; - - max-height: 400px; - min-width: 100%; - overflow: auto; - padding: 0; - position: absolute; - z-index: z-index(".components-popover"); -} - -.components-custom-select-control__item { - align-items: center; - display: grid; - grid-template-columns: auto auto; - list-style-type: none; - padding: $grid-unit-10 $grid-unit-20; - cursor: default; - line-height: $icon-size + $grid-unit-05; - - &:not(.is-next-40px-default-size) { - padding: $grid-unit-10; - } - - &.has-hint { - grid-template-columns: auto auto 30px; - } - &.is-highlighted { - background: $gray-300; - } - .components-custom-select-control__item-hint { - color: $gray-600; - text-align: right; - padding-right: $grid-unit-05; - } - .components-custom-select-control__item-icon { - margin-left: auto; - } - - &:last-child { - margin-bottom: 0; - } -} diff --git a/packages/components/src/custom-select-control/test/index.js b/packages/components/src/custom-select-control/test/index.js deleted file mode 100644 index 9b17c4894de40..0000000000000 --- a/packages/components/src/custom-select-control/test/index.js +++ /dev/null @@ -1,665 +0,0 @@ -/** - * External dependencies - */ -import { render, screen } from '@testing-library/react'; -import userEvent from '@testing-library/user-event'; - -/** - * WordPress dependencies - */ -import { useState } from '@wordpress/element'; - -/** - * Internal dependencies - */ -import UncontrolledCustomSelectControl from '..'; - -const customClassName = 'amber-skies'; -const customStyles = { - backgroundColor: 'rgb(127, 255, 212)', - rotate: '13deg', -}; - -const props = { - label: 'label!', - options: [ - { - key: 'flower1', - name: 'violets', - }, - { - key: 'flower2', - name: 'crimson clover', - className: customClassName, - }, - { - key: 'flower3', - name: 'poppy', - }, - { - key: 'color1', - name: 'amber', - className: customClassName, - }, - { - key: 'color2', - name: 'aquamarine', - style: customStyles, - }, - { - key: 'color3', - name: 'tomato (with custom props)', - className: customClassName, - style: customStyles, - // try passing a valid HTML attribute - 'aria-label': 'test label', - // try adding a custom prop - customPropFoo: 'foo', - }, - ], -}; - -const ControlledCustomSelectControl = ( { - options, - onChange: onChangeProp, - ...restProps -} ) => { - const [ value, setValue ] = useState( restProps.value ?? options[ 0 ] ); - - const onChange = ( changeObject ) => { - onChangeProp?.( changeObject ); - setValue( changeObject.selectedItem ); - }; - - return ( - option.key === value.key ) } - /> - ); -}; - -it( 'Should apply external controlled updates', async () => { - const mockOnChange = jest.fn(); - const { rerender } = render( - - ); - - const currentSelectedItem = screen.getByRole( 'button', { - expanded: false, - } ); - - expect( currentSelectedItem ).toHaveTextContent( props.options[ 0 ].name ); - - rerender( - - ); - - expect( currentSelectedItem ).toHaveTextContent( props.options[ 1 ].name ); - - expect( mockOnChange ).not.toHaveBeenCalled(); -} ); - -describe.each( [ - [ 'Uncontrolled', UncontrolledCustomSelectControl ], - [ 'Controlled', ControlledCustomSelectControl ], -] )( 'CustomSelectControl %s', ( ...modeAndComponent ) => { - const [ , Component ] = modeAndComponent; - - it( 'Should select the first option when no explicit initial value is passed without firing onChange', () => { - const mockOnChange = jest.fn(); - render( ); - - expect( - screen.getByRole( 'button', { - expanded: false, - } ) - ).toHaveTextContent( props.options[ 0 ].name ); - - expect( mockOnChange ).not.toHaveBeenCalled(); - } ); - - it( 'Should pick the initially selected option if the value prop is passed without firing onChange', async () => { - const mockOnChange = jest.fn(); - render( - - ); - - expect( - screen.getByRole( 'button', { - expanded: false, - } ) - ).toHaveTextContent( props.options[ 3 ].name ); - - expect( mockOnChange ).not.toHaveBeenCalled(); - } ); - - it( 'Should replace the initial selection when a new item is selected', async () => { - const user = userEvent.setup(); - - render( ); - - const currentSelectedItem = screen.getByRole( 'button', { - expanded: false, - } ); - - await user.click( currentSelectedItem ); - - await user.click( - screen.getByRole( 'option', { - name: 'crimson clover', - } ) - ); - - expect( currentSelectedItem ).toHaveTextContent( 'crimson clover' ); - - await user.click( currentSelectedItem ); - - await user.click( - screen.getByRole( 'option', { - name: 'poppy', - } ) - ); - - expect( currentSelectedItem ).toHaveTextContent( 'poppy' ); - } ); - - it( 'Should keep current selection if dropdown is closed without changing selection', async () => { - const user = userEvent.setup(); - - render( ); - - const currentSelectedItem = screen.getByRole( 'button', { - expanded: false, - } ); - - await user.tab(); - await user.keyboard( '{enter}' ); - expect( - screen.getByRole( 'listbox', { - name: props.label, - } ) - ).toBeVisible(); - - await user.keyboard( '{escape}' ); - expect( - screen.queryByRole( 'listbox', { - name: props.label, - } ) - ).not.toBeInTheDocument(); - - expect( currentSelectedItem ).toHaveTextContent( - props.options[ 0 ].name - ); - } ); - - it( 'Should apply class only to options that have a className defined', async () => { - const user = userEvent.setup(); - - render( ); - - await user.click( - screen.getByRole( 'button', { - expanded: false, - } ) - ); - - // return an array of items _with_ a className added - const itemsWithClass = props.options.filter( - ( option ) => option.className !== undefined - ); - - // assert against filtered array - itemsWithClass.map( ( { name } ) => - expect( screen.getByRole( 'option', { name } ) ).toHaveClass( - customClassName - ) - ); - - // return an array of items _without_ a className added - const itemsWithoutClass = props.options.filter( - ( option ) => option.className === undefined - ); - - // assert against filtered array - itemsWithoutClass.map( ( { name } ) => - expect( screen.getByRole( 'option', { name } ) ).not.toHaveClass( - customClassName - ) - ); - } ); - - it( 'Should apply styles only to options that have styles defined', async () => { - const user = userEvent.setup(); - - render( ); - - await user.click( - screen.getByRole( 'button', { - expanded: false, - } ) - ); - - // return an array of items _with_ styles added - const styledItems = props.options.filter( - ( option ) => option.style !== undefined - ); - - // assert against filtered array - styledItems.map( ( { name } ) => - expect( screen.getByRole( 'option', { name } ) ).toHaveStyle( - customStyles - ) - ); - - // return an array of items _without_ styles added - const unstyledItems = props.options.filter( - ( option ) => option.style === undefined - ); - - // assert against filtered array - unstyledItems.map( ( { name } ) => - expect( screen.getByRole( 'option', { name } ) ).not.toHaveStyle( - customStyles - ) - ); - } ); - - it( 'does not show selected hint by default', () => { - render( - - ); - expect( - screen.getByRole( 'button', { name: 'Custom select' } ) - ).not.toHaveTextContent( 'Hint' ); - } ); - - it( 'shows selected hint when __experimentalShowSelectedHint is set', () => { - render( - - ); - expect( - screen.getByRole( 'button', { name: 'Custom select' } ) - ).toHaveTextContent( 'Hint' ); - } ); - - it( 'shows selected hint in list of options when added, regardless of __experimentalShowSelectedHint prop', async () => { - const user = userEvent.setup(); - - render( - - ); - - await user.click( - screen.getByRole( 'button', { name: 'Custom select' } ) - ); - - expect( screen.getByRole( 'option', { name: /hint/i } ) ).toBeVisible(); - } ); - - it( 'Should return object onChange', async () => { - const user = userEvent.setup(); - const mockOnChange = jest.fn(); - - render( ); - - await user.click( - screen.getByRole( 'button', { - expanded: false, - } ) - ); - - await user.click( - screen.getByRole( 'option', { - name: 'aquamarine', - } ) - ); - - expect( mockOnChange ).toHaveBeenCalledTimes( 1 ); - expect( mockOnChange ).toHaveBeenLastCalledWith( - expect.objectContaining( { - inputValue: '', - isOpen: false, - selectedItem: expect.objectContaining( { - name: 'aquamarine', - } ), - type: expect.any( String ), - } ) - ); - } ); - - it( 'Should return selectedItem object when specified onChange', async () => { - const user = userEvent.setup(); - const mockOnChange = jest.fn(); - - render( ); - - await user.tab(); - expect( - screen.getByRole( 'button', { - expanded: false, - } ) - ).toHaveFocus(); - - await user.keyboard( 'p' ); - await user.keyboard( '{enter}' ); - - expect( mockOnChange ).toHaveBeenCalledTimes( 1 ); - expect( mockOnChange ).toHaveBeenLastCalledWith( - expect.objectContaining( { - selectedItem: expect.objectContaining( { - key: 'flower3', - name: 'poppy', - } ), - } ) - ); - } ); - - it( "Should pass arbitrary props to onChange's selectedItem, but apply only style and className to DOM elements", async () => { - const user = userEvent.setup(); - const onChangeMock = jest.fn(); - - render( ); - - const currentSelectedItem = screen.getByRole( 'button', { - expanded: false, - } ); - - await user.click( currentSelectedItem ); - - const optionWithCustomAttributes = screen.getByRole( 'option', { - name: 'tomato (with custom props)', - } ); - - // Assert that the option element does not have the custom attributes - expect( optionWithCustomAttributes ).not.toHaveAttribute( - 'customPropFoo' - ); - expect( optionWithCustomAttributes ).not.toHaveAttribute( - 'aria-label' - ); - - await user.click( optionWithCustomAttributes ); - - expect( onChangeMock ).toHaveBeenCalledTimes( 1 ); - expect( onChangeMock ).toHaveBeenCalledWith( - expect.objectContaining( { - selectedItem: expect.objectContaining( { - key: 'color3', - name: 'tomato (with custom props)', - className: customClassName, - style: customStyles, - 'aria-label': 'test label', - customPropFoo: 'foo', - } ), - } ) - ); - } ); - - it( 'Should label the component correctly even when the label is not visible', () => { - render( ); - - expect( - screen.getByRole( 'button', { - name: props.label, - } ) - ).toBeVisible(); - } ); - - describe( 'Keyboard behavior and accessibility', () => { - it( 'Captures the keypress event and does not let it propagate', async () => { - const user = userEvent.setup(); - const onKeyDown = jest.fn(); - - render( -
- -
- ); - const currentSelectedItem = screen.getByRole( 'button', { - expanded: false, - } ); - await user.click( currentSelectedItem ); - - const customSelect = screen.getByRole( 'listbox', { - name: props.label, - } ); - await user.type( customSelect, '{enter}' ); - - expect( onKeyDown ).toHaveBeenCalledTimes( 0 ); - } ); - - it( 'Should be able to change selection using keyboard', async () => { - const user = userEvent.setup(); - - render( ); - - const currentSelectedItem = screen.getByRole( 'button', { - expanded: false, - } ); - - await user.tab(); - expect( currentSelectedItem ).toHaveFocus(); - - await user.keyboard( '{enter}' ); - expect( - screen.getByRole( 'listbox', { - name: props.label, - } ) - ).toHaveFocus(); - - await user.keyboard( '{arrowdown}' ); - await user.keyboard( '{enter}' ); - - expect( currentSelectedItem ).toHaveTextContent( - props.options[ 1 ].name - ); - } ); - - it( 'Should be able to type characters to select matching options', async () => { - const user = userEvent.setup(); - - render( ); - - const currentSelectedItem = screen.getByRole( 'button', { - expanded: false, - } ); - - await user.tab(); - await user.keyboard( '{enter}' ); - expect( - screen.getByRole( 'listbox', { - name: props.label, - } ) - ).toHaveFocus(); - - await user.keyboard( '{a}' ); - await user.keyboard( '{enter}' ); - expect( currentSelectedItem ).toHaveTextContent( 'amber' ); - } ); - - it( 'Can change selection with a focused input and closed dropdown if typed characters match an option', async () => { - const user = userEvent.setup(); - - render( ); - - const currentSelectedItem = screen.getByRole( 'button', { - expanded: false, - } ); - - await user.tab(); - expect( currentSelectedItem ).toHaveFocus(); - - await user.keyboard( '{a}' ); - await user.keyboard( '{q}' ); - - expect( - screen.queryByRole( 'listbox', { - name: props.label, - hidden: true, - } ) - ).not.toBeInTheDocument(); - - await user.keyboard( '{enter}' ); - expect( currentSelectedItem ).toHaveTextContent( 'aquamarine' ); - } ); - - it( 'Can change selection with a focused input and closed dropdown while pressing arrow keys', async () => { - const user = userEvent.setup(); - - render( ); - - const currentSelectedItem = screen.getByRole( 'button', { - expanded: false, - } ); - - await user.tab(); - expect( currentSelectedItem ).toHaveFocus(); - expect( currentSelectedItem ).toHaveTextContent( - props.options[ 0 ].name - ); - - await user.keyboard( '{arrowdown}' ); - await user.keyboard( '{arrowdown}' ); - expect( - screen.queryByRole( 'listbox', { name: props.label } ) - ).not.toBeInTheDocument(); - - expect( currentSelectedItem ).toHaveTextContent( - props.options[ 2 ].name - ); - } ); - - it( 'Should have correct aria-selected value for selections', async () => { - const user = userEvent.setup(); - - render( ); - - const currentSelectedItem = screen.getByRole( 'button', { - expanded: false, - } ); - - await user.click( currentSelectedItem ); - - // get all items except for first option - const unselectedItems = props.options.filter( - ( { name } ) => name !== props.options[ 0 ].name - ); - - // assert that all other items have aria-selected="false" - unselectedItems.map( ( { name } ) => - expect( - screen.getByRole( 'option', { name, selected: false } ) - ).toBeVisible() - ); - - // assert that first item has aria-selected="true" - expect( - screen.getByRole( 'option', { - name: props.options[ 0 ].name, - selected: true, - } ) - ).toBeVisible(); - - // change the current selection - await user.click( screen.getByRole( 'option', { name: 'poppy' } ) ); - - // click button to mount listbox with options again - await user.click( currentSelectedItem ); - - // check that first item is has aria-selected="false" after new selection - expect( - screen.getByRole( 'option', { - name: props.options[ 0 ].name, - selected: false, - } ) - ).toBeVisible(); - - // check that new selected item now has aria-selected="true" - expect( - screen.getByRole( 'option', { - name: 'poppy', - selected: true, - } ) - ).toBeVisible(); - } ); - - it( 'Should call custom event handlers', async () => { - const user = userEvent.setup(); - const onFocusMock = jest.fn(); - const onBlurMock = jest.fn(); - - render( - <> - - - - ); - - const currentSelectedItem = screen.getByRole( 'button', { - expanded: false, - } ); - - await user.tab(); - - expect( currentSelectedItem ).toHaveFocus(); - expect( onFocusMock ).toHaveBeenCalledTimes( 1 ); - - await user.tab(); - expect( currentSelectedItem ).not.toHaveFocus(); - expect( onBlurMock ).toHaveBeenCalledTimes( 1 ); - } ); - } ); -} ); diff --git a/packages/components/src/private-apis.ts b/packages/components/src/private-apis.ts index 19c8778a1fbda..5ff39ba364a04 100644 --- a/packages/components/src/private-apis.ts +++ b/packages/components/src/private-apis.ts @@ -8,8 +8,6 @@ import { CompositeRow as CompositeRowV2, useCompositeStore as useCompositeStoreV2, } from './composite/v2'; -import { default as CustomSelectControl } from './custom-select-control'; -import { default as CustomSelectControlV2Legacy } from './custom-select-control-v2/legacy-component'; import { positionToPlacement as __experimentalPopoverLegacyPositionToPlacement } from './popover/utils'; import { createPrivateSlotFill } from './slot-fill'; import { @@ -35,8 +33,6 @@ lock( privateApis, { CompositeItemV2, CompositeRowV2, useCompositeStoreV2, - CustomSelectControlV2Legacy, - CustomSelectControl, __experimentalPopoverLegacyPositionToPlacement, createPrivateSlotFill, ComponentsContext, From 7b7e2ec085115e5529cda2f13d0ea966e023d19d Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Mon, 8 Jul 2024 17:42:49 +0200 Subject: [PATCH 02/16] Move files over from v2 folder --- .../legacy-component => custom-select-control}/index.tsx | 8 ++++---- .../stories/index.story.tsx} | 3 +-- .../test/index.tsx | 0 3 files changed, 5 insertions(+), 6 deletions(-) rename packages/components/src/{custom-select-control-v2/legacy-component => custom-select-control}/index.tsx (94%) rename packages/components/src/{custom-select-control-v2/stories/legacy.story.tsx => custom-select-control/stories/index.story.tsx} (91%) rename packages/components/src/{custom-select-control-v2/legacy-component => custom-select-control}/test/index.tsx (100%) diff --git a/packages/components/src/custom-select-control-v2/legacy-component/index.tsx b/packages/components/src/custom-select-control/index.tsx similarity index 94% rename from packages/components/src/custom-select-control-v2/legacy-component/index.tsx rename to packages/components/src/custom-select-control/index.tsx index 7dcdec9b7bdc6..b5819a5a00da7 100644 --- a/packages/components/src/custom-select-control-v2/legacy-component/index.tsx +++ b/packages/components/src/custom-select-control/index.tsx @@ -7,10 +7,10 @@ import clsx from 'clsx'; /** * Internal dependencies */ -import _CustomSelect from '../custom-select'; -import CustomSelectItem from '../item'; -import type { LegacyCustomSelectProps } from '../types'; -import * as Styled from '../styles'; +import _CustomSelect from '../custom-select-control-v2/custom-select'; +import CustomSelectItem from '../custom-select-control-v2/item'; +import type { LegacyCustomSelectProps } from '../custom-select-control-v2/types'; +import * as Styled from '../custom-select-control-v2/styles'; function useDeprecatedProps( { __experimentalShowSelectedHint, diff --git a/packages/components/src/custom-select-control-v2/stories/legacy.story.tsx b/packages/components/src/custom-select-control/stories/index.story.tsx similarity index 91% rename from packages/components/src/custom-select-control-v2/stories/legacy.story.tsx rename to packages/components/src/custom-select-control/stories/index.story.tsx index e8835d1897db9..5ef9a603bc2b7 100644 --- a/packages/components/src/custom-select-control-v2/stories/legacy.story.tsx +++ b/packages/components/src/custom-select-control/stories/index.story.tsx @@ -11,8 +11,7 @@ import { useState } from '@wordpress/element'; /** * Internal dependencies */ -import CustomSelectControl from '../legacy-component'; -import * as V1Story from '../../custom-select-control/stories/index.story'; +import CustomSelectControl from '../'; const meta: Meta< typeof CustomSelectControl > = { title: 'Components/CustomSelectControl v2/Legacy', diff --git a/packages/components/src/custom-select-control-v2/legacy-component/test/index.tsx b/packages/components/src/custom-select-control/test/index.tsx similarity index 100% rename from packages/components/src/custom-select-control-v2/legacy-component/test/index.tsx rename to packages/components/src/custom-select-control/test/index.tsx From 1fbe0acc22350e3efd4f6f7449215d5752871f9c Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Mon, 8 Jul 2024 17:44:21 +0200 Subject: [PATCH 03/16] Update Storybook files --- .../{default.story.tsx => index.story.tsx} | 2 +- .../stories/index.story.tsx | 76 +++++++++++++++++-- 2 files changed, 71 insertions(+), 7 deletions(-) rename packages/components/src/custom-select-control-v2/stories/{default.story.tsx => index.story.tsx} (98%) diff --git a/packages/components/src/custom-select-control-v2/stories/default.story.tsx b/packages/components/src/custom-select-control-v2/stories/index.story.tsx similarity index 98% rename from packages/components/src/custom-select-control-v2/stories/default.story.tsx rename to packages/components/src/custom-select-control-v2/stories/index.story.tsx index 5b715b2af9c09..a3324a5fa03a4 100644 --- a/packages/components/src/custom-select-control-v2/stories/default.story.tsx +++ b/packages/components/src/custom-select-control-v2/stories/index.story.tsx @@ -14,7 +14,7 @@ import { useState } from '@wordpress/element'; import CustomSelectControlV2 from '..'; const meta: Meta< typeof CustomSelectControlV2 > = { - title: 'Components/CustomSelectControl v2/Default', + title: 'Components/CustomSelectControl v2', component: CustomSelectControlV2, subcomponents: { // @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170 diff --git a/packages/components/src/custom-select-control/stories/index.story.tsx b/packages/components/src/custom-select-control/stories/index.story.tsx index 5ef9a603bc2b7..836fc540c6d1e 100644 --- a/packages/components/src/custom-select-control/stories/index.story.tsx +++ b/packages/components/src/custom-select-control/stories/index.story.tsx @@ -11,16 +11,15 @@ import { useState } from '@wordpress/element'; /** * Internal dependencies */ -import CustomSelectControl from '../'; +import CustomSelectControl from '..'; const meta: Meta< typeof CustomSelectControl > = { - title: 'Components/CustomSelectControl v2/Legacy', + title: 'Components/CustomSelectControl', component: CustomSelectControl, argTypes: { onChange: { control: { type: null } }, value: { control: { type: null } }, }, - tags: [ 'status-wip' ], parameters: { actions: { argTypesRegex: '^on.*' }, controls: { expanded: true }, @@ -62,10 +61,75 @@ const Template: StoryFn< typeof CustomSelectControl > = ( props ) => { }; export const Default = Template.bind( {} ); -Default.args = V1Story.Default.args; +Default.args = { + label: 'Label', + options: [ + { + key: 'small', + name: 'Small', + style: { fontSize: '50%' }, + }, + { + key: 'normal', + name: 'Normal', + style: { fontSize: '100%' }, + className: 'can-apply-custom-class-to-option', + }, + { + key: 'large', + name: 'Large', + style: { fontSize: '200%' }, + }, + { + key: 'huge', + name: 'Huge', + style: { fontSize: '300%' }, + }, + ], +}; export const WithLongLabels = Template.bind( {} ); -WithLongLabels.args = V1Story.WithLongLabels.args; +WithLongLabels.args = { + ...Default.args, + options: [ + { + key: 'reallylonglabel1', + name: 'Really long labels are good for stress testing', + }, + { + key: 'reallylonglabel2', + name: 'But they can take a long time to type.', + }, + { + key: 'reallylonglabel3', + name: 'That really is ok though because you should stress test your UIs.', + }, + ], +}; export const WithHints = Template.bind( {} ); -WithHints.args = V1Story.WithHints.args; +WithHints.args = { + ...Default.args, + options: [ + { + key: 'thumbnail', + name: 'Thumbnail', + hint: '150x150', + }, + { + key: 'medium', + name: 'Medium', + hint: '250x250', + }, + { + key: 'large', + name: 'Large', + hint: '1024x1024', + }, + { + key: 'full', + name: 'Full Size', + hint: '1600x1600', + }, + ], +}; From 7c433a8a6936bda83630f14249a1e687524f40ed Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Mon, 8 Jul 2024 17:47:35 +0200 Subject: [PATCH 04/16] Fix imports & exports --- .../components/src/font-size-picker/font-size-picker-select.tsx | 2 +- packages/components/src/index.ts | 2 +- packages/components/src/style.scss | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/components/src/font-size-picker/font-size-picker-select.tsx b/packages/components/src/font-size-picker/font-size-picker-select.tsx index 4dd80b45b0ac7..19eaba1cfbecd 100644 --- a/packages/components/src/font-size-picker/font-size-picker-select.tsx +++ b/packages/components/src/font-size-picker/font-size-picker-select.tsx @@ -6,7 +6,7 @@ import { __, sprintf } from '@wordpress/i18n'; /** * Internal dependencies */ -import CustomSelectControl from '../custom-select-control-v2/legacy-component'; +import CustomSelectControl from '../custom-select-control'; import { parseQuantityAndUnitFromRawValue } from '../unit-control'; import type { FontSizePickerSelectProps, diff --git a/packages/components/src/index.ts b/packages/components/src/index.ts index f3643a1499a02..f0ea4a4b7e86b 100644 --- a/packages/components/src/index.ts +++ b/packages/components/src/index.ts @@ -63,7 +63,7 @@ export { useCompositeState as __unstableUseCompositeState, } from './composite'; export { ConfirmDialog as __experimentalConfirmDialog } from './confirm-dialog'; -export { StableCustomSelectControl as CustomSelectControl } from './custom-select-control'; +export { default as CustomSelectControl } from './custom-select-control'; export { default as Dashicon } from './dashicon'; export { default as DateTimePicker, DatePicker, TimePicker } from './date-time'; export { default as __experimentalDimensionControl } from './dimension-control'; diff --git a/packages/components/src/style.scss b/packages/components/src/style.scss index 3858fdb0376af..c73ee1cb639ee 100644 --- a/packages/components/src/style.scss +++ b/packages/components/src/style.scss @@ -19,7 +19,6 @@ @import "./combobox-control/style.scss"; @import "./color-palette/style.scss"; @import "./custom-gradient-picker/style.scss"; -@import "./custom-select-control/style.scss"; @import "./dimension-control/style.scss"; @import "./draggable/style.scss"; @import "./drop-zone/style.scss"; From 3e8e0030bff9e8433c6777443a8813f9502927bb Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Mon, 8 Jul 2024 18:03:59 +0200 Subject: [PATCH 05/16] Remove mentions of downshift --- .../input-controls/spacing-input-control.js | 4 +++- packages/components/src/custom-select-control/index.tsx | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/block-editor/src/components/spacing-sizes-control/input-controls/spacing-input-control.js b/packages/block-editor/src/components/spacing-sizes-control/input-controls/spacing-input-control.js index 4ba87647dc3ed..bec589f2ed9aa 100644 --- a/packages/block-editor/src/components/spacing-sizes-control/input-controls/spacing-input-control.js +++ b/packages/block-editor/src/components/spacing-sizes-control/input-controls/spacing-input-control.js @@ -303,9 +303,11 @@ export default function SpacingInputControl( { option.key === currentValue - ) || '' // passing undefined here causes a downshift controlled/uncontrolled warning + ) || '' } onChange={ ( selection ) => { onChange( diff --git a/packages/components/src/custom-select-control/index.tsx b/packages/components/src/custom-select-control/index.tsx index b5819a5a00da7..04c00da60c2c5 100644 --- a/packages/components/src/custom-select-control/index.tsx +++ b/packages/components/src/custom-select-control/index.tsx @@ -60,7 +60,8 @@ function CustomSelectControl( props: LegacyCustomSelectProps ) { } // Executes the logic in a microtask after the popup is closed. - // This is simply to ensure the isOpen state matches that in Downshift. + // This is simply to ensure the isOpen state matches the one from the + // previous legacy implementation. await Promise.resolve(); const state = store.getState(); From 9e44fd4d12616f5c67d6a60e57e8463c30709080 Mon Sep 17 00:00:00 2001 From: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Mon, 8 Jul 2024 19:15:57 +0300 Subject: [PATCH 06/16] Remove downshift dependency --- package-lock.json | 49 -------------------------------- packages/components/package.json | 1 - 2 files changed, 50 deletions(-) diff --git a/package-lock.json b/package-lock.json index 12fd4d2c44d28..15cae4c9961a4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22482,11 +22482,6 @@ "ms": "2.0.0" } }, - "node_modules/compute-scroll-into-view": { - "version": "1.0.16", - "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.16.tgz", - "integrity": "sha512-a85LHKY81oQnikatZYA90pufpZ6sQx++BoCxOEMsjpZx+ZnaKGQnCyCehTRr/1p9GBIAHTjcU9k71kSYWloLiQ==" - }, "node_modules/computed-style": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/computed-style/-/computed-style-0.1.4.tgz", @@ -25484,25 +25479,6 @@ "node": ">=12" } }, - "node_modules/downshift": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/downshift/-/downshift-6.1.0.tgz", - "integrity": "sha512-MnEJERij+1pTVAsOPsH3q9MJGNIZuu2sT90uxOCEOZYH6sEzkVGtUcTBVDRQkE8y96zpB7uEbRn24aE9VpHnZg==", - "dependencies": { - "@babel/runtime": "^7.12.5", - "compute-scroll-into-view": "^1.0.16", - "prop-types": "^15.7.2", - "react-is": "^17.0.1" - }, - "peerDependencies": { - "react": ">=16.12.0" - } - }, - "node_modules/downshift/node_modules/react-is": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", - "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" - }, "node_modules/duplexer": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", @@ -53672,7 +53648,6 @@ "colord": "^2.7.0", "date-fns": "^3.6.0", "deepmerge": "^4.3.0", - "downshift": "^6.0.15", "fast-deep-equal": "^3.1.3", "framer-motion": "^11.1.9", "gradient-parser": "^0.1.5", @@ -69015,7 +68990,6 @@ "colord": "^2.7.0", "date-fns": "^3.6.0", "deepmerge": "^4.3.0", - "downshift": "^6.0.15", "fast-deep-equal": "^3.1.3", "framer-motion": "^11.1.9", "gradient-parser": "^0.1.5", @@ -73783,11 +73757,6 @@ } } }, - "compute-scroll-into-view": { - "version": "1.0.16", - "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.16.tgz", - "integrity": "sha512-a85LHKY81oQnikatZYA90pufpZ6sQx++BoCxOEMsjpZx+ZnaKGQnCyCehTRr/1p9GBIAHTjcU9k71kSYWloLiQ==" - }, "computed-style": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/computed-style/-/computed-style-0.1.4.tgz", @@ -76063,24 +76032,6 @@ "integrity": "sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==", "dev": true }, - "downshift": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/downshift/-/downshift-6.1.0.tgz", - "integrity": "sha512-MnEJERij+1pTVAsOPsH3q9MJGNIZuu2sT90uxOCEOZYH6sEzkVGtUcTBVDRQkE8y96zpB7uEbRn24aE9VpHnZg==", - "requires": { - "@babel/runtime": "^7.12.5", - "compute-scroll-into-view": "^1.0.16", - "prop-types": "^15.7.2", - "react-is": "^17.0.1" - }, - "dependencies": { - "react-is": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", - "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" - } - } - }, "duplexer": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", diff --git a/packages/components/package.json b/packages/components/package.json index e14bf953bdb66..626b80d6ff7ac 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -65,7 +65,6 @@ "colord": "^2.7.0", "date-fns": "^3.6.0", "deepmerge": "^4.3.0", - "downshift": "^6.0.15", "fast-deep-equal": "^3.1.3", "framer-motion": "^11.1.9", "gradient-parser": "^0.1.5", From bd51e7fddb241efa4fadf15a9ea67071add5fd86 Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Tue, 9 Jul 2024 10:00:09 +0200 Subject: [PATCH 07/16] Import directly from components package instead of private APIs --- .../src/components/date-format-picker/index.js | 11 +---------- .../src/components/font-appearance-control/index.js | 6 +----- packages/block-editor/src/hooks/position.js | 10 +--------- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/packages/block-editor/src/components/date-format-picker/index.js b/packages/block-editor/src/components/date-format-picker/index.js index cf9af5eb33f12..15beec4ac6ed5 100644 --- a/packages/block-editor/src/components/date-format-picker/index.js +++ b/packages/block-editor/src/components/date-format-picker/index.js @@ -10,18 +10,9 @@ import { VisuallyHidden, ToggleControl, __experimentalVStack as VStack, - privateApis as componentsPrivateApis, + CustomSelectControl, } from '@wordpress/components'; -/** - * Internal dependencies - */ -import { unlock } from '../../lock-unlock'; - -const { CustomSelectControlV2Legacy: CustomSelectControl } = unlock( - componentsPrivateApis -); - // So that we illustrate the different formats in the dropdown properly, show a date that is // somwhat recent, has a day greater than 12, and a month with more than three letters. const exampleDate = new Date(); diff --git a/packages/block-editor/src/components/font-appearance-control/index.js b/packages/block-editor/src/components/font-appearance-control/index.js index 023a4519d485d..418d43e322ac8 100644 --- a/packages/block-editor/src/components/font-appearance-control/index.js +++ b/packages/block-editor/src/components/font-appearance-control/index.js @@ -1,7 +1,7 @@ /** * WordPress dependencies */ -import { privateApis as componentsPrivateApis } from '@wordpress/components'; +import { CustomSelectControl } from '@wordpress/components'; import { useMemo } from '@wordpress/element'; import { __, sprintf } from '@wordpress/i18n'; @@ -9,11 +9,7 @@ import { __, sprintf } from '@wordpress/i18n'; * Internal dependencies */ import { getFontStylesAndWeights } from '../../utils/get-font-styles-and-weights'; -import { unlock } from '../../lock-unlock'; -const { CustomSelectControlV2Legacy: CustomSelectControl } = unlock( - componentsPrivateApis -); /** * Adjusts font appearance field label in case either font styles or weights * are disabled. diff --git a/packages/block-editor/src/hooks/position.js b/packages/block-editor/src/hooks/position.js index a5fae3d8d3a7c..95a9c2198e4c7 100644 --- a/packages/block-editor/src/hooks/position.js +++ b/packages/block-editor/src/hooks/position.js @@ -8,10 +8,7 @@ import clsx from 'clsx'; */ import { __, _x, sprintf } from '@wordpress/i18n'; import { getBlockSupport, hasBlockSupport } from '@wordpress/blocks'; -import { - BaseControl, - privateApis as componentsPrivateApis, -} from '@wordpress/components'; +import { BaseControl, CustomSelectControl } from '@wordpress/components'; import { useInstanceId } from '@wordpress/compose'; import { useSelect } from '@wordpress/data'; import { useMemo, Platform } from '@wordpress/element'; @@ -23,13 +20,8 @@ import { useSettings } from '../components/use-settings'; import InspectorControls from '../components/inspector-controls'; import useBlockDisplayInformation from '../components/use-block-display-information'; import { cleanEmptyObject, useStyleOverride } from './utils'; -import { unlock } from '../lock-unlock'; import { store as blockEditorStore } from '../store'; -const { CustomSelectControlV2Legacy: CustomSelectControl } = unlock( - componentsPrivateApis -); - const POSITION_SUPPORT_KEY = 'position'; const DEFAULT_OPTION = { From b7c1a3e271c3e42d5094b616f0c26c462853eb7f Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Tue, 9 Jul 2024 10:16:27 +0200 Subject: [PATCH 08/16] Move V2 implementation out of /default-component subfolder --- .../default-component/index.tsx | 29 ------------------- .../src/custom-select-control-v2/index.tsx | 27 ++++++++++++++++- 2 files changed, 26 insertions(+), 30 deletions(-) delete mode 100644 packages/components/src/custom-select-control-v2/default-component/index.tsx diff --git a/packages/components/src/custom-select-control-v2/default-component/index.tsx b/packages/components/src/custom-select-control-v2/default-component/index.tsx deleted file mode 100644 index 89ff14097e8ca..0000000000000 --- a/packages/components/src/custom-select-control-v2/default-component/index.tsx +++ /dev/null @@ -1,29 +0,0 @@ -/** - * External dependencies - */ -import * as Ariakit from '@ariakit/react'; -/** - * Internal dependencies - */ -import _CustomSelect from '../custom-select'; -import type { CustomSelectProps } from '../types'; -import type { WordPressComponentProps } from '../../context'; -import Item from '../item'; - -function CustomSelectControlV2( - props: WordPressComponentProps< CustomSelectProps, 'button', false > -) { - const { defaultValue, onChange, value, ...restProps } = props; - // Forward props + store from v2 implementation - const store = Ariakit.useSelectStore( { - setValue: ( nextValue ) => onChange?.( nextValue ), - defaultValue, - value, - } ); - - return <_CustomSelect { ...restProps } store={ store } />; -} - -CustomSelectControlV2.Item = Item; - -export default CustomSelectControlV2; diff --git a/packages/components/src/custom-select-control-v2/index.tsx b/packages/components/src/custom-select-control-v2/index.tsx index f07e8f6f9f311..07d073caf920f 100644 --- a/packages/components/src/custom-select-control-v2/index.tsx +++ b/packages/components/src/custom-select-control-v2/index.tsx @@ -1,4 +1,29 @@ +/** + * External dependencies + */ +import * as Ariakit from '@ariakit/react'; /** * Internal dependencies */ -export { default } from './default-component'; +import _CustomSelect from './custom-select'; +import type { CustomSelectProps } from './types'; +import type { WordPressComponentProps } from '../context'; +import Item from './item'; + +function CustomSelectControlV2( + props: WordPressComponentProps< CustomSelectProps, 'button', false > +) { + const { defaultValue, onChange, value, ...restProps } = props; + // Forward props + store from v2 implementation + const store = Ariakit.useSelectStore( { + setValue: ( nextValue ) => onChange?.( nextValue ), + defaultValue, + value, + } ); + + return <_CustomSelect { ...restProps } store={ store } />; +} + +CustomSelectControlV2.Item = Item; + +export default CustomSelectControlV2; From b7db2617fab2698092527ad8cc15fc9c1cdae8ab Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Tue, 9 Jul 2024 10:20:28 +0200 Subject: [PATCH 09/16] Add back legacy classnames --- .../src/custom-select-control/index.tsx | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/packages/components/src/custom-select-control/index.tsx b/packages/components/src/custom-select-control/index.tsx index 04c00da60c2c5..fc80122016ec5 100644 --- a/packages/components/src/custom-select-control/index.tsx +++ b/packages/components/src/custom-select-control/index.tsx @@ -91,8 +91,8 @@ function CustomSelectControl( props: LegacyCustomSelectProps ) { { name } { hint } @@ -106,13 +106,12 @@ function CustomSelectControl( props: LegacyCustomSelectProps ) { children={ hint ? withHint : name } style={ style } className={ clsx( - // TODO: Legacy classname. Add V1 styles are removed from the codebase - // 'components-custom-select-control__item', - className - // TODO: Legacy classname. Add V1 styles are removed from the codebase - // { - // 'has-hint': hint, - // } + className, + // Keeping the classnames for legacy reasons + 'components-custom-select-control__item', + { + 'has-hint': hint, + } ) } /> ); @@ -130,8 +129,8 @@ function CustomSelectControl( props: LegacyCustomSelectProps ) { { currentValue } { selectedOptionHint && ( { selectedOptionHint } @@ -162,8 +161,8 @@ function CustomSelectControl( props: LegacyCustomSelectProps ) { size={ translatedSize } store={ store } className={ clsx( - // TODO: Legacy classname. Add V1 styles are removed from the codebase - // 'components-custom-select-control', + // Keeping the classname for legacy reasons + 'components-custom-select-control', classNameProp ) } isLegacy From 104a28d8ac3d0c76f4e57a9e07fcaab7fea641fc Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Tue, 9 Jul 2024 10:44:04 +0200 Subject: [PATCH 10/16] Move V1 types to V1 folder --- .../src/custom-select-control-v2/types.ts | 121 ----------------- .../src/custom-select-control/index.tsx | 2 +- .../src/custom-select-control/types.ts | 124 ++++++++++++++++++ 3 files changed, 125 insertions(+), 122 deletions(-) create mode 100644 packages/components/src/custom-select-control/types.ts diff --git a/packages/components/src/custom-select-control-v2/types.ts b/packages/components/src/custom-select-control-v2/types.ts index 95a78c501839d..a31598c1db3ea 100644 --- a/packages/components/src/custom-select-control-v2/types.ts +++ b/packages/components/src/custom-select-control-v2/types.ts @@ -2,7 +2,6 @@ * External dependencies */ import type * as Ariakit from '@ariakit/react'; -import type { FocusEventHandler, MouseEventHandler } from 'react'; export type CustomSelectStore = { /** @@ -82,126 +81,6 @@ export type _CustomSelectProps = CustomSelectButtonProps & { export type CustomSelectProps = _CustomSelectProps & CustomSelectSize; -/** - * The legacy object structure for the options array. - */ -type LegacyOption = { - key: string; - name: string; - style?: React.CSSProperties; - className?: string; - hint?: string; - /** - * Use the `hint` property instead - * @deprecated - * @ignore - */ - __experimentalHint?: string; - [ key: string ]: any; -}; - -/** - * The legacy object returned from the onChange event. - */ -type LegacyOnChangeObject = { - highlightedIndex?: number; - inputValue?: string; - isOpen?: boolean; - type?: string; - selectedItem: LegacyOption; -}; - -export type LegacyCustomSelectProps = { - /** - * Optional classname for the component. - */ - className?: string; - /** - * Used to visually hide the label. It will always be visible to screen readers. - * - */ - hideLabelFromVision?: boolean; - /** - * Pass in a description that will be shown to screen readers associated with the - * select trigger button. If no value is passed, the text "Currently selected: - * selectedItem.name" will be used fully translated. - */ - describedBy?: string; - /** - * Label for the control. - */ - label: string; - /** - * Function called with the control's internal state changes. The `selectedItem` - * property contains the next selected item. - */ - onChange?: ( newValue: LegacyOnChangeObject ) => void; - /** - * A handler for `onBlur` events. - * - * @ignore - */ - onBlur?: FocusEventHandler< HTMLButtonElement >; - /** - * A handler for `onFocus` events. - * - * @ignore - */ - onFocus?: FocusEventHandler< HTMLButtonElement >; - /** - * A handler for `onMouseOver` events. - * - * @ignore - */ - onMouseOut?: MouseEventHandler< HTMLButtonElement >; - /** - * A handler for `onMouseOut` events. - * - * @ignore - */ - onMouseOver?: MouseEventHandler< HTMLButtonElement >; - /** - * The options that can be chosen from. - */ - options: Array< LegacyOption >; - /** - * The size of the control. - * - * @default 'default' - */ - size?: 'default' | 'small' | '__unstable-large'; - /** - * Can be used to externally control the value of the control. - */ - value?: LegacyOption; - /** - * Use the `showSelectedHint` property instead. - * @deprecated - * @ignore - */ - __experimentalShowSelectedHint?: boolean; - /** - * Show the hint of the selected item in the trigger button. - * - * @default false - */ - showSelectedHint?: boolean; - /** - * Opt-in prop for an unconstrained width style which became the default in - * WordPress 6.5. The prop is no longer needed and can be safely removed. - * - * @deprecated - * @ignore - */ - __nextUnconstrainedWidth?: boolean; - /** - * Start opting into the larger default height that will become the default size in a future version. - * - * @default false - */ - __next40pxDefaultSize?: boolean; -}; - export type CustomSelectItemProps = { /** * The value of the select item. This will be used as the children if diff --git a/packages/components/src/custom-select-control/index.tsx b/packages/components/src/custom-select-control/index.tsx index fc80122016ec5..a732b3362ca40 100644 --- a/packages/components/src/custom-select-control/index.tsx +++ b/packages/components/src/custom-select-control/index.tsx @@ -9,8 +9,8 @@ import clsx from 'clsx'; */ import _CustomSelect from '../custom-select-control-v2/custom-select'; import CustomSelectItem from '../custom-select-control-v2/item'; -import type { LegacyCustomSelectProps } from '../custom-select-control-v2/types'; import * as Styled from '../custom-select-control-v2/styles'; +import type { LegacyCustomSelectProps } from './types'; function useDeprecatedProps( { __experimentalShowSelectedHint, diff --git a/packages/components/src/custom-select-control/types.ts b/packages/components/src/custom-select-control/types.ts new file mode 100644 index 0000000000000..ff9751f875db2 --- /dev/null +++ b/packages/components/src/custom-select-control/types.ts @@ -0,0 +1,124 @@ +/** + * External dependencies + */ +import type { FocusEventHandler, MouseEventHandler } from 'react'; + +/** + * The legacy object structure for the options array. + */ +type LegacyOption = { + key: string; + name: string; + style?: React.CSSProperties; + className?: string; + hint?: string; + /** + * Use the `hint` property instead + * @deprecated + * @ignore + */ + __experimentalHint?: string; + [ key: string ]: any; +}; + +/** + * The legacy object returned from the onChange event. + */ +type LegacyOnChangeObject = { + highlightedIndex?: number; + inputValue?: string; + isOpen?: boolean; + type?: string; + selectedItem: LegacyOption; +}; + +export type LegacyCustomSelectProps = { + /** + * Optional classname for the component. + */ + className?: string; + /** + * Used to visually hide the label. It will always be visible to screen readers. + * + */ + hideLabelFromVision?: boolean; + /** + * Pass in a description that will be shown to screen readers associated with the + * select trigger button. If no value is passed, the text "Currently selected: + * selectedItem.name" will be used fully translated. + */ + describedBy?: string; + /** + * Label for the control. + */ + label: string; + /** + * Function called with the control's internal state changes. The `selectedItem` + * property contains the next selected item. + */ + onChange?: ( newValue: LegacyOnChangeObject ) => void; + /** + * A handler for `onBlur` events. + * + * @ignore + */ + onBlur?: FocusEventHandler< HTMLButtonElement >; + /** + * A handler for `onFocus` events. + * + * @ignore + */ + onFocus?: FocusEventHandler< HTMLButtonElement >; + /** + * A handler for `onMouseOver` events. + * + * @ignore + */ + onMouseOut?: MouseEventHandler< HTMLButtonElement >; + /** + * A handler for `onMouseOut` events. + * + * @ignore + */ + onMouseOver?: MouseEventHandler< HTMLButtonElement >; + /** + * The options that can be chosen from. + */ + options: Array< LegacyOption >; + /** + * The size of the control. + * + * @default 'default' + */ + size?: 'default' | 'small' | '__unstable-large'; + /** + * Can be used to externally control the value of the control. + */ + value?: LegacyOption; + /** + * Use the `showSelectedHint` property instead. + * @deprecated + * @ignore + */ + __experimentalShowSelectedHint?: boolean; + /** + * Show the hint of the selected item in the trigger button. + * + * @default false + */ + showSelectedHint?: boolean; + /** + * Opt-in prop for an unconstrained width style which became the default in + * WordPress 6.5. The prop is no longer needed and can be safely removed. + * + * @deprecated + * @ignore + */ + __nextUnconstrainedWidth?: boolean; + /** + * Start opting into the larger default height that will become the default size in a future version. + * + * @default false + */ + __next40pxDefaultSize?: boolean; +}; From 9809de05ef1bea1c91bb2a8be63402a7ff3f041e Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Tue, 9 Jul 2024 10:46:07 +0200 Subject: [PATCH 11/16] CHANGELOG --- packages/components/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md index 3699162feb510..21f8aec64379b 100644 --- a/packages/components/CHANGELOG.md +++ b/packages/components/CHANGELOG.md @@ -58,6 +58,7 @@ - `TimeInput`: Add `label` prop ([#63106](https://github.com/WordPress/gutenberg/pull/63106)). - Method style type signatures have been changed to function style ([#62718](https://github.com/WordPress/gutenberg/pull/62718)). - `FontSizePicker`: use CustomSelectControl V2 legacy adapter ([#63134](https://github.com/WordPress/gutenberg/pull/63134)). +- `CustomSelectControl`: switch to ariakit-based implementation ([#63258](https://github.com/WordPress/gutenberg/pull/63258)). ## 28.2.0 (2024-06-26) From 9326555948a96b763f6810da1f0489c0fef0dd30 Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Tue, 9 Jul 2024 11:03:53 +0200 Subject: [PATCH 12/16] Remove "Legacy" from V1 types --- .../src/custom-select-control/index.tsx | 8 +- .../src/custom-select-control/test/index.tsx | 106 +++++++++--------- .../src/custom-select-control/types.ts | 18 +-- 3 files changed, 64 insertions(+), 68 deletions(-) diff --git a/packages/components/src/custom-select-control/index.tsx b/packages/components/src/custom-select-control/index.tsx index a732b3362ca40..5bce6afc4d92b 100644 --- a/packages/components/src/custom-select-control/index.tsx +++ b/packages/components/src/custom-select-control/index.tsx @@ -10,12 +10,12 @@ import clsx from 'clsx'; import _CustomSelect from '../custom-select-control-v2/custom-select'; import CustomSelectItem from '../custom-select-control-v2/item'; import * as Styled from '../custom-select-control-v2/styles'; -import type { LegacyCustomSelectProps } from './types'; +import type { CustomSelectProps } from './types'; function useDeprecatedProps( { __experimentalShowSelectedHint, ...otherProps -}: LegacyCustomSelectProps ) { +}: CustomSelectProps ) { return { showSelectedHint: __experimentalShowSelectedHint, ...otherProps, @@ -28,14 +28,14 @@ function useDeprecatedProps( { function applyOptionDeprecations( { __experimentalHint, ...rest -}: LegacyCustomSelectProps[ 'options' ][ number ] ) { +}: CustomSelectProps[ 'options' ][ number ] ) { return { hint: __experimentalHint, ...rest, }; } -function CustomSelectControl( props: LegacyCustomSelectProps ) { +function CustomSelectControl( props: CustomSelectProps ) { const { __next40pxDefaultSize = false, describedBy, diff --git a/packages/components/src/custom-select-control/test/index.tsx b/packages/components/src/custom-select-control/test/index.tsx index 496b42572d82f..73dcb039df3f1 100644 --- a/packages/components/src/custom-select-control/test/index.tsx +++ b/packages/components/src/custom-select-control/test/index.tsx @@ -20,7 +20,7 @@ const customStyles = { rotate: '13deg', }; -const legacyProps = { +const props = { label: 'label!', options: [ { @@ -87,8 +87,8 @@ it( 'Should apply external controlled updates', async () => { const mockOnChange = jest.fn(); const { rerender } = render( ); @@ -97,22 +97,18 @@ it( 'Should apply external controlled updates', async () => { expanded: false, } ); - expect( currentSelectedItem ).toHaveTextContent( - legacyProps.options[ 0 ].name - ); + expect( currentSelectedItem ).toHaveTextContent( props.options[ 0 ].name ); expect( mockOnChange ).not.toHaveBeenCalled(); rerender( ); - expect( currentSelectedItem ).toHaveTextContent( - legacyProps.options[ 1 ].name - ); + expect( currentSelectedItem ).toHaveTextContent( props.options[ 1 ].name ); // Necessary to wait for onChange to potentially fire await sleep(); @@ -128,13 +124,13 @@ describe.each( [ it( 'Should select the first option when no explicit initial value is passed without firing onChange', async () => { const mockOnChange = jest.fn(); - render( ); + render( ); expect( screen.getByRole( 'combobox', { expanded: false, } ) - ).toHaveTextContent( legacyProps.options[ 0 ].name ); + ).toHaveTextContent( props.options[ 0 ].name ); // Necessary to wait for onChange to potentially fire await sleep(); @@ -146,9 +142,9 @@ describe.each( [ const mockOnChange = jest.fn(); render( ); @@ -156,7 +152,7 @@ describe.each( [ screen.getByRole( 'combobox', { expanded: false, } ) - ).toHaveTextContent( legacyProps.options[ 3 ].name ); + ).toHaveTextContent( props.options[ 3 ].name ); // Necessary to wait for onChange to potentially fire await sleep(); @@ -165,7 +161,7 @@ describe.each( [ } ); it( 'Should replace the initial selection when a new item is selected', async () => { - render( ); + render( ); const currentSelectedItem = screen.getByRole( 'combobox', { expanded: false, @@ -193,7 +189,7 @@ describe.each( [ } ); it( 'Should keep current selection if dropdown is closed without changing selection', async () => { - render( ); + render( ); const currentSelectedItem = screen.getByRole( 'combobox', { expanded: false, @@ -204,24 +200,24 @@ describe.each( [ await press.Enter(); expect( screen.getByRole( 'listbox', { - name: legacyProps.label, + name: props.label, } ) ).toBeVisible(); await press.Escape(); expect( screen.queryByRole( 'listbox', { - name: legacyProps.label, + name: props.label, } ) ).not.toBeInTheDocument(); expect( currentSelectedItem ).toHaveTextContent( - legacyProps.options[ 0 ].name + props.options[ 0 ].name ); } ); it( 'Should apply class only to options that have a className defined', async () => { - render( ); + render( ); await click( screen.getByRole( 'combobox', { @@ -230,7 +226,7 @@ describe.each( [ ); // return an array of items _with_ a className added - const itemsWithClass = legacyProps.options.filter( + const itemsWithClass = props.options.filter( ( option ) => option.className !== undefined ); @@ -242,7 +238,7 @@ describe.each( [ ); // return an array of items _without_ a className added - const itemsWithoutClass = legacyProps.options.filter( + const itemsWithoutClass = props.options.filter( ( option ) => option.className === undefined ); @@ -255,7 +251,7 @@ describe.each( [ } ); it( 'Should apply styles only to options that have styles defined', async () => { - render( ); + render( ); await click( screen.getByRole( 'combobox', { @@ -264,7 +260,7 @@ describe.each( [ ); // return an array of items _with_ styles added - const styledItems = legacyProps.options.filter( + const styledItems = props.options.filter( ( option ) => option.style !== undefined ); @@ -276,7 +272,7 @@ describe.each( [ ); // return an array of items _without_ styles added - const unstyledItems = legacyProps.options.filter( + const unstyledItems = props.options.filter( ( option ) => option.style === undefined ); @@ -291,7 +287,7 @@ describe.each( [ it( 'does not show selected hint by default', async () => { render( { render( { render( { const mockOnChange = jest.fn(); - render( ); + render( ); await click( screen.getByRole( 'combobox', { @@ -389,7 +385,7 @@ describe.each( [ it( 'Should return selectedItem object when specified onChange', async () => { const mockOnChange = jest.fn(); - render( ); + render( ); await sleep(); await press.Tab(); @@ -416,7 +412,7 @@ describe.each( [ it( "Should pass arbitrary props to onChange's selectedItem, but apply only style and className to DOM elements", async () => { const onChangeMock = jest.fn(); - render( ); + render( ); const currentSelectedItem = screen.getByRole( 'combobox', { expanded: false, @@ -454,11 +450,11 @@ describe.each( [ } ); it( 'Should label the component correctly even when the label is not visible', () => { - render( ); + render( ); expect( screen.getByRole( 'combobox', { - name: legacyProps.label, + name: props.label, } ) ).toBeVisible(); } ); @@ -473,7 +469,7 @@ describe.each( [ role="none" onKeyDown={ onKeyDown } > - + ); const currentSelectedItem = screen.getByRole( 'combobox', { @@ -482,7 +478,7 @@ describe.each( [ await click( currentSelectedItem ); const customSelect = screen.getByRole( 'listbox', { - name: legacyProps.label, + name: props.label, } ); expect( customSelect ).toHaveFocus(); await press.Enter(); @@ -491,7 +487,7 @@ describe.each( [ } ); it( 'Should be able to change selection using keyboard', async () => { - render( ); + render( ); const currentSelectedItem = screen.getByRole( 'combobox', { expanded: false, @@ -504,7 +500,7 @@ describe.each( [ await press.Enter(); expect( screen.getByRole( 'listbox', { - name: legacyProps.label, + name: props.label, } ) ).toHaveFocus(); @@ -512,12 +508,12 @@ describe.each( [ await press.Enter(); expect( currentSelectedItem ).toHaveTextContent( - legacyProps.options[ 1 ].name + props.options[ 1 ].name ); } ); it( 'Should be able to type characters to select matching options', async () => { - render( ); + render( ); const currentSelectedItem = screen.getByRole( 'combobox', { expanded: false, @@ -528,7 +524,7 @@ describe.each( [ await press.Enter(); expect( screen.getByRole( 'listbox', { - name: legacyProps.label, + name: props.label, } ) ).toHaveFocus(); @@ -538,7 +534,7 @@ describe.each( [ } ); it( 'Can change selection with a focused input and closed dropdown if typed characters match an option', async () => { - render( ); + render( ); const currentSelectedItem = screen.getByRole( 'combobox', { expanded: false, @@ -548,7 +544,7 @@ describe.each( [ await press.Tab(); expect( currentSelectedItem ).toHaveFocus(); expect( currentSelectedItem ).toHaveTextContent( - legacyProps.options[ 0 ].name + props.options[ 0 ].name ); // Ideally we would test a multi-character typeahead, but anything more than a single character is flaky @@ -556,7 +552,7 @@ describe.each( [ expect( screen.queryByRole( 'listbox', { - name: legacyProps.label, + name: props.label, hidden: true, } ) ).not.toBeInTheDocument(); @@ -568,7 +564,7 @@ describe.each( [ } ); it( 'Can change selection with a focused input and closed dropdown while pressing arrow keys', async () => { - render( ); + render( ); const currentSelectedItem = screen.getByRole( 'combobox', { expanded: false, @@ -578,24 +574,24 @@ describe.each( [ await press.Tab(); expect( currentSelectedItem ).toHaveFocus(); expect( currentSelectedItem ).toHaveTextContent( - legacyProps.options[ 0 ].name + props.options[ 0 ].name ); await press.ArrowDown(); await press.ArrowDown(); expect( screen.queryByRole( 'listbox', { - name: legacyProps.label, + name: props.label, } ) ).not.toBeInTheDocument(); expect( currentSelectedItem ).toHaveTextContent( - legacyProps.options[ 2 ].name + props.options[ 2 ].name ); } ); it( 'Should have correct aria-selected value for selections', async () => { - render( ); + render( ); const currentSelectedItem = screen.getByRole( 'combobox', { expanded: false, @@ -604,8 +600,8 @@ describe.each( [ await click( currentSelectedItem ); // get all items except for first option - const unselectedItems = legacyProps.options.filter( - ( { name } ) => name !== legacyProps.options[ 0 ].name + const unselectedItems = props.options.filter( + ( { name } ) => name !== props.options[ 0 ].name ); // assert that all other items have aria-selected="false" @@ -618,7 +614,7 @@ describe.each( [ // assert that first item has aria-selected="true" expect( screen.getByRole( 'option', { - name: legacyProps.options[ 0 ].name, + name: props.options[ 0 ].name, selected: true, } ) ).toBeVisible(); @@ -632,7 +628,7 @@ describe.each( [ // check that first item is has aria-selected="false" after new selection expect( screen.getByRole( 'option', { - name: legacyProps.options[ 0 ].name, + name: props.options[ 0 ].name, selected: false, } ) ).toBeVisible(); @@ -653,7 +649,7 @@ describe.each( [ render( <> diff --git a/packages/components/src/custom-select-control/types.ts b/packages/components/src/custom-select-control/types.ts index ff9751f875db2..9908ed76d3eb3 100644 --- a/packages/components/src/custom-select-control/types.ts +++ b/packages/components/src/custom-select-control/types.ts @@ -4,9 +4,9 @@ import type { FocusEventHandler, MouseEventHandler } from 'react'; /** - * The legacy object structure for the options array. + * The object structure for the options array. */ -type LegacyOption = { +type Option = { key: string; name: string; style?: React.CSSProperties; @@ -22,17 +22,17 @@ type LegacyOption = { }; /** - * The legacy object returned from the onChange event. + * The object returned from the onChange event. */ -type LegacyOnChangeObject = { +type ChangeObject = { highlightedIndex?: number; inputValue?: string; isOpen?: boolean; type?: string; - selectedItem: LegacyOption; + selectedItem: Option; }; -export type LegacyCustomSelectProps = { +export type CustomSelectProps = { /** * Optional classname for the component. */ @@ -56,7 +56,7 @@ export type LegacyCustomSelectProps = { * Function called with the control's internal state changes. The `selectedItem` * property contains the next selected item. */ - onChange?: ( newValue: LegacyOnChangeObject ) => void; + onChange?: ( newValue: ChangeObject ) => void; /** * A handler for `onBlur` events. * @@ -84,7 +84,7 @@ export type LegacyCustomSelectProps = { /** * The options that can be chosen from. */ - options: Array< LegacyOption >; + options: Array< Option >; /** * The size of the control. * @@ -94,7 +94,7 @@ export type LegacyCustomSelectProps = { /** * Can be used to externally control the value of the control. */ - value?: LegacyOption; + value?: Option; /** * Use the `showSelectedHint` property instead. * @deprecated From 54cf48cd77d130092a8c6111969b021bc7ea1fac Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Tue, 9 Jul 2024 11:04:07 +0200 Subject: [PATCH 13/16] Update and align README and JSDocs --- .../src/custom-select-control/README.md | 60 +++++++++---------- .../src/custom-select-control/types.ts | 19 +++--- 2 files changed, 37 insertions(+), 42 deletions(-) diff --git a/packages/components/src/custom-select-control/README.md b/packages/components/src/custom-select-control/README.md index ff890c606af46..c72aa2dd569bc 100644 --- a/packages/components/src/custom-select-control/README.md +++ b/packages/components/src/custom-select-control/README.md @@ -63,81 +63,77 @@ function MyControlledCustomSelectControl() { ### Props -#### className +#### `className`: `string` -A custom class name to append to the outer `
`. +Optional classname for the component. -- Type: `String` - Required: No -#### hideLabelFromVision +#### `hideLabelFromVision`: `boolean` -Used to visually hide the label. It will always be visible to screen readers. +Hide the label visually, while keeping available to assistive technology -- Type: `Boolean` - Required: No -#### label +#### `describedBy`: `string` -The label for the control. +Description for the select trigger button used by assistive technology. If no value is passed, the text "Currently selected: selectedItem.name" will be used fully translated. + +- Required: No + +#### `label`: `string` + +Label for the control. -- Type: `String` - Required: Yes -#### describedBy +#### `onChange`: `( newValue: ChangeObject ) => void` -Pass in a description that will be shown to screen readers associated with the select trigger button. If no value is passed, the text "Currently selected: selectedItem.name" will be used fully translated. +Function called with the control's internal state changes. The `selectedItem` property contains the next selected item. -- Type: `String` - Required: No -#### options +#### `options`: `Array< Option >` -The options that can be chosen from. +The list of options that can be chosen from. -- Type: `Array<{ key: String, name: String, style: ?{}, className: ?String, ...rest }>` - Required: Yes -#### onChange +#### `size`: `'default' | 'small' | '\_\_unstable-large'` -Function called with the control's internal state changes. The `selectedItem` property contains the next selected item. +The size of the control. -- Type: `Function` +- Default: `false` - Required: No -#### value +#### `value`: `Option` Can be used to externally control the value of the control, like in the `MyControlledCustomSelectControl` example above. -- Type: `Object` - Required: No -#### onMouseOver +#### `onMouseOver`: `MouseEventHandler< HTMLButtonElement >` -A handler for onMouseOver events. +A handler for `mouseover` events on the trigger button. -- Type: `Function` - Required: No -#### onMouseOut +#### `onMouseOut`: `MouseEventHandler< HTMLButtonElement >` -A handler for onMouseOut events. +A handler for `mouseout` events on the trigger button. -- Type: `Function` - Required: No -#### onFocus +#### `onFocus`: `FocusEventHandler< HTMLButtonElement >` -A handler for onFocus events. +A handler for `focus` events on the trigger button. -- Type: `Function` - Required: No -#### onBlur +#### `onBlur`: `FocusEventHandler< HTMLButtonElement >` -A handler for onBlur events. +A handler for `blur` events on the trigger button. -- Type: `Function` - Required: No ## Related components diff --git a/packages/components/src/custom-select-control/types.ts b/packages/components/src/custom-select-control/types.ts index 9908ed76d3eb3..98e9633b02f1a 100644 --- a/packages/components/src/custom-select-control/types.ts +++ b/packages/components/src/custom-select-control/types.ts @@ -38,14 +38,13 @@ export type CustomSelectProps = { */ className?: string; /** - * Used to visually hide the label. It will always be visible to screen readers. - * + * Hide the label visually, while keeping available to assistive technology. */ hideLabelFromVision?: boolean; /** - * Pass in a description that will be shown to screen readers associated with the - * select trigger button. If no value is passed, the text "Currently selected: - * selectedItem.name" will be used fully translated. + * Description for the select trigger button used by assistive technology. + * If no value is passed, the text "Currently selected: selectedItem.name" + * will be used fully translated. */ describedBy?: string; /** @@ -58,31 +57,31 @@ export type CustomSelectProps = { */ onChange?: ( newValue: ChangeObject ) => void; /** - * A handler for `onBlur` events. + * A handler for `blur` events on the trigger button. * * @ignore */ onBlur?: FocusEventHandler< HTMLButtonElement >; /** - * A handler for `onFocus` events. + * A handler for `focus` events on the trigger button. * * @ignore */ onFocus?: FocusEventHandler< HTMLButtonElement >; /** - * A handler for `onMouseOver` events. + * A handler for `mouseout` events on the trigger button. * * @ignore */ onMouseOut?: MouseEventHandler< HTMLButtonElement >; /** - * A handler for `onMouseOut` events. + * A handler for `mouseover` events on the trigger button. * * @ignore */ onMouseOver?: MouseEventHandler< HTMLButtonElement >; /** - * The options that can be chosen from. + * The list of options that can be chosen from. */ options: Array< Option >; /** From cf6be50dfba6fa7f7596b395a1f0751ed26c3707 Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Wed, 10 Jul 2024 23:28:43 +0200 Subject: [PATCH 14/16] apply feedback --- packages/components/src/custom-select-control/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/components/src/custom-select-control/README.md b/packages/components/src/custom-select-control/README.md index c72aa2dd569bc..6d63381429ba1 100644 --- a/packages/components/src/custom-select-control/README.md +++ b/packages/components/src/custom-select-control/README.md @@ -71,7 +71,7 @@ Optional classname for the component. #### `hideLabelFromVision`: `boolean` -Hide the label visually, while keeping available to assistive technology +Hide the label visually, while keeping available to assistive technology. - Required: No @@ -103,7 +103,7 @@ The list of options that can be chosen from. The size of the control. -- Default: `false` +- Default: `'default'` - Required: No #### `value`: `Option` From 639bec678b3b89184c484c4220d18aaea056bf0a Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Wed, 10 Jul 2024 23:30:16 +0200 Subject: [PATCH 15/16] apply feedback --- packages/components/src/custom-select-control/README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/components/src/custom-select-control/README.md b/packages/components/src/custom-select-control/README.md index 6d63381429ba1..6804f4cf6ecd3 100644 --- a/packages/components/src/custom-select-control/README.md +++ b/packages/components/src/custom-select-control/README.md @@ -106,6 +106,12 @@ The size of the control. - Default: `'default'` - Required: No +#### `showSelectedHint`: `boolean` + +Show the hint of the selected item in the trigger button. + +- Required: No + #### `value`: `Option` Can be used to externally control the value of the control, like in the `MyControlledCustomSelectControl` example above. From 262c4e73d51194adc6d087c7d6e19c9fea40d61f Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Wed, 10 Jul 2024 23:35:27 +0200 Subject: [PATCH 16/16] Updated CHANGELOG --- packages/components/CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md index 21f8aec64379b..7b0c17a67bc40 100644 --- a/packages/components/CHANGELOG.md +++ b/packages/components/CHANGELOG.md @@ -4,7 +4,8 @@ ### Internal -- `CustomSelectControlV2`: animate select popover appearance. ([#63343](https://github.com/WordPress/gutenberg/pull/63343)) +- `CustomSelectControl`: switch to ariakit-based implementation ([#63258](https://github.com/WordPress/gutenberg/pull/63258)). +- `CustomSelectControl`: animate select popover appearance. ([#63343](https://github.com/WordPress/gutenberg/pull/63343)) ### Enhancements @@ -58,7 +59,6 @@ - `TimeInput`: Add `label` prop ([#63106](https://github.com/WordPress/gutenberg/pull/63106)). - Method style type signatures have been changed to function style ([#62718](https://github.com/WordPress/gutenberg/pull/62718)). - `FontSizePicker`: use CustomSelectControl V2 legacy adapter ([#63134](https://github.com/WordPress/gutenberg/pull/63134)). -- `CustomSelectControl`: switch to ariakit-based implementation ([#63258](https://github.com/WordPress/gutenberg/pull/63258)). ## 28.2.0 (2024-06-26)