Merge branch 'main' into clear-select

ni · May 10, 2024 · 5228fbd · 5228fbd
2 parents ae4fa8b + 16b2dd9
commit 5228fbd
Show file tree

Hide file tree

Showing 27 changed files with 245 additions and 27 deletions.
diff --git a/change/@ni-nimble-components-9175671a-fa87-4b79-ab66-48e3b8e49550.json b/change/@ni-nimble-components-9175671a-fa87-4b79-ab66-48e3b8e49550.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/angular-workspace/example-client-app/src/tests/pipes.spec.ts b/packages/angular-workspace/example-client-app/src/tests/pipes.spec.ts
@@ -1,4 +1,4 @@
-import { DurationPipe, NumberTextPipe, byteUnitScale, byte1024UnitScale, voltUnitScale } from '@ni/nimble-angular/pipes';
+import { DurationPipe, NumberTextPipe, byteUnitScale, byte1024UnitScale, celsiusUnitScale, fahrenheitUnitScale, voltUnitScale } from '@ni/nimble-angular/pipes';
 
 describe('Pipes', () => {
     it('exports DurationPipe', () => {
@@ -17,6 +17,14 @@ describe('Pipes', () => {
         expect(byte1024UnitScale).toBeTruthy();
     });
 
+    it('exports celsiusUnitScale', () => {
+        expect(celsiusUnitScale).toBeTruthy();
+    });
+
+    it('exports fahrenheitUnitScale', () => {
+        expect(fahrenheitUnitScale).toBeTruthy();
+    });
+
     it('exports voltUnitScale', () => {
         expect(voltUnitScale).toBeTruthy();
     });

diff --git a/packages/angular-workspace/nimble-angular/CHANGELOG.json b/packages/angular-workspace/nimble-angular/CHANGELOG.json
@@ -1,6 +1,36 @@
 {
   "name": "@ni/nimble-angular",
   "entries": [
+    {
+      "date": "Fri, 10 May 2024 18:51:13 GMT",
+      "version": "24.1.0",
+      "tag": "@ni/nimble-angular_v24.1.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "7282195+m-akinc@users.noreply.github.com",
+            "package": "@ni/nimble-angular",
+            "commit": "7f6a791484cc420725502f5a5e07aa037a952a1f",
+            "comment": "Add Angular support for Celsius and Fahrenheit number format units"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 10 May 2024 16:42:46 GMT",
+      "version": "24.0.9",
+      "tag": "@ni/nimble-angular_v24.0.9",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v28.2.1",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Fri, 10 May 2024 16:11:56 GMT",
       "version": "24.0.8",

diff --git a/packages/angular-workspace/nimble-angular/CHANGELOG.md b/packages/angular-workspace/nimble-angular/CHANGELOG.md
@@ -1,9 +1,25 @@
 # Change Log - @ni/nimble-angular
 
-This log was last generated on Fri, 10 May 2024 16:11:56 GMT and should not be manually modified.
+This log was last generated on Fri, 10 May 2024 18:51:13 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 24.1.0
+
+Fri, 10 May 2024 18:51:13 GMT
+
+### Minor changes
+
+- Add Angular support for Celsius and Fahrenheit number format units ([ni/nimble@7f6a791](https://github.com/ni/nimble/commit/7f6a791484cc420725502f5a5e07aa037a952a1f))
+
+## 24.0.9
+
+Fri, 10 May 2024 16:42:46 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v28.2.1
+
 ## 24.0.8
 
 Fri, 10 May 2024 16:11:56 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.0.8",
+  "version": "24.1.0",
   "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": "^28.2.0"
+    "@ni/nimble-components": "^28.2.1"
   },
   "dependencies": {
     "tslib": "^2.2.0"

diff --git a/packages/angular-workspace/nimble-angular/pipes/public-api.ts b/packages/angular-workspace/nimble-angular/pipes/public-api.ts
@@ -2,4 +2,6 @@ export * from './duration.pipe';
 export * from './number-text.pipe';
 export { byteUnitScale } from '@ni/nimble-components/dist/esm/utilities/unit-format/unit-scale/byte-unit-scale';
 export { byte1024UnitScale } from '@ni/nimble-components/dist/esm/utilities/unit-format/unit-scale/byte-1024-unit-scale';
+export { celsiusUnitScale } from '@ni/nimble-components/dist/esm/utilities/unit-format/unit-scale/celsius-unit-scale';
+export { fahrenheitUnitScale } from '@ni/nimble-components/dist/esm/utilities/unit-format/unit-scale/fahrenheit-unit-scale';
 export { voltUnitScale } from '@ni/nimble-components/dist/esm/utilities/unit-format/unit-scale/volt-unit-scale';
diff --git a/packages/angular-workspace/nimble-angular/unit/celsius/ng-package.json b/packages/angular-workspace/nimble-angular/unit/celsius/ng-package.json
@@ -0,0 +1,6 @@
+{
+    "$schema": "../../../../../node_modules/ng-packagr/ng-package.schema.json",
+    "lib": {
+      "entryFile": "public-api.ts"
+    }
+}
diff --git a/packages/angular-workspace/nimble-angular/unit/celsius/nimble-unit-celsius.directive.ts b/packages/angular-workspace/nimble-angular/unit/celsius/nimble-unit-celsius.directive.ts
@@ -0,0 +1,14 @@
+import { Directive } from '@angular/core';
+import { type UnitCelsius, unitCelsiusTag } from '@ni/nimble-components/dist/esm/unit/celsius';
+
+export type { UnitCelsius };
+export { unitCelsiusTag };
+
+/**
+ * Directive to provide Angular integration for the Celsius unit element used by the number-text column.
+ */
+@Directive({
+    selector: 'nimble-unit-celsius'
+})
+export class NimbleUnitCelsiusDirective {
+}
diff --git a/packages/angular-workspace/nimble-angular/unit/celsius/nimble-unit-celsius.module.ts b/packages/angular-workspace/nimble-angular/unit/celsius/nimble-unit-celsius.module.ts
@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { NimbleUnitCelsiusDirective } from './nimble-unit-celsius.directive';
+
+import '@ni/nimble-components/dist/esm/unit/celsius';
+
+@NgModule({
+    declarations: [NimbleUnitCelsiusDirective],
+    imports: [CommonModule],
+    exports: [NimbleUnitCelsiusDirective]
+})
+export class NimbleUnitCelsiusModule { }
diff --git a/packages/angular-workspace/nimble-angular/unit/celsius/public-api.ts b/packages/angular-workspace/nimble-angular/unit/celsius/public-api.ts
@@ -0,0 +1,2 @@
+export * from './nimble-unit-celsius.directive';
+export * from './nimble-unit-celsius.module';
diff --git a/...angular-workspace/nimble-angular/unit/celsius/tests/nimble-unit-celsius.directive.spec.ts b/...angular-workspace/nimble-angular/unit/celsius/tests/nimble-unit-celsius.directive.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+import { NimbleUnitCelsiusModule } from '../nimble-unit-celsius.module';
+
+describe('Nimble Celsius unit', () => {
+    describe('module', () => {
+        beforeEach(() => {
+            TestBed.configureTestingModule({
+                imports: [NimbleUnitCelsiusModule]
+            });
+        });
+
+        it('custom element is defined', () => {
+            expect(customElements.get('nimble-unit-celsius')).not.toBeUndefined();
+        });
+    });
+});
diff --git a/packages/angular-workspace/nimble-angular/unit/fahrenheit/ng-package.json b/packages/angular-workspace/nimble-angular/unit/fahrenheit/ng-package.json
@@ -0,0 +1,6 @@
+{
+    "$schema": "../../../../../node_modules/ng-packagr/ng-package.schema.json",
+    "lib": {
+      "entryFile": "public-api.ts"
+    }
+}
diff --git a/...ages/angular-workspace/nimble-angular/unit/fahrenheit/nimble-unit-fahrenheit.directive.ts b/...ages/angular-workspace/nimble-angular/unit/fahrenheit/nimble-unit-fahrenheit.directive.ts
@@ -0,0 +1,14 @@
+import { Directive } from '@angular/core';
+import { type UnitFahrenheit, unitFahrenheitTag } from '@ni/nimble-components/dist/esm/unit/fahrenheit';
+
+export type { UnitFahrenheit };
+export { unitFahrenheitTag };
+
+/**
+ * Directive to provide Angular integration for the Fahrenheit unit element used by the number-text column.
+ */
+@Directive({
+    selector: 'nimble-unit-fahrenheit'
+})
+export class NimbleUnitFahrenheitDirective {
+}
diff --git a/packages/angular-workspace/nimble-angular/unit/fahrenheit/nimble-unit-fahrenheit.module.ts b/packages/angular-workspace/nimble-angular/unit/fahrenheit/nimble-unit-fahrenheit.module.ts
@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { NimbleUnitFahrenheitDirective } from './nimble-unit-fahrenheit.directive';
+
+import '@ni/nimble-components/dist/esm/unit/fahrenheit';
+
+@NgModule({
+    declarations: [NimbleUnitFahrenheitDirective],
+    imports: [CommonModule],
+    exports: [NimbleUnitFahrenheitDirective]
+})
+export class NimbleUnitFahrenheitModule { }
diff --git a/packages/angular-workspace/nimble-angular/unit/fahrenheit/public-api.ts b/packages/angular-workspace/nimble-angular/unit/fahrenheit/public-api.ts
@@ -0,0 +1,2 @@
+export * from './nimble-unit-fahrenheit.directive';
+export * from './nimble-unit-fahrenheit.module';
diff --git a/...r-workspace/nimble-angular/unit/fahrenheit/tests/nimble-unit-fahrenheit.directive.spec.ts b/...r-workspace/nimble-angular/unit/fahrenheit/tests/nimble-unit-fahrenheit.directive.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+import { NimbleUnitFahrenheitModule } from '../nimble-unit-fahrenheit.module';
+
+describe('Nimble Fahrenheit unit', () => {
+    describe('module', () => {
+        beforeEach(() => {
+            TestBed.configureTestingModule({
+                imports: [NimbleUnitFahrenheitModule]
+            });
+        });
+
+        it('custom element is defined', () => {
+            expect(customElements.get('nimble-unit-fahrenheit')).not.toBeUndefined();
+        });
+    });
+});
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, 10 May 2024 16:42:46 GMT",
+      "version": "0.1.20",
+      "tag": "@ni/spright-angular_v0.1.20",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/spright-angular",
+            "comment": "Bump @ni/spright-components to v0.0.22",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Fri, 10 May 2024 16:11:56 GMT",
       "version": "0.1.19",

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 Fri, 10 May 2024 16:11:56 GMT and should not be manually modified.
+This log was last generated on Fri, 10 May 2024 16:42:46 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.1.20
+
+Fri, 10 May 2024 16:42:46 GMT
+
+### Patches
+
+- Bump @ni/spright-components to v0.0.22
+
 ## 0.1.19
 
 Fri, 10 May 2024 16:11:56 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": "0.1.19",
+  "version": "0.1.20",
   "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": "^0.0.21"
+    "@ni/spright-components": "^0.0.22"
   },
   "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, 10 May 2024 16:42:46 GMT",
+      "version": "28.2.1",
+      "tag": "@ni/nimble-components_v28.2.1",
+      "comments": {
+        "patch": [
+          {
+            "author": "26874831+atmgrifter00@users.noreply.github.com",
+            "package": "@ni/nimble-components",
+            "commit": "9714748c8963830a41b772796cb237262f26683b",
+            "comment": "Fix issue with clicking option in dropdown not updating display."
+          }
+        ]
+      }
+    },
     {
       "date": "Fri, 10 May 2024 16:11:55 GMT",
       "version": "28.2.0",

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 Fri, 10 May 2024 16:11:55 GMT and should not be manually modified.
+This log was last generated on Fri, 10 May 2024 16:42:46 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 28.2.1
+
+Fri, 10 May 2024 16:42:46 GMT
+
+### Patches
+
+- Fix issue with clicking option in dropdown not updating display. ([ni/nimble@9714748](https://github.com/ni/nimble/commit/9714748c8963830a41b772796cb237262f26683b))
+
 ## 28.2.0
 
 Fri, 10 May 2024 16:11:55 GMT