@vibecook/ice 0.15.0 → 0.16.0-portals.2

package/dist/{chunk-SPG45AVV.js → chunk-SHU3HVMF.js}

@@ -1367,7 +1367,18 @@ var HeldPress = defineComponent("HeldPress", {
   y: field3("f64", { default: 0 }),
   panX0: field3("f64", { default: 0 }),
   panY0: field3("f64", { default: 0 }),
-  moved: field3("bool", { default: false })
+  moved: field3("bool", { default: false }),
+  count: field3("u32", { default: 1 })
+});
+var HeldPressMemo = defineResource(
+  "HeldPressMemo",
+  { x: field3("f64", { default: 0 }), y: field3("f64", { default: 0 }), at: field3("f64", { default: 0 }), count: field3("u32", { default: 0 }) },
+  { durable: false }
+);
+var HeldWheel = defineComponent("HeldWheel", {
+  dx: field3("f64", { default: 0 }),
+  dy: field3("f64", { default: 0 }),
+  seq: field3("u32", { default: 0 })
 });
 var HeldTapMemo = defineResource(
   "HeldTapMemo",
@@ -1730,7 +1741,6 @@ var SnapSource = defineTag("SnapSource");
 var SnapTarget = defineTag("SnapTarget");
 var SweepsContained = defineTag("SweepsContained");
 var WheelTurns = defineTag("WheelTurns");
-var KeyboardExclusive = defineTag("KeyboardExclusive");
 var PresencePeer = defineTag("PresencePeer");
 var PresenceInfo = defineComponent("PresenceInfo", { name: "string", color: "string" });
 var PresenceCursor = defineComponent("PresenceCursor", {
@@ -3176,6 +3186,12 @@ function defineWidget(def) {
       `ice: defineWidget("${def.type}") declares ${retired.join(", ")} \u2014 the view half of a widget is retired (design-015 D5b): a widget's face is its object kind's program (\`object:\`), and nothing mounts a component, a chrome, a preview or a surface for it. Drop ${retired.length > 1 ? "them" : "it"}.`
     );
   }
+  const claim = ["keyboard", "keyboardEscape"].filter((k) => def.interaction?.[k] !== void 0);
+  if (claim.length > 0) {
+    throw new Error(
+      `ice: defineWidget("${def.type}") declares interaction.${claim.join(" and interaction.")} \u2014 the keyboard claim is retired (design-019 \xA75, M24 LT2): a kind takes keys by LEASING the desk's one editor (\`EditorLease\`), and an object in hand that owns Escape says \`open.escape: "kind"\`. Drop ${claim.length > 1 ? "them" : "it"}.`
+    );
+  }
   if (def.container?.framePreview !== void 0) {
     throw new Error(
       `ice: defineWidget("${def.type}") container declares framePreview \u2014 the container's preview renderer is retired (design-015 D5b): a mini mat's inside is drawn by the desk.`
@@ -3193,6 +3209,17 @@ function defineWidget(def) {
     }
     validateHeldTools(def.type, def.heldTools ?? []);
   }
+  if (def.heldWheel !== void 0 || def.heldEscape !== void 0) {
+    if (!(hasObject && def.openable === true)) {
+      throw new Error(`ice: defineWidget("${def.type}") declares heldWheel or heldEscape but does not open \u2014 only an object picked up into the hand has a wheel or an Escape of its own (design-019 \xA75).`);
+    }
+    if (def.heldWheel !== void 0 && def.heldWheel !== "hand" && def.heldWheel !== "kind") {
+      throw new Error(`ice: defineWidget("${def.type}") declares heldWheel "${String(def.heldWheel)}" \u2014 the wheel in hand is "hand" or "kind" (design-019 \xA75).`);
+    }
+    if (def.heldEscape !== void 0 && def.heldEscape !== "desk" && def.heldEscape !== "kind") {
+      throw new Error(`ice: defineWidget("${def.type}") declares heldEscape "${String(def.heldEscape)}" \u2014 Escape in hand is "desk" or "kind" (design-019 \xA75).`);
+    }
+  }
   validateMenuActions(def.type, def.menu ?? []);
   for (const d of def.data ?? []) {
     if (d.store !== "durable") throw new Error(`ice: defineWidget("${def.type}") data prefab "${d.id}" is ${d.store} \u2014 an object's data children live in the document (durable).`);
@@ -3229,7 +3256,6 @@ function defineWidget(def) {
   if (interaction.dragOn === "longPress") capabilityTags.push(LongPressDrag);
   if (interaction.sweepContained === true) capabilityTags.push(SweepsContained);
   if (interaction.wheelTurns === true) capabilityTags.push(WheelTurns);
-  if (interaction.keyboard === "exclusive") capabilityTags.push(KeyboardExclusive);
   const snap = interaction.snap ?? "target";
   if (snap === "source" || snap === "both") capabilityTags.push(SnapSource);
   if (snap === "target" || snap === "both") capabilityTags.push(SnapTarget);
@@ -3268,8 +3294,8 @@ function defineWidget(def) {
       frameProjection: def.container.frameProjection,
       typed: def.container.typed === true
     }),
-    keyboard: interaction.keyboard ?? "shared",
-    keyboardEscape: interaction.keyboardEscape ?? "release",
+    heldWheel: def.heldWheel ?? "hand",
+    heldEscape: def.heldEscape ?? "desk",
     drop: interaction.drop ?? "into",
     migrate: def.migrate ?? {},
     behaviors: behaviorEntries,
@@ -8517,6 +8543,22 @@ function heldToolCursor(world) {
   });
   return over ? cursor : void 0;
 }
+function heldKindCursor(world, pose) {
+  const source = pose?.current;
+  if (source?.cursor === void 0) return void 0;
+  const held = world.firstOf(heldQ);
+  if (held === void 0) return void 0;
+  let part = "";
+  world.query(localPointerQ).each((b) => {
+    for (const r of b) {
+      const p2 = b.entity(r);
+      if (world.read(p2, Pointer).device === "mouse") part = world.get(p2, HeldPointer)?.part ?? "";
+    }
+  });
+  if (part === "" || part === "content" || part === "frame") return void 0;
+  const c = source.cursor(held, part);
+  return typeof c === "string" && c !== "" ? c : void 0;
+}
 function trayCursor(world) {
   const tray = world.firstOf(trayQ);
   const t = tray === void 0 ? void 0 : world.get(tray, Tray);
@@ -8547,12 +8589,12 @@ function resizeCursorForAnchor(anchor) {
       return "ew-resize";
   }
 }
-function createCursorSync(world) {
+function createCursorSync(world, opts = {}) {
   let cursor = "default";
   const system = defineSystem7(
     anchorQ,
     (_b, ctx) => {
-      let resolved = heldToolCursor(world) ?? trayCursor(world);
+      let resolved = heldKindCursor(world, opts.pose) ?? heldToolCursor(world) ?? trayCursor(world);
       let mouseTargets;
       world.query(localPointerQ).each((b) => {
         for (const r of b) {
@@ -8617,10 +8659,12 @@ function createHeldInput(world, opts) {
       if (held === void 0 || !ctx.isAlive(held)) {
         const mute = world.getResource(HeldMute);
         let muted = mute !== void 0 && now2 < mute.until;
+        if ((world.getResource(HeldPressMemo)?.count ?? 0) !== 0) world.setResource(HeldPressMemo, { x: 0, y: 0, at: 0, count: 0 });
         for (const r of b) {
           const p2 = b.entity(r);
           if (ctx.has(p2, HeldPointer)) ctx.removeComponent(p2, HeldPointer);
           if (ctx.has(p2, HeldPress)) ctx.removeComponent(p2, HeldPress);
+          if (ctx.has(p2, HeldWheel)) ctx.removeComponent(p2, HeldWheel);
           if (!muted) continue;
           const w = ctx.get(p2, PointerWheel);
           if (w === void 0 || w.dx === 0 && w.dy === 0 && w.pinch === 0 || ctx.hasTag(p2, WheelHandled)) continue;
@@ -8636,6 +8680,8 @@ function createHeldInput(world, opts) {
       const windowMs = gs2?.multiTapWindowMs ?? GESTURE_DEFAULTS.multiTapWindowMs;
       const slopPx = gs2?.multiTapSlopPx ?? GESTURE_DEFAULTS.multiTapSlopPx;
       const space = world.getResource(Keyboard)?.space === true;
+      const typeId = world.get(held, PrefabId)?.id;
+      const wheelToKind = typeof typeId === "string" && widgetTypeFor(world, typeId)?.heldWheel === "kind";
       const clampPan = (x, y, zoom) => {
         if (frame2 === void 0) return [x, y];
         const hx = frame2.hx / Math.max(view.zoom, 1e-9) * zoom;
@@ -8679,6 +8725,11 @@ function createHeldInput(world, opts) {
               const [px, py] = zoom <= 1 ? [0, 0] : clampPan(next2.panX + (s.x - cx) * (1 - ratio), next2.panY + (s.y - cy) * (1 - ratio), zoom);
               next2 = { zoom, panX: px, panY: py };
             }
+          } else if (wheelToKind) {
+            const cur = ctx.get(p2, HeldWheel);
+            const wheel = { dx: w.dx, dy: w.dy, seq: (cur?.seq ?? 0) + 1 };
+            if (cur === void 0) ctx.addComponent(p2, HeldWheel, wheel);
+            else ctx.edit(p2).set(HeldWheel, wheel);
           } else if (next2.zoom > 1.001) {
             const [px, py] = clampPan(next2.panX - w.dx, next2.panY - w.dy, next2.zoom);
             next2 = { ...next2, panX: px, panY: py };
@@ -8691,7 +8742,15 @@ function createHeldInput(world, opts) {
             const tool = part === "content" && (world.get(held, HeldTool)?.id ?? "") !== "";
             const named = part !== "" && part !== "content" && part !== "frame";
             const kind = pan ? "pan" : tool ? "tool" : named ? "part" : inside ? "object" : "desk";
-            const press = { kind, part, x: s.x, y: s.y, panX0: next2.panX, panY0: next2.panY, moved: false };
+            let count = 1;
+            if (button === "primary") {
+              const memo = world.getResource(HeldPressMemo);
+              const downMs = ctx.get(p2, PointerButtons)?.downMs ?? 0;
+              const at = downMs !== 0 ? downMs : now2;
+              if (memo !== void 0 && memo.count > 0 && at - memo.at <= windowMs && Math.hypot(s.x - memo.x, s.y - memo.y) <= slopPx) count = memo.count + 1;
+              world.setResource(HeldPressMemo, { x: s.x, y: s.y, at, count });
+            }
+            const press = { kind, part, x: s.x, y: s.y, panX0: next2.panX, panY0: next2.panY, moved: false, count };
             if (ctx.has(p2, HeldPress)) ctx.edit(p2).set(HeldPress, press);
             else ctx.addComponent(p2, HeldPress, press);
           } else if (ctx.has(p2, HeldPress)) ctx.removeComponent(p2, HeldPress);
@@ -8732,7 +8791,7 @@ function createHeldInput(world, opts) {
         else ctx.addComponent(held, HeldView, next2);
       }
     },
-    { name: "heldInput", access: { write: [HeldView, HeldPointer, HeldPress] } }
+    { name: "heldInput", access: { write: [HeldView, HeldPointer, HeldPress, HeldWheel] } }
   );
 }
 
@@ -11097,7 +11156,7 @@ function installInteractionStack(engine, opts = {}) {
   const connect = createConnectSystems(world, sink, index, wires);
   const ports = createPortMaterialize(world, index);
   const camera = createCameraSystems(world);
-  const cursor = createCursorSync(world);
+  const cursor = createCursorSync(world, { pose: heldPose });
   const cleanup = createCleanupSystems(world);
   const removers = [
     // the stack's registered wake (K7a, interaction/wakes.ts): due every frame while its time-driven work is pending
@@ -16911,6 +16970,8 @@ export {
   HeldMute,
   HeldPointer,
   HeldPress,
+  HeldPressMemo,
+  HeldWheel,
   HeldTapMemo,
   Tray,
   TrayIntent,
@@ -17014,7 +17075,6 @@ export {
   SnapTarget,
   SweepsContained,
   WheelTurns,
-  KeyboardExclusive,
   PresencePeer,
   PresenceInfo,
   PresenceCursor,
@@ -17236,4 +17296,4 @@ export {
   Local3 as Local,
   DurableUndoStatus
 };
-//# sourceMappingURL=chunk-SPG45AVV.js.map
+//# sourceMappingURL=chunk-SHU3HVMF.js.map