From 3dda74c3377243797ceffb429f94e0ea63ad6d75 Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Tue, 21 Jul 2020 15:38:03 +0000
Subject: [PATCH] Editor: Ensure the required assets for the block directory
 are enqueued.

This fixes an issue where the block directory appears unstyled due to the stylesheets not being enqueued.

Props ryelle, timothyblynjacobs, earnjam.
Fixes #50661.
Built from https://develop.svn.wordpress.org/trunk@48537


git-svn-id: http://core.svn.wordpress.org/trunk@48299 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/edit-form-blocks.php   |  3 +--
 wp-includes/default-filters.php |  1 +
 wp-includes/script-loader.php   | 12 ++++++++++++
 wp-includes/version.php         |  2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/wp-admin/edit-form-blocks.php b/wp-admin/edit-form-blocks.php
index df14b3d022..4e104feda2 100644
--- a/wp-admin/edit-form-blocks.php
+++ b/wp-admin/edit-form-blocks.php
@@ -365,14 +365,13 @@ wp_enqueue_media(
 );
 wp_tinymce_inline_scripts();
 wp_enqueue_editor();
-wp_enqueue_script( 'wp-block-directory' );
+
 
 /**
  * Styles
  */
 wp_enqueue_style( 'wp-edit-post' );
 wp_enqueue_style( 'wp-format-library' );
-wp_enqueue_style( 'wp-block-directory' );
 
 /**
  * Fires after block assets have been enqueued for the editing interface.
diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php
index 68b684671b..18c3224466 100644
--- a/wp-includes/default-filters.php
+++ b/wp-includes/default-filters.php
@@ -516,6 +516,7 @@ add_filter( 'print_scripts_array', 'wp_prototype_before_jquery' );
 add_filter( 'customize_controls_print_styles', 'wp_resource_hints', 1 );
 add_action( 'enqueue_block_assets', 'enqueue_block_styles_assets', 30 );
 add_action( 'enqueue_block_editor_assets', 'enqueue_editor_block_styles_assets' );
+add_action( 'enqueue_block_editor_assets', 'wp_enqueue_editor_block_directory_assets' );
 
 add_action( 'wp_default_styles', 'wp_default_styles' );
 add_filter( 'style_loader_src', 'wp_style_loader_src', 10, 2 );
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index f0404830bd..8cbe8d0b87 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -1463,6 +1463,7 @@ function wp_default_styles( $styles ) {
 			'wp-editor-font',
 		),
 		'block-library'        => array(),
+		'block-directory'      => array(),
 		'components'           => array(),
 		'edit-post'            => array(
 			'wp-components',
@@ -1527,6 +1528,7 @@ function wp_default_styles( $styles ) {
 		'wp-edit-blocks',
 		'wp-block-editor',
 		'wp-block-library',
+		'wp-block-directory',
 		'wp-components',
 		'wp-edit-post',
 		'wp-editor',
@@ -2269,3 +2271,13 @@ function enqueue_editor_block_styles_assets() {
 	wp_add_inline_script( 'wp-block-styles', $inline_script );
 	wp_enqueue_script( 'wp-block-styles' );
 }
+
+/**
+ * Enqueues the assets required for the block directory within the block editor.
+ *
+ * @since 5.5.0
+ */
+function wp_enqueue_editor_block_directory_assets() {
+	wp_enqueue_script( 'wp-block-directory' );
+	wp_enqueue_style( 'wp-block-directory' );
+}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 74277841df..4444d26f82 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-beta2-48536';
+$wp_version = '5.5-beta2-48537';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.