Refactor componentDidUpdate to accomodate separate flows

WordPress · Jun 11, 2018 · c9829bc · c9829bc
1 parent bcdb811
commit c9829bc
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/edit-post/components/browser-url/index.js b/edit-post/components/browser-url/index.js
@@ -46,18 +46,25 @@ export class BrowserURL extends Component {
 		const { historyId } = this.state;
 
 		if ( postStatus === 'trash' ) {
-			window.location.href = getPostTrashedURL( postId, postType );
-		}
-
-		if ( postId === prevProps.postId && postId === historyId ) {
+			this.setTrashURL( postId, postType );
 			return;
 		}
 
-		if ( postStatus !== 'auto-draft' ) {
+		if ( ( postId !== prevProps.postId || postId !== historyId ) && postStatus !== 'auto-draft' ) {
 			this.setBrowserURL( postId );
 		}
 	}
 
+	/**
+	 * Navigates the browser to the post trashed URL to show a notice about the trashed post.
+	 *
+	 * @param {number} postId    Post ID.
+	 * @param {string} postType  Post Type.
+	 */
+	setTrashURL( postId, postType ) {
+		window.location.href = getPostTrashedURL( postId, postType );
+	}
+
 	/**
 	 * Replaces the browser URL with a post editor link for the given post ID.
 	 *