From f4f3f45c9107ff6d6c964fea69cd48247d6595fe Mon Sep 17 00:00:00 2001 From: m-akinc <7282195+m-akinc@users.noreply.github.com> Date: Wed, 28 Feb 2024 13:17:25 -0600 Subject: [PATCH 1/2] Add new icons for resume, generate, stop, deploy, undeploy, and hide (#1875) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Pull Request ## ๐Ÿคจ Rationale Fixes #1844 ## ๐Ÿ‘ฉโ€๐Ÿ’ป Implementation Added new SVGs and updated icon-metadata file. ## ๐Ÿงช Testing None ## โœ… Checklist - [x] I have updated the project documentation to reflect my changes or determined no changes are needed. --- ...s-ad9b45b0-4a44-4907-b442-c62d946d50c8.json | 7 +++++++ ...s-b973b274-079e-421e-b812-e36f4d8a1b4f.json | 7 +++++++ .../src/icon-base/tests/icon-metadata.ts | 18 ++++++++++++++++++ .../src/icon-base/tests/icons.stories.ts | 2 +- .../dist/icons/svg/eye-dash_16x16.svg | 5 +++++ .../svg/horizontal-triangle-outline_16x16.svg | 5 +++++ .../icons/svg/inward-squares-three_16x16.svg | 5 +++++ .../icons/svg/outward-squares-three_16x16.svg | 5 +++++ .../dist/icons/svg/skip-arrow_16x16.svg | 5 +++-- .../dist/icons/svg/square-x_16x16.svg | 5 +++++ ...three-circles-ascending-container_16x16.svg | 5 +++++ 11 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 change/@ni-nimble-components-ad9b45b0-4a44-4907-b442-c62d946d50c8.json create mode 100644 change/@ni-nimble-tokens-b973b274-079e-421e-b812-e36f4d8a1b4f.json create mode 100644 packages/nimble-tokens/dist/icons/svg/eye-dash_16x16.svg create mode 100644 packages/nimble-tokens/dist/icons/svg/horizontal-triangle-outline_16x16.svg create mode 100644 packages/nimble-tokens/dist/icons/svg/inward-squares-three_16x16.svg create mode 100644 packages/nimble-tokens/dist/icons/svg/outward-squares-three_16x16.svg create mode 100644 packages/nimble-tokens/dist/icons/svg/square-x_16x16.svg create mode 100644 packages/nimble-tokens/dist/icons/svg/three-circles-ascending-container_16x16.svg diff --git a/change/@ni-nimble-components-ad9b45b0-4a44-4907-b442-c62d946d50c8.json b/change/@ni-nimble-components-ad9b45b0-4a44-4907-b442-c62d946d50c8.json new file mode 100644 index 0000000000..7f5f4187fe --- /dev/null +++ b/change/@ni-nimble-components-ad9b45b0-4a44-4907-b442-c62d946d50c8.json @@ -0,0 +1,7 @@ +{ + "type": "minor", + "comment": "Add new icons for resume, generate, stop, deploy, undeploy, and hide", + "packageName": "@ni/nimble-components", + "email": "7282195+m-akinc@users.noreply.github.com", + "dependentChangeType": "patch" +} diff --git a/change/@ni-nimble-tokens-b973b274-079e-421e-b812-e36f4d8a1b4f.json b/change/@ni-nimble-tokens-b973b274-079e-421e-b812-e36f4d8a1b4f.json new file mode 100644 index 0000000000..253c204a92 --- /dev/null +++ b/change/@ni-nimble-tokens-b973b274-079e-421e-b812-e36f4d8a1b4f.json @@ -0,0 +1,7 @@ +{ + "type": "minor", + "comment": "Add new icons for resume, generate, stop, deploy, undeploy, and hide", + "packageName": "@ni/nimble-tokens", + "email": "7282195+m-akinc@users.noreply.github.com", + "dependentChangeType": "patch" +} diff --git a/packages/nimble-components/src/icon-base/tests/icon-metadata.ts b/packages/nimble-components/src/icon-base/tests/icon-metadata.ts index c53d658e55..96c0e68f36 100644 --- a/packages/nimble-components/src/icon-base/tests/icon-metadata.ts +++ b/packages/nimble-components/src/icon-base/tests/icon-metadata.ts @@ -244,6 +244,9 @@ export const iconMetadata: { IconEye: { tags: ['details', 'view'] }, + IconEyeDash: { + tags: ['hide', 'show', 'view', 'remove'] + }, IconFancyA: { tags: ['tdms string channel'] }, @@ -313,6 +316,9 @@ export const iconMetadata: { IconHourglass: { tags: ['history', 'timer'] }, + IconHorizontalTriangleOutline: { + tags: ['resume', 'play', 'start', 'go', 'now'] + }, IconIndent: { tags: ['increase list level', 'indent right'] }, @@ -325,6 +331,9 @@ export const iconMetadata: { IconInfoCircle: { tags: [] }, + IconInwardSquaresThree: { + tags: ['deploy'] + }, IconItalicI: { tags: [] }, @@ -385,6 +394,9 @@ export const iconMetadata: { IconOutdent: { tags: ['decrease list level', 'indent left'] }, + IconOutwardSquaresThree: { + tags: ['undeploy'] + }, IconPaste: { tags: ['clipboard'] }, @@ -445,6 +457,9 @@ export const iconMetadata: { IconSquareT: { tags: ['static text'] }, + IconSquareX: { + tags: ['quit', 'end', 'abort', 'stop', 'terminate'] + }, IconStopSquare: { tags: ['quit', 'end'] }, @@ -469,6 +484,9 @@ export const iconMetadata: { IconTargetCrosshairsProgress: { tags: ['calibrate', 'self calibrate'] }, + IconThreeCirclesAscendingContainer: { + tags: ['generate', 'produce'] + }, IconThreeDotsLine: { tags: ['ellipsis', 'options'] }, diff --git a/packages/nimble-components/src/icon-base/tests/icons.stories.ts b/packages/nimble-components/src/icon-base/tests/icons.stories.ts index bf1cce2849..d59f18b9bd 100644 --- a/packages/nimble-components/src/icon-base/tests/icons.stories.ts +++ b/packages/nimble-components/src/icon-base/tests/icons.stories.ts @@ -82,7 +82,7 @@ export const icons: StoryObj = { <${tableTag} ${ref('tableRef')} ${/* Make the table big enough to remove vertical scrollbar */ ''} - style="height: 6200px;" + style="height: 6325px;" data-unused="${x => updateData(x.tableRef)}" > <${tableColumnIconTag} field-name="tag" key-type="string"> diff --git a/packages/nimble-tokens/dist/icons/svg/eye-dash_16x16.svg b/packages/nimble-tokens/dist/icons/svg/eye-dash_16x16.svg new file mode 100644 index 0000000000..19e6d42821 --- /dev/null +++ b/packages/nimble-tokens/dist/icons/svg/eye-dash_16x16.svg @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/packages/nimble-tokens/dist/icons/svg/horizontal-triangle-outline_16x16.svg b/packages/nimble-tokens/dist/icons/svg/horizontal-triangle-outline_16x16.svg new file mode 100644 index 0000000000..ea6aa928e2 --- /dev/null +++ b/packages/nimble-tokens/dist/icons/svg/horizontal-triangle-outline_16x16.svg @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/packages/nimble-tokens/dist/icons/svg/inward-squares-three_16x16.svg b/packages/nimble-tokens/dist/icons/svg/inward-squares-three_16x16.svg new file mode 100644 index 0000000000..53a0bc7da8 --- /dev/null +++ b/packages/nimble-tokens/dist/icons/svg/inward-squares-three_16x16.svg @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/packages/nimble-tokens/dist/icons/svg/outward-squares-three_16x16.svg b/packages/nimble-tokens/dist/icons/svg/outward-squares-three_16x16.svg new file mode 100644 index 0000000000..cf4652bcf4 --- /dev/null +++ b/packages/nimble-tokens/dist/icons/svg/outward-squares-three_16x16.svg @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/packages/nimble-tokens/dist/icons/svg/skip-arrow_16x16.svg b/packages/nimble-tokens/dist/icons/svg/skip-arrow_16x16.svg index 1ed460cc36..8f46b75ae3 100644 --- a/packages/nimble-tokens/dist/icons/svg/skip-arrow_16x16.svg +++ b/packages/nimble-tokens/dist/icons/svg/skip-arrow_16x16.svg @@ -1,4 +1,5 @@ - + - + \ No newline at end of file diff --git a/packages/nimble-tokens/dist/icons/svg/square-x_16x16.svg b/packages/nimble-tokens/dist/icons/svg/square-x_16x16.svg new file mode 100644 index 0000000000..35d3417af4 --- /dev/null +++ b/packages/nimble-tokens/dist/icons/svg/square-x_16x16.svg @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/packages/nimble-tokens/dist/icons/svg/three-circles-ascending-container_16x16.svg b/packages/nimble-tokens/dist/icons/svg/three-circles-ascending-container_16x16.svg new file mode 100644 index 0000000000..077092bb98 --- /dev/null +++ b/packages/nimble-tokens/dist/icons/svg/three-circles-ascending-container_16x16.svg @@ -0,0 +1,5 @@ + + + + \ No newline at end of file From 33354140e84c85eff7fe47c2452f559a29a52ac0 Mon Sep 17 00:00:00 2001 From: rajsite Date: Wed, 28 Feb 2024 19:35:04 +0000 Subject: [PATCH 2/2] applying package updates [skip ci] --- .../projects/ni/nimble-angular/CHANGELOG.json | 15 +++++++++++++ .../projects/ni/nimble-angular/CHANGELOG.md | 10 ++++++++- .../projects/ni/nimble-angular/package.json | 4 ++-- ...-ad9b45b0-4a44-4907-b442-c62d946d50c8.json | 7 ------- ...-b973b274-079e-421e-b812-e36f4d8a1b4f.json | 7 ------- package-lock.json | 12 +++++------ packages/nimble-blazor/package.json | 2 +- packages/nimble-components/CHANGELOG.json | 21 +++++++++++++++++++ packages/nimble-components/CHANGELOG.md | 11 +++++++++- packages/nimble-components/package.json | 4 ++-- packages/nimble-tokens/CHANGELOG.json | 15 +++++++++++++ packages/nimble-tokens/CHANGELOG.md | 10 ++++++++- packages/nimble-tokens/package.json | 2 +- 13 files changed, 91 insertions(+), 29 deletions(-) delete mode 100644 change/@ni-nimble-components-ad9b45b0-4a44-4907-b442-c62d946d50c8.json delete mode 100644 change/@ni-nimble-tokens-b973b274-079e-421e-b812-e36f4d8a1b4f.json diff --git a/angular-workspace/projects/ni/nimble-angular/CHANGELOG.json b/angular-workspace/projects/ni/nimble-angular/CHANGELOG.json index 55072f8e70..e8b7bf13b5 100644 --- a/angular-workspace/projects/ni/nimble-angular/CHANGELOG.json +++ b/angular-workspace/projects/ni/nimble-angular/CHANGELOG.json @@ -1,6 +1,21 @@ { "name": "@ni/nimble-angular", "entries": [ + { + "date": "Wed, 28 Feb 2024 19:35:04 GMT", + "version": "20.2.12", + "tag": "@ni/nimble-angular_v20.2.12", + "comments": { + "patch": [ + { + "author": "beachball", + "package": "@ni/nimble-angular", + "comment": "Bump @ni/nimble-components to v21.7.0", + "commit": "not available" + } + ] + } + }, { "date": "Mon, 26 Feb 2024 22:26:36 GMT", "version": "20.2.11", diff --git a/angular-workspace/projects/ni/nimble-angular/CHANGELOG.md b/angular-workspace/projects/ni/nimble-angular/CHANGELOG.md index 94f3f9a7d1..e580df39ab 100644 --- a/angular-workspace/projects/ni/nimble-angular/CHANGELOG.md +++ b/angular-workspace/projects/ni/nimble-angular/CHANGELOG.md @@ -1,9 +1,17 @@ # Change Log - @ni/nimble-angular -This log was last generated on Mon, 26 Feb 2024 22:26:36 GMT and should not be manually modified. +This log was last generated on Wed, 28 Feb 2024 19:35:04 GMT and should not be manually modified. +## 20.2.12 + +Wed, 28 Feb 2024 19:35:04 GMT + +### Patches + +- Bump @ni/nimble-components to v21.7.0 + ## 20.2.11 Mon, 26 Feb 2024 22:26:36 GMT diff --git a/angular-workspace/projects/ni/nimble-angular/package.json b/angular-workspace/projects/ni/nimble-angular/package.json index bf3f4c0968..211816a498 100644 --- a/angular-workspace/projects/ni/nimble-angular/package.json +++ b/angular-workspace/projects/ni/nimble-angular/package.json @@ -1,6 +1,6 @@ { "name": "@ni/nimble-angular", - "version": "20.2.11", + "version": "20.2.12", "description": "Angular components for the NI Nimble Design System", "scripts": { "invoke-publish": "cd ../../../ && npm run build:library && cd dist/ni/nimble-angular && npm publish" @@ -31,7 +31,7 @@ "@angular/forms": "^15.2.10", "@angular/localize": "^15.2.10", "@angular/router": "^15.2.10", - "@ni/nimble-components": "^21.6.8" + "@ni/nimble-components": "^21.7.0" }, "dependencies": { "tslib": "^2.2.0" diff --git a/change/@ni-nimble-components-ad9b45b0-4a44-4907-b442-c62d946d50c8.json b/change/@ni-nimble-components-ad9b45b0-4a44-4907-b442-c62d946d50c8.json deleted file mode 100644 index 7f5f4187fe..0000000000 --- a/change/@ni-nimble-components-ad9b45b0-4a44-4907-b442-c62d946d50c8.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "minor", - "comment": "Add new icons for resume, generate, stop, deploy, undeploy, and hide", - "packageName": "@ni/nimble-components", - "email": "7282195+m-akinc@users.noreply.github.com", - "dependentChangeType": "patch" -} diff --git a/change/@ni-nimble-tokens-b973b274-079e-421e-b812-e36f4d8a1b4f.json b/change/@ni-nimble-tokens-b973b274-079e-421e-b812-e36f4d8a1b4f.json deleted file mode 100644 index 253c204a92..0000000000 --- a/change/@ni-nimble-tokens-b973b274-079e-421e-b812-e36f4d8a1b4f.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "minor", - "comment": "Add new icons for resume, generate, stop, deploy, undeploy, and hide", - "packageName": "@ni/nimble-tokens", - "email": "7282195+m-akinc@users.noreply.github.com", - "dependentChangeType": "patch" -} diff --git a/package-lock.json b/package-lock.json index 741b32cb1e..bcf30a1168 100644 --- a/package-lock.json +++ b/package-lock.json @@ -83,7 +83,7 @@ }, "angular-workspace/projects/ni/nimble-angular": { "name": "@ni/nimble-angular", - "version": "20.2.11", + "version": "20.2.12", "license": "MIT", "dependencies": { "tslib": "^2.2.0" @@ -94,7 +94,7 @@ "@angular/forms": "^15.2.10", "@angular/localize": "^15.2.10", "@angular/router": "^15.2.10", - "@ni/nimble-components": "^21.6.8" + "@ni/nimble-components": "^21.7.0" } }, "node_modules/@11ty/dependency-tree": { @@ -33892,7 +33892,7 @@ }, "packages/nimble-blazor": { "name": "@ni/nimble-blazor", - "version": "14.3.8", + "version": "14.3.9", "hasInstallScript": true, "license": "MIT", "devDependencies": { @@ -34014,14 +34014,14 @@ }, "packages/nimble-components": { "name": "@ni/nimble-components", - "version": "21.6.8", + "version": "21.7.0", "license": "MIT", "dependencies": { "@microsoft/fast-colors": "^5.3.1", "@microsoft/fast-element": "^1.12.0", "@microsoft/fast-foundation": "2.49.4", "@microsoft/fast-web-utilities": "^6.0.0", - "@ni/nimble-tokens": "^6.11.1", + "@ni/nimble-tokens": "^6.12.0", "@tanstack/table-core": "^8.10.7", "@tanstack/virtual-core": "^3.0.0-beta.68", "@tiptap/core": "^2.2.2", @@ -34133,7 +34133,7 @@ }, "packages/nimble-tokens": { "name": "@ni/nimble-tokens", - "version": "6.11.1", + "version": "6.12.0", "license": "MIT", "devDependencies": { "@microsoft/fast-colors": "^5.3.1", diff --git a/packages/nimble-blazor/package.json b/packages/nimble-blazor/package.json index fd33b81b87..6bd8a13519 100644 --- a/packages/nimble-blazor/package.json +++ b/packages/nimble-blazor/package.json @@ -1,6 +1,6 @@ { "name": "@ni/nimble-blazor", - "version": "14.3.8", + "version": "14.3.9", "description": "Blazor components for the NI Nimble Design System", "scripts": { "postinstall": "node build/generate-playwright-version-properties/source/index.js", diff --git a/packages/nimble-components/CHANGELOG.json b/packages/nimble-components/CHANGELOG.json index f5de9b045f..33e4a52a42 100644 --- a/packages/nimble-components/CHANGELOG.json +++ b/packages/nimble-components/CHANGELOG.json @@ -1,6 +1,27 @@ { "name": "@ni/nimble-components", "entries": [ + { + "date": "Wed, 28 Feb 2024 19:35:04 GMT", + "version": "21.7.0", + "tag": "@ni/nimble-components_v21.7.0", + "comments": { + "minor": [ + { + "author": "7282195+m-akinc@users.noreply.github.com", + "package": "@ni/nimble-components", + "commit": "f4f3f45c9107ff6d6c964fea69cd48247d6595fe", + "comment": "Add new icons for resume, generate, stop, deploy, undeploy, and hide" + }, + { + "author": "beachball", + "package": "@ni/nimble-components", + "comment": "Bump @ni/nimble-tokens to v6.12.0", + "commit": "not available" + } + ] + } + }, { "date": "Mon, 26 Feb 2024 22:26:36 GMT", "version": "21.6.8", diff --git a/packages/nimble-components/CHANGELOG.md b/packages/nimble-components/CHANGELOG.md index 47c95e658f..4f08eec2e9 100644 --- a/packages/nimble-components/CHANGELOG.md +++ b/packages/nimble-components/CHANGELOG.md @@ -1,9 +1,18 @@ # Change Log - @ni/nimble-components -This log was last generated on Mon, 26 Feb 2024 22:26:36 GMT and should not be manually modified. +This log was last generated on Wed, 28 Feb 2024 19:35:04 GMT and should not be manually modified. +## 21.7.0 + +Wed, 28 Feb 2024 19:35:04 GMT + +### Minor changes + +- Add new icons for resume, generate, stop, deploy, undeploy, and hide ([ni/nimble@f4f3f45](https://github.com/ni/nimble/commit/f4f3f45c9107ff6d6c964fea69cd48247d6595fe)) +- Bump @ni/nimble-tokens to v6.12.0 + ## 21.6.8 Mon, 26 Feb 2024 22:26:36 GMT diff --git a/packages/nimble-components/package.json b/packages/nimble-components/package.json index 45b684aa68..d5df1c41f1 100644 --- a/packages/nimble-components/package.json +++ b/packages/nimble-components/package.json @@ -1,6 +1,6 @@ { "name": "@ni/nimble-components", - "version": "21.6.8", + "version": "21.7.0", "description": "Styled web components for the NI Nimble Design System", "scripts": { "build": "npm run generate-icons && npm run build-components && npm run bundle-components && npm run generate-scss && npm run build-storybook", @@ -64,7 +64,7 @@ "@microsoft/fast-element": "^1.12.0", "@microsoft/fast-foundation": "2.49.4", "@microsoft/fast-web-utilities": "^6.0.0", - "@ni/nimble-tokens": "^6.11.1", + "@ni/nimble-tokens": "^6.12.0", "@tanstack/table-core": "^8.10.7", "@tanstack/virtual-core": "^3.0.0-beta.68", "@tiptap/core": "^2.2.2", diff --git a/packages/nimble-tokens/CHANGELOG.json b/packages/nimble-tokens/CHANGELOG.json index 6d8d0477ff..b849c006ff 100644 --- a/packages/nimble-tokens/CHANGELOG.json +++ b/packages/nimble-tokens/CHANGELOG.json @@ -1,6 +1,21 @@ { "name": "@ni/nimble-tokens", "entries": [ + { + "date": "Wed, 28 Feb 2024 19:35:04 GMT", + "version": "6.12.0", + "tag": "@ni/nimble-tokens_v6.12.0", + "comments": { + "minor": [ + { + "author": "7282195+m-akinc@users.noreply.github.com", + "package": "@ni/nimble-tokens", + "commit": "f4f3f45c9107ff6d6c964fea69cd48247d6595fe", + "comment": "Add new icons for resume, generate, stop, deploy, undeploy, and hide" + } + ] + } + }, { "date": "Thu, 22 Feb 2024 01:13:03 GMT", "version": "6.11.1", diff --git a/packages/nimble-tokens/CHANGELOG.md b/packages/nimble-tokens/CHANGELOG.md index 5a1690bc41..fbb4e1919e 100644 --- a/packages/nimble-tokens/CHANGELOG.md +++ b/packages/nimble-tokens/CHANGELOG.md @@ -1,9 +1,17 @@ # Change Log - @ni/nimble-tokens -This log was last generated on Thu, 22 Feb 2024 01:13:03 GMT and should not be manually modified. +This log was last generated on Wed, 28 Feb 2024 19:35:04 GMT and should not be manually modified. +## 6.12.0 + +Wed, 28 Feb 2024 19:35:04 GMT + +### Minor changes + +- Add new icons for resume, generate, stop, deploy, undeploy, and hide ([ni/nimble@f4f3f45](https://github.com/ni/nimble/commit/f4f3f45c9107ff6d6c964fea69cd48247d6595fe)) + ## 6.11.1 Thu, 22 Feb 2024 01:13:03 GMT diff --git a/packages/nimble-tokens/package.json b/packages/nimble-tokens/package.json index ebabe53d8f..c38de12866 100644 --- a/packages/nimble-tokens/package.json +++ b/packages/nimble-tokens/package.json @@ -1,6 +1,6 @@ { "name": "@ni/nimble-tokens", - "version": "6.11.1", + "version": "6.12.0", "description": "Design tokens for the NI Nimble Design System", "scripts": { "build": "npm run build:svg-to-ts && npm run build:ts && npm run build:svg-to-ico && npm run build:generate-font-scss && npm run build:style-dictionary",