Skip to content

HTML block: Fix accessibility issues on back-end #54408

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
alexstine merged 12 commits into from
Sep 20, 2023
Merged

HTML block: Fix accessibility issues on back-end #54408

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
baafaaa
Accessibility fixes for HTML block.
alexstine Sep 13, 2023
7f70f29
Remove focus handling code.
alexstine Sep 13, 2023
75fb6b7
Cleaner useInstanceId handling.
alexstine Sep 13, 2023
2163d54
Add tabindex -1 and title to iFrame.
alexstine Sep 13, 2023
8f9c5d5
README and changelog.
alexstine Sep 13, 2023
0964e6f
Fix conflict.
alexstine Sep 13, 2023
1bb8ea7
Reviewer feedback and refresh.
alexstine Sep 18, 2023
8207748
Revert odd changes.
alexstine Sep 18, 2023
6511280
Reviewer feedback.
alexstine Sep 19, 2023
99c0f45
Refresh.
alexstine Sep 19, 2023
fde547b
Merge branch 'trunk' of github.com:WordPress/gutenberg into fix/html-…
alexstine Sep 19, 2023
54172bc
Revert change.
alexstine Sep 19, 2023
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
Prev Previous commit
Next Next commit
Remove focus handling code.
  • Loading branch information
@alexstine
alexstine committed Sep 13, 2023
commit 7f70f29bd76a0c69df526a14918b0afba0b4dd79
22 changes: 1 addition & 21 deletions packages/block-library/src/html/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* WordPress dependencies
*/
import { __, sprintf } from '@wordpress/i18n';
import { useContext, useEffect, useRef, useState } from '@wordpress/element';
import { useContext, useState } from '@wordpress/element';
import {
BlockControls,
PlainText,
Expand All @@ -23,41 +23,22 @@ import Preview from './preview';

export default function HTMLEdit( { attributes, setAttributes, isSelected } ) {
const [ isPreview, setIsPreview ] = useState();
const [ shouldFocus, setShouldFocus ] = useState( false );
const isDisabled = useContext( Disabled.Context );

const htmlTextareaRef = useRef();
const blockRef = useRef();

const instanceId = useInstanceId( HTMLEdit );
const instanceIdDesc = sprintf( 'html-edit-%d-desc', instanceId );

function switchToPreview() {
setIsPreview( true );
setShouldFocus( true );
}

function switchToHTML() {
setIsPreview( false );
setShouldFocus( true );
}

// Effect for managing focus.
useEffect( () => {
if ( ! shouldFocus ) {
return;
}
if ( isPreview ) {
blockRef?.current?.focus();
} else {
htmlTextareaRef?.current?.focus();
}
}, [ shouldFocus, isPreview ] );

const blockProps = useBlockProps( {
className: 'block-library-html__edit',
'aria-describedby': isPreview ? instanceIdDesc : undefined,
ref: blockRef,
} );

return (
Expand Down Expand Up @@ -98,7 +79,6 @@ export default function HTMLEdit( { attributes, setAttributes, isSelected } ) {
onChange={ ( content ) => setAttributes( { content } ) }
placeholder={ __( 'Write HTML…' ) }
aria-label={ __( 'HTML' ) }
ref={ htmlTextareaRef }
/>
) }
</div>
Expand Down