[RNMobile] Simplify media insertion flow Part 1 - redux changes

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

@@ -25,3 +25,28 @@ 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,6 +80,25 @@ 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,
@@ -93,4 +112,5 @@ export default combineReducers( {
 	editorSettings,
 	clipboard,
 	notices,
+	lastBlockInserted,
 } );

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

@@ -55,3 +55,14 @@ 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,9 +1,13 @@
 /**
  * Internal dependencies
  */
-import { togglePostTitleSelection } from '../actions';
+import {
+	togglePostTitleSelection,
+	addLastBlockInserted,
+	clearLastBlockInserted,
+} from '../actions';
 
-describe( 'Editor actions', () => {
+describe( 'actions native', () => {
 	describe( 'togglePostTitleSelection', () => {
 		it( 'should return the TOGGLE_POST_TITLE_SELECTION action', () => {
 			const result = togglePostTitleSelection( true );
@@ -13,4 +17,24 @@ describe( 'Editor actions', () => {
 			} );
 		} );
 	} );
+
+	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 } from '../reducer';
+import { postTitle, lastBlockInserted } from '../reducer';
 
 describe( 'state native', () => {
 	describe( 'postTitle', () => {
@@ -32,5 +32,28 @@ 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( {} );
+			} );
+		} );
 	} );
 } );

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

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import { isPostTitleSelected } from '../selectors';
+import { isPostTitleSelected, wasBlockJustInserted } from '../selectors';
 
 describe( 'selectors native', () => {
 	describe( 'isPostTitleSelected', () => {
@@ -25,4 +25,33 @@ describe( 'selectors native', () => {
 			expect( isPostTitleSelected( state ) ).toBe( false );
 		} );
 	} );
+
+	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
+			);
+		} );
+	} );
 } );