From e80b714697b68f38df82b0e0082a85e0c589d87f Mon Sep 17 00:00:00 2001 From: Andrea Fercia Date: Thu, 11 Apr 2024 15:10:07 +0200 Subject: [PATCH] Move code to block-library. --- package-lock.json | 2 ++ packages/block-editor/README.md | 4 ---- packages/block-editor/src/components/index.js | 1 - packages/block-library/README.md | 4 ++++ packages/block-library/package.json | 1 + .../src}/block-keyboard-shortcuts/index.js | 6 +----- packages/block-library/src/index.js | 2 ++ .../src/components/sidebar-block-editor/index.js | 2 +- packages/edit-post/src/components/layout/index.js | 2 +- packages/edit-site/src/components/editor/index.js | 2 +- .../components/widget-areas-block-editor-provider/index.js | 6 ++---- 11 files changed, 15 insertions(+), 17 deletions(-) rename packages/{block-editor/src/components => block-library/src}/block-keyboard-shortcuts/index.js (96%) diff --git a/package-lock.json b/package-lock.json index d5615eb8e2df1..bafd0e526bf37 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53367,6 +53367,7 @@ "@wordpress/icons": "file:../icons", "@wordpress/interactivity": "file:../interactivity", "@wordpress/interactivity-router": "file:../interactivity-router", + "@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts", "@wordpress/keycodes": "file:../keycodes", "@wordpress/notices": "file:../notices", "@wordpress/patterns": "file:../patterns", @@ -68687,6 +68688,7 @@ "@wordpress/icons": "file:../icons", "@wordpress/interactivity": "file:../interactivity", "@wordpress/interactivity-router": "file:../interactivity-router", + "@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts", "@wordpress/keycodes": "file:../keycodes", "@wordpress/notices": "file:../notices", "@wordpress/patterns": "file:../patterns", diff --git a/packages/block-editor/README.md b/packages/block-editor/README.md index 53537d9f90d3b..75f4d1143895e 100644 --- a/packages/block-editor/README.md +++ b/packages/block-editor/README.md @@ -193,10 +193,6 @@ _Related_ - -### BlockKeyboardShortcuts - -Undocumented declaration. - ### BlockList Undocumented declaration. diff --git a/packages/block-editor/src/components/index.js b/packages/block-editor/src/components/index.js index 2bd8aec34f5df..5263ca3332b25 100644 --- a/packages/block-editor/src/components/index.js +++ b/packages/block-editor/src/components/index.js @@ -24,7 +24,6 @@ export { export { default as BlockColorsStyleSelector } from './color-style-selector'; export { default as BlockEdit, useBlockEditContext } from './block-edit'; export { default as BlockIcon } from './block-icon'; -export { default as BlockKeyboardShortcuts } from './block-keyboard-shortcuts'; export { default as BlockNavigationDropdown } from './block-navigation/dropdown'; export { default as BlockStyles } from './block-styles'; export { default as HeadingLevelDropdown } from './block-heading-level-dropdown'; diff --git a/packages/block-library/README.md b/packages/block-library/README.md index 25c5f9b52c71a..545dfe69e252f 100644 --- a/packages/block-library/README.md +++ b/packages/block-library/README.md @@ -32,6 +32,10 @@ _Parameters_ - _blocks_ `Array`: An optional array of the core blocks being registered. +### BlockKeyboardShortcuts + +Undocumented declaration. + ## Registering individual blocks diff --git a/packages/block-library/package.json b/packages/block-library/package.json index d9bb73400d79c..1f4646e94e31f 100644 --- a/packages/block-library/package.json +++ b/packages/block-library/package.json @@ -52,6 +52,7 @@ "@wordpress/icons": "file:../icons", "@wordpress/interactivity": "file:../interactivity", "@wordpress/interactivity-router": "file:../interactivity-router", + "@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts", "@wordpress/keycodes": "file:../keycodes", "@wordpress/notices": "file:../notices", "@wordpress/patterns": "file:../patterns", diff --git a/packages/block-editor/src/components/block-keyboard-shortcuts/index.js b/packages/block-library/src/block-keyboard-shortcuts/index.js similarity index 96% rename from packages/block-editor/src/components/block-keyboard-shortcuts/index.js rename to packages/block-library/src/block-keyboard-shortcuts/index.js index 683c91acc573c..7f9429e376d79 100644 --- a/packages/block-editor/src/components/block-keyboard-shortcuts/index.js +++ b/packages/block-library/src/block-keyboard-shortcuts/index.js @@ -9,11 +9,7 @@ import { } from '@wordpress/keyboard-shortcuts'; import { __ } from '@wordpress/i18n'; import { createBlock } from '@wordpress/blocks'; - -/** - * Internal dependencies - */ -import { store as blockEditorStore } from '../../store'; +import { store as blockEditorStore } from '@wordpress/block-editor'; function BlockKeyboardShortcuts() { const { registerShortcut } = useDispatch( keyboardShortcutsStore ); diff --git a/packages/block-library/src/index.js b/packages/block-library/src/index.js index e2e0fd9e414ef..01641a6b23e25 100644 --- a/packages/block-library/src/index.js +++ b/packages/block-library/src/index.js @@ -330,3 +330,5 @@ export const __experimentalRegisterExperimentalCoreBlocks = process.env .forEach( ( { init } ) => init() ); } : undefined; + +export { default as BlockKeyboardShortcuts } from './block-keyboard-shortcuts'; diff --git a/packages/customize-widgets/src/components/sidebar-block-editor/index.js b/packages/customize-widgets/src/components/sidebar-block-editor/index.js index e8c5ff5122c07..0be7130fcc285 100644 --- a/packages/customize-widgets/src/components/sidebar-block-editor/index.js +++ b/packages/customize-widgets/src/components/sidebar-block-editor/index.js @@ -11,8 +11,8 @@ import { BlockInspector, privateApis as blockEditorPrivateApis, __unstableBlockSettingsMenuFirstItem, - BlockKeyboardShortcuts, } from '@wordpress/block-editor'; +import { BlockKeyboardShortcuts } from '@wordpress/block-library'; import { uploadMedia } from '@wordpress/media-utils'; import { store as preferencesStore } from '@wordpress/preferences'; diff --git a/packages/edit-post/src/components/layout/index.js b/packages/edit-post/src/components/layout/index.js index dad3d3ff03c06..7a30490f63594 100644 --- a/packages/edit-post/src/components/layout/index.js +++ b/packages/edit-post/src/components/layout/index.js @@ -23,8 +23,8 @@ import { BlockToolbar, privateApis as blockEditorPrivateApis, store as blockEditorStore, - BlockKeyboardShortcuts, } from '@wordpress/block-editor'; +import { BlockKeyboardShortcuts } from '@wordpress/block-library'; import { Button, ScrollLock } from '@wordpress/components'; import { useViewportMatch } from '@wordpress/compose'; import { PluginArea } from '@wordpress/plugins'; diff --git a/packages/edit-site/src/components/editor/index.js b/packages/edit-site/src/components/editor/index.js index 405e2e8407baa..619a8a5ebbaf2 100644 --- a/packages/edit-site/src/components/editor/index.js +++ b/packages/edit-site/src/components/editor/index.js @@ -23,8 +23,8 @@ import { BlockToolbar, store as blockEditorStore, BlockInspector, - BlockKeyboardShortcuts, } from '@wordpress/block-editor'; +import { BlockKeyboardShortcuts } from '@wordpress/block-library'; import { InterfaceSkeleton, ComplementaryArea, diff --git a/packages/edit-widgets/src/components/widget-areas-block-editor-provider/index.js b/packages/edit-widgets/src/components/widget-areas-block-editor-provider/index.js index 378160bda5584..455c8982aee56 100644 --- a/packages/edit-widgets/src/components/widget-areas-block-editor-provider/index.js +++ b/packages/edit-widgets/src/components/widget-areas-block-editor-provider/index.js @@ -11,10 +11,8 @@ import { useResourcePermissions, } from '@wordpress/core-data'; import { useMemo } from '@wordpress/element'; -import { - privateApis as blockEditorPrivateApis, - BlockKeyboardShortcuts, -} from '@wordpress/block-editor'; +import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor'; +import { BlockKeyboardShortcuts } from '@wordpress/block-library'; import { privateApis as editPatternsPrivateApis } from '@wordpress/patterns'; import { store as preferencesStore } from '@wordpress/preferences';