@progress/kendo-angular-pivotgrid 12.0.1-develop.2 → 12.0.1-develop.3

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.
@@ -35,6 +35,7 @@ export declare class ChipMenuFilterComponent extends ChipMenuItemBase {
35
35
  actionsClass: string;
36
36
  filterSVGIcon: SVGIcon;
37
37
  constructor(localization: PivotLocalizationService, hostElement: ElementRef);
38
+ ngAfterViewInit(): void;
38
39
  onCollapse(): void;
39
40
  onExpand(): void;
40
41
  /**
@@ -9,7 +9,6 @@ import * as i0 from "@angular/core";
9
9
  export declare class MenuTabbingService {
10
10
  firstFocusable: any;
11
11
  lastFocusable: any;
12
- isColumnMenu: boolean;
13
12
  isPopupOpen: boolean;
14
13
  lastMenuItem: any;
15
14
  static ɵfac: i0.ɵɵFactoryDeclaration<MenuTabbingService, never>;
@@ -23,9 +23,11 @@ export class ChipKeyboardNavigationDirective {
23
23
  const chipElement = this.host.element.nativeElement;
24
24
  this.ngZone.runOutsideAngular(() => {
25
25
  this.keydownSub.add(this.renderer.listen(chipElement, 'keydown', (ev) => {
26
+ ev.preventDefault();
26
27
  const isAltDown = ev.keyCode === Keys.ArrowDown && ev.altKey;
27
28
  const menuIcon = this.host.element.nativeElement.querySelector('.k-i-more-vertical');
28
- const shiftAndMeta = ev.shiftKey && ev.metaKey;
29
+ const isCtrlOrMeta = ev.ctrlKey || ev.metaKey;
30
+ const shiftAndMeta = ev.shiftKey && isCtrlOrMeta;
29
31
  const isArrow = [Keys.ArrowLeft, Keys.ArrowRight, Keys.ArrowDown, Keys.ArrowUp].includes(ev.keyCode);
30
32
  const isReorderAction = shiftAndMeta && isArrow;
31
33
  if (isAltDown && menuIcon) {
@@ -36,6 +36,13 @@ export class ChipMenuFilterComponent extends ChipMenuItemBase {
36
36
  this.actionsClass = 'k-columnmenu-actions';
37
37
  this.filterSVGIcon = filterIcon;
38
38
  }
39
+ ngAfterViewInit() {
40
+ if (this.isLast) {
41
+ this.service.menuTabbingService.lastFocusable = this.expanded ?
42
+ this.hostElement.nativeElement.querySelector('.k-button:not([disabled])') :
43
+ this.hostElement.nativeElement.querySelector('.k-columnmenu-item');
44
+ }
45
+ }
39
46
  onCollapse() {
40
47
  this.expanded = false;
41
48
  if (this.isLast) {
@@ -45,6 +52,9 @@ export class ChipMenuFilterComponent extends ChipMenuItemBase {
45
52
  }
46
53
  onExpand() {
47
54
  this.expanded = true;
55
+ if (this.isLast) {
56
+ this.service.menuTabbingService.lastFocusable = this.hostElement.nativeElement.querySelector('.k-button:not([disabled])');
57
+ }
48
58
  this.expand.emit();
49
59
  }
50
60
  /**
@@ -74,7 +74,7 @@ export class ChipMenuItemDirective {
74
74
  this.subs.unsubscribe();
75
75
  }
76
76
  getLastColumnMenuItem() {
77
- return (this.chipMenuItems.length === 1 ? this.chipMenuItems[0] : this.chipMenuItems[1]);
77
+ return this.chipMenuItems[this.chipMenuItems.length - 1];
78
78
  }
79
79
  }
80
80
  ChipMenuItemDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: ChipMenuItemDirective, deps: [{ token: i0.ElementRef }, { token: i0.Renderer2 }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Directive });
@@ -88,6 +88,7 @@ ChipMenuComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", vers
88
88
  <kendo-pivot-chipmenu-filter
89
89
  #filterItem
90
90
  [chip]="chip"
91
+ [isLast]="true"
91
92
  [kendoPivotChipMenuItem]="filterItem"
92
93
  [service]="service">
93
94
  </kendo-pivot-chipmenu-filter>
@@ -126,6 +127,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
126
127
  <kendo-pivot-chipmenu-filter
127
128
  #filterItem
128
129
  [chip]="chip"
130
+ [isLast]="true"
129
131
  [kendoPivotChipMenuItem]="filterItem"
130
132
  [service]="service">
131
133
  </kendo-pivot-chipmenu-filter>
@@ -34,7 +34,7 @@ export class FilterMenuContainerComponent {
34
34
  this.menuTabbingService = menuTabbingService;
35
35
  }
36
36
  ngAfterViewChecked() {
37
- if (!this.menuTabbingService.isColumnMenu || (this.isLast && this.isExpanded)) {
37
+ if (this.isLast && this.isExpanded) {
38
38
  this.menuTabbingService.lastFocusable = this.disabled ?
39
39
  this.resetButton.nativeElement : this.filterButton.nativeElement;
40
40
  }
@@ -66,7 +66,7 @@ export class FilterMenuContainerComponent {
66
66
  this.close.emit();
67
67
  }
68
68
  onTab(e, buttonType) {
69
- if (this.menuTabbingService.firstFocusable && (!this.menuTabbingService.isColumnMenu || this.isLast)) {
69
+ if (this.menuTabbingService.firstFocusable && this.isLast) {
70
70
  e.preventDefault();
71
71
  if (buttonType === 'reset') {
72
72
  // eslint-disable-next-line no-unused-expressions
@@ -9,7 +9,6 @@ import * as i0 from "@angular/core";
9
9
  */
10
10
  export class MenuTabbingService {
11
11
  constructor() {
12
- this.isColumnMenu = false;
13
12
  this.isPopupOpen = false;
14
13
  }
15
14
  }
@@ -9,7 +9,7 @@ export const packageMetadata = {
9
9
  name: '@progress/kendo-angular-pivotgrid',
10
10
  productName: 'Kendo UI for Angular',
11
11
  productCodes: ['KENDOUIANGULAR', 'KENDOUICOMPLETE'],
12
- publishDate: 1683098039,
13
- version: '12.0.1-develop.2',
12
+ publishDate: 1683100397,
13
+ version: '12.0.1-develop.3',
14
14
  licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/?utm_medium=product&utm_source=kendoangular&utm_campaign=kendo-ui-angular-purchase-license-keys-warning'
15
15
  };
@@ -41,8 +41,8 @@ const packageMetadata = {
41
41
  name: '@progress/kendo-angular-pivotgrid',
42
42
  productName: 'Kendo UI for Angular',
43
43
  productCodes: ['KENDOUIANGULAR', 'KENDOUICOMPLETE'],
44
- publishDate: 1683098039,
45
- version: '12.0.1-develop.2',
44
+ publishDate: 1683100397,
45
+ version: '12.0.1-develop.3',
46
46
  licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/?utm_medium=product&utm_source=kendoangular&utm_campaign=kendo-ui-angular-purchase-license-keys-warning'
47
47
  };
48
48
 
@@ -727,7 +727,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
727
727
  */
728
728
  class MenuTabbingService {
729
729
  constructor() {
730
- this.isColumnMenu = false;
731
730
  this.isPopupOpen = false;
732
731
  }
733
732
  }
@@ -827,7 +826,7 @@ class ChipMenuItemDirective {
827
826
  this.subs.unsubscribe();
828
827
  }
829
828
  getLastColumnMenuItem() {
830
- return (this.chipMenuItems.length === 1 ? this.chipMenuItems[0] : this.chipMenuItems[1]);
829
+ return this.chipMenuItems[this.chipMenuItems.length - 1];
831
830
  }
832
831
  }
