diff --git a/.eslintrc.ts.json b/.eslintrc.ts.json index c1a3027901..1080f94c9e 100644 --- a/.eslintrc.ts.json +++ b/.eslintrc.ts.json @@ -276,6 +276,7 @@ "assets/js/src/form_editor/store/reducers/history_record.ts", "assets/js/src/form_editor/store/reducers/toggle_form.ts", "assets/js/src/form_editor/store/reducers/toggle_fullscreen.ts", + "assets/js/src/form_editor/store/reducers/toggle_sidebar.ts", "assets/js/src/form_editor/store/reducers/tutorial_dismiss.ts", "assets/js/src/form_editor/template_selection.tsx", "assets/js/src/form_editor/translations.ts", diff --git a/assets/js/src/form_editor/components/editor.jsx b/assets/js/src/form_editor/components/editor.jsx index ec2fe6cfd9..bd57977787 100644 --- a/assets/js/src/form_editor/components/editor.jsx +++ b/assets/js/src/form_editor/components/editor.jsx @@ -1,4 +1,4 @@ -import React, { useState } from 'react'; +import React from 'react'; import '@wordpress/core-data'; import { useSelect, useDispatch } from '@wordpress/data'; import { @@ -39,11 +39,16 @@ import Fullscreen from './fullscreen'; * https://developer.wordpress.org/block-editor/packages/packages-block-editor/ */ export default () => { - const [isInserterOpen, setIsInserterOpen] = useState(false); const sidebarOpened = useSelect( (sel) => sel('mailpoet-form-editor').getSidebarOpened(), [] ); + + const isInserterOpened = useSelect( + (sel) => sel('mailpoet-form-editor').isInserterOpened(), + [] + ); + const formBlocks = useSelect( (sel) => sel('mailpoet-form-editor').getFormBlocks(), [] @@ -67,7 +72,7 @@ export default () => { } ); - const { blocksChangedInBlockEditor } = useDispatch('mailpoet-form-editor'); + const { blocksChangedInBlockEditor, toggleInserter } = useDispatch('mailpoet-form-editor'); // Editor settings - see @wordpress/block-editor/src/store/defaults.js const editorSettings = { @@ -82,7 +87,7 @@ export default () => { __experimentalFetchLinkSuggestions: fetchLinkSuggestions, __experimentalBlockPatterns: [], // we don't want patterns in our inserter __experimentalBlockPatternCategories: [], - __experimentalSetIsInserterOpened: setIsInserterOpen, + __experimentalSetIsInserterOpened: toggleInserter, }; return ( @@ -93,8 +98,8 @@ export default () => {