Skip to content

Commit b29bb6d

Browse files
rajsiterajsite
committed
Merge branch 'main' into stepper-hld
2 parents b4e5617 + 1a3afd1 commit b29bb6d

61 files changed

Lines changed: 756 additions & 110 deletions

Some content is hidden

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

‎.github/CODEOWNERS‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,17 @@
1010
# Order is important. The last matching pattern has the most precedence.
1111

1212
# Specific packages
13-
/packages/angular-workspace/example-client-app @rajsite @atmgrifter00
14-
/packages/angular-workspace/nimble-angular @rajsite @atmgrifter00
15-
/packages/angular-workspace/spright-angular @rajsite @atmgrifter00
16-
/packages/blazor-workspace @rajsite @atmgrifter00 @msmithNI
17-
/packages/nimble-components @rajsite @jattasNI
13+
/packages/angular-workspace @rajsite @mollykreis
14+
/packages/blazor-workspace @rajsite @msmithNI
1815
/packages/nimble-components/build/generate-workers @rajsite @jattasNI @munteannatan
1916
/packages/nimble-components/src/wafer-map @rajsite @jattasNI @munteannatan
2017
/packages/nimble-components/src/rich-text @rajsite @jattasNI @vivinkrishna-ni
2118
/packages/nimble-components/src/rich-text-mention @rajsite @jattasNI @vivinkrishna-ni
2219
/packages/nimble-tokens @rajsite @jattasNI @fredvisser
23-
/packages/site @rajsite @jattasNI
24-
/packages/spright-components @rajsite @jattasNI
2520
/packages/storybook/.storybook @rajsite @jattasNI @fredvisser
26-
/packages/xliff-to-json-converter @rajsite @jattasNI
2721

2822
# Specs (placed after packages to have higher precedence for spec files contained in packages)
29-
specs @rajsite @jattasNI @atmgrifter00 @mollykreis
23+
specs @rajsite @jattasNI @mollykreis
3024

3125
# .snyk security scanning configuration file
3226
/.snyk @chris468 @cameronwaterman @BKnight760 @rbell517 @jattasNI @prestwick

‎package-lock.json‎

Lines changed: 27 additions & 27 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
@@ -12,6 +12,7 @@ import { NimbleTextAreaModule, NimbleTextFieldModule, NimbleNumberFieldModule, N
1212
NimbleIconCheckModule, NimbleBannerModule, NimbleAnchorMenuItemModule, NimbleAnchorTreeItemModule, NimbleIconXmarkCheckModule,
1313
NimbleListOptionGroupModule } from '@ni/nimble-angular';
1414
import { NimbleCardModule } from '@ni/nimble-angular/card';
15+
import { NimbleChipModule } from '@ni/nimble-angular/chip';
1516
import { NimbleLabelProviderCoreModule } from '@ni/nimble-angular/label-provider/core';
1617
import { NimbleLabelProviderRichTextModule } from '@ni/nimble-angular/label-provider/rich-text';
1718
import { NimbleLabelProviderTableModule } from '@ni/nimble-angular/label-provider/table';
@@ -70,6 +71,7 @@ import { CustomAppComponent } from './customapp/customapp.component';
7071
NimbleTabsToolbarModule,
7172
NimbleDrawerModule,
7273
NimbleCheckboxModule,
74+
NimbleChipModule,
7375
NimbleToggleButtonModule,
7476
NimbleBreadcrumbModule,
7577
NimbleBreadcrumbItemModule,

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,13 @@
7373
<nimble-checkbox>Checkbox label</nimble-checkbox>
7474
<nimble-checkbox>Checkbox label</nimble-checkbox>
7575
</div>
76+
<div class="sub-container">
77+
<div class="container-label">Chip</div>
78+
<nimble-chip>Outline Chip</nimble-chip>
79+
<nimble-chip appearance="block">Block Chip</nimble-chip>
80+
<nimble-chip removable (remove)="onChipRemove()">Removable Chip</nimble-chip>
81+
<nimble-chip disabled>Disabled Chip</nimble-chip>
82+
</div>
7683
<div class="sub-container">
7784
<div class="container-label">Radio Buttons</div>
7885
<nimble-radio-group>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,10 @@ export class CustomAppComponent implements AfterViewInit {
159159
alert(`${menuItemText} selected`);
160160
}
161161

