fix(core): adjust propertyToAttach on ngtInstance

nartc · Apr 9, 2022 · 143aa5c · 143aa5c
1 parent 56d437b
commit 143aa5c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/libs/core/src/index.ts b/libs/core/src/index.ts
@@ -15,6 +15,7 @@ export * from './lib/di/audio';
 export * from './lib/di/camera';
 export * from './lib/di/geometry';
 export * from './lib/di/material';
+export * from './lib/di/curve';
 
 export * from './lib/pipes/math';
 export * from './lib/pipes/vector';

diff --git a/libs/core/src/lib/abstracts/instance.ts b/libs/core/src/lib/abstracts/instance.ts
@@ -180,6 +180,19 @@ export abstract class NgtInstance<
             tap(([, attach]) => {
                 if (!this.parentInstanceFactory) return;
 
+                const propertyToAttach = [];
+                if (Array.isArray(attach)) {
+                    if (attach.length === 0) {
+                        if (this.instance) {
+                            if (isMaterial(this.instance)) {
+                                propertyToAttach.push('material');
+                            } else if (isGeometry(this.instance)) {
+                                propertyToAttach.push('geometry');
+                            }
+                        }
+                    }
+                }
+
                 if (!this.shouldAttach) {
                     this.shouldAttach =
                         typeof attach === 'function' || attach.length > 0;
@@ -195,17 +208,6 @@ export abstract class NgtInstance<
                         this.__ngt__.previousAttach = attachCleanUp;
                     }
                 } else {
-                    const propertyToAttach = [...attach];
-                    if (propertyToAttach.length === 0) {
-                        if (this.instance) {
-                            if (isMaterial(this.instance)) {
-                                propertyToAttach.push('material');
-                            } else if (isGeometry(this.instance)) {
-                                propertyToAttach.push('geometry');
-                            }
-                        }
-                    }
-
                     if (propertyToAttach.length === 0) {
                         // TODO: warn users about invalid attach params
                         return;

diff --git a/...les/lib/__fileName__.directive.ts__tmpl__ → .../curves/files/lib/__fileName__.ts__tmpl__ b/...les/lib/__fileName__.directive.ts__tmpl__ → .../curves/files/lib/__fileName__.ts__tmpl__