Skip to content

Commit 1d59d73

Browse files
edbznedbzn
authored
Merge branch 'main' into LayZeeDK/docs/use-docusaurus
2 parents 13ab538 + 234c6ee commit 1d59d73

35 files changed

+1805
-134
lines changed

‎apps/demos/src/app/features/template/rx-context/rx-context.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { NgModule } from '@angular/core';
2-
import { ForModule } from '@rx-angular/template/experimental/for';
2+
import { ForModule } from '@rx-angular/template/for';
33
import { LetModule } from '@rx-angular/template/let';
44
import { VisualizerModule } from '../../../shared/debug-helper/visualizer';
55
import { StrategySelectModule } from '../../../shared/debug-helper/strategy-select';

‎apps/demos/src/app/features/template/rx-for/error-handling/rx-for-error-handling.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { NgModule } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33
import { RouterModule } from '@angular/router';
4-
import { ForModule } from '@rx-angular/template/experimental/for';
4+
import { ForModule } from '@rx-angular/template/for';
55
import { StrategySelectModule } from '../../../../shared/debug-helper/strategy-select/strategy-select.module';
66
import { ValueProvidersModule } from '../../../../shared/debug-helper/value-provider/value-providers.module';
77
import { ErrorHandlingParentComponent } from './error-handling-parent.component';

‎apps/demos/src/app/features/template/rx-for/list-actions/list-actions.component.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,22 @@ import {
22
AfterViewInit,
33
ChangeDetectorRef,
44
Component,
5-
ElementRef, NgZone,
5+
ElementRef,
6+
NgZone,
67
QueryList,
78
ViewChild,
89
ViewChildren,
9-
ViewEncapsulation
10+
ViewEncapsulation,
1011
} from '@angular/core';
1112
import { asyncScheduler } from '@rx-angular/cdk/zone-less/rxjs';
12-
import { BehaviorSubject, defer, merge, scheduled, Subject } from 'rxjs';
13+
import {
14+
BehaviorSubject,
15+
defer,
16+
merge,
17+
Observable,
18+
scheduled,
19+
Subject,
20+
} from 'rxjs';
1321
import { environment } from '../../../../../environments/environment';
1422
import {
1523
ArrayProviderService,

‎apps/demos/src/app/features/template/rx-for/list-actions/list-actions.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { MatIconModule } from '@angular/material/icon';
88
import { MatInputModule } from '@angular/material/input';
99
import { RouterModule } from '@angular/router';
1010
import { LetModule, PushModule } from '@rx-angular/template';
11-
import { ForModule } from '@rx-angular/template/experimental/for';
11+
import { ForModule } from '@rx-angular/template/for';
1212
import { UnpatchModule } from '@rx-angular/template/unpatch';
1313
import { DirtyChecksModule } from '../../../../shared/debug-helper/dirty-checks';
1414
import { ValueProvidersModule } from '../../../../shared/debug-helper/value-provider/value-providers.module';

‎apps/demos/src/app/features/template/rx-for/nested-lists/nested-lists.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { NgModule } from '@angular/core';
22
import { CommonModule } from '@angular/common';
3-
import { ForModule } from '@rx-angular/template/experimental/for';
3+
import { ForModule } from '@rx-angular/template/for';
44
import { LetModule } from '@rx-angular/template/let';
55
import { PushModule } from '@rx-angular/template/push';
66
import { VisualizerModule } from '../../../../shared/debug-helper/visualizer';

‎apps/demos/src/app/features/template/rx-for/route-change/route-change.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { MatButtonModule } from '@angular/material/button';
55
import { MatIconModule } from '@angular/material/icon';
66
import { MatTabsModule } from '@angular/material/tabs';
77
import { RouterModule, Routes } from '@angular/router';
8-
import { ForModule } from '@rx-angular/template/experimental/for';
8+
import { ForModule } from '@rx-angular/template/for';
99
import { LetModule } from '@rx-angular/template/let';
1010
import { RouteChangeComponent } from './route-change.component';
1111
import { RoutedNgForComponent } from './routed-ng-for.component';

‎apps/ssr-e2e/src/integration/app.spec.ts

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ describe('@rx-angular/template universal rendering', () => {
1111
});
1212

1313
describe('LetDirective', () => {
14-
it('should display green text using', () => {
14+
it('should display green text', () => {
1515
cy.request('http://localhost:4200').its('body').then(
1616
html => {
1717
const el = Cypress.$(html).find('#let');
@@ -20,4 +20,17 @@ describe('@rx-angular/template universal rendering', () => {
2020
)
2121
});
2222
});
23+
24+
describe('RxFor', () => {
25+
it('should display green and purple text', () => {
26+
cy.request('http://localhost:4200').its('body').then(
27+
html => {
28+
const el = Cypress.$(html).find('.for');
29+
expect(el.length).eq(2);
30+
expect(el.eq(0)).to.include.text('green');
31+
expect(el.eq(1)).to.include.text('purple');
32+
}
33+
)
34+
});
35+
});
2336
});

‎apps/ssr/src/app/app.component.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,19 @@ import { BehaviorSubject } from 'rxjs';
88
<div id="let" *rxLet="color$ as color; strategy">{{ color }}</div>
99
<div id="push">{{ color$ | push }}</div>
1010
<div id="unpatch" [unpatch]="['click']" (click)="onClick()"></div>
11+
<div class="for" *rxFor="let color of colors$">{{ color }}</div>
1112
`,
1213
})
1314
export class AppComponent implements OnInit {
1415
color$ = new BehaviorSubject('red');
16+
colors$ = new BehaviorSubject(['red']);
1517

1618
constructor(@Inject(PLATFORM_ID) private platformId: string) {}
1719

1820
ngOnInit() {
1921
if (isPlatformServer(this.platformId)) {
2022
this.color$.next('green');
23+
this.colors$.next(['green', 'purple']);
2124
}
2225
}
2326

‎apps/ssr/src/app/app.module.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { BrowserModule } from '@angular/platform-browser';
21
import { NgModule } from '@angular/core';
2+
import { BrowserModule } from '@angular/platform-browser';
33
import { PushModule } from '@rx-angular/template';
4+
import { ForModule } from '@rx-angular/template/for';
45
import { LetModule } from '@rx-angular/template/let';
56
import { UnpatchModule } from '@rx-angular/template/unpatch';
6-
77
import { AppComponent } from './app.component';
88

99
@NgModule({
@@ -13,6 +13,7 @@ import { AppComponent } from './app.component';
1313
PushModule,
1414
LetModule,
1515
UnpatchModule,
16+
ForModule,
1617
],
1718
providers: [],
1819
bootstrap: [AppComponent],

‎libs/cdk/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
44

5+
# [1.0.0-rc.0](https://github.com/rx-angular/rx-angular/compare/cdk@1.0.0-beta.3...cdk@1.0.0-rc.0) (2022-08-28)
6+
7+
8+
### Features
9+
10+
* **cdk:** deprecate global StrategyCredentials and replace with native ([#1389](https://github.com/rx-angular/rx-angular/issues/1389)) ([f46e837](https://github.com/rx-angular/rx-angular/commit/f46e837137cefd2753b331c0bb3d249aa286905b))
11+
12+
13+
514
# [1.0.0-beta.3](https://github.com/rx-angular/rx-angular/compare/cdk@1.0.0-beta.2...cdk@1.0.0-beta.3) (2022-06-07)
615

716

0 commit comments

Comments
 (0)