@progress/kendo-angular-common 17.3.0-develop.1 → 17.3.0-develop.2

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 (3) hide show
  1. package/esm2022/toggle-button-tab-stop/toggle-button-tab-stop.directive.mjs +22 -24
  2. package/fesm2022/progress-kendo-angular-common.mjs +22 -24
  3. package/package.json +2 -2
package/esm2022/toggle-button-tab-stop/toggle-button-tab-stop.directive.mjs CHANGED
@@ -77,31 +77,29 @@ export class ToggleButtonTabStopDirective {
77
77
  if (this.active) {
78
78
  this.activateButton();
79
79
  }
80
- if (this.hostComponent?.escape instanceof EventEmitter) {
81
- this.sub = this.hostComponent?.escape.subscribe(() => {
82
- this.returnFocusToToggleButton();
83
- });
84
- // Returns the focus to the toggle button when component is opened through it, and the Popup is closed
85
- // while the active element is within the component or popup.
86
- this.sub.add(this.hostComponent.close.subscribe((e) => {
87
- if (!e.isDefaultPrevented() && this.focusButton) {
88
- this.zone.onStable.pipe(take(1)).subscribe(() => {
89
- this.zone.runOutsideAngular(() => {
90
- setTimeout(() => this.focusButton = false);
91
- });
92
- });
93
- const mainFocusableElement = this.hostEl.nativeElement.querySelector('.k-split-button > .k-button:first-child, .k-input-inner');
94
- const optionsListContainer = document.getElementById(`${mainFocusableElement.getAttribute('aria-controls')}`);
95
- const inList = !!optionsListContainer && optionsListContainer.contains(document.activeElement);
96
- const inWrapper = this.hostEl.nativeElement.contains(document.activeElement);
97
- const focusInComponent = inList || inWrapper;
98
- if (focusInComponent) {
99
- this.returnFocusToToggleButton();
100
- }
101
- }
102
- }));
80
+ if (!(this.hostComponent?.escape instanceof EventEmitter)) {
81
+ return;
103
82
  }
104
- const close = this.hostComponent.close;
83
+ this.sub = this.hostComponent?.escape.subscribe(() => {
84
+ this.returnFocusToToggleButton();
85
+ });
86
+ // Returns the focus to the toggle button when component is opened through it, and the Popup is closed
87
+ // while the active element is within the component or popup.
88
+ this.sub.add(this.hostComponent.close.subscribe((e) => {
89
+ if (!e.isDefaultPrevented() && this.focusButton) {
90
+ this.zone.runOutsideAngular(() => {
91
+ setTimeout(() => this.focusButton = false);
92
+ });
93
+ const mainFocusableElement = this.hostEl.nativeElement.querySelector('.k-split-button > .k-button:first-child, .k-input-inner');
94
+ const optionsListContainer = document.getElementById(`${mainFocusableElement.getAttribute('aria-controls')}`);
95
+ const inList = !!optionsListContainer && optionsListContainer.contains(document.activeElement);
96
+ const inWrapper = this.hostEl.nativeElement.contains(document.activeElement);
97
+ const focusInComponent = inList || inWrapper;
98
+ if (focusInComponent) {
99
+ this.returnFocusToToggleButton();
100
+ }
101
+ }
102
+ }));
105
103
  }
106
104
  ngOnChanges(changes) {
107
105
  if (!isDocumentAvailable()) {
package/fesm2022/progress-kendo-angular-common.mjs CHANGED
@@ -1315,31 +1315,29 @@ class ToggleButtonTabStopDirective {
1315
1315
  if (this.active) {
1316
1316
  this.activateButton();
1317
1317
  }
1318
- if (this.hostComponent?.escape instanceof EventEmitter) {
1319
- this.sub = this.hostComponent?.escape.subscribe(() => {
1320
- this.returnFocusToToggleButton();
1321
- });
1322
- // Returns the focus to the toggle button when component is opened through it, and the Popup is closed
1323
- // while the active element is within the component or popup.
1324
- this.sub.add(this.hostComponent.close.subscribe((e) => {
1325
- if (!e.isDefaultPrevented() && this.focusButton) {
1326
- this.zone.onStable.pipe(take(1)).subscribe(() => {
1327
- this.zone.runOutsideAngular(() => {
1328
- setTimeout(() => this.focusButton = false);
1329
- });
1330
- });
1331
- const mainFocusableElement = this.hostEl.nativeElement.querySelector('.k-split-button > .k-button:first-child, .k-input-inner');
1332
- const optionsListContainer = document.getElementById(`${mainFocusableElement.getAttribute('aria-controls')}`);
1333
- const inList = !!optionsListContainer && optionsListContainer.contains(document.activeElement);
1334
- const inWrapper = this.hostEl.nativeElement.contains(document.activeElement);
1335
- const focusInComponent = inList || inWrapper;
1336
- if (focusInComponent) {
1337
- this.returnFocusToToggleButton();
1338
- }
1339
- }
1340
- }));
1318
+ if (!(this.hostComponent?.escape instanceof EventEmitter)) {
1319
+ return;
1341
1320
  }
1342
- const close = this.hostComponent.close;
1321
+ this.sub = this.hostComponent?.escape.subscribe(() => {
1322
+ this.returnFocusToToggleButton();
1323
+ });
1324
+ // Returns the focus to the toggle button when component is opened through it, and the Popup is closed
1325
+ // while the active element is within the component or popup.
1326
+ this.sub.add(this.hostComponent.close.subscribe((e) => {
1327
+ if (!e.isDefaultPrevented() && this.focusButton) {
1328
+ this.zone.runOutsideAngular(() => {
1329
+ setTimeout(() => this.focusButton = false);
1330
+ });
1331
+ const mainFocusableElement = this.hostEl.nativeElement.querySelector('.k-split-button > .k-button:first-child, .k-input-inner');
1332
+ const optionsListContainer = document.getElementById(`${mainFocusableElement.getAttribute('aria-controls')}`);
1333
+ const inList = !!optionsListContainer && optionsListContainer.contains(document.activeElement);
1334
+ const inWrapper = this.hostEl.nativeElement.contains(document.activeElement);
1335
+ const focusInComponent = inList || inWrapper;
1336
+ if (focusInComponent) {
1337
+ this.returnFocusToToggleButton();
1338
+ }
1339
+ }
1340
+ }));
1343
1341
  }
1344
1342
  ngOnChanges(changes) {
1345
1343
  if (!isDocumentAvailable()) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@progress/kendo-angular-common",
3
- "version": "17.3.0-develop.1",
3
+ "version": "17.3.0-develop.2",
4
4
  "description": "Kendo UI for Angular - Utility Package",
5
5
  "license": "SEE LICENSE IN LICENSE.md",
6
6
  "author": "Progress",
@@ -23,7 +23,7 @@
23
23
  "@progress/kendo-common": "^1.0.1",
24
24
  "@progress/kendo-draggable": "^3.0.2",
25
25
  "tslib": "^2.3.1",
26
- "@progress/kendo-angular-schematics": "17.3.0-develop.1"
26
+ "@progress/kendo-angular-schematics": "17.3.0-develop.2"
27
27
  },
28
28
  "publishConfig": {
29
29
  "access": "public"