Skip to content

Commit 0328b55

Browse files
costasovoveljkho
authored andcommittedJan 19, 2022
Fix registering keyboard shortcuts
After refactoring shortcuts from native event to react events, we need to wrap the editor into <ShortcutProvider> Related PR WordPress/gutenberg#34539 [MAILPOET-4029]
1 parent 8176ff0 commit 0328b55

File tree

1 file changed

+52
-49
lines changed
  • mailpoet/assets/js/src/form_editor/components

1 file changed

+52
-49
lines changed
 

‎mailpoet/assets/js/src/form_editor/components/editor.jsx

+52-49
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import {
1515
WritingFlow,
1616
ObserveTyping,
1717
} from '@wordpress/block-editor';
18+
import { ShortcutProvider } from '@wordpress/keyboard-shortcuts';
1819
import classnames from 'classnames';
1920
import fetchLinkSuggestions from '../utils/link_suggestions';
2021
import Header from './header.jsx';
@@ -93,59 +94,61 @@ export default () => {
9394
return (
9495
<>
9596
<CustomFontsStyleSheetLink />
96-
<SlotFillProvider>
97-
<div className={layoutClass}>
98-
<div className="interface-interface-skeleton__editor">
99-
<div className="interface-interface-skeleton__header">
100-
<Header
101-
isInserterOpened={isInserterOpened}
102-
setIsInserterOpened={toggleInserter}
103-
/>
104-
</div>
105-
<div className="interface-interface-skeleton__body">
106-
<BlockEditorProvider
107-
value={formBlocks}
108-
onInput={blocksChangedInBlockEditor}
109-
onChange={blocksChangedInBlockEditor}
110-
settings={editorSettings}
111-
useSubRegistry={false}
112-
>
113-
{(isInserterOpened) && (
114-
<div className="interface-interface-skeleton__secondary-sidebar">
115-
<Inserter setIsInserterOpened={toggleInserter} />
116-
</div>
117-
)}
118-
<div className="interface-interface-skeleton__content">
119-
<BlockTools />
120-
<Notices />
121-
<UnsavedChangesNotice />
122-
<BlockSelectionClearer className="edit-post-visual-editor editor-styles-wrapper">
123-
<BlockEditorKeyboardShortcuts />
124-
<BlockEditorKeyboardShortcuts.Register />
125-
<div className="mailpoet_form">
126-
<WritingFlow>
127-
<ObserveTyping>
128-
<FormStylingBackground>
129-
<BlockList />
130-
</FormStylingBackground>
131-
</ObserveTyping>
132-
</WritingFlow>
97+
<ShortcutProvider>
98+
<SlotFillProvider>
99+
<div className={layoutClass}>
100+
<div className="interface-interface-skeleton__editor">
101+
<div className="interface-interface-skeleton__header">
102+
<Header
103+
isInserterOpened={isInserterOpened}
104+
setIsInserterOpened={toggleInserter}
105+
/>
106+
</div>
107+
<div className="interface-interface-skeleton__body">
108+
<BlockEditorProvider
109+
value={formBlocks}
110+
onInput={blocksChangedInBlockEditor}
111+
onChange={blocksChangedInBlockEditor}
112+
settings={editorSettings}
113+
useSubRegistry={false}
114+
>
115+
{(isInserterOpened) && (
116+
<div className="interface-interface-skeleton__secondary-sidebar">
117+
<Inserter setIsInserterOpened={toggleInserter} />
133118
</div>
134-
</BlockSelectionClearer>
135-
</div>
136-
{(sidebarOpened) && (
137-
<div className="interface-interface-skeleton__sidebar">
138-
<Sidebar />
119+
)}
120+
<div className="interface-interface-skeleton__content">
121+
<BlockTools />
122+
<Notices />
123+
<UnsavedChangesNotice />
124+
<BlockSelectionClearer className="edit-post-visual-editor editor-styles-wrapper">
125+
<BlockEditorKeyboardShortcuts />
126+
<BlockEditorKeyboardShortcuts.Register />
127+
<div className="mailpoet_form">
128+
<WritingFlow>
129+
<ObserveTyping>
130+
<FormStylingBackground>
131+
<BlockList />
132+
</FormStylingBackground>
133+
</ObserveTyping>
134+
</WritingFlow>
135+
</div>
136+
</BlockSelectionClearer>
139137
</div>
140-
)}
141-
</BlockEditorProvider>
138+
{(sidebarOpened) && (
139+
<div className="interface-interface-skeleton__sidebar">
140+
<Sidebar />
141+
</div>
142+
)}
143+
</BlockEditorProvider>
144+
</div>
145+
<FormStyles />
146+
<Fullscreen />
142147
</div>
143-
<FormStyles />
144-
<Fullscreen />
148+
<Popover.Slot />
145149
</div>
146-
<Popover.Slot />
147-
</div>
148-
</SlotFillProvider>
150+
</SlotFillProvider>
151+
</ShortcutProvider>
149152
<Preview />
150153
<Tutorial />
151154
</>

0 commit comments

Comments
 (0)
Please sign in to comment.