Merge branch 'development' into bugfix/2373

Codeinwp · Oct 3, 2024 · ba8673b · ba8673b
2 parents e6fb693 + cae7c91
commit ba8673b
Show file tree

Hide file tree

Showing 7 changed files with 455 additions and 147 deletions.
diff --git a/.github/workflows/build-size.yml b/.github/workflows/build-size.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Build files
         run: npm run analyzer
       - name: Upload base stats.json
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: base
           path: ./build/**/stats.json
@@ -63,7 +63,7 @@ jobs:
       - name: Build files
         run: npm run analyzer
       - name: Upload base stats.json
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pr
           path: ./build/**/stats.json
@@ -78,12 +78,12 @@ jobs:
       - name: Checkout PR
         uses: actions/checkout@v2
       - name: Download base stats
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: base
           path: base
       - name: Download PR stats
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: pr
           path: pr

diff --git a/.github/workflows/e2e-js.yml b/.github/workflows/e2e-js.yml
@@ -74,7 +74,7 @@ jobs:
 
       - name: Upload tests artifacts
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: artifact
           path: ./artifacts

diff --git a/composer.lock b/composer.lock
diff --git a/inc/class-blocks-animation.php b/inc/class-blocks-animation.php
@@ -282,7 +282,7 @@ public function render_welcome_notice() {
 		$notice_html .= '<button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span></button>';
 		$notice_html .= '<div class="notice-content">';
 
-		$notice_html .= '<img class="otter-preview" src="' . esc_url( BLOCKS_ANIMATION_URL . '/assets/images/welcome-notice.png' ) . '" alt="' . esc_attr__( 'Otter Blocks preview', 'otter-blocks' ) . '"/>';
+		$notice_html .= '<img class="otter-preview" style="max-height: 300px;" src="' . esc_url( BLOCKS_ANIMATION_URL . '/assets/images/welcome-notice.png' ) . '" alt="' . esc_attr__( 'Otter Blocks preview', 'otter-blocks' ) . '"/>';
 
 		$notice_html .= '<div class="notice-copy">';
 

diff --git a/inc/class-main.php b/inc/class-main.php
@@ -175,6 +175,10 @@ public function used_css_properties( $attr ) {
 			'text-transform',
 			'transform',
 		);
+		// Return $props if $attr is not an array, addressing a specific edge case.
+		if ( ! is_array( $attr ) ) {
+			return $props;
+		}
 
 		$list = array_merge( $props, $attr );