refactor: revert usage of clearable prop

WordPress · Feb 3, 2025 · 1c61404 · 1c61404
1 parent 1ec75a0
commit 1c61404
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/packages/block-editor/src/components/global-styles/filters-panel.js b/packages/block-editor/src/components/global-styles/filters-panel.js
@@ -120,7 +120,7 @@ const LabeledColorIndicator = ( { indicator, label } ) => (
 );
 
 const renderToggle =
-	( duotone, resetDuotone, clearable ) =>
+	( duotone, resetDuotone ) =>
 	( { onToggle, isOpen } ) => {
 		const toggleProps = {
 			onClick: onToggle,
@@ -140,7 +140,7 @@ const renderToggle =
 						label={ __( 'Duotone' ) }
 					/>
 				</Item>
-				{ clearable && duotone && (
+				{ duotone && (
 					<Button
 						__next40pxDefaultSize
 						label={ __( 'Reset' ) }
@@ -162,7 +162,6 @@ export default function FiltersPanel( {
 	settings,
 	panelId,
 	defaultControls = DEFAULT_CONTROLS,
-	clearable = false,
 } ) {
 	const decodeValue = ( rawValue ) =>
 		getValueFromVariable( { settings }, '', rawValue );
@@ -220,11 +219,7 @@ export default function FiltersPanel( {
 					<Dropdown
 						popoverProps={ popoverProps }
 						className="block-editor-global-styles-filters-panel__dropdown"
-						renderToggle={ renderToggle(
-							duotone,
-							resetDuotone,
-							clearable
-						) }
+						renderToggle={ renderToggle( duotone, resetDuotone ) }
 						renderContent={ () => (
 							<DropdownContentWrapper paddingSize="small">
 								<MenuGroup label={ __( 'Duotone' ) }>

diff --git a/packages/block-editor/src/components/global-styles/style.scss b/packages/block-editor/src/components/global-styles/style.scss
@@ -88,8 +88,9 @@
 	top: $grid-unit;
 	margin: auto $grid-unit auto;
 	opacity: 0;
-	transition: opacity 0.1s ease-in-out;
-	@include reduce-motion("transition");
+	@media not (prefers-reduced-motion) {
+		transition: opacity 0.1s ease-in-out;
+	}
 
 	.block-editor-panel-duotone-settings__dropdown:hover + &,
 	&:focus,

diff --git a/packages/block-editor/src/hooks/duotone.js b/packages/block-editor/src/hooks/duotone.js
@@ -143,7 +143,6 @@ function DuotonePanelPure( { style, setAttributes, name } ) {
 						setAttributes( { style: newStyle } );
 					} }
 					settings={ settings }
-					clearable
 				/>
 			</InspectorControls>
 			<BlockControls group="block" __experimentalShareWithChildBlocks>