162+
public onChipRemove(): void {
163+
alert('Chip removed');
164+
}
165+
162166
public onDynamicSelectFilterInput(e: Event): void {
163167
const event = e as CustomEvent<SelectFilterInputEventDetail>;
164168
const filter = event.detail.filterText;

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,42 @@
11
{
22
"name": "@ni/nimble-angular",
33
"entries": [
4+
{
5+
"date": "Fri, 23 Jan 2026 21:08:50 GMT",
6+
"version": "32.1.1",
7+
"tag": "@ni/nimble-angular_v32.1.1",
8+
"comments": {
9+
"patch": [
10+
{
11+
"author": "1588923+rajsite@users.noreply.github.com",
12+
"package": "@ni/nimble-angular",
13+
"commit": "ea48f0fb1ca901fa9bf2bfe4a82ae04a44b2ab63",
14+
"comment": "Internal change to icon pattern"
15+
},
16+
{
17+
"author": "beachball",
18+
"package": "@ni/nimble-angular",
19+
"comment": "Bump @ni/nimble-components to v35.0.3",
20+
"commit": "not available"
21+
}
22+
]
23+
}
24+
},
25+
{
26+
"date": "Fri, 23 Jan 2026 16:37:46 GMT",
27+
"version": "32.1.0",
28+
"tag": "@ni/nimble-angular_v32.1.0",
29+
"comments": {
30+
"minor": [
31+
{
32+
"author": "123377523+vivinkrishna-ni@users.noreply.github.com",
33+
"package": "@ni/nimble-angular",
34+
"commit": "fed6c36b6fe971d4699a6b8c1b55084f7fe8a651",
35+
"comment": "Angular integration for nimble-chip component"
36+
}
37+
]
38+
}
39+
},
440
{
541
"date": "Tue, 20 Jan 2026 03:36:17 GMT",
642
"version": "32.0.2",

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

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

3-
<!-- This log was last generated on Tue, 20 Jan 2026 03:36:17 GMT and should not be manually modified. -->
3+
<!-- This log was last generated on Fri, 23 Jan 2026 21:08:50 GMT and should not be manually modified. -->
44

55
<!-- Start content -->
66

7+
## 32.1.1
8+
9+
Fri, 23 Jan 2026 21:08:50 GMT
10+
11+
### Patches
12+
13+
- Internal change to icon pattern ([ni/nimble@ea48f0f](https://github.com/ni/nimble/commit/ea48f0fb1ca901fa9bf2bfe4a82ae04a44b2ab63))
14+
- Bump @ni/nimble-components to v35.0.3
15+
16+
## 32.1.0
17+
18+
Fri, 23 Jan 2026 16:37:46 GMT
19+
20+
### Minor changes
21+
22+
- Angular integration for nimble-chip component ([ni/nimble@fed6c36](https://github.com/ni/nimble/commit/fed6c36b6fe971d4699a6b8c1b55084f7fe8a651))
23+
724
## 32.0.2
825

926
Tue, 20 Jan 2026 03:36:17 GMT

‎packages/angular-workspace/nimble-angular/build/generate-icons.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ export class ${moduleName} { }
9191
modulePath: moduleFilePath
9292
});
9393
}
94-
console.log(`Finshed writing ${directiveAndModulePaths.length} icon directive and module files`);
94+
console.log(`Finished writing ${directiveAndModulePaths.length} icon directive and module files`);
9595

9696
let barrelFileContents = `${generatedFilePrefix}\n`;
9797
for (const paths of directiveAndModulePaths) {

‎packages/angular-workspace/nimble-angular/chip/ng-package.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"$schema": "../../../../node_modules/ng-packagr/ng-package.schema.json",
3+
"lib": {
4+
"entryFile": "public-api.ts"
5+
}
6+
}

‎packages/angular-workspace/nimble-angular/chip/nimble-chip.directive.ts‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
import { Directive, ElementRef, Input, Renderer2 } from '@angular/core';
2+
import { type Chip, chipTag } from '@ni/nimble-components/dist/esm/chip';
3+
import { ChipAppearance } from '@ni/nimble-components/dist/esm/chip/types';
4+
import { type BooleanValueOrAttribute, toBooleanProperty } from '@ni/nimble-angular/internal-utilities';
5+
6+
export type { Chip };
7+
export { chipTag };
8+
export { ChipAppearance };
9+
10+
/**
11+
* Directive to provide Angular integration for the chip.
12+
*/
13+
@Directive({
14+
selector: 'nimble-chip',
15+
standalone: false
16+
})
17+
export class NimbleChipDirective {
18+
public get removable(): boolean {
19+
return this.elementRef.nativeElement.removable;
20+
}
21+
22+
@Input() public set removable(value: BooleanValueOrAttribute) {
23+
this.renderer.setProperty(this.elementRef.nativeElement, 'removable', toBooleanProperty(value));
24+
}
25+
26+
public get disabled(): boolean {
27+
return this.elementRef.nativeElement.disabled;
28+
}
29+
30+
@Input() public set disabled(value: BooleanValueOrAttribute) {
31+
this.renderer.setProperty(this.elementRef.nativeElement, 'disabled', toBooleanProperty(value));
32+
}
33+
34+
public get appearance(): ChipAppearance {
35+
return this.elementRef.nativeElement.appearance;
36+
}
37+
38+
@Input() public set appearance(value: ChipAppearance) {
39+
this.renderer.setProperty(this.elementRef.nativeElement, 'appearance', value);
40+
}
41+
42+
public constructor(private readonly renderer: Renderer2, private readonly elementRef: ElementRef<Chip>) {}
43+
}

0 commit comments

Comments
 (0)