Skip to content

Commit

Permalink
try load editor
Browse files Browse the repository at this point in the history
  • Loading branch information
@ntsekouras
ntsekouras committed Jun 27, 2024
1 parent 013b627 commit e7e10de
Show file tree
Hide file tree
Showing 5 changed files with 151 additions and 57 deletions.
59 changes: 56 additions & 3 deletions lib/experimental/posts/load.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,67 @@
* Renders the new posts dashboard page.
*/
function gutenberg_posts_dashboard() {
// Flag that we're loading the block editor.
// $current_screen = get_current_screen();
// $current_screen->is_block_editor( true );

// Default to is-fullscreen-mode to avoid jumps in the UI.
// add_filter(
// 'admin_body_class',

Check failure on line 20 in lib/experimental/posts/load.php

View workflow job for this annotation

GitHub Actions / PHP coding standards 

Spaces must be used for mid-line alignment; tabs are not allowed
// static function ( $classes ) {

Check failure on line 21 in lib/experimental/posts/load.php

View workflow job for this annotation

GitHub Actions / PHP coding standards 

Spaces must be used for mid-line alignment; tabs are not allowed
// return "$classes is-fullscreen-mode";

Check failure on line 22 in lib/experimental/posts/load.php

View workflow job for this annotation

GitHub Actions / PHP coding standards 

Spaces must be used for mid-line alignment; tabs are not allowed
// }

Check failure on line 23 in lib/experimental/posts/load.php

View workflow job for this annotation

GitHub Actions / PHP coding standards 

Spaces must be used for mid-line alignment; tabs are not allowed
// );

$block_editor_context = new WP_Block_Editor_Context( array( 'name' => 'core/edit-site' ) );
$custom_settings = array(
'siteUrl' => site_url(),

Check warning on line 28 in lib/experimental/posts/load.php

View workflow job for this annotation

GitHub Actions / PHP coding standards 

Array double arrow not aligned correctly; expected 8 space(s) between "'siteUrl'" and double arrow, but found 19.
// 'postsPerPage' => get_option( 'posts_per_page' ),
'styles' => get_block_editor_theme_styles(),

Check warning on line 30 in lib/experimental/posts/load.php

View workflow job for this annotation

GitHub Actions / PHP coding standards 

Array double arrow not aligned correctly; expected 9 space(s) between "'styles'" and double arrow, but found 20.
// 'defaultTemplateTypes' => $indexed_template_types,
// 'defaultTemplatePartAreas' => get_allowed_block_template_part_areas(),
'supportsLayout' => wp_theme_has_theme_json(),

Check warning on line 33 in lib/experimental/posts/load.php

View workflow job for this annotation

GitHub Actions / PHP coding standards 

Array double arrow not aligned correctly; expected 1 space(s) between "'supportsLayout'" and double arrow, but found 12.
// 'supportsTemplatePartsMode' => ! wp_is_block_theme() && current_theme_supports( 'block-template-parts' ),
);
$editor_settings = get_block_editor_settings( $custom_settings, $block_editor_context );

$active_global_styles_id = WP_Theme_JSON_Resolver::get_user_global_styles_post_id();

Check warning on line 38 in lib/experimental/posts/load.php

View workflow job for this annotation

GitHub Actions / PHP coding standards 

Unused variable $active_global_styles_id.
$active_theme = get_stylesheet();

Check warning on line 39 in lib/experimental/posts/load.php

View workflow job for this annotation

GitHub Actions / PHP coding standards 

Unused variable $active_theme.

// 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_add_inline_script(
'wp-blocks',
sprintf( 'wp.blocks.setCategories( %s );', wp_json_encode( isset( $editor_settings['blockCategories'] ) ? $editor_settings['blockCategories'] : array() ) ),
'after'
);

