Merge branch 'main' into users/munteannatan/experimental-events

ni · Mar 18, 2024 · 85d961a · 85d961a
2 parents cba3d20 + aeaa29b
commit 85d961a
Show file tree

Hide file tree

Showing 70 changed files with 1,486 additions and 186 deletions.
diff --git a/angular-workspace/package.json b/angular-workspace/package.json
@@ -60,6 +60,6 @@
     "ng-packagr": "^15.2.2",
     "playwright": "1.40.0",
     "rollup": "^4.12.0",
-    "typescript": "~4.8.2"
+    "typescript": "~4.9.5"
   }
 }
diff --git a/angular-workspace/projects/example-client-app/src/app/customapp/customapp.component.html b/angular-workspace/projects/example-client-app/src/app/customapp/customapp.component.html
@@ -151,16 +151,19 @@
         <div class="sub-container">
             <div class="container-label">Select</div>
             <nimble-select filter-mode="standard" appearance="underline">
+                <nimble-list-option hidden selected disabled>Select an option</nimble-list-option>
                 <nimble-list-option>Option 1</nimble-list-option>
                 <nimble-list-option>Option 2</nimble-list-option>
                 <nimble-list-option>Option 3</nimble-list-option>
             </nimble-select>
             <nimble-select appearance="outline">
+                <nimble-list-option hidden selected disabled>Select an option</nimble-list-option>
                 <nimble-list-option>Option 1</nimble-list-option>
                 <nimble-list-option>Option 2</nimble-list-option>
                 <nimble-list-option>Option 3</nimble-list-option>
             </nimble-select>
             <nimble-select appearance="block">
+                <nimble-list-option hidden selected disabled>Select an option</nimble-list-option>
                 <nimble-list-option>Option 1</nimble-list-option>
                 <nimble-list-option>Option 2</nimble-list-option>
                 <nimble-list-option>Option 3</nimble-list-option>

