@woven-canvas/core 1.0.1 → 1.0.3

package/build/index.d.cts

@@ -91,7 +91,7 @@ export { FontFamily_alias_1 as FontFamily } from './_tsup-dts-rollup.cjs';
 export { FontFamilyInput_alias_1 as FontFamilyInput } from './_tsup-dts-rollup.cjs';
 export { FontLoader_alias_1 as FontLoader } from './_tsup-dts-rollup.cjs';
 export { canBlockEdit } from './_tsup-dts-rollup.cjs';
-export { canBlockSelect } from './_tsup-dts-rollup.cjs';
+export { canBlockInteract } from './_tsup-dts-rollup.cjs';
 export { detectEmbedProvider } from './_tsup-dts-rollup.cjs';
 export { getBlockDef } from './_tsup-dts-rollup.cjs';
 export { getBlockResizeMode } from './_tsup-dts-rollup.cjs';

package/build/index.d.ts

@@ -91,7 +91,7 @@ export { FontFamily_alias_1 as FontFamily } from './_tsup-dts-rollup.js';
 export { FontFamilyInput_alias_1 as FontFamilyInput } from './_tsup-dts-rollup.js';
 export { FontLoader_alias_1 as FontLoader } from './_tsup-dts-rollup.js';
 export { canBlockEdit } from './_tsup-dts-rollup.js';
-export { canBlockSelect } from './_tsup-dts-rollup.js';
+export { canBlockInteract } from './_tsup-dts-rollup.js';
 export { detectEmbedProvider } from './_tsup-dts-rollup.js';
 export { getBlockDef } from './_tsup-dts-rollup.js';
 export { getBlockResizeMode } from './_tsup-dts-rollup.js';

package/build/index.js

@@ -166,7 +166,7 @@ var ControlsOptions = z.object({
    * Tool activated by right mouse button.
    * @default 'menu'
    */
-  rightMouseTool: z.string().max(32).default("menu"),
+  rightMouseTool: z.string().max(32).default("hand"),
   /**
    * Tool activated by mouse wheel.
    * @default 'scroll'
@@ -327,7 +327,7 @@ var BlockDef = z.object({
   resizeMode: z.enum([ResizeMode.Scale, ResizeMode.Text, ResizeMode.Free, ResizeMode.GroupOnly]).default(ResizeMode.Scale),
   canRotate: z.boolean().default(true),
   canScale: z.boolean().default(true),
-  selectable: z.boolean().default(true),
+  interactable: z.boolean().default(true),
   connectors: BlockDefConnectors.default(BlockDefConnectors.parse({}))
 });
 
@@ -1522,7 +1522,7 @@ var ControlsSchema = {
   /** Tool activated by middle mouse button */
   middleMouseTool: field19.string().max(32).default("hand"),
   /** Tool activated by right mouse button */
-  rightMouseTool: field19.string().max(32).default("menu"),
+  rightMouseTool: field19.string().max(32).default("hand"),
   /** Tool activated by mouse wheel */
   wheelTool: field19.string().max(32).default("scroll"),
   /** Tool activated by mouse wheel with modifier key held */
@@ -2547,9 +2547,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,
@@ -2758,8 +2762,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);
@@ -3155,6 +3159,10 @@ var intersectSystem = defineEditorSystem({ phase: "capture", priority: 100 }, (c
     changed.add(entityId);
   }
   for (const entityId of added) {
+    if (hasComponent5(ctx, entityId, Block)) {
+      const block = Block.read(ctx, entityId);
+      if (!canBlockInteract(ctx, block.tag)) continue;
+    }
     if (!hasComponent5(ctx, entityId, Aabb)) {
       addComponent4(ctx, entityId, Aabb, { value: [0, 0, 0, 0] });
     }
@@ -3162,6 +3170,7 @@ var intersectSystem = defineEditorSystem({ phase: "capture", priority: 100 }, (c
     computeAabb(ctx, entityId, aabb.value);
   }
   for (const entityId of changed) {
+    if (!hasComponent5(ctx, entityId, Aabb)) continue;
     const aabb = Aabb.write(ctx, entityId);
     computeAabb(ctx, entityId, aabb.value);
   }
@@ -3273,6 +3282,7 @@ import { defineQuery as defineQuery9 } from "@woven-ecs/core";
 var scaleWithZoomQuery = defineQuery9((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);
@@ -3297,7 +3307,15 @@ function scaleBlock(ctx, entityId, zoom) {
   _scaledSize[1] = swz.startSize[1] * scaleY;
   Vec22.copy(_anchorOffset, swz.startSize);
   Vec22.sub(_anchorOffset, _scaledSize);
-  Vec22.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);
+    Vec22.rotate(_anchorAdj, block.rotateZ);
+    _anchorOffset[0] = _anchorOffset[0] * 0.5 + _anchorAdj[0];
+    _anchorOffset[1] = _anchorOffset[1] * 0.5 + _anchorAdj[1];
+  } else {
+    Vec22.multiply(_anchorOffset, swz.anchor);
+  }
   Vec22.copy(block.position, swz.startPosition);
   Vec22.add(block.position, _anchorOffset);
   Vec22.copy(block.size, _scaledSize);
@@ -4274,7 +4292,7 @@ export {
   VerticalAlignment,
   addComponent6 as addComponent,
   canBlockEdit,
-  canBlockSelect,
+  canBlockInteract,
   clearPointerTrackingState,
   createEntity5 as createEntity,
   defineCanvasComponent14 as defineCanvasComponent,