diff --git a/packages/components/package.json b/packages/components/package.json index 002ebd9aa84..7d71f1ecea5 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -63,7 +63,7 @@ "ember-a11y-refocus": "^5.1.0", "ember-concurrency": "^4.0.4", "ember-element-helper": "^0.8.6", - "ember-focus-trap": "^1.1.1", + "ember-focus-trap": "^2.0.0", "ember-modifier": "^4.2.2", "ember-power-select": "^8.12.0", "ember-stargate": "^1.0.2", diff --git a/packages/components/src/components/hds/advanced-table/td.hbs b/packages/components/src/components/hds/advanced-table/td.hbs index 17c09049d61..00f03f78c32 100644 --- a/packages/components/src/components/hds/advanced-table/td.hbs +++ b/packages/components/src/components/hds/advanced-table/td.hbs @@ -13,7 +13,6 @@ shouldTrapFocus=this._shouldTrapFocus setCellElement=this.setElement }} - {{! @glint-expect-error - https://github.com/josemarluedke/ember-focus-trap/issues/86 }} {{focus-trap isActive=this._shouldTrapFocus focusTrapOptions=(hash diff --git a/packages/components/src/components/hds/advanced-table/th-sort.hbs b/packages/components/src/components/hds/advanced-table/th-sort.hbs index d5cb16ad38f..a90dc3b9c8c 100644 --- a/packages/components/src/components/hds/advanced-table/th-sort.hbs +++ b/packages/components/src/components/hds/advanced-table/th-sort.hbs @@ -13,7 +13,6 @@ shouldTrapFocus=this._shouldTrapFocus setCellElement=this.setElement }} - {{! @glint-expect-error - https://github.com/josemarluedke/ember-focus-trap/issues/86 }} {{focus-trap isActive=this._shouldTrapFocus focusTrapOptions=(hash diff --git a/packages/components/src/components/hds/advanced-table/th.hbs b/packages/components/src/components/hds/advanced-table/th.hbs index 7a6b0ac20ef..b2bc1e4597c 100644 --- a/packages/components/src/components/hds/advanced-table/th.hbs +++ b/packages/components/src/components/hds/advanced-table/th.hbs @@ -14,7 +14,6 @@ shouldTrapFocus=this._shouldTrapFocus setCellElement=this.setElement }} - {{! @glint-expect-error - https://github.com/josemarluedke/ember-focus-trap/issues/86 }} {{focus-trap isActive=this._shouldTrapFocus focusTrapOptions=(hash diff --git a/packages/components/src/components/hds/app-header/index.gts b/packages/components/src/components/hds/app-header/index.gts index ddd5aa807a6..2a191eb7be8 100644 --- a/packages/components/src/components/hds/app-header/index.gts +++ b/packages/components/src/components/hds/app-header/index.gts @@ -10,8 +10,7 @@ import { registerDestructor } from '@ember/destroyable'; import { hash } from '@ember/helper'; import { and, not } from 'ember-truth-helpers'; import { NavigationNarrator } from 'ember-a11y-refocus'; -// @ts-expect-error: missing types https://github.com/josemarluedke/ember-focus-trap/issues/86 -import focusTrap from 'ember-focus-trap/modifiers/focus-trap'; +import { focusTrap } from 'ember-focus-trap'; import type Owner from '@ember/owner'; import type { NavigationNarratorSignature } from 'ember-a11y-refocus/components/navigation-narrator'; diff --git a/packages/components/src/components/hds/app-side-nav/index.gts b/packages/components/src/components/hds/app-side-nav/index.gts index 2ea4d4eab6c..3043c1e1465 100644 --- a/packages/components/src/components/hds/app-side-nav/index.gts +++ b/packages/components/src/components/hds/app-side-nav/index.gts @@ -9,8 +9,7 @@ import { registerDestructor } from '@ember/destroyable'; import { modifier } from 'ember-modifier'; import { on } from '@ember/modifier'; import { fn } from '@ember/helper'; -// @ts-expect-error: missing types https://github.com/josemarluedke/ember-focus-trap/issues/86 -import focusTrap from 'ember-focus-trap/modifiers/focus-trap'; +import { focusTrap } from 'ember-focus-trap'; import type Owner from '@ember/owner'; diff --git a/packages/components/src/components/hds/code-editor/index.gts b/packages/components/src/components/hds/code-editor/index.gts index a7220153abd..88c0e380740 100644 --- a/packages/components/src/components/hds/code-editor/index.gts +++ b/packages/components/src/components/hds/code-editor/index.gts @@ -9,8 +9,7 @@ import { hash } from '@ember/helper'; import { modifier } from 'ember-modifier'; import { or } from 'ember-truth-helpers'; import { tracked } from '@glimmer/tracking'; -// @ts-expect-error: missing types https://github.com/josemarluedke/ember-focus-trap/issues/86 -import focusTrap from 'ember-focus-trap/modifiers/focus-trap'; +import { focusTrap } from 'ember-focus-trap'; import type { EditorView } from '@codemirror/view'; import type { WithBoundArgs } from '@glint/template'; diff --git a/packages/components/src/components/hds/flyout/index.gts b/packages/components/src/components/hds/flyout/index.gts index 06ba3c229d5..5eff8d64192 100644 --- a/packages/components/src/components/hds/flyout/index.gts +++ b/packages/components/src/components/hds/flyout/index.gts @@ -9,8 +9,7 @@ import { assert } from '@ember/debug'; import { buildWaiter } from '@ember/test-waiters'; import { modifier } from 'ember-modifier'; import { hash } from '@ember/helper'; -// @ts-expect-error: missing types https://github.com/josemarluedke/ember-focus-trap/issues/86 -import focusTrap from 'ember-focus-trap/modifiers/focus-trap'; +import { focusTrap } from 'ember-focus-trap'; import type { WithBoundArgs } from '@glint/template'; diff --git a/packages/components/src/components/hds/modal/index.gts b/packages/components/src/components/hds/modal/index.gts index 62d7a7ca5b9..a097a7fc1fe 100644 --- a/packages/components/src/components/hds/modal/index.gts +++ b/packages/components/src/components/hds/modal/index.gts @@ -9,8 +9,7 @@ import { assert } from '@ember/debug'; import { buildWaiter } from '@ember/test-waiters'; import { modifier } from 'ember-modifier'; import { hash } from '@ember/helper'; -// @ts-expect-error: missing types https://github.com/josemarluedke/ember-focus-trap/issues/86 -import focusTrap from 'ember-focus-trap/modifiers/focus-trap'; +import { focusTrap } from 'ember-focus-trap'; import type { WithBoundArgs } from '@glint/template'; diff --git a/packages/components/unpublished-development-types/global.d.ts b/packages/components/unpublished-development-types/global.d.ts index c40323d6d6e..df82cf03b05 100644 --- a/packages/components/unpublished-development-types/global.d.ts +++ b/packages/components/unpublished-development-types/global.d.ts @@ -16,6 +16,7 @@ import type RenderModifiersRegistry from '@ember/render-modifiers/template-regis import type EmberComposableHelpersRegistry from '@nullvoxpopuli/ember-composable-helpers/template-registry'; import type EmberIntlRegistry from 'ember-intl/template-registry'; import type EmberA11yRefocusRegistry from 'ember-a11y-refocus/template-registry'; +import type EmberFocusTrapRegistry from 'ember-focus-trap/template-registry'; declare module '@glint/environment-ember-loose/registry' { export default interface Registry @@ -30,7 +31,8 @@ declare module '@glint/environment-ember-loose/registry' { EmberComposableHelpersRegistry, EmbroiderUtilRegistry, EmberA11yRefocusRegistry, - EmberIntlRegistry /*, other addon registries */ { + EmberIntlRegistry, + EmberFocusTrapRegistry /*, other addon registries */ { // local entries Portal: typeof Portal; PortalTarget: typeof PortalTarget; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f5484e209b3..d5903604494 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -160,8 +160,8 @@ importers: specifier: ^0.8.6 version: 0.8.8 ember-focus-trap: - specifier: ^1.1.1 - version: 1.1.1(ember-source@6.5.0(@glimmer/component@2.0.0)(rsvp@4.8.5)) + specifier: ^2.0.0 + version: 2.0.0(@babel/core@7.28.0) ember-modifier: specifier: ^4.2.2 version: 4.2.2(@babel/core@7.28.0) @@ -185,7 +185,7 @@ importers: version: 1.30.0 tabbable: specifier: ^6.2.0 - version: 6.2.0 + version: 6.4.0 tippy.js: specifier: ^6.3.7 version: 6.3.7 @@ -753,7 +753,7 @@ importers: version: 14.0.0(postcss@8.5.6)(stylelint@16.23.0(typescript@5.9.2)) tabbable: specifier: ^6.2.0 - version: 6.2.0 + version: 6.4.0 tracked-built-ins: specifier: ^4.0.0 version: 4.0.0(@babel/core@7.28.0) @@ -6299,11 +6299,9 @@ packages: resolution: {integrity: sha512-TVx24/jrvDIuPL296DV0hBwp7BWLcSMf0I8464KGz01sPytAB+ZAePbc9ooBTJDkKZEGFgatJa4nj3yF1S9Bpw==} engines: {node: '>= 10'} - ember-focus-trap@1.1.1: - resolution: {integrity: sha512-5tOWu6eV1UoNZE+P9Gl9lJXNrENZVCoOXi52ePb7JOrOZ3ckOk1OkPsFwR4Jym9VJ7vZ6S3Z3D8BrkFa2aCpYw==} - engines: {node: 12.* || >= 14} - peerDependencies: - ember-source: '>= 4.0.0' + ember-focus-trap@2.0.0: + resolution: {integrity: sha512-zGPvt934h08gxdemIZz29XRn4cdwn51UxlodKtDkiahGrEpiSQ6qH8nvXGwDhQvZsf8zGumnXqcmDYYA5oFomQ==} + engines: {node: '>= 22.*', pnpm: '>= 10'} ember-functions-as-helper-polyfill@2.1.3: resolution: {integrity: sha512-Hte8jfOmSNzrz/vOchf68CGaBWXN2/5qKgFaylqr9omW2i4Wt9JmaBWRkeR0AJ53N57q3DX2TOb166Taq6QjiA==} @@ -7169,8 +7167,8 @@ packages: resolution: {integrity: sha512-Y8CrO98EcXVCiYE4s5z0LTMbeYjKyd3MAEUJqxA7B8yGRlmdrG5UDqq4pVrUAfAu2tMFgpQESvBhBu9Xg1tpow==} engines: {node: '>=0.4.0'} - focus-trap@6.9.4: - resolution: {integrity: sha512-v2NTsZe2FF59Y+sDykKY+XjqZ0cPfhq/hikWVL88BqLivnNiEffAsac6rP6H45ff9wG9LL5ToiDqrLEP9GX9mw==} + focus-trap@8.0.0: + resolution: {integrity: sha512-Aa84FOGHs99vVwufDMdq2qgOwXPC2e9U66GcqBhn1/jEHPDhJaP8PYhkIbqG9lhfL5Kddk/567lj46LLHYCRUw==} follow-redirects@1.15.11: resolution: {integrity: sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==} @@ -11001,11 +10999,8 @@ packages: os: [darwin, linux, win32, freebsd, openbsd, netbsd, sunos, android] hasBin: true - tabbable@5.3.3: - resolution: {integrity: sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA==} - - tabbable@6.2.0: - resolution: {integrity: sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==} + tabbable@6.4.0: + resolution: {integrity: sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==} table@5.4.6: resolution: {integrity: sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==} @@ -14252,7 +14247,7 @@ snapshots: ember-basic-dropdown: 8.8.0(@babel/core@7.28.0)(@ember/string@4.0.1)(@ember/test-helpers@5.4.0(@babel/core@7.28.0)(@glint/template@1.5.2))(@glimmer/component@2.0.0)(@glint/environment-ember-loose@1.5.2(@glimmer/component@2.0.0)(@glint/template@1.5.2)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.2(@babel/core@7.28.0)))(@glint/template@1.5.2)(ember-source@6.4.0(@glimmer/component@2.0.0)(rsvp@4.8.5)) ember-concurrency: 4.0.4(@babel/core@7.28.0)(@glint/template@1.5.2) ember-element-helper: 0.8.8 - ember-focus-trap: 1.1.1(ember-source@6.4.0(@glimmer/component@2.0.0)(rsvp@4.8.5)) + ember-focus-trap: 2.0.0(@babel/core@7.28.0) ember-modifier: 4.2.2(@babel/core@7.28.0) ember-power-select: 8.12.0(@babel/core@7.28.0)(@ember/test-helpers@5.4.0(@babel/core@7.28.0)(@glint/template@1.5.2))(@glimmer/component@2.0.0)(@glint/environment-ember-loose@1.5.2(@glimmer/component@2.0.0)(@glint/template@1.5.2)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.2(@babel/core@7.28.0)))(@glint/template@1.5.2)(ember-basic-dropdown@8.8.0(@babel/core@7.28.0)(@ember/string@4.0.1)(@ember/test-helpers@5.4.0(@babel/core@7.28.0)(@glint/template@1.5.2))(@glimmer/component@2.0.0)(@glint/environment-ember-loose@1.5.2(@glimmer/component@2.0.0)(@glint/template@1.5.2)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.2(@babel/core@7.28.0)))(@glint/template@1.5.2)(ember-source@6.4.0(@glimmer/component@2.0.0)(rsvp@4.8.5)))(ember-concurrency@4.0.4(@babel/core@7.28.0)(@glint/template@1.5.2))(ember-source@6.4.0(@glimmer/component@2.0.0)(rsvp@4.8.5)) ember-stargate: 1.0.2(@babel/core@7.28.0)(@glimmer/component@2.0.0)(@glint/template@1.5.2) @@ -14260,7 +14255,7 @@ snapshots: ember-truth-helpers: 5.0.0 luxon: 3.7.1 prismjs: 1.30.0 - tabbable: 6.2.0 + tabbable: 6.4.0 tippy.js: 6.3.7 tracked-built-ins: 4.0.0(@babel/core@7.28.0) optionalDependencies: @@ -14307,7 +14302,7 @@ snapshots: ember-basic-dropdown: 8.8.0(@babel/core@7.28.0)(@ember/string@4.0.1)(@ember/test-helpers@5.4.0(@babel/core@7.28.0)(@glint/template@1.5.2))(@glimmer/component@2.0.0)(@glint/environment-ember-loose@1.5.2(@glimmer/component@2.0.0)(@glint/template@1.5.2)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.2(@babel/core@7.28.0)))(@glint/template@1.5.2)(ember-source@6.5.0(@glimmer/component@2.0.0)(rsvp@4.8.5)) ember-concurrency: 4.0.4(@babel/core@7.28.0)(@glint/template@1.5.2) ember-element-helper: 0.8.8 - ember-focus-trap: 1.1.1(ember-source@6.5.0(@glimmer/component@2.0.0)(rsvp@4.8.5)) + ember-focus-trap: 2.0.0(@babel/core@7.28.0) ember-modifier: 4.2.2(@babel/core@7.28.0) ember-power-select: 8.12.0(@babel/core@7.28.0)(@ember/test-helpers@5.4.0(@babel/core@7.28.0)(@glint/template@1.5.2))(@glimmer/component@2.0.0)(@glint/environment-ember-loose@1.5.2(@glimmer/component@2.0.0)(@glint/template@1.5.2)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.2(@babel/core@7.28.0)))(@glint/template@1.5.2)(ember-basic-dropdown@8.8.0(@babel/core@7.28.0)(@ember/string@4.0.1)(@ember/test-helpers@5.4.0(@babel/core@7.28.0)(@glint/template@1.5.2))(@glimmer/component@2.0.0)(@glint/environment-ember-loose@1.5.2(@glimmer/component@2.0.0)(@glint/template@1.5.2)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.2(@babel/core@7.28.0)))(@glint/template@1.5.2)(ember-source@6.5.0(@glimmer/component@2.0.0)(rsvp@4.8.5)))(ember-concurrency@4.0.4(@babel/core@7.28.0)(@glint/template@1.5.2))(ember-source@6.5.0(@glimmer/component@2.0.0)(rsvp@4.8.5)) ember-stargate: 1.0.2(@babel/core@7.28.0)(@glimmer/component@2.0.0)(@glint/template@1.5.2) @@ -14315,7 +14310,7 @@ snapshots: ember-truth-helpers: 5.0.0 luxon: 3.7.1 prismjs: 1.30.0 - tabbable: 6.2.0 + tabbable: 6.4.0 tippy.js: 6.3.7 tracked-built-ins: 4.0.0(@babel/core@7.28.0) optionalDependencies: @@ -19344,20 +19339,13 @@ snapshots: - encoding - supports-color - ember-focus-trap@1.1.1(ember-source@6.4.0(@glimmer/component@2.0.0)(rsvp@4.8.5)): + ember-focus-trap@2.0.0(@babel/core@7.28.0): dependencies: '@embroider/addon-shim': 1.10.2 - ember-source: 6.4.0(@glimmer/component@2.0.0)(rsvp@4.8.5) - focus-trap: 6.9.4 - transitivePeerDependencies: - - supports-color - - ember-focus-trap@1.1.1(ember-source@6.5.0(@glimmer/component@2.0.0)(rsvp@4.8.5)): - dependencies: - '@embroider/addon-shim': 1.10.2 - ember-source: 6.5.0(@glimmer/component@2.0.0)(rsvp@4.8.5) - focus-trap: 6.9.4 + decorator-transforms: 2.3.1(@babel/core@7.28.0) + focus-trap: 8.0.0 transitivePeerDependencies: + - '@babel/core' - supports-color ember-functions-as-helper-polyfill@2.1.3(ember-source@6.4.0(@glimmer/component@2.0.0)(rsvp@4.8.5)): @@ -20836,9 +20824,9 @@ snapshots: flow-parser@0.258.1: {} - focus-trap@6.9.4: + focus-trap@8.0.0: dependencies: - tabbable: 5.3.3 + tabbable: 6.4.0 follow-redirects@1.15.11: {} @@ -25576,9 +25564,7 @@ snapshots: systeminformation@5.27.14: {} - tabbable@5.3.3: {} - - tabbable@6.2.0: {} + tabbable@6.4.0: {} table@5.4.6: dependencies: