angular-three 4.0.0-next.13 → 4.0.0-next.15

package/fesm2022/angular-three.mjs

@@ -82,9 +82,9 @@ class NgtCommonDirective {
         this.injected = false;
         this.injectedValue = null;
         effect(() => {
-            const value = this.linkedValue();
             if (this.shouldSkipRender())
                 return;
+            const value = this.linkedValue();
             if (is.equ(value, this.injectedValue)) {
                 // we have the same value as before, no need to update
                 return;
@@ -614,6 +614,13 @@ function injectStore(options) {
     return inject(NGT_STORE, options);
 }
 
+function resolveRef(ref) {
+    if (is.ref(ref)) {
+        return ref.nativeElement;
+    }
+    return ref;
+}
+
 class NgtParent extends NgtCommonDirective {
     constructor() {
         super();
@@ -628,10 +635,7 @@ class NgtParent extends NgtCommonDirective {
             if (typeof rawParent === 'string') {
                 return scene.getObjectByName(rawParent);
             }
-            if ('nativeElement' in rawParent) {
-                return rawParent.nativeElement;
-            }
-            return rawParent;
+            return resolveRef(rawParent);
         });
         this.linkedValue = linkedSignal(this._parent);
         this.shouldSkipRender = computed(() => !this._parent());
@@ -3008,32 +3012,34 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.4", ngImpor
  * `injectBeforeRender` invokes its callback on every frame. Hence, the notion of tracking
  * changes (i.e: signals) does not really matter since we're getting latest values of the things we need on every frame anyway.
  *
- * If `priority` is dynamic, consumers should set up `injectBeforeRender` in
- * an `effect` and track `priority` changes. Make use of `onCleanup` to clean up
- * previous before render subscription
+ * If `priority` is a Signal, `injectBeforeRender` will set up an Effect internally and returns the `EffectRef#destroy` instead.
  *
  * @example
  * ```ts
- * const injector = inject(Injector);
- *
- * effect((onCleanup) => {
- *   const priority = this.priority(); // track priority
- *
- *   const sub = injectBeforeRender(
- *    ({ gl, camera }) => {
- *      // before render logic
- *    },
- *    {
- *      priority,
- *      injector, // injector is needed since injectBeforeRender is invoked in effect body
- *    }
- *   });
- *
- *   onCleanup(() => sub());
- * });
+ * const destroy = injectBeforeRender(
+ *  ({ gl, camera }) => {
+ *    // before render logic
+ *  },
+ *  {
+ *    priority: this.priority, // this.priority is a Signal<number>
+ *  }
+ * )
  * ```
  */
 function injectBeforeRender(cb, { priority = 0, injector } = {}) {
+    if (typeof priority === 'function') {
+        const effectRef = assertInjector(injectBeforeRender, injector, () => {
+            const store = injectStore();
+            const ref = effect((onCleanup) => {
+                const p = priority();
+                const sub = store.snapshot.internal.subscribe(cb, p, store);
+                onCleanup(() => sub());
+            });
+            inject(DestroyRef).onDestroy(() => void ref.destroy());
+            return ref;
+        });
+        return effectRef.destroy.bind(effectRef);
+    }
     return assertInjector(injectBeforeRender, injector, () => {
         const store = injectStore();
         const sub = store.snapshot.internal.subscribe(cb, priority, store);
@@ -3042,13 +3048,6 @@ function injectBeforeRender(cb, { priority = 0, injector } = {}) {
     });
 }
 
-function resolveRef(ref) {
-    if (is.ref(ref)) {
-        return ref.nativeElement;
-    }
-    return ref;
-}
-
 /**
  * As host directive:
  * - outputs: [