Skip to content

Commit

Permalink
Fix: Drag & Drop does not work on the widgets screen (#19029)
Browse files Browse the repository at this point in the history
  • Loading branch information
jorgefilipecosta authored Dec 10, 2019
1 parent ed66431 commit acd5477
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 19 deletions.
41 changes: 22 additions & 19 deletions packages/edit-widgets/src/components/layout/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import { __ } from '@wordpress/i18n';
import {
navigateRegions,
DropZoneProvider,
Popover,
SlotFillProvider,
} from '@wordpress/components';
Expand All @@ -21,25 +22,27 @@ function Layout( { blockEditorSettings } ) {
const [ selectedArea, setSelectedArea ] = useState( null );
return (
<SlotFillProvider>
<Header />
<Sidebar />
<Notices />
<div
className="edit-widgets-layout__content"
role="region"
aria-label={ __( 'Widgets screen content' ) }
tabIndex="-1"
onFocus={ () => {
setSelectedArea( null );
} }
>
<WidgetAreas
selectedArea={ selectedArea }
setSelectedArea={ setSelectedArea }
blockEditorSettings={ blockEditorSettings }
/>
</div>
<Popover.Slot />
<DropZoneProvider>
<Header />
<Sidebar />
<Notices />
<div
className="edit-widgets-layout__content"
role="region"
aria-label={ __( 'Widgets screen content' ) }
tabIndex="-1"
onFocus={ () => {
setSelectedArea( null );
} }
>
<WidgetAreas
selectedArea={ selectedArea }
setSelectedArea={ setSelectedArea }
blockEditorSettings={ blockEditorSettings }
/>
</div>
<Popover.Slot />
</DropZoneProvider>
</SlotFillProvider>
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@

.edit-widgets-main-block-list > .block-list-appender {
padding-top: $panel-padding;
position: relative;
}

0 comments on commit acd5477

Please sign in to comment.