fix: applyOrUnset() consistency.

See: #3859
WordPress · Jan 16, 2018 · 8e87182 · 8e87182
1 parent 8f0aab9
commit 8e87182
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/blocks/alignment-toolbar/index.js b/blocks/alignment-toolbar/index.js
@@ -23,6 +23,10 @@ const ALIGNMENT_CONTROLS = [
 ];
 
 export default function AlignmentToolbar( { value, onChange } ) {
+	function applyOrUnset( align ) {
+		return () => onChange( value === align ? undefined : align );
+	}
+
 	return (
 		<Toolbar
 			controls={ ALIGNMENT_CONTROLS.map( ( control ) => {
@@ -32,7 +36,7 @@ export default function AlignmentToolbar( { value, onChange } ) {
 				return {
 					...control,
 					isActive,
-					onClick: () => onChange( isActive ? undefined : align ),
+					onClick: applyOrUnset( align ),
 				};
 			} ) }
 		/>

diff --git a/blocks/color-palette/index.js b/blocks/color-palette/index.js
@@ -18,6 +18,10 @@ import './style.scss';
 export function ColorPalette( { defaultColors, colors, value, onChange } ) {
 	const usedColors = colors || defaultColors;
 
+	function applyOrUnset( color ) {
+		return () => onChange( value === color ? undefined : color );
+	}
+
 	return (
 		<div className="blocks-color-palette">
 			{ usedColors.map( ( color ) => {
@@ -30,7 +34,7 @@ export function ColorPalette( { defaultColors, colors, value, onChange } ) {
 							type="button"
 							className={ className }
 							style={ style }
-							onClick={ () => onChange( value === color ? undefined : color ) }
+							onClick={ applyOrUnset( color ) }
 							aria-label={ sprintf( __( 'Color: %s' ), color ) }
 							aria-pressed={ value === color }
 						/>