Merge branch 'main' into button-docs

ni · May 17, 2024 · 0d365eb · 0d365eb
2 parents c0ba309 + 7cb88f1
commit 0d365eb
Show file tree

Hide file tree

Showing 15 changed files with 114 additions and 22 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/angular-workspace/nimble-angular/CHANGELOG.json b/packages/angular-workspace/nimble-angular/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@ni/nimble-angular",
   "entries": [
+    {
+      "date": "Fri, 17 May 2024 20:05:45 GMT",
+      "version": "24.2.5",
+      "tag": "@ni/nimble-angular_v24.2.5",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v29.1.2",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Thu, 16 May 2024 18:44:46 GMT",
       "version": "24.2.4",

diff --git a/packages/angular-workspace/nimble-angular/CHANGELOG.md b/packages/angular-workspace/nimble-angular/CHANGELOG.md
@@ -1,9 +1,17 @@
 # Change Log - @ni/nimble-angular
 
-This log was last generated on Thu, 16 May 2024 18:44:46 GMT and should not be manually modified.
+This log was last generated on Fri, 17 May 2024 20:05:45 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 24.2.5
+
+Fri, 17 May 2024 20:05:45 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v29.1.2
+
 ## 24.2.4
 
 Thu, 16 May 2024 18:44:46 GMT

diff --git a/packages/angular-workspace/nimble-angular/package.json b/packages/angular-workspace/nimble-angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-angular",
-  "version": "24.2.4",
+  "version": "24.2.5",
   "description": "Angular components for the NI Nimble Design System",
   "scripts": {
     "invoke-publish": "npm run invoke-publish:setup && cd ../dist/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": "^29.1.1"
+    "@ni/nimble-components": "^29.1.2"
   },
   "dependencies": {
     "tslib": "^2.2.0"

diff --git a/packages/angular-workspace/spright-angular/CHANGELOG.json b/packages/angular-workspace/spright-angular/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@ni/spright-angular",
   "entries": [
+    {
+      "date": "Fri, 17 May 2024 20:05:45 GMT",
+      "version": "1.0.3",
+      "tag": "@ni/spright-angular_v1.0.3",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/spright-angular",
+            "comment": "Bump @ni/spright-components to v1.0.3",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Thu, 16 May 2024 18:44:46 GMT",
       "version": "1.0.2",

diff --git a/packages/angular-workspace/spright-angular/CHANGELOG.md b/packages/angular-workspace/spright-angular/CHANGELOG.md
@@ -1,9 +1,17 @@
 # Change Log - @ni/spright-angular
 
-This log was last generated on Thu, 16 May 2024 18:44:46 GMT and should not be manually modified.
+This log was last generated on Fri, 17 May 2024 20:05:45 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 1.0.3
+
+Fri, 17 May 2024 20:05:45 GMT
+
+### Patches
+
+- Bump @ni/spright-components to v1.0.3
+
 ## 1.0.2
 
 Thu, 16 May 2024 18:44:46 GMT

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

diff --git a/packages/nimble-components/CHANGELOG.json b/packages/nimble-components/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@ni/nimble-components",
   "entries": [
+    {
+      "date": "Fri, 17 May 2024 20:05:45 GMT",
+      "version": "29.1.2",
+      "tag": "@ni/nimble-components_v29.1.2",
+      "comments": {
+        "patch": [
+          {
+            "author": "20542556+mollykreis@users.noreply.github.com",
+            "package": "@ni/nimble-components",
+            "commit": "c05781966b2fde5db2445db93872fbcc3a1a27de",
+            "comment": "Make clear select button match design spec"
+          }
+        ]
+      }
+    },
     {
       "date": "Thu, 16 May 2024 18:44:46 GMT",
       "version": "29.1.1",

diff --git 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 Thu, 16 May 2024 18:44:46 GMT and should not be manually modified.
+This log was last generated on Fri, 17 May 2024 20:05:45 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 29.1.2
+
+Fri, 17 May 2024 20:05:45 GMT
+
+### Patches
+
+- Make clear select button match design spec ([ni/nimble@c057819](https://github.com/ni/nimble/commit/c05781966b2fde5db2445db93872fbcc3a1a27de))
+
 ## 29.1.1
 
 Thu, 16 May 2024 18:44:46 GMT

diff --git a/packages/nimble-components/package.json b/packages/nimble-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-components",
-  "version": "29.1.1",
+  "version": "29.1.2",
   "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/select/styles.ts b/packages/nimble-components/src/select/styles.ts
@@ -6,6 +6,7 @@ import {
     borderRgbPartialColor,
     borderWidth,
     controlHeight,
+    controlSlimHeight,
     fillHoverColor,
     fillHoverSelectedColor,
     fillSelectedColor,
@@ -39,8 +40,7 @@ export const styles = css`
 
     .clear-button {
         order: 3;
-        width: auto;
-        height: auto;
+        height: ${controlSlimHeight};
         margin-left: ${smallPadding};
     }
 

diff --git a/packages/nimble-components/src/select/template.ts b/packages/nimble-components/src/select/template.ts
@@ -23,7 +23,7 @@ import {
 } from '../label-provider/core/label-tokens';
 import { FilterMode } from './types';
 import { buttonTag } from '../button';
-import { iconXmarkTag } from '../icons/xmark';
+import { iconTimesTag } from '../icons/times';
 
 /* eslint-disable @typescript-eslint/indent */
 // prettier-ignore
@@ -74,7 +74,7 @@ SelectOptions
                             content-hidden
                             appearance="ghost"
                             @click="${(x, c) => x.clearClickHandler(c.event as MouseEvent)}">
-                            <${iconXmarkTag} slot="start"></${iconXmarkTag}>
+                            <${iconTimesTag} slot="start"></${iconTimesTag}>
                         </${buttonTag}>
                     `)}
                     <div aria-hidden="true" class="indicator" part="indicator">

diff --git a/packages/spright-components/CHANGELOG.json b/packages/spright-components/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@ni/spright-components",
   "entries": [
+    {
+      "date": "Fri, 17 May 2024 20:05:45 GMT",
+      "version": "1.0.3",
+      "tag": "@ni/spright-components_v1.0.3",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/spright-components",
+            "comment": "Bump @ni/nimble-components to v29.1.2",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Thu, 16 May 2024 18:44:46 GMT",
       "version": "1.0.2",

diff --git a/packages/spright-components/CHANGELOG.md b/packages/spright-components/CHANGELOG.md
@@ -1,9 +1,17 @@
 # Change Log - @ni/spright-components
 
-This log was last generated on Thu, 16 May 2024 18:44:46 GMT and should not be manually modified.
+This log was last generated on Fri, 17 May 2024 20:05:45 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 1.0.3
+
+Fri, 17 May 2024 20:05:45 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v29.1.2
+
 ## 1.0.2
 
 Thu, 16 May 2024 18:44:46 GMT

diff --git a/packages/spright-components/package.json b/packages/spright-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/spright-components",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "NI Spright Components",
   "scripts": {
     "build": "npm run build-components && npm run bundle-components",
@@ -55,7 +55,7 @@
     "@microsoft/fast-element": "^1.12.0",
     "@microsoft/fast-foundation": "^2.49.6",
     "@microsoft/fast-web-utilities": "^6.0.0",
-    "@ni/nimble-components": "29.1.1",
+    "@ni/nimble-components": "29.1.2",
     "@ni/nimble-tokens": "^6.13.6",
     "tslib": "^2.2.0"
   },