Skip to content
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

Jump to bottom

Remove Tooltip workarounds added in the site and block editor #54450

Merged
merged 2 commits into from
Sep 14, 2023
Merged

Remove Tooltip workarounds added in the site and block editor #54450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebae174
Remove workarounds for Icons with Tooltips
brookewp Sep 14, 2023
58e7d2e
Remove wrapper around button
brookewp Sep 14, 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
19 changes: 8 additions & 11 deletions packages/block-editor/src/components/border-radius-control/linked-button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,16 @@ import { __ } from '@wordpress/i18n';
export default function LinkedButton( { isLinked, ...props } ) {
const label = isLinked ? __( 'Unlink radii' ) : __( 'Link radii' );

// TODO: Remove span after merging https://github.com/WordPress/gutenberg/pull/44198
return (
<Tooltip text={ label }>
<span>
<Button
{ ...props }
className="component-border-radius-control__linked-button"
isSmall
icon={ isLinked ? link : linkOff }
iconSize={ 24 }
aria-label={ label }
/>
</span>
<Button
{ ...props }
className="component-border-radius-control__linked-button"
isSmall
icon={ isLinked ? link : linkOff }
iconSize={ 24 }
aria-label={ label }
/>
</Tooltip>
);
}
4 changes: 1 addition & 3 deletions packages/block-editor/src/components/list-view/block-select-button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,7 @@ function ListViewBlockSelectButton(
) }
{ positionLabel && isSticky && (
<Tooltip text={ positionLabel }>
<span className="block-editor-list-view-block-select-button__sticky">
<Icon icon={ pinSmall } />
</span>
<Icon icon={ pinSmall } />
</Tooltip>
) }
{ images.length ? (
Expand Down
3 changes: 1 addition & 2 deletions packages/block-editor/src/components/list-view/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,7 @@
background: rgba($black, 0.3);
}

.block-editor-list-view-block-select-button__lock,
.block-editor-list-view-block-select-button__sticky {
.block-editor-list-view-block-select-button__lock {
line-height: 0;
}

Expand Down
18 changes: 9 additions & 9 deletions packages/edit-site/src/components/page-patterns/grid-item.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,12 +184,10 @@ function GridItem( { categoryId, item, ...props } ) {
'Editing this pattern will also update anywhere it is used'
) }
>
<span>
<Icon
className="edit-site-patterns__pattern-icon"
icon={ itemIcon }
/>
</span>
<Icon
className="edit-site-patterns__pattern-icon"
icon={ itemIcon }
/>
</Tooltip>
) }
<Flex as="span" gap={ 0 } justify="left">
Expand All @@ -213,9 +211,11 @@ function GridItem( { categoryId, item, ...props } ) {
position="top center"
text={ __( 'This pattern cannot be edited.' ) }
>
<span className="edit-site-patterns__pattern-lock-icon">
<Icon icon={ lockSmall } size={ 24 } />
</span>
<Icon
className="edit-site-patterns__pattern-lock-icon"
icon={ lockSmall }
size={ 24 }
/>
</Tooltip>
) }
</Flex>
Expand Down
6 changes: 1 addition & 5 deletions packages/edit-site/src/components/page-patterns/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,7 @@
}

.edit-site-patterns__pattern-lock-icon {
display: inline-flex;

svg {
fill: currentcolor;
}
fill: currentcolor;
}
}

Expand Down
3 changes: 0 additions & 3 deletions packages/edit-site/src/components/sidebar-navigation-screen-pattern/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,3 @@
margin-right: $grid-unit-10;
}

.edit-site-sidebar-navigation-screen-pattern__lock-icon {
display: inline-flex;
}
4 changes: 1 addition & 3 deletions packages/edit-site/src/components/sidebar-navigation-screen-patterns/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,7 @@ function ThemePatternsGroup( { categories, currentCategory, currentType } ) {
category.label
) }
>
<span className="edit-site-sidebar-navigation-screen-pattern__lock-icon">
<Icon icon={ lockSmall } size={ 24 } />
</span>
<Icon icon={ lockSmall } size={ 24 } />
</Tooltip>
</Flex>
}
Expand Down
Loading