From 74932e9c654ea1356e00e587f5e9e71e259b15e4 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Thu, 18 Jun 2020 11:31:39 +0100
Subject: [PATCH 01/11] Initial attempt at Undo/Redo

---
 package.json                   |  2 ++
 src/components/header/index.js |  9 +++++++++
 src/components/header/undo.js  | 34 ++++++++++++++++++++++++++++++++++
 src/index.js                   | 10 +++++++---
 src/store/actions.js           | 20 ++++++++++++++++++++
 src/store/index.js             | 26 ++++++++++++++++++++++++++
 src/store/reducer.js           |  3 +++
 src/store/selectors.js         | 24 ++++++++++++++++++++++++
 8 files changed, 125 insertions(+), 3 deletions(-)
 create mode 100644 src/components/header/undo.js
 create mode 100644 src/store/actions.js
 create mode 100644 src/store/index.js
 create mode 100644 src/store/reducer.js
 create mode 100644 src/store/selectors.js

diff --git a/package.json b/package.json
index c6db140..00e1529 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,9 @@
   },
   "devDependencies": {
     "@wordpress/env": "^2.0.0",
+    "@wordpress/data-controls": "^1.14.0",
     "@wordpress/eslint-plugin": "^7.2.0",
+    "@wordpress/keycodes": "^2.13.0",
     "@wordpress/scripts": "^12.2.0",
     "autoprefixer": "^9.8.6",
     "css-loader": "^4.3.0",
diff --git a/src/components/header/index.js b/src/components/header/index.js
index e2cb932..30621e2 100644
--- a/src/components/header/index.js
+++ b/src/components/header/index.js
@@ -2,8 +2,14 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
+import { EditorHistoryRedo } from '@wordpress/editor';
+
+import HistoryUndo from './undo';
 
 export default function Header() {
+	function handleUndo() {
+		console.log( 'undo' );
+	}
 	return (
 		<div
 			className="getdavesbe-header"
@@ -14,6 +20,9 @@ export default function Header() {
 			<h1 className="getdavesbe-header__title">
 				{ __( 'Standalone Block Editor', 'getdavesbe' ) }
 			</h1>
+
+			<HistoryUndo />
+			<EditorHistoryRedo />
 		</div>
 	);
 }
diff --git a/src/components/header/undo.js b/src/components/header/undo.js
new file mode 100644
index 0000000..2ff8549
--- /dev/null
+++ b/src/components/header/undo.js
@@ -0,0 +1,34 @@
+import { __ } from '@wordpress/i18n';
+import { Button } from '@wordpress/components';
+import { withSelect, withDispatch } from '@wordpress/data';
+import { compose } from '@wordpress/compose';
+import { displayShortcut } from '@wordpress/keycodes';
+import { undo as undoIcon } from '@wordpress/icons';
+
+function HistoryUndo( { hasUndo, undo, ...props } ) {
+	return (
+		<Button
+			{ ...props }
+			icon={ undoIcon }
+			label={ __( 'Undo' ) }
+			shortcut={ displayShortcut.primary( 'z' ) }
+			// If there are no undo levels we don't want to actually disable this
+			// button, because it will remove focus for keyboard users.
+			// See: https://github.com/WordPress/gutenberg/issues/3486
+			aria-disabled={ ! hasUndo }
+			onClick={ hasUndo ? undo : undefined }
+			className="editor-history__undo"
+		/>
+	);
+}
+
+const EnhancedHistoryUndo = compose( [
+	withSelect( ( select ) => ( {
+		hasUndo: select( 'getdavesbe' ).hasEditorUndo(),
+	} ) ),
+	withDispatch( ( dispatch ) => ( {
+		undo: dispatch( 'getdavesbe' ).undo,
+	} ) ),
+] )( HistoryUndo );
+
+export default EnhancedHistoryUndo;
diff --git a/src/index.js b/src/index.js
index 71781cd..aff1a3b 100644
--- a/src/index.js
+++ b/src/index.js
@@ -3,11 +3,15 @@ import { render } from '@wordpress/element';
 import { registerCoreBlocks } from '@wordpress/block-library';
 import Editor from './editor';
 
+import './store';
+
 import './styles.scss';
 
-domReady( function() {
+domReady( function () {
 	const settings = window.getdaveSbeSettings || {};
 	registerCoreBlocks();
-	render( <Editor settings={ settings } />, document.getElementById( 'getdave-sbe-block-editor' ) );
+	render(
+		<Editor settings={ settings } />,
+		document.getElementById( 'getdave-sbe-block-editor' )
+	);
 } );
-
diff --git a/src/store/actions.js b/src/store/actions.js
new file mode 100644
index 0000000..0f93417
--- /dev/null
+++ b/src/store/actions.js
@@ -0,0 +1,20 @@
+import { dispatch } from '@wordpress/data-controls';
+
+/**
+ * Returns an action object used in signalling that undo history should
+ * restore last popped state.
+ *
+ * @yield {Object} Action object.
+ */
+export function* redo() {
+	yield dispatch( 'core', 'redo' );
+}
+
+/**
+ * Returns an action object used in signalling that undo history should pop.
+ *
+ * @yield {Object} Action object.
+ */
+export function* undo() {
+	yield dispatch( 'core', 'undo' );
+}
diff --git a/src/store/index.js b/src/store/index.js
new file mode 100644
index 0000000..c77e8c0
--- /dev/null
+++ b/src/store/index.js
@@ -0,0 +1,26 @@
+/**
+ * WordPress dependencies
+ */
+import { registerStore } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import reducer from './reducer';
+import * as selectors from './selectors';
+import * as actions from './actions';
+
+/**
+ * Module Constants
+ */
+const MODULE_KEY = 'getdavesbe';
+
+const store = registerStore( MODULE_KEY, {
+	reducer,
+	selectors,
+	actions,
+} );
+
+window.getDaveStore = store;
+
+export default store;
diff --git a/src/store/reducer.js b/src/store/reducer.js
new file mode 100644
index 0000000..e8338a9
--- /dev/null
+++ b/src/store/reducer.js
@@ -0,0 +1,3 @@
+export default function ( state = [], action ) {
+	return state;
+}
diff --git a/src/store/selectors.js b/src/store/selectors.js
new file mode 100644
index 0000000..ba89334
--- /dev/null
+++ b/src/store/selectors.js
@@ -0,0 +1,24 @@
+import { createRegistrySelector } from '@wordpress/data';
+
+/**
+ * Returns true if any past editor history snapshots exist, or false otherwise.
+ *
+ * @param {Object} state Global application state.
+ *
+ * @return {boolean} Whether undo history exists.
+ */
+export const hasEditorUndo = createRegistrySelector( ( select ) => () => {
+	return select( 'core' ).hasUndo();
+} );
+
+/**
+ * Returns true if any future editor history snapshots exist, or false
+ * otherwise.
+ *
+ * @param {Object} state Global application state.
+ *
+ * @return {boolean} Whether redo history exists.
+ */
+export const hasEditorRedo = createRegistrySelector( ( select ) => () => {
+	return select( 'core' ).hasRedo();
+} );

From 853d7cdec0a39b18350b5a3f49b2095744452bcd Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Tue, 15 Sep 2020 15:42:40 +0100
Subject: [PATCH 02/11] Add store to webpack known paths

---
 webpack.config.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webpack.config.js b/webpack.config.js
index d3b3be0..eae530b 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -15,7 +15,8 @@ module.exports = {
 		...defaultConfig.resolve,
 		// alias directories to paths you can use in import() statements
 		alias: {
-			components: path.join( paths.srcDir, 'components' ),
+			components: path.join(paths.srcDir, "components"),
+			store: path.join(paths.srcDir, "store"),
 		},
 	},
 };

From f56c3134ea41a8a9255a2516806d638c09c5ab8f Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Tue, 15 Sep 2020 15:42:59 +0100
Subject: [PATCH 03/11] Add Redux Undo package

---
 package-lock.json | 5 +++++
 package.json      | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index a92712b..2b881d9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16463,6 +16463,11 @@
       "resolved": "https://registry.npmjs.org/redux-optimist/-/redux-optimist-1.0.0.tgz",
       "integrity": "sha512-AG1v8o6UZcGXTEH2jVcWG6KD+gEix+Cj9JXAAzln9MPkauSVd98H7N7EOOyT/v4c9N1mJB4sm1zfspGlLDkUEw=="
     },
+    "redux-undo": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/redux-undo/-/redux-undo-1.0.1.tgz",
+      "integrity": "sha512-0yFPT+FUgwxCEiS0Mg5T1S4tkgjR8h6sJRY9CW4EMsbJOf1SxO289TbJmlzhRouCHacdDF+powPjrjLHoJYxWQ=="
+    },
     "reflect.ownkeys": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz",
diff --git a/package.json b/package.json
index 00e1529..ed44cad 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "@wordpress/format-library": "^1.23.0",
     "@wordpress/i18n": "^3.15.0",
     "@wordpress/interface": "^0.8.0",
-    "@wordpress/media-utils": "^1.16.0"
+    "@wordpress/media-utils": "^1.16.0",
+    "redux-undo": "^1.0.1"
   }
 }

