@progress/kendo-angular-filter 14.0.2-develop.9 → 14.1.0-develop.10

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.
Files changed (7) hide show
  1. package/esm2020/base-filter-row.component.mjs +8 -3
  2. package/esm2020/filter.component.mjs +3 -2
  3. package/esm2020/package-metadata.mjs +2 -2
  4. package/fesm2015/progress-kendo-angular-filter.mjs +13 -7
  5. package/fesm2020/progress-kendo-angular-filter.mjs +13 -7
  6. package/package.json +15 -15
  7. package/schematics/ngAdd/index.js +3 -3
package/esm2020/base-filter-row.component.mjs CHANGED
@@ -29,9 +29,12 @@ export class BaseFilterRowComponent {
29
29
  onMouseDown(event) {
30
30
  let elementToFocus;
31
31
  const closestFilterToolbarItem = event.target.closest(selectors.kendoFilterToolbarItem);
32
+ const closestButton = event.target.closest(selectors.kendoFilterToolbarButton);
32
33
  const closestToolbarItem = event.target.closest(selectors.kendoToolbar);
33
- if (closestFilterToolbarItem) {
34
- const index = Array.from(closestToolbarItem.children).indexOf(closestFilterToolbarItem);
34
+ if (closestFilterToolbarItem || closestButton) {
35
+ const index = Array.from(closestToolbarItem.children).indexOf(closestFilterToolbarItem) > -1
36
+ ? Array.from(closestToolbarItem.children).indexOf(closestFilterToolbarItem)
37
+ : Array.from(closestToolbarItem.children).indexOf(closestButton);
35
38
  this.navigationService.currentToolbarItemChildrenIndex = index;
36
39
  this.navigationService.isInnerNavigationActivated = true;
37
40
  this.navigationService.isFilterExpressionComponentFocused = true;
@@ -40,7 +43,9 @@ export class BaseFilterRowComponent {
40
43
  wrapperElement.querySelector(selectors.kendoInput) ||
41
44
  wrapperElement.querySelector(selectors.kendoInputInner) ||
42
45
  wrapperElement.querySelector(selectors.inputElement) ||
43
- wrapperElement.querySelector(selectors.textAreaElement);
46
+ wrapperElement.querySelector(selectors.textAreaElement) ||
47
+ wrapperElement.querySelector(selectors.kendoButton) ||
48
+ wrapperElement;
44
49
  }
45
50
  else {
46
51
  this.navigationService.currentToolbarItemChildrenIndex = 0;
package/esm2020/filter.component.mjs CHANGED
@@ -186,8 +186,9 @@ export class FilterComponent {
186
186
  }
187
187
  this.navigationService.isFilterExpressionComponentFocused = false;
188
188
  const itemIndex = this.navigationService.currentToolbarItemIndex;
189
- const activeChildIndex = this.navigationService.currentToolbarItemChildrenIndex;
190
- this.navigationService.currentlyFocusedElement = this.navigationService.flattenFilterItems[itemIndex].focusableChildren[activeChildIndex];
189
+ const toolbarItem = this.navigationService.flattenFilterItems[itemIndex];
190
+ const activeChildIndex = toolbarItem.focusableChildren.length - 1;
191
+ this.navigationService.currentlyFocusedElement = toolbarItem.focusableChildren[activeChildIndex];
191
192
  this.renderer.setAttribute(this.navigationService.currentlyFocusedElement, 'tabindex', '0');
192
193
  this.renderer.addClass(this.navigationService.currentlyFocusedElement, 'k-focus');
193
194
  this.navigationService.currentlyFocusedElement.focus();
package/esm2020/package-metadata.mjs CHANGED
@@ -9,7 +9,7 @@ export const packageMetadata = {
9
9
  name: '@progress/kendo-angular-filter',
10
10
  productName: 'Kendo UI for Angular',
11
11
  productCodes: ['KENDOUIANGULAR', 'KENDOUICOMPLETE'],
12
- publishDate: 1698069155,
13
- version: '14.0.2-develop.9',
12
+ publishDate: 1699437599,
13
+ version: '14.1.0-develop.10',
14
14
  licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/'
15
15
  };
package/fesm2015/progress-kendo-angular-filter.mjs CHANGED
@@ -235,8 +235,8 @@ const packageMetadata = {
235
235
  name: '@progress/kendo-angular-filter',
236
236
  productName: 'Kendo UI for Angular',
237
237
  productCodes: ['KENDOUIANGULAR', 'KENDOUICOMPLETE'],
238
- publishDate: 1698069155,
239
- version: '14.0.2-develop.9',
238
+ publishDate: 1699437599,
239
+ version: '14.1.0-develop.10',
240
240
  licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/'
241
241
  };
242
242
 
@@ -494,9 +494,12 @@ class BaseFilterRowComponent {
494
494
  onMouseDown(event) {
495
495
  let elementToFocus;
496
496
  const closestFilterToolbarItem = event.target.closest(selectors.kendoFilterToolbarItem);
497
+ const closestButton = event.target.closest(selectors.kendoFilterToolbarButton);
497
498
  const closestToolbarItem = event.target.closest(selectors.kendoToolbar);
498
- if (closestFilterToolbarItem) {
499
- const index = Array.from(closestToolbarItem.children).indexOf(closestFilterToolbarItem);
499
+ if (closestFilterToolbarItem || closestButton) {
500
+ const index = Array.from(closestToolbarItem.children).indexOf(closestFilterToolbarItem) > -1
501
+ ? Array.from(closestToolbarItem.children).indexOf(closestFilterToolbarItem)
502
+ : Array.from(closestToolbarItem.children).indexOf(closestButton);
500
503
  this.navigationService.currentToolbarItemChildrenIndex = index;
501
504
  this.navigationService.isInnerNavigationActivated = true;
502
505
  this.navigationService.isFilterExpressionComponentFocused = true;
@@ -505,7 +508,9 @@ class BaseFilterRowComponent {
505
508
  wrapperElement.querySelector(selectors.kendoInput) ||
506
509
  wrapperElement.querySelector(selectors.kendoInputInner) ||
507
510
  wrapperElement.querySelector(selectors.inputElement) ||
508
- wrapperElement.querySelector(selectors.textAreaElement);
511
+ wrapperElement.querySelector(selectors.textAreaElement) ||
512
+ wrapperElement.querySelector(selectors.kendoButton) ||
513
+ wrapperElement;
509
514
  }
510
515
  else {
511
516
  this.navigationService.currentToolbarItemChildrenIndex = 0;
@@ -1695,8 +1700,9 @@ class FilterComponent {
1695
1700
  }
1696
1701
  this.navigationService.isFilterExpressionComponentFocused = false;
1697
1702
  const itemIndex = this.navigationService.currentToolbarItemIndex;
1698
- const activeChildIndex = this.navigationService.currentToolbarItemChildrenIndex;
1699
- this.navigationService.currentlyFocusedElement = this.navigationService.flattenFilterItems[itemIndex].focusableChildren[activeChildIndex];
1703
+ const toolbarItem = this.navigationService.flattenFilterItems[itemIndex];
1704
+ const activeChildIndex = toolbarItem.focusableChildren.length - 1;
1705
+ this.navigationService.currentlyFocusedElement = toolbarItem.focusableChildren[activeChildIndex];
1700
1706
  this.renderer.setAttribute(this.navigationService.currentlyFocusedElement, 'tabindex', '0');
1701
1707
  this.renderer.addClass(this.navigationService.currentlyFocusedElement, 'k-focus');
1702
1708
  this.navigationService.currentlyFocusedElement.focus();
package/fesm2020/progress-kendo-angular-filter.mjs CHANGED
@@ -235,8 +235,8 @@ const packageMetadata = {
235
235
  name: '@progress/kendo-angular-filter',
236
236
  productName: 'Kendo UI for Angular',
237
237
  productCodes: ['KENDOUIANGULAR', 'KENDOUICOMPLETE'],
238
- publishDate: 1698069155,
239
- version: '14.0.2-develop.9',
238
+ publishDate: 1699437599,
239
+ version: '14.1.0-develop.10',
240
240
  licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/'
241
241
  };
242
242
 
@@ -493,9 +493,12 @@ class BaseFilterRowComponent {
493
493
  onMouseDown(event) {
494
494
  let elementToFocus;
495
495
  const closestFilterToolbarItem = event.target.closest(selectors.kendoFilterToolbarItem);
496
+ const closestButton = event.target.closest(selectors.kendoFilterToolbarButton);
496
497
  const closestToolbarItem = event.target.closest(selectors.kendoToolbar);
497
- if (closestFilterToolbarItem) {
498
- const index = Array.from(closestToolbarItem.children).indexOf(closestFilterToolbarItem);
498
+ if (closestFilterToolbarItem || closestButton) {
499
+ const index = Array.from(closestToolbarItem.children).indexOf(closestFilterToolbarItem) > -1
500
+ ? Array.from(closestToolbarItem.children).indexOf(closestFilterToolbarItem)
501
+ : Array.from(closestToolbarItem.children).indexOf(closestButton);
499
502
  this.navigationService.currentToolbarItemChildrenIndex = index;
500
503
  this.navigationService.isInnerNavigationActivated = true;
501
504
  this.navigationService.isFilterExpressionComponentFocused = true;
@@ -504,7 +507,9 @@ class BaseFilterRowComponent {
504
507
  wrapperElement.querySelector(selectors.kendoInput) ||
505
508
  wrapperElement.querySelector(selectors.kendoInputInner) ||
506
509
  wrapperElement.querySelector(selectors.inputElement) ||
507
- wrapperElement.querySelector(selectors.textAreaElement);
510
+ wrapperElement.querySelector(selectors.textAreaElement) ||
511
+ wrapperElement.querySelector(selectors.kendoButton) ||
512
+ wrapperElement;
508
513
  }
509
514
  else {
510
515
  this.navigationService.currentToolbarItemChildrenIndex = 0;
@@ -1695,8 +1700,9 @@ class FilterComponent {
1695
1700
  }
1696
1701
  this.navigationService.isFilterExpressionComponentFocused = false;
1697
1702
  const itemIndex = this.navigationService.currentToolbarItemIndex;
1698
- const activeChildIndex = this.navigationService.currentToolbarItemChildrenIndex;
1699
- this.navigationService.currentlyFocusedElement = this.navigationService.flattenFilterItems[itemIndex].focusableChildren[activeChildIndex];
1703
+ const toolbarItem = this.navigationService.flattenFilterItems[itemIndex];
1704
+ const activeChildIndex = toolbarItem.focusableChildren.length - 1;
1705
+ this.navigationService.currentlyFocusedElement = toolbarItem.focusableChildren[activeChildIndex];
1700
1706
  this.renderer.setAttribute(this.navigationService.currentlyFocusedElement, 'tabindex', '0');
1701
1707
  this.renderer.addClass(this.navigationService.currentlyFocusedElement, 'k-focus');
1702
1708
  this.navigationService.currentlyFocusedElement.focus();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@progress/kendo-angular-filter",
3
- "version": "14.0.2-develop.9",
3
+ "version": "14.1.0-develop.10",
4
4
  "description": "Kendo UI Angular Filter",
5
5
  "license": "SEE LICENSE IN LICENSE.md",
6
6
  "author": "Progress",
@@ -16,26 +16,26 @@
16
16
  "friendlyName": "Filter"
17
17
  },
18
18
  "peerDependencies": {
19
- "@angular/animations": "13 - 16",
20
- "@angular/common": "13 - 16",
21
- "@angular/core": "13 - 16",
22
- "@angular/platform-browser": "13 - 16",
19
+ "@angular/animations": "13 - 17",
20
+ "@angular/common": "13 - 17",
21
+ "@angular/core": "13 - 17",
22
+ "@angular/platform-browser": "13 - 17",
23
23
  "@progress/kendo-data-query": "^1.5.5",
24
24
  "@progress/kendo-licensing": "^1.0.2",
25
- "@progress/kendo-angular-buttons": "14.0.2-develop.9",
26
- "@progress/kendo-angular-common": "14.0.2-develop.9",
27
- "@progress/kendo-angular-dateinputs": "14.0.2-develop.9",
28
- "@progress/kendo-angular-dropdowns": "14.0.2-develop.9",
29
- "@progress/kendo-angular-inputs": "14.0.2-develop.9",
30
- "@progress/kendo-angular-intl": "14.0.2-develop.9",
31
- "@progress/kendo-angular-l10n": "14.0.2-develop.9",
32
- "@progress/kendo-angular-icons": "14.0.2-develop.9",
33
- "@progress/kendo-angular-label": "14.0.2-develop.9",
25
+ "@progress/kendo-angular-buttons": "14.1.0-develop.10",
26
+ "@progress/kendo-angular-common": "14.1.0-develop.10",
27
+ "@progress/kendo-angular-dateinputs": "14.1.0-develop.10",
28
+ "@progress/kendo-angular-dropdowns": "14.1.0-develop.10",
29
+ "@progress/kendo-angular-inputs": "14.1.0-develop.10",
30
+ "@progress/kendo-angular-intl": "14.1.0-develop.10",
31
+ "@progress/kendo-angular-l10n": "14.1.0-develop.10",
32
+ "@progress/kendo-angular-icons": "14.1.0-develop.10",
33
+ "@progress/kendo-angular-label": "14.1.0-develop.10",
34
34
  "rxjs": "^6.5.3 || ^7.0.0"
35
35
  },
36
36
  "dependencies": {
37
37
  "tslib": "^2.3.1",
38
- "@progress/kendo-angular-schematics": "14.0.2-develop.9"
38
+ "@progress/kendo-angular-schematics": "14.1.0-develop.10"
39
39
  },
40
40
  "schematics": "./schematics/collection.json",
41
41
  "module": "fesm2015/progress-kendo-angular-filter.mjs",
package/schematics/ngAdd/index.js CHANGED
@@ -4,11 +4,11 @@ const schematics_1 = require("@angular-devkit/schematics");
4
4
  function default_1(options) {
5
5
  const finalOptions = Object.assign(Object.assign({}, options), { mainNgModule: 'FilterModule', package: 'filter', peerDependencies: {
6
6
  // peer dep of the dropdowns
7
- '@progress/kendo-angular-treeview': '14.0.2-develop.9',
8
- '@progress/kendo-angular-popup': '14.0.2-develop.9',
7
+ '@progress/kendo-angular-treeview': '14.1.0-develop.10',
8
+ '@progress/kendo-angular-popup': '14.1.0-develop.10',
9
9
  // peer dependency of kendo-angular-inputs
10
10
  '@progress/kendo-drawing': '^1.16.0',
11
- '@progress/kendo-angular-dialog': '14.0.2-develop.9',
11
+ '@progress/kendo-angular-dialog': '14.1.0-develop.10',
12
12
  // Peer dependency of icons
13
13
  '@progress/kendo-svg-icons': '^2.0.0'
14
14
  } });