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

ColorGradientControl: Fix awkward padding in popover #43018

Merged
merged 7 commits into from
Aug 8, 2022
Merged

ColorGradientControl: Fix awkward padding in popover #43018

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c1ed656
ColorGradientControl: Fix awkward padding in popover
mirka Aug 5, 2022
b977d73
Change API
mirka Aug 5, 2022
96415c7
Simplify
mirka Aug 5, 2022
5d32483
Simplify
mirka Aug 5, 2022
93932a0
Update snapshot
mirka Aug 5, 2022
e38b7a8
Fix popover width regression
mirka Aug 8, 2022
ca303ef
Merge branch 'trunk' into update/color-popover-padding
mirka Aug 8, 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
158 changes: 81 additions & 77 deletions packages/block-editor/src/components/color-palette/test/__snapshots__/control.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,100 +147,104 @@ exports[`ColorPaletteControl matches the snapshot 1`] = `
</div>
</legend>
<div
className="components-flex components-h-stack components-v-stack emotion-8 emotion-5"
data-wp-c16t={true}
data-wp-component="VStack"
className="block-editor-color-gradient-control__panel"
>
<div
className="components-dropdown"
tabIndex="-1"
className="components-flex components-h-stack components-v-stack emotion-8 emotion-5"
data-wp-c16t={true}
data-wp-component="VStack"
>
<button
aria-expanded={false}
aria-haspopup="true"
aria-label="Custom color picker. The currently selected color is called \\"red\\" and has a value of \\"f00\\"."
className="components-flex components-color-palette__custom-color emotion-10 emotion-5"
data-wp-c16t={true}
data-wp-component="Flex"
onClick={[Function]}
style={
Object {
"background": "#f00",
"color": "#000",
}
}
<div
className="components-dropdown"
tabIndex="-1"
>
<span
className="components-truncate components-flex-item components-color-palette__custom-color-name emotion-5 emotion-13 emotion-5"
data-wp-c16t={true}
data-wp-component="FlexItem"
>
red
</span>
<span
className="components-flex-item components-color-palette__custom-color-value emotion-15 emotion-5"
<button
aria-expanded={false}
aria-haspopup="true"
aria-label="Custom color picker. The currently selected color is called \\"red\\" and has a value of \\"f00\\"."
className="components-flex components-color-palette__custom-color emotion-10 emotion-5"
data-wp-c16t={true}
data-wp-component="FlexItem"
data-wp-component="Flex"
onClick={[Function]}
style={
Object {
"background": "#f00",
"color": "#000",
}
}
>
f00
</span>
</button>
</div>
<div
className="components-circular-option-picker"
>
<span
className="components-truncate components-flex-item components-color-palette__custom-color-name emotion-5 emotion-13 emotion-5"
data-wp-c16t={true}
data-wp-component="FlexItem"
>
red
</span>
<span
className="components-flex-item components-color-palette__custom-color-value emotion-15 emotion-5"
data-wp-c16t={true}
data-wp-component="FlexItem"
>
f00
</span>
</button>
</div>
<div
className="components-circular-option-picker__swatches"
className="components-circular-option-picker"
>
<div
className="components-circular-option-picker__option-wrapper"
className="components-circular-option-picker__swatches"
>
<div
className="components-circular-option-picker__option-wrapper"
>
<button
aria-describedby={null}
aria-label="Color: red"
aria-pressed={true}
className="components-button components-circular-option-picker__option is-pressed"
onBlur={[Function]}
onClick={[Function]}
onFocus={[Function]}
onMouseDown={[Function]}
onMouseEnter={[Function]}
onMouseLeave={[Function]}
style={
Object {
"backgroundColor": "#f00",
"color": "#f00",
}
}
type="button"
/>
<svg
aria-hidden={true}
fill="#000"
focusable={false}
height={24}
viewBox="0 0 24 24"
width={24}
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"
/>
</svg>
</div>
</div>
<div
className="components-circular-option-picker__custom-clear-wrapper"
>
<button
aria-describedby={null}
aria-label="Color: red"
aria-pressed={true}
className="components-button components-circular-option-picker__option is-pressed"
onBlur={[Function]}
className="components-button components-circular-option-picker__clear is-tertiary"
onClick={[Function]}
onFocus={[Function]}
onMouseDown={[Function]}
onMouseEnter={[Function]}
onMouseLeave={[Function]}
style={
Object {
"backgroundColor": "#f00",
"color": "#f00",
}
}
type="button"
/>
<svg
aria-hidden={true}
fill="#000"
focusable={false}
height={24}
viewBox="0 0 24 24"
width={24}
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"
/>
</svg>
Clear
</button>
</div>
</div>
<div
className="components-circular-option-picker__custom-clear-wrapper"
>
<button
aria-describedby={null}
className="components-button components-circular-option-picker__clear is-tertiary"
onClick={[Function]}
type="button"
>
Clear
</button>
</div>
</div>
</div>
</div>
Expand Down
18 changes: 11 additions & 7 deletions packages/block-editor/src/components/colors-gradients/control.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,12 @@ function ColorGradientControlInner( {
),
};

const renderPanelType = ( type ) => (
<div className="block-editor-color-gradient-control__panel">
{ tabPanels[ type ] }
</div>
);

return (
<BaseControl
__nextHasNoMarginBottom
Expand Down Expand Up @@ -142,15 +148,13 @@ function ColorGradientControlInner( {
: !! canChooseAColor && TAB_COLOR.value
}
>
{ ( tab ) => (
<div className="block-editor-color-gradient-control__tab-panel">
{ tabPanels[ tab.value ] }
</div>
) }
{ ( tab ) => renderPanelType( tab.value ) }
</TabPanel>
) }
{ ! canChooseAGradient && tabPanels[ TAB_COLOR.value ] }
{ ! canChooseAColor && tabPanels[ TAB_GRADIENT.value ] }
{ ! canChooseAGradient &&
renderPanelType( TAB_COLOR.value ) }
{ ! canChooseAColor &&
renderPanelType( TAB_GRADIENT.value ) }
</VStack>
</fieldset>
</BaseControl>
Expand Down
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/colors-gradients/dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ export default function ColorGradientSettingsDropdown( {
className="block-editor-tools-panel-color-gradient-settings__dropdown"
renderToggle={ renderToggle( toggleSettings ) }
renderContent={ () => (
<DropdownContentWrapper paddingSize="medium">
<DropdownContentWrapper paddingSize="none">
<div className="block-editor-panel-color-gradient-settings__dropdown-content">
<ColorGradientControl
{ ...controlProps }
Expand Down
14 changes: 10 additions & 4 deletions packages/block-editor/src/components/colors-gradients/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ $swatch-gap: 12px;
min-width: 0;
}

.block-editor-color-gradient-control__tabs {
.block-editor-color-gradient-control__panel {
padding: $grid-unit-20;
}
}

.block-editor-panel-color-gradient-settings.block-editor-panel-color-gradient-settings {
&,
& > div:not(:first-of-type) {
Expand Down Expand Up @@ -42,6 +48,10 @@ $swatch-gap: 12px;

.block-editor-panel-color-gradient-settings__dropdown-content {
width: ( $swatch-size * 6 ) + ( $swatch-gap * 5 ); // Ensure the popover perfectly wraps the swatches.

.block-editor-color-gradient-control__panel {
padding: $grid-unit-20;
}
}

.block-editor-panel-color-gradient-settings__color-indicator {
Expand Down Expand Up @@ -113,7 +123,3 @@ $swatch-gap: 12px;
flex-shrink: 0;
}
}

.block-editor-color-gradient-control__tab-panel {
padding-top: $grid-unit-10;
}
6 changes: 0 additions & 6 deletions packages/edit-site/src/components/global-styles/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,6 @@
padding: $grid-unit-20;
}

.edit-site-screen-background-color__control {
.block-editor-color-gradient-control__tab-panel {
padding: $grid-unit-20;
}
}

.edit-site-global-styles-variations_item {
box-sizing: border-box;

Expand Down