@syncfusion/ej2-querybuilder 32.2.9 → 33.1.46

package/dist/es6/ej2-querybuilder.es2015.js

@@ -1361,10 +1361,9 @@ let QueryBuilder = class QueryBuilder extends Component {
                     if (rule.rules[index].value instanceof Array) {
                         valArray = rule.rules[index].value;
                     }
-                    if (excludeOprs.indexOf(rule.rules[index].operator) < -1 &&
-                        (isNullOrUndefined(rule.rules[index].value) &&
-                            rule.rules[index].type !== 'date') || rule.rules[index].value === '' || rule.rules[index].value === null ||
-                        (rule.rules[index].value instanceof Array && valArray.length < 1)) {
+                    if (excludeOprs.indexOf(rule.rules[index].operator) < 0 && ((isNullOrUndefined(rule.rules[index].value) &&
+                        rule.rules[index].type !== 'date') || rule.rules[index].value === '' || rule.rules[index].value === null ||
+                        (rule.rules[index].value instanceof Array && valArray.length < 1))) {
                         const valElem = tempElem.querySelectorAll('.e-rule-value .e-control');
                         if (excludeOprs.indexOf(rule.rules[index].operator) < 0) {
                             isValid = false;
@@ -4133,31 +4132,33 @@ let QueryBuilder = class QueryBuilder extends Component {
         if (this.portals && this.portals.length) {
             this.clearQBTemplate();
         }
-        let qbDdlElems = this.element.querySelectorAll('.qb-dropdownlist');
-        if (!qbDdlElems || qbDdlElems.length === 0) {
-            qbDdlElems = document.querySelectorAll('.qb-dropdownlist');
-        }
-        for (i = 0; i < qbDdlElems.length; i++) {
-            const ddlElem = qbDdlElems[i];
-            const targetInput = ddlElem.tagName === 'INPUT' ? ddlElem : ddlElem.querySelector('input');
-            if (targetInput) {
-                const ddlInst = getComponent(targetInput, 'dropdownlist');
-                if (ddlInst) {
-                    if (ddlInst.close) {
-                        ddlInst.close = null;
-                    }
-                    if (ddlInst.open) {
-                        ddlInst.open = null;
-                    }
-                    if (ddlInst.change) {
-                        ddlInst.change = null;
+        const qbDdlElems = this.element.querySelectorAll('.qb-dropdownlist');
+        if (qbDdlElems && qbDdlElems.length > 0) {
+            for (i = 0; i < qbDdlElems.length; i++) {
+                const ddlElem = qbDdlElems[i];
+                if (this.element.contains(ddlElem)) {
+                    const targetInput = ddlElem.tagName === 'INPUT' ? ddlElem : ddlElem.querySelector('input');
+                    if (targetInput) {
+                        const ddlInst = getComponent(targetInput, 'dropdownlist');
+                        if (ddlInst) {
+                            if (ddlInst.close) {
+                                ddlInst.close = null;
+                            }
+                            if (ddlInst.open) {
+                                ddlInst.open = null;
+                            }
+                            if (ddlInst.change) {
+                                ddlInst.change = null;
+                            }
+                            ddlInst.destroy();
+                        }
                     }
-                    ddlInst.destroy();
                 }
             }
         }
-        const popupElement = document.querySelectorAll('.qb-dropdownlist.e-popup');
-        if (popupElement) {
+        // Cleanup orphaned popup elements
+        const popupElement = this.element.querySelectorAll('.e-popup.e-dropdownlist');
+        if (popupElement && popupElement.length > 0) {
             for (i = 0; i < popupElement.length; i++) {
                 popupElement[i].remove();
             }