/** This action is documented in wp-admin/edit-form-blocks.php */
do_action( 'enqueue_block_editor_assets' );
wp_register_style(
'wp-gutenberg-posts-dashboard',
gutenberg_url( 'build/edit-site/posts.css', __FILE__ ),
array( 'wp-components', 'wp-commands' )
array( 'wp-components', 'wp-commands', 'wp-edit-site' )
);
wp_enqueue_style( 'wp-gutenberg-posts-dashboard' );
wp_add_inline_script( 'wp-edit-site', 'window.wp.editSite.initializePostsDashboard( "gutenberg-posts-dashboard" );', 'after' );
// wp_add_inline_script( 'wp-edit-site', 'window.wp.editSite.initializePostsDashboard( "gutenberg-posts-dashboard" );', 'after' );
wp_add_inline_script(
'wp-edit-site',
sprintf(
'wp.domReady( function() {
wp.editSite.initializePostsDashboard( "gutenberg-posts-dashboard", %s );
} );',
wp_json_encode( $editor_settings )
)
);
wp_enqueue_script( 'wp-edit-site' );
// wp_enqueue_style( 'wp-edit-site' );

wp_enqueue_media();

echo '<div id="gutenberg-posts-dashboard"></div>';
}
Expand All @@ -29,7 +82,7 @@ function gutenberg_posts_dashboard() {
*/
function gutenberg_add_post_type_arg() {
global $pagenow;

Check failure on line 84 in lib/experimental/posts/load.php

View workflow job for this annotation

GitHub Actions / PHP coding standards 

Tabs must be used to indent lines; spaces are not allowed
if ( $pagenow == 'admin.php' && isset( $_GET['page'] ) && $_GET['page'] == 'gutenberg-posts-dashboard' && empty( $_GET['postType'] ) ) {
if ( 'admin.php' === $pagenow && isset( $_GET['page'] ) && 'gutenberg-posts-dashboard' === $_GET['page'] && empty( $_GET['postType'] ) ) {

Check failure on line 85 in lib/experimental/posts/load.php

View workflow job for this annotation

GitHub Actions / PHP coding standards 

Tabs must be used to indent lines; spaces are not allowed
wp_redirect( admin_url( '/admin.php?page=gutenberg-posts-dashboard&postType=post' ) );

Check failure on line 86 in lib/experimental/posts/load.php

View workflow job for this annotation

GitHub Actions / PHP coding standards 

Tabs must be used to indent lines; spaces are not allowed
exit;

Check failure on line 87 in lib/experimental/posts/load.php

View workflow job for this annotation

GitHub Actions / PHP coding standards 

Tabs must be used to indent lines; spaces are not allowed
}

Check failure on line 88 in lib/experimental/posts/load.php

View workflow job for this annotation

GitHub Actions / PHP coding standards 

Tabs must be used to indent lines; spaces are not allowed
Expand Down
4 changes: 3 additions & 1 deletion packages/edit-site/src/components/editor/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,14 @@ import SiteEditorMoreMenu from '../more-menu';
import SiteIcon from '../site-icon';
import useEditorIframeProps from '../block-editor/use-editor-iframe-props';
import useEditorTitle from './use-editor-title';
import { useIsSiteEditorLoading } from '../layout/hooks';

const { Editor, BackButton } = unlock( editorPrivateApis );
const { useHistory } = unlock( routerPrivateApis );
const { BlockKeyboardShortcuts } = unlock( blockLibraryPrivateApis );

export default function EditSiteEditor( { isLoading } ) {
export default function EditSiteEditor() {
const isLoading = useIsSiteEditorLoading();
const {
editedPostType,
editedPostId,
Expand Down
40 changes: 12 additions & 28 deletions packages/edit-site/src/components/layout/router.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { useEffect } from '@wordpress/element';
* Internal dependencies
*/
import { unlock } from '../../lock-unlock';
import { useIsSiteEditorLoading } from './hooks';
import Editor from '../editor';
import PostsList from '../posts-app/posts-list';
import PagePatterns from '../page-patterns';
Expand Down Expand Up @@ -74,7 +73,6 @@ function useRedirectOldPaths() {
}

export default function useLayoutAreas() {
const isSiteEditorLoading = useIsSiteEditorLoading();
const { params } = useLocation();
const { postType, postId, path, layout, isCustom, canvas } = params;
useRedirectOldPaths();
Expand All @@ -93,12 +91,10 @@ export default function useLayoutAreas() {
/>
),
content: <PostsList postType={ postType } />,
preview: ( isListLayout || canvas === 'edit' ) && (
<Editor isLoading={ isSiteEditorLoading } />
),
preview: ( isListLayout || canvas === 'edit' ) && <Editor />,
mobile:
canvas === 'edit' ? (
<Editor isLoading={ isSiteEditorLoading } />
<Editor />
) : (
<PostsList postType={ postType } />
),
Expand All @@ -119,9 +115,7 @@ export default function useLayoutAreas() {
<SidebarNavigationScreenTemplatesBrowse backPath={ {} } />
),
content: <PageTemplates />,
preview: ( isListLayout || canvas === 'edit' ) && (
<Editor isLoading={ isSiteEditorLoading } />
),
preview: ( isListLayout || canvas === 'edit' ) && <Editor />,
mobile: <PageTemplates />,
},
widths: {
Expand All @@ -140,9 +134,7 @@ export default function useLayoutAreas() {
sidebar: <SidebarNavigationScreenPatterns backPath={ {} } />,
content: <PagePatterns />,
mobile: <PagePatterns />,
preview: canvas === 'edit' && (
<Editor isLoading={ isSiteEditorLoading } />
),
preview: canvas === 'edit' && <Editor />,
},
};
}
Expand All @@ -155,10 +147,8 @@ export default function useLayoutAreas() {
sidebar: (
<SidebarNavigationScreenGlobalStyles backPath={ {} } />
),
preview: <Editor isLoading={ isSiteEditorLoading } />,
mobile: canvas === 'edit' && (
<Editor isLoading={ isSiteEditorLoading } />
),
preview: <Editor />,
mobile: canvas === 'edit' && <Editor />,
},
};
}
Expand All @@ -174,10 +164,8 @@ export default function useLayoutAreas() {
backPath={ { postType: NAVIGATION_POST_TYPE } }
/>
),
preview: <Editor isLoading={ isSiteEditorLoading } />,
mobile: canvas === 'edit' && (
<Editor isLoading={ isSiteEditorLoading } />
),
preview: <Editor />,
mobile: canvas === 'edit' && <Editor />,
},
};
}
Expand All @@ -187,10 +175,8 @@ export default function useLayoutAreas() {
sidebar: (
<SidebarNavigationScreenNavigationMenus backPath={ {} } />
),
preview: <Editor isLoading={ isSiteEditorLoading } />,
mobile: canvas === 'edit' && (
<Editor isLoading={ isSiteEditorLoading } />
),
preview: <Editor />,
mobile: canvas === 'edit' && <Editor />,
},
};
}
Expand All @@ -200,10 +186,8 @@ export default function useLayoutAreas() {
key: 'default',
areas: {
sidebar: <SidebarNavigationScreenMain />,
preview: <Editor isLoading={ isSiteEditorLoading } />,
mobile: canvas === 'edit' && (
<Editor isLoading={ isSiteEditorLoading } />
),
preview: <Editor />,
mobile: canvas === 'edit' && <Editor />,
},
};
}
29 changes: 7 additions & 22 deletions packages/edit-site/src/components/posts-app/router.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { store as coreStore } from '@wordpress/core-data';
* Internal dependencies
*/
import { unlock } from '../../lock-unlock';
import { useIsSiteEditorLoading } from '../layout/hooks';
import Editor from '../editor';
import SidebarNavigationScreen from '../sidebar-navigation-screen';
import SidebarNavigationScreenMain from '../sidebar-navigation-screen-main';
Expand All @@ -19,7 +18,6 @@ import PostsList from '../posts-app/posts-list';
const { useLocation } = unlock( routerPrivateApis );

