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.

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

Fix editor dynamic width on WP 5.6 #1520

Closed
wants to merge 2 commits into from
Closed

Fix editor dynamic width on WP 5.6 #1520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efea3f5
Fix editor dynamic width on WP 5.6
Aljullu Oct 26, 2020
d191fe8
Linting
Aljullu Oct 27, 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
21 changes: 13 additions & 8 deletions assets/css/base/gutenberg-editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,20 +300,25 @@ table {
.wp-block {
max-width: $container-width;

&[data-align='wide'] {
max-width: ms(19);
}

&[data-align='full'] {
max-width: none;

.storefront-has-sidebar & {
margin-left: auto !important;
margin-right: auto !important;
}
}

.storefront-has-sidebar & {
$span-value: span(9) / 100;
max-width: calc(#{$container-width} * #{$span-value / ( $span-value * 0 + 1 )}); // Unitless hack.
}
}

.wp-block[data-align='wide'] {
max-width: ms(19);
}

.wp-block[data-align='full'] {
max-width: none;
}

// Tables
.wp-block-table {
&__cell-content {
Expand Down
130 changes: 50 additions & 80 deletions assets/js/src/editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
* configuration and styling.
*/

( function() {
// First class for WP<=5.3 and second class for WP>=5.4.
const editorWrapperSelector =
'.editor-writing-flow, .block-editor-writing-flow';

( function () {
/**
* Check if the main sidebar is active (has widgets).
*
Expand All @@ -16,9 +19,12 @@
* @return {boolean} Whether sidebar is active.
*/
const sidebarIsActive = () => {
let settings = wp.data.select( 'core/editor' ).getEditorSettings();
const settings = wp.data.select( 'core/editor' ).getEditorSettings();

if ( settings.hasOwnProperty( 'mainSidebarActive' ) && !! settings.mainSidebarActive ) {
if (
settings.hasOwnProperty( 'mainSidebarActive' ) &&
settings.mainSidebarActive
) {
return true;
}

Expand All @@ -31,22 +37,9 @@
* @return {string} The page template name.
*/
const getCurrentPageTemplate = () => {
return wp.data.select( 'core/editor' ).getEditedPostAttribute( 'template' );
};

/**
* Check if the active theme supports a wide layout.
*
* @return {boolean} Whether the theme supports wide layout.
*/
const themeSupportsWide = () => {
let settings = wp.data.select( 'core/editor' ).getEditorSettings();

if ( settings.hasOwnProperty( 'alignWide' ) && !! settings.alignWide ) {
return true;
}

return false;
return wp.data
.select( 'core/editor' )
.getEditedPostAttribute( 'template' );
};

/**
Expand All @@ -58,52 +51,26 @@
* @return {void}
*/
const updateWideSupport = ( alignWide ) => {
wp.data.dispatch( 'core/editor' ).updateEditorSettings( { 'alignWide': !! alignWide } );
};

/**
* Update `data-align` attribute on each block.
*
* @param {boolean} alignWide Whether alignWide is supported.
*
* @return {void}
*/
const updateAlignAttribute = ( alignWide ) => {
let blocks = wp.data.select( 'core/editor' ).getBlocks();

blocks.forEach( ( block ) => {
if ( block.attributes.hasOwnProperty( 'align' ) ) {
let align = block.attributes.align;

if ( ! [ 'full', 'wide' ].includes( align ) ) {
return;
}

let blockWrapper = document.getElementById( 'block-' + block.clientId );

if ( blockWrapper ) {
blockWrapper.setAttribute( 'data-align', alignWide ? align : '' );
}
}
} );
wp.data
.dispatch( 'core/block-editor' )
.updateSettings( { alignWide: !! alignWide } );
};

/**
* Add custom class to editor wrapper if main sidebar is active.
*
* @param {boolean} showSidebar Whether to add custom class.
* @param {boolean} hasSidebar Whether to add custom class.
*
* @return {void}
*/
const toggleCustomSidebarClass = ( showSidebar ) => {
// First class for WP<=5.3 and second class for WP>=5.4.
const editorWrapper = document.querySelector( '.editor-writing-flow, .block-editor-writing-flow' );
const toggleCustomSidebarClass = ( hasSidebar ) => {
const editorWrapper = document.querySelector( editorWrapperSelector );

if ( ! editorWrapper ) {
return;
}

if ( !! showSidebar ) {
if ( hasSidebar ) {
editorWrapper.classList.add( 'storefront-has-sidebar' );
} else {
editorWrapper.classList.remove( 'storefront-has-sidebar' );
Expand All @@ -115,39 +82,42 @@
*
* @return {void}
*/
const maybeUpdateEditor = () => {
if ( 'template-fullwidth.php' === getCurrentPageTemplate() ) {
updateWideSupport( true );
toggleCustomSidebarClass( false );
updateAlignAttribute( true );
} else if ( sidebarIsActive() ) {
updateWideSupport( false );
toggleCustomSidebarClass( true );
updateAlignAttribute( false );
} else {
updateWideSupport( true );
toggleCustomSidebarClass( false );
updateAlignAttribute( true );
}
const maybeUpdateEditor = ( pageTemplate, sidebarActive ) => {
const hasSidebar =
'template-fullwidth.php' !== pageTemplate && sidebarActive;
updateWideSupport( ! hasSidebar );
toggleCustomSidebarClass( hasSidebar );
};

wp.domReady( () => {
const observer = new MutationObserver( ( mutationsList, observer ) => {
if ( ! document.querySelector( editorWrapperSelector ) ) {
return;
}

// Don't do anything if the theme doesn't declare support for `align-wide`.
if ( ! themeSupportsWide() ) {
return;
}

maybeUpdateEditor();

let pageTemplate = getCurrentPageTemplate();

wp.data.subscribe( () => {
if ( getCurrentPageTemplate() !== pageTemplate ) {
pageTemplate = getCurrentPageTemplate();
let pageTemplate = getCurrentPageTemplate();
let sidebarActive = sidebarIsActive();
maybeUpdateEditor( pageTemplate, sidebarActive );

wp.data.subscribe( () => {
const newPageTemplate = getCurrentPageTemplate();
const newSidebarActive = sidebarIsActive();
if (
newPageTemplate !== pageTemplate ||
newSidebarActive !== sidebarActive
) {
pageTemplate = newPageTemplate;
sidebarActive = newSidebarActive;

maybeUpdateEditor( pageTemplate, sidebarActive );
}
} );

maybeUpdateEditor();
}
observer.disconnect();
} );

const targetNode = document.querySelector( '.block-editor__container' );
const config = { childList: true, subtree: true };
observer.observe( targetNode, config );
} );
} )();