<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][12763] trunk/src: BP Blocks: make sure the Activity Embed block renders the activity</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/12763">12763</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12763","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-10-20 18:25:43 +0000 (Tue, 20 Oct 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>BP Blocks: make sure the Activity Embed block renders the activity
The Activity permalink URL was wrongly reset to an empty string the first time the embed request was made. As a result the error state of the block was rendered.
This commit fixes this issue and brings some complementary improvements:
- Stop using the deprecated Toolbar Block component in favor of the ToolbarGroup one.
- Use the Disabled Block component to disable links inside the rendered activity.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8377">#8377</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivityjsblocksembedactivityjs">trunk/src/bp-activity/js/blocks/embed-activity.js</a></li>
<li><a href="#trunksrcjsbpactivityjsblocksembedactivityeditjs">trunk/src/js/bp-activity/js/blocks/embed-activity/edit.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivityjsblocksembedactivityjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/js/blocks/embed-activity.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/js/blocks/embed-activity.js 2020-10-16 20:42:11 UTC (rev 12762)
+++ trunk/src/bp-activity/js/blocks/embed-activity.js 2020-10-20 18:25:43 UTC (rev 12763)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,11 +220,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> __ = _wp.i18n.__,
</span><span class="cx" style="display: block; padding: 0 10px"> _wp$components = _wp.components,
</span><span class="cx" style="display: block; padding: 0 10px"> Placeholder = _wp$components.Placeholder,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Disabled = _wp$components.Disabled,
</ins><span class="cx" style="display: block; padding: 0 10px"> SandBox = _wp$components.SandBox,
</span><span class="cx" style="display: block; padding: 0 10px"> Button = _wp$components.Button,
</span><span class="cx" style="display: block; padding: 0 10px"> ExternalLink = _wp$components.ExternalLink,
</span><span class="cx" style="display: block; padding: 0 10px"> Spinner = _wp$components.Spinner,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- Toolbar = _wp$components.Toolbar,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ToolbarGroup = _wp$components.ToolbarGroup,
</ins><span class="cx" style="display: block; padding: 0 10px"> ToolbarButton = _wp$components.ToolbarButton,
</span><span class="cx" style="display: block; padding: 0 10px"> compose = _wp.compose.compose,
</span><span class="cx" style="display: block; padding: 0 10px"> withSelect = _wp.data.withSelect,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,7 +275,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> setIsEditingURL(true);
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var editToolbar = createElement(BlockControls, null, createElement(Toolbar, null, createElement(ToolbarButton, {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var editToolbar = createElement(BlockControls, null, createElement(ToolbarGroup, null, createElement(ToolbarButton, {
</ins><span class="cx" style="display: block; padding: 0 10px"> icon: "edit",
</span><span class="cx" style="display: block; padding: 0 10px"> title: __('Edit URL', 'buddypress'),
</span><span class="cx" style="display: block; padding: 0 10px"> onClick: switchBackToURLInput
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -314,10 +315,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if (!preview || !preview['x_buddypress'] || 'activity' !== preview['x_buddypress']) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Reset the URL.
- setAttributes({
- url: ''
- });
</del><span class="cx" style="display: block; padding: 0 10px"> return createElement(Fragment, null, editToolbar, createElement(Placeholder, {
</span><span class="cx" style="display: block; padding: 0 10px"> icon: "buddicons-activity",
</span><span class="cx" style="display: block; padding: 0 10px"> label: label
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -330,10 +327,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> className: "wp-block-embed is-type-bp-activity"
</span><span class="cx" style="display: block; padding: 0 10px"> }, createElement("div", {
</span><span class="cx" style="display: block; padding: 0 10px"> className: "wp-block-embed__wrapper"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }, createElement(SandBox, {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }, createElement(Disabled, null, createElement(SandBox, {
</ins><span class="cx" style="display: block; padding: 0 10px"> html: preview && preview.html ? preview.html : '',
</span><span class="cx" style="display: block; padding: 0 10px"> scripts: [embedScriptURL]
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- })), (!RichText.isEmpty(caption) || isSelected) && createElement(RichText, {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }))), (!RichText.isEmpty(caption) || isSelected) && createElement(RichText, {
</ins><span class="cx" style="display: block; padding: 0 10px"> tagName: "figcaption",
</span><span class="cx" style="display: block; padding: 0 10px"> placeholder: __('Write caption…', 'buddypress'),
</span><span class="cx" style="display: block; padding: 0 10px"> value: caption,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -354,8 +351,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> getEmbedPreview = _select.getEmbedPreview,
</span><span class="cx" style="display: block; padding: 0 10px"> isRequestingEmbedPreview = _select.isRequestingEmbedPreview;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var preview = undefined !== url && getEmbedPreview(url);
- var fetching = undefined !== url && isRequestingEmbedPreview(url);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var preview = !!url && getEmbedPreview(url);
+ var fetching = !!url && isRequestingEmbedPreview(url);
</ins><span class="cx" style="display: block; padding: 0 10px"> return {
</span><span class="cx" style="display: block; padding: 0 10px"> bpSettings: editorSettings.bp.activity || {},
</span><span class="cx" style="display: block; padding: 0 10px"> preview: preview,
</span></span></pre></div>
<a id="trunksrcjsbpactivityjsblocksembedactivityeditjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/bp-activity/js/blocks/embed-activity/edit.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/bp-activity/js/blocks/embed-activity/edit.js 2020-10-16 20:42:11 UTC (rev 12762)
+++ trunk/src/js/bp-activity/js/blocks/embed-activity/edit.js 2020-10-20 18:25:43 UTC (rev 12763)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,11 +12,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> components: {
</span><span class="cx" style="display: block; padding: 0 10px"> Placeholder,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Disabled,
</ins><span class="cx" style="display: block; padding: 0 10px"> SandBox,
</span><span class="cx" style="display: block; padding: 0 10px"> Button,
</span><span class="cx" style="display: block; padding: 0 10px"> ExternalLink,
</span><span class="cx" style="display: block; padding: 0 10px"> Spinner,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- Toolbar,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ToolbarGroup,
</ins><span class="cx" style="display: block; padding: 0 10px"> ToolbarButton,
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> compose: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,13 +65,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> const editToolbar = (
</span><span class="cx" style="display: block; padding: 0 10px"> <BlockControls>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <Toolbar>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <ToolbarGroup>
</ins><span class="cx" style="display: block; padding: 0 10px"> <ToolbarButton
</span><span class="cx" style="display: block; padding: 0 10px"> icon="edit"
</span><span class="cx" style="display: block; padding: 0 10px"> title={ __( 'Edit URL', 'buddypress' ) }
</span><span class="cx" style="display: block; padding: 0 10px"> onClick={ switchBackToURLInput }
</span><span class="cx" style="display: block; padding: 0 10px"> />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </Toolbar>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </ToolbarGroup>
</ins><span class="cx" style="display: block; padding: 0 10px"> </BlockControls>
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,9 +119,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! preview || ! preview['x_buddypress'] || 'activity' !== preview['x_buddypress'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Reset the URL.
- setAttributes( { url: '' } );
-
</del><span class="cx" style="display: block; padding: 0 10px"> return (
</span><span class="cx" style="display: block; padding: 0 10px"> <Fragment>
</span><span class="cx" style="display: block; padding: 0 10px"> { editToolbar }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,10 +139,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> { ! isEditingURL && editToolbar }
</span><span class="cx" style="display: block; padding: 0 10px"> <figure className="wp-block-embed is-type-bp-activity">
</span><span class="cx" style="display: block; padding: 0 10px"> <div className="wp-block-embed__wrapper">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <SandBox
- html={ preview && preview.html ? preview.html : '' }
- scripts={ [ embedScriptURL ] }
- />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <Disabled>
+ <SandBox
+ html={ preview && preview.html ? preview.html : '' }
+ scripts={ [ embedScriptURL ] }
+ />
+ </Disabled>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> { ( ! RichText.isEmpty( caption ) || isSelected ) && (
</span><span class="cx" style="display: block; padding: 0 10px"> <RichText
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,8 +169,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> isRequestingEmbedPreview,
</span><span class="cx" style="display: block; padding: 0 10px"> } = select( 'core' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const preview = undefined !== url && getEmbedPreview( url );
- const fetching = undefined !== url && isRequestingEmbedPreview( url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const preview = !! url && getEmbedPreview( url );
+ const fetching = !! url && isRequestingEmbedPreview( url );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return {
</span><span class="cx" style="display: block; padding: 0 10px"> bpSettings: editorSettings.bp.activity || {},
</span></span></pre>
</div>
</div>
</body>
</html>