From c99681695e6d18a6a00ff6778b6339266eebec77 Mon Sep 17 00:00:00 2001 From: ramon Date: Wed, 8 May 2024 12:58:56 +1000 Subject: [PATCH 1/2] Follow up to https://github.com/WordPress/gutenberg/pull/61387 - I missed a couple of source props --- lib/class-wp-theme-json-gutenberg.php | 1 - packages/style-engine/src/types.ts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/class-wp-theme-json-gutenberg.php b/lib/class-wp-theme-json-gutenberg.php index 46d7082912f537..1dec7b164d880b 100644 --- a/lib/class-wp-theme-json-gutenberg.php +++ b/lib/class-wp-theme-json-gutenberg.php @@ -320,7 +320,6 @@ class WP_Theme_JSON_Gutenberg { ), 'background-image' => array( array( 'background', 'backgroundImage', 'url' ), - array( 'background', 'backgroundImage', 'source' ), ), ); diff --git a/packages/style-engine/src/types.ts b/packages/style-engine/src/types.ts index 5b361836a8e375..fd18965a058f5f 100644 --- a/packages/style-engine/src/types.ts +++ b/packages/style-engine/src/types.ts @@ -23,7 +23,7 @@ export interface BorderIndividualStyles< T extends BoxEdge > { export interface Style { background?: { backgroundImage?: - | { url?: CSSProperties[ 'backgroundImage' ]; source?: string } + | { url?: CSSProperties[ 'backgroundImage' ] } | CSSProperties[ 'backgroundImage' ]; backgroundPosition?: CSSProperties[ 'backgroundPosition' ]; backgroundRepeat?: CSSProperties[ 'backgroundRepeat' ]; From 0badfed27e1e985d7c90e1440346f1419d2fef7f Mon Sep 17 00:00:00 2001 From: ramon Date: Wed, 8 May 2024 13:08:58 +1000 Subject: [PATCH 2/2] Actually let's keep the source type in the style engine for existing block code --- packages/style-engine/src/types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/style-engine/src/types.ts b/packages/style-engine/src/types.ts index fd18965a058f5f..5b361836a8e375 100644 --- a/packages/style-engine/src/types.ts +++ b/packages/style-engine/src/types.ts @@ -23,7 +23,7 @@ export interface BorderIndividualStyles< T extends BoxEdge > { export interface Style { background?: { backgroundImage?: - | { url?: CSSProperties[ 'backgroundImage' ] } + | { url?: CSSProperties[ 'backgroundImage' ]; source?: string } | CSSProperties[ 'backgroundImage' ]; backgroundPosition?: CSSProperties[ 'backgroundPosition' ]; backgroundRepeat?: CSSProperties[ 'backgroundRepeat' ];