From 2ab00520c16eaff8a7c12200781601ba80711534 Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@git.wordpress.org>
Date: Tue, 3 Dec 2024 13:36:07 -0500
Subject: [PATCH 01/31] Enhance admin UI with dominant color support.

Added inline CSS and JavaScript to display dominant colors and transparency in the WordPress admin area for attachment previews. This enhancement allows the media library to utilize dominant color and transparency data, providing visual feedback on image properties. Updated version to 1.1.2 to reflect these changes.
---
 plugins/dominant-color-images/hooks.php  | 84 ++++++++++++++++++++++++
 plugins/dominant-color-images/load.php   |  4 +-
 plugins/dominant-color-images/readme.txt |  8 ++-
 3 files changed, 93 insertions(+), 3 deletions(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index 1eb930dba0..bb41da22d4 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -193,3 +193,87 @@ function dominant_color_render_generator(): void {
 	echo '<meta name="generator" content="dominant-color-images ' . esc_attr( DOMINANT_COLOR_IMAGES_VERSION ) . '">' . "\n";
 }
 add_action( 'wp_head', 'dominant_color_render_generator' );
+
+
+
+
+/**
+ * Adds inline CSS for dominant color styling in the WordPress admin area.
+ *
+ * This function registers and enqueues a custom style handle, then adds inline CSS
+ * to apply background color based on the dominant color for attachment previews
+ * in the WordPress admin interface.
+ *
+ * @since 1.1.2
+ *
+ * @return void
+ */
+function dominant_color_admin_inline_style() {
+    $handle = 'dominant-color-admin-styles';
+    // PHPCS ignore reason: Version not used since this handle is only registered for adding an inline style.
+    // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
+    wp_register_style( $handle, false );
+    wp_enqueue_style( $handle );
+    $custom_css = '.wp-core-ui .attachment-preview[data-dominant-color]:not(.has-transparency) { background-color: var(--dominant-color); }';
+    wp_add_inline_style( $handle, $custom_css );
+};
+add_action( 'admin_enqueue_scripts', 'dominant_color_admin_inline_style' );
+
+/**
+ * Adds a script to the admin footer to modify the attachment template.
+ *
+ * This function injects a JavaScript snippet into the admin footer that modifies
+ * the attachment template. It adds attributes for dominant color and transparency
+ * to the template, allowing these properties to be displayed in the media library.
+ *
+ * @since 1.1.2
+ *
+ * @return void
+ */
+ function dominant_color_admin_script(){
+	?>
+	<script>
+		(function() {
+			var s = jQuery( '#tmpl-attachment' )
+			var n = s[0].innerText.replace( '{{ data.orientation }}"', '{{ data.orientation }} {{ data.hasTransparencyClass }}"	data-dominant-color="{{ data.dominantColor }}" data-has-transparency="{{ data.hasTransparency }}" style="--dominant-color: #{{ data.dominantColor }};"')
+			s.replaceWith( '<script type="text/html" id="tmpl-attachment">' + n  );
+		}());
+	</script>
+	<?php
+
+};
+add_action( 'admin_print_footer_scripts', 'dominant_color_admin_script', 1000  );
+
+
+/**
+ * Prepares attachment data for JavaScript, adding dominant color and transparency information.
+ *
+ * This function enhances the attachment data for JavaScript by including information about
+ * the dominant color and transparency of the image. It modifies the response array to include
+ * these additional properties, which can be used in the media library interface.
+ *
+ * @since 1.1.2
+ *
+ * @param array   $response   The current response array for the attachment.
+ * @param WP_Post $attachment The attachment post object.
+ * @param array   $meta       The attachment metadata.
+ *
+ * @return array The modified response array with added dominant color and transparency information.
+ */
+function dominant_color_prepare_attachment_for_js( $response, $attachment, $meta ) {
+	unset( $attachment );
+
+    $response['dominantColor'] = '';
+    if ( isset( $meta['dominant_color'] ) ) {
+        $response['dominantColor'] = $meta['dominant_color'];
+    }
+    $response['hasTransparency'] = '';
+    $response['hasTransparencyClass'] = '';
+    if ( isset( $meta['has_transparency'] ) ) {
+        $response['hasTransparency'] = $meta['has_transparency'];
+        $response['hasTransparencyClass'] = $meta['has_transparency'] ? 'has-transparency' : 'not-transparent';
+    }
+
+    return $response;
+};
+add_filter( 'wp_prepare_attachment_for_js', 'dominant_color_prepare_attachment_for_js', 10, 3  );
diff --git a/plugins/dominant-color-images/load.php b/plugins/dominant-color-images/load.php
index b505d94a8e..6f36b559eb 100644
--- a/plugins/dominant-color-images/load.php
+++ b/plugins/dominant-color-images/load.php
@@ -5,7 +5,7 @@
  * Description: Displays placeholders based on an image's dominant color while the image is loading.
  * Requires at least: 6.5
  * Requires PHP: 7.2
- * Version: 1.1.1
+ * Version: 1.1.2
  * Author: WordPress Performance Team
  * Author URI: https://make.wordpress.org/performance/
  * License: GPLv2 or later
@@ -25,7 +25,7 @@
 	return;
 }
 
-define( 'DOMINANT_COLOR_IMAGES_VERSION', '1.1.1' );
+define( 'DOMINANT_COLOR_IMAGES_VERSION', '1.1.2' );
 
 require_once __DIR__ . '/helper.php';
 require_once __DIR__ . '/hooks.php';
diff --git a/plugins/dominant-color-images/readme.txt b/plugins/dominant-color-images/readme.txt
index 88880c4c4d..a072724ddd 100644
--- a/plugins/dominant-color-images/readme.txt
+++ b/plugins/dominant-color-images/readme.txt
@@ -2,7 +2,7 @@
 
 Contributors: wordpressdotorg
 Tested up to: 6.6
-Stable tag:   1.1.1
+Stable tag:   1.1.2
 License:      GPLv2 or later
 License URI:  https://www.gnu.org/licenses/gpl-2.0.html
 Tags:         performance, images, dominant color
