ENGCOM-6007: [Catalog|Sales] Fix wrong behavior of grid row click event

#22990
magento · Jan 8, 2020 · 706e813 · 706e813
2 parents a2800e8 + 09cf424
commit 706e813
Show file tree

Hide file tree

Showing 3 changed files with 288 additions and 256 deletions.
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/assign-products.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/assign-products.js
@@ -51,15 +51,29 @@ define([
          */
         function categoryProductRowClick(grid, event) {
             var trElement = Event.findElement(event, 'tr'),
-                isInput = Event.element(event).tagName === 'INPUT',
+                eventElement = Event.element(event),
+                isInputCheckbox = eventElement.tagName === 'INPUT' && eventElement.type === 'checkbox',
+                isInputPosition = grid.targetElement &&
+                    grid.targetElement.tagName === 'INPUT' &&
+                    grid.targetElement.name === 'position',
                 checked = false,
                 checkbox = null;
 
-            if (trElement) {
+            if (eventElement.tagName === 'LABEL' &&
+                trElement.querySelector('#' + eventElement.htmlFor) &&
+                trElement.querySelector('#' + eventElement.htmlFor).type === 'checkbox'
+            ) {
+                event.stopPropagation();
+                trElement.querySelector('#' + eventElement.htmlFor).trigger('click');
+
+                return;
+            }
+
+            if (trElement && !isInputPosition) {
                 checkbox = Element.getElementsBySelector(trElement, 'input');
 
                 if (checkbox[0]) {
-                    checked = isInput ? checkbox[0].checked : !checkbox[0].checked;
+                    checked = isInputCheckbox ? checkbox[0].checked : !checkbox[0].checked;
                     gridJsObject.setCheckboxChecked(checkbox[0], checked);
                 }
             }