@zcomponent/core 1.18.0 → 1.19.1-beta

package/lib/behaviors/SetLayerOff.d.ts

@@ -2,7 +2,7 @@ import { ActionBehavior, ActionBehaviorConstructorProps } from '../actionbehavio
 import { Component } from '../component';
 import { ContextManager } from '../context';
 /**
- * Sets a leye clip to be inactive.
+ * Deactivates a layer
  * @zbehavior
  * @zicon toggle_off
  * @zgroup Animation Actions

package/lib/behaviors/SetLayerOff.js

@@ -1,7 +1,7 @@
 import { ActionBehavior } from '../actionbehavior';
 import { registerBehaviorRunAtDesignTime } from '../behavior';
 /**
- * Sets a leye clip to be inactive.
+ * Deactivates a layer
  * @zbehavior
  * @zicon toggle_off
  * @zgroup Animation Actions

package/lib/component.d.ts

@@ -73,6 +73,10 @@ export declare class Component<ElementType = any, ConstructorPropsType extends C
      * The parent of this component.
      */
     parent?: Component;
+    /**
+     * If true, this component can't be selected at design time in the 3D preview.
+     */
+    locked?: boolean;
     /**
      * Creates an instance of Component.
      * @param contextManager The current ContextManager
@@ -128,6 +132,10 @@ export declare class Component<ElementType = any, ConstructorPropsType extends C
      * exposed by this component's children.
      */
     get elementsResolved(): any[];
+    /**
+     * Returns true if this component, or any of its parents, are marked as locked.
+     */
+    get lockedResolved(): boolean;
     /**
      * An array of string 'tags' assocated with this component.
      *

package/lib/component.js

@@ -159,6 +159,12 @@ export class Component extends Entity {
         }
         return ret;
     }
+    /**
+     * Returns true if this component, or any of its parents, are marked as locked.
+     */
+    get lockedResolved() {
+        return (this.locked ?? false) || (this.parent?.lockedResolved ?? false);
+    }
     /**
      * Dispose of this component and all of its children.
      */

package/lib/data/animation.d.ts

@@ -151,6 +151,7 @@ export interface BaseTrack {
     id: string;
     type: TrackType;
     entityID: string;
+    nameHint?: string;
     lock?: {
         track?: boolean;
         weight?: boolean;

package/lib/data/change.d.ts

@@ -241,3 +241,6 @@ export interface BehaviorDataCombined extends EntityDataCombined {
  * @returns A unique label for the node.
  */
 export declare function getUniqueLabel(zcomp: ZComponentData, label: string): string;
+export declare function getUniqueName(n: string, requireUniqueIn: string[] | {
+    [k: string]: any;
+}): string;

package/lib/data/change.js

@@ -551,7 +551,6 @@ export function forEachNodeAncestor(zcomp, id, fn) {
     fn(node.parent.id);
     forEachNodeAncestor(zcomp, node.parent.id, fn);
 }
-const lastNumberRegex = new RegExp(/[0-9]*$/);
 /**
  * Generates a unique label for a node in ZComponentData.
  *
@@ -560,23 +559,25 @@ const lastNumberRegex = new RegExp(/[0-9]*$/);
  * @returns A unique label for the node.
  */
 export function getUniqueLabel(zcomp, label) {
-    lastNumberRegex.lastIndex = 0;
-    let startIndex = 1;
-    const result = lastNumberRegex.exec(label);
-    if (result && result.length === 1) {
-        const num = parseInt(result[0]);
-        if (!isNaN(num)) {
-            startIndex = num + 1;
-            label = label.substring(0, result.index);
-        }
+    return getUniqueName(label, zcomp.entitiesByLabel ?? {});
+}
+export function getUniqueName(n, requireUniqueIn) {
+    const existing = new Set(Array.isArray(requireUniqueIn) ? requireUniqueIn : Object.keys(requireUniqueIn));
+    if (n === undefined || n.length === 0) {
+        n = 'Item';
     }
-    const existingLabels = zcomp.entitiesByLabel ?? {};
-    for (let i = startIndex; i < 10000; i++) {
-        const testName = i === 1 ? label : `${label} ${i.toString()}`;
-        if (!Object.prototype.hasOwnProperty.call(existingLabels, testName)) {
-            label = testName;
-            break;
-        }
+    if (!existing.has(n)) {
+        return n;
+    }
+    const endNumberString = n.match(/\d+$/)?.[0];
+    const nameString = n.slice(0, endNumberString ? endNumberString.length * -1 : undefined);
+    let num = parseInt(endNumberString ?? '1');
+    if (!isNaN(num)) {
+        num++;
+    }
+    const name = `${nameString}${endNumberString ? '' : ' '}${num}`;
+    if (existing.has(name)) {
+        return getUniqueName(name, requireUniqueIn);
     }
-    return label;
+    return name;
 }

package/lib/data/core.d.ts

@@ -55,6 +55,7 @@ export interface NodeData {
     label?: string;
     scriptName?: string;
     type: ElementType;
+    locked?: boolean;
     parent?: {
         id: string;
         order: string;

package/lib/types.js

@@ -146,6 +146,17 @@ export function areTypesCompatible(a, b) {
                 return false;
             if (a.ret && bt.ret)
                 return areTypesCompatible(a.ret, bt.ret);
+            break;
+        }
+        case 'event': {
+            const bt = b;
+            if (a.children.length !== bt.children.length)
+                return false;
+            for (let i = 0; i < a.children.length; i++) {
+                if (!areTypesCompatible(a.children[i], bt.children[i]))
+                    return false;
+            }
+            return true;
         }
     }
     return true;

package/lib/zcomponent.js

@@ -149,6 +149,7 @@ export class ZComponent extends Component {
                 };
                 setCurrentZComponentConstruction(that);
                 super(contextManager, constructorProps);
+                this.locked = that._opts.data.nodes[nodeId]?.locked;
                 that.entityByID.set(nodeId, this);
                 if (node?.label) {
                     that.entityByLabel.set(node.label, this);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zcomponent/core",
-  "version": "1.18.0",
+  "version": "1.19.1-beta",
   "description": "The core component model and built-in functionality for Mattercraft.",
   "main": "index.js",
   "types": "index.d.ts",