Merge branch 'v3' of https://github.com/craftcms/cms into develop

# Conflicts: # CHANGELOG.md # src/elements/Asset.php # src/web/assets/matrix/dist/MatrixInput.js # src/web/assets/matrix/dist/MatrixInput.js.map
craftcms · Feb 24, 2023 · aad45b7 · aad45b7
2 parents 5170d71 + bd1c661
commit aad45b7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Fixed a bug where `craft\events\RegisterElementSourcesEvent::$context` wasn’t always set to `modal` when defining the available element sources for an element selection modal.
 - Fixed a styling bug where multi-line checkbox labels within the Customize Sources modal and View menu weren’t wrapping properly. ([#12717](https://github.com/craftcms/cms/issues/12717))
+- Fixed a bug where asset thumbnails within collapsed Matrix blocks weren’t loading when the block was expanded. ([#12720](https://github.com/craftcms/cms/issues/12720))
 - Fixed a bug where user activation/verification/reset-password URLs could be root-relative, if the `@web` alias was explicitly set to a root-relative URL.
 - Fixed a PHP error that could occur if an options field’s condition rule wasn’t configured with any values. ([#12713](https://github.com/craftcms/cms/pull/12713))
 - Fixed a bug where control panel notifications weren’t being announced to screen readers. ([#12714](https://github.com/craftcms/cms/pull/12714))

diff --git a/src/web/assets/matrix/dist/MatrixInput.js b/src/web/assets/matrix/dist/MatrixInput.js
diff --git a/src/web/assets/matrix/dist/MatrixInput.js.map b/src/web/assets/matrix/dist/MatrixInput.js.map
diff --git a/src/web/assets/matrix/src/MatrixInput.js b/src/web/assets/matrix/src/MatrixInput.js
@@ -813,6 +813,7 @@
         () => {
           this.$previewContainer.html('');
           this.$container.height('auto');
+          this.$container.trigger('scroll');
         }
       );
-Original file line number
+Diff line change
@@ Expand Up / @@ -813,6 +813,7 @@ @@
             () => {
               this.$previewContainer.html('');
               this.$container.height('auto');
+              this.$container.trigger('scroll');
             }
           );
@@ Expand Down @@