Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove block tools back compat component schedule for deprecated in 6.3 #53115

Merged
merged 2 commits into from
Jul 28, 2023
Merged

Remove block tools back compat component schedule for deprecated in 6.3 #53115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
450780e
Removes usage of BlockToolsBackCompat
getdave Jul 28, 2023
5b33880
Remove unwanted BlockTools from Nav sidebar
getdave Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions packages/block-editor/src/components/block-list/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ import { useInBetweenInserter } from './use-in-between-inserter';
import { store as blockEditorStore } from '../../store';
import { usePreParsePatterns } from '../../utils/pre-parse-patterns';
import { LayoutProvider, defaultLayout } from './layout';
import BlockToolsBackCompat from '../block-tools/back-compat';
import { useBlockSelectionClearer } from '../block-selection-clearer';
import { useInnerBlocksProps } from '../inner-blocks';
import {
Expand Down Expand Up @@ -127,11 +126,9 @@ function Root( { className, ...settings } ) {
export default function BlockList( settings ) {
usePreParsePatterns();
return (
<BlockToolsBackCompat>
<BlockEditContextProvider value={ DEFAULT_BLOCK_EDIT_CONTEXT }>
<Root { ...settings } />
</BlockEditContextProvider>
</BlockToolsBackCompat>
<BlockEditContextProvider value={ DEFAULT_BLOCK_EDIT_CONTEXT }>
<Root { ...settings } />
</BlockEditContextProvider>
);
}

Expand Down
5 changes: 1 addition & 4 deletions ...site/src/components/sidebar-navigation-screen-navigation-menus/navigation-menu-content.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {
privateApis as blockEditorPrivateApis,
store as blockEditorStore,
BlockList,
BlockTools,
} from '@wordpress/block-editor';
import { useDispatch, useSelect } from '@wordpress/data';
import { createBlock } from '@wordpress/blocks';
Expand Down Expand Up @@ -106,9 +105,7 @@ export default function NavigationMenuContent( { rootClientId } ) {
/>
) }
<div className="edit-site-sidebar-navigation-screen-navigation-menus__helper-block-editor">
<BlockTools>
<BlockList />
</BlockTools>
<BlockList />
</div>
</>
);
Expand Down