Ticket #8513: 8513.patch

src/bp-activity/bp-activity-blocks.php

@@ -11 +11 @@
 if ( ! defined( 'ABSPATH' ) ) {
         exit;
 }
-
-/**
- * Add BP Activity blocks specific settings to the BP Blocks Editor ones.
- *
- * @since 7.0.0
- *
- * @param array $bp_editor_settings BP blocks editor settings.
- * @return array BP Activity blocks editor settings.
- */
-function bp_activity_editor_settings( $bp_editor_settings = array() ) {
-        return array_merge(
-                $bp_editor_settings,
-                array(
-                        'activity' => array(
-                                'embedScriptURL' => includes_url( 'js/wp-embed.min.js' ),
-                        ),
-                )
-        );
-}
-add_filter( 'bp_blocks_editor_settings', 'bp_activity_editor_settings' );

src/bp-activity/classes/class-bp-activity-component.php

@@ -497 +497 @@
                                                 'wp-block-editor',
                                                 'wp-data',
                                                 'wp-compose',
+                                                'bp-block-data',
                                         ),
                                 ),
                         )

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

@@ -232 +232 @@
     _wp$blockEditor = _wp.blockEditor,
     RichText = _wp$blockEditor.RichText,
     BlockControls = _wp$blockEditor.BlockControls;
