Merge pull request #13897 from craftcms/bugfix/cms-1204-inline-matrix…

…-disabled-block fix for actions not being clickable on disabled inline matrix blocks
craftcms · Nov 3, 2023 · decfb7a · decfb7a
2 parents beaa914 + c1fe536
commit decfb7a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/src/templates/_components/fieldtypes/Matrix/block.twig b/src/templates/_components/fieldtypes/Matrix/block.twig
@@ -6,7 +6,7 @@
 {% set entryAttributes = {
   class: [
     'matrixblock',
-    not entry.enabled ? 'disabled',
+    not entry.enabled ? 'disabled-entry',
     static ? 'static',
   ]|filter,
   data: {

diff --git a/src/web/assets/cp/dist/css/cp.css b/src/web/assets/cp/dist/css/cp.css
diff --git a/src/web/assets/cp/dist/css/cp.css.map b/src/web/assets/cp/dist/css/cp.css.map
diff --git a/src/web/assets/cp/src/css/_main.scss b/src/web/assets/cp/src/css/_main.scss
@@ -7492,9 +7492,7 @@ $titlebarBorderRadius: calc(var(--large-border-radius) - 1px);
     }
   }
 
-  &.disabled {
-    opacity: 1;
-
+  &.disabled-entry {
     & > .titlebar {
       @include padding-right(90px);
     }

diff --git a/src/web/assets/matrix/src/MatrixInput.js b/src/web/assets/matrix/src/MatrixInput.js
@@ -727,7 +727,7 @@
 
     disable: function () {
       this.$container.children('input[name$="[enabled]"]:first').val('');
-      this.$container.addClass('disabled');
+      this.$container.addClass('disabled-entry');
 
       setTimeout(() => {
         this.$actionMenu
@@ -745,7 +745,7 @@
 
     enable: function () {
       this.$container.children('input[name$="[enabled]"]:first').val('1');
-      this.$container.removeClass('disabled');
+      this.$container.removeClass('disabled-entry');
 
       setTimeout(() => {
         this.$actionMenu