angular-three 1.5.1 → 1.6.0

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, Pipe, SkipSelf, ContentChild } 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 { 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';
@@ -993,34 +993,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.3", ngImpor
                 type: Input
             }] } });
 
-class NgtRef extends NgtCommonDirective {
-    set ref(ref) {
-        if (!ref || ref == null)
-            return;
-        this.injected = false;
-        this.injectedRef = ref;
-        this.createView();
-    }
-    get ref() {
-        if (this.validate()) {
-            this.injected = true;
-            return this.injectedRef;
-        }
-        return null;
-    }
-    validate() {
-        return !this.injected && !!this.injectedRef && !this.injectedRef.nativeElement;
-    }
-}
-NgtRef.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.3", ngImport: i0, type: NgtRef, deps: null, target: i0.ɵɵFactoryTarget.Directive });
-NgtRef.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.1.3", type: NgtRef, isStandalone: true, selector: "[ref]", inputs: { ref: "ref" }, usesInheritance: true, ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.3", ngImport: i0, type: NgtRef, decorators: [{
-            type: Directive,
-            args: [{ selector: '[ref]', standalone: true }]
-        }], propDecorators: { ref: [{
-                type: Input
-            }] } });
-
 function releaseInternalPointerCapture(capturedMap, obj, captures, pointerId) {
     const captureData = captures.get(obj);
     if (captureData) {
@@ -1718,15 +1690,21 @@ class NgtRendererStore {
     applyProperty(node, name, value) {
         if (node.__ngt_renderer__[3 /* NgtRendererClassId.destroyed */])
             return;
+        // [ref]
+        if (name === SPECIAL_PROPERTIES.REF && is.ref(value)) {
+            node.__ngt_renderer__[11 /* NgtRendererClassId.ref */] = value;
+            value.nativeElement = node;
+            return;
+        }
         const parent = getLocalState(node).parent || node.__ngt_renderer__[1 /* NgtRendererClassId.parent */];
-        // rawValue
+        // [rawValue]
         if (getLocalState(node).isRaw && name === SPECIAL_PROPERTIES.VALUE) {
             node.__ngt_renderer__[10 /* NgtRendererClassId.rawValue */] = value;
             if (parent)
                 attachThreeChild(parent, node);
             return;
         }
-        // attach
+        // [attach]
         if (name === SPECIAL_PROPERTIES.ATTACH) {
             getLocalState(node).attach = Array.isArray(value) ? value.map((v) => v.toString()) : value;
             if (parent)
@@ -1795,9 +1773,8 @@ class NgtRendererStore {
     }
     getCreationState() {
         const injectedArgs = this.firstNonInjectedDirective(NgtArgs)?.args || [];
-        const injectedRef = this.firstNonInjectedDirective(NgtRef)?.ref || null;
         const store = this.tryGetPortalStore();
-        return { injectedArgs, injectedRef, store };
+        return { injectedArgs, store };
     }
     destroy(node, parent) {
         const state = node.__ngt_renderer__;
@@ -2014,7 +1991,7 @@ class NgtRenderer {
         if (name === SPECIAL_DOM_TAG.NGT_VALUE) {
             return this.store.createNode('three', Object.assign({ __ngt_renderer__: { rawValue: undefined } }, { __ngt__: { isRaw: true } }));
         }
-        const { injectedArgs, injectedRef, store } = this.store.getCreationState();
+        const { injectedArgs, store } = this.store.getCreationState();
         // handle primitive
         if (name === SPECIAL_DOM_TAG.NGT_PRIMITIVE) {
             if (!injectedArgs[0])
@@ -2027,10 +2004,7 @@ class NgtRenderer {
             }
             if (!localState.store)
                 localState.store = store;
-            const primitiveNode = this.store.createNode('three', object);
-            if (injectedRef)
-                injectedRef.nativeElement = primitiveNode;
-            return primitiveNode;
+            return this.store.createNode('three', object);
         }
         const threeTag = name.startsWith('ngt') ? name.slice(4) : name;
         const threeName = kebabToPascal(threeTag);
@@ -2046,10 +2020,6 @@ class NgtRenderer {
             else if (is.material(instance)) {
                 localState.attach = ['material'];
             }
-            if (injectedRef) {
-                injectedRef.nativeElement = node;
-                node.__ngt_renderer__[11 /* NgtRendererClassId.ref */] = injectedRef;
-            }
             return node;
         }
         const domNode = this.store.createNode('dom', element);
@@ -2662,6 +2632,26 @@ function injectNgtRef(initialValue = null) {
     return Object.assign(ref, { subscribe, $, children$, useCDR: (cdr) => void cdRefs.push(cdr) });
 }
 
+function createRunInContext() {
+    const nodeInjector = inject(Injector);
+    const envInjector = inject(EnvironmentInjector);
+    const originalGet = envInjector.get;
+    return (cb) => {
+        envInjector.get = (...args) => {
+            try {
+                const fromNodeInjector = nodeInjector.get(...args);
+                if (fromNodeInjector)
+                    return fromNodeInjector;
+                return originalGet(...args);
+            }
+            catch (e) {
+                return originalGet(...args);
+            }
+        };
+        return envInjector.runInContext(cb);
+    };
+}
+
 class NgtRepeat extends NgForOf {
     set ngForRepeat(count) {
         this.ngForOf = Number.isInteger(count) ? Array.from({ length: count }, (_, i) => i) : [];
@@ -2961,5 +2951,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.3", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { NGT_CATALOGUE, NgtArgs, NgtCanvas, NgtPortal, NgtPortalBeforeRender, NgtPortalContent, NgtPush, NgtRef, NgtRepeat, NgtRxStore, NgtStore, addAfterEffect, addEffect, addTail, applyProps, checkNeedsUpdate, checkUpdate, createAttachFunction, createLoop, extend, flushGlobalEffects, getLocalState, injectBeforeRender, injectNgtDestroy, injectNgtLoader, injectNgtRef, invalidateInstance, is, makeDefaultCamera, makeDefaultRenderer, makeDpr, makeId, makeObjectGraph, prepare, rootStateMap, safeDetectChanges, startWithUndefined, tapEffect, updateCamera };
+export { NGT_CATALOGUE, NgtArgs, NgtCanvas, NgtPortal, NgtPortalBeforeRender, NgtPortalContent, NgtPush, NgtRepeat, NgtRxStore, NgtStore, addAfterEffect, addEffect, addTail, applyProps, checkNeedsUpdate, checkUpdate, createAttachFunction, createLoop, createRunInContext, extend, flushGlobalEffects, getLocalState, injectBeforeRender, injectNgtDestroy, injectNgtLoader, injectNgtRef, invalidateInstance, is, makeDefaultCamera, makeDefaultRenderer, makeDpr, makeId, makeObjectGraph, prepare, rootStateMap, safeDetectChanges, startWithUndefined, tapEffect, updateCamera };
 //# sourceMappingURL=angular-three.mjs.map