Merge pull request #1834 from michaelbe812/fix/some-issues-in-demo-app

hoebbelsB · web-flow · commit 303df1ecf526 · 2025-01-06T13:55:17.000+01:00
Fix/some issues in demo app
diff --git a/apps/demos/src/app/features/template/rx-let/ng-if-hack/ng-if-hack-rx-let.component.ts b/apps/demos/src/app/features/template/rx-let/ng-if-hack/ng-if-hack-rx-let.component.ts
@@ -19,7 +19,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';
           let value;
           suspense: suspenseView;
           error: errorView;
-          rxComplete: completeView
+          complete: completeView
         "
       >
         value: {{ value | json }}<br />
diff --git a/apps/demos/src/app/features/template/rx-virtual-for/virtual-rendering/virtual-for-reverse-infinite-scroll.component.ts b/apps/demos/src/app/features/template/rx-virtual-for/virtual-rendering/virtual-for-reverse-infinite-scroll.component.ts
@@ -200,7 +200,6 @@ import { Message, MessageService } from './messages/messages.service';
     DatePipe,
     MatButtonToggleModule,
     MatInputModule,
-    RxIf,
     RxLet,
     StrategySelectModule,
     FixedSizeVirtualScrollStrategy,
diff --git a/apps/demos/src/app/shared/debug-helper/value-provider/primitives-provider.service.ts b/apps/demos/src/app/shared/debug-helper/value-provider/primitives-provider.service.ts
@@ -1,13 +1,26 @@
-import { ChangeDetectorRef, Injectable } from '@angular/core';
+import {
+  ChangeDetectorRef,
+  inject,
+  Injectable,
+  Injector,
+  runInInjectionContext,
+} from '@angular/core';
 import { RxState } from '@rx-angular/state';
 import { merge, Observable, Subject } from 'rxjs';
 import { map, scan } from 'rxjs/operators';
 import { ngInputFlatten } from '../../utils/ngInputFlatten';
 import { ProvidedValues } from './model';
-import { toBoolean, toImgUrl, toInt, toRandom, withCompleteAndError } from './utils';
+import {
+  toBoolean,
+  toImgUrl,
+  toInt,
+  toRandom,
+  withCompleteAndError,
+} from './utils';
 
 @Injectable()
 export class PrimitivesProviderService {
+  private injector = inject(Injector);
   protected outerChanges = new Subject<Observable<any>>();
 
   protected nextSubject = new Subject<any>();
@@ -16,7 +29,7 @@ export class PrimitivesProviderService {
   protected error$ = this.errorSubject.pipe(
     map((_) => {
       throw new Error('ERROR');
-    })
+    }),
   );
   protected completeSubject = new Subject<any>();
   protected resetSubject = new Subject<any>();
@@ -47,31 +60,34 @@ export class PrimitivesProviderService {
 
   private resetObservables = () => {
     this.state.ngOnDestroy();
-    this.state = new RxState<ProvidedValues>();
+    runInInjectionContext(
+      this.injector,
+      () => (this.state = new RxState<ProvidedValues>()),
+    );
 
     this.state.connect(
       'random',
       merge(this.nextSubject, this.outerChanges.pipe(ngInputFlatten())).pipe(
-        map(toRandom)
-      )
+        map(toRandom),
+      ),
     );
 
     this.float$ = this.state.select('random');
     this.int$ = this.state.select(
       map((s) => toInt(s.random, this.min, this.max)),
-      withCompleteAndError(this.error$, this.completeSubject)
+      withCompleteAndError(this.error$, this.completeSubject),
     );
     this.incremental$ = this.state.select(
       scan((inc) => ++inc, 0),
-      withCompleteAndError(this.error$, this.completeSubject)
+      withCompleteAndError(this.error$, this.completeSubject),
     );
     this.boolean$ = this.state.select(
       map((s) => toBoolean(s.random, this.truthy)),
-      withCompleteAndError(this.error$, this.completeSubject)
+      withCompleteAndError(this.error$, this.completeSubject),
     );
     this.imgUrl$ = this.state.select(
       map((s) => toImgUrl(s.random)),
-      withCompleteAndError(this.error$, this.completeSubject)
+      withCompleteAndError(this.error$, this.completeSubject),
     );
 
     this.state.hold(this.float$, this.updateStatic);
@@ -86,7 +102,7 @@ export class PrimitivesProviderService {
 
   constructor(
     protected state: RxState<ProvidedValues>,
-    protected cdRef: ChangeDetectorRef
+    protected cdRef: ChangeDetectorRef,
   ) {
     this.resetAll();
   }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';`
`19`	`19`	`let value;`
`20`	`20`	`suspense: suspenseView;`
`21`	`21`	`error: errorView;`
`22`		`- rxComplete: completeView`
	`22`	`+ complete: completeView`
`23`	`23`	`"`
`24`	`24`	`>`
`25`	`25`	`value: {{ value \| json }}<br />`