diff --git a/lib/experiments-page.php b/lib/experiments-page.php index 40da640aced1a..07a7f2a200a7b 100644 --- a/lib/experiments-page.php +++ b/lib/experiments-page.php @@ -95,17 +95,6 @@ function gutenberg_initialize_experiments_settings() { 'id' => 'gutenberg-full-site-editing-demo', ) ); - add_settings_field( - 'gutenberg-rich-image-editing', - __( 'Rich Image Editing', 'gutenberg' ), - 'gutenberg_display_experiment_field', - 'gutenberg-experiments', - 'gutenberg_experiments_section', - array( - 'label' => __( 'Enable inline rich image editing', 'gutenberg' ), - 'id' => 'gutenberg-rich-image-editing', - ) - ); register_setting( 'gutenberg-experiments', 'gutenberg-experiments' @@ -157,7 +146,6 @@ function gutenberg_experiments_editor_settings( $settings ) { '__experimentalBlockDirectory' => gutenberg_is_experiment_enabled( 'gutenberg-block-directory' ), '__experimentalEnableFullSiteEditing' => gutenberg_is_experiment_enabled( 'gutenberg-full-site-editing' ), '__experimentalEnableFullSiteEditingDemo' => gutenberg_is_experiment_enabled( 'gutenberg-full-site-editing-demo' ), - '__experimentalEnableRichImageEditing' => gutenberg_is_experiment_enabled( 'gutenberg-rich-image-editing' ), ); $gradient_presets = current( (array) get_theme_support( 'editor-gradient-presets' ) ); diff --git a/lib/rest-api.php b/lib/rest-api.php index c0f1c2aa31950..0f05798de87d0 100644 --- a/lib/rest-api.php +++ b/lib/rest-api.php @@ -285,10 +285,6 @@ function gutenberg_auto_draft_get_sample_permalink( $permalink, $id, $title, $na * @since 7.x.0 */ function gutenberg_register_image_editor() { - if ( ! gutenberg_is_experiment_enabled( 'gutenberg-rich-image-editing' ) ) { - return; - } - $image_editor = new WP_REST_Image_Editor_Controller(); $image_editor->register_routes(); } diff --git a/packages/block-editor/README.md b/packages/block-editor/README.md index 86371a46848c6..b36d411125abb 100644 --- a/packages/block-editor/README.md +++ b/packages/block-editor/README.md @@ -495,7 +495,6 @@ _Properties_ - _\_\_experimentalBlockDirectory_ `boolean`: Whether the user has enabled the Block Directory - _\_\_experimentalEnableFullSiteEditing_ `boolean`: Whether the user has enabled Full Site Editing - _\_\_experimentalEnableFullSiteEditingDemo_ `boolean`: Whether the user has enabled Full Site Editing Demo Templates -- _\_\_experimentalEnableRichImageEditing_ `boolean`: Whether the user has enabled Rich Image Editing # **SkipToSelectedBlock** diff --git a/packages/block-editor/src/store/defaults.js b/packages/block-editor/src/store/defaults.js index 42d043c24a135..08ce91e5dbf4e 100644 --- a/packages/block-editor/src/store/defaults.js +++ b/packages/block-editor/src/store/defaults.js @@ -33,7 +33,6 @@ export const PREFERENCES_DEFAULTS = { * @property {boolean} __experimentalBlockDirectory Whether the user has enabled the Block Directory * @property {boolean} __experimentalEnableFullSiteEditing Whether the user has enabled Full Site Editing * @property {boolean} __experimentalEnableFullSiteEditingDemo Whether the user has enabled Full Site Editing Demo Templates - * @property {boolean} __experimentalEnableRichImageEditing Whether the user has enabled Rich Image Editing */ export const SETTINGS_DEFAULTS = { alignWide: false, @@ -151,7 +150,6 @@ export const SETTINGS_DEFAULTS = { __experimentalBlockDirectory: false, __experimentalEnableFullSiteEditing: false, __experimentalEnableFullSiteEditingDemo: false, - __experimentalEnableRichImageEditing: false, __mobileEnablePageTemplates: false, gradients: [ { diff --git a/packages/block-library/src/image/image.js b/packages/block-library/src/image/image.js index 144e6e51e3bb5..f529acf98a9e2 100644 --- a/packages/block-library/src/image/image.js +++ b/packages/block-library/src/image/image.js @@ -85,19 +85,9 @@ export default function Image( { }, [ id, isSelected ] ); - const { - maxWidth, - isRTL, - imageSizes, - __experimentalEnableRichImageEditing, - } = useSelect( ( select ) => { + const { maxWidth, isRTL, imageSizes } = useSelect( ( select ) => { const { getSettings } = select( 'core/block-editor' ); - return pick( getSettings(), [ - 'imageSizes', - 'isRTL', - 'maxWidth', - '__experimentalEnableRichImageEditing', - ] ); + return pick( getSettings(), [ 'imageSizes', 'isRTL', 'maxWidth' ] ); } ); const { toggleSelection } = useDispatch( 'core/block-editor' ); const isLargeViewport = useViewportMatch( 'medium' ); @@ -187,11 +177,7 @@ export default function Image( { } }, [ isSelected ] ); - const canEditImage = - __experimentalEnableRichImageEditing && - id && - naturalWidth && - naturalHeight; + const canEditImage = id && naturalWidth && naturalHeight; const controls = ( <> diff --git a/packages/editor/src/components/provider/index.js b/packages/editor/src/components/provider/index.js index e9fbe2863a665..57cfb4af84da4 100644 --- a/packages/editor/src/components/provider/index.js +++ b/packages/editor/src/components/provider/index.js @@ -121,7 +121,6 @@ class EditorProvider extends Component { '__experimentalEnableLinkColor', '__experimentalEnableFullSiteEditing', '__experimentalEnableFullSiteEditingDemo', - '__experimentalEnableRichImageEditing', '__experimentalFeatures', '__experimentalGlobalStylesUserEntityId', '__experimentalGlobalStylesBase',