Skip to content

ColorPicker: Cleanly implement large size #42002

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

Merged
mirka merged 3 commits into from
Jul 15, 2022
Merged

ColorPicker: Cleanly implement large size #42002

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
d573ad8
ColorPicker: Cleanly implement large size
mirka Apr 29, 2022
842d5c8
Add changelog
mirka Jul 15, 2022
4160194
Fix prefix spacing
mirka Jul 15, 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 @@ -9,6 +9,7 @@

### Internal

- `ColorPicker`: Clean up implementation of 40px size ([#42002](https://github.com/WordPress/gutenberg/pull/42002/)).
- `Divider`: Complete TypeScript migration ([#41991](https://github.com/WordPress/gutenberg/pull/41991)).
- `Divider`, `Flex`, `Spacer`: Improve documentation for the `SpaceInput` prop ([#42376](https://github.com/WordPress/gutenberg/pull/42376)).
- `Elevation`: Convert to TypeScript ([#42302](https://github.com/WordPress/gutenberg/pull/42302)).
Expand Down
3 changes: 2 additions & 1 deletion packages/components/src/color-picker/hex-input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export const HexInput = ( { color, onChange, enableAlpha }: HexInputProps ) => {
prefix={
<Spacer
as={ Text }
marginLeft={ space( 3.5 ) }
marginLeft={ space( 4 ) }
color={ COLORS.ui.theme }
lineHeight={ 1 }
>
Expand All @@ -65,6 +65,7 @@ export const HexInput = ( { color, onChange, enableAlpha }: HexInputProps ) => {
maxLength={ enableAlpha ? 9 : 7 }
label={ __( 'Hex color' ) }
hideLabelFromVision
size="__unstable-large"
__unstableStateReducer={ stateReducer }
__unstableInputWidth="9em"
/>
Expand Down
3 changes: 2 additions & 1 deletion packages/components/src/color-picker/input-with-slider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,15 @@ export const InputWithSlider = ( {
prefix={
<Spacer
as={ Text }
paddingLeft={ space( 3.5 ) }
paddingLeft={ space( 4 ) }
color={ COLORS.ui.theme }
lineHeight={ 1 }
>
{ abbreviation }
</Spacer>
}
hideHTMLArrows
size="__unstable-large"
/>
<RangeControl
label={ label }
Expand Down
11 changes: 0 additions & 11 deletions packages/components/src/color-picker/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import { HStack } from '../h-stack';
import {
BackdropUI,
Container as InputControlContainer,
Input,
} from '../input-control/styles/input-control-styles';
import CONFIG from '../utils/config-values';

Expand All @@ -44,14 +43,6 @@ export const RangeControl = styled( InnerRangeControl )`
}
`;

// All inputs should be the same height so this should be changed at the component level.
// That involves changing heights of multiple input types probably buttons too etc.
// So until that is done we are already using the new height on the color picker so it matches the mockups.
const inputHeightStyle = `
&&& ${ Input } {
height: 40px;
}`;

// Make the Hue circle picker not go out of the bar.
const interactiveHueStyles = `
.react-colorful__interactive {
Expand Down Expand Up @@ -125,8 +116,6 @@ export const ColorfulWrapper = styled.div`
${ StyledField } {
margin-bottom: 0;
}

${ inputHeightStyle }
`;

export const CopyButton = styled( Button )`
Expand Down