Skip to content

Button Component: update to use non-deprecated attributes #23242

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
oskosk merged 11 commits into from
Mar 7, 2022
Merged

Button Component: update to use non-deprecated attributes #23242

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5f484f8
Blocks: update secondary buttons to use non-deprecated attribute.
jeherve Mar 4, 2022
7d8ede2
Remove isLarge, it is not used anymore.
jeherve Mar 4, 2022
32d4faa
Update changelog entry
jeherve Mar 4, 2022
1346801
Replace all isPrimary references
jeherve Mar 4, 2022
e26a5f0
Update the logic to be simpler
jeherve Mar 4, 2022
ed89c6b
Move from isSecondary to variant
jeherve Mar 4, 2022
4fa2f08
Move from isLink to variant
jeherve Mar 4, 2022
63ce6f5
Move from isTertiary to variant
jeherve Mar 4, 2022
068d579
Update usage of the Button component in our other projects
jeherve Mar 4, 2022
863ed5c
Bump versions
jeherve Mar 4, 2022
bb8fe46
Merge branch 'master' into update/buttons-deprecated-isdefault
oskosk Mar 7, 2022
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
Update the logic to be simpler 
This was already refactored in #19778, but didn't need to remain that complicated.
  • Loading branch information
@jeherve
jeherve committed Mar 4, 2022
commit e26a5f09eda7e428e6a1fa49b280651c1ea7c7b4
12 changes: 3 additions & 9 deletions projects/plugins/jetpack/extensions/shared/external-media/media-button/media-menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ import MediaSources from './media-sources';
function MediaButtonMenu( props ) {
const { mediaProps, open, setSelectedSource, isFeatured, isReplace, hasImage } = props;
const originalComponent = mediaProps.render;
let isPrimary = isFeatured;
let isSecondary = false;
let isTertiary = ! isFeatured;
let variant = 'tertiary';

if ( isReplace ) {
return (
Expand All @@ -39,9 +37,7 @@ function MediaButtonMenu( props ) {

if ( isFeatured ) {
label = __( 'Replace Image', 'jetpack' );
isPrimary = false;
isTertiary = false;
isSecondary = true;
variant = 'secondary';
}

return (
Expand All @@ -60,9 +56,7 @@ function MediaButtonMenu( props ) {
}
return (
<Button
isPrimary={ isPrimary }
isSecondary={ isSecondary }
isTertiary={ isTertiary }
variant={ variant }
className="jetpack-external-media-button-menu"
aria-haspopup="true"
aria-expanded={ isOpen }
Expand Down