Merge branch 'main' into column-placeholder-hld

ni · Feb 26, 2024 · 005cf0d · 005cf0d
2 parents d55eaca + f2d6322
commit 005cf0d
Show file tree

Hide file tree

Showing 12 changed files with 169 additions and 20 deletions.
diff --git a/angular-workspace/projects/ni/nimble-angular/CHANGELOG.json b/angular-workspace/projects/ni/nimble-angular/CHANGELOG.json
@@ -1,6 +1,51 @@
 {
   "name": "@ni/nimble-angular",
   "entries": [
+    {
+      "date": "Fri, 23 Feb 2024 22:56:07 GMT",
+      "version": "20.2.10",
+      "tag": "@ni/nimble-angular_v20.2.10",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v21.6.7",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "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",
+      "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
@@ -1,9 +1,33 @@
 # 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 22:56:07 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 20.2.10
+
+Fri, 23 Feb 2024 22:56:07 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v21.6.7
+
+## 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
+
+### 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
@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-angular",
-  "version": "20.2.7",
+  "version": "20.2.10",
   "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.7"
   },
   "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
diff --git a/package-lock.json b/package-lock.json
diff --git 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.6",
   "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
@@ -1,6 +1,51 @@
 {
   "name": "@ni/nimble-components",
   "entries": [
+    {
+      "date": "Fri, 23 Feb 2024 22:56:07 GMT",
+      "version": "21.6.7",
+      "tag": "@ni/nimble-components_v21.6.7",
+      "comments": {
+        "patch": [
+          {
+            "author": "20542556+mollykreis@users.noreply.github.com",
+            "package": "@ni/nimble-components",
+            "commit": "1e5b10c7a247e13dcece70496b5ccbae322075a3",
+            "comment": "Fix bug in Firefox where title on spinner isn't always displayed as expected"
+          }
+        ]
+      }
+    },
+    {
+      "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",
+      "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
@@ -1,9 +1,33 @@
 # 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 22:56:07 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 21.6.7
+
+Fri, 23 Feb 2024 22:56:07 GMT
+
+### Patches
+
+- Fix bug in Firefox where title on spinner isn't always displayed as expected ([ni/nimble@1e5b10c](https://github.com/ni/nimble/commit/1e5b10c7a247e13dcece70496b5ccbae322075a3))
+
+## 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
+
+### 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
@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-components",
-  "version": "21.6.4",
+  "version": "21.6.7",
   "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",

diff --git 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;

diff --git 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
@@ -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<Spinner>`
     <template role="progressbar">
+        ${''
+            /**
+             * In Firefox, the 'title' set on the spinner is very finicky when
+             * the spinner is animating. Therefore, put a transparent overlay on
+             * top of the spinning bits so that the title displays as expected.
+             */
+        }
+        <div class="overlay"></div>
+
         <div class="container">
             <div class="bit1"></div>
             <div class="bit2"></div>