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.

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

First pass at Navigation screen #21036

Merged
merged 4 commits into from
Mar 31, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions docs/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -1301,6 +1301,12 @@
"markdown_source": "../packages/e2e-tests/README.md",
"parent": "packages"
},
{
"title": "@wordpress/edit-navigation",
"slug": "packages-edit-navigation",
"markdown_source": "../packages/edit-navigation/README.md",
"parent": "packages"
},
{
"title": "@wordpress/edit-post",
"slug": "packages-edit-post",
Expand Down
10 changes: 10 additions & 0 deletions gutenberg.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,16 @@ function gutenberg_menu() {
'the_gutenberg_widgets'
);
}
if ( array_key_exists( 'gutenberg-navigation', get_option( 'gutenberg-experiments' ) ) ) {
add_submenu_page(
'gutenberg',
__( 'Navigation (beta)', 'gutenberg' ),
__( 'Navigation (beta)', 'gutenberg' ),
'edit_theme_options',
'gutenberg-navigation',
'gutenberg_navigation_page'
);
}
if ( array_key_exists( 'gutenberg-full-site-editing', get_option( 'gutenberg-experiments' ) ) ) {
add_submenu_page(
'gutenberg',
Expand Down
9 changes: 9 additions & 0 deletions lib/client-assets.php
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,15 @@ function gutenberg_register_packages_styles( &$styles ) {
);
$styles->add_data( 'wp-list-reusable-block', 'rtl', 'replace' );

gutenberg_override_style(
$styles,
'wp-edit-navigation',
gutenberg_url( 'build/edit-navigation/style.css' ),
array( 'wp-components', 'wp-block-editor', 'wp-edit-blocks' ),
filemtime( gutenberg_dir_path() . 'build/edit-navigation/style.css' )
);
$styles->add_data( 'wp-edit-navigation', 'rtl', 'replace' );

gutenberg_override_style(
$styles,
'wp-edit-site',
Expand Down
11 changes: 11 additions & 0 deletions lib/experiments-page.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,17 @@ function gutenberg_initialize_experiments_settings() {
'id' => 'gutenberg-widget-experiments',
)
);
add_settings_field(
'gutenberg-navigation',
__( 'Navigation', 'gutenberg' ),
'gutenberg_display_experiment_field',
'gutenberg-experiments',
'gutenberg_experiments_section',
array(
'label' => __( 'Enable Navigation screen', 'gutenberg' ),
'id' => 'gutenberg-navigation',
)
);
add_settings_field(
'gutenberg-block-directory',
__( 'Block Directory', 'gutenberg' ),
Expand Down
1 change: 1 addition & 0 deletions lib/load.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ function gutenberg_is_experiment_enabled( $name ) {
require dirname( __FILE__ ) . '/demo.php';
require dirname( __FILE__ ) . '/widgets.php';
require dirname( __FILE__ ) . '/widgets-page.php';
require dirname( __FILE__ ) . '/navigation-page.php';
require dirname( __FILE__ ) . '/experiments-page.php';
require dirname( __FILE__ ) . '/customizer.php';
require dirname( __FILE__ ) . '/edit-site-page.php';
Expand Down
101 changes: 101 additions & 0 deletions lib/navigation-page.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<?php
/**
* Bootstraping the Gutenberg Navigation page.
*
* @package gutenberg
*/

/**
* The main entry point for the Gutenberg Navigation page.
*
* @since 7.8.0
*/
function gutenberg_navigation_page() {
?>
<div
id="navigation-editor"
class="edit-navigation"
>
</div>
<?php
}

/**
* Initialize the Gutenberg Navigation page.
*
* @since 7.8.0
*
* @param string $hook Page.
*/
function gutenberg_navigation_init( $hook ) {
if ( 'gutenberg_page_gutenberg-navigation' !== $hook ) {
return;
}

// Media settings.
$max_upload_size = wp_max_upload_size();
if ( ! $max_upload_size ) {
$max_upload_size = 0;
}

/** This filter is documented in wp-admin/includes/media.php */
$image_size_names = apply_filters(
'image_size_names_choose',
array(
'thumbnail' => __( 'Thumbnail', 'gutenberg' ),
'medium' => __( 'Medium', 'gutenberg' ),
'large' => __( 'Large', 'gutenberg' ),
'full' => __( 'Full Size', 'gutenberg' ),
)
);

$available_image_sizes = array();
foreach ( $image_size_names as $image_size_slug => $image_size_name ) {
$available_image_sizes[] = array(
'slug' => $image_size_slug,
'name' => $image_size_name,
);
}

$settings = array(
'disableCustomColors' => get_theme_support( 'disable-custom-colors' ),
'disableCustomFontSizes' => get_theme_support( 'disable-custom-font-sizes' ),
'imageSizes' => $available_image_sizes,
'isRTL' => is_rtl(),
'maxUploadFileSize' => $max_upload_size,
);

list( $color_palette, ) = (array) get_theme_support( 'editor-color-palette' );
list( $font_sizes, ) = (array) get_theme_support( 'editor-font-sizes' );

if ( false !== $color_palette ) {
$settings['colors'] = $color_palette;
}

if ( false !== $font_sizes ) {
$settings['fontSizes'] = $font_sizes;
}

wp_add_inline_script(
'wp-edit-navigation',
sprintf(
'wp.domReady( function() {
wp.editNavigation.initialize( "navigation-editor", %s );
} );',
wp_json_encode( gutenberg_experiments_editor_settings( $settings ) )
)
);

// Preload server-registered block schemas.
wp_add_inline_script(
'wp-blocks',
'wp.blocks.unstable__bootstrapServerSideBlockDefinitions(' . wp_json_encode( get_block_editor_server_block_settings() ) . ');'
);

wp_enqueue_script( 'wp-edit-navigation' );
wp_enqueue_style( 'wp-edit-navigation' );
wp_enqueue_style( 'wp-block-library' );
wp_enqueue_script( 'wp-format-library' );
wp_enqueue_style( 'wp-format-library' );
}
add_action( 'admin_enqueue_scripts', 'gutenberg_navigation_init' );
21 changes: 21 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"@wordpress/deprecated": "file:packages/deprecated",
"@wordpress/dom": "file:packages/dom",
"@wordpress/dom-ready": "file:packages/dom-ready",
"@wordpress/edit-navigation": "file:packages/edit-navigation",
"@wordpress/edit-post": "file:packages/edit-post",
"@wordpress/edit-site": "file:packages/edit-site",
"@wordpress/edit-widgets": "file:packages/edit-widgets",
Expand Down
4 changes: 4 additions & 0 deletions packages/block-library/src/navigation/edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,10 @@ function Navigation( {
className: 'wp-block-navigation__container',
} }
__experimentalCaptureToolbars={ true }
// Template lock set to false here so that the Nav
// Block on the experimental menus screen does not
// inherit templateLock={ 'all' }.
templateLock={ false }
draganescu marked this conversation as resolved.
Show resolved Hide resolved
/>
</Block.nav>
</BackgroundColor>
Expand Down
21 changes: 21 additions & 0 deletions packages/core-data/src/entities.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,27 @@ export const defaultEntities = [
plural: 'comments',
label: __( 'Comment' ),
},
{
name: 'menu',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The generated functions become part of the stable api of core data, but meanwhile the endpoint is still experimental and could be changed. I think it'd be good if the entity could be marked as experimental to match the endpoint. I made small PR that enables that - #21072

kind: 'root',
baseURL: '/__experimental/menus',
plural: 'menus',
label: __( 'Menu' ),
},
{
name: 'menuItem',
kind: 'root',
baseURL: '/__experimental/menu-items',
plural: 'menuItems',
label: __( 'Menu Item' ),
},
{
name: 'menuLocation',
kind: 'root',
baseURL: '/__experimental/menu-locations',
plural: 'menuLocations',
label: __( 'Menu Location' ),
},
];

export const kinds = [
Expand Down
1 change: 1 addition & 0 deletions packages/edit-navigation/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package-lock=false
5 changes: 5 additions & 0 deletions packages/edit-navigation/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- Package name
- Package description
- Installation details
- Usage example
- `Code is Poetry` logo (`<br/><br/><p align="center"><img src="https://s.w.org/style/images/codeispoetry.png?1" alt="Code is Poetry." /></p>`)
44 changes: 44 additions & 0 deletions packages/edit-navigation/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"name": "@wordpress/edit-navigation",
"version": "1.0.0-beta.0",
"private": true,
"description": "Module for the Navigation page in WordPress.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
"keywords": [
"wordpress"
],
"homepage": "https://github.com/WordPress/gutenberg/tree/master/packages/edit-navigation/README.md",
"repository": {
"type": "git",
"url": "https://github.com/WordPress/gutenberg.git",
"directory": "packages/edit-navigation"
},
"bugs": {
"url": "https://github.com/WordPress/gutenberg/issues"
},
"main": "build/index.js",
"module": "build-module/index.js",
"react-native": "src/index",
"dependencies": {
"@babel/runtime": "^7.8.3",
"@wordpress/block-editor": "file:../block-editor",
"@wordpress/block-library": "file:../block-library",
"@wordpress/blocks": "file:../blocks",
"@wordpress/components": "file:../components",
"@wordpress/compose": "file:../compose",
"@wordpress/data": "file:../data",
"@wordpress/data-controls": "file:../data-controls",
"@wordpress/dom-ready": "file:../dom-ready",
"@wordpress/element": "file:../element",
"@wordpress/hooks": "file:../hooks",
"@wordpress/i18n": "file:../i18n",
"@wordpress/media-utils": "file:../media-utils",
"@wordpress/notices": "file:../notices",
"lodash": "^4.17.15",
"rememo": "^3.0.0"
},
"publishConfig": {
"access": "public"
}
}
60 changes: 60 additions & 0 deletions packages/edit-navigation/src/components/layout/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/**
* WordPress dependencies
*/
import {
DropZoneProvider,
FocusReturnProvider,
Popover,
SlotFillProvider,
TabPanel,
} from '@wordpress/components';
import { __ } from '@wordpress/i18n';

/**
* Internal dependencies
*/
import MenusEditor from '../menus-editor';
import MenuLocationsEditor from '../menu-locations-editor';

export default function Layout( { blockEditorSettings } ) {
return (
<>
<SlotFillProvider>
<DropZoneProvider>
<FocusReturnProvider>
{ /* <Notices /> */ }
<Popover.Slot name="block-toolbar" />
<TabPanel
tabs={ [
{
name: 'menus',
title: __( 'Edit Navigation' ),
},
{
name: 'menu-locations',
title: __( 'Manage Locations' ),
},
] }
>
{ ( tab ) => (
<>
{ tab.name === 'menus' && (
<MenusEditor
blockEditorSettings={
blockEditorSettings
}
/>
) }
{ tab.name === 'menu-locations' && (
<MenuLocationsEditor />
) }
</>
) }
</TabPanel>
<Popover.Slot />
</FocusReturnProvider>
</DropZoneProvider>
</SlotFillProvider>
</>
);
}
Loading