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

CustomSelectControl: Add flag for larger default size #39401

Merged
merged 6 commits into from
Mar 21, 2022
Merged

CustomSelectControl: Add flag for larger default size #39401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
da01e50
CustomSelectControl: Add flag for larger default size
mirka Mar 11, 2022
ff4b0bd
Migrate stories
mirka Mar 11, 2022
916720d
Add changelog entry
mirka Mar 11, 2022
126c3d9
Increase paddings to 16px
mirka Mar 14, 2022
982a4a6
Fixup changelog
mirka Mar 14, 2022
87089ef
Merge branch 'trunk' into enlarge-custom-select-control
mirka Mar 18, 2022
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
1 change: 1 addition & 0 deletions packages/components/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### Enhancements

- `CustomSelectControl`: Add `__next36pxDefaultSize` flag for larger default size ([#39401](https://github.com/WordPress/gutenberg/pull/39401)).
- `BaseControl`: Add `__nextHasNoMarginBottom` prop for opting into the new margin-free styles ([#39325](https://github.com/WordPress/gutenberg/pull/39325)).
- `Divider`: Make the divider visible by default (`display: inline`) in flow layout containers when the divider orientation is vertical ([#39316](https://github.com/WordPress/gutenberg/pull/39316)).
- Stop using deprecated `event.keyCode` in favor of `event.key` for keyboard events in `UnitControl` and `InputControl`. ([#39360](https://github.com/WordPress/gutenberg/pull/39360))
Expand Down
10 changes: 8 additions & 2 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 @@ -56,6 +56,8 @@ const stateReducer = (
}
};
export default function CustomSelectControl( {
/** Start opting into the larger default height that will become the default size in a future version. */
__next36pxDefaultSize = false,
className,
hideLabelFromVision,
label,
Expand Down Expand Up @@ -141,8 +143,11 @@ export default function CustomSelectControl( {
// This is needed because some speech recognition software don't support `aria-labelledby`.
'aria-label': label,
'aria-labelledby': undefined,
className: 'components-custom-select-control__button',
isSmall: true,
className: classnames(
'components-custom-select-control__button',
{ 'is-next-36px-default-size': __next36pxDefaultSize }
),
isSmall: ! __next36pxDefaultSize,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Love it when we rely on composability instead of style overrides

describedBy: getDescribedBy(),
} ) }
>
Expand All @@ -169,6 +174,7 @@ export default function CustomSelectControl( {
'is-highlighted':
index === highlightedIndex,
'has-hint': !! item.__experimentalHint,
'is-next-36px-default-size': __next36pxDefaultSize,
}
),
style: item.style,
Expand Down
151 changes: 77 additions & 74 deletions packages/components/src/custom-select-control/stories/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,81 +6,84 @@ import CustomSelectControl from '../';
export default {
title: 'Components/CustomSelectControl',
component: CustomSelectControl,
};

const defaultOptions = [
{
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 _default = () => (
<CustomSelectControl label="Font size" options={ defaultOptions } />
);

const longLabelOptions = [
{
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.',
argTypes: {
__next36pxDefaultSize: {
control: { type: 'boolean' },
},
},
];
};

export const longLabels = () => (
<CustomSelectControl
label="Testing long labels"
options={ longLabelOptions }
/>
);
export const Default = CustomSelectControl.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%' },
},
],
};

const withHintsOptions = [
{
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',
},
];
export const WithLongLabels = CustomSelectControl.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 hints = () => (
<CustomSelectControl label="Testing hints" options={ withHintsOptions } />
);
export const WithHints = CustomSelectControl.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',
},
],
};
21 changes: 18 additions & 3 deletions packages/components/src/custom-select-control/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,26 @@
.components-custom-select-control__button {
border: 1px solid $gray-700;
border-radius: $radius-block-ui;
min-height: 30px;
min-width: 130px;
position: relative;
text-align: left;

&:not(.is-next-36px-default-size) {
min-height: 30px;
}

// For all button sizes allow sufficient space for the
// dropdown "arrow" icon to display.
&.components-custom-select-control__button {
padding-right: $icon-size;
// TODO: Some of these can be removed after some internal inconsistencies are addressed, such as the chevron
// (https://github.com/WordPress/gutenberg/issues/39400) and Button padding (https://github.com/WordPress/gutenberg/issues/39431)
padding-left: $grid-unit-20;
padding-right: $icon-size + $grid-unit-10;

&:not(.is-next-36px-default-size) {
padding-left: $grid-unit-10;
padding-right: $icon-size;
}
}

&:focus:not(:disabled) {
Expand Down Expand Up @@ -61,10 +72,14 @@
display: grid;
grid-template-columns: auto auto;
list-style-type: none;
padding: $grid-unit-10;
padding: $grid-unit-10 $grid-unit-20;
cursor: default;
line-height: $icon-size + $grid-unit-05;

&:not(.is-next-36px-default-size) {
padding: $grid-unit-10;
}

&.has-hint {
grid-template-columns: auto auto 30px;
}
Expand Down