Skip to content

Commit

Permalink
Remove block tools back compat component schedule for deprecated in 6…
Browse files Browse the repository at this point in the history
….3 (#53115)

* Removes usage of BlockToolsBackCompat

* Remove unwanted BlockTools from Nav sidebar
  • Loading branch information
getdave authored Jul 28, 2023
1 parent 4b4914b commit 7b1c44c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
9 changes: 3 additions & 6 deletions packages/block-editor/src/components/block-list/index.js
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
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

0 comments on commit 7b1c44c

Please sign in to comment.