diff --git a/package-lock.json b/package-lock.json index a01fe9dcf9..aa0fa34c71 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32647,7 +32647,7 @@ }, "packages/angular-workspace/nimble-angular": { "name": "@ni/nimble-angular", - "version": "24.2.4", + "version": "24.2.5", "license": "MIT", "dependencies": { "tslib": "^2.2.0" @@ -32658,12 +32658,12 @@ "@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" } }, "packages/angular-workspace/spright-angular": { "name": "@ni/spright-angular", - "version": "1.0.2", + "version": "1.0.3", "license": "MIT", "dependencies": { "tslib": "^2.2.0" @@ -32671,7 +32671,7 @@ "peerDependencies": { "@angular/common": "^16.2.12", "@angular/core": "^16.2.12", - "@ni/spright-components": "^1.0.2" + "@ni/spright-components": "^1.0.3" } }, "packages/blazor-workspace": { @@ -32756,7 +32756,7 @@ }, "packages/nimble-components": { "name": "@ni/nimble-components", - "version": "29.1.1", + "version": "29.1.2", "license": "MIT", "dependencies": { "@microsoft/fast-colors": "^5.3.1", @@ -32904,14 +32904,14 @@ }, "packages/spright-components": { "name": "@ni/spright-components", - "version": "1.0.2", + "version": "1.0.3", "license": "MIT", "dependencies": { "@microsoft/fast-colors": "^5.3.1", "@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" }, diff --git a/packages/angular-workspace/nimble-angular/CHANGELOG.json b/packages/angular-workspace/nimble-angular/CHANGELOG.json index 832cdbbdcf..3e731afb1a 100644 --- 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 index 9dc8f003b0..746860b136 100644 --- 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. +## 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 index c01aa90a0f..abb9e10923 100644 --- 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 index e877ee351f..998116873c 100644 --- 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 index 6d8f3ee565..b7736d084d 100644 --- 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. +## 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 index a2730ce700..24e1b8df45 100644 --- 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 index 681dc56354..b9067bac0f 100644 --- 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 index e78612efb6..571cb8b2c4 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 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. +## 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 index e83fc69383..1d3b7a44ec 100644 --- 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 index ca12bad57c..174890cf74 100644 --- 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 index ab8fc1539b..7528b12f08 100644 --- 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}> `)}