Remove unnecessary ToolbarGroup

WordPress · Sep 11, 2024 · e27e730 · e27e730
1 parent 0eb13a8
commit e27e730
Showing 1 changed file with 101 additions and 105 deletions.
diff --git a/packages/block-library/src/image/image.js b/packages/block-library/src/image/image.js
@@ -639,116 +639,112 @@ export default function Image( {
 						) }
 
 					<BlockControls group="other">
-						<ToolbarGroup>
-							<Dropdown
-								popoverProps={ { position: 'bottom right' } }
-								renderToggle={ ( { isOpen, onToggle } ) => (
-									<ToolbarButton
-										onClick={ onToggle }
-										aria-haspopup="true"
-										aria-expanded={ isOpen }
-										onKeyDown={ ( event ) => {
-											if (
-												! isOpen &&
-												event.keyCode === DOWN
-											) {
-												event.preventDefault();
-												onToggle();
-											}
-										} }
-									>
-										{ _x(
-											'Alt',
-											'Alternative text for an image. Block toolbar label, a low character count is preferred.'
-										) }
-									</ToolbarButton>
-								) }
-								renderContent={ () => (
-									<TextareaControl
-										className="wp-block-image__toolbar_content_textarea"
-										label={ __( 'Alternative text' ) }
-										value={ alt || '' }
-										onChange={ updateAlt }
-										disabled={ lockAltControls }
-										help={
-											lockAltControls ? (
-												<>{ lockAltControlsMessage }</>
-											) : (
-												<>
-													<ExternalLink
-														href={
-															// translators: Localized tutorial, if one exists. W3C Web Accessibility Initiative link has list of existing translations.
-															__(
-																'https://www.w3.org/WAI/tutorials/images/decision-tree/'
-															)
-														}
-													>
-														{ __(
-															'Describe the purpose of the image.'
-														) }
-													</ExternalLink>
-													<br />
+						<Dropdown
+							popoverProps={ { position: 'bottom right' } }
+							renderToggle={ ( { isOpen, onToggle } ) => (
+								<ToolbarButton
+									onClick={ onToggle }
+									aria-haspopup="true"
+									aria-expanded={ isOpen }
+									onKeyDown={ ( event ) => {
+										if (
+											! isOpen &&
+											event.keyCode === DOWN
+										) {
+											event.preventDefault();
+											onToggle();
+										}
+									} }
+								>
+									{ _x(
+										'Alt',
+										'Alternative text for an image. Block toolbar label, a low character count is preferred.'
+									) }
+								</ToolbarButton>
+							) }
+							renderContent={ () => (
+								<TextareaControl
+									className="wp-block-image__toolbar_content_textarea"
+									label={ __( 'Alternative text' ) }
+									value={ alt || '' }
+									onChange={ updateAlt }
+									disabled={ lockAltControls }
+									help={
+										lockAltControls ? (
+											<>{ lockAltControlsMessage }</>
+										) : (
+											<>
+												<ExternalLink
+													href={
+														// translators: Localized tutorial, if one exists. W3C Web Accessibility Initiative link has list of existing translations.
+														__(
+															'https://www.w3.org/WAI/tutorials/images/decision-tree/'
+														)
+													}
+												>
 													{ __(
-														'Leave empty if decorative.'
+														'Describe the purpose of the image.'
 													) }
-												</>
-											)
+												</ExternalLink>
+												<br />
+												{ __(
+													'Leave empty if decorative.'
+												) }
+											</>
+										)
+									}
+									__nextHasNoMarginBottom
+								/>
+							) }
+						/>
+						<Dropdown
+							popoverProps={ { position: 'bottom right' } }
+							renderToggle={ ( { isOpen, onToggle } ) => (
+								<ToolbarButton
+									onClick={ onToggle }
+									aria-haspopup="true"
+									aria-expanded={ isOpen }
+									onKeyDown={ ( event ) => {
+										if (
+											! isOpen &&
+											event.keyCode === DOWN
+										) {
+											event.preventDefault();
+											onToggle();
 										}
-										__nextHasNoMarginBottom
-									/>
-								) }
-							/>
-							<Dropdown
-								popoverProps={ { position: 'bottom right' } }
-								renderToggle={ ( { isOpen, onToggle } ) => (
-									<ToolbarButton
-										onClick={ onToggle }
-										aria-haspopup="true"
-										aria-expanded={ isOpen }
-										onKeyDown={ ( event ) => {
-											if (
-												! isOpen &&
-												event.keyCode === DOWN
-											) {
-												event.preventDefault();
-												onToggle();
-											}
-										} }
-									>
-										{ __( 'Title' ) }
-									</ToolbarButton>
-								) }
-								renderContent={ () => (
-									<TextControl
-										__next40pxDefaultSize
-										className="wp-block-image__toolbar_content_textarea"
-										__nextHasNoMarginBottom
-										label={ __( 'Title attribute' ) }
-										value={ title || '' }
-										onChange={ onSetTitle }
-										disabled={ lockTitleControls }
-										help={
-											lockTitleControls ? (
-												<>
-													{ lockTitleControlsMessage }
-												</>
-											) : (
-												<>
+									} }
+								>
+									{ __( 'Title' ) }
+								</ToolbarButton>
+							) }
+							renderContent={ () => (
+								<TextControl
+									__next40pxDefaultSize
+									className="wp-block-image__toolbar_content_textarea"
+									__nextHasNoMarginBottom
+									label={ __( 'Title attribute' ) }
+									value={ title || '' }
+									onChange={ onSetTitle }
+									disabled={ lockTitleControls }
+									help={
+										lockTitleControls ? (
+											<>{ lockTitleControlsMessage }</>
+										) : (
+											<>
+												{ __(
+													'Describe the role of this image on the page.'
+												) }
+												<ExternalLink href="https://www.w3.org/TR/html52/dom.html#the-title-attribute">
 													{ __(
-														'Describe the role of this image on the page.'
+														'(Note: many devices and browsers do not display this text.)'
 													) }
-													<ExternalLink href="https://www.w3.org/TR/html52/dom.html#the-title-attribute">
-														{ __(
-															'(Note: many devices and browsers do not display this text.)'
-														) }
-													</ExternalLink>
-												</>
-											)
-										}
-									/>
-								) }
-							/>
-						</ToolbarGroup>
+												</ExternalLink>
+											</>
+										)
+									}
+								/>
+							) }
+						/>
 					</BlockControls>
 				</>
 			) }