Skip to content

Commit

Permalink
Merge branch 'main' into users/masmith/blazor-net8-upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
msmithNI committed Oct 25, 2024
2 parents 0113f99 + fc06286 commit 3c2dbaf
Show file tree
Hide file tree
Showing 51 changed files with 1,377 additions and 155 deletions.
22 changes: 11 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 45 additions & 0 deletions packages/angular-workspace/nimble-angular/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,51 @@
{
"name": "@ni/nimble-angular",
"entries": [
{
"date": "Thu, 24 Oct 2024 20:52:01 GMT",
"version": "28.4.1",
"tag": "@ni/nimble-angular_v28.4.1",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/nimble-angular",
"comment": "Bump @ni/nimble-components to v32.5.1",
"commit": "not available"
}
]
}
},
{
"date": "Thu, 24 Oct 2024 12:36:19 GMT",
"version": "28.4.0",
"tag": "@ni/nimble-angular_v28.4.0",
"comments": {
"minor": [
{
"author": "[email protected]",
"package": "@ni/nimble-angular",
"commit": "868a8a67780160f0a224fbc62a27511ed97db2df",
"comment": "Angular and Blazor label provider changes for scrollable tabs."
}
]
}
},
{
"date": "Wed, 23 Oct 2024 19:20:53 GMT",
"version": "28.3.4",
"tag": "@ni/nimble-angular_v28.3.4",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/nimble-angular",
"comment": "Bump @ni/nimble-components to v32.5.0",
"commit": "not available"
}
]
}
},
{
"date": "Wed, 23 Oct 2024 13:33:55 GMT",
"version": "28.3.3",
Expand Down
26 changes: 25 additions & 1 deletion packages/angular-workspace/nimble-angular/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,33 @@
# Change Log - @ni/nimble-angular

<!-- This log was last generated on Wed, 23 Oct 2024 13:33:55 GMT and should not be manually modified. -->
<!-- This log was last generated on Thu, 24 Oct 2024 20:52:01 GMT and should not be manually modified. -->

<!-- Start content -->

## 28.4.1

Thu, 24 Oct 2024 20:52:01 GMT

### Patches

- Bump @ni/nimble-components to v32.5.1

## 28.4.0

Thu, 24 Oct 2024 12:36:19 GMT

### Minor changes

- Angular and Blazor label provider changes for scrollable tabs. ([ni/nimble@868a8a6](https://github.com/ni/nimble/commit/868a8a67780160f0a224fbc62a27511ed97db2df))

## 28.3.4

Wed, 23 Oct 2024 19:20:53 GMT

### Patches

- Bump @ni/nimble-components to v32.5.0

## 28.3.3

Wed, 23 Oct 2024 13:33:55 GMT
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,7 @@ export class NimbleLabelProviderCoreWithDefaultsDirective {
this.elementRef.nativeElement.filterSearch = $localize`:Nimble select - search items|:Search`;
this.elementRef.nativeElement.filterNoResults = $localize`:Nimble select - no items|:No items found`;
this.elementRef.nativeElement.loading = $localize`:Nimble loading - loading|:Loading…`;
this.elementRef.nativeElement.scrollBackward = $localize`:Nimble scroll backward|:Scroll backward`;
this.elementRef.nativeElement.scrollForward = $localize`:Nimble scroll forward|:Scroll forward`;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,20 @@ export class NimbleLabelProviderCoreDirective {
@Input('loading') public set loading(value: string | undefined) {
this.renderer.setProperty(this.elementRef.nativeElement, 'loading', value);
}

public get scrollBackward(): string | undefined {
return this.elementRef.nativeElement.scrollBackward;
}

@Input('scrollBackward') public set scrollBackward(value: string | undefined) {
this.renderer.setProperty(this.elementRef.nativeElement, 'scrollBackward', value);
}

public get scrollForward(): string | undefined {
return this.elementRef.nativeElement.scrollForward;
}

@Input('scrollForward') public set scrollForward(value: string | undefined) {
this.renderer.setProperty(this.elementRef.nativeElement, 'scrollForward', value);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ describe('Nimble LabelProviderCore withDefaults directive', () => {
[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',
[computeMsgId('Loading…', 'Nimble loading - loading')]: 'Translated loading'
[computeMsgId('Loading…', 'Nimble loading - loading')]: 'Translated loading',
[computeMsgId('Scroll backward', 'Nimble scroll backward')]: 'Translated scroll backward',
[computeMsgId('Scroll forward', 'Nimble scroll forward')]: 'Translated scroll forward'
});
const fixture = TestBed.createComponent(TestHostComponent);
const testHostComponent = fixture.componentInstance;
Expand All @@ -54,5 +56,7 @@ describe('Nimble LabelProviderCore withDefaults directive', () => {
expect(labelProvider.filterSearch).toBe('Translated search');
expect(labelProvider.filterNoResults).toBe('Translated no items found');
expect(labelProvider.loading).toBe('Translated loading');
expect(labelProvider.scrollBackward).toBe('Translated scroll backward');
expect(labelProvider.scrollForward).toBe('Translated scroll forward');
});
});
Loading

0 comments on commit 3c2dbaf

Please sign in to comment.