Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Use our modal instead of Gutenberg one

Browse Source 
[MAILPOET-2602]
This commit is contained in:
Pavel Dohnal
2020-02-06 13:16:17 +01:00
committed by Jack Kitterhing
parent 38a62850fc
commit b6c2e4554d
2 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
assets/js/src/form_editor/components/editor.jsx
View File

@@ -16,6 +16,7 @@ import FormTitle from './form_title.jsx';
import Notices from './notices.jsx';
import UnsavedChangesNotice from './unsaved_changes_notice.jsx';
import FormStyles from './form_styles.jsx';
import Preview from './preview.jsx';
// Editor settings - see @wordpress/block-editor/src/store/defaults.js
const editorSettings = {
@@ -44,46 +45,49 @@ export default () => {
const { blocksChangedInBlockEditor } = useDispatch('mailpoet-form-editor');
return (
<DropZoneProvider>
<SlotFillProvider>
<div className={layoutClass}>
<div className="block-editor-editor-skeleton__header">
<Header />
</div>
<div className="block-editor-editor-skeleton__body">
<BlockEditorProvider
value={select('mailpoet-form-editor').getFormBlocks()}
onInput={blocksChangedInBlockEditor}
onChange={blocksChangedInBlockEditor}
settings={editorSettings}
useSubRegistry={false}
>
<div className="block-editor-editor-skeleton__content">
<Notices />
<Popover.Slot name="block-toolbar" />
<UnsavedChangesNotice />
<BlockSelectionClearer className="edit-post-visual-editor editor-styles-wrapper">
<BlockEditorKeyboardShortcuts />
<BlockEditorKeyboardShortcuts.Register />
<WritingFlow>
<ObserveTyping>
<FormTitle />
<BlockList />
</ObserveTyping>
</WritingFlow>
</BlockSelectionClearer>
</div>
<div className="block-editor-editor-skeleton__sidebar">
<div>
{ sidebarOpened ? <Sidebar /> : null }
<>
<DropZoneProvider>
<SlotFillProvider>
<div className={layoutClass}>
<div className="block-editor-editor-skeleton__header">
<Header />
</div>
<div className="block-editor-editor-skeleton__body">
<BlockEditorProvider
value={select('mailpoet-form-editor').getFormBlocks()}
onInput={blocksChangedInBlockEditor}
onChange={blocksChangedInBlockEditor}
settings={editorSettings}
useSubRegistry={false}
>
<div className="block-editor-editor-skeleton__content">
<Notices />
<Popover.Slot name="block-toolbar" />
<UnsavedChangesNotice />
<BlockSelectionClearer className="edit-post-visual-editor editor-styles-wrapper">
<BlockEditorKeyboardShortcuts />
<BlockEditorKeyboardShortcuts.Register />
<WritingFlow>
<ObserveTyping>
<FormTitle />
<BlockList />
</ObserveTyping>
</WritingFlow>
</BlockSelectionClearer>
</div>
</div>
<Popover.Slot />
</BlockEditorProvider>
<div className="block-editor-editor-skeleton__sidebar">
<div>
{ sidebarOpened ? <Sidebar /> : null }
</div>
</div>
<Popover.Slot />
</BlockEditorProvider>
</div>
<FormStyles />
</div>
<FormStyles />
</div>
</SlotFillProvider>
</DropZoneProvider>
</SlotFillProvider>
</DropZoneProvider>
<Preview />
</>
);
};

6
assets/js/src/form_editor/components/preview.jsx
View File

@@ -1,8 +1,9 @@
import React, { useEffect, useState } from 'react';
import { Modal, Spinner } from '@wordpress/components';
import { Spinner } from '@wordpress/components';
import { useDispatch, useSelect } from '@wordpress/data';
import Preview from '../../common/preview.jsx';
import Modal from '../../common/modal/modal.jsx';
const FormPreview = () => {
const [form, setForm] = useState(null);
@@ -27,9 +28,6 @@ const FormPreview = () => {
return (
<Modal
isDismissible
shouldCloseOnEsc
shouldCloseOnClickOutside
title="Form Preview"
onRequestClose={hidePreview}
>