Editor: Implement editor tearDown to un-ready state

WordPress · Jul 5, 2019 · fa46691 · fa46691
1 parent 9aabe75
commit fa46691
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/packages/editor/src/components/provider/index.js b/packages/editor/src/components/provider/index.js
@@ -125,6 +125,10 @@ class EditorProvider extends Component {
 		}
 	}
 
+	componentWillUnmount() {
+		this.props.tearDownEditor();
+	}
+
 	render() {
 		const {
 			children,
@@ -187,6 +191,7 @@ export default compose( [
 			resetEditorBlocks,
 			updateEditorSettings,
 			updateBlockSources,
+			tearDownEditor,
 		} = dispatch( 'core/editor' );
 		const { createWarningNotice } = dispatch( 'core/notices' );
 
@@ -197,6 +202,7 @@ export default compose( [
 			resetEditorBlocks,
 			updateEditorSettings,
 			updateBlockSources,
+			tearDownEditor,
 			resetEditorBlocksWithoutUndoLevel( blocks ) {
 				resetEditorBlocks( blocks, {
 					__unstableShouldCreateUndoLevel: false,

diff --git a/packages/editor/src/store/actions.js b/packages/editor/src/store/actions.js
@@ -72,6 +72,16 @@ export function* setupEditor( post, edits, template ) {
 	yield resetEditorBlocks( blocks );
 }
 
+/**
+ * Returns an action object signalling that the editor is being destroyed and
+ * that any necessary state or side-effect cleanup should occur.
+ *
+ * @return {Object} Action object.
+ */
+export function tearDownEditor() {
+	return { type: 'TEAR_DOWN_EDITOR' };
+}
+
 /**
  * Action generator function used in signalling that sources are to be updated
  * in response to a single block attributes update.

diff --git a/packages/editor/src/store/reducer.js b/packages/editor/src/store/reducer.js
@@ -558,6 +558,9 @@ export function isReady( state = false, action ) {
 	switch ( action.type ) {
 		case 'SETUP_EDITOR_STATE':
 			return true;
+
+		case 'TEAR_DOWN_EDITOR':
+			return false;
 	}
 
 	return state;