FontSizePicker: Replace SCSS with Emotion + components (#44483)

* Replace SCSS with Emotion + components * Nuke .components-color-palette__clear * Go back to only using VStack when __nextHasNoMarginBottom is set * Update CHANGELOG.md * Make Reset button always 30px high
WordPress · Sep 29, 2022 · 02c5684 · 02c5684
1 parent d6f4bb1
commit 02c5684
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 121 deletions.
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
@@ -15,6 +15,7 @@
 -   `ResizableBox` updated to pass the `react/exhaustive-deps` eslint rule ([#44370](https://github.com/WordPress/gutenberg/pull/44370)).
 -   `Sandbox`: updated to satisfy `react/exhaustive-deps` eslint rule ([#44378](https://github.com/WordPress/gutenberg/pull/44378))
 -   `FontSizePicker`: Convert to TypeScript ([#44449](https://github.com/WordPress/gutenberg/pull/44449)).
+-   `FontSizePicker`: Replace SCSS with Emotion + components ([#44483](https://github.com/WordPress/gutenberg/pull/44483)).
 
 ## 21.1.0 (2022-09-21)
 

diff --git a/packages/components/src/font-size-picker/index.tsx b/packages/components/src/font-size-picker/index.tsx
@@ -1,7 +1,6 @@
 /**
  * External dependencies
  */
-import classNames from 'classnames';
 import type { ReactNode, ForwardedRef } from 'react';
 
 /**
@@ -15,7 +14,6 @@ import { useState, useMemo, forwardRef } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import { BaseControl } from '../base-control';
 import Button from '../button';
 import RangeControl from '../range-control';
 import { Flex, FlexItem } from '../flex';
@@ -40,6 +38,14 @@ import type {
 	FontSizeSelectOption,
 	FontSizeToggleGroupOption,
 } from './types';
+import {
+	Container,
+	HeaderHint,
+	HeaderLabel,
+	Controls,
+	ResetButton,
+} from './styles';
+import { Spacer } from '../spacer';
 
 // This conditional is needed to maintain the spacing before the slider in the `withSlider` case.
 const MaybeVStack = ( {
@@ -163,49 +169,49 @@ const UnforwardedFontSizePicker = (
 		__( 'Currently selected font size: %s' ),
 		selectedOption.name
 	);
-	const baseClassName = 'components-font-size-picker';
 	return (
-		<fieldset className={ baseClassName } { ...( ref ? {} : { ref } ) }>
+		<Container ref={ ref } className="components-font-size-picker">
 			<VisuallyHidden as="legend">{ __( 'Font size' ) }</VisuallyHidden>
-			<HStack className={ `${ baseClassName }__header` }>
-				<BaseControl.VisualLabel>
-					{ __( 'Size' ) }
-					{ headerHint && (
-						<span className={ `${ baseClassName }__header__hint` }>
-							{ headerHint }
-						</span>
+			<Spacer>
+				<HStack className="components-font-size-picker__header">
+					<HeaderLabel>
+						{ __( 'Size' ) }
+						{ headerHint && (
+							<HeaderHint className="components-font-size-picker__header__hint">
+								{ headerHint }
+							</HeaderHint>
+						) }
+					</HeaderLabel>
+					{ ! disableCustomFontSizes && (
+						<Button
+							label={
+								showCustomValueControl
+									? __( 'Use size preset' )
+									: __( 'Set custom size' )
+							}
+							icon={ settings }
+							onClick={ () => {
+								setShowCustomValueControl(
+									! showCustomValueControl
+								);
+							} }
+							isPressed={ showCustomValueControl }
+							isSmall
+						/>
 					) }
-				</BaseControl.VisualLabel>
-				{ ! disableCustomFontSizes && (
-					<Button
-						label={
-							showCustomValueControl
-								? __( 'Use size preset' )
-								: __( 'Set custom size' )
-						}
-						icon={ settings }
-						onClick={ () => {
-							setShowCustomValueControl(
-								! showCustomValueControl
-							);
-						} }
-						isPressed={ showCustomValueControl }
-						isSmall
-					/>
-				) }
-			</HStack>
+				</HStack>
+			</Spacer>
 			<MaybeVStack __nextHasNoMarginBottom={ __nextHasNoMarginBottom }>
-				<div
-					className={ classNames( `${ baseClassName }__controls`, {
-						'is-next-has-no-margin-bottom': __nextHasNoMarginBottom,
-					} ) }
+				<Controls
+					className="components-font-size-picker__controls"
+					__nextHasNoMarginBottom={ __nextHasNoMarginBottom }
 				>
 					{ !! fontSizes.length &&
 						shouldUseSelectControl &&
 						! showCustomValueControl && (
 							<CustomSelectControl
 								__nextUnconstrainedWidth
-								className={ `${ baseClassName }__select` }
+								className="components-font-size-picker__select"
 								label={ __( 'Font size' ) }
 								hideLabelFromVision
 								describedBy={ currentFontSizeSR }
@@ -267,7 +273,7 @@ const UnforwardedFontSizePicker = (
 						showCustomValueControl && (
 							<Flex
 								justify="space-between"
-								className={ `${ baseClassName }__custom-size-control` }
+								className="components-font-size-picker__custom-size-control"
 							>
 								<FlexItem isBlock>
 									<UnitControl
@@ -298,8 +304,7 @@ const UnforwardedFontSizePicker = (
 								</FlexItem>
 								{ withReset && (
 									<FlexItem isBlock>
-										<Button
-											className="components-color-palette__clear"
+										<ResetButton
 											disabled={ value === undefined }
 											onClick={ () => {
 												onChange?.( undefined );
@@ -308,16 +313,16 @@ const UnforwardedFontSizePicker = (
 											variant="secondary"
 										>
 											{ __( 'Reset' ) }
-										</Button>
+										</ResetButton>
 									</FlexItem>
 								) }
 							</Flex>
 						) }
-				</div>
+				</Controls>
 				{ withSlider && (
 					<RangeControl
 						__nextHasNoMarginBottom={ __nextHasNoMarginBottom }
-						className={ `${ baseClassName }__custom-input` }
+						className="components-font-size-picker__custom-input"
 						label={ __( 'Custom Size' ) }
 						value={
 							isPixelValue && noUnitsValue
@@ -333,7 +338,7 @@ const UnforwardedFontSizePicker = (
 					/>
 				) }
 			</MaybeVStack>
-		</fieldset>
+		</Container>
 	);
 };
 

diff --git a/packages/components/src/font-size-picker/style.scss b/packages/components/src/font-size-picker/style.scss
diff --git a/packages/components/src/font-size-picker/styles.ts b/packages/components/src/font-size-picker/styles.ts
@@ -0,0 +1,44 @@
+/**
+ * External dependencies
+ */
+import styled from '@emotion/styled';
+
+/**
+ * Internal dependencies
+ */
+import BaseControl from '../base-control';
+import Button from '../button';
+import { space } from '../ui/utils/space';
+import { COLORS } from '../utils';
+
+export const Container = styled.fieldset`
+	border: 0;
+	margin: 0;
+	padding: 0;
+`;
+
+export const HeaderLabel = styled( BaseControl.VisualLabel )`
+	margin-bottom: 0;
+`;
+
+export const HeaderHint = styled.span`
+	color: ${ COLORS.gray[ 700 ] };
+	margin-left: ${ space( 1 ) };
+`;
+
+// 280px is the sidebar width.
+// TODO: Remove this, @wordpress/components shouldn't care what a "sidebar" is.
+export const Controls = styled.div< {
+	__nextHasNoMarginBottom: boolean;
+} >`
+	max-width: calc( 280px - ${ space( 4 ) } * 2 );
+
+	${ ( props ) =>
+		! props.__nextHasNoMarginBottom && `margin-bottom: ${ space( 6 ) };` }
+`;
+
+export const ResetButton = styled( Button )`
+	&&& {
+		height: 30px;
+	}
+`;
diff --git a/packages/components/src/style.scss b/packages/components/src/style.scss
@@ -17,7 +17,6 @@
 @import "./dropdown/style.scss";
 @import "./dropdown-menu/style.scss";
 @import "./duotone-picker/style.scss";
-@import "./font-size-picker/style.scss";
 @import "./form-toggle/style.scss";
 @import "./form-token-field/style.scss";
 @import "./guide/style.scss";