Changeset 58693 for trunk/src/wp-includes/blocks/image.php

Timestamp:

07/09/2024 01:43:14 PM (17 months ago)

Author:

ellatrix

Message:

Editor: Update packages for 6.6 RC 3.

Fixes #61603.
Fixes ​https://github.com/WordPress/wordpress-develop/pull/6998.
See ​https://make.wordpress.org/core/handbook/about/release-cycle/block-editor-release-process-for-major-releases/#package-updates-and-core-patches.

Props ellatrix, youknowriad.

File:

• trunk/src/wp-includes/blocks/image.php (modified) (1 diff)

trunk/src/wp-includes/blocks/image.php

@@ -29 +29 @@
     }
 
+    $has_id_binding = isset( $attributes['metadata']['bindings']['id'] ) && isset( $attributes['id'] );
+
+    // Ensure the `wp-image-id` classname on the image block supports block bindings.
+    if ( $has_id_binding ) {
+        // If there's a mismatch with the 'wp-image-' class and the actual id, the id was
+        // probably overridden by block bindings. Update it to the correct value.
+        // See https://github.com/WordPress/gutenberg/issues/62886 for why this is needed.
+        $id                       = $attributes['id'];
+        $image_classnames         = $p->get_attribute( 'class' );
+        $class_with_binding_value = "wp-image-$id";
+        if ( is_string( $image_classnames ) && ! str_contains( $image_classnames, $class_with_binding_value ) ) {
+            $image_classnames = preg_replace( '/wp-image-(\d+)/', $class_with_binding_value, $image_classnames );
+            $p->set_attribute( 'class', $image_classnames );
+        }
+    }
+
+    // For backwards compatibility, the data-id html attribute is only set for
+    // image blocks nested in a gallery. Detect if the image is in a gallery by
+    // checking the data-id attribute.
+    // See the `block_core_gallery_data_id_backcompatibility` function.
     if ( isset( $attributes['data-id'] ) ) {
-        // Adds the data-id="$id" attribute to the img element to provide backwards
-        // compatibility for the Gallery Block, which now wraps Image Blocks within
-        // innerBlocks. The data-id attribute is added in a core/gallery
-        // `render_block_data` hook.
-        $p->set_attribute( 'data-id', $attributes['data-id'] );
+        // If there's a binding for the `id`, the `id` attribute is used for the
+        // value, since `data-id` does not support block bindings.
+        // Else the `data-id` is used for backwards compatibility, since
+        // third parties may be filtering its value.
+        $data_id = $has_id_binding ? $attributes['id'] : $attributes['data-id'];
+        $p->set_attribute( 'data-id', $data_id );
     }