[RNMobile] Refactor simplify media flow redux store changes

packages/block-editor/src/components/inserter/menu.native.js

@@ -51,10 +51,9 @@ function InserterMenu( {
 		removeBlock,
 		resetBlocks,
 		insertDefaultBlock,
+		addLastBlockInserted,
 	} = useDispatch( blockEditorStore );
 
-	const { addLastBlockInserted } = useDispatch( 'core/editor' );
-
 	const {
 		items,
 		destinationRootClientId,

packages/block-editor/src/store/actions.js

@@ -1380,3 +1380,28 @@ export function setHasControlledInnerBlocks(
 		clientId,
 	};
 }
+
+/**
+ * Returns an action object to track the last block that was inserted.
+ *
+ * @param {Object} clientId The client id of the block.
+ *
+ * @return {Object} Action object.
+ */
+export function addLastBlockInserted( clientId ) {
+	return {
+		type: 'ADD_LAST_BLOCK_INSERTED',
+		clientId,
+	};
+}
+
+/**
+ * Returns an action object to clear the last block that was inserted.
+ *
+ * @return {Object} Action object.
+ */
+export function clearLastBlockInserted() {
+	return {
+		type: 'CLEAR_LAST_BLOCK_INSERTED',
+	};
+}

packages/block-editor/src/store/reducer.js

@@ -1727,6 +1727,25 @@ export function highlightedBlock( state, action ) {
 	return state;
 }
 
+/**
+ * Reducer returning the block insertion event list state.
+ *
+ * @param {Object}  state  Current state.
+ * @param {Object}  action Dispatched action.
+ *
+ * @return {Object} Updated state.
+ */
+export function lastBlockInserted( state = {}, action ) {
+	switch ( action.type ) {
+		case 'ADD_LAST_BLOCK_INSERTED':
+			return { ...state, clientId: action.clientId };
+
+		case 'CLEAR_LAST_BLOCK_INSERTED':
+			return {};
+	}
+	return state;
+}
+
 export default combineReducers( {
 	blocks,
 	isTyping,
@@ -1748,4 +1767,5 @@ export default combineReducers( {
 	hasBlockMovingClientId,
 	automaticChangeStatus,
 	highlightedBlock,
+	lastBlockInserted,
 } );

packages/block-editor/src/store/selectors.js

@@ -2084,3 +2084,14 @@ export const __experimentalGetActiveBlockIdByBlockNames = createSelector(
 		validBlockNames,
 	]
 );
+
+/**
+ * Tells if the block with the passed clientId was just inserted.
+ *
+ * @param {Object} state Global application state.
+ * @param {Object} clientId client id of the block.
+ * @return {boolean} If the client id exists within the lastBlockInserted state then the block was just inserted.
+ */
+export function wasBlockJustInserted( state, clientId ) {
+	return state.lastBlockInserted.clientId === clientId;
+}

packages/block-editor/src/store/test/actions.js

@@ -58,6 +58,8 @@ const {
 	updateSettings,
 	selectionChange,
 	validateBlocksToTemplate,
+	addLastBlockInserted,
+	clearLastBlockInserted,
 } = actions;
 
 describe( 'actions', () => {
@@ -1508,4 +1510,24 @@ describe( 'actions', () => {
 			expect( result ).toEqual( false );
 		} );
 	} );
+
+	describe( 'addLastBlockInserted', () => {
+		it( 'should return the ADD_LAST_BLOCK_INSERTED action', () => {
+			const expectedClientId = 1;
+			const result = addLastBlockInserted( expectedClientId );
+			expect( result ).toEqual( {
+				type: 'ADD_LAST_BLOCK_INSERTED',
+				clientId: expectedClientId,
+			} );
+		} );
+	} );
+
+	describe( 'clearLastBlockInserted', () => {
+		it( 'should return the CLEAR_LAST_BLOCK_INSERTED action', () => {
+			const result = clearLastBlockInserted();
+			expect( result ).toEqual( {
+				type: 'CLEAR_LAST_BLOCK_INSERTED',
+			} );
+		} );
+	} );
 } );

packages/block-editor/src/store/test/reducer.js

@@ -33,6 +33,7 @@ import {
 	template,
 	blockListSettings,
 	lastBlockAttributesChange,
+	lastBlockInserted,
 } from '../reducer';
 
 describe( 'state', () => {
@@ -2944,4 +2945,27 @@ describe( 'state', () => {
 			expect( state ).toBe( null );
 		} );
 	} );
