Skip to content

Navigation screen: Add opt-in Navigation block rendering #24503

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

Merged
draganescu merged 8 commits into from
Aug 18, 2020
Merged

Navigation screen: Add opt-in Navigation block rendering #24503

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3a47a1a
Navigation screen: Add opt-in Navigation block rendering
noisysocks Aug 12, 2020
bb57216
Navigation: Remove unused argument
noisysocks Aug 13, 2020
c955c6c
Navigation: Fix phpunit tests
noisysocks Aug 14, 2020
50d192f
Shorten 'Gutenberg Block' label to 'Block'
noisysocks Aug 18, 2020
38da717
Navigation: Add @return inline documentation
noisysocks Aug 18, 2020
c6b0a88
Navigation: Add label to content textarea
noisysocks Aug 18, 2020
641aebb
Navigation: Hide all non-content fields from Block menu items
noisysocks Aug 18, 2020
1e71c10
Navigation: Fix loss of block content when saving menu in nav-menus.php
noisysocks Aug 18, 2020
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
Prev Previous commit
Next Next commit
Navigation: Add @return inline documentation
  • Loading branch information
@noisysocks
noisysocks committed Aug 18, 2020
commit 38da717124d14baf03f714b1674e5d3c8ed07547
11 changes: 10 additions & 1 deletion lib/navigation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ function gutenberg_update_nav_menu_item_content( $menu_id, $menu_item_db_id, $ar
* @see https://core.trac.wordpress.org/ticket/50544
*
* @param object $menu_item The menu item object.
*
* @return object Updated menu item object.
*/
function gutenberg_setup_block_nav_menu_item( $menu_item ) {
if ( 'block' === $menu_item->type ) {
Expand Down Expand Up @@ -104,6 +106,8 @@ function gutenberg_setup_block_nav_menu_item( $menu_item ) {
* @param WP_Post $item Menu item data object.
* @param int $depth Depth of menu item. Used for padding.
* @param stdClass $args An object of wp_nav_menu() arguments.
*
* @return string The menu item's updated HTML output.
*/
function gutenberg_output_block_nav_menu_item( $item_output, $item, $depth, $args ) {
if ( 'block' === $item->type ) {
Expand Down Expand Up @@ -131,6 +135,8 @@ function gutenberg_output_block_nav_menu_item( $item_output, $item, $depth, $arg
* @see https://core.trac.wordpress.org/ticket/50544
*
* @param array $menu_items The menu items, sorted by each menu item's menu order.
Copy link
Contributor

@talldan talldan Aug 14, 2020

Choose a reason for hiding this comment

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

I notice some of the functions are missing @return documentation.

Copy link
Member Author

@noisysocks noisysocks Aug 18, 2020

Choose a reason for hiding this comment

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

38da717

*
* @return array Updated menu items, sorted by each menu item's menu order.
*/
function gutenberg_remove_block_nav_menu_items( $menu_items ) {
if ( current_theme_supports( 'block-nav-menus' ) ) {
Expand All @@ -155,7 +161,8 @@ function( $menu_item ) {
*
* @param array $menu_items The menu items to convert, sorted by each menu item's menu order.
* @param array $menu_items_by_parent_id All menu items, indexed by their parent's ID.
* @return array

* @return array Updated menu items, sorted by each menu item's menu order.
*/
function gutenberg_convert_menu_items_to_blocks(
$menu_items,
Expand Down Expand Up @@ -222,6 +229,8 @@ function gutenberg_convert_menu_items_to_blocks(
*
* @param string|null $output Nav menu output to short-circuit with. Default null.
* @param stdClass $args An object containing wp_nav_menu() arguments.
*
* @return string|null Nav menu output to short-circuit with.
*/
function gutenberg_output_block_nav_menu( $output, $args ) {
if ( ! current_theme_supports( 'block-nav-menus' ) ) {
Expand Down