export default function useLayoutAreas() {
const isSiteEditorLoading = useIsSiteEditorLoading();
const { params = {} } = useLocation();
const { postType, layout, canvas } = params;
const labels = useSelect(
Expand All @@ -30,25 +28,23 @@ export default function useLayoutAreas() {
);

// Posts list.
if ( [ 'page', 'post' ].includes( postType ) ) {
if ( [ 'post' ].includes( postType ) ) {
const isListLayout = layout === 'list' || ! layout;
return {
key: 'pages',
key: 'posts-list',
areas: {
sidebar: (
<SidebarNavigationScreen
title={ labels?.name }
backPath={ {} }
// backPath={ {} }
content={ <DataViewsSidebarContent /> }
/>
),
content: <PostsList postType={ postType } />,
preview: ( isListLayout || canvas === 'edit' ) && (
<Editor isLoading={ isSiteEditorLoading } />
),
preview: ( isListLayout || canvas === 'edit' ) && <Editor />,
mobile:
canvas === 'edit' ? (
<Editor isLoading={ isSiteEditorLoading } />
<Editor />
) : (
<PostsList postType={ postType } />
),
Expand All @@ -59,24 +55,13 @@ export default function useLayoutAreas() {
};
}

// const defaultRoute = {
// key: 'index',
// areas: {
// sidebar: 'Empty Sidebar',
// content: <PostsList />,
// preview: undefined,
// mobile: <Page>Welcome to Posts</Page>,
// },
// };
// Fallback shows the home page preview
return {
key: 'default',
areas: {
sidebar: <SidebarNavigationScreenMain />,
preview: <Editor isLoading={ isSiteEditorLoading } />,
mobile: canvas === 'edit' && (
<Editor isLoading={ isSiteEditorLoading } />
),
preview: <Editor />,
mobile: canvas === 'edit' && <Editor />,
},
};
}
76 changes: 73 additions & 3 deletions packages/edit-site/src/posts.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,26 @@
/**
* WordPress dependencies
*/
import { store as blocksStore } from '@wordpress/blocks';
import {
registerCoreBlocks,
__experimentalGetCoreBlocks,
__experimentalRegisterExperimentalCoreBlocks,
} from '@wordpress/block-library';
import { dispatch } from '@wordpress/data';
import { createRoot, StrictMode } from '@wordpress/element';
import { store as editorStore } from '@wordpress/editor';
import { store as preferencesStore } from '@wordpress/preferences';
import {
registerLegacyWidgetBlock,
registerWidgetGroupBlock,
} from '@wordpress/widgets';

/**
* Internal dependencies
*/
import './hooks';
import { store as editSiteStore } from './store';

/**
* Internal dependencies
Expand All @@ -11,16 +30,67 @@ import PostsApp from './components/posts-app';

/**
* Initializes the "Posts Dashboard"
* @param {string} id DOM element id.
* @param {string} id ID of the root element to render the screen in.
* @param {Object} settings Editor settings.
*/
export function initializePostsDashboard( id ) {
export function initializePostsDashboard( id, settings ) {
if ( ! globalThis.IS_GUTENBERG_PLUGIN ) {
return;
}
// initializeEditor( 'site-editor', {} );
const target = document.getElementById( id );
const root = createRoot( target );

dispatch( blocksStore ).reapplyBlockTypeFilters();
const coreBlocks = __experimentalGetCoreBlocks().filter(
( { name } ) => name !== 'core/freeform'
);
registerCoreBlocks( coreBlocks );
dispatch( blocksStore ).setFreeformFallbackBlockName( 'core/html' );
registerLegacyWidgetBlock( { inserter: false } );
registerWidgetGroupBlock( { inserter: false } );
if ( globalThis.IS_GUTENBERG_PLUGIN ) {
__experimentalRegisterExperimentalCoreBlocks( {
enableFSEBlocks: true,
} );
}

// We dispatch actions and update the store synchronously before rendering
// so that we won't trigger unnecessary re-renders with useEffect.
dispatch( preferencesStore ).setDefaults( 'core/edit-site', {
welcomeGuide: true,
welcomeGuideStyles: true,
welcomeGuidePage: true,
welcomeGuideTemplate: true,
} );

dispatch( preferencesStore ).setDefaults( 'core', {
allowRightClickOverrides: true,
distractionFree: false,
editorMode: 'visual',
fixedToolbar: false,
focusMode: false,
inactivePanels: [],
keepCaretInsideBlock: false,
openPanels: [ 'post-status' ],
showBlockBreadcrumbs: true,
showListViewByDefault: false,
} );

dispatch( editSiteStore ).updateSettings( settings );

// Keep the defaultTemplateTypes in the core/editor settings too,
// so that they can be selected with core/editor selectors in any editor.
// This is needed because edit-site doesn't initialize with EditorProvider,
// which internally uses updateEditorSettings as well.
dispatch( editorStore ).updateEditorSettings( {
defaultTemplateTypes: settings.defaultTemplateTypes,
defaultTemplatePartAreas: settings.defaultTemplatePartAreas,
} );

// Prevent the default browser action for files dropped outside of dropzones.
window.addEventListener( 'dragover', ( e ) => e.preventDefault(), false );
window.addEventListener( 'drop', ( e ) => e.preventDefault(), false );

root.render(
<StrictMode>
<PostsApp />
Expand Down

0 comments on commit e7e10de

Please sign in to comment.