Skip to content

Commit 0456fd8

Browse files
committed
a11y: return focus to parent button on reset
1 parent c1dcacc commit 0456fd8

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

packages/block-editor/src/components/global-styles/shadow-panel-components.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
Composite,
1414
Tooltip,
1515
} from '@wordpress/components';
16-
import { useMemo } from '@wordpress/element';
16+
import { useMemo, useRef } from '@wordpress/element';
1717
import { shadow as shadowIcon, Icon, check, reset } from '@wordpress/icons';
1818

1919
/**
@@ -135,10 +135,13 @@ export function ShadowPopover( { shadow, onShadowChange, settings } ) {
135135

136136
function renderShadowToggle( shadow, onShadowChange ) {
137137
return ( { onToggle, isOpen } ) => {
138+
const shadowButtonRef = useRef( undefined );
139+
138140
const toggleProps = {
139141
onClick: onToggle,
140142
className: clsx( { 'is-open': isOpen } ),
141143
'aria-expanded': isOpen,
144+
ref: shadowButtonRef,
142145
};
143146

144147
const removeButtonProps = {
@@ -147,6 +150,8 @@ function renderShadowToggle( shadow, onShadowChange ) {
147150
onToggle();
148151
}
149152
onShadowChange( undefined );
153+
// Return focus to parent button.
154+
shadowButtonRef.current?.focus();
150155
},
151156
className: clsx(
152157
'block-editor-global-styles__shadow-editor__remove-button',

0 commit comments

Comments
 (0)