diff --git a/angular-workspace/projects/example-client-app/src/app/customapp/customapp.component.ts b/angular-workspace/projects/example-client-app/src/app/customapp/customapp.component.ts
@@ -110,14 +110,6 @@ export class CustomAppComponent implements AfterViewInit {
     public constructor(@Inject(ActivatedRoute) public readonly route: ActivatedRoute) {
         this.tableData$ = this.tableDataSubject.asObservable();
         this.addTableRows(10);
-
-        this.comboboxItems = [];
-        for (let i = 0; i < 300; i++) {
-            this.comboboxItems.push({
-                first: i.toString(),
-                last: i.toString()
-            });
-        }
     }
 
     public ngAfterViewInit(): void {

diff --git a/angular-workspace/projects/ni/nimble-angular/CHANGELOG.json b/angular-workspace/projects/ni/nimble-angular/CHANGELOG.json
@@ -1,6 +1,78 @@
 {
   "name": "@ni/nimble-angular",
   "entries": [
+    {
+      "date": "Thu, 14 Mar 2024 14:48:16 GMT",
+      "version": "20.4.1",
+      "tag": "@ni/nimble-angular_v20.4.1",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v22.0.1",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Wed, 13 Mar 2024 23:07:24 GMT",
+      "version": "20.4.0",
+      "tag": "@ni/nimble-angular_v20.4.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "[email protected]",
+            "package": "@ni/nimble-angular",
+            "commit": "518c229b964d2c4a2e77210692f5d367f2937ff4",
+            "comment": "Update default values in label provider directives and expose additional label provider properties"
+          },
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v22.0.0",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 12 Mar 2024 22:17:11 GMT",
+      "version": "20.3.0",
+      "tag": "@ni/nimble-angular_v20.3.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "[email protected]",
+            "package": "@ni/nimble-angular",
+            "commit": "880dfa1a7f1f9f478dc87199184dba3e5e2c0a56",
+            "comment": "Add selected and hidden attributes to NimbleListOptionDirective. Also exporting SelectPageObject."
+          },
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v21.10.2",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 12 Mar 2024 21:01:54 GMT",
+      "version": "20.2.21",
+      "tag": "@ni/nimble-angular_v20.2.21",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v21.10.1",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Thu, 07 Mar 2024 21:20:52 GMT",
       "version": "20.2.20",

diff --git a/angular-workspace/projects/ni/nimble-angular/CHANGELOG.md b/angular-workspace/projects/ni/nimble-angular/CHANGELOG.md
@@ -1,9 +1,43 @@
 # Change Log - @ni/nimble-angular
 
-This log was last generated on Thu, 07 Mar 2024 21:20:52 GMT and should not be manually modified.
+This log was last generated on Thu, 14 Mar 2024 14:48:16 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 20.4.1
+
+Thu, 14 Mar 2024 14:48:16 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v22.0.1
+
+## 20.4.0
+
+Wed, 13 Mar 2024 23:07:24 GMT
+
+### Minor changes
+
+- Update default values in label provider directives and expose additional label provider properties ([ni/nimble@518c229](https://github.com/ni/nimble/commit/518c229b964d2c4a2e77210692f5d367f2937ff4))
+- Bump @ni/nimble-components to v22.0.0
+
+## 20.3.0
+
+Tue, 12 Mar 2024 22:17:11 GMT
+
+### Minor changes
+
+- Add selected and hidden attributes to NimbleListOptionDirective. Also exporting SelectPageObject. ([ni/nimble@880dfa1](https://github.com/ni/nimble/commit/880dfa1a7f1f9f478dc87199184dba3e5e2c0a56))
+- Bump @ni/nimble-components to v21.10.2
+
+## 20.2.21
+
+Tue, 12 Mar 2024 21:01:54 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v21.10.1
+
 ## 20.2.20
 
 Thu, 07 Mar 2024 21:20:52 GMT

diff --git a/.../nimble-angular/label-provider/core/nimble-label-provider-core-with-defaults.directive.ts b/.../nimble-angular/label-provider/core/nimble-label-provider-core-with-defaults.directive.ts
@@ -15,5 +15,10 @@ export class NimbleLabelProviderCoreWithDefaultsDirective {
         this.elementRef.nativeElement.popupDismiss = $localize`:Nimble popup - dismiss|:Close`;
         this.elementRef.nativeElement.numericDecrement = $localize`:Nimble numeric - decrement|:Decrement`;
         this.elementRef.nativeElement.numericIncrement = $localize`:Nimble numeric - increment|:Increment`;
+        this.elementRef.nativeElement.popupIconError = $localize`:Nimble popup icon - error|:Error`;
+        this.elementRef.nativeElement.popupIconWarning = $localize`:Nimble popup icon - warning|:Warning`;
+        this.elementRef.nativeElement.popupIconInformation = $localize`:Nimble popup icon - information|:Information`;
+        this.elementRef.nativeElement.filterSearch = $localize`:Nimble select - search items|:Search`;
+        this.elementRef.nativeElement.filterNoResults = $localize`:Nimble select - no items|:No items found`;
     }
 }
diff --git a/...ce/projects/ni/nimble-angular/label-provider/core/nimble-label-provider-core.directive.ts b/...ce/projects/ni/nimble-angular/label-provider/core/nimble-label-provider-core.directive.ts
@@ -37,4 +37,44 @@ export class NimbleLabelProviderCoreDirective {
     @Input('numeric-increment') public set numericIncrement(value: string | undefined) {
         this.renderer.setProperty(this.elementRef.nativeElement, 'numericIncrement', value);
     }
+
+    public get popupIconError(): string | undefined {
+        return this.elementRef.nativeElement.popupIconError;
+    }
+
+    @Input('popup-icon-error') public set popupIconError(value: string | undefined) {
+        this.renderer.setProperty(this.elementRef.nativeElement, 'popupIconError', value);
+    }
+
+    public get popupIconWarning(): string | undefined {
+        return this.elementRef.nativeElement.popupIconWarning;
+    }
+
+    @Input('popup-icon-warning') public set popupIconWarning(value: string | undefined) {
+        this.renderer.setProperty(this.elementRef.nativeElement, 'popupIconWarning', value);
+    }
+
+    public get popupIconInformation(): string | undefined {
+        return this.elementRef.nativeElement.popupIconInformation;
+    }
+
+    @Input('popup-icon-information') public set popupIconInformation(value: string | undefined) {
+        this.renderer.setProperty(this.elementRef.nativeElement, 'popupIconInformation', value);
+    }
+
+    public get filterSearch(): string | undefined {
+        return this.elementRef.nativeElement.filterSearch;
+    }
+
+    @Input('filter-search') public set filterSearch(value: string | undefined) {
+        this.renderer.setProperty(this.elementRef.nativeElement, 'filterSearch', value);
+    }
+
+    public get filterNoResults(): string | undefined {
+        return this.elementRef.nativeElement.filterNoResults;
+    }
+
+    @Input('filter-no-results') public set filterNoResults(value: string | undefined) {
+        this.renderer.setProperty(this.elementRef.nativeElement, 'filterNoResults', value);
+    }
 }
diff --git a/...ular/label-provider/core/tests/nimble-label-provider-core-with-defaults.directive.spec.ts b/...ular/label-provider/core/tests/nimble-label-provider-core-with-defaults.directive.spec.ts
@@ -30,7 +30,12 @@ describe('Nimble LabelProviderCore withDefaults directive', () => {
         loadTranslations({
             [computeMsgId('Close', 'Nimble popup - dismiss')]: 'Translated close',
             [computeMsgId('Decrement', 'Nimble numeric - decrement')]: 'Translated decrement',
-            [computeMsgId('Increment', 'Nimble numeric - increment')]: 'Translated increment'
+            [computeMsgId('Increment', 'Nimble numeric - increment')]: 'Translated increment',
+            [computeMsgId('Error', 'Nimble popup icon - error')]: 'Translated error',
+            [computeMsgId('Warning', 'Nimble popup icon - warning')]: 'Translated warning',
+            [computeMsgId('Information', 'Nimble popup icon - information')]: 'Translated information',
+            [computeMsgId('Search', 'Nimble select - search items')]: 'Translated search',
+            [computeMsgId('No items found', 'Nimble select - no items')]: 'Translated no items found'
         });
         const fixture = TestBed.createComponent(TestHostComponent);
         const testHostComponent = fixture.componentInstance;
@@ -42,5 +47,10 @@ describe('Nimble LabelProviderCore withDefaults directive', () => {
         expect(labelProvider.popupDismiss).toBe('Translated close');
         expect(labelProvider.numericDecrement).toBe('Translated decrement');
         expect(labelProvider.numericIncrement).toBe('Translated increment');
+        expect(labelProvider.popupIconError).toBe('Translated error');
+        expect(labelProvider.popupIconWarning).toBe('Translated warning');
+        expect(labelProvider.popupIconInformation).toBe('Translated information');
+        expect(labelProvider.filterSearch).toBe('Translated search');
+        expect(labelProvider.filterNoResults).toBe('Translated no items found');
     });
 });