Changeset 12763

Timestamp:

10/20/2020 06:25:43 PM (6 years ago)

Author:

imath

Message:

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 #8377

Location:

trunk/src

Files:

• bp-activity/js/blocks/embed-activity.js (modified) (5 diffs)
• js/bp-activity/js/blocks/embed-activity/edit.js (modified) (6 diffs)

trunk/src/bp-activity/js/blocks/embed-activity.js

@@ -221 +221 @@
     _wp$components = _wp.components,
     Placeholder = _wp$components.Placeholder,
+    Disabled = _wp$components.Disabled,
     SandBox = _wp$components.SandBox,
     Button = _wp$components.Button,
     ExternalLink = _wp$components.ExternalLink,
     Spinner = _wp$components.Spinner,
-    Toolbar = _wp$components.Toolbar,
+    ToolbarGroup = _wp$components.ToolbarGroup,
     ToolbarButton = _wp$components.ToolbarButton,
     compose = _wp.compose.compose,
@@ -275 +276 @@
   };
 
-  var editToolbar = createElement(BlockControls, null, createElement(Toolbar, null, createElement(ToolbarButton, {
+  var editToolbar = createElement(BlockControls, null, createElement(ToolbarGroup, null, createElement(ToolbarButton, {
     icon: "edit",
     title: __('Edit URL', 'buddypress'),
@@ -315 +316 @@
 
   if (!preview || !preview['x_buddypress'] || 'activity' !== preview['x_buddypress']) {
-    // Reset the URL.
-    setAttributes({
-      url: ''
-    });
     return createElement(Fragment, null, editToolbar, createElement(Placeholder, {
       icon: "buddicons-activity",
@@ -331 +328 @@
   }, createElement("div", {
     className: "wp-block-embed__wrapper"
-  }, createElement(SandBox, {
+  }, createElement(Disabled, null, createElement(SandBox, {
     html: preview && preview.html ? preview.html : '',
     scripts: [embedScriptURL]
-  })), (!RichText.isEmpty(caption) || isSelected) && createElement(RichText, {
+  }))), (!RichText.isEmpty(caption) || isSelected) && createElement(RichText, {
     tagName: "figcaption",
     placeholder: __('Write caption…', 'buddypress'),
@@ -355 +352 @@
       isRequestingEmbedPreview = _select.isRequestingEmbedPreview;
 
-  var preview = undefined !== url && getEmbedPreview(url);
-  var fetching = undefined !== url && isRequestingEmbedPreview(url);
+  var preview = !!url && getEmbedPreview(url);
+  var fetching = !!url && isRequestingEmbedPreview(url);
   return {
     bpSettings: editorSettings.bp.activity || {},

trunk/src/js/bp-activity/js/blocks/embed-activity/edit.js

@@ -13 +13 @@
         components: {
                 Placeholder,
+                Disabled,
                 SandBox,
                 Button,
                 ExternalLink,
                 Spinner,
-                Toolbar,
+                ToolbarGroup,
                 ToolbarButton,
         },
@@ -65 +66 @@
         const editToolbar = (
                 <BlockControls>
-                        <Toolbar>
+                        <ToolbarGroup>
                                 <ToolbarButton
                                         icon="edit"
@@ -71 +72 @@
                                         onClick={ switchBackToURLInput }
                                 />
-                        </Toolbar>
+                        </ToolbarGroup>
                 </BlockControls>
         );
@@ -119 +120 @@
 
         if ( ! preview || ! preview['x_buddypress'] || 'activity' !== preview['x_buddypress'] ) {
-                // Reset the URL.
-                setAttributes( { url: '' } );
-
                 return (
                         <Fragment>
@@ -142 +140 @@
                         <figure className="wp-block-embed is-type-bp-activity">
                                 <div className="wp-block-embed__wrapper">
-                                        <SandBox
-                                                html={ preview && preview.html ? preview.html : '' }
-                                                scripts={ [ embedScriptURL ] }
-                                        />
+                                        <Disabled>
+                                                <SandBox
+                                                        html={ preview && preview.html ? preview.html : '' }
+                                                        scripts={ [ embedScriptURL ] }
+                                                />
+                                        </Disabled>
                                 </div>
                                 { ( ! RichText.isEmpty( caption ) || isSelected ) && (
@@ -170 +170 @@
                 } = select( 'core' );
 
-                const preview = undefined !== url && getEmbedPreview( url );
-                const fetching = undefined !== url && isRequestingEmbedPreview( url );
+                const preview = !! url && getEmbedPreview( url );
+                const fetching = !! url && isRequestingEmbedPreview( url );
 
                 return {