Skip to content

Commit 7866af9

Browse files
author
shleewhite
committed
chore: upgrade glimmer/component for types to work properly
1 parent 7f5a325 commit 7866af9

File tree

11 files changed

+218
-207
lines changed

11 files changed

+218
-207
lines changed

.changeset/khaki-bananas-know.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,12 @@
22
"@hashicorp/design-system-components": patch
33
---
44

5-
Dependency ember-a11y-refocus upgraded
5+
Dependency `ember-a11y-refocus` and `@glimmer/component` upgraded.
6+
7+
<!-- START components/side-nav -->
8+
`SideNav` - Fixed the type of `@a11yRefocusNavigationText` to match the expected type from `ember-a11y-refocus`. The new type is `(transition: Transition) => boolean` instead of `string`.
9+
<!-- END -->
10+
11+
<!-- START components/app-header -->
12+
`AppHeader` - Fixed the type of `@a11yRefocusNavigationText` to match the expected type from `ember-a11y-refocus`. The new type is `(transition: Transition) => boolean` instead of `string`.
13+
<!-- END -->

packages/components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"@ember/test-helpers": "^4.0.4",
8686
"@embroider/addon-dev": "^7.1.5",
8787
"@eslint/js": "^9.23.0",
88-
"@glimmer/component": "^1.1.2",
88+
"@glimmer/component": "^2.0.0",
8989
"@glint/core": "^1.5.2",
9090
"@glint/environment-ember-loose": "^1.5.2",
9191
"@glint/environment-ember-template-imports": "^1.5.2",

packages/components/src/components/hds/advanced-table/th-resize-handle.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { action } from '@ember/object';
99
import { modifier } from 'ember-modifier';
1010
import { requestAnimationFrameWaiter } from './utils.ts';
1111
import { BORDER_WIDTH } from './index.ts';
12+
import type Owner from '@ember/owner';
1213

1314
import type HdsAdvancedTableColumn from './models/column.ts';
1415
import type { HdsAdvancedTableSignature } from './index.ts';
@@ -90,7 +91,7 @@ export default class HdsAdvancedTableThResizeHandle extends Component<HdsAdvance
9091
);
9192

9293
constructor(
93-
owner: unknown,
94+
owner: Owner,
9495
args: HdsAdvancedTableThResizeHandleSignature['Args']
9596
) {
9697
super(owner, args);

packages/components/src/components/hds/app-header/index.hbs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
...attributes
1111
>
1212
{{#if (and this.hasA11yRefocus (not this._isOpen))}}
13-
{{! @glint-expect-error - `ember-a11y-refocus` doesn't expose types yet }}
1413
<NavigationNarrator
1514
@routeChangeValidator={{@a11yRefocusRouteChangeValidator}}
1615
@skipTo={{this.a11yRefocusSkipTo}}

packages/components/src/components/hds/app-header/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { guidFor } from '@ember/object/internals';
99
import { tracked } from '@glimmer/tracking';
1010
import { registerDestructor } from '@ember/destroyable';
1111
import type Owner from '@ember/owner';
12+
import type {NavigationNarratorSignature} from 'ember-a11y-refocus/components/navigation-narrator';
1213

1314
import { hdsBreakpoints } from '../../../utils/hds-breakpoints.ts';
1415

@@ -19,7 +20,7 @@ export interface HdsAppHeaderSignature {
1920
a11yRefocusSkipTo?: string;
2021
a11yRefocusSkipText?: string;
2122
a11yRefocusNavigationText?: string;
22-
a11yRefocusRouteChangeValidator?: string;
23+
a11yRefocusRouteChangeValidator?: NavigationNarratorSignature['Args']['routeChangeValidator'];
2324
a11yRefocusExcludeAllQueryParams?: boolean;
2425
};
2526
Blocks: {

packages/components/src/components/hds/side-nav/index.hbs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
>
2121
<:root>
2222
{{#if this.hasA11yRefocus}}
23-
{{! @glint-expect-error - `ember-a11y-refocus` doesn't expose types yet }}
2423
<NavigationNarrator
2524
@routeChangeValidator={{@a11yRefocusRouteChangeValidator}}
2625
@skipTo={{this.a11yRefocusSkipTo}}

packages/components/src/components/hds/side-nav/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { registerDestructor } from '@ember/destroyable';
1111

1212
import type { HdsSideNavBaseSignature } from './base';
1313
import type Owner from '@ember/owner';
14+
import type {NavigationNarratorSignature} from 'ember-a11y-refocus/components/navigation-narrator';
1415

1516
export interface HdsSideNavSignature {
1617
Args: {
@@ -21,7 +22,7 @@ export interface HdsSideNavSignature {
2122
a11yRefocusSkipTo?: string;
2223
a11yRefocusSkipText?: string;
2324
a11yRefocusNavigationText?: string;
24-
a11yRefocusRouteChangeValidator?: string;
25+
a11yRefocusRouteChangeValidator?: NavigationNarratorSignature['Args']['routeChangeValidator'];
2526
a11yRefocusExcludeAllQueryParams?: boolean;
2627
/**
2728
* @deprecated The `@ariaLabel` argument for "Hds::SideNav" has been deprecated. It is replaced by aria-labelledby and aria-expanded on the toggle button

packages/components/unpublished-development-types/global.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import type { EmbroiderUtilRegistry } from '@embroider/util';
1515
import type RenderModifiersRegistry from '@ember/render-modifiers/template-registry';
1616
import type EmberComposableHelpersRegistry from '@nullvoxpopuli/ember-composable-helpers/template-registry';
1717
import type EmberIntlRegistry from 'ember-intl/template-registry';
18+
import type EmberA11yRefocusRegistry from 'ember-a11y-refocus/template-registry';
1819

1920
declare module '@glint/environment-ember-loose/registry' {
2021
export default interface Registry
@@ -28,6 +29,7 @@ declare module '@glint/environment-ember-loose/registry' {
2829
RenderModifiersRegistry,
2930
EmberComposableHelpersRegistry,
3031
EmbroiderUtilRegistry,
32+
EmberA11yRefocusRegistry,
3133
EmberIntlRegistry /*, other addon registries */ {
3234
// local entries
3335
Portal: typeof Portal;

pnpm-lock.yaml

Lines changed: 198 additions & 198 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

showcase/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"@embroider/macros": "^1.18.1",
5050
"@embroider/test-setup": "^4.0.0",
5151
"@eslint/js": "^9.27.0",
52-
"@glimmer/component": "^1.1.2",
52+
"@glimmer/component": "^2.0.0",
5353
"@glimmer/tracking": "^1.1.2",
5454
"@glint/core": "^1.5.2",
5555
"@glint/environment-ember-loose": "^1.5.2",

0 commit comments

Comments
 (0)