Merge branch 'main' into storybook-files-docs

ni · May 7, 2024 · 00133e1 · 00133e1
2 parents 0c76e9d + 5563bc6
commit 00133e1
Show file tree

Hide file tree

Showing 29 changed files with 805 additions and 130 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": "Tue, 07 May 2024 20:15:55 GMT",
+      "version": "24.0.3",
+      "tag": "@ni/nimble-angular_v24.0.3",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v28.0.3",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 07 May 2024 16:24:36 GMT",
+      "version": "24.0.2",
+      "tag": "@ni/nimble-angular_v24.0.2",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v28.0.2",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 07 May 2024 13:17:00 GMT",
+      "version": "24.0.1",
+      "tag": "@ni/nimble-angular_v24.0.1",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v28.0.1",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Mon, 06 May 2024 19:00:05 GMT",
       "version": "24.0.0",

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 Mon, 06 May 2024 19:00:05 GMT and should not be manually modified.
+This log was last generated on Tue, 07 May 2024 20:15:55 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 24.0.3
+
+Tue, 07 May 2024 20:15:55 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v28.0.3
+
+## 24.0.2
+
+Tue, 07 May 2024 16:24:36 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v28.0.2
+
+## 24.0.1
+
+Tue, 07 May 2024 13:17:00 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v28.0.1
+
 ## 24.0.0
 
 Mon, 06 May 2024 19:00:05 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": "24.0.0",
