Skip to content

Commit fc2228e

Browse files
committed
Merge branch 'main' into users/makinc/namespace-blazor
2 parents 0437b4d + b45b4e6 commit fc2228e

File tree

126 files changed

+3616
-312
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+3616
-312
lines changed

CONTRIBUTING.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@ To submit changes to Nimble, the first step is to build the monorepo which requi
66

77
- Sync down a copy of the nimble repository
88
- Note: For one-off small contributions you can consider using a fork-pull workflow. However [fork-pull workflows are not yet supported](https://github.com/ni/nimble/issues/634) for substantial development. For substantial development you should be added as a Contributor to the repository. See the [`README.md` Community section](/README.md#community) to get in touch if you need Contributor permissions.
9-
- Install Node.js version 24+ (run `node --version`) and npm version 10+ (run `npm --version`) which can be downloaded from <https://nodejs.org/en/download/>
10-
- Install .NET 8 SDK (`8.0.403` or higher) which can be downloaded from <https://dotnet.microsoft.com/en-us/download>
9+
- Install Node.js version 24+ (run `node --version`) which can be downloaded from <https://nodejs.org/en/download/>
10+
- Install .NET 8 SDK (see required version in [`globals.json`](/packages/blazor-workspace/global.json)) which can be downloaded from <https://dotnet.microsoft.com/en-us/download>
1111
- Run `dotnet --info` to verify the required version of the SDK is installed. A `v8` install is required, but it's fine if later versions are installed too.
12+
- If running on an IT-managed system, set env var `NODE_USE_SYSTEM_CA=1`
13+
- This avoids errors during `npm install` like `playwright Error: unable to get local issuer certificate`. See Node docs: [Adding CA Certificates from the System Store](https://nodejs.org/en/learn/http/enterprise-network-configuration#adding-ca-certificates-from-the-system-store).
14+
1215

1316
From the `nimble` directory:
1417

package-lock.json

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

packages/angular-workspace/example-client-app/src/app/app.module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import { NimbleRichTextMentionUsersModule } from '@ni/nimble-angular/rich-text-m
3737
import { OkButtonModule } from 'ok-angular/button/ok-button.module';
3838
import { SprightChatConversationModule } from '@ni/spright-angular/chat/conversation';
3939
import { SprightChatInputModule } from '@ni/spright-angular/chat/input';
40+
import { SprightIconWorkItemCalendarWeekDirective } from '@ni/spright-angular/icons/work-item-calendar-week';
4041
import { SprightChatMessageInboundModule } from '@ni/spright-angular/chat/message/inbound';
4142
import { SprightChatMessageOutboundModule } from '@ni/spright-angular/chat/message/outbound';
4243
import { SprightChatMessageSystemModule } from '@ni/spright-angular/chat/message/system';
@@ -125,6 +126,7 @@ import { CustomAppComponent } from './customapp/customapp.component';
125126
SprightChatMessageInboundModule,
126127
SprightChatMessageOutboundModule,
127128
SprightChatMessageSystemModule,
129+
SprightIconWorkItemCalendarWeekDirective,
128130
SprightRectangleModule,
129131
RouterModule.forRoot(
130132
[

packages/angular-workspace/example-client-app/src/app/customapp/customapp.component.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,10 @@
479479
<nimble-icon-pencil-to-rectangle slot="start"></nimble-icon-pencil-to-rectangle>
480480
</nimble-button>
481481
</nimble-toolbar>
482+
<nimble-banner slot="start" open severity="information">
483+
<span slot="title">Title of the banner</span>
484+
This is the message text of this banner. It tells you something interesting.
485+
</nimble-banner>
482486
<spright-chat-message-system>To start, press any key.</spright-chat-message-system>
483487
<spright-chat-message-outbound>Where is the Any key?</spright-chat-message-outbound>
484488
<spright-chat-message-system>
@@ -499,6 +503,10 @@
499503
<spright-chat-input slot="input" placeholder="Type here" (send)="onChatInputSend($event)"></spright-chat-input>
500504
</spright-chat-conversation>
501505
</div>
506+
<div class="sub-container">
507+
<div class="container-label">Icons (Spright)</div>
508+
<spright-icon-work-item-calendar-week></spright-icon-work-item-calendar-week>
509+
</div>
502510
<div class="sub-container">
503511
<div class="container-label">Rectangle (Spright)</div>
504512
<spright-rectangle>Spright!</spright-rectangle>

packages/angular-workspace/nimble-angular/CHANGELOG.json

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,51 @@
11
{
22
"name": "@ni/nimble-angular",
33
"entries": [
4+
{
5+
"date": "Thu, 19 Mar 2026 14:12:53 GMT",
6+
"version": "32.4.2",
7+
"tag": "@ni/nimble-angular_v32.4.2",
8+
"comments": {
9+
"patch": [
10+
{
11+
"author": "beachball",
12+
"package": "@ni/nimble-angular",
13+
"comment": "Bump @ni/nimble-components to v35.5.2",
14+
"commit": "not available"
15+
}
16+
]
17+
}
18+
},
19+
{
20+
"date": "Wed, 18 Mar 2026 21:46:50 GMT",
21+
"version": "32.4.1",
22+
"tag": "@ni/nimble-angular_v32.4.1",
23+
"comments": {
24+
"patch": [
25+
{
26+
"author": "beachball",
27+
"package": "@ni/nimble-angular",
28+
"comment": "Bump @ni/nimble-components to v35.5.1",
29+
"commit": "not available"
30+
}
31+
]
32+
}
33+
},
34+
{
35+
"date": "Thu, 12 Mar 2026 16:41:20 GMT",
36+
"version": "32.4.0",
37+
"tag": "@ni/nimble-angular_v32.4.0",
38+
"comments": {
39+
"minor": [
40+
{
41+
"author": "beachball",
42+
"package": "@ni/nimble-angular",
43+
"comment": "Bump @ni/nimble-components to v35.5.0",
44+
"commit": "not available"
45+
}
46+
]
47+
}
48+
},
449
{
550
"date": "Mon, 02 Mar 2026 18:11:33 GMT",
651
"version": "32.3.12",

packages/angular-workspace/nimble-angular/CHANGELOG.md

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,33 @@
11
# Change Log - @ni/nimble-angular
22

3-
<!-- This log was last generated on Mon, 02 Mar 2026 18:11:33 GMT and should not be manually modified. -->
3+
<!-- This log was last generated on Thu, 19 Mar 2026 14:12:53 GMT and should not be manually modified. -->
44

55
<!-- Start content -->
66

7+
## 32.4.2
8+
9+
Thu, 19 Mar 2026 14:12:53 GMT
10+
11+
### Patches
12+
13+
- Bump @ni/nimble-components to v35.5.2
14+
15+
## 32.4.1
16+
17+
Wed, 18 Mar 2026 21:46:50 GMT
18+
19+
### Patches
20+
21+
- Bump @ni/nimble-components to v35.5.1
22+
23+
## 32.4.0
24+
25+
Thu, 12 Mar 2026 16:41:20 GMT
26+
27+
### Minor changes
28+
29+
- Bump @ni/nimble-components to v35.5.0
30+
731
## 32.3.12
832

933
Mon, 02 Mar 2026 18:11:33 GMT

packages/angular-workspace/nimble-angular/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ni/nimble-angular",
3-
"version": "32.3.12",
3+
"version": "32.4.2",
44
"description": "Angular components for the NI Nimble Design System",
55
"scripts": {
66
"invoke-publish": "npm run invoke-publish:setup && cd ../dist/nimble-angular && npm publish",
@@ -36,7 +36,7 @@
3636
"@angular/forms": "^19.2.17",
3737
"@angular/localize": "^19.2.17",
3838
"@angular/router": "^19.2.17",
39-
"@ni/nimble-components": "^35.4.0",
39+
"@ni/nimble-components": "^35.5.2",
4040
"@ni/unit-format": "^1.0.3"
4141
}
4242
}

packages/angular-workspace/nimble-angular/src/directives/icon-base/tests/nimble-icon-check.directive.spec.ts renamed to packages/angular-workspace/nimble-angular/src/directives/icon-base/tests/nimble-icon-base.directive.spec.ts

File renamed without changes.

0 commit comments

Comments
 (0)