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

Switch Social Links to use LinkControl component #20740

Closed
wants to merge 4 commits into from
Closed

Switch Social Links to use LinkControl component #20740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
115a6ba
Switch URLInput to LinkControl for external tab
mkaz Mar 9, 2020
35e63dc
Update fixtures
mkaz Mar 9, 2020
6c45cfe
Whitespace
mkaz Mar 9, 2020
be6c567
Shakes fist at PHP equal signs
mkaz Mar 9, 2020
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
4 changes: 4 additions & 0 deletions packages/block-library/src/social-link/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
"service": {
"type": "string"
},
"opensInNewTab": {
"type": "boolean",
"default": false
},
"label": {
"type": "string"
}
Expand Down
26 changes: 18 additions & 8 deletions packages/block-library/src/social-link/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import classNames from 'classnames';
* WordPress dependencies
*/
import {
__experimentalLinkControl as LinkControl,
InspectorControls,
URLPopover,
URLInput,
} from '@wordpress/block-editor';
import { Fragment, useState } from '@wordpress/element';
import {
Expand All @@ -27,12 +27,17 @@ import { keyboardReturn } from '@wordpress/icons';
import { getIconBySite, getNameBySite } from './social-list';

const SocialLinkEdit = ( { attributes, setAttributes, isSelected } ) => {
const { url, service, label } = attributes;
const { url, label, opensInNewTab, service } = attributes;
const [ showURLPopover, setPopover ] = useState( false );
const classes = classNames( 'wp-social-link', 'wp-social-link-' + service, {
'wp-social-link__is-incomplete': ! url,
} );

const link = {
url,
opensInNewTab,
};

// Import icon.
const IconComponent = getIconBySite( service );
const socialLinkName = getNameBySite( service );
Expand Down Expand Up @@ -70,13 +75,18 @@ const SocialLinkEdit = ( { attributes, setAttributes, isSelected } ) => {
} }
>
<div className="block-editor-url-input">
<URLInput
value={ url }
onChange={ ( nextURL ) =>
setAttributes( { url: nextURL } )
<LinkControl
value={ link }
onChange={ ( {
url: newURL = '',
opensInNewTab: newOpensInNewTab,
} = {} ) =>
setAttributes( {
url: encodeURI( newURL ),
opensInNewTab: newOpensInNewTab,
} )
}
placeholder={ __( 'Enter address' ) }
disableSuggestions={ true }
showInitialSuggestions={ false }
/>
</div>
<Button
Expand Down
13 changes: 7 additions & 6 deletions packages/block-library/src/social-link/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@
* @return string Rendered HTML of the referenced block.
*/
function render_block_core_social_link( $attributes ) {
$service = ( isset( $attributes['service'] ) ) ? $attributes['service'] : 'Icon';
$url = ( isset( $attributes['url'] ) ) ? $attributes['url'] : false;
$label = ( isset( $attributes['label'] ) ) ?
$service = ( isset( $attributes['service'] ) ) ? $attributes['service'] : 'Icon';
$url = ( isset( $attributes['url'] ) ) ? $attributes['url'] : false;
$opens_in_new_tab = ( isset( $attributes['opensInNewTab'] ) ) ? $attributes['opensInNewTab'] : false;
$label = ( isset( $attributes['label'] ) ) ?
$attributes['label'] :
/* translators: %s: Social Link service name */
sprintf( __( 'Link to %s' ), block_core_social_link_get_name( $service ) );
Expand All @@ -24,9 +25,9 @@ function render_block_core_social_link( $attributes ) {
if ( ! $url ) {
return '';
}

$icon = block_core_social_link_get_icon( $service );
return '<li class="wp-social-link wp-social-link-' . esc_attr( $service ) . '"><a href="' . esc_url( $url ) . '" aria-label="' . esc_attr( $label ) . '"> ' . $icon . '</a></li>';
$target = ( $opens_in_new_tab ) ? 'target="_new"' : '';
$icon = block_core_social_link_get_icon( $service );
return '<li class="wp-social-link wp-social-link-' . esc_attr( $service ) . '"><a href="' . esc_url( $url ) . '" ' . $target . ' aria-label="' . esc_attr( $label ) . '"> ' . $icon . '</a></li>';
}

/**
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-amazon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "amazon"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-bandcamp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "bandcamp"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-behance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "behance"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-chain.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "chain"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-codepen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "codepen"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-deviantart.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "deviantart"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-dribbble.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "dribbble"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-dropbox.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "dropbox"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-etsy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "etsy"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-facebook.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "facebook"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-feed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "feed"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-fivehundredpx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "fivehundredpx"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-flickr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "flickr"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-foursquare.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "foursquare"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-github.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "github"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-goodreads.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "goodreads"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-google.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "google"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-instagram.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "instagram"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-lastfm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "lastfm"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-linkedin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "linkedin"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-mail.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "mail"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-mastodon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "mastodon"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-medium.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "medium"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-meetup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "meetup"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-pinterest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "pinterest"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-pocket.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "pocket"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-reddit.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "reddit"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-skype.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "skype"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-snapchat.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "snapchat"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-soundcloud.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "soundcloud"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-spotify.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "spotify"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-tumblr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "tumblr"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-twitch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "twitch"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-twitter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "twitter"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-vimeo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "vimeo"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-vk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "vk"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-wordpress.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "wordpress"
},
Expand Down
1 change: 1 addition & 0 deletions packages/e2e-tests/fixtures/blocks/core__social-link-yelp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "core/social-link",
"isValid": true,
"attributes": {
"opensInNewTab": false,
"url": "https://example.com/",
"service": "yelp"
},
Expand Down
Loading