Fix welcome guide focus and e2e tests

WordPress · Jun 6, 2024 · 5707016 · 5707016
1 parent 8b47ac7
commit 5707016
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/packages/edit-post/src/components/layout/index.js b/packages/edit-post/src/components/layout/index.js
@@ -321,6 +321,7 @@ function Layout( {
  <SlotFillProvider>
  <ErrorBoundary>
  <CommandMenu />
+ <WelcomeGuide postType={ currentPost.postType } />
  <Editor
  settings={ editorSettings }
  initialEdits={ initialEdits }
@@ -359,7 +360,6 @@ function Layout( {
  <EditPostKeyboardShortcuts />
  <EditorKeyboardShortcutsRegister />
  <BlockKeyboardShortcuts />
- <WelcomeGuide />
  <InitPatternModal />
  <PluginArea onError={ onPluginAreaError } />
  <PostEditorMoreMenu />

diff --git a/packages/edit-post/src/components/welcome-guide/index.js b/packages/edit-post/src/components/welcome-guide/index.js
@@ -2,7 +2,6 @@
  * WordPress dependencies
  */
 import { useSelect } from '@wordpress/data';
-import { store as editorStore } from '@wordpress/editor';
 
 /**
  * Internal dependencies
@@ -11,21 +10,22 @@ import WelcomeGuideDefault from './default';
 import WelcomeGuideTemplate from './template';
 import { store as editPostStore } from '../../store';
 
-export default function WelcomeGuide() {
- const { isActive, isEditingTemplate } = useSelect( ( select ) => {
- const { isFeatureActive } = select( editPostStore );
- const { getCurrentPostType } = select( editorStore );
- const _isEditingTemplate = getCurrentPostType() === 'wp_template';
+export default function WelcomeGuide( { postType } ) {
+ const { isActive, isEditingTemplate } = useSelect(
+ ( select ) => {
+ const { isFeatureActive } = select( editPostStore );
+ const _isEditingTemplate = postType === 'wp_template';
+ const feature = _isEditingTemplate
+ ? 'welcomeGuideTemplate'
+ : 'welcomeGuide';
 
- const feature = _isEditingTemplate
- ? 'welcomeGuideTemplate'
- : 'welcomeGuide';
-
- return {
- isActive: isFeatureActive( feature ),
- isEditingTemplate: _isEditingTemplate,
- };
- }, [] );
+ return {
+ isActive: isFeatureActive( feature ),
+ isEditingTemplate: _isEditingTemplate,
+ };
+ },
+ [ postType ]
+ );
 
  if ( ! isActive ) {
  return null;