From ef51a6b1929647dd37d0157d1e13dec8ebb71031 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Tue, 15 Sep 2020 15:44:16 +0100
Subject: [PATCH 04/11] Implement a basic undo redo system

---
 src/components/block-editor/index.js | 28 ++++++++++----------
 src/components/header/index.js       |  9 ++++---
 src/components/header/redo.js        | 35 +++++++++++++++++++++++++
 src/components/header/undo.js        |  3 ++-
 src/store/action-types.js            |  2 ++
 src/store/actions.js                 | 31 +++++++++++-----------
 src/store/reducer.js                 | 23 +++++++++++++++-
 src/store/selectors.js               | 39 ++++++++++++----------------
 8 files changed, 114 insertions(+), 56 deletions(-)
 create mode 100644 src/components/header/redo.js
 create mode 100644 src/store/action-types.js

diff --git a/src/components/block-editor/index.js b/src/components/block-editor/index.js
index 88ae320..8f05c8d 100644
--- a/src/components/block-editor/index.js
+++ b/src/components/block-editor/index.js
@@ -23,7 +23,8 @@ import {
 import Sidebar from 'components/sidebar';
 
 function BlockEditor( { settings: _settings } ) {
-	const [ blocks, updateBlocks ] = useState( [] );
+	const blocks = useSelect((select) => select("getdavesbe").getBlocks());
+	const { updateBlocks } = useDispatch("getdavesbe");
 	const { createInfoNotice } = useDispatch( 'core/notices' );
 
 	const canUserCreateMedia = useSelect( ( select ) => {
@@ -47,17 +48,17 @@ function BlockEditor( { settings: _settings } ) {
 		};
 	}, [ canUserCreateMedia, _settings ] );
 
-	useEffect( () => {
-		const storedBlocks = window.localStorage.getItem( 'getdavesbeBlocks' );
+	// useEffect( () => {
+	// 	const storedBlocks = window.localStorage.getItem( 'getdavesbeBlocks' );
 
-		if ( storedBlocks?.length ) {
-			handleUpdateBlocks(() => parse(storedBlocks));
-			createInfoNotice( 'Blocks loaded', {
-				type: 'snackbar',
-				isDismissible: true,
-			} );
-		}
-	}, [] );
+	// 	if ( storedBlocks?.length ) {
+	// 		handleUpdateBlocks(() => parse(storedBlocks));
+	// 		createInfoNotice( 'Blocks loaded', {
+	// 			type: 'snackbar',
+	// 			isDismissible: true,
+	// 		} );
+	// 	}
+	// }, [] );
 
 	/**
 	 * Wrapper for updating blocks. Required as `onInput` callback passed to
@@ -70,8 +71,9 @@ function BlockEditor( { settings: _settings } ) {
 	}
 
 	function handlePersistBlocks( newBlocks ) {
-		updateBlocks( newBlocks );
-		window.localStorage.setItem( 'getdavesbeBlocks', serialize( newBlocks ) );
+		updateBlocks( newBlocks, true );
+		// persistBlocks(newBlocks);
+		// window.localStorage.setItem( 'getdavesbeBlocks', serialize( newBlocks ) );
 	}
 
 	return (
diff --git a/src/components/header/index.js b/src/components/header/index.js
index 30621e2..4619802 100644
--- a/src/components/header/index.js
+++ b/src/components/header/index.js
@@ -2,9 +2,10 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { EditorHistoryRedo } from '@wordpress/editor';
+
 
 import HistoryUndo from './undo';
+import HistoryRedo from "./redo";
 
 export default function Header() {
 	function handleUndo() {
@@ -14,15 +15,15 @@ export default function Header() {
 		<div
 			className="getdavesbe-header"
 			role="region"
-			aria-label={ __( 'Standalone Editor top bar.', 'getdavesbe' ) }
+			aria-label={__("Standalone Editor top bar.", "getdavesbe")}
 			tabIndex="-1"
 		>
 			<h1 className="getdavesbe-header__title">
-				{ __( 'Standalone Block Editor', 'getdavesbe' ) }
+				{__("Standalone Block Editor", "getdavesbe")}
 			</h1>
 
 			<HistoryUndo />
-			<EditorHistoryRedo />
+			<HistoryRedo />
 		</div>
 	);
 }
diff --git a/src/components/header/redo.js b/src/components/header/redo.js
new file mode 100644
index 0000000..499763b
--- /dev/null
+++ b/src/components/header/redo.js
@@ -0,0 +1,35 @@
+import { __ } from '@wordpress/i18n';
+import { Button } from '@wordpress/components';
+import { withSelect, withDispatch } from '@wordpress/data';
+import { compose } from '@wordpress/compose';
+import { displayShortcut } from '@wordpress/keycodes';
+import { redo as redoIcon } from '@wordpress/icons';
+
+
+function HistoryRedo( { hasRedo, redo, ...props } ) {
+	return (
+		<Button
+			{ ...props }
+			icon={ redoIcon }
+			label={ __( 'Red' ) }
+			shortcut={ displayShortcut.primary( 'z' ) }
+			// If there are no redo levels we don't want to actually disable this
+			// button, because it will remove focus for keyboard users.
+			// See: https://github.com/WordPress/gutenberg/issues/3486
+			aria-disabled={ ! hasRedo }
+			onClick={ hasRedo ? redo : undefined }
+			className="editor-history__redo"
+		/>
+	);
+}
+
+const EnhancedHistoryRedo = compose( [
+	withSelect( ( select ) => ( {
+		hasRedo: select( 'getdavesbe' ).hasRedo(),
+	} ) ),
+	withDispatch( ( dispatch ) => ( {
+		redo: dispatch( 'getdavesbe' ).redo,
+	} ) ),
+] )( HistoryRedo );
+
+export default EnhancedHistoryRedo;
diff --git a/src/components/header/undo.js b/src/components/header/undo.js
index 2ff8549..4b65815 100644
--- a/src/components/header/undo.js
+++ b/src/components/header/undo.js
@@ -5,6 +5,7 @@ import { compose } from '@wordpress/compose';
 import { displayShortcut } from '@wordpress/keycodes';
 import { undo as undoIcon } from '@wordpress/icons';
 
+
 function HistoryUndo( { hasUndo, undo, ...props } ) {
 	return (
 		<Button
@@ -24,7 +25,7 @@ function HistoryUndo( { hasUndo, undo, ...props } ) {
 
 const EnhancedHistoryUndo = compose( [
 	withSelect( ( select ) => ( {
-		hasUndo: select( 'getdavesbe' ).hasEditorUndo(),
+		hasUndo: select( 'getdavesbe' ).hasUndo(),
 	} ) ),
 	withDispatch( ( dispatch ) => ( {
 		undo: dispatch( 'getdavesbe' ).undo,
diff --git a/src/store/action-types.js b/src/store/action-types.js
new file mode 100644
index 0000000..8a2bcae
--- /dev/null
+++ b/src/store/action-types.js
@@ -0,0 +1,2 @@
+export const UPDATE_BLOCKS = "UPDATE_BLOCKS";
+export const PERSIST_BLOCKS = "PERSIST_BLOCKS";
\ No newline at end of file
diff --git a/src/store/actions.js b/src/store/actions.js
index 0f93417..6b32835 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -1,20 +1,21 @@
 import { dispatch } from '@wordpress/data-controls';
+import { UPDATE_BLOCKS, PERSIST_BLOCKS } from "./action-types";
+import { ActionCreators } from "redux-undo";
 
-/**
- * Returns an action object used in signalling that undo history should
- * restore last popped state.
- *
- * @yield {Object} Action object.
- */
-export function* redo() {
-	yield dispatch( 'core', 'redo' );
+
+export function undo() {
+	return ActionCreators.undo();
+}
+
+export function redo() {
+	return ActionCreators.redo();
 }
 
-/**
- * Returns an action object used in signalling that undo history should pop.
- *
- * @yield {Object} Action object.
- */
-export function* undo() {
-	yield dispatch( 'core', 'undo' );
+export function updateBlocks( blocks, persist = false ) {
+	return {
+		type: persist ? PERSIST_BLOCKS : UPDATE_BLOCKS,
+		blocks,
+	};
 }
+
+
diff --git a/src/store/reducer.js b/src/store/reducer.js
index e8338a9..0cdd95c 100644
--- a/src/store/reducer.js
+++ b/src/store/reducer.js
@@ -1,3 +1,24 @@
-export default function ( state = [], action ) {
+
+import undoable, { groupByActionTypes, includeAction } from "redux-undo";
+
+
+
+import { UPDATE_BLOCKS, PERSIST_BLOCKS } from "./action-types";
+
+function blocksReducer(state = [], action) {
+	switch (action.type) {
+		case UPDATE_BLOCKS:
+		case PERSIST_BLOCKS:
+			const { blocks } = action;
+
+			return {
+				blocks,
+			};
+	}
+
 	return state;
 }
+
+export default undoable(blocksReducer, {
+	filter: includeAction(PERSIST_BLOCKS),
+});
diff --git a/src/store/selectors.js b/src/store/selectors.js
index ba89334..14417b2 100644
--- a/src/store/selectors.js
+++ b/src/store/selectors.js
@@ -1,24 +1,19 @@
 import { createRegistrySelector } from '@wordpress/data';
 
-/**
- * Returns true if any past editor history snapshots exist, or false otherwise.
- *
- * @param {Object} state Global application state.
- *
- * @return {boolean} Whether undo history exists.
- */
-export const hasEditorUndo = createRegistrySelector( ( select ) => () => {
-	return select( 'core' ).hasUndo();
-} );
-
-/**
- * Returns true if any future editor history snapshots exist, or false
- * otherwise.
- *
- * @param {Object} state Global application state.
- *
- * @return {boolean} Whether redo history exists.
- */
-export const hasEditorRedo = createRegistrySelector( ( select ) => () => {
-	return select( 'core' ).hasRedo();
-} );
+
+
+
+
+
+export const getBlocks = ( state ) => {
+	return state.present.blocks || [];
+}
+
+export const hasUndo = (state) => {
+	return state.past?.length;
+};
+
+export const hasRedo = (state) => {
+	return state.future?.length;
+};
+

From 1b83374db8a7c859991972f2361b7b305d7a3256 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Tue, 15 Sep 2020 15:46:55 +0100
Subject: [PATCH 05/11] Include interface skeleton base styles to enable
 clicking on undo/redo

---
 src/styles.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/styles.scss b/src/styles.scss
index 029a0db..7f5523e 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -4,6 +4,7 @@
 @import "~@wordpress/base-styles/breakpoints";
 @import "~@wordpress/base-styles/animations";
 @import "~@wordpress/base-styles/z-index";
+@import "~@wordpress/interface/src/style.scss";
 
 
 

From 38396d5d381ffff8d69770591bb5b51ba6e14339 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Mon, 21 Sep 2020 09:50:50 +0100
Subject: [PATCH 06/11] Update src/components/header/redo.js

Co-authored-by: Patrick Lindsay <patrick@yamasolutions.com>
---
 src/components/header/redo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/header/redo.js b/src/components/header/redo.js
index 499763b..b7b1521 100644
--- a/src/components/header/redo.js
+++ b/src/components/header/redo.js
@@ -12,7 +12,7 @@ function HistoryRedo( { hasRedo, redo, ...props } ) {
 			{ ...props }
 			icon={ redoIcon }
 			label={ __( 'Red' ) }
-			shortcut={ displayShortcut.primary( 'z' ) }
+			shortcut={ displayShortcut.primary( 'x' ) }
 			// If there are no redo levels we don't want to actually disable this
 			// button, because it will remove focus for keyboard users.
 			// See: https://github.com/WordPress/gutenberg/issues/3486

From a23de3c573e7e9a8a8d4e6b6283f1840e2b895c4 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Mon, 21 Sep 2020 09:51:36 +0100
Subject: [PATCH 07/11] Update src/components/header/redo.js

Co-authored-by: Patrick Lindsay <patrick@yamasolutions.com>
---
 src/components/header/redo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/header/redo.js b/src/components/header/redo.js
index b7b1521..45e60a7 100644
--- a/src/components/header/redo.js
+++ b/src/components/header/redo.js
@@ -11,7 +11,7 @@ function HistoryRedo( { hasRedo, redo, ...props } ) {
 		<Button
 			{ ...props }
 			icon={ redoIcon }
-			label={ __( 'Red' ) }
+			label={ __( 'Redo' ) }
 			shortcut={ displayShortcut.primary( 'x' ) }
 			// If there are no redo levels we don't want to actually disable this
 			// button, because it will remove focus for keyboard users.

From 91380a14efdd52174c15b0242a2523a975902d10 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Mon, 21 Sep 2020 11:48:45 +0100
Subject: [PATCH 08/11] Add persistance via data controls

---
 src/store/action-types.js |  4 +++-
 src/store/actions.js      | 29 +++++++++++++++++++++++++++--
 src/store/controls.js     | 21 +++++++++++++++++++++
 src/store/index.js        | 18 ++++++++++++++++--
 4 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 src/store/controls.js

diff --git a/src/store/action-types.js b/src/store/action-types.js
index 8a2bcae..11b60d8 100644
--- a/src/store/action-types.js
+++ b/src/store/action-types.js
@@ -1,2 +1,4 @@
 export const UPDATE_BLOCKS = "UPDATE_BLOCKS";
-export const PERSIST_BLOCKS = "PERSIST_BLOCKS";
\ No newline at end of file
+export const PERSIST_BLOCKS = "PERSIST_BLOCKS";
+export const FETCH_BLOCKS_FROM_STORAGE = "FETCH_BLOCKS_FROM_STORAGE";
+export const PERSIST_BLOCKS_TO_STORAGE = "PERSIST_BLOCKS_TO_STORAGE";
\ No newline at end of file
diff --git a/src/store/actions.js b/src/store/actions.js
index 6b32835..15f8e95 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -1,5 +1,10 @@
 import { dispatch } from '@wordpress/data-controls';
-import { UPDATE_BLOCKS, PERSIST_BLOCKS } from "./action-types";
+import {
+	UPDATE_BLOCKS,
+	PERSIST_BLOCKS,
+	FETCH_BLOCKS_FROM_STORAGE,
+	PERSIST_BLOCKS_TO_STORAGE,
+} from "./action-types";
 import { ActionCreators } from "redux-undo";
 
 
@@ -11,11 +16,31 @@ export function redo() {
 	return ActionCreators.redo();
 }
 
-export function updateBlocks( blocks, persist = false ) {
+
+
+export function *updateBlocks( blocks, persist = false ) {
+
+	if( persist ) {
+		yield persistBlocksToStorage(blocks);
+	}
+
 	return {
 		type: persist ? PERSIST_BLOCKS : UPDATE_BLOCKS,
 		blocks,
 	};
 }
 
+export function fetchBlocksFromStorage() {
+	return {
+		type: FETCH_BLOCKS_FROM_STORAGE,
+	};
+};
+
+export function persistBlocksToStorage(blocks) {
+	return {
+		type: PERSIST_BLOCKS_TO_STORAGE,
+		blocks,
+	};
+}
+
 
diff --git a/src/store/controls.js b/src/store/controls.js
new file mode 100644
index 0000000..0ade00e
--- /dev/null
+++ b/src/store/controls.js
@@ -0,0 +1,21 @@
+import {
+	FETCH_BLOCKS_FROM_STORAGE,
+	PERSIST_BLOCKS_TO_STORAGE,
+} from "./action-types";
+import { serialize } from "@wordpress/blocks";
+
+export default {
+    [PERSIST_BLOCKS_TO_STORAGE](action) {
+        return new Promise((resolve, reject) => {
+            window.localStorage.setItem("getdavesbeBlocks", serialize(action.blocks));
+            resolve(action.blocks);
+        });
+    },
+    [FETCH_BLOCKS_FROM_STORAGE]() {
+        return new Promise((resolve, reject) => {
+            const storedBlocks =
+                window.localStorage.getItem("getdavesbeBlocks") || [];
+            resolve(storedBlocks);
+        });
+    },
+};
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index c77e8c0..23d4bc8 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -9,17 +9,31 @@ import { registerStore } from '@wordpress/data';
 import reducer from './reducer';
 import * as selectors from './selectors';
 import * as actions from './actions';
+import controls from './controls';
+import { parse } from "@wordpress/blocks";
+
+
 
 /**
  * Module Constants
  */
 const MODULE_KEY = 'getdavesbe';
 
-const store = registerStore( MODULE_KEY, {
+const store = registerStore(MODULE_KEY, {
 	reducer,
 	selectors,
 	actions,
-} );
+	controls,
+	resolvers: {
+		*getBlocks() {
+			const rawBlocks = yield actions.fetchBlocksFromStorage();
+			const persist = false;
+			const blocks = parse(rawBlocks);
+			yield actions.updateBlocks(blocks, persist);
+			return blocks;
+		},
+	},
+});
 
 window.getDaveStore = store;
 

From 1e67af5236965f282d05d20728602ef15f503bbc Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Mon, 21 Sep 2020 11:53:55 +0100
Subject: [PATCH 09/11] Move resolvers to dedicated file

---
 src/store/index.js     | 14 ++------------
 src/store/resolvers.js | 10 ++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 src/store/resolvers.js

diff --git a/src/store/index.js b/src/store/index.js
index 23d4bc8..e6e7d15 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -9,10 +9,8 @@ import { registerStore } from '@wordpress/data';
 import reducer from './reducer';
 import * as selectors from './selectors';
 import * as actions from './actions';
+import * as resolvers from "./resolvers";
 import controls from './controls';
-import { parse } from "@wordpress/blocks";
-
-
 
 /**
  * Module Constants
@@ -24,15 +22,7 @@ const store = registerStore(MODULE_KEY, {
 	selectors,
 	actions,
 	controls,
-	resolvers: {
-		*getBlocks() {
-			const rawBlocks = yield actions.fetchBlocksFromStorage();
-			const persist = false;
-			const blocks = parse(rawBlocks);
-			yield actions.updateBlocks(blocks, persist);
-			return blocks;
-		},
-	},
+	resolvers,
 });
 
 window.getDaveStore = store;
diff --git a/src/store/resolvers.js b/src/store/resolvers.js
new file mode 100644
index 0000000..802f464
--- /dev/null
+++ b/src/store/resolvers.js
@@ -0,0 +1,10 @@
+import { parse } from "@wordpress/blocks";
+import { fetchBlocksFromStorage, updateBlocks } from "./actions";
+
+export function *getBlocks() {
+    const rawBlocks = yield fetchBlocksFromStorage();
+    const persist = false;
+    const blocks = parse(rawBlocks);
+    yield updateBlocks(blocks, persist);
+    return blocks;
+}
\ No newline at end of file

From 5e2f858bc754d5de03a3d9374749073f928efd81 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Mon, 21 Sep 2020 11:54:05 +0100
Subject: [PATCH 10/11] Make action creators clearer

---
 src/store/actions.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/store/actions.js b/src/store/actions.js
index 15f8e95..0bb8c83 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -5,19 +5,17 @@ import {
 	FETCH_BLOCKS_FROM_STORAGE,
 	PERSIST_BLOCKS_TO_STORAGE,
 } from "./action-types";
-import { ActionCreators } from "redux-undo";
+import { ActionCreators as ReduxUndo } from "redux-undo";
 
 
 export function undo() {
-	return ActionCreators.undo();
+	return ReduxUndo.undo();
 }
 
 export function redo() {
-	return ActionCreators.redo();
+	return ReduxUndo.redo();
 }
 
-
-
 export function *updateBlocks( blocks, persist = false ) {
 
 	if( persist ) {

From 7cc59f456f8e34995b1397474eb5cb2b990542cd Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Mon, 21 Sep 2020 11:57:57 +0100
Subject: [PATCH 11/11] Remove rogue dispatch

---
 src/store/actions.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/store/actions.js b/src/store/actions.js
index 0bb8c83..1d9e184 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -1,4 +1,3 @@
-import { dispatch } from '@wordpress/data-controls';
 import {
 	UPDATE_BLOCKS,
 	PERSIST_BLOCKS,