Merge branch 'ipetrov/query-builder-drag-and-drop-nogap' of https://github.com/IgniteUI/igniteui-angular into ipetrov/query-builder-drag-and-drop-nogap

Author: ivanvpetrov

projects/igniteui-angular/package.json

@@ -73,7 +73,7 @@
         "tslib": "^2.3.0",
         "igniteui-trial-watermark": "^3.0.2",
         "lodash-es": "^4.17.21",
-        "igniteui-theming": "^14.3.1-beta.1",
+        "igniteui-theming": "v14.5.0-beta.1",
         "@igniteui/material-icons-extended": "^3.1.0"
     },
     "peerDependencies": {

projects/igniteui-angular/src/lib/core/styles/components/query-builder/_query-builder-theme.scss

@@ -222,7 +222,9 @@
             border-radius: inherit;
             background: var-get($theme, 'subquery-background');
 
-            > igx-input-group {
+            > igx-input-group,
+            > igx-date-picker,
+            > igx-time-picker {
                 flex-grow: 1;
             }
         }

projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.html

@@ -254,7 +254,7 @@
         </div>
 
         <div #editingInputsContainer class="igx-filter-tree__subquery" >
-            <div                
+            <div
                 igxDrop
                 (enter)="onChipEnter(editingInputsContainer, expressionItem, true)"
                 (over)="onDivOver(editingInputsContainer, expressionItem)"
@@ -405,11 +405,11 @@
                         type="box"
                         *ngIf="selectedField && selectedField.dataType === 'dateTime'"
                     >
-                        <label igxLabel>{{this.resourceStrings.igx_query_builder_datetime_placeholder}}</label>
                         <input
                             #input
                             igxInput
                             tabindex="0"
+                            [placeholder]="this.resourceStrings.igx_query_builder_datetime_placeholder"
                             [(ngModel)]="searchValue.value"
                             [disabled]="isSearchValueInputDisabled()"
                             [locale]="this.locale"
@@ -539,7 +539,9 @@
     </ng-template>
 
     <div class="igx-filter-tree__section" *ngIf="rootGroup || (!rootGroup && (selectedEntity || (entities?.length === 1 && !entities[0]?.name)))">
-        <span class="igx-query-builder__label">Where</span>
+        @if(!this.isAdvancedFiltering()) {
+            <span class="igx-query-builder__label">Where</span>
+        }
         <ng-container
             *ngTemplateOutlet="
                 expressionGroupTemplate;

projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.ts

@@ -1924,14 +1924,9 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
             return null;
         }
 
-        const exprTreeCopy =
-        {
-            filteringOperands: [],
-            operator: expressionTree.operator,
-            fieldName: expressionTree.fieldName,
-            entity: expressionTree.entity,
-            returnFields: expressionTree.returnFields
-        };
+        const exprTreeCopy = new FilteringExpressionsTree(expressionTree.operator, expressionTree.fieldName, expressionTree.entity, expressionTree.returnFields);
+        exprTreeCopy.filteringOperands = [];
+
         expressionTree.filteringOperands.forEach(o => o instanceof FilteringExpressionsTree ? exprTreeCopy.filteringOperands.push(this.getExpressionTreeCopy(o)) : exprTreeCopy.filteringOperands.push(o));
 
         if (!this.innerQueryNewExpressionTree && shouldAssignInnerQueryExprTree) {