angular-three 1.6.5 → 1.6.7

package/fesm2020/angular-three.mjs

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { ElementRef, Injectable, inject, InjectionToken, ViewContainerRef, TemplateRef, Directive, Input, EventEmitter, getDebugNode, RendererFactory2, ChangeDetectorRef, makeEnvironmentProviders, EnvironmentInjector, createEnvironmentInjector, Component, HostBinding, Output, ViewChild, Injector, Pipe, SkipSelf, ContentChild } from '@angular/core';
+import { ElementRef, inject, ChangeDetectorRef, Injectable, InjectionToken, ViewContainerRef, TemplateRef, Directive, Input, EventEmitter, getDebugNode, RendererFactory2, makeEnvironmentProviders, EnvironmentInjector, createEnvironmentInjector, Component, HostBinding, Output, ViewChild, Injector, Pipe, SkipSelf, ContentChild } from '@angular/core';
 import { provideNgxResizeOptions, NgxResize } from 'ngx-resize';
 import { isObservable, of, map, from, tap, retry, catchError, share, ReplaySubject, switchMap, forkJoin, take, BehaviorSubject, startWith, combineLatest, filter, distinctUntilChanged, takeUntil, merge } from 'rxjs';
 import * as THREE from 'three';
@@ -516,6 +516,7 @@ function tapEffect(effectFn) {
 class NgtRxStore extends RxState {
     constructor() {
         super();
+        const cdr = inject(ChangeDetectorRef, { optional: true });
         // set a dummy property so that initial this.get() won't return undefined
         this.set({ __ngt_dummy__: '__ngt_dummy__' });
         // call initialize that might be setup by derived Stores
@@ -532,10 +533,14 @@ class NgtRxStore extends RxState {
                             modded[key] = value === undefined ? this.get(key) : value;
                             return modded;
                         }, {});
-                        return originalSet(modArgs);
+                        const value = originalSet(modArgs);
+                        cdr?.detectChanges();
+                        return value;
                     }
                     // @ts-expect-error not sure why ...args here doesn't pass tuple check
-                    return originalSet(...args);
+                    const value = originalSet(...args);
+                    cdr?.detectChanges();
+                    return value;
                 };
             },
         });
@@ -2111,8 +2116,12 @@ class NgtRenderer {
         // if child is three but haven't been attached to a parent yet
         (newChild.__ngt_renderer__[0 /* NgtRendererClassId.type */] === 'three' && !getLocalState(newChild).parent) ||
             // or both parent and child are DOM elements
-            (parent.__ngt_renderer__[0 /* NgtRendererClassId.type */] === 'dom' &&
-                newChild.__ngt_renderer__[0 /* NgtRendererClassId.type */] === 'dom');
+            ((parent.__ngt_renderer__[0 /* NgtRendererClassId.type */] === 'dom' ||
+                (parent.__ngt_renderer__[0 /* NgtRendererClassId.type */] === 'compound' &&
+                    !parent.__ngt_renderer__[6 /* NgtRendererClassId.compounded */])) &&
+                (newChild.__ngt_renderer__[0 /* NgtRendererClassId.type */] === 'dom' ||
+                    (newChild.__ngt_renderer__[0 /* NgtRendererClassId.type */] === 'compound' &&
+                        !newChild.__ngt_renderer__[6 /* NgtRendererClassId.compounded */])));
         if (shouldFindGrandparentInstance) {
             // we'll try to get the grandparent instance here so that we can run appendChild with both instances
             const closestGrandparentInstance = this.store.getClosestParentWithInstance(parent);
@@ -2653,7 +2662,7 @@ function injectNgtRef(initialValue = null) {
 function createRunInContext() {
     const nodeInjector = inject(Injector);
     const envInjector = inject(EnvironmentInjector);
-    const originalGet = envInjector.get;
+    const originalGet = envInjector.get.bind(envInjector);
     return (cb) => {
         envInjector.get = (...args) => {
             try {