@woven-canvas/core 1.0.1 → 1.0.3

package/build/_tsup-dts-rollup.d.cts

@@ -132,7 +132,7 @@ declare const BlockDef: z.ZodObject<{
     }>>;
     canRotate: z.ZodDefault<z.ZodBoolean>;
     canScale: z.ZodDefault<z.ZodBoolean>;
-    selectable: z.ZodDefault<z.ZodBoolean>;
+    interactable: z.ZodDefault<z.ZodBoolean>;
     connectors: z.ZodDefault<z.ZodObject<{
         enabled: z.ZodDefault<z.ZodBoolean>;
         terminals: z.ZodDefault<z.ZodArray<z.ZodTuple<[z.ZodNumber, z.ZodNumber], null>>>;
@@ -208,6 +208,11 @@ export { canBlockEdit }
 export { canBlockEdit as canBlockEdit_alias_1 }
 export { canBlockEdit as canBlockEdit_alias_2 }
 
+declare function canBlockInteract(ctx: Context, tag: string): boolean;
+export { canBlockInteract }
+export { canBlockInteract as canBlockInteract_alias_1 }
+export { canBlockInteract as canBlockInteract_alias_2 }
+
 declare function canBlockRotate(ctx: Context, tag: string): boolean;
 export { canBlockRotate }
 export { canBlockRotate as canBlockRotate_alias_1 }
@@ -216,11 +221,6 @@ declare function canBlockScale(ctx: Context, tag: string): boolean;
 export { canBlockScale }
 export { canBlockScale as canBlockScale_alias_1 }
 
-declare function canBlockSelect(ctx: Context, tag: string): boolean;
-export { canBlockSelect }
-export { canBlockSelect as canBlockSelect_alias_1 }
-export { canBlockSelect as canBlockSelect_alias_2 }
-
 declare const canSeeBlocksSystem: EditorSystem;
 export { canSeeBlocksSystem }
 export { canSeeBlocksSystem as canSeeBlocksSystem_alias_1 }
@@ -516,7 +516,7 @@ export declare const EditorOptionsSchema: z.ZodObject<{
         resizeMode?: "scale" | "text" | "free" | "groupOnly" | undefined;
         canRotate?: boolean | undefined;
         canScale?: boolean | undefined;
-        selectable?: boolean | undefined;
+        interactable?: boolean | undefined;
         connectors?: {
             enabled?: boolean | undefined;
             terminals?: [number, number][] | undefined;
@@ -532,7 +532,7 @@ export declare const EditorOptionsSchema: z.ZodObject<{
         resizeMode?: "scale" | "text" | "free" | "groupOnly" | undefined;
         canRotate?: boolean | undefined;
         canScale?: boolean | undefined;
-        selectable?: boolean | undefined;
+        interactable?: boolean | undefined;
         connectors?: {
             enabled?: boolean | undefined;
             terminals?: [number, number][] | undefined;

package/build/_tsup-dts-rollup.d.ts

@@ -132,7 +132,7 @@ declare const BlockDef: z.ZodObject<{
     }>>;
     canRotate: z.ZodDefault<z.ZodBoolean>;
     canScale: z.ZodDefault<z.ZodBoolean>;
-    selectable: z.ZodDefault<z.ZodBoolean>;
+    interactable: z.ZodDefault<z.ZodBoolean>;
     connectors: z.ZodDefault<z.ZodObject<{
         enabled: z.ZodDefault<z.ZodBoolean>;
         terminals: z.ZodDefault<z.ZodArray<z.ZodTuple<[z.ZodNumber, z.ZodNumber], null>>>;
@@ -208,6 +208,11 @@ export { canBlockEdit }
 export { canBlockEdit as canBlockEdit_alias_1 }
 export { canBlockEdit as canBlockEdit_alias_2 }
 
+declare function canBlockInteract(ctx: Context, tag: string): boolean;
+export { canBlockInteract }
+export { canBlockInteract as canBlockInteract_alias_1 }
+export { canBlockInteract as canBlockInteract_alias_2 }
+
 declare function canBlockRotate(ctx: Context, tag: string): boolean;
 export { canBlockRotate }
 export { canBlockRotate as canBlockRotate_alias_1 }
@@ -216,11 +221,6 @@ declare function canBlockScale(ctx: Context, tag: string): boolean;
 export { canBlockScale }
 export { canBlockScale as canBlockScale_alias_1 }
 
-declare function canBlockSelect(ctx: Context, tag: string): boolean;
-export { canBlockSelect }
-export { canBlockSelect as canBlockSelect_alias_1 }
-export { canBlockSelect as canBlockSelect_alias_2 }
-
 declare const canSeeBlocksSystem: EditorSystem;
 export { canSeeBlocksSystem }
 export { canSeeBlocksSystem as canSeeBlocksSystem_alias_1 }
@@ -516,7 +516,7 @@ export declare const EditorOptionsSchema: z.ZodObject<{
         resizeMode?: "scale" | "text" | "free" | "groupOnly" | undefined;
         canRotate?: boolean | undefined;
         canScale?: boolean | undefined;
-        selectable?: boolean | undefined;
+        interactable?: boolean | undefined;
         connectors?: {
             enabled?: boolean | undefined;
             terminals?: [number, number][] | undefined;
@@ -532,7 +532,7 @@ export declare const EditorOptionsSchema: z.ZodObject<{
         resizeMode?: "scale" | "text" | "free" | "groupOnly" | undefined;
         canRotate?: boolean | undefined;
         canScale?: boolean | undefined;
-        selectable?: boolean | undefined;
+        interactable?: boolean | undefined;
         connectors?: {
             enabled?: boolean | undefined;
             terminals?: [number, number][] | undefined;

package/build/index.cjs

@@ -86,7 +86,7 @@ __export(index_exports, {
   VerticalAlignment: () => VerticalAlignment,
   addComponent: () => import_core50.addComponent,
   canBlockEdit: () => canBlockEdit,
-  canBlockSelect: () => canBlockSelect,
+  canBlockInteract: () => canBlockInteract,
   clearPointerTrackingState: () => clearPointerTrackingState,
   createEntity: () => import_core50.createEntity,
   defineCanvasComponent: () => import_canvas_store35.defineCanvasComponent,
@@ -259,7 +259,7 @@ var ControlsOptions = import_zod.z.object({
    * Tool activated by right mouse button.
    * @default 'menu'
    */
-  rightMouseTool: import_zod.z.string().max(32).default("menu"),
+  rightMouseTool: import_zod.z.string().max(32).default("hand"),
   /**
    * Tool activated by mouse wheel.
    * @default 'scroll'
@@ -420,7 +420,7 @@ var BlockDef = import_zod.z.object({
   resizeMode: import_zod.z.enum([ResizeMode.Scale, ResizeMode.Text, ResizeMode.Free, ResizeMode.GroupOnly]).default(ResizeMode.Scale),
   canRotate: import_zod.z.boolean().default(true),
   canScale: import_zod.z.boolean().default(true),
-  selectable: import_zod.z.boolean().default(true),
+  interactable: import_zod.z.boolean().default(true),
   connectors: BlockDefConnectors.default(BlockDefConnectors.parse({}))
 });
 
@@ -1615,7 +1615,7 @@ var ControlsSchema = {
   /** Tool activated by middle mouse button */
   middleMouseTool: import_core19.field.string().max(32).default("hand"),
   /** Tool activated by right mouse button */
-  rightMouseTool: import_core19.field.string().max(32).default("menu"),
+  rightMouseTool: import_core19.field.string().max(32).default("hand"),
   /** Tool activated by mouse wheel */
   wheelTool: import_core19.field.string().max(32).default("scroll"),
   /** Tool activated by mouse wheel with modifier key held */
@@ -2632,9 +2632,13 @@ function attachPointerListeners(domElement) {
       });
     },
     onContextMenu: (e) => {
+      if (e.target instanceof HTMLElement && e.target.closest('[contenteditable="true"]')) return;
       e.preventDefault();
-      const hasPointerDown = state.eventsBuffer.some((evt) => evt.type === "pointerdown");
-      if (hasPointerDown) return;
+      const hasRightButtonEvent = state.eventsBuffer.some(
+        (evt) => evt.button === 2 && (evt.type === "pointerdown" || evt.type === "pointerup")
+      );
+      if (hasRightButtonEvent) return;
+      if (state.pointerEntityMap.size > 0) return;
       state.eventsBuffer.push({
         type: "pointerdown",
         pointerId: 0,
@@ -2843,8 +2847,8 @@ function getBlockDef(ctx, tag) {
 function canBlockEdit(ctx, tag) {
   return getBlockDef(ctx, tag).editOptions.canEdit;
 }
-function canBlockSelect(ctx, tag) {
-  return getBlockDef(ctx, tag).selectable;
+function canBlockInteract(ctx, tag) {
+  return getBlockDef(ctx, tag).interactable;
 }
 function getBlockResizeMode(ctx, entityId) {
   const block = Block.read(ctx, entityId);
@@ -3240,6 +3244,10 @@ var intersectSystem = defineEditorSystem({ phase: "capture", priority: 100 }, (c
     changed.add(entityId);
   }
   for (const entityId of added) {
+    if ((0, import_core43.hasComponent)(ctx, entityId, Block)) {
+      const block = Block.read(ctx, entityId);
+      if (!canBlockInteract(ctx, block.tag)) continue;
+    }
     if (!(0, import_core43.hasComponent)(ctx, entityId, Aabb)) {
       (0, import_core43.addComponent)(ctx, entityId, Aabb, { value: [0, 0, 0, 0] });
     }
@@ -3247,6 +3255,7 @@ var intersectSystem = defineEditorSystem({ phase: "capture", priority: 100 }, (c
     computeAabb(ctx, entityId, aabb.value);
   }
   for (const entityId of changed) {
+    if (!(0, import_core43.hasComponent)(ctx, entityId, Aabb)) continue;
     const aabb = Aabb.write(ctx, entityId);
     computeAabb(ctx, entityId, aabb.value);
   }
@@ -3358,6 +3367,7 @@ var import_core46 = require("@woven-ecs/core");
 var scaleWithZoomQuery = (0, import_core46.defineQuery)((q) => q.with(Block).tracking(ScaleWithZoom));
 var _scaledSize = [0, 0];
 var _anchorOffset = [0, 0];
+var _anchorAdj = [0, 0];
 var scaleWithZoomSystem = defineEditorSystem({ phase: "render", priority: 100 }, (ctx) => {
   const camera = Camera.read(ctx);
   const state = ScaleWithZoomState.read(ctx);
@@ -3382,7 +3392,15 @@ function scaleBlock(ctx, entityId, zoom) {
   _scaledSize[1] = swz.startSize[1] * scaleY;
   import_math8.Vec2.copy(_anchorOffset, swz.startSize);
   import_math8.Vec2.sub(_anchorOffset, _scaledSize);
-  import_math8.Vec2.multiply(_anchorOffset, swz.anchor);
+  if (block.rotateZ !== 0) {
+    _anchorAdj[0] = _anchorOffset[0] * (swz.anchor[0] - 0.5);
+    _anchorAdj[1] = _anchorOffset[1] * (swz.anchor[1] - 0.5);
+    import_math8.Vec2.rotate(_anchorAdj, block.rotateZ);
+    _anchorOffset[0] = _anchorOffset[0] * 0.5 + _anchorAdj[0];
+    _anchorOffset[1] = _anchorOffset[1] * 0.5 + _anchorAdj[1];
+  } else {
+    import_math8.Vec2.multiply(_anchorOffset, swz.anchor);
+  }
   import_math8.Vec2.copy(block.position, swz.startPosition);
   import_math8.Vec2.add(block.position, _anchorOffset);
   import_math8.Vec2.copy(block.size, _scaledSize);
@@ -4356,7 +4374,7 @@ function clearPointerTrackingState(ctx) {
   VerticalAlignment,
   addComponent,
   canBlockEdit,
-  canBlockSelect,
+  canBlockInteract,
   clearPointerTrackingState,
   createEntity,
   defineCanvasComponent,