Skip to content

Commit

Permalink
Rebase fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ellatrix committed Apr 27, 2021
1 parent 8e01eaf commit 248dc62
Showing 1 changed file with 5 additions and 13 deletions.
18 changes: 5 additions & 13 deletions packages/block-editor/src/components/block-list/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import classnames from 'classnames';
* WordPress dependencies
*/
import { AsyncModeProvider, useSelect } from '@wordpress/data';
import { useRef } from '@wordpress/element';
import { useViewportMatch, useMergeRefs } from '@wordpress/compose';

/**
Expand Down Expand Up @@ -67,21 +66,14 @@ function Root( { className, children } ) {
}

export default function BlockList( { className, __experimentalLayout } ) {
const ref = useRef();

usePreParsePatterns();

return (
<>
<InsertionPoint>
<BlockPopover />
<InsertionPoint>
<Root className={ className } containerRef={ ref }>
<BlockListItems
__experimentalLayout={ __experimentalLayout }
/>
</Root>
</InsertionPoint>
</>
<Root className={ className }>
<BlockListItems __experimentalLayout={ __experimentalLayout } />
</Root>
</InsertionPoint>
);
}

Expand Down

0 comments on commit 248dc62

Please sign in to comment.