833
832
  ChipMenuItemDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: ChipMenuItemDirective, deps: [{ token: i0.ElementRef }, { token: i0.Renderer2 }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Directive });
@@ -1345,7 +1344,7 @@ class FilterMenuContainerComponent {
1345
1344
  this.menuTabbingService = menuTabbingService;
1346
1345
  }
1347
1346
  ngAfterViewChecked() {
1348
- if (!this.menuTabbingService.isColumnMenu || (this.isLast && this.isExpanded)) {
1347
+ if (this.isLast && this.isExpanded) {
1349
1348
  this.menuTabbingService.lastFocusable = this.disabled ?
1350
1349
  this.resetButton.nativeElement : this.filterButton.nativeElement;
1351
1350
  }
@@ -1374,7 +1373,7 @@ class FilterMenuContainerComponent {
1374
1373
  this.close.emit();
1375
1374
  }
1376
1375
  onTab(e, buttonType) {
1377
- if (this.menuTabbingService.firstFocusable && (!this.menuTabbingService.isColumnMenu || this.isLast)) {
1376
+ if (this.menuTabbingService.firstFocusable && this.isLast) {
1378
1377
  e.preventDefault();
1379
1378
  if (buttonType === 'reset') {
1380
1379
  // eslint-disable-next-line no-unused-expressions
@@ -1502,6 +1501,13 @@ class ChipMenuFilterComponent extends ChipMenuItemBase {
1502
1501
  this.actionsClass = 'k-columnmenu-actions';
1503
1502
  this.filterSVGIcon = filterIcon;
1504
1503
  }
1504
+ ngAfterViewInit() {
1505
+ if (this.isLast) {
1506
+ this.service.menuTabbingService.lastFocusable = this.expanded ?
1507
+ this.hostElement.nativeElement.querySelector('.k-button:not([disabled])') :
1508
+ this.hostElement.nativeElement.querySelector('.k-columnmenu-item');
1509
+ }
1510
+ }
1505
1511
  onCollapse() {
1506
1512
  this.expanded = false;
1507
1513
  if (this.isLast) {
@@ -1511,6 +1517,9 @@ class ChipMenuFilterComponent extends ChipMenuItemBase {
1511
1517
  }
1512
1518
  onExpand() {
1513
1519
  this.expanded = true;
1520
+ if (this.isLast) {
1521
+ this.service.menuTabbingService.lastFocusable = this.hostElement.nativeElement.querySelector('.k-button:not([disabled])');
1522
+ }
1514
1523
  this.expand.emit();
1515
1524
  }
1516
1525
  /**
@@ -1652,6 +1661,7 @@ ChipMenuComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", vers
1652
1661
  <kendo-pivot-chipmenu-filter
1653
1662
  #filterItem
1654
1663
  [chip]="chip"
1664
+ [isLast]="true"
1655
1665
  [kendoPivotChipMenuItem]="filterItem"
1656
1666
  [service]="service">
1657
1667
  </kendo-pivot-chipmenu-filter>
@@ -1690,6 +1700,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
1690
1700
  <kendo-pivot-chipmenu-filter
1691
1701
  #filterItem
1692
1702
  [chip]="chip"
1703
+ [isLast]="true"
1693
1704
  [kendoPivotChipMenuItem]="filterItem"
1694
1705
  [service]="service">
1695
1706
  </kendo-pivot-chipmenu-filter>
@@ -1993,9 +2004,11 @@ class ChipKeyboardNavigationDirective {
1993
2004
  const chipElement = this.host.element.nativeElement;
1994
2005
  this.ngZone.runOutsideAngular(() => {
1995
2006
  this.keydownSub.add(this.renderer.listen(chipElement, 'keydown', (ev) => {
2007
+ ev.preventDefault();
1996
2008
  const isAltDown = ev.keyCode === Keys.ArrowDown && ev.altKey;
1997
2009
  const menuIcon = this.host.element.nativeElement.querySelector('.k-i-more-vertical');
1998
- const shiftAndMeta = ev.shiftKey && ev.metaKey;
2010
+ const isCtrlOrMeta = ev.ctrlKey || ev.metaKey;
2011
+ const shiftAndMeta = ev.shiftKey && isCtrlOrMeta;
1999
2012
  const isArrow = [Keys.ArrowLeft, Keys.ArrowRight, Keys.ArrowDown, Keys.ArrowUp].includes(ev.keyCode);
2000
2013
  const isReorderAction = shiftAndMeta && isArrow;
2001
2014
  if (isAltDown && menuIcon) {
@@ -40,8 +40,8 @@ const packageMetadata = {
40
40
  name: '@progress/kendo-angular-pivotgrid',
41
41
  productName: 'Kendo UI for Angular',
42
42
  productCodes: ['KENDOUIANGULAR', 'KENDOUICOMPLETE'],
43
- publishDate: 1683098039,
44
- version: '12.0.1-develop.2',
43
+ publishDate: 1683100397,
44
+ version: '12.0.1-develop.3',
45
45
  licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/?utm_medium=product&utm_source=kendoangular&utm_campaign=kendo-ui-angular-purchase-license-keys-warning'
46
46
  };
47
47
 
@@ -723,7 +723,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
723
723
  */
724
724
  class MenuTabbingService {
725
725
  constructor() {
726
- this.isColumnMenu = false;
727
726
  this.isPopupOpen = false;
728
727
  }
729
728
  }
@@ -823,7 +822,7 @@ class ChipMenuItemDirective {
823
822
  this.subs.unsubscribe();
824
823
  }
825
824
  getLastColumnMenuItem() {
826
- return (this.chipMenuItems.length === 1 ? this.chipMenuItems[0] : this.chipMenuItems[1]);
825
+ return this.chipMenuItems[this.chipMenuItems.length - 1];
827
826
  }
828
827
  }
829
828
  ChipMenuItemDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: ChipMenuItemDirective, deps: [{ token: i0.ElementRef }, { token: i0.Renderer2 }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Directive });
@@ -1338,7 +1337,7 @@ class FilterMenuContainerComponent {
1338
1337
  this.menuTabbingService = menuTabbingService;
1339
1338
  }
1340
1339
  ngAfterViewChecked() {
1341
- if (!this.menuTabbingService.isColumnMenu || (this.isLast && this.isExpanded)) {
1340
+ if (this.isLast && this.isExpanded) {
1342
1341
  this.menuTabbingService.lastFocusable = this.disabled ?
1343
1342
  this.resetButton.nativeElement : this.filterButton.nativeElement;
1344
1343
  }
@@ -1370,7 +1369,7 @@ class FilterMenuContainerComponent {
1370
1369
  this.close.emit();
1371
1370
  }
1372
1371
  onTab(e, buttonType) {
1373
- if (this.menuTabbingService.firstFocusable && (!this.menuTabbingService.isColumnMenu || this.isLast)) {
1372
+ if (this.menuTabbingService.firstFocusable && this.isLast) {
1374
1373
  e.preventDefault();
1375
1374
  if (buttonType === 'reset') {
1376
1375
  // eslint-disable-next-line no-unused-expressions
@@ -1498,6 +1497,13 @@ class ChipMenuFilterComponent extends ChipMenuItemBase {
1498
1497
  this.actionsClass = 'k-columnmenu-actions';
1499
1498
  this.filterSVGIcon = filterIcon;
1500
1499
  }
1500
+ ngAfterViewInit() {
1501
+ if (this.isLast) {
1502
+ this.service.menuTabbingService.lastFocusable = this.expanded ?
1503
+ this.hostElement.nativeElement.querySelector('.k-button:not([disabled])') :
1504
+ this.hostElement.nativeElement.querySelector('.k-columnmenu-item');
1505
+ }
1506
+ }
1501
1507
  onCollapse() {
1502
1508
  this.expanded = false;
1503
1509
  if (this.isLast) {
@@ -1507,6 +1513,9 @@ class ChipMenuFilterComponent extends ChipMenuItemBase {
1507
1513
  }
1508
1514
  onExpand() {
1509
1515
  this.expanded = true;
1516
+ if (this.isLast) {
1517
+ this.service.menuTabbingService.lastFocusable = this.hostElement.nativeElement.querySelector('.k-button:not([disabled])');
1518
+ }
1510
1519
  this.expand.emit();
1511
1520
  }
1512
1521
  /**
@@ -1648,6 +1657,7 @@ ChipMenuComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", vers
1648
1657
  <kendo-pivot-chipmenu-filter
1649
1658
  #filterItem
1650
1659
  [chip]="chip"
1660
+ [isLast]="true"
1651
1661
  [kendoPivotChipMenuItem]="filterItem"
1652
1662
  [service]="service">
1653
1663
  </kendo-pivot-chipmenu-filter>
@@ -1686,6 +1696,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
1686
1696
  <kendo-pivot-chipmenu-filter
1687
1697
  #filterItem
1688
1698
  [chip]="chip"
1699
+ [isLast]="true"
1689
1700
  [kendoPivotChipMenuItem]="filterItem"
1690
1701
  [service]="service">
1691
1702
  </kendo-pivot-chipmenu-filter>
@@ -1984,9 +1995,11 @@ class ChipKeyboardNavigationDirective {
1984
1995
  const chipElement = this.host.element.nativeElement;
1985
1996
  this.ngZone.runOutsideAngular(() => {
1986
1997
  this.keydownSub.add(this.renderer.listen(chipElement, 'keydown', (ev) => {
1998
+ ev.preventDefault();
1987
1999
  const isAltDown = ev.keyCode === Keys.ArrowDown && ev.altKey;
1988
2000
  const menuIcon = this.host.element.nativeElement.querySelector('.k-i-more-vertical');
1989
- const shiftAndMeta = ev.shiftKey && ev.metaKey;
2001
+ const isCtrlOrMeta = ev.ctrlKey || ev.metaKey;
2002
+ const shiftAndMeta = ev.shiftKey && isCtrlOrMeta;
1990
2003
  const isArrow = [Keys.ArrowLeft, Keys.ArrowRight, Keys.ArrowDown, Keys.ArrowUp].includes(ev.keyCode);
1991
2004
  const isReorderAction = shiftAndMeta && isArrow;
1992
2005
  if (isAltDown && menuIcon) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@progress/kendo-angular-pivotgrid",
3
- "version": "12.0.1-develop.2",
3
+ "version": "12.0.1-develop.3",
4
4
  "description": "PivotGrid package for Angular",
5
5
  "license": "SEE LICENSE IN LICENSE.md",
6
6
  "author": "Progress",
@@ -24,21 +24,21 @@
24
24
  "@progress/kendo-data-query": "^1.5.5",
25
25
  "@progress/kendo-drawing": "^1.17.2",
26
26
  "@progress/kendo-licensing": "^1.0.2",
27
- "@progress/kendo-angular-buttons": "12.0.1-develop.2",
28
- "@progress/kendo-angular-common": "12.0.1-develop.2",
29
- "@progress/kendo-angular-dropdowns": "12.0.1-develop.2",
30
- "@progress/kendo-angular-indicators": "12.0.1-develop.2",
31
- "@progress/kendo-angular-inputs": "12.0.1-develop.2",
32
- "@progress/kendo-angular-intl": "12.0.1-develop.2",
33
- "@progress/kendo-angular-l10n": "12.0.1-develop.2",
34
- "@progress/kendo-angular-popup": "12.0.1-develop.2",
35
- "@progress/kendo-angular-icons": "12.0.1-develop.2",
36
- "@progress/kendo-angular-treeview": "12.0.1-develop.2",
27
+ "@progress/kendo-angular-buttons": "12.0.1-develop.3",
28
+ "@progress/kendo-angular-common": "12.0.1-develop.3",
29
+ "@progress/kendo-angular-dropdowns": "12.0.1-develop.3",
30
+ "@progress/kendo-angular-indicators": "12.0.1-develop.3",
31
+ "@progress/kendo-angular-inputs": "12.0.1-develop.3",
32
+ "@progress/kendo-angular-intl": "12.0.1-develop.3",
33
+ "@progress/kendo-angular-l10n": "12.0.1-develop.3",
34
+ "@progress/kendo-angular-popup": "12.0.1-develop.3",
35
+ "@progress/kendo-angular-icons": "12.0.1-develop.3",
36
+ "@progress/kendo-angular-treeview": "12.0.1-develop.3",
37
37
  "rxjs": "^6.5.3 || ^7.0.0"
38
38
  },
39
39
  "dependencies": {
40
40
  "tslib": "^2.3.1",
41
- "@progress/kendo-angular-schematics": "12.0.1-develop.2",
41
+ "@progress/kendo-angular-schematics": "12.0.1-develop.3",
42
42
  "@progress/kendo-pivotgrid-common": "0.5.1"
43
43
  },
44
44
  "schematics": "./schematics/collection.json",
@@ -6,7 +6,7 @@ function default_1(options) {
6
6
  // Additional dependencies to install.
7
7
  // See https://github.com/telerik/kendo-schematics/issues/28
8
8
  peerDependencies: {
9
- '@progress/kendo-angular-dialog': '12.0.1-develop.2',
9
+ '@progress/kendo-angular-dialog': '12.0.1-develop.3',
10
10
  // peer dep of the icons
11
11
  '@progress/kendo-svg-icons': '^1.0.0'
12
12
  } });