From 77e3f740bf455d6cb757fe9b51dad27e54ad69ba Mon Sep 17 00:00:00 2001 From: rajsite Date: Fri, 23 Feb 2024 21:23:19 +0000 Subject: [PATCH 1/5] 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 ++-- ...ents-4305503e-0bf0-48f8-b23a-ff4046ed7e0c.json | 7 ------- package-lock.json | 8 ++++---- packages/nimble-blazor/package.json | 2 +- packages/nimble-components/CHANGELOG.json | 15 +++++++++++++++ packages/nimble-components/CHANGELOG.md | 10 +++++++++- packages/nimble-components/package.json | 2 +- 9 files changed, 56 insertions(+), 17 deletions(-) delete mode 100644 change/@ni-nimble-components-4305503e-0bf0-48f8-b23a-ff4046ed7e0c.json diff --git a/angular-workspace/projects/ni/nimble-angular/CHANGELOG.json b/angular-workspace/projects/ni/nimble-angular/CHANGELOG.json index eebd8ff20b..b6667bd0b4 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": "Fri, 23 Feb 2024 21:23:19 GMT", + "version": "20.2.8", + "tag": "@ni/nimble-angular_v20.2.8", + "comments": { + "patch": [ + { + "author": "beachball", + "package": "@ni/nimble-angular", + "comment": "Bump @ni/nimble-components to v21.6.5", + "commit": "not available" + } + ] + } + }, { "date": "Fri, 23 Feb 2024 00:08:44 GMT", "version": "20.2.7", diff --git a/angular-workspace/projects/ni/nimble-angular/CHANGELOG.md b/angular-workspace/projects/ni/nimble-angular/CHANGELOG.md index 69e31e868f..bf69669b0a 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 Fri, 23 Feb 2024 00:08:44 GMT and should not be manually modified. +This log was last generated on Fri, 23 Feb 2024 21:23:19 GMT and should not be manually modified. +## 20.2.8 + +Fri, 23 Feb 2024 21:23:19 GMT + +### Patches + +- Bump @ni/nimble-components to v21.6.5 + ## 20.2.7 Fri, 23 Feb 2024 00:08:44 GMT diff --git a/angular-workspace/projects/ni/nimble-angular/package.json b/angular-workspace/projects/ni/nimble-angular/package.json index 83dccb5255..436cd94393 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.7", + "version": "20.2.8", "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.4" + "@ni/nimble-components": "^21.6.5" }, "dependencies": { "tslib": "^2.2.0" diff --git a/change/@ni-nimble-components-4305503e-0bf0-48f8-b23a-ff4046ed7e0c.json b/change/@ni-nimble-components-4305503e-0bf0-48f8-b23a-ff4046ed7e0c.json deleted file mode 100644 index e607c6cb33..0000000000 --- a/change/@ni-nimble-components-4305503e-0bf0-48f8-b23a-ff4046ed7e0c.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "patch", - "comment": "Only handle close events coming from dialog element", - "packageName": "@ni/nimble-components", - "email": "7282195+m-akinc@users.noreply.github.com", - "dependentChangeType": "patch" -} diff --git a/package-lock.json b/package-lock.json index ba9545f46a..c8627c0a65 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.7", + "version": "20.2.8", "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.4" + "@ni/nimble-components": "^21.6.5" } }, "node_modules/@11ty/dependency-tree": { @@ -33892,7 +33892,7 @@ }, "packages/nimble-blazor": { "name": "@ni/nimble-blazor", - "version": "14.3.3", + "version": "14.3.4", "hasInstallScript": true, "license": "MIT", "devDependencies": { @@ -34014,7 +34014,7 @@ }, "packages/nimble-components": { "name": "@ni/nimble-components", - "version": "21.6.4", + "version": "21.6.5", "license": "MIT", "dependencies": { "@microsoft/fast-colors": "^5.3.1", diff --git a/packages/nimble-blazor/package.json b/packages/nimble-blazor/package.json index 91473200b3..ef40b935b0 100644 --- a/packages/nimble-blazor/package.json +++ b/packages/nimble-blazor/package.json @@ -1,6 +1,6 @@ { "name": "@ni/nimble-blazor", - "version": "14.3.3", + "version": "14.3.4", "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 7e47678054..7cd721d597 100644 --- a/packages/nimble-components/CHANGELOG.json +++ b/packages/nimble-components/CHANGELOG.json @@ -1,6 +1,21 @@ { "name": "@ni/nimble-components", "entries": [ + { + "date": "Fri, 23 Feb 2024 21:23:18 GMT", + "version": "21.6.5", + "tag": "@ni/nimble-components_v21.6.5", + "comments": { + "patch": [ + { + "author": "7282195+m-akinc@users.noreply.github.com", + "package": "@ni/nimble-components", + "commit": "c1f4f8fb9bbb889608f1d2930f7a29d55fa31c79", + "comment": "Only handle close events coming from dialog element" + } + ] + } + }, { "date": "Fri, 23 Feb 2024 00:08:44 GMT", "version": "21.6.4", diff --git a/packages/nimble-components/CHANGELOG.md b/packages/nimble-components/CHANGELOG.md index ae6a5a5a65..8977dff993 100644 --- a/packages/nimble-components/CHANGELOG.md +++ b/packages/nimble-components/CHANGELOG.md @@ -1,9 +1,17 @@ # Change Log - @ni/nimble-components -This log was last generated on Fri, 23 Feb 2024 00:08:44 GMT and should not be manually modified. +This log was last generated on Fri, 23 Feb 2024 21:23:18 GMT and should not be manually modified. +## 21.6.5 + +Fri, 23 Feb 2024 21:23:18 GMT + +### Patches + +- Only handle close events coming from dialog element ([ni/nimble@c1f4f8f](https://github.com/ni/nimble/commit/c1f4f8fb9bbb889608f1d2930f7a29d55fa31c79)) + ## 21.6.4 Fri, 23 Feb 2024 00:08:44 GMT diff --git a/packages/nimble-components/package.json b/packages/nimble-components/package.json index 54d6068cd2..50728d0f20 100644 --- a/packages/nimble-components/package.json +++ b/packages/nimble-components/package.json @@ -1,6 +1,6 @@ { "name": "@ni/nimble-components", - "version": "21.6.4", + "version": "21.6.5", "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", From c6e803caaa9757f7584281f096a94c4d58ef194d Mon Sep 17 00:00:00 2001 From: mollykreis <20542556+mollykreis@users.noreply.github.com> Date: Fri, 23 Feb 2024 16:00:45 -0600 Subject: [PATCH 2/5] Fix spacing between error text and component (#1864) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Pull Request ## ๐Ÿคจ Rationale Fixes #1845 ## ๐Ÿ‘ฉโ€๐Ÿ’ป Implementation Moved the error text on controls down 2px to create a 2px margin between the bottom of a control and the error text. ## ๐Ÿงช Testing Manually tested in storybook and verified that the error text is no longer visible between the select/combobox and the dropdown. ## โœ… Checklist - [ ] I have updated the project documentation to reflect my changes or determined no changes are needed. --------- Co-authored-by: Milan Raj --- ...le-components-9b36005d-7790-48bb-8717-21198a97490a.json | 7 +++++++ packages/nimble-components/src/patterns/error/styles.ts | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 change/@ni-nimble-components-9b36005d-7790-48bb-8717-21198a97490a.json diff --git a/change/@ni-nimble-components-9b36005d-7790-48bb-8717-21198a97490a.json b/change/@ni-nimble-components-9b36005d-7790-48bb-8717-21198a97490a.json new file mode 100644 index 0000000000..a8bb6a30e9 --- /dev/null +++ b/change/@ni-nimble-components-9b36005d-7790-48bb-8717-21198a97490a.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Fix spacing between error text and component", + "packageName": "@ni/nimble-components", + "email": "20542556+mollykreis@users.noreply.github.com", + "dependentChangeType": "patch" +} diff --git a/packages/nimble-components/src/patterns/error/styles.ts b/packages/nimble-components/src/patterns/error/styles.ts index 11d78eed19..1db07afafd 100644 --- a/packages/nimble-components/src/patterns/error/styles.ts +++ b/packages/nimble-components/src/patterns/error/styles.ts @@ -28,7 +28,7 @@ export const styles = css` color: ${failColor}; width: 100%; position: absolute; - bottom: calc(-1 * ${errorTextFontLineHeight}); + bottom: calc(-1 * (${errorTextFontLineHeight} + 2px)); left: 0px; overflow: hidden; text-overflow: ellipsis; From d15d2ed19908b94849bede2e9fc262253a88d56c Mon Sep 17 00:00:00 2001 From: rajsite Date: Fri, 23 Feb 2024 22:17:56 +0000 Subject: [PATCH 3/5] 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 ++-- ...ents-9b36005d-7790-48bb-8717-21198a97490a.json | 7 ------- package-lock.json | 8 ++++---- packages/nimble-blazor/package.json | 2 +- packages/nimble-components/CHANGELOG.json | 15 +++++++++++++++ packages/nimble-components/CHANGELOG.md | 10 +++++++++- packages/nimble-components/package.json | 2 +- 9 files changed, 56 insertions(+), 17 deletions(-) delete mode 100644 change/@ni-nimble-components-9b36005d-7790-48bb-8717-21198a97490a.json diff --git a/angular-workspace/projects/ni/nimble-angular/CHANGELOG.json b/angular-workspace/projects/ni/nimble-angular/CHANGELOG.json index b6667bd0b4..f02940d907 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": "Fri, 23 Feb 2024 22:17:56 GMT", + "version": "20.2.9", + "tag": "@ni/nimble-angular_v20.2.9", + "comments": { + "patch": [ + { + "author": "beachball", + "package": "@ni/nimble-angular", + "comment": "Bump @ni/nimble-components to v21.6.6", + "commit": "not available" + } + ] + } + }, { "date": "Fri, 23 Feb 2024 21:23:19 GMT", "version": "20.2.8", diff --git a/angular-workspace/projects/ni/nimble-angular/CHANGELOG.md b/angular-workspace/projects/ni/nimble-angular/CHANGELOG.md index bf69669b0a..fbd22e5131 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 Fri, 23 Feb 2024 21:23:19 GMT and should not be manually modified. +This log was last generated on Fri, 23 Feb 2024 22:17:56 GMT and should not be manually modified. +## 20.2.9 + +Fri, 23 Feb 2024 22:17:56 GMT + +### Patches + +- Bump @ni/nimble-components to v21.6.6 + ## 20.2.8 Fri, 23 Feb 2024 21:23:19 GMT diff --git a/angular-workspace/projects/ni/nimble-angular/package.json b/angular-workspace/projects/ni/nimble-angular/package.json index 436cd94393..8a8c600070 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.8", + "version": "20.2.9", "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.5" + "@ni/nimble-components": "^21.6.6" }, "dependencies": { "tslib": "^2.2.0" diff --git a/change/@ni-nimble-components-9b36005d-7790-48bb-8717-21198a97490a.json b/change/@ni-nimble-components-9b36005d-7790-48bb-8717-21198a97490a.json deleted file mode 100644 index a8bb6a30e9..0000000000 --- a/change/@ni-nimble-components-9b36005d-7790-48bb-8717-21198a97490a.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "patch", - "comment": "Fix spacing between error text and component", - "packageName": "@ni/nimble-components", - "email": "20542556+mollykreis@users.noreply.github.com", - "dependentChangeType": "patch" -} diff --git a/package-lock.json b/package-lock.json index c8627c0a65..c4cf47461d 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.8", + "version": "20.2.9", "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.5" + "@ni/nimble-components": "^21.6.6" } }, "node_modules/@11ty/dependency-tree": { @@ -33892,7 +33892,7 @@ }, "packages/nimble-blazor": { "name": "@ni/nimble-blazor", - "version": "14.3.4", + "version": "14.3.5", "hasInstallScript": true, "license": "MIT", "devDependencies": { @@ -34014,7 +34014,7 @@ }, "packages/nimble-components": { "name": "@ni/nimble-components", - "version": "21.6.5", + "version": "21.6.6", "license": "MIT", "dependencies": { "@microsoft/fast-colors": "^5.3.1", diff --git a/packages/nimble-blazor/package.json b/packages/nimble-blazor/package.json index ef40b935b0..877d3a94c2 100644 --- a/packages/nimble-blazor/package.json +++ b/packages/nimble-blazor/package.json @@ -1,6 +1,6 @@ { "name": "@ni/nimble-blazor", - "version": "14.3.4", + "version": "14.3.5", "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 7cd721d597..86efbb700b 100644 --- a/packages/nimble-components/CHANGELOG.json +++ b/packages/nimble-components/CHANGELOG.json @@ -1,6 +1,21 @@ { "name": "@ni/nimble-components", "entries": [ + { + "date": "Fri, 23 Feb 2024 22:17:56 GMT", + "version": "21.6.6", + "tag": "@ni/nimble-components_v21.6.6", + "comments": { + "patch": [ + { + "author": "20542556+mollykreis@users.noreply.github.com", + "package": "@ni/nimble-components", + "commit": "c6e803caaa9757f7584281f096a94c4d58ef194d", + "comment": "Fix spacing between error text and component" + } + ] + } + }, { "date": "Fri, 23 Feb 2024 21:23:18 GMT", "version": "21.6.5", diff --git a/packages/nimble-components/CHANGELOG.md b/packages/nimble-components/CHANGELOG.md index 8977dff993..7961d3437b 100644 --- a/packages/nimble-components/CHANGELOG.md +++ b/packages/nimble-components/CHANGELOG.md @@ -1,9 +1,17 @@ # Change Log - @ni/nimble-components -This log was last generated on Fri, 23 Feb 2024 21:23:18 GMT and should not be manually modified. +This log was last generated on Fri, 23 Feb 2024 22:17:56 GMT and should not be manually modified. +## 21.6.6 + +Fri, 23 Feb 2024 22:17:56 GMT + +### Patches + +- Fix spacing between error text and component ([ni/nimble@c6e803c](https://github.com/ni/nimble/commit/c6e803caaa9757f7584281f096a94c4d58ef194d)) + ## 21.6.5 Fri, 23 Feb 2024 21:23:18 GMT diff --git a/packages/nimble-components/package.json b/packages/nimble-components/package.json index 50728d0f20..6437850d6d 100644 --- a/packages/nimble-components/package.json +++ b/packages/nimble-components/package.json @@ -1,6 +1,6 @@ { "name": "@ni/nimble-components", - "version": "21.6.5", + "version": "21.6.6", "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", From 1e5b10c7a247e13dcece70496b5ccbae322075a3 Mon Sep 17 00:00:00 2001 From: mollykreis <20542556+mollykreis@users.noreply.github.com> Date: Fri, 23 Feb 2024 16:38:06 -0600 Subject: [PATCH 4/5] Fix bug with setting a title on spinner in Firefox (#1849) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Pull Request ## ๐Ÿคจ Rationale Resolves #1825 ## ๐Ÿ‘ฉโ€๐Ÿ’ป Implementation I created a transparent overlay on top of the spinning bits in the spinner's template. This is enough to get the title to display correctly in Firefox and not flicker when the bits move. ## ๐Ÿงช Testing Manually verified that the title now displays correctly in Firefox and still displays correctly in Edge. ## โœ… Checklist - [ ] I have updated the project documentation to reflect my changes or determined no changes are needed. --- ...mponents-59f21279-5a01-4b63-96fa-fa83d08c2fc3.json | 7 +++++++ packages/nimble-components/src/spinner/styles.ts | 11 +++++++++-- packages/nimble-components/src/spinner/template.ts | 11 +++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 change/@ni-nimble-components-59f21279-5a01-4b63-96fa-fa83d08c2fc3.json diff --git a/change/@ni-nimble-components-59f21279-5a01-4b63-96fa-fa83d08c2fc3.json b/change/@ni-nimble-components-59f21279-5a01-4b63-96fa-fa83d08c2fc3.json new file mode 100644 index 0000000000..e154f6f1c8 --- /dev/null +++ b/change/@ni-nimble-components-59f21279-5a01-4b63-96fa-fa83d08c2fc3.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Fix bug in Firefox where title on spinner isn't always displayed as expected", + "packageName": "@ni/nimble-components", + "email": "20542556+mollykreis@users.noreply.github.com", + "dependentChangeType": "patch" +} diff --git a/packages/nimble-components/src/spinner/styles.ts b/packages/nimble-components/src/spinner/styles.ts index 693abffeae..0f3c7390b2 100644 --- a/packages/nimble-components/src/spinner/styles.ts +++ b/packages/nimble-components/src/spinner/styles.ts @@ -10,18 +10,25 @@ import { import { spinnerSmallHeight } from '../theme-provider/design-tokens'; import { Theme } from '../theme-provider/types'; import { themeBehavior } from '../utilities/style/theme'; +import { ZIndexLevels } from '../utilities/style/types'; export const styles = css` - ${display('inline-flex')} + ${display('inline-grid')} :host { height: ${spinnerSmallHeight}; aspect-ratio: 1 / 1; } + div.overlay { + z-index: ${ZIndexLevels.zIndex1}; + margin: max(2px, 6.25%); + grid-area: 1/1; + } + div.container { margin: max(2px, 6.25%); - flex: 1; + grid-area: 1/1; ${ /** * At some spinner sizes / browser zoom levels, the spinner bits/squares appear to slightly overlap visually. diff --git a/packages/nimble-components/src/spinner/template.ts b/packages/nimble-components/src/spinner/template.ts index 416d4a6823..b7744fce4c 100644 --- a/packages/nimble-components/src/spinner/template.ts +++ b/packages/nimble-components/src/spinner/template.ts @@ -1,8 +1,19 @@ import { html } from '@microsoft/fast-element'; import type { Spinner } from '.'; +/* eslint-disable @typescript-eslint/indent */ +// prettier-ignore export const template = html`