@wordpress/edit-site 5.30.0 → 5.31.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +2 -0
- package/build/components/actions/index.js +2 -4
- package/build/components/actions/index.js.map +1 -1
- package/build/components/block-editor/editor-canvas.js +16 -3
- package/build/components/block-editor/editor-canvas.js.map +1 -1
- package/build/components/block-editor/use-site-editor-settings.js +1 -1
- package/build/components/block-editor/use-site-editor-settings.js.map +1 -1
- package/build/components/global-styles/color-palette-panel.js +0 -9
- package/build/components/global-styles/color-palette-panel.js.map +1 -1
- package/build/components/global-styles/font-library-modal/context.js +15 -8
- package/build/components/global-styles/font-library-modal/context.js.map +1 -1
- package/build/components/global-styles/font-library-modal/font-collection.js +4 -3
- package/build/components/global-styles/font-library-modal/font-collection.js.map +1 -1
- package/build/components/global-styles/font-library-modal/google-fonts-confirm-dialog.js +3 -2
- package/build/components/global-styles/font-library-modal/google-fonts-confirm-dialog.js.map +1 -1
- package/build/components/global-styles/font-library-modal/installed-fonts.js +1 -1
- package/build/components/global-styles/font-library-modal/installed-fonts.js.map +1 -1
- package/build/components/global-styles/font-library-modal/upload-fonts.js +44 -10
- package/build/components/global-styles/font-library-modal/upload-fonts.js.map +1 -1
- package/build/components/global-styles/font-library-modal/utils/index.js +2 -2
- package/build/components/global-styles/font-library-modal/utils/index.js.map +1 -1
- package/build/components/global-styles/font-library-modal/utils/preview-styles.js +3 -0
- package/build/components/global-styles/font-library-modal/utils/preview-styles.js.map +1 -1
- package/build/components/global-styles/header.js +1 -1
- package/build/components/global-styles/header.js.map +1 -1
- package/build/components/global-styles/hooks.js +50 -1
- package/build/components/global-styles/hooks.js.map +1 -1
- package/build/components/global-styles/preview-iframe.js +0 -1
- package/build/components/global-styles/preview-iframe.js.map +1 -1
- package/build/components/global-styles/preview-styles.js +2 -2
- package/build/components/global-styles/preview-styles.js.map +1 -1
- package/build/components/global-styles/screen-colors.js +2 -9
- package/build/components/global-styles/screen-colors.js.map +1 -1
- package/build/components/global-styles/screen-typography.js +1 -6
- package/build/components/global-styles/screen-typography.js.map +1 -1
- package/build/components/global-styles/typography-elements.js +3 -1
- package/build/components/global-styles/typography-elements.js.map +1 -1
- package/build/components/global-styles/{preview-typography.js → typography-example.js} +4 -2
- package/build/components/global-styles/typography-example.js.map +1 -0
- package/build/components/global-styles/typography-preview.js +3 -1
- package/build/components/global-styles/typography-preview.js.map +1 -1
- package/build/components/global-styles/utils.js +1 -1
- package/build/components/global-styles/utils.js.map +1 -1
- package/build/components/global-styles/variations/variations-color.js +8 -9
- package/build/components/global-styles/variations/variations-color.js.map +1 -1
- package/build/components/global-styles/variations/variations-typography.js +27 -37
- package/build/components/global-styles/variations/variations-typography.js.map +1 -1
- package/build/components/header-edit-mode/index.js +2 -1
- package/build/components/header-edit-mode/index.js.map +1 -1
- package/build/components/keyboard-shortcut-help-modal/config.js +6 -0
- package/build/components/keyboard-shortcut-help-modal/config.js.map +1 -1
- package/build/components/keyboard-shortcuts/global.js +17 -3
- package/build/components/keyboard-shortcuts/global.js.map +1 -1
- package/build/components/layout/router.js +2 -5
- package/build/components/layout/router.js.map +1 -1
- package/build/components/page-pages/index.js +6 -11
- package/build/components/page-pages/index.js.map +1 -1
- package/build/components/page-patterns/delete-category-menu-item.js +6 -1
- package/build/components/page-patterns/delete-category-menu-item.js.map +1 -1
- package/build/components/page-patterns/index.js +1 -4
- package/build/components/page-patterns/index.js.map +1 -1
- package/build/components/page-patterns/use-patterns.js +9 -9
- package/build/components/page-patterns/use-patterns.js.map +1 -1
- package/build/components/page-templates-template-parts/index.js +11 -16
- package/build/components/page-templates-template-parts/index.js.map +1 -1
- package/build/components/save-panel/index.js +14 -9
- package/build/components/save-panel/index.js.map +1 -1
- package/build/components/sidebar/index.js +2 -3
- package/build/components/sidebar/index.js.map +1 -1
- package/build/components/sidebar-dataviews/custom-dataviews-list.js +2 -2
- package/build/components/sidebar-dataviews/custom-dataviews-list.js.map +1 -1
- package/build/components/sidebar-dataviews/dataview-item.js +2 -2
- package/build/components/sidebar-dataviews/dataview-item.js.map +1 -1
- package/build/components/sidebar-dataviews/default-views.js +2 -2
- package/build/components/sidebar-dataviews/default-views.js.map +1 -1
- package/build/components/sidebar-dataviews/index.js +4 -3
- package/build/components/sidebar-dataviews/index.js.map +1 -1
- package/build/components/sidebar-edit-mode/page-panels/index.js +2 -2
- package/build/components/sidebar-edit-mode/page-panels/index.js.map +1 -1
- package/build/components/sidebar-edit-mode/page-panels/page-summary.js +3 -1
- package/build/components/sidebar-edit-mode/page-panels/page-summary.js.map +1 -1
- package/build/components/sidebar-edit-mode/sidebar-card/index.js +12 -6
- package/build/components/sidebar-edit-mode/sidebar-card/index.js.map +1 -1
- package/build/components/sidebar-edit-mode/template-panel/index.js +23 -3
- package/build/components/sidebar-edit-mode/template-panel/index.js.map +1 -1
- package/build/components/sidebar-navigation-screen-global-styles/index.js +13 -1
- package/build/components/sidebar-navigation-screen-global-styles/index.js.map +1 -1
- package/build/components/sidebar-navigation-screen-navigation-menu/{delete-modal.js → delete-confirm-dialog.js} +4 -5
- package/build/components/sidebar-navigation-screen-navigation-menu/delete-confirm-dialog.js.map +1 -0
- package/build/components/sidebar-navigation-screen-navigation-menu/more-menu.js +6 -6
- package/build/components/sidebar-navigation-screen-navigation-menu/more-menu.js.map +1 -1
- package/build/components/sidebar-navigation-screen-navigation-menu/use-navigation-menu-handlers.js +1 -1
- package/build/components/sidebar-navigation-screen-navigation-menu/use-navigation-menu-handlers.js.map +1 -1
- package/build/components/sidebar-navigation-screen-template/index.js +5 -1
- package/build/components/sidebar-navigation-screen-template/index.js.map +1 -1
- package/build/components/sidebar-navigation-screen-templates-browse/content.js +2 -2
- package/build/components/sidebar-navigation-screen-templates-browse/content.js.map +1 -1
- package/build/components/sync-state-with-url/use-init-edited-entity-from-url.js +1 -1
- package/build/components/sync-state-with-url/use-init-edited-entity-from-url.js.map +1 -1
- package/build/components/sync-state-with-url/use-sync-path-with-url.js +1 -11
- package/build/components/sync-state-with-url/use-sync-path-with-url.js.map +1 -1
- package/build/components/template-actions/index.js +44 -27
- package/build/components/template-actions/index.js.map +1 -1
- package/build/components/welcome-guide/editor.js +11 -2
- package/build/components/welcome-guide/editor.js.map +1 -1
- package/build/hooks/use-theme-style-variations/use-theme-style-variations-by-property.js +15 -2
- package/build/hooks/use-theme-style-variations/use-theme-style-variations-by-property.js.map +1 -1
- package/build/utils/constants.js +5 -3
- package/build/utils/constants.js.map +1 -1
- package/build/utils/get-is-list-page.js +1 -1
- package/build/utils/get-is-list-page.js.map +1 -1
- package/build/utils/math.js +98 -0
- package/build/utils/math.js.map +1 -0
- package/build-module/components/actions/index.js +3 -5
- package/build-module/components/actions/index.js.map +1 -1
- package/build-module/components/block-editor/editor-canvas.js +16 -3
- package/build-module/components/block-editor/editor-canvas.js.map +1 -1
- package/build-module/components/block-editor/use-site-editor-settings.js +1 -1
- package/build-module/components/block-editor/use-site-editor-settings.js.map +1 -1
- package/build-module/components/global-styles/color-palette-panel.js +0 -8
- package/build-module/components/global-styles/color-palette-panel.js.map +1 -1
- package/build-module/components/global-styles/font-library-modal/context.js +16 -9
- package/build-module/components/global-styles/font-library-modal/context.js.map +1 -1
- package/build-module/components/global-styles/font-library-modal/font-collection.js +4 -3
- package/build-module/components/global-styles/font-library-modal/font-collection.js.map +1 -1
- package/build-module/components/global-styles/font-library-modal/google-fonts-confirm-dialog.js +4 -3
- package/build-module/components/global-styles/font-library-modal/google-fonts-confirm-dialog.js.map +1 -1
- package/build-module/components/global-styles/font-library-modal/installed-fonts.js +1 -1
- package/build-module/components/global-styles/font-library-modal/installed-fonts.js.map +1 -1
- package/build-module/components/global-styles/font-library-modal/upload-fonts.js +44 -10
- package/build-module/components/global-styles/font-library-modal/upload-fonts.js.map +1 -1
- package/build-module/components/global-styles/font-library-modal/utils/index.js +2 -2
- package/build-module/components/global-styles/font-library-modal/utils/index.js.map +1 -1
- package/build-module/components/global-styles/font-library-modal/utils/preview-styles.js +3 -0
- package/build-module/components/global-styles/font-library-modal/utils/preview-styles.js.map +1 -1
- package/build-module/components/global-styles/header.js +1 -1
- package/build-module/components/global-styles/header.js.map +1 -1
- package/build-module/components/global-styles/hooks.js +48 -1
- package/build-module/components/global-styles/hooks.js.map +1 -1
- package/build-module/components/global-styles/preview-iframe.js +0 -1
- package/build-module/components/global-styles/preview-iframe.js.map +1 -1
- package/build-module/components/global-styles/preview-styles.js +2 -2
- package/build-module/components/global-styles/preview-styles.js.map +1 -1
- package/build-module/components/global-styles/screen-colors.js +2 -9
- package/build-module/components/global-styles/screen-colors.js.map +1 -1
- package/build-module/components/global-styles/screen-typography.js +1 -6
- package/build-module/components/global-styles/screen-typography.js.map +1 -1
- package/build-module/components/global-styles/typography-elements.js +3 -1
- package/build-module/components/global-styles/typography-elements.js.map +1 -1
- package/build-module/components/global-styles/{preview-typography.js → typography-example.js} +4 -2
- package/build-module/components/global-styles/typography-example.js.map +1 -0
- package/build-module/components/global-styles/typography-preview.js +3 -1
- package/build-module/components/global-styles/typography-preview.js.map +1 -1
- package/build-module/components/global-styles/utils.js +1 -1
- package/build-module/components/global-styles/utils.js.map +1 -1
- package/build-module/components/global-styles/variations/variations-color.js +8 -9
- package/build-module/components/global-styles/variations/variations-color.js.map +1 -1
- package/build-module/components/global-styles/variations/variations-typography.js +28 -38
- package/build-module/components/global-styles/variations/variations-typography.js.map +1 -1
- package/build-module/components/header-edit-mode/index.js +2 -1
- package/build-module/components/header-edit-mode/index.js.map +1 -1
- package/build-module/components/keyboard-shortcut-help-modal/config.js +6 -0
- package/build-module/components/keyboard-shortcut-help-modal/config.js.map +1 -1
- package/build-module/components/keyboard-shortcuts/global.js +17 -3
- package/build-module/components/keyboard-shortcuts/global.js.map +1 -1
- package/build-module/components/layout/router.js +2 -5
- package/build-module/components/layout/router.js.map +1 -1
- package/build-module/components/page-pages/index.js +7 -12
- package/build-module/components/page-pages/index.js.map +1 -1
- package/build-module/components/page-patterns/delete-category-menu-item.js +6 -1
- package/build-module/components/page-patterns/delete-category-menu-item.js.map +1 -1
- package/build-module/components/page-patterns/index.js +2 -5
- package/build-module/components/page-patterns/index.js.map +1 -1
- package/build-module/components/page-patterns/use-patterns.js +9 -9
- package/build-module/components/page-patterns/use-patterns.js.map +1 -1
- package/build-module/components/page-templates-template-parts/index.js +12 -17
- package/build-module/components/page-templates-template-parts/index.js.map +1 -1
- package/build-module/components/save-panel/index.js +14 -9
- package/build-module/components/save-panel/index.js.map +1 -1
- package/build-module/components/sidebar/index.js +2 -3
- package/build-module/components/sidebar/index.js.map +1 -1
- package/build-module/components/sidebar-dataviews/custom-dataviews-list.js +2 -2
- package/build-module/components/sidebar-dataviews/custom-dataviews-list.js.map +1 -1
- package/build-module/components/sidebar-dataviews/dataview-item.js +2 -2
- package/build-module/components/sidebar-dataviews/dataview-item.js.map +1 -1
- package/build-module/components/sidebar-dataviews/default-views.js +3 -3
- package/build-module/components/sidebar-dataviews/default-views.js.map +1 -1
- package/build-module/components/sidebar-dataviews/index.js +4 -3
- package/build-module/components/sidebar-dataviews/index.js.map +1 -1
- package/build-module/components/sidebar-edit-mode/page-panels/index.js +3 -3
- package/build-module/components/sidebar-edit-mode/page-panels/index.js.map +1 -1
- package/build-module/components/sidebar-edit-mode/page-panels/page-summary.js +4 -2
- package/build-module/components/sidebar-edit-mode/page-panels/page-summary.js.map +1 -1
- package/build-module/components/sidebar-edit-mode/sidebar-card/index.js +13 -7
- package/build-module/components/sidebar-edit-mode/sidebar-card/index.js.map +1 -1
- package/build-module/components/sidebar-edit-mode/template-panel/index.js +24 -4
- package/build-module/components/sidebar-edit-mode/template-panel/index.js.map +1 -1
- package/build-module/components/sidebar-navigation-screen-global-styles/index.js +14 -2
- package/build-module/components/sidebar-navigation-screen-global-styles/index.js.map +1 -1
- package/build-module/components/sidebar-navigation-screen-navigation-menu/{delete-modal.js → delete-confirm-dialog.js} +3 -4
- package/build-module/components/sidebar-navigation-screen-navigation-menu/delete-confirm-dialog.js.map +1 -0
- package/build-module/components/sidebar-navigation-screen-navigation-menu/more-menu.js +6 -6
- package/build-module/components/sidebar-navigation-screen-navigation-menu/more-menu.js.map +1 -1
- package/build-module/components/sidebar-navigation-screen-navigation-menu/use-navigation-menu-handlers.js +1 -1
- package/build-module/components/sidebar-navigation-screen-navigation-menu/use-navigation-menu-handlers.js.map +1 -1
- package/build-module/components/sidebar-navigation-screen-template/index.js +5 -1
- package/build-module/components/sidebar-navigation-screen-template/index.js.map +1 -1
- package/build-module/components/sidebar-navigation-screen-templates-browse/content.js +2 -2
- package/build-module/components/sidebar-navigation-screen-templates-browse/content.js.map +1 -1
- package/build-module/components/sync-state-with-url/use-init-edited-entity-from-url.js +1 -1
- package/build-module/components/sync-state-with-url/use-init-edited-entity-from-url.js.map +1 -1
- package/build-module/components/sync-state-with-url/use-sync-path-with-url.js +1 -11
- package/build-module/components/sync-state-with-url/use-sync-path-with-url.js.map +1 -1
- package/build-module/components/template-actions/index.js +44 -27
- package/build-module/components/template-actions/index.js.map +1 -1
- package/build-module/components/welcome-guide/editor.js +11 -2
- package/build-module/components/welcome-guide/editor.js.map +1 -1
- package/build-module/hooks/use-theme-style-variations/use-theme-style-variations-by-property.js +15 -2
- package/build-module/hooks/use-theme-style-variations/use-theme-style-variations-by-property.js.map +1 -1
- package/build-module/utils/constants.js +4 -2
- package/build-module/utils/constants.js.map +1 -1
- package/build-module/utils/get-is-list-page.js +1 -1
- package/build-module/utils/get-is-list-page.js.map +1 -1
- package/build-module/utils/math.js +92 -0
- package/build-module/utils/math.js.map +1 -0
- package/build-style/style-rtl.css +41 -37
- package/build-style/style.css +41 -37
- package/package.json +42 -42
- package/src/components/actions/index.js +3 -5
- package/src/components/block-editor/editor-canvas.js +20 -7
- package/src/components/block-editor/use-site-editor-settings.js +0 -2
- package/src/components/global-styles/color-palette-panel.js +0 -11
- package/src/components/global-styles/font-library-modal/context.js +34 -17
- package/src/components/global-styles/font-library-modal/font-collection.js +4 -3
- package/src/components/global-styles/font-library-modal/google-fonts-confirm-dialog.js +9 -2
- package/src/components/global-styles/font-library-modal/installed-fonts.js +1 -1
- package/src/components/global-styles/font-library-modal/style.scss +14 -5
- package/src/components/global-styles/font-library-modal/upload-fonts.js +53 -8
- package/src/components/global-styles/font-library-modal/utils/index.js +4 -4
- package/src/components/global-styles/font-library-modal/utils/preview-styles.js +4 -0
- package/src/components/global-styles/header.js +1 -1
- package/src/components/global-styles/hooks.js +68 -1
- package/src/components/global-styles/preview-iframe.js +0 -1
- package/src/components/global-styles/preview-styles.js +2 -2
- package/src/components/global-styles/screen-colors.js +2 -13
- package/src/components/global-styles/screen-typography.js +1 -12
- package/src/components/global-styles/style.scss +4 -1
- package/src/components/global-styles/typography-elements.js +5 -1
- package/src/components/global-styles/{preview-typography.js → typography-example.js} +3 -1
- package/src/components/global-styles/typography-preview.js +3 -1
- package/src/components/global-styles/utils.js +1 -1
- package/src/components/global-styles/variations/style.scss +0 -6
- package/src/components/global-styles/variations/variations-color.js +9 -5
- package/src/components/global-styles/variations/variations-typography.js +37 -59
- package/src/components/header-edit-mode/index.js +1 -0
- package/src/components/keyboard-shortcut-help-modal/config.js +4 -0
- package/src/components/keyboard-shortcuts/global.js +16 -4
- package/src/components/layout/router.js +2 -7
- package/src/components/page-pages/index.js +8 -13
- package/src/components/page-patterns/delete-category-menu-item.js +7 -0
- package/src/components/page-patterns/index.js +2 -3
- package/src/components/page-patterns/use-patterns.js +17 -10
- package/src/components/page-templates-template-parts/index.js +14 -22
- package/src/components/save-panel/index.js +24 -17
- package/src/components/sidebar/index.js +2 -3
- package/src/components/sidebar-dataviews/custom-dataviews-list.js +2 -2
- package/src/components/sidebar-dataviews/dataview-item.js +2 -2
- package/src/components/sidebar-dataviews/default-views.js +11 -3
- package/src/components/sidebar-dataviews/index.js +4 -3
- package/src/components/sidebar-edit-mode/page-panels/index.js +2 -2
- package/src/components/sidebar-edit-mode/page-panels/page-summary.js +2 -0
- package/src/components/sidebar-edit-mode/sidebar-card/index.js +30 -11
- package/src/components/sidebar-edit-mode/sidebar-card/style.scss +10 -11
- package/src/components/sidebar-edit-mode/template-panel/index.js +24 -5
- package/src/components/sidebar-navigation-screen/style.scss +10 -1
- package/src/components/sidebar-navigation-screen-global-styles/index.js +35 -2
- package/src/components/sidebar-navigation-screen-navigation-menu/{delete-modal.js → delete-confirm-dialog.js} +2 -3
- package/src/components/sidebar-navigation-screen-navigation-menu/more-menu.js +11 -9
- package/src/components/sidebar-navigation-screen-navigation-menu/use-navigation-menu-handlers.js +6 -3
- package/src/components/sidebar-navigation-screen-template/index.js +6 -1
- package/src/components/sidebar-navigation-screen-templates-browse/content.js +2 -2
- package/src/components/sync-state-with-url/use-init-edited-entity-from-url.js +1 -1
- package/src/components/sync-state-with-url/use-sync-path-with-url.js +3 -19
- package/src/components/template-actions/index.js +63 -46
- package/src/components/welcome-guide/editor.js +9 -6
- package/src/hooks/use-theme-style-variations/use-theme-style-variations-by-property.js +21 -4
- package/src/style.scss +0 -1
- package/src/utils/constants.js +4 -2
- package/src/utils/get-is-list-page.js +1 -1
- package/src/utils/math.js +93 -0
- package/build/components/global-styles/preview-typography.js.map +0 -1
- package/build/components/sidebar-edit-mode/template-panel/template-actions.js +0 -50
- package/build/components/sidebar-edit-mode/template-panel/template-actions.js.map +0 -1
- package/build/components/sidebar-navigation-screen-navigation-menu/delete-modal.js.map +0 -1
- package/build/components/sidebar-navigation-screen-templates/index.js +0 -132
- package/build/components/sidebar-navigation-screen-templates/index.js.map +0 -1
- package/build-module/components/global-styles/preview-typography.js.map +0 -1
- package/build-module/components/sidebar-edit-mode/template-panel/template-actions.js +0 -42
- package/build-module/components/sidebar-edit-mode/template-panel/template-actions.js.map +0 -1
- package/build-module/components/sidebar-navigation-screen-navigation-menu/delete-modal.js.map +0 -1
- package/build-module/components/sidebar-navigation-screen-templates/index.js +0 -124
- package/build-module/components/sidebar-navigation-screen-templates/index.js.map +0 -1
- package/src/components/sidebar-edit-mode/template-panel/template-actions.js +0 -49
- package/src/components/sidebar-navigation-screen-templates/index.js +0 -156
- package/src/components/sidebar-navigation-screen-templates/style.scss +0 -9
|
@@ -1,84 +1,62 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* WordPress dependencies
|
|
3
3
|
*/
|
|
4
|
-
import { useContext } from '@wordpress/element';
|
|
5
4
|
import {
|
|
6
5
|
__experimentalGrid as Grid,
|
|
6
|
+
__experimentalVStack as HStack,
|
|
7
7
|
__experimentalVStack as VStack,
|
|
8
8
|
} from '@wordpress/components';
|
|
9
|
-
import { __ } from '@wordpress/i18n';
|
|
10
|
-
import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
|
|
11
9
|
|
|
12
10
|
/**
|
|
13
11
|
* Internal dependencies
|
|
14
12
|
*/
|
|
15
|
-
import {
|
|
16
|
-
import
|
|
17
|
-
import
|
|
18
|
-
import PreviewTypography from '../preview-typography';
|
|
19
|
-
import Subtitle from '../subtitle';
|
|
20
|
-
import { getFontFamilies } from '../utils';
|
|
13
|
+
import { useTypographyVariations } from '../hooks';
|
|
14
|
+
import TypographyExample from '../typography-example';
|
|
15
|
+
import PreviewIframe from '../preview-iframe';
|
|
21
16
|
import Variation from './variation';
|
|
22
17
|
|
|
23
|
-
const { GlobalStylesContext } = unlock( blockEditorPrivateApis );
|
|
24
|
-
|
|
25
18
|
export default function TypographyVariations() {
|
|
26
|
-
const typographyVariations =
|
|
27
|
-
useCurrentMergeThemeStyleVariationsWithUserConfig( {
|
|
28
|
-
property: 'typography',
|
|
29
|
-
filter: ( variation ) =>
|
|
30
|
-
variation?.settings?.typography?.fontFamilies &&
|
|
31
|
-
Object.keys( variation?.settings?.typography?.fontFamilies )
|
|
32
|
-
.length,
|
|
33
|
-
} );
|
|
34
|
-
|
|
35
|
-
const { base } = useContext( GlobalStylesContext );
|
|
36
|
-
|
|
37
|
-
/*
|
|
38
|
-
* Filter duplicate variations based on the font families used in the variation.
|
|
39
|
-
*/
|
|
40
|
-
const uniqueTypographyVariations = typographyVariations?.length
|
|
41
|
-
? Object.values(
|
|
42
|
-
typographyVariations.reduce( ( acc, variation ) => {
|
|
43
|
-
const [ bodyFontFamily, headingFontFamily ] =
|
|
44
|
-
getFontFamilies(
|
|
45
|
-
mergeBaseAndUserConfigs( base, variation )
|
|
46
|
-
);
|
|
47
|
-
if (
|
|
48
|
-
headingFontFamily?.name &&
|
|
49
|
-
bodyFontFamily?.name &&
|
|
50
|
-
! acc[
|
|
51
|
-
`${ headingFontFamily?.name }:${ bodyFontFamily?.name }`
|
|
52
|
-
]
|
|
53
|
-
) {
|
|
54
|
-
acc[
|
|
55
|
-
`${ headingFontFamily?.name }:${ bodyFontFamily?.name }`
|
|
56
|
-
] = variation;
|
|
57
|
-
}
|
|
19
|
+
const typographyVariations = useTypographyVariations();
|
|
58
20
|
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
: [];
|
|
21
|
+
if ( ! typographyVariations?.length ) {
|
|
22
|
+
return null;
|
|
23
|
+
}
|
|
63
24
|
|
|
64
25
|
return (
|
|
65
26
|
<VStack spacing={ 3 }>
|
|
66
|
-
<Subtitle level={ 3 }>{ __( 'Presets' ) }</Subtitle>
|
|
67
27
|
<Grid
|
|
68
28
|
columns={ 3 }
|
|
69
29
|
className="edit-site-global-styles-style-variations-container"
|
|
70
30
|
>
|
|
71
|
-
{ typographyVariations &&
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
31
|
+
{ typographyVariations &&
|
|
32
|
+
typographyVariations.length &&
|
|
33
|
+
typographyVariations.map( ( variation, index ) => (
|
|
34
|
+
<Variation key={ index } variation={ variation }>
|
|
35
|
+
{ ( isFocused ) => (
|
|
36
|
+
<PreviewIframe
|
|
37
|
+
label={ variation?.title }
|
|
38
|
+
isFocused={ isFocused }
|
|
39
|
+
>
|
|
40
|
+
{ ( { ratio, key } ) => (
|
|
41
|
+
<HStack
|
|
42
|
+
key={ key }
|
|
43
|
+
spacing={ 10 * ratio }
|
|
44
|
+
justify="center"
|
|
45
|
+
style={ {
|
|
46
|
+
height: '100%',
|
|
47
|
+
overflow: 'hidden',
|
|
48
|
+
} }
|
|
49
|
+
>
|
|
50
|
+
<TypographyExample
|
|
51
|
+
variation={ variation }
|
|
52
|
+
fontSize={ 85 * ratio }
|
|
53
|
+
/>
|
|
54
|
+
</HStack>
|
|
55
|
+
) }
|
|
56
|
+
</PreviewIframe>
|
|
57
|
+
) }
|
|
58
|
+
</Variation>
|
|
59
|
+
) ) }
|
|
82
60
|
</Grid>
|
|
83
61
|
</VStack>
|
|
84
62
|
);
|
|
@@ -46,4 +46,8 @@ export const textFormattingShortcuts = [
|
|
|
46
46
|
'Convert the current paragraph or heading to a heading of level 1 to 6.'
|
|
47
47
|
),
|
|
48
48
|
},
|
|
49
|
+
{
|
|
50
|
+
keyCombination: { modifier: 'primaryShift', character: 'SPACE' },
|
|
51
|
+
description: __( 'Add non breaking space.' ),
|
|
52
|
+
},
|
|
49
53
|
];
|
|
@@ -4,29 +4,41 @@
|
|
|
4
4
|
import { useShortcut } from '@wordpress/keyboard-shortcuts';
|
|
5
5
|
import { useDispatch, useSelect } from '@wordpress/data';
|
|
6
6
|
import { store as coreStore } from '@wordpress/core-data';
|
|
7
|
+
import { store as editorStore } from '@wordpress/editor';
|
|
7
8
|
|
|
8
9
|
/**
|
|
9
10
|
* Internal dependencies
|
|
10
11
|
*/
|
|
11
12
|
import { store as editSiteStore } from '../../store';
|
|
13
|
+
import { unlock } from '../../lock-unlock';
|
|
12
14
|
|
|
13
15
|
function KeyboardShortcutsGlobal() {
|
|
14
16
|
const { __experimentalGetDirtyEntityRecords, isSavingEntityRecord } =
|
|
15
17
|
useSelect( coreStore );
|
|
18
|
+
const { hasNonPostEntityChanges } = useSelect( editorStore );
|
|
19
|
+
const { getCanvasMode } = unlock( useSelect( editSiteStore ) );
|
|
16
20
|
const { setIsSaveViewOpened } = useDispatch( editSiteStore );
|
|
17
21
|
|
|
18
22
|
useShortcut( 'core/edit-site/save', ( event ) => {
|
|
19
23
|
event.preventDefault();
|
|
20
24
|
|
|
21
25
|
const dirtyEntityRecords = __experimentalGetDirtyEntityRecords();
|
|
22
|
-
const
|
|
26
|
+
const hasDirtyEntities = !! dirtyEntityRecords.length;
|
|
23
27
|
const isSaving = dirtyEntityRecords.some( ( record ) =>
|
|
24
28
|
isSavingEntityRecord( record.kind, record.name, record.key )
|
|
25
29
|
);
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
30
|
+
const _hasNonPostEntityChanges = hasNonPostEntityChanges();
|
|
31
|
+
const isViewMode = getCanvasMode() === 'view';
|
|
32
|
+
if (
|
|
33
|
+
( ! hasDirtyEntities || ! _hasNonPostEntityChanges || isSaving ) &&
|
|
34
|
+
! isViewMode
|
|
35
|
+
) {
|
|
36
|
+
return;
|
|
29
37
|
}
|
|
38
|
+
// At this point, we know that there are dirty entities, other than
|
|
39
|
+
// the edited post, and we're not in the process of saving, so open
|
|
40
|
+
// save view.
|
|
41
|
+
setIsSaveViewOpened( true );
|
|
30
42
|
} );
|
|
31
43
|
|
|
32
44
|
return null;
|
|
@@ -45,12 +45,7 @@ export default function useLayoutAreas() {
|
|
|
45
45
|
};
|
|
46
46
|
}
|
|
47
47
|
|
|
48
|
-
|
|
49
|
-
// Extracted it here out of the conditionals so it doesn't unintentionally becomes stable.
|
|
50
|
-
const isListLayout =
|
|
51
|
-
isCustom !== 'true' &&
|
|
52
|
-
layout === 'list' &&
|
|
53
|
-
window?.__experimentalAdminViews;
|
|
48
|
+
const isListLayout = isCustom !== 'true' && layout === 'list';
|
|
54
49
|
|
|
55
50
|
if ( path === '/pages' ) {
|
|
56
51
|
return {
|
|
@@ -80,7 +75,7 @@ export default function useLayoutAreas() {
|
|
|
80
75
|
}
|
|
81
76
|
|
|
82
77
|
// Templates
|
|
83
|
-
if ( path === '/wp_template
|
|
78
|
+
if ( path === '/wp_template' ) {
|
|
84
79
|
return {
|
|
85
80
|
areas: {
|
|
86
81
|
content: (
|
|
@@ -30,8 +30,8 @@ import {
|
|
|
30
30
|
LAYOUT_GRID,
|
|
31
31
|
LAYOUT_TABLE,
|
|
32
32
|
LAYOUT_LIST,
|
|
33
|
-
|
|
34
|
-
|
|
33
|
+
OPERATOR_IS_ANY,
|
|
34
|
+
OPERATOR_IS_NONE,
|
|
35
35
|
} from '../../utils/constants';
|
|
36
36
|
|
|
37
37
|
import {
|
|
@@ -49,9 +49,6 @@ import { unlock } from '../../lock-unlock';
|
|
|
49
49
|
const { useLocation, useHistory } = unlock( routerPrivateApis );
|
|
50
50
|
|
|
51
51
|
const EMPTY_ARRAY = [];
|
|
52
|
-
const SUPPORTED_LAYOUTS = window?.__experimentalAdminViews
|
|
53
|
-
? [ LAYOUT_GRID, LAYOUT_TABLE, LAYOUT_LIST ]
|
|
54
|
-
: [ LAYOUT_GRID, LAYOUT_TABLE ];
|
|
55
52
|
|
|
56
53
|
function useView( postType ) {
|
|
57
54
|
const { params } = useLocation();
|
|
@@ -222,18 +219,18 @@ export default function PagePages() {
|
|
|
222
219
|
view.filters.forEach( ( filter ) => {
|
|
223
220
|
if (
|
|
224
221
|
filter.field === 'status' &&
|
|
225
|
-
filter.operator ===
|
|
222
|
+
filter.operator === OPERATOR_IS_ANY
|
|
226
223
|
) {
|
|
227
224
|
filters.status = filter.value;
|
|
228
225
|
}
|
|
229
226
|
if (
|
|
230
227
|
filter.field === 'author' &&
|
|
231
|
-
filter.operator ===
|
|
228
|
+
filter.operator === OPERATOR_IS_ANY
|
|
232
229
|
) {
|
|
233
230
|
filters.author = filter.value;
|
|
234
231
|
} else if (
|
|
235
232
|
filter.field === 'author' &&
|
|
236
|
-
filter.operator ===
|
|
233
|
+
filter.operator === OPERATOR_IS_NONE
|
|
237
234
|
) {
|
|
238
235
|
filters.author_exclude = filter.value;
|
|
239
236
|
}
|
|
@@ -331,13 +328,12 @@ export default function PagePages() {
|
|
|
331
328
|
elements: STATUSES,
|
|
332
329
|
enableSorting: false,
|
|
333
330
|
filterBy: {
|
|
334
|
-
operators: [
|
|
331
|
+
operators: [ OPERATOR_IS_ANY ],
|
|
335
332
|
},
|
|
336
333
|
},
|
|
337
334
|
{
|
|
338
335
|
header: __( 'Date' ),
|
|
339
336
|
id: 'date',
|
|
340
|
-
getValue: ( { item } ) => item.date,
|
|
341
337
|
render: ( { item } ) => {
|
|
342
338
|
const formattedDate = dateI18n(
|
|
343
339
|
getSettings().formats.datetimeAbbreviated,
|
|
@@ -355,12 +351,12 @@ export default function PagePages() {
|
|
|
355
351
|
const editPostAction = useEditPostAction();
|
|
356
352
|
const actions = useMemo(
|
|
357
353
|
() => [
|
|
354
|
+
editPostAction,
|
|
358
355
|
viewPostAction,
|
|
359
|
-
trashPostAction,
|
|
360
356
|
restorePostAction,
|
|
361
357
|
permanentlyDeletePostAction,
|
|
362
|
-
editPostAction,
|
|
363
358
|
postRevisionsAction,
|
|
359
|
+
trashPostAction,
|
|
364
360
|
],
|
|
365
361
|
[ permanentlyDeletePostAction, restorePostAction, editPostAction ]
|
|
366
362
|
);
|
|
@@ -430,7 +426,6 @@ export default function PagePages() {
|
|
|
430
426
|
view={ view }
|
|
431
427
|
onChangeView={ onChangeView }
|
|
432
428
|
onSelectionChange={ onSelectionChange }
|
|
433
|
-
supportedLayouts={ SUPPORTED_LAYOUTS }
|
|
434
429
|
/>
|
|
435
430
|
</Page>
|
|
436
431
|
);
|
|
@@ -90,6 +90,13 @@ export default function DeleteCategoryMenuItem( { category, onClose } ) {
|
|
|
90
90
|
onCancel={ () => setIsModalOpen( false ) }
|
|
91
91
|
confirmButtonText={ __( 'Delete' ) }
|
|
92
92
|
className="edit-site-patterns__delete-modal"
|
|
93
|
+
title={ sprintf(
|
|
94
|
+
// translators: %s: The pattern category's name.
|
|
95
|
+
__( 'Delete "%s"?' ),
|
|
96
|
+
decodeEntities( category.label )
|
|
97
|
+
) }
|
|
98
|
+
size="medium"
|
|
99
|
+
__experimentalHideHeader={ false }
|
|
93
100
|
>
|
|
94
101
|
{ sprintf(
|
|
95
102
|
// translators: %s: The pattern category's name.
|
|
@@ -46,7 +46,7 @@ import {
|
|
|
46
46
|
PATTERN_SYNC_TYPES,
|
|
47
47
|
PATTERN_DEFAULT_CATEGORY,
|
|
48
48
|
ENUMERATION_TYPE,
|
|
49
|
-
|
|
49
|
+
OPERATOR_IS,
|
|
50
50
|
} from '../../utils/constants';
|
|
51
51
|
import {
|
|
52
52
|
exportJSONaction,
|
|
@@ -296,7 +296,6 @@ export default function DataviewsPatterns() {
|
|
|
296
296
|
{
|
|
297
297
|
header: __( 'Title' ),
|
|
298
298
|
id: 'title',
|
|
299
|
-
getValue: ( { item } ) => item.title,
|
|
300
299
|
render: ( { item } ) => (
|
|
301
300
|
<Title item={ item } categoryId={ categoryId } />
|
|
302
301
|
),
|
|
@@ -323,7 +322,7 @@ export default function DataviewsPatterns() {
|
|
|
323
322
|
type: ENUMERATION_TYPE,
|
|
324
323
|
elements: SYNC_FILTERS,
|
|
325
324
|
filterBy: {
|
|
326
|
-
operators: [
|
|
325
|
+
operators: [ OPERATOR_IS ],
|
|
327
326
|
isPrimary: true,
|
|
328
327
|
},
|
|
329
328
|
enableSorting: false,
|
|
@@ -50,7 +50,8 @@ const templatePartToPattern = ( templatePart ) => ( {
|
|
|
50
50
|
|
|
51
51
|
const selectTemplatePartsAsPatterns = createSelector(
|
|
52
52
|
( select, categoryId, search = '' ) => {
|
|
53
|
-
const { getEntityRecords,
|
|
53
|
+
const { getEntityRecords, isResolving: isResolvingSelector } =
|
|
54
|
+
select( coreStore );
|
|
54
55
|
const { __experimentalGetDefaultTemplatePartAreas } =
|
|
55
56
|
select( editorStore );
|
|
56
57
|
const query = { per_page: -1 };
|
|
@@ -78,7 +79,7 @@ const selectTemplatePartsAsPatterns = createSelector(
|
|
|
78
79
|
);
|
|
79
80
|
};
|
|
80
81
|
|
|
81
|
-
const isResolving =
|
|
82
|
+
const isResolving = isResolvingSelector( 'getEntityRecords', [
|
|
82
83
|
'postType',
|
|
83
84
|
TEMPLATE_PART_POST_TYPE,
|
|
84
85
|
query,
|
|
@@ -99,7 +100,7 @@ const selectTemplatePartsAsPatterns = createSelector(
|
|
|
99
100
|
per_page: -1,
|
|
100
101
|
}
|
|
101
102
|
),
|
|
102
|
-
select( coreStore ).
|
|
103
|
+
select( coreStore ).isResolving( 'getEntityRecords', [
|
|
103
104
|
'postType',
|
|
104
105
|
TEMPLATE_PART_POST_TYPE,
|
|
105
106
|
{ per_page: -1 },
|
|
@@ -111,7 +112,7 @@ const selectTemplatePartsAsPatterns = createSelector(
|
|
|
111
112
|
const selectThemePatterns = createSelector(
|
|
112
113
|
( select ) => {
|
|
113
114
|
const { getSettings } = unlock( select( editSiteStore ) );
|
|
114
|
-
const {
|
|
115
|
+
const { isResolving: isResolvingSelector } = select( coreStore );
|
|
115
116
|
const settings = getSettings();
|
|
116
117
|
const blockPatterns =
|
|
117
118
|
settings.__experimentalAdditionalBlockPatterns ??
|
|
@@ -137,11 +138,14 @@ const selectThemePatterns = createSelector(
|
|
|
137
138
|
__unstableSkipMigrationLogs: true,
|
|
138
139
|
} ),
|
|
139
140
|
} ) );
|
|
140
|
-
return {
|
|
141
|
+
return {
|
|
142
|
+
patterns,
|
|
143
|
+
isResolving: isResolvingSelector( 'getBlockPatterns' ),
|
|
144
|
+
};
|
|
141
145
|
},
|
|
142
146
|
( select ) => [
|
|
143
147
|
select( coreStore ).getBlockPatterns(),
|
|
144
|
-
select( coreStore ).
|
|
148
|
+
select( coreStore ).isResolving( 'getBlockPatterns' ),
|
|
145
149
|
unlock( select( editSiteStore ) ).getSettings(),
|
|
146
150
|
]
|
|
147
151
|
);
|
|
@@ -228,8 +232,11 @@ const convertPatternPostToItem = ( patternPost, categories ) => ( {
|
|
|
228
232
|
|
|
229
233
|
const selectUserPatterns = createSelector(
|
|
230
234
|
( select, syncStatus, search = '' ) => {
|
|
231
|
-
const {
|
|
232
|
-
|
|
235
|
+
const {
|
|
236
|
+
getEntityRecords,
|
|
237
|
+
isResolving: isResolvingSelector,
|
|
238
|
+
getUserPatternCategories,
|
|
239
|
+
} = select( coreStore );
|
|
233
240
|
|
|
234
241
|
const query = { per_page: -1 };
|
|
235
242
|
const patternPosts = getEntityRecords(
|
|
@@ -248,7 +255,7 @@ const selectUserPatterns = createSelector(
|
|
|
248
255
|
)
|
|
249
256
|
: EMPTY_PATTERN_LIST;
|
|
250
257
|
|
|
251
|
-
const isResolving =
|
|
258
|
+
const isResolving = isResolvingSelector( 'getEntityRecords', [
|
|
252
259
|
'postType',
|
|
253
260
|
PATTERN_TYPES.user,
|
|
254
261
|
query,
|
|
@@ -277,7 +284,7 @@ const selectUserPatterns = createSelector(
|
|
|
277
284
|
select( coreStore ).getEntityRecords( 'postType', PATTERN_TYPES.user, {
|
|
278
285
|
per_page: -1,
|
|
279
286
|
} ),
|
|
280
|
-
select( coreStore ).
|
|
287
|
+
select( coreStore ).isResolving( 'getEntityRecords', [
|
|
281
288
|
'postType',
|
|
282
289
|
PATTERN_TYPES.user,
|
|
283
290
|
{ per_page: -1 },
|
|
@@ -40,8 +40,8 @@ import {
|
|
|
40
40
|
TEMPLATE_POST_TYPE,
|
|
41
41
|
TEMPLATE_PART_POST_TYPE,
|
|
42
42
|
ENUMERATION_TYPE,
|
|
43
|
-
|
|
44
|
-
|
|
43
|
+
OPERATOR_IS_ANY,
|
|
44
|
+
OPERATOR_IS_NONE,
|
|
45
45
|
LAYOUT_GRID,
|
|
46
46
|
LAYOUT_TABLE,
|
|
47
47
|
LAYOUT_LIST,
|
|
@@ -63,10 +63,6 @@ const { useHistory, useLocation } = unlock( routerPrivateApis );
|
|
|
63
63
|
|
|
64
64
|
const EMPTY_ARRAY = [];
|
|
65
65
|
|
|
66
|
-
const SUPPORTED_LAYOUTS = window?.__experimentalAdminViews
|
|
67
|
-
? [ LAYOUT_TABLE, LAYOUT_GRID, LAYOUT_LIST ]
|
|
68
|
-
: [ LAYOUT_TABLE, LAYOUT_GRID ];
|
|
69
|
-
|
|
70
66
|
const defaultConfigPerViewType = {
|
|
71
67
|
[ LAYOUT_TABLE ]: {
|
|
72
68
|
primaryField: 'title',
|
|
@@ -209,9 +205,7 @@ export default function PageTemplatesTemplateParts( { postType } ) {
|
|
|
209
205
|
const { params } = useLocation();
|
|
210
206
|
const { activeView = 'all', layout } = params;
|
|
211
207
|
const defaultView = useMemo( () => {
|
|
212
|
-
const usedType =
|
|
213
|
-
? layout ?? DEFAULT_VIEW.type
|
|
214
|
-
: DEFAULT_VIEW.type;
|
|
208
|
+
const usedType = layout ?? DEFAULT_VIEW.type;
|
|
215
209
|
return {
|
|
216
210
|
...DEFAULT_VIEW,
|
|
217
211
|
type: usedType,
|
|
@@ -221,8 +215,8 @@ export default function PageTemplatesTemplateParts( { postType } ) {
|
|
|
221
215
|
? [
|
|
222
216
|
{
|
|
223
217
|
field: 'author',
|
|
224
|
-
operator: '
|
|
225
|
-
value: activeView,
|
|
218
|
+
operator: 'isAny',
|
|
219
|
+
value: [ activeView ],
|
|
226
220
|
},
|
|
227
221
|
]
|
|
228
222
|
: [],
|
|
@@ -237,8 +231,8 @@ export default function PageTemplatesTemplateParts( { postType } ) {
|
|
|
237
231
|
? [
|
|
238
232
|
{
|
|
239
233
|
field: 'author',
|
|
240
|
-
operator:
|
|
241
|
-
value: activeView,
|
|
234
|
+
operator: OPERATOR_IS_ANY,
|
|
235
|
+
value: [ activeView ],
|
|
242
236
|
},
|
|
243
237
|
]
|
|
244
238
|
: [],
|
|
@@ -309,7 +303,6 @@ export default function PageTemplatesTemplateParts( { postType } ) {
|
|
|
309
303
|
_fields.push( {
|
|
310
304
|
header: __( 'Description' ),
|
|
311
305
|
id: 'description',
|
|
312
|
-
getValue: ( { item } ) => item.description,
|
|
313
306
|
render: ( { item } ) => {
|
|
314
307
|
return item.description ? (
|
|
315
308
|
<span className="page-templates-description">
|
|
@@ -378,19 +371,19 @@ export default function PageTemplatesTemplateParts( { postType } ) {
|
|
|
378
371
|
view.filters.forEach( ( filter ) => {
|
|
379
372
|
if (
|
|
380
373
|
filter.field === 'author' &&
|
|
381
|
-
filter.operator ===
|
|
382
|
-
|
|
374
|
+
filter.operator === OPERATOR_IS_ANY &&
|
|
375
|
+
filter?.value?.length > 0
|
|
383
376
|
) {
|
|
384
377
|
filteredData = filteredData.filter( ( item ) => {
|
|
385
|
-
return item.author_text
|
|
378
|
+
return filter.value.includes( item.author_text );
|
|
386
379
|
} );
|
|
387
380
|
} else if (
|
|
388
381
|
filter.field === 'author' &&
|
|
389
|
-
filter.operator ===
|
|
390
|
-
|
|
382
|
+
filter.operator === OPERATOR_IS_NONE &&
|
|
383
|
+
filter?.value?.length > 0
|
|
391
384
|
) {
|
|
392
385
|
filteredData = filteredData.filter( ( item ) => {
|
|
393
|
-
return item.author_text
|
|
386
|
+
return ! filter.value.includes( item.author_text );
|
|
394
387
|
} );
|
|
395
388
|
}
|
|
396
389
|
} );
|
|
@@ -416,9 +409,9 @@ export default function PageTemplatesTemplateParts( { postType } ) {
|
|
|
416
409
|
const actions = useMemo(
|
|
417
410
|
() => [
|
|
418
411
|
resetTemplateAction,
|
|
419
|
-
deleteTemplateAction,
|
|
420
412
|
renameTemplateAction,
|
|
421
413
|
postRevisionsAction,
|
|
414
|
+
deleteTemplateAction,
|
|
422
415
|
],
|
|
423
416
|
[ resetTemplateAction ]
|
|
424
417
|
);
|
|
@@ -474,7 +467,6 @@ export default function PageTemplatesTemplateParts( { postType } ) {
|
|
|
474
467
|
onChangeView={ onChangeView }
|
|
475
468
|
onSelectionChange={ onSelectionChange }
|
|
476
469
|
deferredRendering={ ! view.hiddenFields?.includes( 'preview' ) }
|
|
477
|
-
supportedLayouts={ SUPPORTED_LAYOUTS }
|
|
478
470
|
/>
|
|
479
471
|
</Page>
|
|
480
472
|
);
|
|
@@ -77,11 +77,13 @@ const EntitiesSavedStatesForPreview = ( { onClose } ) => {
|
|
|
77
77
|
);
|
|
78
78
|
};
|
|
79
79
|
|
|
80
|
-
const _EntitiesSavedStates = ( { onClose } ) => {
|
|
80
|
+
const _EntitiesSavedStates = ( { onClose, renderDialog = undefined } ) => {
|
|
81
81
|
if ( isPreviewingTheme() ) {
|
|
82
82
|
return <EntitiesSavedStatesForPreview onClose={ onClose } />;
|
|
83
83
|
}
|
|
84
|
-
return
|
|
84
|
+
return (
|
|
85
|
+
<EntitiesSavedStates close={ onClose } renderDialog={ renderDialog } />
|
|
86
|
+
);
|
|
85
87
|
};
|
|
86
88
|
|
|
87
89
|
export default function SavePanel() {
|
|
@@ -142,21 +144,26 @@ export default function SavePanel() {
|
|
|
142
144
|
} ) }
|
|
143
145
|
ariaLabel={ __( 'Save panel' ) }
|
|
144
146
|
>
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
147
|
+
<div
|
|
148
|
+
className={ classnames( 'edit-site-editor__toggle-save-panel', {
|
|
149
|
+
'screen-reader-text': isSaveViewOpen,
|
|
150
|
+
} ) }
|
|
151
|
+
>
|
|
152
|
+
<Button
|
|
153
|
+
variant="secondary"
|
|
154
|
+
className={ classnames(
|
|
155
|
+
'edit-site-editor__toggle-save-panel-button'
|
|
156
|
+
) }
|
|
157
|
+
onClick={ () => setIsSaveViewOpened( true ) }
|
|
158
|
+
aria-haspopup={ 'dialog' }
|
|
159
|
+
disabled={ disabled }
|
|
160
|
+
__experimentalIsFocusable
|
|
161
|
+
>
|
|
162
|
+
{ __( 'Open save panel' ) }
|
|
163
|
+
</Button>
|
|
164
|
+
</div>
|
|
165
|
+
{ isSaveViewOpen && (
|
|
166
|
+
<_EntitiesSavedStates onClose={ onClose } renderDialog />
|
|
160
167
|
) }
|
|
161
168
|
</NavigableRegion>
|
|
162
169
|
);
|
|
@@ -19,7 +19,6 @@ import { __ } from '@wordpress/i18n';
|
|
|
19
19
|
* Internal dependencies
|
|
20
20
|
*/
|
|
21
21
|
import SidebarNavigationScreenMain from '../sidebar-navigation-screen-main';
|
|
22
|
-
import SidebarNavigationScreenTemplates from '../sidebar-navigation-screen-templates';
|
|
23
22
|
import SidebarNavigationScreenTemplate from '../sidebar-navigation-screen-template';
|
|
24
23
|
import SidebarNavigationScreenPatterns from '../sidebar-navigation-screen-patterns';
|
|
25
24
|
import SidebarNavigationScreenPattern from '../sidebar-navigation-screen-pattern';
|
|
@@ -83,14 +82,14 @@ function SidebarScreens() {
|
|
|
83
82
|
<SidebarNavigationScreenPage />
|
|
84
83
|
</SidebarScreenWrapper>
|
|
85
84
|
<SidebarScreenWrapper path="/:postType(wp_template)">
|
|
86
|
-
<
|
|
85
|
+
<SidebarNavigationScreenTemplatesBrowse />
|
|
87
86
|
</SidebarScreenWrapper>
|
|
88
87
|
{ ! isMobileViewport && (
|
|
89
88
|
<SidebarScreenWrapper path="/patterns">
|
|
90
89
|
<SidebarNavigationScreenPatterns />
|
|
91
90
|
</SidebarScreenWrapper>
|
|
92
91
|
) }
|
|
93
|
-
<SidebarScreenWrapper path="/:postType(
|
|
92
|
+
<SidebarScreenWrapper path="/:postType(wp_template_part)/all">
|
|
94
93
|
<SidebarNavigationScreenTemplatesBrowse />
|
|
95
94
|
</SidebarScreenWrapper>
|
|
96
95
|
<SidebarScreenWrapper path="/:postType(wp_template_part|wp_block)/:postId">
|
|
@@ -110,7 +110,7 @@ function CustomDataViewItem( { dataviewId, isActive } ) {
|
|
|
110
110
|
title={ dataview.title }
|
|
111
111
|
type={ type }
|
|
112
112
|
isActive={ isActive }
|
|
113
|
-
isCustom
|
|
113
|
+
isCustom
|
|
114
114
|
customViewId={ dataviewId }
|
|
115
115
|
suffix={
|
|
116
116
|
<DropdownMenu
|
|
@@ -216,7 +216,7 @@ export default function CustomDataViewsList( { type, activeView, isCustom } ) {
|
|
|
216
216
|
key={ customViewRecord.id }
|
|
217
217
|
dataviewId={ customViewRecord.id }
|
|
218
218
|
isActive={
|
|
219
|
-
isCustom
|
|
219
|
+
isCustom &&
|
|
220
220
|
Number( activeView ) === customViewRecord.id
|
|
221
221
|
}
|
|
222
222
|
/>
|
|
@@ -38,8 +38,8 @@ export default function DataViewItem( {
|
|
|
38
38
|
const linkInfo = useLink( {
|
|
39
39
|
path,
|
|
40
40
|
layout,
|
|
41
|
-
activeView: isCustom
|
|
42
|
-
isCustom,
|
|
41
|
+
activeView: isCustom ? customViewId : slug,
|
|
42
|
+
isCustom: isCustom ? 'true' : 'false',
|
|
43
43
|
} );
|
|
44
44
|
return (
|
|
45
45
|
<HStack
|
|
@@ -11,7 +11,7 @@ import {
|
|
|
11
11
|
LAYOUT_LIST,
|
|
12
12
|
LAYOUT_TABLE,
|
|
13
13
|
LAYOUT_GRID,
|
|
14
|
-
|
|
14
|
+
OPERATOR_IS_ANY,
|
|
15
15
|
} from '../../utils/constants';
|
|
16
16
|
|
|
17
17
|
export const DEFAULT_CONFIG_PER_VIEW_TYPE = {
|
|
@@ -61,7 +61,11 @@ export const DEFAULT_VIEWS = {
|
|
|
61
61
|
view: {
|
|
62
62
|
...DEFAULT_PAGE_BASE,
|
|
63
63
|
filters: [
|
|
64
|
-
{
|
|
64
|
+
{
|
|
65
|
+
field: 'status',
|
|
66
|
+
operator: OPERATOR_IS_ANY,
|
|
67
|
+
value: 'draft',
|
|
68
|
+
},
|
|
65
69
|
],
|
|
66
70
|
},
|
|
67
71
|
},
|
|
@@ -72,7 +76,11 @@ export const DEFAULT_VIEWS = {
|
|
|
72
76
|
view: {
|
|
73
77
|
...DEFAULT_PAGE_BASE,
|
|
74
78
|
filters: [
|
|
75
|
-
{
|
|
79
|
+
{
|
|
80
|
+
field: 'status',
|
|
81
|
+
operator: OPERATOR_IS_ANY,
|
|
82
|
+
value: 'trash',
|
|
83
|
+
},
|
|
76
84
|
],
|
|
77
85
|
},
|
|
78
86
|
},
|