+
+	describe( 'lastBlockInserted()', () => {
+		it( 'should return client id of last block inserted', () => {
+			const expectedClientId = 1;
+			const action = {
+				type: 'ADD_LAST_BLOCK_INSERTED',
+				clientId: expectedClientId,
+			};
+
+			expect(
+				lastBlockInserted( { clientId: expectedClientId }, action )
+					.clientId
+			).toBe( expectedClientId );
+		} );
+
+		it( 'should return empty state if last block has been cleared', () => {
+			const action = {
+				type: 'CLEAR_LAST_BLOCK_INSERTED',
+			};
+
+			expect( lastBlockInserted( {}, action ) ).toStrictEqual( {} );
+		} );
+	} );
 } );

packages/block-editor/src/store/test/selectors.js

@@ -73,6 +73,7 @@ const {
 	__experimentalGetParsedReusableBlock,
 	__experimentalGetAllowedPatterns,
 	__experimentalGetScopedBlockPatterns,
+	wasBlockJustInserted,
 } = selectors;
 
 describe( 'selectors', () => {
@@ -3450,6 +3451,35 @@ describe( 'selectors', () => {
 			);
 		} );
 	} );
+
+	describe( 'wasBlockJustInserted', () => {
+		it( 'should return true if the client id passed to wasBlockJustInserted is found within the state', () => {
+			const expectedClientId = 1;
+			const state = {
+				lastBlockInserted: {
+					clientId: expectedClientId,
+				},
+			};
+
+			expect( wasBlockJustInserted( state, expectedClientId ) ).toBe(
+				true
+			);
+		} );
+
+		it( 'should return false if the client id passed to wasBlockJustInserted is not found within the state', () => {
+			const expectedClientId = 1;
+			const unexpectedClientId = 0;
+			const state = {
+				lastBlockInserted: {
+					clientId: unexpectedClientId,
+				},
+			};
+
+			expect( wasBlockJustInserted( state, expectedClientId ) ).toBe(
+				false
+			);
+		} );
+	} );
 } );
 
 describe( '__experimentalGetParsedReusableBlock', () => {

packages/block-library/src/gallery/edit.js

@@ -473,8 +473,8 @@ export default compose( [
 	withDispatch( ( dispatch, { clientId }, { select } ) => {
 		return {
 			wasBlockJustInserted() {
-				const { clearLastBlockInserted } = dispatch( 'core/editor' );
-				const { wasBlockJustInserted } = select( 'core/editor' );
+				const { clearLastBlockInserted } = dispatch( blockEditorStore );
+				const { wasBlockJustInserted } = select( blockEditorStore );
 
 				const result = wasBlockJustInserted( clientId );
 

packages/block-library/src/image/edit.native.js

@@ -591,8 +591,8 @@ export default compose( [
 	withDispatch( ( dispatch, { clientId }, { select } ) => {
 		return {
 			wasBlockJustInserted() {
-				const { clearLastBlockInserted } = dispatch( 'core/editor' );
-				const { wasBlockJustInserted } = select( 'core/editor' );
+				const { clearLastBlockInserted } = dispatch( blockEditorStore );
+				const { wasBlockJustInserted } = select( blockEditorStore );
 
 				const result = wasBlockJustInserted( clientId );
 

packages/block-library/src/video/edit.native.js

@@ -30,6 +30,7 @@ import {
 	VIDEO_ASPECT_RATIO,
 	VideoPlayer,
 	InspectorControls,
+	store as blockEditorStore,
 } from '@wordpress/block-editor';
 import { __, sprintf } from '@wordpress/i18n';
 import { isURL, getProtocol } from '@wordpress/url';
@@ -374,8 +375,8 @@ export default compose( [
 	withDispatch( ( dispatch, { clientId }, { select } ) => {
 		return {
 			wasBlockJustInserted() {
-				const { clearLastBlockInserted } = dispatch( 'core/editor' );
-				const { wasBlockJustInserted } = select( 'core/editor' );
+				const { clearLastBlockInserted } = dispatch( blockEditorStore );
+				const { wasBlockJustInserted } = select( blockEditorStore );
 
 				const result = wasBlockJustInserted( clientId );
 

packages/editor/src/store/actions.native.js

@@ -25,28 +25,3 @@ export function togglePostTitleSelection( isSelected = true ) {
 export function* autosave() {
 	RNReactNativeGutenbergBridge.editorDidAutosave();
 }
-
-/**
- * Returns an action object to track the last block that was inserted.
- *
- * @param {Object} clientId The client id of the block.
- *
- * @return {Object} Action object.
- */
-export function addLastBlockInserted( clientId ) {
-	return {
-		type: 'ADD_LAST_BLOCK_INSERTED',
-		clientId,
-	};
-}
-
-/**
- * Returns an action object to clear the last block that was inserted.
- *
- * @return {Object} Action object.
- */
-export function clearLastBlockInserted() {
-	return {
-		type: 'CLEAR_LAST_BLOCK_INSERTED',
-	};
-}

packages/editor/src/store/reducer.native.js

@@ -80,25 +80,6 @@ export function notices( state = [], action ) {
 	return state;
 }
 
-/**
- * Reducer returning the block insertion event list state.
- *
- * @param {Object}  state  Current state.
- * @param {Object}  action Dispatched action.
- *
- * @return {Object} Updated state.
- */
-export function lastBlockInserted( state = {}, action ) {
-	switch ( action.type ) {
-		case 'ADD_LAST_BLOCK_INSERTED':
-			return { ...state, clientId: action.clientId };
-
-		case 'CLEAR_LAST_BLOCK_INSERTED':
-			return {};
-	}
-	return state;
-}
-
 export default combineReducers( {
 	postId,
 	postType,
@@ -112,5 +93,4 @@ export default combineReducers( {
 	editorSettings,
 	clipboard,
 	notices,
-	lastBlockInserted,
 } );

packages/editor/src/store/selectors.native.js

@@ -55,14 +55,3 @@ export const isEditedPostAutosaveable = createRegistrySelector(
 		return false;
 	}
 );
-
-/**
- * Tells if the block with the passed clientId was just inserted.
- *
- * @param {Object} state Global application state.
- * @param {Object} clientId client id of the block.
- * @return {boolean} If the client id exists within the lastBlockInserted state then the block was just inserted.
- */
-export function wasBlockJustInserted( state, clientId ) {
-	return state.lastBlockInserted.clientId === clientId;
-}

packages/editor/src/store/test/actions.native.js

@@ -1,11 +1,7 @@
 /**
  * Internal dependencies
  */
-import {
-	togglePostTitleSelection,
-	addLastBlockInserted,
-	clearLastBlockInserted,
-} from '../actions';
+import { togglePostTitleSelection } from '../actions';
 
 describe( 'actions native', () => {
 	describe( 'togglePostTitleSelection', () => {
@@ -17,24 +13,4 @@ describe( 'actions native', () => {
 			} );
 		} );
 	} );
-
-	describe( 'addLastBlockInserted', () => {
-		it( 'should return the ADD_LAST_BLOCK_INSERTED action', () => {
-			const expectedClientId = 1;
-			const result = addLastBlockInserted( expectedClientId );
-			expect( result ).toEqual( {
-				type: 'ADD_LAST_BLOCK_INSERTED',
-				clientId: expectedClientId,
-			} );
-		} );
-	} );
-
-	describe( 'clearLastBlockInserted', () => {
-		it( 'should return the CLEAR_LAST_BLOCK_INSERTED action', () => {
-			const result = clearLastBlockInserted();
-			expect( result ).toEqual( {
-				type: 'CLEAR_LAST_BLOCK_INSERTED',
-			} );
-		} );
-	} );
 } );

packages/editor/src/store/test/reducer.native.js

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import { postTitle, lastBlockInserted } from '../reducer';
+import { postTitle } from '../reducer';
 
 describe( 'state native', () => {
 	describe( 'postTitle', () => {
@@ -32,28 +32,5 @@ describe( 'state native', () => {
 				).toBe( true );
 			} );
 		} );
-
-		describe( 'lastBlockInserted()', () => {
-			it( 'should return client id of last block inserted', () => {
-				const expectedClientId = 1;
-				const action = {
-					type: 'ADD_LAST_BLOCK_INSERTED',
-					clientId: expectedClientId,
-				};
-
-				expect(
-					lastBlockInserted( { clientId: expectedClientId }, action )
-						.clientId
-				).toBe( expectedClientId );
-			} );
-
-			it( 'should return empty state if last block has been cleared', () => {
-				const action = {
-					type: 'CLEAR_LAST_BLOCK_INSERTED',
-				};
-
-				expect( lastBlockInserted( {}, action ) ).toStrictEqual( {} );
-			} );
-		} );
 	} );
 } );