@wordpress/edit-post 8.44.0 → 8.45.0

package/src/components/meta-boxes/use-meta-box-initialization.js

@@ -21,23 +21,18 @@ export const useMetaBoxInitialization = ( enabled ) => {
 	const {
 		isEnabledAndEditorReady,
 		isCollaborationEnabled,
-		hasMetaBoxes,
-		allMetaBoxes,
-		rtcCompatibleIds,
+		hasIncompatibleMetaBoxes,
 	} = useSelect(
 		( select ) => ( {
 			isEnabledAndEditorReady:
 				enabled && select( editorStore ).__unstableIsEditorReady(),
 			isCollaborationEnabled:
 				select( editorStore ).isCollaborationEnabledForCurrentPost(),
-			hasMetaBoxes: enabled
-				? select( editPostStore ).hasMetaBoxes()
+			hasIncompatibleMetaBoxes: enabled
+				? select( editPostStore )
+						.getAllMetaBoxes()
+						.some( ( metaBox ) => ! metaBox.__rtc_compatible )
 				: false,
-			allMetaBoxes: enabled
-				? select( editPostStore ).getAllMetaBoxes()
-				: undefined,
-			rtcCompatibleIds:
-				select( editPostStore ).getRtcCompatibleMetaBoxIds(),
 		} ),
 		[ enabled ]
 	);
@@ -50,17 +45,9 @@ export const useMetaBoxInitialization = ( enabled ) => {
 		if ( isEnabledAndEditorReady ) {
 			initializeMetaBoxes();
 
-			// Disable real-time collaboration when legacy meta boxes are detected.
-			// Meta boxes marked with __rtc_compatible_meta_box on the server
-			// have their IDs stored via setRtcCompatibleMetaBoxIds().
-			if ( isCollaborationEnabled ) {
-				const hasIncompatibleMetaBoxes = allMetaBoxes?.some(
-					( metaBox ) => ! rtcCompatibleIds.includes( metaBox.id )
-				);
-
-				if ( hasIncompatibleMetaBoxes ) {
-					setCollaborationSupported( false );
-				}
+			// Disable real-time collaboration when incompatible meta boxes are detected.
+			if ( isCollaborationEnabled && hasIncompatibleMetaBoxes ) {
+				setCollaborationSupported( false );
 			}
 		}
 	}, [
@@ -68,8 +55,6 @@ export const useMetaBoxInitialization = ( enabled ) => {
 		initializeMetaBoxes,
 		isCollaborationEnabled,
 		setCollaborationSupported,
-		hasMetaBoxes,
-		allMetaBoxes,
-		rtcCompatibleIds,
+		hasIncompatibleMetaBoxes,
 	] );
 };

package/src/store/actions.js

@@ -277,19 +277,6 @@ export function setAvailableMetaBoxesPerLocation( metaBoxesPerLocation ) {
 	};
 }
 
-/**
- * Stores the IDs of meta boxes marked as compatible with real-time collaboration
- * via the __rtc_compatible_meta_box flag on the server.
- *
- * @param {string[]} ids Meta box IDs that are RTC-compatible.
- */
-export function setRtcCompatibleMetaBoxIds( ids ) {
-	return {
-		type: 'SET_RTC_COMPATIBLE_META_BOX_IDS',
-		ids,
-	};
-}
-
 /**
  * Update a metabox.
  */

package/src/store/reducer.js

@@ -32,7 +32,10 @@ function mergeMetaboxes( metaboxes = [], newMetaboxes ) {
 			( box ) => box.id === metabox.id
 		);
 		if ( existing !== -1 ) {
-			mergedMetaboxes[ existing ] = metabox;
+			mergedMetaboxes[ existing ] = {
+				...mergedMetaboxes[ existing ],
+				...metabox,
+			};
 		} else {
 			mergedMetaboxes.push( metabox );
 		}
@@ -83,28 +86,10 @@ function metaBoxesInitialized( state = false, action ) {
 	return state;
 }
 
-/**
- * Reducer tracking meta box IDs marked as compatible with real-time collaboration
- * via the add_meta_box() __rtc_compatible_meta_box compatibility flag.
- *
- * @param {string[]} state  Previous state.
- * @param {Object}   action Action Object.
- *
- * @return {string[]} Updated state.
- */
-export function rtcCompatibleMetaBoxIds( state = [], action ) {
-	switch ( action.type ) {
-		case 'SET_RTC_COMPATIBLE_META_BOX_IDS':
-			return action.ids;
-	}
-	return state;
-}
-
 const metaBoxes = combineReducers( {
 	isSaving: isSavingMetaBoxes,
 	locations: metaBoxLocations,
 	initialized: metaBoxesInitialized,
-	rtcCompatibleIds: rtcCompatibleMetaBoxIds,
 } );
 
 export default combineReducers( {

package/src/store/selectors.js

@@ -424,18 +424,6 @@ export const getAllMetaBoxes = createSelector(
 	( state ) => [ state.metaBoxes.locations ]
 );
 
-/**
- * Returns the list of meta box IDs marked as compatible with real-time
- * collaboration via the add_meta_box() __rtc_compatible_meta_box compatibility flag.
- *
- * @param {Object} state Global application state.
- *
- * @return {string[]} List of RTC-compatible meta box IDs.
- */
-export function getRtcCompatibleMetaBoxIds( state ) {
-	return state.metaBoxes.rtcCompatibleIds;
-}
-
 /**
  * Returns true if the post is using Meta Boxes
  *

package/src/style.scss

@@ -1,7 +1,6 @@
 @use "@wordpress/base-styles/default-custom-properties";
 @use "@wordpress/base-styles/mixins" as *;
 @use "@wordpress/base-styles/variables" as *;
-@use "@wordpress/admin-ui/build-style/style.css" as *;
 @use "./components/back-button/style.scss" as *;
 @use "./components/layout/style.scss" as *;
 @use "./components/meta-boxes/meta-boxes-area/style.scss" as *;