Skip to content

Commit 26830a1

Browse files
committed
Merge branch 'icon-refactor' into icon-dynamic
2 parents 9ac31c1 + acd6397 commit 26830a1

6 files changed

Lines changed: 28 additions & 29 deletions

File tree

change/@ni-nimble-angular-9ecc4cd6-b0a5-467e-b0e8-ef1705ef2c54.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
{
22
"name": "@ni/nimble-angular",
33
"entries": [
4+
{
5+
"date": "Fri, 23 Jan 2026 16:37:46 GMT",
6+
"version": "32.1.0",
7+
"tag": "@ni/nimble-angular_v32.1.0",
8+
"comments": {
9+
"minor": [
10+
{
11+
"author": "123377523+vivinkrishna-ni@users.noreply.github.com",
12+
"package": "@ni/nimble-angular",
13+
"commit": "fed6c36b6fe971d4699a6b8c1b55084f7fe8a651",
14+
"comment": "Angular integration for nimble-chip component"
15+
}
16+
]
17+
}
18+
},
419
{
520
"date": "Tue, 20 Jan 2026 03:36:17 GMT",
621
"version": "32.0.2",

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
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 16:37:46 GMT and should not be manually modified. -->
44

55
<!-- Start content -->
66

7+
## 32.1.0
8+
9+
Fri, 23 Jan 2026 16:37:46 GMT
10+
11+
### Minor changes
12+
13+
- Angular integration for nimble-chip component ([ni/nimble@fed6c36](https://github.com/ni/nimble/commit/fed6c36b6fe971d4699a6b8c1b55084f7fe8a651))
14+
715
## 32.0.2
816

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ni/nimble-angular",
3-
"version": "32.0.2",
3+
"version": "32.1.0",
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",

packages/storybook/src/nimble/table-column/mapping/table-column-mapping.stories.ts

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { html, ref, customElement, css } from '@ni/fast-element';
1+
import { html, ref } from '@ni/fast-element';
22
import type { Meta, StoryObj } from '@storybook/html-vite';
33
import { tableTag } from '@ni/nimble-components/dist/esm/table';
44
import { iconXmarkTag } from '@ni/nimble-components/dist/esm/icons/xmark';
@@ -11,8 +11,6 @@ import { mappingTextTag } from '@ni/nimble-components/dist/esm/mapping/text';
1111
import { mappingEmptyTag } from '@ni/nimble-components/dist/esm/mapping/empty';
1212
import { TableColumnMappingWidthMode } from '@ni/nimble-components/dist/esm/table-column/mapping/types';
1313
import { tableColumnMappingTag } from '@ni/nimble-components/dist/esm/table-column/mapping';
14-
import { Icon } from '@ni/nimble-components/dist/esm/icon-base';
15-
import { display } from '@ni/nimble-components/dist/esm/utilities/style/display';
1614
import {
1715
type SharedTableArgs,
1816
sharedTableArgTypes,
@@ -85,21 +83,6 @@ This should only be set when the header contains a single icon (no text) and non
8583
to \`default\`, the column will be resizable and be sized based on its fractional-width and min-pixel-width values. A column with its \`width-mode\` set to \`iconSize\` should
8684
should not be the right-most column in the table.`;
8785

88-
const img = 'data:image/gif;base64,R0lGODlhFwAaAPIHAPfWre+9e//v3s6EITw+PP////+M/wAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFCgAHACwAAAAAFwAaAEADkHi63O5jhEmFBSDCYPq0oNUZGTNgJ6ZiVCC5Tywr70QQn3WD5RKpPMvAMhnMjjOJMcLUnIybVuVygfoot50uq7I2gSEBQGhtnMIgaRnJbifXEDjNVWv95If6lCfXT8ZhPVc2BAU4W4ZVJhwFBjcBAgRiNwaNgnMVgIGXKWBhQygxZ2gRdnEYaAJqZU2trq0HCQAh+QQFCgAAACwAAAAAAQABAAACAkQBACH5BAUKAAAALAAAAAABAAEAAAICRAEAIfkECQoAAAAsAAAAABMABwAAAgqEj6nL7Q+jnLEAACH5BAkKAAIALAIABgATAAQAAAIQlD+pc6gNzRohxAsAY/eyAgAh+QQJCgAEACwEAAUADwAFAAADGThD3E5qhBUrBGrKwLvCWccJJABuYkCuWAIAIfkECQoABAAsAgAGABMABAAAAxhIutM+i70Rqg2zVXqD+AAwhJDWeR/YEAkAIfkEBQoABAAsBAAFAA8ABQAAAxk4Q9xOaoQVKwRqysC7wlnHCSQAbmJArlgCACH5BAUKAAAALAAAAAABAAEAAAICRAEAIfkEBQoAAAAsAAAAAAEAAQAAAgJEAQAh+QQFCgAAACwAAAAAAQABAAACAkQBACH5BAUKAAAALAAAAAABAAEAAAICRAEAIfkEBQoAAAAsAAAAAAEAAQAAAgJEAQAh+QQFCgAAACwAAAAAAQABAAACAkQBACH5BAUKAAAALAAAAAABAAEAAAICRAEAIfkEBQoAAAAsAAAAAAEAAQAAAgJEAQAh+QQFCgAAACwAAAAAAQABAAACAkQBACH5BAUKAAAALAAAAAABAAEAAAICRAEAIfkEBQoAAwAsBgAIAAsABwAAAhKMD6PL7SveSsM0gU+AOFqGDQUAIfkEBQoAAQAsBgAIAAsABwAAAxMYurL+EILIFCHviluwJd3lLWICACH5BAUKAAAALAAAAAABAAEAAAICRAEAIfkEBQoAAAAsAAAAAAEAAQAAAgJEAQAh+QQFCgAAACwAAAAAAQABAAACAkQBACH5BAUKAAAALAAAAAABAAEAAAICRAEAIfkEBQoAAAAsAAAAAAEAAQAAAgJEAQAh+QQFCgAAACwAAAAAAQABAAACAkQBACH5BAUKAAAALAAAAAABAAEAAAICRAEAOw==';
89-
const awesomeIconTag = 'awesome-icon';
90-
/**
91-
* Awesome icon
92-
*/
93-
@customElement({
94-
name: awesomeIconTag,
95-
template: html`<img src="${img}" style="width: 16px; height: 16px">`,
96-
styles: css`
97-
${display('inline-flex')}
98-
`
99-
})
100-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
101-
class AwesomeIcon extends Icon {}
102-
10386
export const mappingColumn: StoryObj<MappingColumnTableArgs> = {
10487
render: createUserSelectedThemeStory(html<MappingColumnTableArgs>`
10588
<${tableTag}
@@ -113,7 +96,7 @@ export const mappingColumn: StoryObj<MappingColumnTableArgs> = {
11396
<${tableColumnMappingTag} field-name="status" group-index="0">
11497
Status
11598
<${mappingIconTag} key="fail" icon="${iconXmarkTag}" severity="error" text="Not a Simpson"></${mappingIconTag}>
116-
<${mappingIconTag} key="success" icon="${awesomeIconTag}" severity="success" text="Is a Simpson"></${mappingIconTag}>
99+
<${mappingIconTag} key="success" icon="${iconCheckTag}" severity="success" text="Is a Simpson"></${mappingIconTag}>
117100
<${mappingSpinnerTag} key="calculating" text="Calculating" text-hidden></${mappingSpinnerTag}>
118101
<${mappingEmptyTag} key="unknown" text="Unknown"></${mappingEmptyTag}>
119102
</${tableColumnMappingTag}>

0 commit comments

Comments
 (0)