@skyux/indicators 6.10.0 → 6.11.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 (6) hide show
  1. package/esm2020/lib/modules/wait/wait-adapter.service.mjs +18 -1
  2. package/fesm2015/skyux-indicators.mjs +17 -0
  3. package/fesm2015/skyux-indicators.mjs.map +1 -1
  4. package/fesm2020/skyux-indicators.mjs +17 -0
  5. package/fesm2020/skyux-indicators.mjs.map +1 -1
  6. package/package.json +5 -5
package/esm2020/lib/modules/wait/wait-adapter.service.mjs CHANGED
@@ -26,10 +26,16 @@ export class SkyWaitAdapterService {
26
26
  : waitEl.nativeElement.parentElement;
27
27
  if (!isNonBlocking) {
28
28
  if (isWaiting) {
29
+ let restoreFocusElement = undefined;
30
+ let restoreFocusCheckElement = undefined;
29
31
  this.renderer.setAttribute(busyEl, 'aria-busy', 'true');
30
32
  // Remove focus from page when full page blocking wait
31
33
  if (isFullPage || busyEl.contains(document.activeElement)) {
34
+ if (document.activeElement !== document.body) {
35
+ restoreFocusElement = document.activeElement;
36
+ }
32
37
  this.clearDocumentFocus();
38
+ restoreFocusCheckElement = document.activeElement;
33
39
  }
34
40
  if (isFullPage) {
35
41
  SkyWaitAdapterService.isPageWaitActive = true;
@@ -49,6 +55,8 @@ export class SkyWaitAdapterService {
49
55
  SkyWaitAdapterService.busyElements[waitComponentId] = {
50
56
  listener: endListenerFunc,
51
57
  busyEl: undefined,
58
+ restoreFocusElement,
59
+ restoreFocusCheckElement,
52
60
  };
53
61
  }
54
62
  else {
@@ -72,6 +80,8 @@ export class SkyWaitAdapterService {
72
80
  SkyWaitAdapterService.busyElements[waitComponentId] = {
73
81
  listener: endListenerFunc,
74
82
  busyEl: busyEl,
83
+ restoreFocusElement,
84
+ restoreFocusCheckElement,
75
85
  };
76
86
  }
77
87
  }
@@ -82,6 +92,13 @@ export class SkyWaitAdapterService {
82
92
  }
83
93
  if (waitComponentId in SkyWaitAdapterService.busyElements) {
84
94
  SkyWaitAdapterService.busyElements[waitComponentId].listener();
95
+ // If there is a restore focus element and the focus has not moved, restore focus.
96
+ if (SkyWaitAdapterService.busyElements[waitComponentId]
97
+ .restoreFocusElement &&
98
+ SkyWaitAdapterService.busyElements[waitComponentId]
99
+ .restoreFocusCheckElement === document.activeElement) {
100
+ SkyWaitAdapterService.busyElements[waitComponentId].restoreFocusElement.focus();
101
+ }
85
102
  delete SkyWaitAdapterService.busyElements[waitComponentId];
86
103
  }
87
104
  }
@@ -198,4 +215,4 @@ SkyWaitAdapterService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0"
198
215
  i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: SkyWaitAdapterService, decorators: [{
199
216
  type: Injectable
200
217
  }], ctorParameters: function () { return [{ type: i0.RendererFactory2 }]; } });
201
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"wait-adapter.service.js","sourceRoot":"","sources":["../../../../../../../../libs/components/indicators/src/lib/modules/wait/wait-adapter.service.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  ElementRef,\n  Injectable,\n  OnDestroy,\n  Renderer2,\n  RendererFactory2,\n} from '@angular/core';\n\n// Need to add the following to classes which contain static methods.\n// See: https://github.com/ng-packagr/ng-packagr/issues/641\n/**\n * @internal\n * @dynamic\n */\n@Injectable()\nexport class SkyWaitAdapterService implements OnDestroy {\n  private static isPageWaitActive = false;\n  private static busyElements: {\n    [key: string]: { busyEl: HTMLElement; listener: any };\n  } = {};\n\n  private focussableElements: HTMLElement[];\n\n  private renderer: Renderer2;\n\n  constructor(private rendererFactory: RendererFactory2) {\n    this.renderer = this.rendererFactory.createRenderer(undefined, undefined);\n  }\n\n  public ngOnDestroy(): void {\n    this.clearListeners();\n  }\n\n  public setWaitBounds(waitEl: ElementRef): void {\n    this.renderer.setStyle(\n      waitEl.nativeElement.parentElement,\n      'position',\n      'relative'\n    );\n  }\n\n  public removeWaitBounds(waitEl: ElementRef): void {\n    this.renderer.removeStyle(waitEl.nativeElement.parentElement, 'position');\n  }\n\n  public setBusyState(\n    waitEl: ElementRef,\n    isFullPage: boolean,\n    isWaiting: boolean,\n    isNonBlocking = false,\n    waitComponentId?: string\n  ): void {\n    const busyEl = isFullPage\n      ? document.body\n      : waitEl.nativeElement.parentElement;\n\n    if (!isNonBlocking) {\n      if (isWaiting) {\n        this.renderer.setAttribute(busyEl, 'aria-busy', 'true');\n\n        // Remove focus from page when full page blocking wait\n        if (isFullPage || busyEl.contains(document.activeElement)) {\n          this.clearDocumentFocus();\n        }\n\n        if (isFullPage) {\n          SkyWaitAdapterService.isPageWaitActive = true;\n          const endListenerFunc = this.renderer.listen(\n            document.body,\n            'keydown',\n            (event: KeyboardEvent) => {\n              /*istanbul ignore else */\n              if (event.key) {\n                /* istanbul ignore else */\n                if (event.key.toLowerCase() === 'tab') {\n                  (event.target as any).blur();\n                  event.preventDefault();\n                  event.stopPropagation();\n                  event.stopImmediatePropagation();\n                  this.clearDocumentFocus();\n                }\n              }\n            }\n          );\n          SkyWaitAdapterService.busyElements[waitComponentId] = {\n            listener: endListenerFunc,\n            busyEl: undefined,\n          };\n        } else {\n          const endListenerFunc = this.renderer.listen(\n            busyEl,\n            'focusin',\n            (event: KeyboardEvent) => {\n              /* istanbul ignore else */\n              if (!isNonBlocking) {\n                event.preventDefault();\n                event.stopPropagation();\n                event.stopImmediatePropagation();\n\n                if (SkyWaitAdapterService.isPageWaitActive) {\n                  this.clearDocumentFocus();\n                } else {\n                  // Propagate tab navigation if attempted into waited element\n                  const target: any = event.target;\n                  target.blur();\n                  this.focusNextElement(target, this.isShift(event), busyEl);\n                }\n              }\n            }\n          );\n          SkyWaitAdapterService.busyElements[waitComponentId] = {\n            listener: endListenerFunc,\n            busyEl: busyEl,\n          };\n        }\n      } else {\n        this.renderer.removeAttribute(busyEl, 'aria-busy');\n\n        if (isFullPage) {\n          SkyWaitAdapterService.isPageWaitActive = false;\n        }\n        if (waitComponentId in SkyWaitAdapterService.busyElements) {\n          SkyWaitAdapterService.busyElements[waitComponentId].listener();\n          delete SkyWaitAdapterService.busyElements[waitComponentId];\n        }\n      }\n    }\n  }\n\n  private focusNextElement(\n    targetElement: HTMLElement,\n    shiftKey: boolean,\n    busyEl: Element\n  ): void {\n    const focussable = this.getFocussableElements();\n\n    // If shift tab, go in the other direction\n    const modifier = shiftKey ? -1 : 1;\n\n    // Find the next navigable element that isn't waiting\n    const startingIndex = focussable.indexOf(targetElement);\n    let curIndex = startingIndex + modifier;\n    while (\n      focussable[curIndex] &&\n      this.isElementBusyOrHidden(focussable[curIndex])\n    ) {\n      curIndex += modifier;\n    }\n\n    if (\n      focussable[curIndex] &&\n      !this.isElementBusyOrHidden(focussable[curIndex])\n    ) {\n      focussable[curIndex].focus();\n    } else {\n      // Try wrapping the navigation\n      /* istanbul ignore next */\n      /* sanity check */\n      curIndex = modifier > 0 ? 0 : focussable.length - 1;\n      while (\n        curIndex !== startingIndex &&\n        focussable[curIndex] &&\n        this.isElementBusyOrHidden(focussable[curIndex])\n      ) {\n        /* istanbul ignore next */\n        /* sanity check */\n        curIndex += modifier;\n      }\n\n      /* istanbul ignore else */\n      /* sanity check */\n      if (\n        focussable[curIndex] &&\n        !this.isElementBusyOrHidden(focussable[curIndex])\n      ) {\n        focussable[curIndex].focus();\n      } else {\n        // No valid target, wipe focus\n        this.clearDocumentFocus();\n      }\n    }\n\n    // clear focussableElements list\n    this.focussableElements = undefined;\n  }\n\n  private isShift(event: Event): boolean {\n    // Determine if shift+tab was used based on element order\n    const elements = this.getFocussableElements().filter(\n      (elem) => !this.isElementHidden(elem)\n    );\n\n    const previousInd = elements.indexOf((event as any).relatedTarget);\n    const currentInd = elements.indexOf(event.target as HTMLElement);\n\n    return (\n      previousInd === currentInd + 1 ||\n      (previousInd === 0 && currentInd === elements.length - 1) ||\n      previousInd > currentInd ||\n      !(event as any).relatedTarget\n    );\n  }\n\n  private isElementHidden(element: any): boolean {\n    const style = window.getComputedStyle(element);\n    return style.display === 'none' || style.visibility === 'hidden';\n  }\n\n  private isElementBusyOrHidden(element: any): boolean {\n    if (this.isElementHidden(element)) {\n      return true;\n    }\n\n    for (const key of Object.keys(SkyWaitAdapterService.busyElements)) {\n      const parentElement = SkyWaitAdapterService.busyElements[key].busyEl;\n      if (parentElement && parentElement.contains(element)) {\n        return true;\n      }\n    }\n    return false;\n  }\n\n  private clearDocumentFocus(): void {\n    /* istanbul ignore else */\n    if (document.activeElement && (document.activeElement as any).blur) {\n      (document.activeElement as any).blur();\n    }\n    document.body.focus();\n  }\n\n  private getFocussableElements(): HTMLElement[] {\n    // Keep this cached so we can reduce querys\n    if (this.focussableElements) {\n      return this.focussableElements;\n    }\n\n    // Select all possible focussable elements\n    const focussableElements =\n      'a[href], ' +\n      'area[href], ' +\n      \"input:not([disabled]):not([tabindex='-1']), \" +\n      \"button:not([disabled]):not([tabindex='-1']), \" +\n      \"select:not([disabled]):not([tabindex='-1']), \" +\n      \"textarea:not([disabled]):not([tabindex='-1']), \" +\n      'iframe, object, embed, ' +\n      \"*[tabindex]:not([tabindex='-1']), \" +\n      '*[contenteditable=true]';\n\n    this.focussableElements = Array.prototype.filter.call(\n      document.body.querySelectorAll(focussableElements),\n      (element: any) => {\n        return (\n          element.offsetWidth > 0 ||\n          element.offsetHeight > 0 ||\n          element === document.activeElement\n        );\n      }\n    );\n    return this.focussableElements;\n  }\n\n  private clearListeners(): void {\n    SkyWaitAdapterService.isPageWaitActive = false;\n    for (const key of Object.keys(SkyWaitAdapterService.busyElements)) {\n      SkyWaitAdapterService.busyElements[key].listener();\n      delete SkyWaitAdapterService.busyElements[key];\n    }\n  }\n}\n"]}
218
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"wait-adapter.service.js","sourceRoot":"","sources":["../../../../../../../../libs/components/indicators/src/lib/modules/wait/wait-adapter.service.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  ElementRef,\n  Injectable,\n  OnDestroy,\n  Renderer2,\n  RendererFactory2,\n} from '@angular/core';\n\n// Need to add the following to classes which contain static methods.\n// See: https://github.com/ng-packagr/ng-packagr/issues/641\n/**\n * @internal\n * @dynamic\n */\n@Injectable()\nexport class SkyWaitAdapterService implements OnDestroy {\n  private static isPageWaitActive = false;\n  private static busyElements: {\n    [key: string]: {\n      busyEl: HTMLElement;\n      listener: any;\n      restoreFocusElement?: HTMLElement | undefined;\n      restoreFocusCheckElement?: HTMLElement | undefined;\n    };\n  } = {};\n\n  private focussableElements: HTMLElement[];\n\n  private renderer: Renderer2;\n\n  constructor(private rendererFactory: RendererFactory2) {\n    this.renderer = this.rendererFactory.createRenderer(undefined, undefined);\n  }\n\n  public ngOnDestroy(): void {\n    this.clearListeners();\n  }\n\n  public setWaitBounds(waitEl: ElementRef): void {\n    this.renderer.setStyle(\n      waitEl.nativeElement.parentElement,\n      'position',\n      'relative'\n    );\n  }\n\n  public removeWaitBounds(waitEl: ElementRef): void {\n    this.renderer.removeStyle(waitEl.nativeElement.parentElement, 'position');\n  }\n\n  public setBusyState(\n    waitEl: ElementRef,\n    isFullPage: boolean,\n    isWaiting: boolean,\n    isNonBlocking = false,\n    waitComponentId?: string\n  ): void {\n    const busyEl = isFullPage\n      ? document.body\n      : waitEl.nativeElement.parentElement;\n\n    if (!isNonBlocking) {\n      if (isWaiting) {\n        let restoreFocusElement: HTMLElement | undefined = undefined;\n        let restoreFocusCheckElement: HTMLElement | undefined = undefined;\n        this.renderer.setAttribute(busyEl, 'aria-busy', 'true');\n\n        // Remove focus from page when full page blocking wait\n        if (isFullPage || busyEl.contains(document.activeElement)) {\n          if (document.activeElement !== document.body) {\n            restoreFocusElement = document.activeElement as HTMLElement;\n          }\n          this.clearDocumentFocus();\n          restoreFocusCheckElement = document.activeElement as HTMLElement;\n        }\n\n        if (isFullPage) {\n          SkyWaitAdapterService.isPageWaitActive = true;\n          const endListenerFunc = this.renderer.listen(\n            document.body,\n            'keydown',\n            (event: KeyboardEvent) => {\n              /*istanbul ignore else */\n              if (event.key) {\n                /* istanbul ignore else */\n                if (event.key.toLowerCase() === 'tab') {\n                  (event.target as any).blur();\n                  event.preventDefault();\n                  event.stopPropagation();\n                  event.stopImmediatePropagation();\n                  this.clearDocumentFocus();\n                }\n              }\n            }\n          );\n          SkyWaitAdapterService.busyElements[waitComponentId] = {\n            listener: endListenerFunc,\n            busyEl: undefined,\n            restoreFocusElement,\n            restoreFocusCheckElement,\n          };\n        } else {\n          const endListenerFunc = this.renderer.listen(\n            busyEl,\n            'focusin',\n            (event: KeyboardEvent) => {\n              /* istanbul ignore else */\n              if (!isNonBlocking) {\n                event.preventDefault();\n                event.stopPropagation();\n                event.stopImmediatePropagation();\n\n                if (SkyWaitAdapterService.isPageWaitActive) {\n                  this.clearDocumentFocus();\n                } else {\n                  // Propagate tab navigation if attempted into waited element\n                  const target: any = event.target;\n                  target.blur();\n                  this.focusNextElement(target, this.isShift(event), busyEl);\n                }\n              }\n            }\n          );\n          SkyWaitAdapterService.busyElements[waitComponentId] = {\n            listener: endListenerFunc,\n            busyEl: busyEl,\n            restoreFocusElement,\n            restoreFocusCheckElement,\n          };\n        }\n      } else {\n        this.renderer.removeAttribute(busyEl, 'aria-busy');\n\n        if (isFullPage) {\n          SkyWaitAdapterService.isPageWaitActive = false;\n        }\n        if (waitComponentId in SkyWaitAdapterService.busyElements) {\n          SkyWaitAdapterService.busyElements[waitComponentId].listener();\n          // If there is a restore focus element and the focus has not moved, restore focus.\n          if (\n            SkyWaitAdapterService.busyElements[waitComponentId]\n              .restoreFocusElement &&\n            SkyWaitAdapterService.busyElements[waitComponentId]\n              .restoreFocusCheckElement === document.activeElement\n          ) {\n            SkyWaitAdapterService.busyElements[\n              waitComponentId\n            ].restoreFocusElement.focus();\n          }\n          delete SkyWaitAdapterService.busyElements[waitComponentId];\n        }\n      }\n    }\n  }\n\n  private focusNextElement(\n    targetElement: HTMLElement,\n    shiftKey: boolean,\n    busyEl: Element\n  ): void {\n    const focussable = this.getFocussableElements();\n\n    // If shift tab, go in the other direction\n    const modifier = shiftKey ? -1 : 1;\n\n    // Find the next navigable element that isn't waiting\n    const startingIndex = focussable.indexOf(targetElement);\n    let curIndex = startingIndex + modifier;\n    while (\n      focussable[curIndex] &&\n      this.isElementBusyOrHidden(focussable[curIndex])\n    ) {\n      curIndex += modifier;\n    }\n\n    if (\n      focussable[curIndex] &&\n      !this.isElementBusyOrHidden(focussable[curIndex])\n    ) {\n      focussable[curIndex].focus();\n    } else {\n      // Try wrapping the navigation\n      /* istanbul ignore next */\n      /* sanity check */\n      curIndex = modifier > 0 ? 0 : focussable.length - 1;\n      while (\n        curIndex !== startingIndex &&\n        focussable[curIndex] &&\n        this.isElementBusyOrHidden(focussable[curIndex])\n      ) {\n        /* istanbul ignore next */\n        /* sanity check */\n        curIndex += modifier;\n      }\n\n      /* istanbul ignore else */\n      /* sanity check */\n      if (\n        focussable[curIndex] &&\n        !this.isElementBusyOrHidden(focussable[curIndex])\n      ) {\n        focussable[curIndex].focus();\n      } else {\n        // No valid target, wipe focus\n        this.clearDocumentFocus();\n      }\n    }\n\n    // clear focussableElements list\n    this.focussableElements = undefined;\n  }\n\n  private isShift(event: Event): boolean {\n    // Determine if shift+tab was used based on element order\n    const elements = this.getFocussableElements().filter(\n      (elem) => !this.isElementHidden(elem)\n    );\n\n    const previousInd = elements.indexOf((event as any).relatedTarget);\n    const currentInd = elements.indexOf(event.target as HTMLElement);\n\n    return (\n      previousInd === currentInd + 1 ||\n      (previousInd === 0 && currentInd === elements.length - 1) ||\n      previousInd > currentInd ||\n      !(event as any).relatedTarget\n    );\n  }\n\n  private isElementHidden(element: any): boolean {\n    const style = window.getComputedStyle(element);\n    return style.display === 'none' || style.visibility === 'hidden';\n  }\n\n  private isElementBusyOrHidden(element: any): boolean {\n    if (this.isElementHidden(element)) {\n      return true;\n    }\n\n    for (const key of Object.keys(SkyWaitAdapterService.busyElements)) {\n      const parentElement = SkyWaitAdapterService.busyElements[key].busyEl;\n      if (parentElement && parentElement.contains(element)) {\n        return true;\n      }\n    }\n    return false;\n  }\n\n  private clearDocumentFocus(): void {\n    /* istanbul ignore else */\n    if (document.activeElement && (document.activeElement as any).blur) {\n      (document.activeElement as any).blur();\n    }\n    document.body.focus();\n  }\n\n  private getFocussableElements(): HTMLElement[] {\n    // Keep this cached so we can reduce querys\n    if (this.focussableElements) {\n      return this.focussableElements;\n    }\n\n    // Select all possible focussable elements\n    const focussableElements =\n      'a[href], ' +\n      'area[href], ' +\n      \"input:not([disabled]):not([tabindex='-1']), \" +\n      \"button:not([disabled]):not([tabindex='-1']), \" +\n      \"select:not([disabled]):not([tabindex='-1']), \" +\n      \"textarea:not([disabled]):not([tabindex='-1']), \" +\n      'iframe, object, embed, ' +\n      \"*[tabindex]:not([tabindex='-1']), \" +\n      '*[contenteditable=true]';\n\n    this.focussableElements = Array.prototype.filter.call(\n      document.body.querySelectorAll(focussableElements),\n      (element: any) => {\n        return (\n          element.offsetWidth > 0 ||\n          element.offsetHeight > 0 ||\n          element === document.activeElement\n        );\n      }\n    );\n    return this.focussableElements;\n  }\n\n  private clearListeners(): void {\n    SkyWaitAdapterService.isPageWaitActive = false;\n    for (const key of Object.keys(SkyWaitAdapterService.busyElements)) {\n      SkyWaitAdapterService.busyElements[key].listener();\n      delete SkyWaitAdapterService.busyElements[key];\n    }\n  }\n}\n"]}
package/fesm2015/skyux-indicators.mjs CHANGED
@@ -1360,10 +1360,16 @@ class SkyWaitAdapterService {
1360
1360
  : waitEl.nativeElement.parentElement;
1361
1361
  if (!isNonBlocking) {
1362
1362
  if (isWaiting) {
1363
+ let restoreFocusElement = undefined;
1364
+ let restoreFocusCheckElement = undefined;
1363
1365
  this.renderer.setAttribute(busyEl, 'aria-busy', 'true');
1364
1366
  // Remove focus from page when full page blocking wait
1365
1367
  if (isFullPage || busyEl.contains(document.activeElement)) {
1368
+ if (document.activeElement !== document.body) {
1369
+ restoreFocusElement = document.activeElement;
1370
+ }
1366
1371
  this.clearDocumentFocus();
1372
+ restoreFocusCheckElement = document.activeElement;
1367
1373
  }
1368
1374
  if (isFullPage) {
1369
1375
  SkyWaitAdapterService.isPageWaitActive = true;
@@ -1383,6 +1389,8 @@ class SkyWaitAdapterService {
1383
1389
  SkyWaitAdapterService.busyElements[waitComponentId] = {
1384
1390
  listener: endListenerFunc,
1385
1391
  busyEl: undefined,
1392
+ restoreFocusElement,
1393
+ restoreFocusCheckElement,
1386
1394
  };
1387
1395
  }
1388
1396
  else {
@@ -1406,6 +1414,8 @@ class SkyWaitAdapterService {
1406
1414
  SkyWaitAdapterService.busyElements[waitComponentId] = {
1407
1415
  listener: endListenerFunc,
1408
1416
  busyEl: busyEl,
1417
+ restoreFocusElement,
1418
+ restoreFocusCheckElement,
1409
1419
  };
1410
1420
  }
1411
1421
  }
@@ -1416,6 +1426,13 @@ class SkyWaitAdapterService {
1416
1426
  }
1417
1427
  if (waitComponentId in SkyWaitAdapterService.busyElements) {
1418
1428
  SkyWaitAdapterService.busyElements[waitComponentId].listener();
1429
+ // If there is a restore focus element and the focus has not moved, restore focus.
1430
+ if (SkyWaitAdapterService.busyElements[waitComponentId]
1431
+ .restoreFocusElement &&
1432
+ SkyWaitAdapterService.busyElements[waitComponentId]
1433
+ .restoreFocusCheckElement === document.activeElement) {
1434
+ SkyWaitAdapterService.busyElements[waitComponentId].restoreFocusElement.focus();
1435
+ }
1419
1436
  delete SkyWaitAdapterService.busyElements[waitComponentId];
1420
1437
  }
1421
1438
  }