+/**
+ * BuddyPress dependencies.
+ */
+
+var _bp = bp,
+    embedScriptURL = _bp.blockData.embedScriptURL;
 
 var EditEmbedActivity = function EditEmbedActivity(_ref) {
   var attributes = _ref.attributes,
       setAttributes = _ref.setAttributes,
       isSelected = _ref.isSelected,
-      bpSettings = _ref.bpSettings,
       preview = _ref.preview,
       fetching = _ref.fetching;
   var url = attributes.url,
       caption = attributes.caption;
-  var embedScriptURL = bpSettings.embedScriptURL;
 
   var label = __('BuddyPress Activity URL', 'buddypress');
 
@@ -345 +349 @@
 
 var editEmbedActivityBlock = compose([withSelect(function (select, ownProps) {
   var url = ownProps.attributes.url;
-  var editorSettings = select('core/editor').getEditorSettings();
 
   var _select = select('core'),
       getEmbedPreview = _select.getEmbedPreview,
@@ -354 +357 @@
   var preview = !!url && getEmbedPreview(url);
   var fetching = !!url && isRequestingEmbedPreview(url);
   return {
-    bpSettings: editorSettings.bp.activity || {},
     preview: preview,
     fetching: fetching
   };
@@ -421 +423 @@
 registerBlockType('bp/embed-activity', {
   title: __('Embed an activity', 'buddypress'),
   description: __('Add a block that displays the activity content pulled from this or other community sites.', 'buddypress'),
-  icon: 'buddicons-activity',
+  icon: {
+    background: '#fff',
+    foreground: '#d84800',
+    src: 'buddicons-activity'
+  },
   category: 'buddypress',
   attributes: {
     url: {

src/bp-groups/bp-groups-blocks.php

@@ -12 +12 @@
         exit;
 }
 
-/**
- * Add BP Groups blocks specific settings to the BP Blocks Editor ones.
- *
- * @since 6.0.0
- *
- * @param array $bp_editor_settings BP blocks editor settings.
- * @return array BP Groups blocks editor settings.
- */
-function bp_groups_editor_settings( $bp_editor_settings = array() ) {
-        $bp = buddypress();
-
-        return array_merge(
-                $bp_editor_settings,
-                array(
-                        'groups' => array(
-                                'isAvatarEnabled'     => $bp->avatar && $bp->avatar->show_avatars && ! bp_disable_group_avatar_uploads(),
-                                'isCoverImageEnabled' => bp_is_active( 'groups', 'cover_image' ),
-                        ),
-                )
-        );
-}
-add_filter( 'bp_blocks_editor_settings', 'bp_groups_editor_settings' );
-
 /**
  * Callback function to render the BP Group Block.
  *
@@ -264 +241 @@
                         $output .= sprintf(
                                 '<div class="item-header-avatar">
                                         <a href="%1$s">
-                                                <img class="avatar" alt="%2$s" src="%3$s" />
+                                                <img loading="lazy" src="%2$s" alt="%3$s" class="avatar">
                                         </a>
                                 </div>',
                                 esc_url( $group_link ),
                                 /* Translators: %s is the group's name. */
-                                sprintf( esc_attr__( 'Group Profile photo of %s', 'buddypress' ), $group->display_name ),
+                                sprintf( esc_attr__( 'Group Profile photo of %s', 'buddypress' ), esc_html( $group->name ) ),
                                 esc_url(
                                         bp_core_fetch_avatar(
                                                 array(

src/bp-groups/classes/class-bp-groups-component.php

@@ -978 +978 @@
                                                 'wp-element',
                                                 'wp-components',
                                                 'wp-i18n',
-                                                'wp-editor',
-                                                'wp-compose',
-                                                'wp-data',
                                                 'wp-block-editor',
                                                 'bp-block-components',
+                                                'bp-block-data',
                                         ),
                                         'style'              => 'bp-group-block',
                                         'style_url'          => plugins_url( 'css/blocks/group.css', dirname( __FILE__ ) ),
@@ -1019 +1017 @@
                                                 'wp-element',
                                                 'wp-components',
                                                 'wp-i18n',
-                                                'wp-compose',
-                                                'wp-data',
                                                 'wp-api-fetch',
                                                 'wp-url',
                                                 'wp-block-editor',
                                                 'bp-block-components',
+                                                'bp-block-data',
                                                 'lodash',
                                         ),
                                         'style'              => 'bp-groups-block',

src/bp-groups/js/blocks/group.js

@@ -184 +184 @@
     ToggleControl = _wp$components.ToggleControl,
     Toolbar = _wp$components.Toolbar,
     ToolbarButton = _wp$components.ToolbarButton,
-    compose = _wp.compose.compose,
-    withSelect = _wp.data.withSelect,
-    ServerSideRender = _wp.editor.ServerSideRender,
     _wp$element = _wp.element,
     Fragment = _wp$element.Fragment,
     createElement = _wp$element.createElement,
@@ -195 +192 @@
  * BuddyPress dependencies.
  */
 
-var AutoCompleter = bp.blockComponents.AutoCompleter;
+var _bp = bp,
+    _bp$blockComponents = _bp.blockComponents,
+    AutoCompleter = _bp$blockComponents.AutoCompleter,
+    ServerSideRender = _bp$blockComponents.ServerSideRender,
+    isActive = _bp.blockData.isActive;
 /**
  * Internal dependencies.
  */
@@ -208 +209 @@
   return null;
 };
 
-var editGroup = function editGroup(_ref) {
+var editGroupBlock = function editGroupBlock(_ref) {
   var attributes = _ref.attributes,
-      setAttributes = _ref.setAttributes,
-      bpSettings = _ref.bpSettings;
-  var isAvatarEnabled = bpSettings.isAvatarEnabled,
-      isCoverImageEnabled = bpSettings.isCoverImageEnabled;
+      setAttributes = _ref.setAttributes;
+  var isAvatarEnabled = isActive('groups', 'avatar');
+  var isCoverImageEnabled = isActive('groups', 'cover');
   var avatarSize = attributes.avatarSize,
       displayDescription = attributes.displayDescription,
       displayActionButton = attributes.displayActionButton,
@@ -237 +237 @@
     }));
   }
 
-  return createElement(Fragment, null, createElement(BlockControls, null, createElement(Toolbar, null, createElement(ToolbarButton, {
+  return createElement(Fragment, null, createElement(BlockControls, null, createElement(Toolbar, {
+    label: __('Block toolbar', 'buddypress')
+  }, createElement(ToolbarButton, {
     icon: "edit",
     title: __('Select another group', 'buddypress'),
     onClick: function onClick() {
@@ -291 +293 @@
   })));
 };
 
-var editGroupBlock = compose([withSelect(function (select) {
-  var editorSettings = select('core/editor').getEditorSettings();
-  return {
-    bpSettings: editorSettings.bp.groups || {}
-  };
-})])(editGroup);
 var _default = editGroupBlock;
 exports.default = _default;
 },{"./constants":"atl5"}],"pvse":[function(require,module,exports) {
@@ -319 +315 @@
 registerBlockType('bp/group', {
   title: __('Group', 'buddypress'),
   description: __('BuddyPress Group.', 'buddypress'),
-  icon: 'buddicons-groups',
+  icon: {
+    background: '#fff',
+    foreground: '#d84800',
+    src: 'buddicons-groups'
+  },
   category: 'buddypress',
   attributes: {
     itemID: {

src/bp-groups/js/blocks/groups.js

@@ -326 +326 @@
     Tooltip = _wp$components.Tooltip,
     ToolbarGroup = _wp$components.ToolbarGroup,
     RangeControl = _wp$components.RangeControl,
-    compose = _wp.compose.compose,
-    withSelect = _wp.data.withSelect,
     _wp$element = _wp.element,
     createElement = _wp$element.createElement,
     Fragment = _wp$element.Fragment,
@@ -342 +340 @@
  * BuddyPress dependencies.
  */
 
-var AutoCompleter = bp.blockComponents.AutoCompleter;
+var _bp = bp,
+    AutoCompleter = _bp.blockComponents.AutoCompleter,
+    isActive = _bp.blockData.isActive;
 /**
  * Internal dependencies.
  */
@@ -363 +363 @@
   return null;
 };
 
-var editGroups = function editGroups(_ref) {
+var editGroupsBlock = function editGroupsBlock(_ref) {
   var attributes = _ref.attributes,
       setAttributes = _ref.setAttributes,
-      isSelected = _ref.isSelected,
-      bpSettings = _ref.bpSettings;
-  var isAvatarEnabled = bpSettings.isAvatarEnabled;
+      isSelected = _ref.isSelected;
+  var isAvatarEnabled = isActive('groups', 'avatar');
   var itemIDs = attributes.itemIDs,
       avatarSize = attributes.avatarSize,
       displayGroupName = attributes.displayGroupName,
@@ -565 +564 @@
   })));
 };
 
-var editGroupsBlock = compose([withSelect(function (select) {
-  var editorSettings = select('core/editor').getEditorSettings();
-  return {
-    bpSettings: editorSettings.bp.groups || {}
-  };
-})])(editGroups);
 var _default = editGroupsBlock;
 exports.default = _default;
 },{"@babel/runtime/helpers/toConsumableArray":"I9dH","@babel/runtime/helpers/slicedToArray":"xkYc","./constants":"jS06"}],"jcTh":[function(require,module,exports) {
@@ -593 +586 @@
 registerBlockType('bp/groups', {
   title: __('Groups', 'buddypress'),
   description: __('BuddyPress Groups.', 'buddypress'),
-  icon: 'buddicons-groups',
+  icon: {
+    background: '#fff',
+    foreground: '#d84800',
+    src: 'buddicons-groups'
+  },
   category: 'buddypress',
   attributes: {
     itemIDs: {

src/bp-members/bp-members-blocks.php

@@ -12 +12 @@
         exit;
 }
 
-/**
- * Add BP Members blocks specific settings to the BP Blocks Editor ones.
- *
- * @since 6.0.0
- *
- * @param array $bp_editor_settings BP blocks editor settings.
- * @return array BP Members blocks editor settings.
- */
-function bp_members_editor_settings( $bp_editor_settings = array() ) {
-        $bp = buddypress();
-
-        return array_merge(
-                $bp_editor_settings,
-                array(
-                        'members' => array(
-                                'isMentionEnabled'    => bp_is_active( 'activity' ) && bp_activity_do_mentions(),
-                                'isAvatarEnabled'     => $bp->avatar && $bp->avatar->show_avatars,
-                                'isCoverImageEnabled' => bp_is_active( 'members', 'cover_image' ),
-                        ),
-                )
-        );
-}
-add_filter( 'bp_blocks_editor_settings', 'bp_members_editor_settings' );
-
 /**
  * Callback function to render the BP Member Block.
  *
@@ -260 +236 @@
                         $output .= sprintf(
                                 '<div class="item-header-avatar">
                                         <a href="%1$s">
-                                                <img class="avatar" alt="%2$s" src="%3$s" />
+                                                <img loading="lazy" class="avatar" alt="%2$s" src="%3$s" />
                                         </a>
                                 </div>',
                                 esc_url( $member_link ),

src/bp-members/classes/class-bp-members-component.php

@@ -737 +737 @@
                                                 'wp-element',
                                                 'wp-components',
                                                 'wp-i18n',
-                                                'wp-editor',
-                                                'wp-compose',
-                                                'wp-data',
                                                 'wp-block-editor',
                                                 'bp-block-components',
+                                                'bp-block-data',
                                         ),
                                         'style'              => 'bp-member-block',
                                         'style_url'          => plugins_url( 'css/blocks/member.css', dirname( __FILE__ ) ),
@@ -778 +776 @@
                                                 'wp-element',
                                                 'wp-components',
                                                 'wp-i18n',
-                                                'wp-compose',
-                                                'wp-data',
                                                 'wp-api-fetch',
                                                 'wp-url',
                                                 'wp-block-editor',
                                                 'bp-block-components',
+                                                'bp-block-data',
                                                 'lodash',
                                         ),
                                         'style'              => 'bp-members-block',

src/bp-members/js/blocks/member.js

@@ -172 +172 @@
     ToggleControl = _wp$components.ToggleControl,
     Toolbar = _wp$components.Toolbar,
     ToolbarButton = _wp$components.ToolbarButton,
-    compose = _wp.compose.compose,
-    withSelect = _wp.data.withSelect,
-    ServerSideRender = _wp.editor.ServerSideRender,
     _wp$element = _wp.element,
     Fragment = _wp$element.Fragment,
     createElement = _wp$element.createElement,
@@ -183 +180 @@
  * BuddyPress dependencies.
  */
 
-var AutoCompleter = bp.blockComponents.AutoCompleter;
+var _bp = bp,
+    _bp$blockComponents = _bp.blockComponents,
+    AutoCompleter = _bp$blockComponents.AutoCompleter,
+    ServerSideRender = _bp$blockComponents.ServerSideRender,
+    isActive = _bp.blockData.isActive;
 /**
  * Internal dependencies.
  */
@@ -196 +197 @@
   return null;
 };
 
-var editMember = function editMember(_ref) {
+var editMemberBlock = function editMemberBlock(_ref) {
   var attributes = _ref.attributes,
-      setAttributes = _ref.setAttributes,
-      bpSettings = _ref.bpSettings;
-  var isAvatarEnabled = bpSettings.isAvatarEnabled,
-      isMentionEnabled = bpSettings.isMentionEnabled,
-      isCoverImageEnabled = bpSettings.isCoverImageEnabled;
+      setAttributes = _ref.setAttributes;
+  var isAvatarEnabled = isActive('members', 'avatar');
+  var isMentionEnabled = isActive('activity', 'mentions');
+  var isCoverImageEnabled = isActive('members', 'cover');
   var avatarSize = attributes.avatarSize,
       displayMentionSlug = attributes.displayMentionSlug,
       displayActionButton = attributes.displayActionButton,
@@ -223 +223 @@
     }));
   }
 
-  return createElement(Fragment, null, createElement(BlockControls, null, createElement(Toolbar, null, createElement(ToolbarButton, {
+  return createElement(Fragment, null, createElement(BlockControls, null, createElement(Toolbar, {
+    label: __('Block toolbar', 'buddypress')
+  }, createElement(ToolbarButton, {
     icon: "edit",
     title: __('Select another member', 'buddypress'),
     onClick: function onClick() {
@@ -277 +279 @@
   })));
 };
 
-var editMemberBlock = compose([withSelect(function (select) {
-  var editorSettings = select('core/editor').getEditorSettings();
-  return {
-    bpSettings: editorSettings.bp.members || {}
-  };
-})])(editMember);
 var _default = editMemberBlock;
 exports.default = _default;
 },{"./constants":"AE3e"}],"TmUL":[function(require,module,exports) {
@@ -305 +301 @@
 registerBlockType('bp/member', {
   title: __('Member', 'buddypress'),
   description: __('BuddyPress Member.', 'buddypress'),
-  icon: 'admin-users',
+  icon: {
+    background: '#fff',
+    foreground: '#d84800',
+    src: 'admin-users'
+  },
   category: 'buddypress',
   attributes: {
     itemID: {

src/bp-members/js/blocks/members.js

@@ -311 +311 @@
     Tooltip = _wp$components.Tooltip,
     ToolbarGroup = _wp$components.ToolbarGroup,
     RangeControl = _wp$components.RangeControl,
-    compose = _wp.compose.compose,
-    withSelect = _wp.data.withSelect,
     _wp$element = _wp.element,
     createElement = _wp$element.createElement,
     Fragment = _wp$element.Fragment,
@@ -326 +324 @@
  * BuddyPress dependencies.
  */
 
-var AutoCompleter = bp.blockComponents.AutoCompleter;
+var _bp = bp,
+    AutoCompleter = _bp.blockComponents.AutoCompleter,
+    isActive = _bp.blockData.isActive;
 /**
  * Internal dependencies.
  */
@@ -347 +347 @@
   return null;
 };
 
-var editMembers = function editMembers(_ref) {
+var editMembersBlock = function editMembersBlock(_ref) {
   var attributes = _ref.attributes,
       setAttributes = _ref.setAttributes,
-      isSelected = _ref.isSelected,
-      bpSettings = _ref.bpSettings;
-  var isAvatarEnabled = bpSettings.isAvatarEnabled,
-      isMentionEnabled = bpSettings.isMentionEnabled;
+      isSelected = _ref.isSelected;
+  var isAvatarEnabled = isActive('members', 'avatar');
+  var isMentionEnabled = isActive('activity', 'mentions');
   var itemIDs = attributes.itemIDs,
       avatarSize = attributes.avatarSize,
       displayMentionSlug = attributes.displayMentionSlug,
@@ -561 +560 @@
   })));
 };
 
-var editMembersBlock = compose([withSelect(function (select) {
-  var editorSettings = select('core/editor').getEditorSettings();
-  return {
-    bpSettings: editorSettings.bp.members || {}
-  };
-})])(editMembers);
 var _default = editMembersBlock;
 exports.default = _default;
 },{"@babel/runtime/helpers/toConsumableArray":"I9dH","@babel/runtime/helpers/slicedToArray":"xkYc","./constants":"gr8I"}],"XEHU":[function(require,module,exports) {
@@ -589 +582 @@
 registerBlockType('bp/members', {
   title: __('Members', 'buddypress'),
   description: __('BuddyPress Members.', 'buddypress'),
-  icon: 'groups',
+  icon: {
+    background: '#fff',
+    foreground: '#d84800',
+    src: 'groups'
+  },
   category: 'buddypress',
   attributes: {
     itemIDs: {

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

@@ -19 +19 @@
 registerBlockType( 'bp/embed-activity', {
         title: __( 'Embed an activity', 'buddypress' ),
         description: __( 'Add a block that displays the activity content pulled from this or other community sites.', 'buddypress' ),
-        icon: 'buddicons-activity',
+        icon: {
+                background: '#fff',
+                foreground: '#d84800',
+                src: 'buddicons-activity',
+        },
         category: 'buddypress',
         attributes: {
                 url: {

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

@@ -32 +32 @@
         }
 } = wp;
 
+/**
+ * BuddyPress dependencies.
+ */
+ const {
+        blockData: {
+                embedScriptURL,
+        }
+} = bp;
+
 const EditEmbedActivity = ( {
         attributes,
         setAttributes,
         isSelected,
-        bpSettings,
         preview,
         fetching
 } ) => {
         const { url, caption } = attributes;
-        const { embedScriptURL } = bpSettings;
         const label = __( 'BuddyPress Activity URL', 'buddypress' );
         const [ value, setURL ] = useState( url );
         const [ isEditingURL, setIsEditingURL ] = useState( ! url );
@@ -163 +170 @@
 const editEmbedActivityBlock = compose( [
         withSelect( ( select, ownProps ) => {
                 const { url } = ownProps.attributes;
-                const editorSettings = select( 'core/editor' ).getEditorSettings();
                 const {
                         getEmbedPreview,
                         isRequestingEmbedPreview,
@@ -173 +179 @@
                 const fetching = !! url && isRequestingEmbedPreview( url );
 
                 return {
-                        bpSettings: editorSettings.bp.activity || {},
                         preview: preview,
                         fetching: fetching,
                 };

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

@@ -18 +18 @@
         }
 
         return (
-                <figure className="wp-block-embed is-type-bp-activity">
-                        <div className="wp-block-embed__wrapper">
-                        {
-                                `\n${ url }\n` /* URL needs to be on its own line. */
-                        }
-                        </div>
-                        { ! RichText.isEmpty( caption ) && (
-                                <RichText.Content
-                                        tagName="figcaption"
-                                        value={ caption }
-                                />
-                        ) }
-                </figure>
+        <figure className="wp-block-embed is-type-bp-activity">
+                <div className="wp-block-embed__wrapper">
+                {
+                        `\n${ url }\n` /* URL needs to be on its own line. */
+                }
+                </div>
+                { ! RichText.isEmpty( caption ) && (
+                        <RichText.Content
+                                tagName="figcaption"
+                                value={ caption }
+                        />
+                ) }
+        </figure>
         );
 };
 

src/js/bp-groups/js/blocks/group.js

@@ -18 +18 @@
 registerBlockType( 'bp/group', {
         title: __( 'Group', 'buddypress' ),
         description: __( 'BuddyPress Group.', 'buddypress' ),
-        icon: 'buddicons-groups',
+        icon: {
+                background: '#fff',
+                foreground: '#d84800',
+                src: 'buddicons-groups',
+        },
         category: 'buddypress',
         attributes: {
                 itemID: {

src/js/bp-groups/js/blocks/group/edit.js

@@ -15 +15 @@
                 Toolbar,
                 ToolbarButton,
         },
-        compose: {
-                compose,
-        },
-        data: {
-                withSelect,
-        },
-        editor: {
-                ServerSideRender,
-        },
         element: {
                 Fragment,
                 createElement,
@@ -36 +27 @@
 /**
  * BuddyPress dependencies.
  */
-const { AutoCompleter } = bp.blockComponents;
+const {
+        blockComponents: {
+                AutoCompleter,
+                ServerSideRender,
+        },
+        blockData: {
+                isActive,
+        }
+} = bp;
 
 /**
  * Internal dependencies.
@@ -51 +50 @@
         return null;
 }
 
-const editGroup = ( { attributes, setAttributes, bpSettings } ) => {
-        const { isAvatarEnabled, isCoverImageEnabled } = bpSettings;
+const editGroupBlock = ( { attributes, setAttributes } ) => {
+        const isAvatarEnabled = isActive( 'groups', 'avatar' );
+        const isCoverImageEnabled = isActive( 'groups', 'cover' );
         const { avatarSize, displayDescription, displayActionButton, displayCoverImage } = attributes;
 
         if ( ! attributes.itemID ) {
@@ -78 +78 @@
         return (
                 <Fragment>
                         <BlockControls>
-                                <Toolbar>
+                                <Toolbar label={ __( 'Block toolbar', 'buddypress' ) }>
                                         <ToolbarButton
                                                 icon="edit"
                                                 title={ __( 'Select another group', 'buddypress' ) }
@@ -151 +151 @@
         );
 };
 
-const editGroupBlock = compose( [
-        withSelect( ( select ) => {
-                const editorSettings = select( 'core/editor' ).getEditorSettings();
-                return {
-                        bpSettings: editorSettings.bp.groups || {},
-                };
-        } ),
-] )( editGroup );
-
 export default editGroupBlock;

src/js/bp-groups/js/blocks/groups.js

@@ -18 +18 @@
 registerBlockType( 'bp/groups', {
         title: __( 'Groups', 'buddypress' ),
         description: __( 'BuddyPress Groups.', 'buddypress' ),
-        icon: 'buddicons-groups',
+        icon: {
+                background: '#fff',
+                foreground: '#d84800',
+                src: 'buddicons-groups',
+        },
         category: 'buddypress',
         attributes: {
                 itemIDs: {

src/js/bp-groups/js/blocks/groups/edit.js

@@ -17 +17 @@
                 ToolbarGroup,
                 RangeControl,
         },
-        compose: {
-                compose,
-        },
-        data: {
-                withSelect,
-        },
         element: {
                 createElement,
                 Fragment,
@@ -42 +36 @@
 /**
  * BuddyPress dependencies.
  */
-const { AutoCompleter } = bp.blockComponents;
+const {
+        blockComponents: {
+                AutoCompleter,
+        },
+        blockData: {
+                isActive,
+        }
+} = bp;
 
 /**
  * Internal dependencies.
@@ -66 +67 @@
         return null;
 }
 
-const editGroups = ( { attributes, setAttributes, isSelected, bpSettings } ) => {
-        const {
-                isAvatarEnabled,
-        } = bpSettings;
+const editGroupsBlock = ( { attributes, setAttributes, isSelected } ) => {
+        const isAvatarEnabled = isActive( 'groups', 'avatar' );
         const {
                 itemIDs,
                 avatarSize,
@@ -294 +293 @@
         );
 };
 
-const editGroupsBlock = compose( [
-        withSelect( ( select ) => {
-                const editorSettings = select( 'core/editor' ).getEditorSettings();
-
-                return {
-                        bpSettings: editorSettings.bp.groups || {},
-                };
-        } ),
-] )( editGroups );
-
 export default editGroupsBlock;

src/js/bp-members/js/blocks/member.js

@@ -18 +18 @@
 registerBlockType( 'bp/member', {
         title: __( 'Member', 'buddypress' ),
         description: __( 'BuddyPress Member.', 'buddypress' ),
-        icon: 'admin-users',
+        icon: {
+                background: '#fff',
+                foreground: '#d84800',
+                src: 'admin-users',
+        },
         category: 'buddypress',
         attributes: {
                 itemID: {

src/js/bp-members/js/blocks/member/edit.js

@@ -15 +15 @@
                 Toolbar,
                 ToolbarButton,
         },
-        compose: {
-                compose,
-        },
-        data: {
-                withSelect,
-        },
-        editor: {
-                ServerSideRender,
-        },
         element: {
                 Fragment,
                 createElement,
@@ -36 +27 @@
 /**
  * BuddyPress dependencies.
  */
-const { AutoCompleter } = bp.blockComponents;
+const {
+        blockComponents: {
+                AutoCompleter,
+                ServerSideRender,
+        },
+        blockData: {
+                isActive,
+        }
+} = bp;
 
 /**
  * Internal dependencies.
@@ -51 +50 @@
         return null;
 }
 
-const editMember = ( { attributes, setAttributes, bpSettings } ) => {
-        const { isAvatarEnabled, isMentionEnabled, isCoverImageEnabled } = bpSettings;
+const editMemberBlock = ( { attributes, setAttributes } ) => {
+        const isAvatarEnabled = isActive( 'members', 'avatar' );
+        const isMentionEnabled = isActive( 'activity', 'mentions' );
+        const isCoverImageEnabled = isActive( 'members', 'cover' );
         const { avatarSize, displayMentionSlug, displayActionButton, displayCoverImage } = attributes;
 
         if ( ! attributes.itemID ) {
@@ -77 +78 @@
         return (
                 <Fragment>
                         <BlockControls>
-                                <Toolbar>
+                                <Toolbar label={ __( 'Block toolbar', 'buddypress' ) }>
                                         <ToolbarButton
                                                 icon="edit"
                                                 title={ __( 'Select another member', 'buddypress' ) }
@@ -152 +153 @@
         );
 };
 
-const editMemberBlock = compose( [
-        withSelect( ( select ) => {
-                const editorSettings = select( 'core/editor' ).getEditorSettings();
-                return {
-                        bpSettings: editorSettings.bp.members || {},
-                };
-        } ),
-] )( editMember );
-
 export default editMemberBlock;

src/js/bp-members/js/blocks/members.js

@@ -18 +18 @@
 registerBlockType( 'bp/members', {
         title: __( 'Members', 'buddypress' ),
         description: __( 'BuddyPress Members.', 'buddypress' ),
-        icon: 'groups',
+        icon: {
+                background: '#fff',
+                foreground: '#d84800',
+                src: 'groups',
+        },
         category: 'buddypress',
         attributes: {
                 itemIDs: {

src/js/bp-members/js/blocks/members/edit.js

@@ -17 +17 @@
                 ToolbarGroup,
                 RangeControl,
         },
-        compose: {
-                compose,
-        },
-        data: {
-                withSelect,
-        },
         element: {
                 createElement,
                 Fragment,
@@ -41 +35 @@
 /**
  * BuddyPress dependencies.
  */
-const { AutoCompleter } = bp.blockComponents;
+const {
+        blockComponents: {
+                AutoCompleter,
+        },
+        blockData: {
+                isActive,
+        }
+} = bp;
 
 /**
  * Internal dependencies.
@@ -65 +66 @@
         return null;
 }
 
-const editMembers = ( { attributes, setAttributes, isSelected, bpSettings } ) => {
-        const {
-                isAvatarEnabled,
-                isMentionEnabled,
-        } = bpSettings;
+const editMembersBlock = ( { attributes, setAttributes, isSelected } ) => {
+        const isAvatarEnabled = isActive( 'members', 'avatar' );
+        const isMentionEnabled = isActive( 'activity', 'mentions' );
         const {
                 itemIDs,
                 avatarSize,
@@ -313 +312 @@
         );
 };
 
-const editMembersBlock = compose( [
-        withSelect( ( select ) => {
-                const editorSettings = select( 'core/editor' ).getEditorSettings();
-
-                return {
-                        bpSettings: editorSettings.bp.members || {},
-                };
-        } ),
-] )( editMembers );
-
 export default editMembersBlock;