@fundamental-ngx/cdk 0.64.0 → 0.64.1-rc.1

package/fesm2022/fundamental-ngx-cdk-utils.mjs

@@ -1561,15 +1561,16 @@ class TabbableElementService {
     }
     /** Get the first tabbable element from a DOM subtree (inclusive). */
     getTabbableElement(root, focusLastElement = false, skipSelf = false) {
-        if (!skipSelf && this._checker.isFocusable(root) && this._checker.isTabbable(root)) {
+        if (!skipSelf && this._isTabbableElement(root)) {
             return root;
         }
+        const elementNodeType = this._document?.ELEMENT_NODE ?? 1;
         // Iterate in DOM order. Note that IE doesn't have `children` for SVG, so we fall
         // back to `childNodes` which includes text nodes, comments etc.
         const rootChildren = root.children || root.childNodes;
         const children = focusLastElement ? Array.from(rootChildren).reverse() : rootChildren;
         for (let i = 0; i < children.length; i++) {
-            const tabbableChild = children[i].nodeType === this._document?.ELEMENT_NODE
+            const tabbableChild = children[i].nodeType === elementNodeType
                 ? this.getTabbableElement(children[i], focusLastElement)
                 : null;
             if (tabbableChild) {
@@ -1578,6 +1579,14 @@ class TabbableElementService {
         }
         return null;
     }
+    _isTabbableElement(element) {
+        return this._checker.isTabbable(element) && !this._isElementDisabled(element);
+    }
+    _isElementDisabled(element) {
+        return (element.hasAttribute('disabled') ||
+            element.getAttribute('aria-disabled') === 'true' ||
+            element.classList.contains('is-disabled'));
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.5", ngImport: i0, type: TabbableElementService, deps: [{ token: i1$1.InteractivityChecker }, { token: DOCUMENT, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.0.5", ngImport: i0, type: TabbableElementService, providedIn: 'root' }); }
 }