@progress/kendo-angular-grid 19.0.0-develop.31 → 19.0.0-develop.32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -169,6 +169,9 @@ export class FilterMenuContainerComponent {
169
169
  this.parentService.filter(root);
170
170
  this.close.emit();
171
171
  }
172
+ resetChildFilters() {
173
+ this._childFilter = null;
174
+ }
172
175
  onTab(e, buttonType) {
173
176
  if (this.menuTabbingService.firstFocusable && (!this.menuTabbingService.isColumnMenu || this.isLast)) {
174
177
  e.preventDefault();
@@ -10,7 +10,7 @@ export const packageMetadata = {
10
10
  productName: 'Kendo UI for Angular',
11
11
  productCode: 'KENDOUIANGULAR',
12
12
  productCodes: ['KENDOUIANGULAR'],
13
- publishDate: 1747923946,
14
- version: '19.0.0-develop.31',
13
+ publishDate: 1748002228,
14
+ version: '19.0.0-develop.32',
15
15
  licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/'
16
16
  };
@@ -65,6 +65,7 @@ export class ColumnChooserToolbarDirective extends ToolbarToolBase {
65
65
  }
66
66
  popupRef;
67
67
  subs = new Subscription();
68
+ actionSheetCloseSub;
68
69
  nextId = incrementingId++;
69
70
  constructor(renderer, popupSerivce, host, ctx, zone, refresh, adaptiveGridService, columnInfoService, cdr) {
70
71
  super(host, ToolbarToolName.columns, ctx, zone, cdr);
@@ -106,6 +107,10 @@ export class ColumnChooserToolbarDirective extends ToolbarToolBase {
106
107
  ngOnDestroy() {
107
108
  super.ngOnDestroy();
108
109
  this.subs.unsubscribe();
110
+ if (this.actionSheetCloseSub) {
111
+ this.actionSheetCloseSub.unsubscribe();
112
+ this.actionSheetCloseSub = null;
113
+ }
109
114
  }
110
115
  /**
111
116
  * @hidden
@@ -117,6 +122,8 @@ export class ColumnChooserToolbarDirective extends ToolbarToolBase {
117
122
  this.adaptiveGridService.viewType = 'columnChooserToolbarTool';
118
123
  this.adaptiveGridService.columns = this.columns;
119
124
  this.ctx.grid.adaptiveRenderer.actionSheet.toggle(true);
125
+ this.host.selected = true;
126
+ this.actionSheetCloseSub = this.ctx.grid.adaptiveRenderer.actionSheet.collapse.subscribe(() => this.host.selected = false);
120
127
  }
121
128
  }
122
129
  else {
@@ -52,6 +52,7 @@ export class FilterCommandToolbarDirective {
52
52
  nextId = incrementingId++;
53
53
  toolSubs = new Subscription();
54
54
  popupSubs;
55
+ actionSheetCloseSub;
55
56
  removeClickListener;
56
57
  /**
57
58
  * @hidden
@@ -74,6 +75,7 @@ export class FilterCommandToolbarDirective {
74
75
  this.toolSubs.add(this.filterService.changes.subscribe(filter => {
75
76
  this.host.showBadge = this.isFilterApplied(filter);
76
77
  }));
78
+ this.host.hasBadgeContainer = true;
77
79
  this.host.showBadge = this.isFilterApplied(this.ctx.grid.filter);
78
80
  const hasToolbarIcon = isPresent(this.host.toolbarOptions.icon) && this.host.toolbarOptions.icon !== '';
79
81
  const hasOverflowIcon = isPresent(this.host.overflowOptions.icon) && this.host.overflowOptions.icon !== '';
@@ -107,6 +109,10 @@ export class FilterCommandToolbarDirective {
107
109
  this.popupRef.close();
108
110
  this.popupRef = null;
109
111
  }
112
+ if (this.actionSheetCloseSub) {
113
+ this.actionSheetCloseSub.unsubscribe();
114
+ this.actionSheetCloseSub = null;
115
+ }
110
116
  if (this.removeClickListener) {
111
117
  this.removeClickListener();
112
118
  this.removeClickListener = null;
@@ -126,6 +132,8 @@ export class FilterCommandToolbarDirective {
126
132
  if (!this.ctx.grid.isActionSheetExpanded) {
127
133
  this.adaptiveGridService.viewType = 'filterToolbarTool';
128
134
  this.ctx.grid.adaptiveRenderer.actionSheet.toggle(true);
135
+ this.host.selected = true;
136
+ this.actionSheetCloseSub = this.ctx.grid.adaptiveRenderer.actionSheet.collapse.subscribe(() => this.host.selected = false);
129
137
  }
130
138
  }
131
139
  else {
@@ -119,6 +119,11 @@ export class FilterToolbarToolComponent {
119
119
  handleClose(filterItem) {
120
120
  filterItem.expanded = false;
121
121
  filterItem.contentState = 'collapsed';
122
+ const filterContainer = this.filterContainers.find(container => container.column === filterItem.column);
123
+ if (filterContainer) {
124
+ // reset the child filter to ensure it is reinitialized based on the global filter on the next open
125
+ filterContainer.resetChildFilters();
126
+ }
122
127
  }
123
128
  toggleItem(event, index) {
124
129
  const menuItem = this.menuItems.get(index);
@@ -52,6 +52,7 @@ export class SortCommandToolbarDirective {
52
52
  nextId = incrementingId++;
53
53
  toolSubs = new Subscription();
54
54
  popupSubs;
55
+ actionSheetCloseSub;
55
56
  removeClickListener;
56
57
  /**
57
58
  * @hidden
@@ -74,6 +75,7 @@ export class SortCommandToolbarDirective {
74
75
  this.toolSubs.add(this.sortService.changes.subscribe(sort => {
75
76
  this.host.showBadge = this.isSortingApplied(sort);
76
77
  }));
78
+ this.host.hasBadgeContainer = true;
77
79
  this.host.showBadge = this.isSortingApplied(this.ctx.grid.sort);
78
80
  const hasToolbarIcon = isPresent(this.host.toolbarOptions.icon) && this.host.toolbarOptions.icon !== '';
79
81
  const hasOverflowIcon = isPresent(this.host.overflowOptions.icon) && this.host.overflowOptions.icon !== '';
@@ -107,6 +109,10 @@ export class SortCommandToolbarDirective {
107
109
  this.popupRef.close();
108
110
  this.popupRef = null;
109
111
  }
112
+ if (this.actionSheetCloseSub) {
113
+ this.actionSheetCloseSub.unsubscribe();
114
+ this.actionSheetCloseSub = null;
115
+ }
110
116
  if (this.removeClickListener) {
111
117
  this.removeClickListener();
112
118
  this.removeClickListener = null;
@@ -118,6 +124,8 @@ export class SortCommandToolbarDirective {
118
124
  if (!this.ctx.grid.isActionSheetExpanded) {
119
125
  this.adaptiveGridService.viewType = 'sortToolbarTool';
120
126
  this.ctx.grid.adaptiveRenderer.actionSheet.toggle(true);
127
+ this.host.selected = true;
128
+ this.actionSheetCloseSub = this.ctx.grid.adaptiveRenderer.actionSheet.collapse.subscribe(() => this.host.selected = false);
121
129
  }
122
130
  }
123
131
  else {
@@ -9884,6 +9884,9 @@ class FilterMenuContainerComponent {
9884
9884
  this.parentService.filter(root);
9885
9885
  this.close.emit();
9886
9886
  }
9887
+ resetChildFilters() {
9888
+ this._childFilter = null;
9889
+ }
9887
9890
  onTab(e, buttonType) {
9888
9891
  if (this.menuTabbingService.firstFocusable && (!this.menuTabbingService.isColumnMenu || this.isLast)) {
9889
9892
  e.preventDefault();
@@ -11934,6 +11937,7 @@ class ColumnChooserToolbarDirective extends ToolbarToolBase {
11934
11937
  }
11935
11938
  popupRef;
11936
11939
  subs = new Subscription();
11940
+ actionSheetCloseSub;
11937
11941
  nextId = incrementingId$2++;
11938
11942
  constructor(renderer, popupSerivce, host, ctx, zone, refresh, adaptiveGridService, columnInfoService, cdr) {
11939
11943
  super(host, ToolbarToolName.columns, ctx, zone, cdr);
@@ -11975,6 +11979,10 @@ class ColumnChooserToolbarDirective extends ToolbarToolBase {
11975
11979
  ngOnDestroy() {
11976
11980
  super.ngOnDestroy();
11977
11981
  this.subs.unsubscribe();
11982
+ if (this.actionSheetCloseSub) {
11983
+ this.actionSheetCloseSub.unsubscribe();
11984
+ this.actionSheetCloseSub = null;
11985
+ }
11978
11986
  }
11979
11987
  /**
11980
11988
  * @hidden
@@ -11986,6 +11994,8 @@ class ColumnChooserToolbarDirective extends ToolbarToolBase {
11986
11994
  this.adaptiveGridService.viewType = 'columnChooserToolbarTool';
11987
11995
  this.adaptiveGridService.columns = this.columns;
11988
11996
  this.ctx.grid.adaptiveRenderer.actionSheet.toggle(true);
11997
+ this.host.selected = true;
11998
+ this.actionSheetCloseSub = this.ctx.grid.adaptiveRenderer.actionSheet.collapse.subscribe(() => this.host.selected = false);
11989
11999
  }
11990
12000
  }
11991
12001
  else {
@@ -20466,8 +20476,8 @@ const packageMetadata = {
20466
20476
  productName: 'Kendo UI for Angular',
20467
20477
  productCode: 'KENDOUIANGULAR',
20468
20478
  productCodes: ['KENDOUIANGULAR'],
20469
- publishDate: 1747923946,
20470
- version: '19.0.0-develop.31',
20479
+ publishDate: 1748002228,
20480
+ version: '19.0.0-develop.32',
20471
20481
  licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/'
20472
20482
  };
20473
20483
 
@@ -24461,6 +24471,11 @@ class FilterToolbarToolComponent {
24461
24471
  handleClose(filterItem) {
24462
24472
  filterItem.expanded = false;
24463
24473
  filterItem.contentState = 'collapsed';
24474
+ const filterContainer = this.filterContainers.find(container => container.column === filterItem.column);
24475
+ if (filterContainer) {
24476
+ // reset the child filter to ensure it is reinitialized based on the global filter on the next open
24477
+ filterContainer.resetChildFilters();
24478
+ }
24464
24479
  }
24465
24480
  toggleItem(event, index) {
24466
24481
  const menuItem = this.menuItems.get(index);
@@ -32735,6 +32750,7 @@ class SortCommandToolbarDirective {
32735
32750
  nextId = incrementingId$1++;
32736
32751
  toolSubs = new Subscription();
32737
32752
  popupSubs;
32753
+ actionSheetCloseSub;
32738
32754
  removeClickListener;
32739
32755
  /**
32740
32756
  * @hidden
@@ -32757,6 +32773,7 @@ class SortCommandToolbarDirective {
32757
32773
  this.toolSubs.add(this.sortService.changes.subscribe(sort => {
32758
32774
  this.host.showBadge = this.isSortingApplied(sort);
32759
32775
  }));
32776
+ this.host.hasBadgeContainer = true;
32760
32777
  this.host.showBadge = this.isSortingApplied(this.ctx.grid.sort);
32761
32778
  const hasToolbarIcon = isPresent$1(this.host.toolbarOptions.icon) && this.host.toolbarOptions.icon !== '';
32762
32779
  const hasOverflowIcon = isPresent$1(this.host.overflowOptions.icon) && this.host.overflowOptions.icon !== '';
@@ -32790,6 +32807,10 @@ class SortCommandToolbarDirective {
32790
32807
  this.popupRef.close();
32791
32808
  this.popupRef = null;
32792
32809
  }
32810
+ if (this.actionSheetCloseSub) {
32811
+ this.actionSheetCloseSub.unsubscribe();
32812
+ this.actionSheetCloseSub = null;
32813
+ }
32793
32814
  if (this.removeClickListener) {
32794
32815
  this.removeClickListener();
32795
32816
  this.removeClickListener = null;
@@ -32801,6 +32822,8 @@ class SortCommandToolbarDirective {
32801
32822
  if (!this.ctx.grid.isActionSheetExpanded) {
32802
32823
  this.adaptiveGridService.viewType = 'sortToolbarTool';
32803
32824
  this.ctx.grid.adaptiveRenderer.actionSheet.toggle(true);
32825
+ this.host.selected = true;
32826
+ this.actionSheetCloseSub = this.ctx.grid.adaptiveRenderer.actionSheet.collapse.subscribe(() => this.host.selected = false);
32804
32827
  }
32805
32828
  }
32806
32829
  else {
@@ -33062,6 +33085,7 @@ class FilterCommandToolbarDirective {
33062
33085
  nextId = incrementingId++;
33063
33086
  toolSubs = new Subscription();
33064
33087
  popupSubs;
33088
+ actionSheetCloseSub;
33065
33089
  removeClickListener;
33066
33090
  /**
33067
33091
  * @hidden
@@ -33084,6 +33108,7 @@ class FilterCommandToolbarDirective {
33084
33108
  this.toolSubs.add(this.filterService.changes.subscribe(filter => {
33085
33109
  this.host.showBadge = this.isFilterApplied(filter);
33086
33110
  }));
33111
+ this.host.hasBadgeContainer = true;
33087
33112
  this.host.showBadge = this.isFilterApplied(this.ctx.grid.filter);
33088
33113
  const hasToolbarIcon = isPresent$1(this.host.toolbarOptions.icon) && this.host.toolbarOptions.icon !== '';
33089
33114
  const hasOverflowIcon = isPresent$1(this.host.overflowOptions.icon) && this.host.overflowOptions.icon !== '';
@@ -33117,6 +33142,10 @@ class FilterCommandToolbarDirective {
33117
33142
  this.popupRef.close();
33118
33143
  this.popupRef = null;
33119
33144
  }
33145
+ if (this.actionSheetCloseSub) {
33146
+ this.actionSheetCloseSub.unsubscribe();
33147
+ this.actionSheetCloseSub = null;
33148
+ }
33120
33149
  if (this.removeClickListener) {
33121
33150
  this.removeClickListener();
33122
33151
  this.removeClickListener = null;
@@ -33136,6 +33165,8 @@ class FilterCommandToolbarDirective {
33136
33165
  if (!this.ctx.grid.isActionSheetExpanded) {
33137
33166
  this.adaptiveGridService.viewType = 'filterToolbarTool';
33138
33167
  this.ctx.grid.adaptiveRenderer.actionSheet.toggle(true);
33168
+ this.host.selected = true;
33169
+ this.actionSheetCloseSub = this.ctx.grid.adaptiveRenderer.actionSheet.collapse.subscribe(() => this.host.selected = false);
33139
33170
  }
33140
33171
  }
33141
33172
  else {
@@ -71,6 +71,7 @@ export declare class FilterMenuContainerComponent implements OnInit, OnDestroy {
71
71
  get hasTemplate(): boolean;
72
72
  submit(): boolean;
73
73
  reset(): void;
74
+ resetChildFilters(): void;
74
75
  onTab(e: Event, buttonType: string): void;
75
76
  get clearText(): string;
76
77
  get filterText(): string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@progress/kendo-angular-grid",
3
- "version": "19.0.0-develop.31",
3
+ "version": "19.0.0-develop.32",
4
4
  "description": "Kendo UI Grid for Angular - high performance data grid with paging, filtering, virtualization, CRUD, and more.",
5
5
  "license": "SEE LICENSE IN LICENSE.md",
6
6
  "author": "Progress",
@@ -41,7 +41,7 @@
41
41
  "package": {
42
42
  "productName": "Kendo UI for Angular",
43
43
  "productCode": "KENDOUIANGULAR",
44
- "publishDate": 1747923946,
44
+ "publishDate": 1748002228,
45
45
  "licensingDocsUrl": "https://www.telerik.com/kendo-angular-ui/my-license/"
46
46
  }
47
47
  },
@@ -54,29 +54,29 @@
54
54
  "@progress/kendo-data-query": "^1.0.0",
55
55
  "@progress/kendo-drawing": "^1.21.0",
56
56
  "@progress/kendo-licensing": "^1.5.0",
57
- "@progress/kendo-angular-buttons": "19.0.0-develop.31",
58
- "@progress/kendo-angular-common": "19.0.0-develop.31",
59
- "@progress/kendo-angular-dateinputs": "19.0.0-develop.31",
60
- "@progress/kendo-angular-layout": "19.0.0-develop.31",
61
- "@progress/kendo-angular-navigation": "19.0.0-develop.31",
62
- "@progress/kendo-angular-dropdowns": "19.0.0-develop.31",
63
- "@progress/kendo-angular-excel-export": "19.0.0-develop.31",
64
- "@progress/kendo-angular-icons": "19.0.0-develop.31",
65
- "@progress/kendo-angular-inputs": "19.0.0-develop.31",
66
- "@progress/kendo-angular-indicators": "19.0.0-develop.31",
67
- "@progress/kendo-angular-intl": "19.0.0-develop.31",
68
- "@progress/kendo-angular-l10n": "19.0.0-develop.31",
69
- "@progress/kendo-angular-label": "19.0.0-develop.31",
70
- "@progress/kendo-angular-pager": "19.0.0-develop.31",
71
- "@progress/kendo-angular-pdf-export": "19.0.0-develop.31",
72
- "@progress/kendo-angular-popup": "19.0.0-develop.31",
73
- "@progress/kendo-angular-toolbar": "19.0.0-develop.31",
74
- "@progress/kendo-angular-utils": "19.0.0-develop.31",
57
+ "@progress/kendo-angular-buttons": "19.0.0-develop.32",
58
+ "@progress/kendo-angular-common": "19.0.0-develop.32",
59
+ "@progress/kendo-angular-dateinputs": "19.0.0-develop.32",
60
+ "@progress/kendo-angular-layout": "19.0.0-develop.32",
61
+ "@progress/kendo-angular-navigation": "19.0.0-develop.32",
62
+ "@progress/kendo-angular-dropdowns": "19.0.0-develop.32",
63
+ "@progress/kendo-angular-excel-export": "19.0.0-develop.32",
64
+ "@progress/kendo-angular-icons": "19.0.0-develop.32",
65
+ "@progress/kendo-angular-inputs": "19.0.0-develop.32",
66
+ "@progress/kendo-angular-indicators": "19.0.0-develop.32",
67
+ "@progress/kendo-angular-intl": "19.0.0-develop.32",
68
+ "@progress/kendo-angular-l10n": "19.0.0-develop.32",
69
+ "@progress/kendo-angular-label": "19.0.0-develop.32",
70
+ "@progress/kendo-angular-pager": "19.0.0-develop.32",
71
+ "@progress/kendo-angular-pdf-export": "19.0.0-develop.32",
72
+ "@progress/kendo-angular-popup": "19.0.0-develop.32",
73
+ "@progress/kendo-angular-toolbar": "19.0.0-develop.32",
74
+ "@progress/kendo-angular-utils": "19.0.0-develop.32",
75
75
  "rxjs": "^6.5.3 || ^7.0.0"
76
76
  },
77
77
  "dependencies": {
78
78
  "tslib": "^2.3.1",
79
- "@progress/kendo-angular-schematics": "19.0.0-develop.31",
79
+ "@progress/kendo-angular-schematics": "19.0.0-develop.32",
80
80
  "@progress/kendo-common": "^1.0.1",
81
81
  "@progress/kendo-file-saver": "^1.0.0"
82
82
  },
@@ -51,6 +51,7 @@ export declare class ColumnChooserToolbarDirective extends ToolbarToolBase imple
51
51
  get columns(): any;
52
52
  private popupRef;
53
53
  private subs;
54
+ private actionSheetCloseSub;
54
55
  private nextId;
55
56
  constructor(renderer: Renderer2, popupSerivce: PopupService, host: ToolBarButtonComponent, ctx: ContextService, zone: NgZone, refresh: RefreshService, adaptiveGridService: AdaptiveGridService, columnInfoService: ColumnInfoService, cdr: ChangeDetectorRef);
56
57
  ngOnInit(): void;
@@ -41,6 +41,7 @@ export declare class FilterCommandToolbarDirective implements AfterViewInit, OnD
41
41
  private nextId;
42
42
  private toolSubs;
43
43
  private popupSubs;
44
+ private actionSheetCloseSub;
44
45
  private removeClickListener;
45
46
  /**
46
47
  * @hidden
@@ -41,6 +41,7 @@ export declare class SortCommandToolbarDirective implements AfterViewInit, OnDes
41
41
  private nextId;
42
42
  private toolSubs;
43
43
  private popupSubs;
44
+ private actionSheetCloseSub;
44
45
  private removeClickListener;
45
46
  /**
46
47
  * @hidden
@@ -4,14 +4,14 @@ const schematics_1 = require("@angular-devkit/schematics");
4
4
  function default_1(options) {
5
5
  const finalOptions = Object.assign(Object.assign({}, options), { mainNgModule: 'GridModule', package: 'grid', peerDependencies: {
6
6
  // peer deps of the dropdowns
7
- '@progress/kendo-angular-treeview': '19.0.0-develop.31',
8
- '@progress/kendo-angular-navigation': '19.0.0-develop.31',
7
+ '@progress/kendo-angular-treeview': '19.0.0-develop.32',
8
+ '@progress/kendo-angular-navigation': '19.0.0-develop.32',
9
9
  // peer dependency of kendo-angular-inputs
10
- '@progress/kendo-angular-dialog': '19.0.0-develop.31',
10
+ '@progress/kendo-angular-dialog': '19.0.0-develop.32',
11
11
  // peer dependency of kendo-angular-icons
12
12
  '@progress/kendo-svg-icons': '^4.0.0',
13
13
  // peer dependency of kendo-angular-layout
14
- '@progress/kendo-angular-progressbar': '19.0.0-develop.31'
14
+ '@progress/kendo-angular-progressbar': '19.0.0-develop.32'
15
15
  } });
16
16
  return (0, schematics_1.externalSchematic)('@progress/kendo-angular-schematics', 'ng-add', finalOptions);
17
17
  }