@syncfusion/ej2-querybuilder 33.2.3 → 33.2.5

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

@@ -164,6 +164,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         this.isRuleClicked = false;
         this.groupCloned = false;
         this.isRequestSent = false;
+        this.isPopupScroll = false;
         MultiSelect.Inject(CheckBoxSelection);
     }
     getPersistData() {
@@ -1295,6 +1296,10 @@ let QueryBuilder = class QueryBuilder extends Component {
                 if (tooltipCloseElement) {
                     tooltipCloseElement.style.display = 'none';
                 }
+            }, beforeClose: (args) => {
+                if (this.isPopupScroll) {
+                    args.cancel = true;
+                }
             }
         });
         tooltip.appendTo(element);
@@ -3349,7 +3354,9 @@ let QueryBuilder = class QueryBuilder extends Component {
                                 const isTemplate = (typeof itemData.template === 'string');
                                 if (rule.value && !isNullOrUndefined(format)) {
                                     selVal = (length > 1) ? rule.value[i] : rule.value;
-                                    selectedValue = this.parseDate(selVal, format) || new Date();
+                                    if (selVal) {
+                                        selectedValue = this.parseDate(selVal, format) || new Date();
+                                    }
                                 }
                                 if (!isNullOrUndefined(itemData) && itemData.value && !isTemplate) {
                                     const parsedDate = this.parseDate(itemData.value.toString(), itemData.format);
@@ -4903,6 +4910,11 @@ let QueryBuilder = class QueryBuilder extends Component {
                     groupRule = groupRule.properties;
                 }
                 const groupElem = closest(targetGroup, '.e-group-container');
+                const cloneGroupElem = groupElem.cloneNode(true);
+                let isRuleArea = false;
+                if (closest(e.target, '.e-group-container') && closest(e.target, '.e-group-container').id === this.initialID + '_group0') {
+                    isRuleArea = true;
+                }
                 const nestGrpElem = groupElem.querySelectorAll('.e-group-container');
                 nestGrpElem.forEach((ele) => {
                     if (this.element.querySelector('#' + ele.id)) {
@@ -4920,11 +4932,23 @@ let QueryBuilder = class QueryBuilder extends Component {
                     ruleIds.push(ruleElems[i].id.split(this.element.id + '_')[1]);
                 }
                 this.deleteRules(ruleIds);
+                // Calculate index considering both groups and rules in the overall rules collection
+                let overallDropIndex = 0;
+                const ruleListElem = cloneGroupElem.querySelector('.e-rule-list');
+                if (ruleListElem) {
+                    for (let j = 0; j < ruleListElem.children.length; j++) {
+                        const child = ruleListElem.children[j];
+                        if (child.classList.contains('e-drag-rule-top-line') || child.classList.contains('e-drag-rule-bottom-line')) {
+                            overallDropIndex = j;
+                            break;
+                        }
+                    }
+                }
                 if (targetGroup.classList.contains('e-drag-rule-top-line')) {
-                    groupRule.rules.splice(dropInd, 0, rule);
+                    groupRule.rules.splice(isRuleArea ? overallDropIndex : dropInd, 0, rule);
                 }
                 else {
-                    groupRule.rules.splice(dropInd + 1, 0, rule);
+                    groupRule.rules.splice(isRuleArea ? overallDropIndex + 1 : dropInd + 1, 0, rule);
                 }
                 groupRule.rules.forEach((rule) => {
                     if (this.enableSeparateConnector) {
@@ -5123,12 +5147,24 @@ let QueryBuilder = class QueryBuilder extends Component {
         this.initWrapper();
         this.wireEvents();
     }
+    scrollEventHandler(e) {
+        const target = e.target;
+        if (target && ((target.closest && target.closest('.e-popup')))) {
+            this.isPopupScroll = true;
+        }
+        else {
+            this.isPopupScroll = false;
+        }
+    }
     wireEvents() {
         const wrapper = this.getWrapper();
         EventHandler.add(wrapper, 'click', this.clickEventHandler, this);
         EventHandler.add(wrapper, 'focusout', this.focusEventHandler, this);
         EventHandler.add(wrapper, 'focusin', this.focusEventHandler, this);
         EventHandler.add(this.element, 'keydown', this.keyBoardHandler, this);
+        this.boundScrollHandler = this.scrollEventHandler.bind(this);
+        document.addEventListener('wheel', this.boundScrollHandler);
+        document.addEventListener('scroll', this.boundScrollHandler);
         if (this.allowDragAndDrop) {
             EventHandler.add(document, 'keydown', this.keyBoardHandler, this);
         }
@@ -5141,6 +5177,9 @@ let QueryBuilder = class QueryBuilder extends Component {
         EventHandler.remove(wrapper, 'focusout', this.focusEventHandler);
         EventHandler.remove(wrapper, 'focusin', this.focusEventHandler);
         EventHandler.remove(this.element, 'keydown', this.keyBoardHandler);
+        document.removeEventListener('wheel', this.boundScrollHandler);
+        document.removeEventListener('scroll', this.boundScrollHandler);
+        this.boundScrollHandler = null;
         EventHandler.remove(document, 'keydown', this.keyBoardHandler);
         if (this.boundResizeHandler) {
             window.removeEventListener('resize', this.boundResizeHandler);