@@ -47,6 +47,12 @@ Contributions are always welcome! Learn more about how to get involved in the [C
 
 == Changelog ==
 
+= 1.1.2 =
+
+**Enhancements**
+
+* Added support for placeholder images to the admin Media Model. ([354](https://github.com/WordPress/performance/issues/354))
+
 = 1.1.1 =
 
 **Enhancements**

From f4b1d2856426b3ccd4f40c75b74326e1f4eb5603 Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@git.wordpress.org>
Date: Tue, 3 Dec 2024 13:40:16 -0500
Subject: [PATCH 02/31] Bump version to 1.1.3 for dominant color images plugin

Update version numbers and associated comments from 1.1.2 to 1.1.3 for consistency across the plugin files. This change ensures that the codebase reflects the correct version for recent updates or bug fixes included in this release.
---
 plugins/dominant-color-images/hooks.php | 6 +++---
 plugins/dominant-color-images/load.php  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index 3d1fe5fb10..2d571e19a6 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -197,7 +197,7 @@ function dominant_color_render_generator(): void {
  * to apply background color based on the dominant color for attachment previews
  * in the WordPress admin interface.
  *
- * @since 1.1.2
+ * @since 1.1.3
  *
  * @return void
  */
@@ -219,7 +219,7 @@ function dominant_color_admin_inline_style() {
  * the attachment template. It adds attributes for dominant color and transparency
  * to the template, allowing these properties to be displayed in the media library.
  *
- * @since 1.1.2
+ * @since 1.1.3
  *
  * @return void
  */
@@ -245,7 +245,7 @@ function dominant_color_admin_script(){
  * the dominant color and transparency of the image. It modifies the response array to include
  * these additional properties, which can be used in the media library interface.
  *
- * @since 1.1.2
+ * @since 1.1.3
  *
  * @param array   $response   The current response array for the attachment.
  * @param WP_Post $attachment The attachment post object.
diff --git a/plugins/dominant-color-images/load.php b/plugins/dominant-color-images/load.php
index e2e3c0c1bc..c85ef3ea7b 100644
--- a/plugins/dominant-color-images/load.php
+++ b/plugins/dominant-color-images/load.php
@@ -5,7 +5,7 @@
  * Description: Displays placeholders based on an image's dominant color while the image is loading.
  * Requires at least: 6.6
  * Requires PHP: 7.2
- * Version: 1.1.2
+ * Version: 1.1.3
  * Author: WordPress Performance Team
  * Author URI: https://make.wordpress.org/performance/
  * License: GPLv2 or later
@@ -25,7 +25,7 @@
 	return;
 }
 
-define( 'DOMINANT_COLOR_IMAGES_VERSION', '1.1.2' );
+define( 'DOMINANT_COLOR_IMAGES_VERSION', '1.1.3' );
 
 require_once __DIR__ . '/helper.php';
 require_once __DIR__ . '/hooks.php';

From d6d96e4b83b0119debb72da85e8205fc6a133998 Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@gmail.com>
Date: Tue, 3 Dec 2024 13:40:50 -0500
Subject: [PATCH 03/31] Update hooks.php

---
 plugins/dominant-color-images/hooks.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index 2d571e19a6..ee9a293d3b 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -187,9 +187,6 @@ function dominant_color_render_generator(): void {
 }
 add_action( 'wp_head', 'dominant_color_render_generator' );
 
-
-
-
 /**
  * Adds inline CSS for dominant color styling in the WordPress admin area.
  *
@@ -237,7 +234,6 @@ function dominant_color_admin_script(){
 };
 add_action( 'admin_print_footer_scripts', 'dominant_color_admin_script', 1000  );
 
-
 /**
  * Prepares attachment data for JavaScript, adding dominant color and transparency information.
  *

From 4abdda43e121bd5d1a136eeb494e2c1ed1d266f4 Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@git.wordpress.org>
Date: Tue, 3 Dec 2024 13:49:02 -0500
Subject: [PATCH 04/31] Fix code indentation and spacing issues

Corrected inconsistent indentation and spacing to improve code readability and maintainability in hooks.php. These changes ensure a cleaner code style without altering the functionality or logic.
---
 plugins/dominant-color-images/hooks.php | 42 ++++++++++++-------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index ee9a293d3b..dfb90170fc 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -200,12 +200,12 @@ function dominant_color_render_generator(): void {
  */
 function dominant_color_admin_inline_style() {
     $handle = 'dominant-color-admin-styles';
-    // PHPCS ignore reason: Version not used since this handle is only registered for adding an inline style.
-    // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
-    wp_register_style( $handle, false );
-    wp_enqueue_style( $handle );
-    $custom_css = '.wp-core-ui .attachment-preview[data-dominant-color]:not(.has-transparency) { background-color: var(--dominant-color); }';
-    wp_add_inline_style( $handle, $custom_css );
+	// PHPCS ignore reason: Version not used since this handle is only registered for adding an inline style.
+	// phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
+	wp_register_style( $handle, false );
+	wp_enqueue_style( $handle );
+	$custom_css = '.wp-core-ui .attachment-preview[data-dominant-color]:not(.has-transparency) { background-color: var(--dominant-color); }';
+	wp_add_inline_style( $handle, $custom_css );
 };
 add_action( 'admin_enqueue_scripts', 'dominant_color_admin_inline_style' );
 
@@ -220,7 +220,7 @@ function dominant_color_admin_inline_style() {
  *
  * @return void
  */
- function dominant_color_admin_script(){
+function dominant_color_admin_script() {
 	?>
 	<script>
 		(function() {
@@ -230,9 +230,8 @@ function dominant_color_admin_script(){
 		}());
 	</script>
 	<?php
-
 };
-add_action( 'admin_print_footer_scripts', 'dominant_color_admin_script', 1000  );
+add_action( 'admin_print_footer_scripts', 'dominant_color_admin_script', 1000 );
 
 /**
  * Prepares attachment data for JavaScript, adding dominant color and transparency information.
@@ -251,18 +250,17 @@ function dominant_color_admin_script(){
  */
 function dominant_color_prepare_attachment_for_js( $response, $attachment, $meta ) {
 	unset( $attachment );
+	$response['dominantColor'] = '';
+	if ( isset( $meta['dominant_color'] ) ) {
+		$response['dominantColor'] = $meta['dominant_color'];
+	}
+	$response['hasTransparency']      = '';
+	$response['hasTransparencyClass'] = '';
+	if ( isset( $meta['has_transparency'] ) ) {
+		$response['hasTransparency']      = $meta['has_transparency'];
+		$response['hasTransparencyClass'] = $meta['has_transparency'] ? 'has-transparency' : 'not-transparent';
+	}
 
-    $response['dominantColor'] = '';
-    if ( isset( $meta['dominant_color'] ) ) {
-        $response['dominantColor'] = $meta['dominant_color'];
-    }
-    $response['hasTransparency'] = '';
-    $response['hasTransparencyClass'] = '';
-    if ( isset( $meta['has_transparency'] ) ) {
-        $response['hasTransparency'] = $meta['has_transparency'];
-        $response['hasTransparencyClass'] = $meta['has_transparency'] ? 'has-transparency' : 'not-transparent';
-    }
-
-    return $response;
+	return $response;
 };
-add_filter( 'wp_prepare_attachment_for_js', 'dominant_color_prepare_attachment_for_js', 10, 3  );
+add_filter( 'wp_prepare_attachment_for_js', 'dominant_color_prepare_attachment_for_js', 10, 3 );

From 892e8dfbb370fdf9caa5ec24b8a498e39112a778 Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@git.wordpress.org>
Date: Tue, 3 Dec 2024 13:52:31 -0500
Subject: [PATCH 05/31] Fix code indentation and spacing issues

Corrected inconsistent indentation and spacing to improve code readability and maintainability in hooks.php. These changes ensure a cleaner code style without altering the functionality or logic.
---
 plugins/dominant-color-images/hooks.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index dfb90170fc..d3f838e111 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -199,14 +199,14 @@ function dominant_color_render_generator(): void {
  * @return void
  */
 function dominant_color_admin_inline_style() {
-    $handle = 'dominant-color-admin-styles';
+	$handle = 'dominant-color-admin-styles';
 	// PHPCS ignore reason: Version not used since this handle is only registered for adding an inline style.
 	// phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
 	wp_register_style( $handle, false );
 	wp_enqueue_style( $handle );
 	$custom_css = '.wp-core-ui .attachment-preview[data-dominant-color]:not(.has-transparency) { background-color: var(--dominant-color); }';
 	wp_add_inline_style( $handle, $custom_css );
-};
+}
 add_action( 'admin_enqueue_scripts', 'dominant_color_admin_inline_style' );
 
 /**
@@ -230,7 +230,7 @@ function dominant_color_admin_script() {
 		}());
 	</script>
 	<?php
-};
+}
 add_action( 'admin_print_footer_scripts', 'dominant_color_admin_script', 1000 );
 
 /**
@@ -245,7 +245,6 @@ function dominant_color_admin_script() {
  * @param array   $response   The current response array for the attachment.
  * @param WP_Post $attachment The attachment post object.
  * @param array   $meta       The attachment metadata.
- *
  * @return array The modified response array with added dominant color and transparency information.
  */
 function dominant_color_prepare_attachment_for_js( $response, $attachment, $meta ) {
@@ -262,5 +261,5 @@ function dominant_color_prepare_attachment_for_js( $response, $attachment, $meta
 	}
 
 	return $response;
-};
+}
 add_filter( 'wp_prepare_attachment_for_js', 'dominant_color_prepare_attachment_for_js', 10, 3 );

From 6de0355fa102c433423bf8ced6b773d179c1c730 Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@git.wordpress.org>
Date: Tue, 3 Dec 2024 13:56:17 -0500
Subject: [PATCH 06/31] Add return types to dominant color functions

This commit specifies return types for several functions in the dominant-color-images plugin. The `dominant_color_admin_inline_style` and `dominant_color_admin_script` functions now explicitly return void, and the `dominant_color_prepare_attachment_for_js` function now returns an array. Adding these return types improves code clarity and aligns with current PHP best practices.
---
 plugins/dominant-color-images/hooks.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index d3f838e111..c86376ca98 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -198,7 +198,7 @@ function dominant_color_render_generator(): void {
  *
  * @return void
  */
-function dominant_color_admin_inline_style() {
+function dominant_color_admin_inline_style(): void {
 	$handle = 'dominant-color-admin-styles';
 	// PHPCS ignore reason: Version not used since this handle is only registered for adding an inline style.
 	// phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
@@ -220,7 +220,7 @@ function dominant_color_admin_inline_style() {
  *
  * @return void
  */
-function dominant_color_admin_script() {
+function dominant_color_admin_script(): void {
 	?>
 	<script>
 		(function() {
@@ -247,7 +247,7 @@ function dominant_color_admin_script() {
  * @param array   $meta       The attachment metadata.
  * @return array The modified response array with added dominant color and transparency information.
  */
-function dominant_color_prepare_attachment_for_js( $response, $attachment, $meta ) {
+function dominant_color_prepare_attachment_for_js( array $response, WP_Post $attachment, array $meta ): array {
 	unset( $attachment );
 	$response['dominantColor'] = '';
 	if ( isset( $meta['dominant_color'] ) ) {

From 7e1e2b3f6ad41ff73b3c74a7dacdc0114396a4ce Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@git.wordpress.org>
Date: Tue, 3 Dec 2024 13:58:26 -0500
Subject: [PATCH 07/31] Remove unnecessary return void annotations

The @return void annotations were removed from the PHPDoc comments in two functions within the hooks.php file. These annotations were redundant, as the functions' return types are already declared with "void" in the function signatures. This cleanup enhances the readability and maintains consistency across the codebase.
---
 plugins/dominant-color-images/hooks.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index c86376ca98..865de36d81 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -195,8 +195,6 @@ function dominant_color_render_generator(): void {
  * in the WordPress admin interface.
  *
  * @since 1.1.3
- *
- * @return void
  */
 function dominant_color_admin_inline_style(): void {
 	$handle = 'dominant-color-admin-styles';
@@ -217,8 +215,6 @@ function dominant_color_admin_inline_style(): void {
  * to the template, allowing these properties to be displayed in the media library.
  *
  * @since 1.1.3
- *
- * @return void
  */
 function dominant_color_admin_script(): void {
 	?>

From 63070c1cf56f321a28e10c527229e81c8361dc63 Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@git.wordpress.org>
Date: Tue, 3 Dec 2024 14:09:18 -0500
Subject: [PATCH 08/31] Refactor type hints in function docblock.

Updated the function docblock type hints for arrays to use generics, enhancing code clarity and consistency. This change does not affect functionality but improves the readability and maintenance of the codebase.
---
 plugins/dominant-color-images/hooks.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index 865de36d81..6f821d2534 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -238,9 +238,9 @@ function dominant_color_admin_script(): void {
  *
  * @since 1.1.3
  *
- * @param array   $response   The current response array for the attachment.
- * @param WP_Post $attachment The attachment post object.
- * @param array   $meta       The attachment metadata.
+ * @param array<mixed> $response   The current response array for the attachment.
+ * @param WP_Post      $attachment The attachment post object.
+ * @param array<mixed> $meta       The attachment metadata.
  * @return array The modified response array with added dominant color and transparency information.
  */
 function dominant_color_prepare_attachment_for_js( array $response, WP_Post $attachment, array $meta ): array {

From 03d933364c443f6f87a1673c2c4f558cffbbd7b6 Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@git.wordpress.org>
Date: Tue, 3 Dec 2024 14:41:33 -0500
Subject: [PATCH 09/31] Refactor type hints in function docblock.

Updated the function docblock type hints for arrays to use generics, enhancing code clarity and consistency. This change does not affect functionality but improves the readability and maintenance of the codebase.
---
 plugins/dominant-color-images/hooks.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index 6f821d2534..93f355ca74 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -241,7 +241,7 @@ function dominant_color_admin_script(): void {
  * @param array<mixed> $response   The current response array for the attachment.
  * @param WP_Post      $attachment The attachment post object.
  * @param array<mixed> $meta       The attachment metadata.
- * @return array The modified response array with added dominant color and transparency information.
+ * @return array<mixed> The modified response array with added dominant color and transparency information.
  */
 function dominant_color_prepare_attachment_for_js( array $response, WP_Post $attachment, array $meta ): array {
 	unset( $attachment );

From 3e6ff292158c8238e359188089ac9b4902c6e045 Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@git.wordpress.org>
Date: Wed, 4 Dec 2024 18:40:09 -0500
Subject: [PATCH 10/31] Ensure correct color and attribute sanitization.

Updated the dominant color and transparency properties in hooks.php to use proper sanitization functions. This change helps prevent potential issues with unsanitized data affecting the media library display. Also, adjusted version references for an upcoming release.
---
 plugins/dominant-color-images/hooks.php  | 14 +++++++-------
 plugins/dominant-color-images/readme.txt |  6 ------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index 93f355ca74..936aac6745 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -194,7 +194,7 @@ function dominant_color_render_generator(): void {
  * to apply background color based on the dominant color for attachment previews
  * in the WordPress admin interface.
  *
- * @since 1.1.3
+ * @since n.e.x.t
  */
 function dominant_color_admin_inline_style(): void {
 	$handle = 'dominant-color-admin-styles';
@@ -214,7 +214,7 @@ function dominant_color_admin_inline_style(): void {
  * the attachment template. It adds attributes for dominant color and transparency
  * to the template, allowing these properties to be displayed in the media library.
  *
- * @since 1.1.3
+ * @since n.e.x.t
  */
 function dominant_color_admin_script(): void {
 	?>
@@ -236,7 +236,7 @@ function dominant_color_admin_script(): void {
  * the dominant color and transparency of the image. It modifies the response array to include
  * these additional properties, which can be used in the media library interface.
  *
- * @since 1.1.3
+ * @since n.e.x.t
  *
  * @param array<mixed> $response   The current response array for the attachment.
  * @param WP_Post      $attachment The attachment post object.
@@ -244,15 +244,15 @@ function dominant_color_admin_script(): void {
  * @return array<mixed> The modified response array with added dominant color and transparency information.
  */
 function dominant_color_prepare_attachment_for_js( array $response, WP_Post $attachment, array $meta ): array {
-	unset( $attachment );
+
 	$response['dominantColor'] = '';
-	if ( isset( $meta['dominant_color'] ) ) {
-		$response['dominantColor'] = $meta['dominant_color'];
+	if ( isset( $meta['dominant_color'] ) && str_contains( '#', $meta['dominant_color'] ) ) {
+		$response['dominantColor'] = sanitize_hex_color( $meta['dominant_color'] );
 	}
 	$response['hasTransparency']      = '';
 	$response['hasTransparencyClass'] = '';
 	if ( isset( $meta['has_transparency'] ) ) {
-		$response['hasTransparency']      = $meta['has_transparency'];
+		$response['hasTransparency']      = esc_attr( $meta['has_transparency'] );
 		$response['hasTransparencyClass'] = $meta['has_transparency'] ? 'has-transparency' : 'not-transparent';
 	}
 
diff --git a/plugins/dominant-color-images/readme.txt b/plugins/dominant-color-images/readme.txt
index 5855281085..037d49466f 100644
--- a/plugins/dominant-color-images/readme.txt
+++ b/plugins/dominant-color-images/readme.txt
@@ -47,12 +47,6 @@ Contributions are always welcome! Learn more about how to get involved in the [C
 
 == Changelog ==
 
-= 1.1.3 =
-
-**Enhancements**
-
-* Added support for placeholder images to the admin Media Model. ([354](https://github.com/WordPress/performance/issues/354))
-
 = 1.1.2 =
 
 **Enhancements**

From 6cc5cfadcd42ee8fb9e24c5a7cdc2fcb94daf916 Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@gmail.com>
Date: Fri, 6 Dec 2024 10:54:46 -0500
Subject: [PATCH 11/31] Update plugins/dominant-color-images/load.php

Co-authored-by: Weston Ruter <westonruter@google.com>
---
 plugins/dominant-color-images/load.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dominant-color-images/load.php b/plugins/dominant-color-images/load.php
index c85ef3ea7b..322117e434 100644
--- a/plugins/dominant-color-images/load.php
+++ b/plugins/dominant-color-images/load.php
@@ -5,7 +5,7 @@
  * Description: Displays placeholders based on an image's dominant color while the image is loading.
  * Requires at least: 6.6
  * Requires PHP: 7.2
- * Version: 1.1.3
+ * Version: 1.1.2
  * Author: WordPress Performance Team
  * Author URI: https://make.wordpress.org/performance/
  * License: GPLv2 or later

From 1e528983e2267e7d6500bed1aeed5052f578373c Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@gmail.com>
Date: Fri, 6 Dec 2024 10:54:55 -0500
Subject: [PATCH 12/31] Update plugins/dominant-color-images/load.php

Co-authored-by: Weston Ruter <westonruter@google.com>
---
 plugins/dominant-color-images/load.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dominant-color-images/load.php b/plugins/dominant-color-images/load.php
index 322117e434..e2e3c0c1bc 100644
--- a/plugins/dominant-color-images/load.php
+++ b/plugins/dominant-color-images/load.php
@@ -25,7 +25,7 @@
 	return;
 }
 
-define( 'DOMINANT_COLOR_IMAGES_VERSION', '1.1.3' );
+define( 'DOMINANT_COLOR_IMAGES_VERSION', '1.1.2' );
 
 require_once __DIR__ . '/helper.php';
 require_once __DIR__ . '/hooks.php';

From 6dd0272a60062be7ab25cce97755e5fc40dff4eb Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@gmail.com>
Date: Fri, 6 Dec 2024 10:55:01 -0500
Subject: [PATCH 13/31] Update plugins/dominant-color-images/readme.txt

Co-authored-by: Weston Ruter <westonruter@google.com>
---
 plugins/dominant-color-images/readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dominant-color-images/readme.txt b/plugins/dominant-color-images/readme.txt
index 037d49466f..b639dc4e53 100644
--- a/plugins/dominant-color-images/readme.txt
+++ b/plugins/dominant-color-images/readme.txt
@@ -2,7 +2,7 @@
 
 Contributors: wordpressdotorg
 Tested up to: 6.7
-Stable tag:   1.1.3
+Stable tag:   1.1.2
 License:      GPLv2 or later
 License URI:  https://www.gnu.org/licenses/gpl-2.0.html
 Tags:         performance, images, dominant color

From bcd40c84d342dd613ad660a69836c6b92bb16ac5 Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@gmail.com>
Date: Fri, 6 Dec 2024 10:55:09 -0500
Subject: [PATCH 14/31] Update plugins/dominant-color-images/hooks.php

Co-authored-by: Weston Ruter <westonruter@google.com>
---
 plugins/dominant-color-images/hooks.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index 936aac6745..d576dc9a35 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -252,7 +252,7 @@ function dominant_color_prepare_attachment_for_js( array $response, WP_Post $att
 	$response['hasTransparency']      = '';
 	$response['hasTransparencyClass'] = '';
 	if ( isset( $meta['has_transparency'] ) ) {
-		$response['hasTransparency']      = esc_attr( $meta['has_transparency'] );
+		$response['hasTransparency']      = (bool) $meta['has_transparency'];
 		$response['hasTransparencyClass'] = $meta['has_transparency'] ? 'has-transparency' : 'not-transparent';
 	}
 

From 713532e90e2afe2c7308c85521a0735d504f49cb Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@gmail.com>
Date: Fri, 6 Dec 2024 10:55:32 -0500
Subject: [PATCH 15/31] Update plugins/dominant-color-images/hooks.php

Co-authored-by: Weston Ruter <westonruter@google.com>
---
 plugins/dominant-color-images/hooks.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index d576dc9a35..b366c12af2 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -238,12 +238,15 @@ function dominant_color_admin_script(): void {
  *
  * @since n.e.x.t
  *
- * @param array<mixed> $response   The current response array for the attachment.
- * @param WP_Post      $attachment The attachment post object.
- * @param array<mixed> $meta       The attachment metadata.
+ * @param array<mixed>|mixed $response   The current response array for the attachment.
+ * @param WP_Post            $attachment The attachment post object.
+ * @param array<mixed>       $meta       The attachment metadata.
  * @return array<mixed> The modified response array with added dominant color and transparency information.
  */
-function dominant_color_prepare_attachment_for_js( array $response, WP_Post $attachment, array $meta ): array {
+function dominant_color_prepare_attachment_for_js( $response, WP_Post $attachment, array $meta ): array {
+	if ( ! is_array( $response ) ) {
+		$response = array();
+	}
 
 	$response['dominantColor'] = '';
 	if ( isset( $meta['dominant_color'] ) && str_contains( '#', $meta['dominant_color'] ) ) {

From ed64c9bc9f49dc75382307ec051132b630bcf635 Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@git.wordpress.org>
Date: Fri, 6 Dec 2024 10:58:58 -0500
Subject: [PATCH 16/31] Refactor transparency class assignment logic

Reorganize the logic for assigning the transparency class name by moving it from the server-side to the client-side script. This change improves code clarity by handling conditional class name assignments directly within the client-side context, thereby simplifying the server-side response handling.
---
 plugins/dominant-color-images/hooks.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index b366c12af2..2891fd4746 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -221,7 +221,8 @@ function dominant_color_admin_script(): void {
 	<script>
 		(function() {
 			var s = jQuery( '#tmpl-attachment' )
-			var n = s[0].innerText.replace( '{{ data.orientation }}"', '{{ data.orientation }} {{ data.hasTransparencyClass }}"	data-dominant-color="{{ data.dominantColor }}" data-has-transparency="{{ data.hasTransparency }}" style="--dominant-color: #{{ data.dominantColor }};"')
+			var transparencyClassName = 'true' === data.hasTransparency ? 'has-transparency' : 'not-transparent';
+			var n = s[0].innerText.replace( '{{ data.orientation }}"', '{{ data.orientation }} {{ transparencyClassName }}"	data-dominant-color="{{ data.dominantColor }}" data-has-transparency="{{ data.hasTransparency }}" style="--dominant-color: #{{ data.dominantColor }};"')
 			s.replaceWith( '<script type="text/html" id="tmpl-attachment">' + n  );
 		}());
 	</script>
@@ -256,7 +257,6 @@ function dominant_color_prepare_attachment_for_js( $response, WP_Post $attachmen
 	$response['hasTransparencyClass'] = '';
 	if ( isset( $meta['has_transparency'] ) ) {
 		$response['hasTransparency']      = (bool) $meta['has_transparency'];
-		$response['hasTransparencyClass'] = $meta['has_transparency'] ? 'has-transparency' : 'not-transparent';
 	}
 
 	return $response;

From 5dfd56eceafb8ec6651b282389f3606f1c08a274 Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@git.wordpress.org>
Date: Fri, 6 Dec 2024 11:01:43 -0500
Subject: [PATCH 17/31] Fix inconsistent spacing in hooks.php file

Remove unnecessary whitespace around the assignment operator in the 'hasTransparency' key modification. This change ensures code consistency and readability in the dominant-color-images plugin.
---
 plugins/dominant-color-images/hooks.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index 2891fd4746..bf13d1dfae 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -256,7 +256,7 @@ function dominant_color_prepare_attachment_for_js( $response, WP_Post $attachmen
 	$response['hasTransparency']      = '';
 	$response['hasTransparencyClass'] = '';
 	if ( isset( $meta['has_transparency'] ) ) {
-		$response['hasTransparency']      = (bool) $meta['has_transparency'];
+		$response['hasTransparency'] = (bool) $meta['has_transparency'];
 	}
 
 	return $response;

From 2f46b74487391bb8af779e5fb8c053be12bd3bc1 Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@gmail.com>
Date: Mon, 9 Dec 2024 09:35:44 -0500
Subject: [PATCH 18/31] Update plugins/dominant-color-images/hooks.php

Co-authored-by: Weston Ruter <westonruter@google.com>
---
 plugins/dominant-color-images/hooks.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index bf13d1dfae..cad357d0a1 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -222,7 +222,7 @@ function dominant_color_admin_script(): void {
 		(function() {
 			var s = jQuery( '#tmpl-attachment' )
 			var transparencyClassName = 'true' === data.hasTransparency ? 'has-transparency' : 'not-transparent';
-			var n = s[0].innerText.replace( '{{ data.orientation }}"', '{{ data.orientation }} {{ transparencyClassName }}"	data-dominant-color="{{ data.dominantColor }}" data-has-transparency="{{ data.hasTransparency }}" style="--dominant-color: #{{ data.dominantColor }};"')
+			var n = s[0].innerText.replace( '{{ data.orientation }}"', '{{ data.orientation }} {{ data.hasTransparency ? 'has-transparency' : 'not-transparent' }}"	data-dominant-color="{{ data.dominantColor }}" data-has-transparency="{{ data.hasTransparency }}" style="--dominant-color: #{{ data.dominantColor }};"')
 			s.replaceWith( '<script type="text/html" id="tmpl-attachment">' + n  );
 		}());
 	</script>

From 6bc708a6af95dc76b6dc4ba2198b27051b8bcda8 Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@gmail.com>
Date: Mon, 9 Dec 2024 09:36:13 -0500
Subject: [PATCH 19/31] Update plugins/dominant-color-images/hooks.php

Co-authored-by: Weston Ruter <westonruter@google.com>
---
 plugins/dominant-color-images/hooks.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index cad357d0a1..d96026edcb 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -250,7 +250,7 @@ function dominant_color_prepare_attachment_for_js( $response, WP_Post $attachmen
 	}
 
 	$response['dominantColor'] = '';
-	if ( isset( $meta['dominant_color'] ) && str_contains( '#', $meta['dominant_color'] ) ) {
+	if ( isset( $meta['dominant_color'] ) && str_starts_with( '#', $meta['dominant_color'] ) ) {
 		$response['dominantColor'] = sanitize_hex_color( $meta['dominant_color'] );
 	}
 	$response['hasTransparency']      = '';

From bd2d72f7298bdcebc1dd629ab934c3fb4d9809b9 Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@gmail.com>
Date: Mon, 9 Dec 2024 09:39:48 -0500
Subject: [PATCH 20/31] Update hooks.php

cleaner JS code
---
 plugins/dominant-color-images/hooks.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index d96026edcb..6b8947d429 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -218,13 +218,14 @@ function dominant_color_admin_inline_style(): void {
  */
 function dominant_color_admin_script(): void {
 	?>
-	<script>
-		(function() {
-			var s = jQuery( '#tmpl-attachment' )
-			var transparencyClassName = 'true' === data.hasTransparency ? 'has-transparency' : 'not-transparent';
-			var n = s[0].innerText.replace( '{{ data.orientation }}"', '{{ data.orientation }} {{ data.hasTransparency ? 'has-transparency' : 'not-transparent' }}"	data-dominant-color="{{ data.dominantColor }}" data-has-transparency="{{ data.hasTransparency }}" style="--dominant-color: #{{ data.dominantColor }};"')
-			s.replaceWith( '<script type="text/html" id="tmpl-attachment">' + n  );
-		}());
+	<script type="module">
+		const tmpl = document.getElementById( 'tmpl-attachment' );
+		if ( tmpl ) {
+			tmpl.textContent = tmpl.textContent.replace(
+				'{{ data.orientation }}"',
+				'{{ data.orientation }} {{ data.hasTransparency ? \'has-transparency\' : \'not-transparent\' }}"	data-dominant-color="{{ data.dominantColor }}" data-has-transparency="{{ data.hasTransparency }}" style="--dominant-color: #{{ data.dominantColor }};"'
+			);
+		}
 	</script>
 	<?php
 }

From 89c62b3a9a75d2e4b78c1a09e289503c7ee5a4dd Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@gmail.com>
Date: Tue, 10 Dec 2024 17:36:13 -0500
Subject: [PATCH 21/31] Update plugins/dominant-color-images/hooks.php

Co-authored-by: Weston Ruter <westonruter@google.com>
---
 plugins/dominant-color-images/hooks.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index 6b8947d429..1e7e58e1aa 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -229,7 +229,7 @@ function dominant_color_admin_script(): void {
 	</script>
 	<?php
 }
-add_action( 'admin_print_footer_scripts', 'dominant_color_admin_script', 1000 );
+add_action( 'admin_print_footer_scripts', 'dominant_color_admin_script' );
 
 /**
  * Prepares attachment data for JavaScript, adding dominant color and transparency information.

From 9d89c4411cc33b6540027dfc01fb5c67f6c36ae3 Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@gmail.com>
Date: Tue, 10 Dec 2024 17:36:45 -0500
Subject: [PATCH 22/31] Update plugins/dominant-color-images/hooks.php

Co-authored-by: Weston Ruter <westonruter@google.com>
---
 plugins/dominant-color-images/hooks.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index 1e7e58e1aa..14d05ecb3c 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -221,10 +221,13 @@ function dominant_color_admin_script(): void {
 	<script type="module">
 		const tmpl = document.getElementById( 'tmpl-attachment' );
 		if ( tmpl ) {
-			tmpl.textContent = tmpl.textContent.replace(
-				'{{ data.orientation }}"',
-				'{{ data.orientation }} {{ data.hasTransparency ? \'has-transparency\' : \'not-transparent\' }}"	data-dominant-color="{{ data.dominantColor }}" data-has-transparency="{{ data.hasTransparency }}" style="--dominant-color: #{{ data.dominantColor }};"'
-			);
+		tmpl.textContent = tmpl.textContent.replace( /^\s*<div[^>]*?(?=>)/, ( match ) => {
+			let replaced = match.replace( /\sclass="/, " class=\"{{ data.hasTransparency ? \'has-transparency\' : \'not-transparent\' }} " );
+			replaced += ' data-dominant-color="{{ data.dominantColor }}"';
+			replaced += ' data-has-transparency="{{ data.hasTransparency }}"';
+			replaced += ' style="--dominant-color: #{{ data.dominantColor }};"'; // TODO: Potentially there could be a style attribute as well!
+			return replaced;
+		} );
 		}
 	</script>
 	<?php

From bafba80034e4da43c477d8bc0082b3fbd44bbd77 Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@gmail.com>
Date: Wed, 11 Dec 2024 09:07:15 -0500
Subject: [PATCH 23/31] Update plugins/dominant-color-images/hooks.php

Co-authored-by: Weston Ruter <westonruter@google.com>
---
 plugins/dominant-color-images/hooks.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index 14d05ecb3c..f97cf1dc49 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -221,13 +221,13 @@ function dominant_color_admin_script(): void {
 	<script type="module">
 		const tmpl = document.getElementById( 'tmpl-attachment' );
 		if ( tmpl ) {
-		tmpl.textContent = tmpl.textContent.replace( /^\s*<div[^>]*?(?=>)/, ( match ) => {
-			let replaced = match.replace( /\sclass="/, " class=\"{{ data.hasTransparency ? \'has-transparency\' : \'not-transparent\' }} " );
-			replaced += ' data-dominant-color="{{ data.dominantColor }}"';
-			replaced += ' data-has-transparency="{{ data.hasTransparency }}"';
-			replaced += ' style="--dominant-color: #{{ data.dominantColor }};"'; // TODO: Potentially there could be a style attribute as well!
-			return replaced;
-		} );
+			tmpl.textContent = tmpl.textContent.replace( /^\s*<div[^>]*?(?=>)/, ( match ) => {
+				let replaced = match.replace( /\sclass="/, " class=\"{{ data.hasTransparency ? \'has-transparency\' : \'not-transparent\' }} " );
+				replaced += ' data-dominant-color="{{ data.dominantColor }}"';
+				replaced += ' data-has-transparency="{{ data.hasTransparency }}"';
+				replaced += ' style="--dominant-color: #{{ data.dominantColor }};"'; // TODO: Potentially there could be a style attribute as well!
+				return replaced;
+			} );
 		}
 	</script>
 	<?php

From 07c1026a8e6f772228c03411918b1ea38537452d Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@gmail.com>
Date: Wed, 11 Dec 2024 09:08:31 -0500
Subject: [PATCH 24/31] Update hooks.php

---
 plugins/dominant-color-images/hooks.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index f97cf1dc49..d31bc6af01 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -258,7 +258,6 @@ function dominant_color_prepare_attachment_for_js( $response, WP_Post $attachmen
 		$response['dominantColor'] = sanitize_hex_color( $meta['dominant_color'] );
 	}
 	$response['hasTransparency']      = '';
-	$response['hasTransparencyClass'] = '';
 	if ( isset( $meta['has_transparency'] ) ) {
 		$response['hasTransparency'] = (bool) $meta['has_transparency'];
 	}

From c58a3556e7dc0f8dfe5c237432263b80c4ecb546 Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@gmail.com>
Date: Thu, 12 Dec 2024 08:20:27 -0500
Subject: [PATCH 25/31] Update plugins/dominant-color-images/hooks.php

Co-authored-by: Weston Ruter <westonruter@google.com>
---
 plugins/dominant-color-images/hooks.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index d31bc6af01..3b9520afeb 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -257,7 +257,7 @@ function dominant_color_prepare_attachment_for_js( $response, WP_Post $attachmen
 	if ( isset( $meta['dominant_color'] ) && str_starts_with( '#', $meta['dominant_color'] ) ) {
 		$response['dominantColor'] = sanitize_hex_color( $meta['dominant_color'] );
 	}
-	$response['hasTransparency']      = '';
+	$response['hasTransparency'] = '';
 	if ( isset( $meta['has_transparency'] ) ) {
 		$response['hasTransparency'] = (bool) $meta['has_transparency'];
 	}

From 3f96e3ff68ee1d40498d3b1f5d75db658ac49fd0 Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@gmail.com>
Date: Thu, 12 Dec 2024 17:27:20 -0500
Subject: [PATCH 26/31] Update plugins/dominant-color-images/hooks.php

Co-authored-by: Weston Ruter <westonruter@google.com>
---
 plugins/dominant-color-images/hooks.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index 3b9520afeb..d49058c991 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -225,7 +225,15 @@ function dominant_color_admin_script(): void {
 				let replaced = match.replace( /\sclass="/, " class=\"{{ data.hasTransparency ? \'has-transparency\' : \'not-transparent\' }} " );
 				replaced += ' data-dominant-color="{{ data.dominantColor }}"';
 				replaced += ' data-has-transparency="{{ data.hasTransparency }}"';
-				replaced += ' style="--dominant-color: #{{ data.dominantColor }};"'; // TODO: Potentially there could be a style attribute as well!
+				let hasStyleAttr = false;
+				const colorStyle = '--dominant-color: #{{ data.dominantColor }};';
+				replaced = replaced.replace( /\sstyle="/, ( styleMatch ) => {
+					hasStyleAttr = true;
+					return styleMatch + colorStyle;
+				} );
+				if ( ! hasStyleAttr ) {
+					replaced += ` style="${colorStyle}"`;
+				}
 				return replaced;
 			} );
 		}

From be572252dbf6e18701d7791bfd64c87b3baed0e7 Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Fri, 13 Dec 2024 11:05:34 -0800
Subject: [PATCH 27/31] Combine comments

---
 plugins/dominant-color-images/hooks.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index d49058c991..94b27b140a 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -198,8 +198,7 @@ function dominant_color_render_generator(): void {
  */
 function dominant_color_admin_inline_style(): void {
 	$handle = 'dominant-color-admin-styles';
-	// PHPCS ignore reason: Version not used since this handle is only registered for adding an inline style.
-	// phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
+	// phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion -- Version not used since this handle is only registered for adding an inline style.
 	wp_register_style( $handle, false );
 	wp_enqueue_style( $handle );
 	$custom_css = '.wp-core-ui .attachment-preview[data-dominant-color]:not(.has-transparency) { background-color: var(--dominant-color); }';

From 6c3f1aef5ff44cfc7d294b22fb13c644c3d316bc Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Fri, 13 Dec 2024 11:31:52 -0800
Subject: [PATCH 28/31] Account for dominant_color not being prefixed by hash

---
 plugins/dominant-color-images/hooks.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index 94b27b140a..e48044d545 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -261,14 +261,20 @@ function dominant_color_prepare_attachment_for_js( $response, WP_Post $attachmen
 	}
 
 	$response['dominantColor'] = '';
-	if ( isset( $meta['dominant_color'] ) && str_starts_with( '#', $meta['dominant_color'] ) ) {
-		$response['dominantColor'] = sanitize_hex_color( $meta['dominant_color'] );
+	if (
+		isset( $meta['dominant_color'] )
+		&&
+		1 === preg_match( '/^[0-9A-F]+$/', $meta['dominant_color'] ) // See format returned by dominant_color_rgb_to_hex().
+	) {
+		$response['dominantColor'] = $meta['dominant_color'];
 	}
 	$response['hasTransparency'] = '';
 	if ( isset( $meta['has_transparency'] ) ) {
 		$response['hasTransparency'] = (bool) $meta['has_transparency'];
 	}
 
+	$response['testMeta'] = $meta;
+
 	return $response;
 }
 add_filter( 'wp_prepare_attachment_for_js', 'dominant_color_prepare_attachment_for_js', 10, 3 );

From e4fb28f4e0ac43bf0701ed4b52fda3d0d8c7970f Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Fri, 13 Dec 2024 11:40:58 -0800
Subject: [PATCH 29/31] Avoid printing --dominant-color style when there is no
 dominant color

---
 plugins/dominant-color-images/hooks.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index e48044d545..dd35052db8 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -221,11 +221,11 @@ function dominant_color_admin_script(): void {
 		const tmpl = document.getElementById( 'tmpl-attachment' );
 		if ( tmpl ) {
 			tmpl.textContent = tmpl.textContent.replace( /^\s*<div[^>]*?(?=>)/, ( match ) => {
-				let replaced = match.replace( /\sclass="/, " class=\"{{ data.hasTransparency ? \'has-transparency\' : \'not-transparent\' }} " );
+				let replaced = match.replace( /\sclass="/, " class=\"{{ data.hasTransparency ? 'has-transparency' : 'not-transparent' }} " );
 				replaced += ' data-dominant-color="{{ data.dominantColor }}"';
 				replaced += ' data-has-transparency="{{ data.hasTransparency }}"';
 				let hasStyleAttr = false;
-				const colorStyle = '--dominant-color: #{{ data.dominantColor }};';
+				const colorStyle = "{{ data.dominantColor ? '--dominant-color: #' + data.dominantColor + ';' : '' }}";
 				replaced = replaced.replace( /\sstyle="/, ( styleMatch ) => {
 					hasStyleAttr = true;
 					return styleMatch + colorStyle;

From 92553f2743e8b27cbf190f62d8e87fe62dad1e11 Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Fri, 13 Dec 2024 11:47:43 -0800
Subject: [PATCH 30/31] Fix regex for dominant_color

---
 plugins/dominant-color-images/hooks.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index dd35052db8..c411909e59 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -264,7 +264,7 @@ function dominant_color_prepare_attachment_for_js( $response, WP_Post $attachmen
 	if (
 		isset( $meta['dominant_color'] )
 		&&
-		1 === preg_match( '/^[0-9A-F]+$/', $meta['dominant_color'] ) // See format returned by dominant_color_rgb_to_hex().
+		1 === preg_match( '/^[0-9a-f]+$/', $meta['dominant_color'] ) // See format returned by dominant_color_rgb_to_hex().
 	) {
 		$response['dominantColor'] = $meta['dominant_color'];
 	}
@@ -273,8 +273,6 @@ function dominant_color_prepare_attachment_for_js( $response, WP_Post $attachmen
 		$response['hasTransparency'] = (bool) $meta['has_transparency'];
 	}
 
-	$response['testMeta'] = $meta;
-
 	return $response;
 }
 add_filter( 'wp_prepare_attachment_for_js', 'dominant_color_prepare_attachment_for_js', 10, 3 );

From 2da00d76803ff11bcc450e773caa16fd6cf975b4 Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Fri, 13 Dec 2024 12:00:28 -0800
Subject: [PATCH 31/31] Add reference to related core function

---
 plugins/dominant-color-images/hooks.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/dominant-color-images/hooks.php b/plugins/dominant-color-images/hooks.php
index c411909e59..a841a6f1f0 100644
--- a/plugins/dominant-color-images/hooks.php
+++ b/plugins/dominant-color-images/hooks.php
@@ -214,6 +214,7 @@ function dominant_color_admin_inline_style(): void {
  * to the template, allowing these properties to be displayed in the media library.
  *
  * @since n.e.x.t
+ * @see wp_print_media_templates()
  */
 function dominant_color_admin_script(): void {
 	?>