Skip to content

Make format control restrictions experimental #74739

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

Closed
t-hamano wants to merge 1 commit into from
Closed

Make format control restrictions experimental #74739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions lib/experimental/editor-settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ function gutenberg_enable_experiments() {
if ( gutenberg_is_experiment_enabled( 'gutenberg-media-editor' ) ) {
wp_add_inline_script( 'wp-block-editor', 'window.__experimentalMediaEditor = true', 'before' );
}
if ( gutenberg_is_experiment_enabled( 'gutenberg-restrict-formatting-in-content-only-mode' ) ) {
wp_add_inline_script( 'wp-block-editor', 'window.__experimentalRestrictFormattingInContentOnlyMode = true', 'before' );
}
}

add_action( 'admin_init', 'gutenberg_enable_experiments' );
Expand Down
12 changes: 12 additions & 0 deletions lib/experiments-page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,18 @@ function gutenberg_initialize_experiments_settings() {
)
);

add_settings_field(
'gutenberg-restrict-formatting-in-content-only-mode',
__( 'Restrict formatting controls in Content Only mode', 'gutenberg' ),
'gutenberg_display_experiment_field',
'gutenberg-experiments',
'gutenberg_experiments_section',
array(
'label' => __( 'Restricts RichText formatting controls when in Content Only mode to provide a simpler, more focused editing experience while maintaining essential content functionality.', 'gutenberg' ),
'id' => 'gutenberg-restrict-formatting-in-content-only-mode',
)
);

register_setting(
'gutenberg-experiments',
'gutenberg-experiments'
Expand Down
4 changes: 3 additions & 1 deletion packages/block-editor/src/components/rich-text/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,9 @@ export function RichTextWrapper(
identifier,
allowedFormats: adjustedAllowedFormats,
withoutInteractiveFormatting,
disableNoneEssentialFormatting: isContentOnly,
disableNoneEssentialFormatting:
isContentOnly &&
window?.__experimentalRestrictFormattingInContentOnlyMode,
} );

function addEditorOnlyFormats( value ) {
Expand Down
8 changes: 7 additions & 1 deletion packages/block-editor/src/components/rich-text/use-format-types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ function getPrefixedSelectKeys( selected, prefix ) {
* @param {Array} options.allowedFormats Allowed formats
* @param {boolean} options.withoutInteractiveFormatting Whether to clean the interactive formatting or not.
* @param {boolean} options.disableNoneEssentialFormatting Whether to disable none-essential formatting or not.
* This option is pnly available when "Restrict formatting
* controls in Content Only mode" experimental setting is enabled.
*/
export function useFormatTypes( {
clientId,
Expand All @@ -88,7 +90,11 @@ export function useFormatTypes( {
return false;
}

if ( disableNoneEssentialFormatting && ! isEssential ) {
if (
disableNoneEssentialFormatting &&
! isEssential &&
window?.__experimentalRestrictFormattingInContentOnlyMode
) {
return false;
}

Expand Down
3 changes: 2 additions & 1 deletion packages/block-editor/src/hooks/block-fields/rich-text/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ export default function RichTextControl( {
identifier: field.id,
allowedFormats: adjustedAllowedFormats,
withoutInteractiveFormatting: fieldConfig?.withoutInteractiveFormatting,
disableNoneEssentialFormatting: true,
disableNoneEssentialFormatting:
window?.__experimentalRestrictFormattingInContentOnlyMode,
} );

function addEditorOnlyFormats( value ) {
Expand Down
Loading