Skip to content

Commit afd99e4

Browse files
committed
Cleanup
1 parent 4de8480 commit afd99e4

File tree

49 files changed

+713
-715
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+713
-715
lines changed

packages/edit-site/src/new/index.js renamed to packages/edit-site/src/components/app/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import { ShortcutProvider } from '@wordpress/keyboard-shortcuts';
88
/**
99
* Internal dependencies
1010
*/
11-
import { Routes } from '../components/routes';
12-
import Layout from './layout';
11+
import { Routes } from '../routes';
12+
import Layout from '../layout';
1313

1414
export default function App() {
1515
return (

packages/edit-site/src/components/block-editor/block-inspector-button.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
1313
*/
1414
import { store as editSiteStore } from '../../store';
1515
import { STORE_NAME } from '../../store/constants';
16-
import { SIDEBAR_BLOCK } from '../sidebar/constants';
16+
import { SIDEBAR_BLOCK } from '../sidebar-edit-mode/constants';
1717

1818
export default function BlockInspectorButton( { onClick = () => {} } ) {
1919
const { shortcut, isBlockInspectorOpen } = useSelect(

packages/edit-site/src/components/block-editor/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { ReusableBlocksMenuItems } from '@wordpress/reusable-blocks';
2929
*/
3030
import TemplatePartConverter from '../template-part-converter';
3131
import NavigateToLink from '../navigate-to-link';
32-
import { SidebarInspectorFill } from '../sidebar';
32+
import { SidebarInspectorFill } from '../sidebar-edit-mode';
3333
import { store as editSiteStore } from '../../store';
3434
import BlockInspectorButton from './block-inspector-button';
3535
import BackButton from './back-button';

packages/edit-site/src/new/canvas/index.js renamed to packages/edit-site/src/components/canvas/index.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
2626
*/
2727
import { store as editSiteStore } from '../../store';
2828
import Header from '../header';
29-
import BlockEditor from '../../components/block-editor';
30-
import CodeEditor from '../../components/code-editor';
31-
import KeyboardShortcuts from '../../components/keyboard-shortcuts';
32-
import useInitEditedEntityFromURL from '../../components/use-init-edited-entity-from-url';
33-
import GlobalStylesRenderer from '../../components/global-styles-renderer';
34-
import { GlobalStylesProvider } from '../../components/global-styles/global-styles-provider';
35-
import ListViewSidebar from '../../components/secondary-sidebar/list-view-sidebar';
36-
import InserterSidebar from '../../components/secondary-sidebar/inserter-sidebar';
37-
import { SidebarComplementaryAreaFills } from '../../components/sidebar';
38-
import WelcomeGuide from '../../components/welcome-guide';
29+
import BlockEditor from '../block-editor';
30+
import CodeEditor from '../code-editor';
31+
import KeyboardShortcuts from '../keyboard-shortcuts';
32+
import useInitEditedEntityFromURL from '../use-init-edited-entity-from-url';
33+
import GlobalStylesRenderer from '../global-styles-renderer';
34+
import { GlobalStylesProvider } from '../global-styles/global-styles-provider';
35+
import ListViewSidebar from '../secondary-sidebar/list-view-sidebar';
36+
import InserterSidebar from '../secondary-sidebar/inserter-sidebar';
37+
import { SidebarComplementaryAreaFills } from '../sidebar-edit-mode';
38+
import WelcomeGuide from '../welcome-guide';
3939

4040
const interfaceLabels = {
4141
/* translators: accessibility text for the editor top bar landmark region. */
File renamed without changes.

packages/edit-site/src/components/header/document-actions/index.js renamed to packages/edit-site/src/components/header-edit-mode/document-actions/index.js

File renamed without changes.

packages/edit-site/src/components/header/document-actions/style.scss renamed to packages/edit-site/src/components/header-edit-mode/document-actions/style.scss

File renamed without changes.
Lines changed: 285 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,285 @@
1+
/**
2+
* External dependencies
3+
*/
4+
import classnames from 'classnames';
5+
6+
/**
7+
* WordPress dependencies
8+
*/
9+
import { useCallback, useRef } from '@wordpress/element';
10+
import { useViewportMatch } from '@wordpress/compose';
11+
import {
12+
ToolSelector,
13+
__experimentalPreviewOptions as PreviewOptions,
14+
NavigableToolbar,
15+
store as blockEditorStore,
16+
} from '@wordpress/block-editor';
17+
import { useSelect, useDispatch } from '@wordpress/data';
18+
import { PinnedItems } from '@wordpress/interface';
19+
import { _x, __ } from '@wordpress/i18n';
20+
import { listView, plus, external, chevronUpDown } from '@wordpress/icons';
21+
import {
22+
Button,
23+
ToolbarItem,
24+
MenuGroup,
25+
MenuItem,
26+
VisuallyHidden,
27+
} from '@wordpress/components';
28+
import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
29+
import { store as preferencesStore } from '@wordpress/preferences';
30+
import { store as editorStore } from '@wordpress/editor';
31+
import { store as coreStore } from '@wordpress/core-data';
32+
33+
/**
34+
* Internal dependencies
35+
*/
36+
import MoreMenu from './more-menu';
37+
import SaveButton from '../save-button';
38+
import UndoButton from './undo-redo/undo';
39+
import RedoButton from './undo-redo/redo';
40+
import DocumentActions from './document-actions';
41+
import TemplateDetails from '../template-details';
42+
import { store as editSiteStore } from '../../store';
43+
44+
const preventDefault = ( event ) => {
45+
event.preventDefault();
46+
};
47+
48+
export default function Header() {
49+
const inserterButton = useRef();
50+
const {
51+
deviceType,
52+
entityTitle,
53+
template,
54+
templateType,
55+
isInserterOpen,
56+
isListViewOpen,
57+
listViewShortcut,
58+
isLoaded,
59+
isVisualMode,
60+
settings,
61+
blockEditorMode,
62+
showIconLabels,
63+
} = useSelect( ( select ) => {
64+
const {
65+
__experimentalGetPreviewDeviceType,
66+
getEditedPostType,
67+
getEditedPostId,
68+
isInserterOpened,
69+
isListViewOpened,
70+
getEditorMode,
71+
getSettings,
72+
} = select( editSiteStore );
73+
const { getEditedEntityRecord } = select( coreStore );
74+
const { __experimentalGetTemplateInfo: getTemplateInfo } =
75+
select( editorStore );
76+
const { getShortcutRepresentation } = select( keyboardShortcutsStore );
77+
const { __unstableGetEditorMode } = select( blockEditorStore );
78+
79+
const postType = getEditedPostType();
80+
const postId = getEditedPostId();
81+
const record = getEditedEntityRecord( 'postType', postType, postId );
82+
const _isLoaded = !! postId;
83+
84+
return {
85+
deviceType: __experimentalGetPreviewDeviceType(),
86+
entityTitle: getTemplateInfo( record ).title,
87+
isLoaded: _isLoaded,
88+
template: record,
89+
templateType: postType,
90+
isInserterOpen: isInserterOpened(),
91+
isListViewOpen: isListViewOpened(),
92+
listViewShortcut: getShortcutRepresentation(
93+
'core/edit-site/toggle-list-view'
94+
),
95+
isVisualMode: getEditorMode() === 'visual',
96+
settings: getSettings(),
97+
blockEditorMode: __unstableGetEditorMode(),
98+
showIconLabels: select( preferencesStore ).get(
99+
'core/edit-site',
100+
'showIconLabels'
101+
),
102+
};
103+
}, [] );
104+
105+
const {
106+
__experimentalSetPreviewDeviceType: setPreviewDeviceType,
107+
setIsInserterOpened,
108+
setIsListViewOpened,
109+
} = useDispatch( editSiteStore );
110+
const { __unstableSetEditorMode } = useDispatch( blockEditorStore );
111+
112+
const isLargeViewport = useViewportMatch( 'medium' );
113+
114+
const openInserter = useCallback( () => {
115+
if ( isInserterOpen ) {
116+
// Focusing the inserter button closes the inserter popover.
117+
inserterButton.current.focus();
118+
} else {
119+
setIsInserterOpened( true );
120+
}
121+
}, [ isInserterOpen, setIsInserterOpened ] );
122+
123+
const toggleListView = useCallback(
124+
() => setIsListViewOpened( ! isListViewOpen ),
125+
[ setIsListViewOpened, isListViewOpen ]
126+
);
127+
128+
const isFocusMode = templateType === 'wp_template_part';
129+
130+
/* translators: button label text should, if possible, be under 16 characters. */
131+
const longLabel = _x(
132+
'Toggle block inserter',
133+
'Generic label for block inserter button'
134+
);
135+
const shortLabel = ! isInserterOpen ? __( 'Add' ) : __( 'Close' );
136+
137+
const isZoomedOutViewExperimentEnabled =
138+
window?.__experimentalEnableZoomedOutView && isVisualMode;
139+
const isZoomedOutView = blockEditorMode === 'zoom-out';
140+
141+
return (
142+
<div
143+
className={ classnames( 'edit-site-header-edit-mode', {
144+
'show-icon-labels': showIconLabels,
145+
} ) }
146+
>
147+
<NavigableToolbar
148+
className="edit-site-header-edit-mode__start"
149+
aria-label={ __( 'Document tools' ) }
150+
>
151+
<div className="edit-site-header-edit-mode__toolbar">
152+
<ToolbarItem
153+
ref={ inserterButton }
154+
as={ Button }
155+
className="edit-site-header-edit-mode-toolbar__inserter-toggle"
156+
variant="primary"
157+
isPressed={ isInserterOpen }
158+
onMouseDown={ preventDefault }
159+
onClick={ openInserter }
160+
disabled={ ! isVisualMode }
161+
icon={ plus }
162+
label={ showIconLabels ? shortLabel : longLabel }
163+
showTooltip={ ! showIconLabels }
164+
/>
165+
{ isLargeViewport && (
166+
<>
167+
<ToolbarItem
168+
as={ ToolSelector }
169+
showTooltip={ ! showIconLabels }
170+
variant={
171+
showIconLabels ? 'tertiary' : undefined
172+
}
173+
disabled={ ! isVisualMode }
174+
/>
175+
<ToolbarItem
176+
as={ UndoButton }
177+
showTooltip={ ! showIconLabels }
178+
variant={
179+
showIconLabels ? 'tertiary' : undefined
180+
}
181+
/>
182+
<ToolbarItem
183+
as={ RedoButton }
184+
showTooltip={ ! showIconLabels }
185+
variant={
186+
showIconLabels ? 'tertiary' : undefined
187+
}
188+
/>
189+
<ToolbarItem
190+
as={ Button }
191+
className="edit-site-header-edit-mode-toolbar__list-view-toggle"
192+
disabled={ ! isVisualMode && isZoomedOutView }
193+
icon={ listView }
194+
isPressed={ isListViewOpen }
195+
/* translators: button label text should, if possible, be under 16 characters. */
196+
label={ __( 'List View' ) }
197+
onClick={ toggleListView }
198+
shortcut={ listViewShortcut }
199+
showTooltip={ ! showIconLabels }
200+
variant={
201+
showIconLabels ? 'tertiary' : undefined
202+
}
203+
/>
204+
{ isZoomedOutViewExperimentEnabled && (
205+
<ToolbarItem
206+
as={ Button }
207+
className="edit-site-header-edit-mode-toolbar__zoom-out-view-toggle"
208+
icon={ chevronUpDown }
209+
isPressed={ isZoomedOutView }
210+
/* translators: button label text should, if possible, be under 16 characters. */
211+
label={ __( 'Zoom-out View' ) }
212+
onClick={ () => {
213+
setPreviewDeviceType( 'desktop' );
214+
__unstableSetEditorMode(
215+
isZoomedOutView
216+
? 'edit'
217+
: 'zoom-out'
218+
);
219+
} }
220+
/>
221+
) }
222+
</>
223+
) }
224+
</div>
225+
</NavigableToolbar>
226+
227+
<div className="edit-site-header-edit-mode__center">
228+
<DocumentActions
229+
entityTitle={ entityTitle }
230+
entityLabel={
231+
templateType === 'wp_template_part'
232+
? 'template part'
233+
: 'template'
234+
}
235+
isLoaded={ isLoaded }
236+
showIconLabels={ showIconLabels }
237+
>
238+
{ ( { onClose } ) => (
239+
<TemplateDetails
240+
template={ template }
241+
onClose={ onClose }
242+
/>
243+
) }
244+
</DocumentActions>
245+
</div>
246+
247+
<div className="edit-site-header-edit-mode__end">
248+
<div className="edit-site-header-edit-mode__actions">
249+
{ ! isFocusMode && (
250+
<div
251+
className={ classnames(
252+
'edit-site-header-edit-mode__actions__preview-options',
253+
{ 'is-zoomed-out': isZoomedOutView }
254+
) }
255+
>
256+
<PreviewOptions
257+
deviceType={ deviceType }
258+
setDeviceType={ setPreviewDeviceType }
259+
>
260+
<MenuGroup>
261+
<MenuItem
262+
href={ settings?.siteUrl }
263+
target="_blank"
264+
icon={ external }
265+
>
266+
{ __( 'View site' ) }
267+
<VisuallyHidden as="span">
268+
{
269+
/* translators: accessibility text */
270+
__( '(opens in a new tab)' )
271+
}
272+
</VisuallyHidden>
273+
</MenuItem>
274+
</MenuGroup>
275+
</PreviewOptions>
276+
</div>
277+
) }
278+
<SaveButton />
279+
<PinnedItems.Slot scope="core/edit-site" />
280+
<MoreMenu showIconLabels={ showIconLabels } />
281+
</div>
282+
</div>
283+
</div>
284+
);
285+
}

packages/edit-site/src/components/header/mode-switcher/index.js renamed to packages/edit-site/src/components/header-edit-mode/mode-switcher/index.js

File renamed without changes.

packages/edit-site/src/components/header/more-menu/copy-content-menu-item.js renamed to packages/edit-site/src/components/header-edit-mode/more-menu/copy-content-menu-item.js

File renamed without changes.

0 commit comments

Comments
 (0)