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

Jump to bottom

Customizer: Mobile & toolbar; Block toolbar widgets mobile #22533

Merged
merged 2 commits into from May 22, 2020
Merged

Customizer: Mobile & toolbar; Block toolbar widgets mobile #22533

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
4e524ba
Force mobile view on customizer
jorgefilipecosta May 21, 2020
ae39b53
Add top toolbar to customizer (inserter/undo...). Add fixed toolbar o…
jorgefilipecosta May 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 15 additions & 1 deletion packages/edit-widgets/src/components/customizer-edit-widgets-initializer/index.js
View file
Open in desktop
Expand Up @@ -2,24 +2,38 @@
* WordPress dependencies
*/
import { navigateRegions } from '@wordpress/components';
import { useSimulatedMediaQuery } from '@wordpress/block-editor';
import { __ } from '@wordpress/i18n';
import { useMemo } from '@wordpress/element';

/**
* Internal dependencies
*/
import './sync-customizer';
import Header from '../header';
import WidgetAreasBlockEditorProvider from '../widget-areas-block-editor-provider';
import WidgetAreasBlockEditorContent from '../widget-areas-block-editor-content';

function CustomizerEditWidgetsInitializer( { settings } ) {
useSimulatedMediaQuery( 'resizable-editor-section', 360 );
const blockEditorSettings = useMemo(
() => ( {
...settings,
hasFixedToolbar: true,
} ),
[ settings ]
);
return (
<WidgetAreasBlockEditorProvider blockEditorSettings={ settings }>
<WidgetAreasBlockEditorProvider
blockEditorSettings={ blockEditorSettings }
>
<div
className="edit-widgets-customizer-edit-widgets-initializer__content"
role="region"
aria-label={ __( 'Widgets screen content' ) }
tabIndex="-1"
>
<Header isCustomizer />
<WidgetAreasBlockEditorContent />
</div>
</WidgetAreasBlockEditorProvider>
Expand Down
17 changes: 8 additions & 9 deletions packages/edit-widgets/src/components/customizer-edit-widgets-initializer/style.scss
View file
Open in desktop
@@ -1,14 +1,13 @@
.edit-widgets-customizer-edit-widgets-initializer__content {
background: #f1f1f1;
margin: 0;
min-height: 100%;
padding: 30px 0;

.block-editor-block-list__layout {
padding: 0 0 0 18px;
.edit-widgets-header {
margin-top: -16px;
border-top: 1px solid $light-gray-500;
}

.block-editor-block-list__empty-block-inserter {
left: -18px;
.edit-widgets-header,
.edit-widgets-header__block-toolbar {
margin-right: -12px;
margin-left: -12px;
background: #fff;
}
}
57 changes: 37 additions & 20 deletions packages/edit-widgets/src/components/header/index.js
View file
Open in desktop
Expand Up @@ -3,8 +3,13 @@
*/
import { __ } from '@wordpress/i18n';
import { NavigableMenu } from '@wordpress/components';
import { BlockNavigationDropdown, Inserter } from '@wordpress/block-editor';
import {
BlockNavigationDropdown,
BlockToolbar,
Inserter,
} from '@wordpress/block-editor';
import { PinnedItems } from '@wordpress/interface';
import { useViewportMatch } from '@wordpress/compose';

/**
* Internal dependencies
Expand All @@ -15,27 +20,39 @@ import RedoButton from './undo-redo/redo';

const inserterToggleProps = { isPrimary: true };

function Header() {
function Header( { isCustomizer } ) {
const isLargeViewport = useViewportMatch( 'medium' );
return (
<div className="edit-widgets-header">
<NavigableMenu>
<Inserter
position="bottom right"
showInserterHelpPanel
toggleProps={ inserterToggleProps }
/>
<UndoButton />
<RedoButton />
<BlockNavigationDropdown />
</NavigableMenu>
<h1 className="edit-widgets-header__title">
{ __( 'Block Areas' ) } { __( '(experimental)' ) }
</h1>
<div className="edit-widgets-header__actions">
<SaveButton />
<PinnedItems.Slot scope="core/edit-widgets" />
<>
<div className="edit-widgets-header">
<NavigableMenu>
<Inserter
position="bottom right"
showInserterHelpPanel
toggleProps={ inserterToggleProps }
/>
<UndoButton />
<RedoButton />
<BlockNavigationDropdown />
</NavigableMenu>
{ ! isCustomizer && (
<>
<h1 className="edit-widgets-header__title">
{ __( 'Block Areas' ) } { __( '(experimental)' ) }
</h1>
<div className="edit-widgets-header__actions">
<SaveButton />
<PinnedItems.Slot scope="core/edit-widgets" />
</div>
</>
) }
</div>
</div>
{ ( ! isLargeViewport || isCustomizer ) && (
<div className="edit-widgets-header__block-toolbar">
<BlockToolbar hideDragHandle />
</div>
) }
</>
);
}

Expand Down
5 changes: 5 additions & 0 deletions packages/edit-widgets/src/components/header/style.scss
View file
Open in desktop
Expand Up @@ -15,3 +15,8 @@
.edit-widgets-header__actions {
display: flex;
}

.edit-widgets-header__block-toolbar {
border-bottom: 1px solid $light-gray-500;
border-top: 1px solid $light-gray-500;
}