+  "version": "24.0.3",
   "description": "Angular components for the NI Nimble Design System",
   "scripts": {
     "invoke-publish": "npm run invoke-publish:setup && cd ../../../dist/ni/nimble-angular && npm publish",
@@ -32,7 +32,7 @@
     "@angular/forms": "^16.2.12",
     "@angular/localize": "^16.2.12",
     "@angular/router": "^16.2.12",
-    "@ni/nimble-components": "^28.0.0"
+    "@ni/nimble-components": "^28.0.3"
   },
   "dependencies": {
     "tslib": "^2.2.0"

diff --git a/angular-workspace/projects/ni/spright-angular/CHANGELOG.json b/angular-workspace/projects/ni/spright-angular/CHANGELOG.json
@@ -1,6 +1,51 @@
 {
   "name": "@ni/spright-angular",
   "entries": [
+    {
+      "date": "Tue, 07 May 2024 20:15:55 GMT",
+      "version": "0.1.14",
+      "tag": "@ni/spright-angular_v0.1.14",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/spright-angular",
+            "comment": "Bump @ni/spright-components to v0.0.17",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 07 May 2024 16:24:36 GMT",
+      "version": "0.1.13",
+      "tag": "@ni/spright-angular_v0.1.13",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/spright-angular",
+            "comment": "Bump @ni/spright-components to v0.0.16",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 07 May 2024 13:17:00 GMT",
+      "version": "0.1.12",
+      "tag": "@ni/spright-angular_v0.1.12",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/spright-angular",
+            "comment": "Bump @ni/spright-components to v0.0.15",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Mon, 06 May 2024 19:00:05 GMT",
       "version": "0.1.11",

diff --git a/angular-workspace/projects/ni/spright-angular/CHANGELOG.md b/angular-workspace/projects/ni/spright-angular/CHANGELOG.md
@@ -1,9 +1,33 @@
 # Change Log - @ni/spright-angular
 
-This log was last generated on Mon, 06 May 2024 19:00:05 GMT and should not be manually modified.
+This log was last generated on Tue, 07 May 2024 20:15:55 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.1.14
+
+Tue, 07 May 2024 20:15:55 GMT
+
+### Patches
+
+- Bump @ni/spright-components to v0.0.17
+
+## 0.1.13
+
+Tue, 07 May 2024 16:24:36 GMT
+
+### Patches
+
+- Bump @ni/spright-components to v0.0.16
+
+## 0.1.12
+
+Tue, 07 May 2024 13:17:00 GMT
+
+### Patches
+
+- Bump @ni/spright-components to v0.0.15
+
 ## 0.1.11
 
 Mon, 06 May 2024 19:00:05 GMT

diff --git a/angular-workspace/projects/ni/spright-angular/package.json b/angular-workspace/projects/ni/spright-angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/spright-angular",
-  "version": "0.1.11",
+  "version": "0.1.14",
   "description": "Angular components for NI Spright",
   "scripts": {
     "invoke-publish": "npm run invoke-publish:setup && cd ../../../dist/ni/spright-angular && npm publish",
@@ -24,7 +24,7 @@
   "peerDependencies": {
     "@angular/common": "^16.2.12",
     "@angular/core": "^16.2.12",
-    "@ni/spright-components": "^0.0.14"
+    "@ni/spright-components": "^0.0.17"
   },
   "dependencies": {
     "tslib": "^2.2.0"

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/nimble-components/CHANGELOG.json b/packages/nimble-components/CHANGELOG.json
@@ -1,6 +1,51 @@
 {
   "name": "@ni/nimble-components",
   "entries": [
+    {
+      "date": "Tue, 07 May 2024 20:15:55 GMT",
+      "version": "28.0.3",
+      "tag": "@ni/nimble-components_v28.0.3",
+      "comments": {
+        "patch": [
+          {
+            "author": "26874831+atmgrifter00@users.noreply.github.com",
+            "package": "@ni/nimble-components",
+            "commit": "7feb69deda088c1fa771f836dedd627e33b4e63b",
+            "comment": "Fixing hover behavior for options in Select."
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 07 May 2024 16:24:36 GMT",
+      "version": "28.0.2",
+      "tag": "@ni/nimble-components_v28.0.2",
+      "comments": {
+        "patch": [
+          {
+            "author": "26874831+atmgrifter00@users.noreply.github.com",
+            "package": "@ni/nimble-components",
+            "commit": "bbe265424e76e1824a5748b8bc6cb6d69a1b9a17",
+            "comment": "Change Select to not update value as you navigate options in dropdown."
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 07 May 2024 13:17:00 GMT",
+      "version": "28.0.1",
+      "tag": "@ni/nimble-components_v28.0.1",
+      "comments": {
+        "patch": [
+          {
+            "author": "1458528+fredvisser@users.noreply.github.com",
+            "package": "@ni/nimble-components",
+            "commit": "799d39216faa9ad98c94627c6505439c846cbac9",
+            "comment": "Set Select and Combobox min-width to menuMinWidth token (176px)"
+          }
+        ]
+      }
+    },
     {
       "date": "Mon, 06 May 2024 20:26:50 GMT",
       "version": "28.0.0",

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 Mon, 06 May 2024 19:00:05 GMT and should not be manually modified.
+This log was last generated on Tue, 07 May 2024 20:15:55 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 28.0.3
+
+Tue, 07 May 2024 20:15:55 GMT
+
+### Patches
+
+- Fixing hover behavior for options in Select. ([ni/nimble@7feb69d](https://github.com/ni/nimble/commit/7feb69deda088c1fa771f836dedd627e33b4e63b))
+
+## 28.0.2
+
+Tue, 07 May 2024 16:24:36 GMT
+
+### Patches
+
+- Change Select to not update value as you navigate options in dropdown. ([ni/nimble@bbe2654](https://github.com/ni/nimble/commit/bbe265424e76e1824a5748b8bc6cb6d69a1b9a17))
+
+## 28.0.1
+
+Tue, 07 May 2024 13:17:00 GMT
+
+### Patches
+
+- Set Select and Combobox min-width to menuMinWidth token (176px) ([ni/nimble@799d392](https://github.com/ni/nimble/commit/799d39216faa9ad98c94627c6505439c846cbac9))
+
 ## 28.0.0
 
 Mon, 06 May 2024 19:00:05 GMT

diff --git a/packages/nimble-components/package.json b/packages/nimble-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-components",
-  "version": "28.0.0",
+  "version": "28.0.3",
   "description": "Styled web components for the NI Nimble Design System",
   "scripts": {
     "build": "npm run generate-icons && npm run generate-workers && npm run build-components && npm run bundle-components && npm run generate-scss",

diff --git a/packages/nimble-components/src/list-option/index.ts b/packages/nimble-components/src/list-option/index.ts
@@ -41,6 +41,17 @@ export class ListOption extends FoundationListboxOption {
     @attr({ attribute: 'visually-hidden', mode: 'boolean' })
     public visuallyHidden = false;
 
+    /**
+     * @internal
+     * This attribute is used to control the visual selected state of an option. This
+     * is handled independently of the public 'selected' attribute, as 'selected' is
+     * representative of the current value of the container control. However, while
+     * a dropdown is open users can navigate through the options (requiring visual
+     * updates) without changing the value of the container control.
+     */
+    @attr({ attribute: 'active-option', mode: 'boolean' })
+    public activeOption = false;
+
     /** @internal */
     @observable
     public hasOverflow = false;

diff --git a/packages/nimble-components/src/patterns/dropdown/styles.ts b/packages/nimble-components/src/patterns/dropdown/styles.ts
@@ -10,6 +10,7 @@ import {
     borderWidth,
     controlHeight,
     iconSize,
+    menuMinWidth,
     popupBorderColor,
     smallDelay,
     smallPadding,
@@ -37,7 +38,7 @@ export const styles = css`
         position: relative;
         justify-content: center;
         ${userSelectNone}
-        min-width: 250px;
+        min-width: ${menuMinWidth};
         outline: none;
         vertical-align: top;
         --ni-private-hover-indicator-width: calc(${borderWidth} + 1px);