Skip to content

Commit

Permalink
Update to USWDS v3.9.0 (#1397)
Browse files Browse the repository at this point in the history
* update uswds to v3.9.0

* toggle onlyChanged flag

* Wrap slot content in an element

* update test

* revert onlyChanged setting
  • Loading branch information
jamigibbs authored Nov 14, 2024
1 parent 4d04298 commit ccc0140
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 32 deletions.
2 changes: 1 addition & 1 deletion packages/web-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"@types/react-dom": "18.3.0",
"@typescript-eslint/eslint-plugin": "^5.30.5",
"@typescript-eslint/parser": "^5.30.5",
"@uswds/uswds": "^3.8.1",
"@uswds/uswds": "^3.9.0",
"animate.css": "^4.1.1",
"babel-loader": "^8.2.2",
"eslint": "^8.19.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ describe('va-alert', () => {
<mock:shadow-root>
<div class="usa-alert usa-alert--info">
<div class="usa-alert__body">
<slot name="headline"></slot>
<slot></slot>
<div>
<slot name="headline"></slot>
<slot></slot>
</div>
</div>
</div>
</mock:shadow-root>
Expand Down
20 changes: 11 additions & 9 deletions packages/web-components/src/components/va-alert/va-alert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -181,15 +181,17 @@ export class VaAlert {
class="usa-alert__body"
onClick={this.handleAlertBodyClick.bind(this)}
>
{status === 'continue' && (
<va-icon
class="va-alert__lock-icon"
icon="lock"
size={slim ? 3 : 4}
></va-icon>
)}
{!slim && <slot name="headline"></slot>}
<slot></slot>
<div>
{status === 'continue' && (
<va-icon
class="va-alert__lock-icon"
icon="lock"
size={slim ? 3 : 4}
></va-icon>
)}
{!slim && <slot name="headline"></slot>}
<slot></slot>
</div>
</div>
</div>

Expand Down
21 changes: 1 addition & 20 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3456,7 +3456,7 @@ __metadata:
"@types/react-dom": "npm:18.3.0"
"@typescript-eslint/eslint-plugin": "npm:^5.30.5"
"@typescript-eslint/parser": "npm:^5.30.5"
"@uswds/uswds": "npm:^3.8.1"
"@uswds/uswds": "npm:^3.9.0"
animate.css: "npm:^4.1.1"
aria-hidden: "npm:^1.1.3"
babel-loader: "npm:^8.2.2"
Expand Down Expand Up @@ -7450,18 +7450,6 @@ __metadata:
languageName: node
linkType: hard

"@uswds/uswds@npm:^3.8.1":
version: 3.8.1
resolution: "@uswds/uswds@npm:3.8.1"
dependencies:
classlist-polyfill: "npm:1.2.0"
object-assign: "npm:4.1.1"
receptor: "npm:1.0.0"
resolve-id-refs: "npm:0.1.0"
checksum: 10/69859ff4c2da126a425b21fc7346023c793ba0fc517a3c52ff23f9466e8c45e4a0b8a534997f15a9611ee525b639000213b045242cf577e3e31a9f131810a47e
languageName: node
linkType: hard

"@uswds/uswds@npm:^3.9.0":
version: 3.9.0
resolution: "@uswds/uswds@npm:3.9.0"
Expand Down Expand Up @@ -9390,13 +9378,6 @@ __metadata:
languageName: node
linkType: hard

"classlist-polyfill@npm:1.2.0":
version: 1.2.0
resolution: "classlist-polyfill@npm:1.2.0"
checksum: 10/dd7211ca016eaa1fa1ae3f7c65680fce8815b1e5b7541b524c3762ab98ce73e1a782cf71819a07e1e2614385f082bbd0285b1a34f389daf16bed23a11efe06a1
languageName: node
linkType: hard

"classnames@npm:^2.2.6, classnames@npm:^2.3.1":
version: 2.3.1
resolution: "classnames@npm:2.3.1"
Expand Down

0 comments on commit ccc0140

Please sign in to comment.