Skip to content

Commit dccccb0

Browse files
authored
Merge branch 'vnext' into ipetrov/query-builder-samples-update-36242
2 parents 4ec75d0 + 514efa5 commit dccccb0

File tree

5 files changed

+13
-10
lines changed

5 files changed

+13
-10
lines changed

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"igniteui-angular": "^19.1.0-beta.4",
6969
"igniteui-angular-charts": "^19.0.0",
7070
"igniteui-angular-core": "^19.0.0",
71-
"igniteui-angular-extras": "^19.0.1",
71+
"igniteui-angular-extras": "^19.0.3",
7272
"igniteui-angular-i18n": "^19.0.10",
7373
"igniteui-dockmanager": "^1.16.0",
7474
"igniteui-live-editing": "^3.0.0",

projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable max-len */
22
import { AfterViewInit, ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA, ElementRef, OnInit, Pipe, PipeTransform, QueryList, ViewChild, ViewChildren } from '@angular/core';
3-
import { IgxChartIntegrationDirective, OPTIONS_TYPE, CHART_TYPE } from 'igniteui-angular-extras';
3+
import { IgxChartIntegrationDirective, IgxContextMenuDirective, OPTIONS_TYPE, CHART_TYPE } from 'igniteui-angular-extras';
44
import { IgcDockManagerLayout, IgcDockManagerPaneType, IgcSplitPane, IgcSplitPaneOrientation } from 'igniteui-dockmanager';
55
import { FinancialData } from '../../data/financialData';
66
import { FloatingPanesService } from '../../services/floating-panes.service';
@@ -53,7 +53,7 @@ export class HastDuplicateLayouts implements PipeTransform {
5353
templateUrl: './data-analysis-dock-manager.component.html',
5454
styleUrls: ['./data-analysis-dock-manager.component.scss'],
5555
providers: [FloatingPanesService],
56-
imports: [IgxGridComponent, IgxChartIntegrationDirective, IgxBadgeComponent, IgxColumnComponent, IgxCellTemplateDirective, NgClass, IgxDividerDirective, DockSlotComponent, DecimalPipe, TitleCasePipe, CurrencyPipe, FilterTypePipe, HastDuplicateLayouts],
56+
imports: [IgxGridComponent, IgxChartIntegrationDirective, IgxContextMenuDirective, IgxBadgeComponent, IgxColumnComponent, IgxCellTemplateDirective, NgClass, IgxDividerDirective, DockSlotComponent, DecimalPipe, TitleCasePipe, CurrencyPipe, FilterTypePipe, HastDuplicateLayouts],
5757
schemas: [CUSTOM_ELEMENTS_SCHEMA]
5858
})
5959
export class DataAnalysisDockManagerComponent implements OnInit, AfterViewInit {
@@ -82,6 +82,7 @@ export class DataAnalysisDockManagerComponent implements OnInit, AfterViewInit {
8282

8383
public ngAfterViewInit() {
8484
this.allCharts = this.chartIntegration.getAvailableCharts();
85+
this.cdr.detectChanges();
8586
const pieChartOptions = {
8687
labelsPosition: 4,
8788
allowSliceExplosion: true,

projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable max-len */
22
import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core';
3-
import { IgxChartIntegrationDirective, OPTIONS_TYPE, CHART_TYPE, PageHeaderComponent } from 'igniteui-angular-extras';
3+
import { IgxChartIntegrationDirective, IgxContextMenuDirective, OPTIONS_TYPE, CHART_TYPE, PageHeaderComponent } from 'igniteui-angular-extras';
44

55
import { FinancialData } from '../data/financialData';
66
import { IgxGridComponent, IgxColumnComponent, IgxCellTemplateDirective } from 'igniteui-angular';
@@ -10,7 +10,7 @@ import { DecimalPipe, CurrencyPipe } from '@angular/common';
1010
selector: 'app-grid-dynamic-chart-data',
1111
templateUrl: './grid-dynamic-chart-data.component.html',
1212
styleUrls: ['./grid-dynamic-chart-data.component.scss'],
13-
imports: [IgxGridComponent, PageHeaderComponent, IgxChartIntegrationDirective, IgxColumnComponent, IgxCellTemplateDirective, DecimalPipe, CurrencyPipe]
13+
imports: [IgxGridComponent, PageHeaderComponent, IgxChartIntegrationDirective, IgxContextMenuDirective, IgxColumnComponent, IgxCellTemplateDirective, DecimalPipe, CurrencyPipe]
1414
})
1515
export class GridDynamicChartDataComponent implements OnInit, AfterViewInit {
1616

projects/app-lob/src/app/services/floating-panes.service.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ export class FloatingPanesService {
2424

2525
if (this.floatingPanes.length) {
2626
const lastPane = this.floatingPanes[this.floatingPanes.length - 1];
27-
pane.floatingLocation = {x: lastPane.floatingLocation.x + 10, y: lastPane.floatingLocation.y + 10} ;
27+
if (lastPane.floatingLocation) {
28+
pane.floatingLocation = {x: lastPane.floatingLocation.x + 10, y: lastPane.floatingLocation.y + 10};
29+
}
2830
} else {
2931
pane.floatingLocation = this.initialPanePosition;
3032
}

0 commit comments

Comments
 (0)