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

Components: FontSizePicker: Adjust Select Button sizing #19479

Merged
merged 3 commits into from
Jan 29, 2020
+12 −10
Merged

Components: FontSizePicker: Adjust Select Button sizing #19479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a30654
Components: FontSizePicker: Adjust Select Button sizing
Jan 7, 2020
f55084f
Remove buttonProps. Add isSmall as default for CustomSelectControl.
Jan 13, 2020
67f13d2
Fix unit tests and remove isSmall prop
youknowriad Jan 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions packages/components/src/custom-select-control/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ const stateReducer = (
return {
selectedItem:
items[
selectedItem ?
Math.min( items.indexOf( selectedItem ) + 1, items.length - 1 ) :
0
selectedItem
? Math.min( items.indexOf( selectedItem ) + 1, items.length - 1 )
: 0
],
};
case useSelect.stateChangeTypes.ToggleButtonKeyDownArrowUp:
Expand All @@ -40,9 +40,9 @@ const stateReducer = (
return {
selectedItem:
items[
selectedItem ?
Math.max( items.indexOf( selectedItem ) - 1, 0 ) :
items.length - 1
selectedItem
? Math.max( items.indexOf( selectedItem ) - 1, 0 )
: items.length - 1
],
};
default:
Expand Down Expand Up @@ -73,6 +73,7 @@ export default function CustomSelectControl( {
selectedItem: _selectedItem,
stateReducer,
} );

const menuProps = getMenuProps( {
className: 'components-custom-select-control__menu',
} );
Expand Down Expand Up @@ -103,6 +104,7 @@ export default function CustomSelectControl( {
'aria-label': label,
'aria-labelledby': undefined,
className: 'components-custom-select-control__button',
isSmall: true,
} ) }
>
{ itemToString( selectedItem ) }
Expand Down
8 changes: 4 additions & 4 deletions storybook/test/__snapshots__/index.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2554,7 +2554,7 @@ exports[`Storyshots Components/CustomSelectControl Default 1`] = `
aria-expanded={false}
aria-haspopup="listbox"
aria-label="Font Size"
className="components-button components-custom-select-control__button"
className="components-button components-custom-select-control__button is-small"
id="downshift-null-toggle-button"
onClick={[Function]}
onKeyDown={[Function]}
Expand Down Expand Up @@ -3092,7 +3092,7 @@ exports[`Storyshots Components/FontSizePicker Default 1`] = `
aria-expanded={false}
aria-haspopup="listbox"
aria-label="Preset Size"
className="components-button components-custom-select-control__button"
className="components-button components-custom-select-control__button is-small"
id="downshift-null-toggle-button"
onClick={[Function]}
onKeyDown={[Function]}
Expand Down Expand Up @@ -3180,7 +3180,7 @@ exports[`Storyshots Components/FontSizePicker With Slider 1`] = `
aria-expanded={false}
aria-haspopup="listbox"
aria-label="Preset Size"
className="components-button components-custom-select-control__button"
className="components-button components-custom-select-control__button is-small"
id="downshift-null-toggle-button"
onClick={[Function]}
onKeyDown={[Function]}
Expand Down Expand Up @@ -3312,7 +3312,7 @@ exports[`Storyshots Components/FontSizePicker Without Custom Sizes 1`] = `
aria-expanded={false}
aria-haspopup="listbox"
aria-label="Preset Size"
className="components-button components-custom-select-control__button"
className="components-button components-custom-select-control__button is-small"
id="downshift-null-toggle-button"
onClick={[Function]}
onKeyDown={[Function]}
Expand Down