@vibecook/ice 0.16.0 → 0.17.0

package/dist/desk-kit.js

@@ -121,9 +121,9 @@ import {
   visibleRect,
   worldBounds,
   writeChanged
-} from "./chunk-BH5AFWJX.js";
+} from "./chunk-VZEZ7CYW.js";
 import "./chunk-RTBW5AIZ.js";
-import "./chunk-Y7K6CHSF.js";
+import "./chunk-LAZIY3J7.js";
 import "./chunk-RE4GDHFJ.js";
 export {
   BLOB_STORE,

package/dist/desk-objects.js

@@ -8,7 +8,7 @@ import {
   rasterPriority,
   stringProp,
   writable
-} from "./chunk-REJTEK3V.js";
+} from "./chunk-M2HUDENL.js";
 import "./chunk-BKV4ZEU3.js";
 import {
   compile,
@@ -110,7 +110,7 @@ import {
   unproject,
   worldBounds,
   writeChanged
-} from "./chunk-BH5AFWJX.js";
+} from "./chunk-VZEZ7CYW.js";
 import {
   bindGroup,
   bindLayout,
@@ -129,6 +129,7 @@ import {
   Down,
   DownPart,
   Drag,
+  Drags,
   Editing,
   GestureActive,
   GestureCancelled,
@@ -142,6 +143,7 @@ import {
   HeldTool,
   LocalPointer,
   Locked,
+  MovesSelection,
   Pointer,
   PointerButtons,
   PointerPart,
@@ -151,6 +153,7 @@ import {
   Position,
   PrefabId,
   PressWheel,
+  RoutedMove,
   Size,
   TouchesExact,
   TransformTween,
@@ -170,7 +173,7 @@ import {
   setWidgetProps,
   tools,
   trayOpen
-} from "./chunk-Y7K6CHSF.js";
+} from "./chunk-LAZIY3J7.js";
 import {
   clientToScreen
 } from "./chunk-RE4GDHFJ.js";
@@ -10820,8 +10823,8 @@ var CAST = MAT_COLORS.cast;
 var PHOTO_SPEC = {
   /** The print's long side — a 6×4 at the note's scale. */
   long: 400,
-  /** The white border, as a fraction of the short side (a classic bordered print). 0 = borderless. */
-  border: 0.05,
+  /** Optional host styling, as a fraction of the short side. Images fill the sheet by default. */
+  border: 0,
   /** The die-cut corner. */
   radius: 2.5,
   /** The paper under the emulsion: a resin-coated white, a touch warm (sRGB), and its fibre ±/255. */
@@ -12230,7 +12233,7 @@ function photoKind(opts = {}) {
     },
     record(G, ctx) {
       const { w, h } = extentOf(ctx);
-      const border = borderOf(w / 2, h / 2, { ...law, border: numberProp(ctx.props, "border", law.border) });
+      const border = borderOf(w / 2, h / 2, law);
       const prints = ctx.local;
       const picture = prints?.pictureFor(ctx.entity, stringProp(ctx.props, "blob", ""), numberProp(ctx.props, "width", 0), numberProp(ctx.props, "height", 0)) ?? null;
       return { geometry: G, border, picture };
@@ -12250,11 +12253,13 @@ function printRect(cx, cy, width, height, long = PHOTO.long) {
 
 // ../objects/src/photo/carry.ts
 var pointersQ5 = defineQuery([Pointer, LocalPointer, PointerWorld, PointerButtons]);
+var coreMovesQ = defineQuery([Drag, RoutedMove, GestureActive]);
 var TWIST_PER_WHEEL = 35e-4;
 function createPhotoCarry(opts) {
   const { world, docs } = opts;
   const defer = opts.defer ?? ((fn) => queueMicrotask(fn));
   const held = /* @__PURE__ */ new Set();
+  const coreMoves = /* @__PURE__ */ new Set();
   const refusing = /* @__PURE__ */ new Set();
   const wheel = /* @__PURE__ */ new Map();
   let cancelStamp = world.resourceStamp(CancelRequest);
@@ -12282,7 +12287,26 @@ function createPhotoCarry(opts) {
     follow(now) {
       const prints = opts.prints();
       if (prints === void 0) return;
-      for (const r of prints.rests()) defer(() => prints.settle(r.entity, commit(r.entity, r.x, r.y, r.angle)));
+      for (const rec of coreMoves) if (!world.isAlive(rec) || !world.hasTag(rec, GestureActive)) coreMoves.delete(rec);
+      world.query(coreMovesQ).each((b) => {
+        for (const row of b) {
+          const rec = b.entity(row);
+          if (coreMoves.has(rec)) continue;
+          coreMoves.add(rec);
+          for (const e of world.getRelations(rec, Drags)) {
+            if (!opts.isPrint(e)) continue;
+            prints.settle(e, false);
+            held.delete(e);
+            wheel.delete(e);
+          }
+        }
+      });
+      for (const r of prints.rests()) {
+        if (world.has(r.entity, Grab)) continue;
+        defer(() => {
+          if (!world.has(r.entity, Grab)) prints.settle(r.entity, commit(r.entity, r.x, r.y, r.angle));
+        });
+      }
       const stamp = world.resourceStamp(CancelRequest);
       const cancelled = stamp !== cancelStamp;
       cancelStamp = stamp;
@@ -12293,7 +12317,9 @@ function createPhotoCarry(opts) {
         for (const row of b) {
           const p2 = b.entity(row);
           if ((world.read(p2, PointerButtons).buttons & 1) === 0) continue;
-          for (const rec of world.getReverse(p2, Watches)) {
+          const watchers = world.getReverse(p2, Watches);
+          if (watchers.some((rec) => (world.hasTag(rec, MovesSelection) || world.hasTag(rec, RoutedMove)) && !world.hasTag(rec, GestureCancelled) && !world.hasTag(rec, GestureFailed) && !world.hasTag(rec, GestureEnded))) continue;
+          for (const rec of watchers) {
             if (world.hasTag(rec, GestureCancelled) || world.hasTag(rec, GestureFailed) || world.hasTag(rec, GestureEnded)) continue;
             const e = world.getRelation(rec, Captures);
             if (e === void 0 || hands.has(e) || !world.isAlive(e) || !opts.isPrint(e)) continue;
@@ -12357,16 +12383,15 @@ var Photo2 = defineObject({
     blob: p.string({ default: "" }),
     width: p.number({ default: 0 }),
     height: p.number({ default: 0 }),
+    // Legacy saved field: presentation follows the kind's law, borderless by default.
     border: p.number({ default: PHOTO.border }),
     angle: p.number({ default: 0 })
   },
   size: { w: printExtent(0, 0).w, h: printExtent(0, 0).h },
   kind: photoKind(),
-  // on the pegboard tray (design-017 §8): a print, clipped
-  // …showing the kind's sample picture (K5b, D-K5b.4) through its own pictures (`local`); one taken is blank — it asks for a picture
-  tray: { label: "Print", category: "paper", order: 1, props: { blob: SAMPLE_PICTURE, width: SAMPLE_SIZE.w, height: SAMPLE_SIZE.h }, local: true, hang: { w: 150, h: 100, accessory: "clip", pegs: [[0, -0.5]] } },
+  // Created from an image (paste, drop, or a host's card), never as a blank tray specimen.
   // the wheel TURNS a print held in a hand (PHOTO.md; D3t-a — core cedes that pointer's wheel to it, `PressWheel`)
-  interaction: { selectable: true, movable: false, resizable: false, snap: "both", wheelTurns: true },
+  interaction: { selectable: true, movable: "selection", resizable: false, snap: "both", wheelTurns: true },
   // it lies on the desk by what it provides (K8a — `DESK_OBJECT`, the desk canvas's one key), as a plugin kind does
   provides: [PHOTO_TYPE, DESK_OBJECT],
   // the prints' CARRY (D3w): the hands onto the photo kind's bodies, each rest ONE transaction out of the frame (D-D7-A.3)
@@ -12380,7 +12405,7 @@ function builtin(id) {
   if (tool === void 0) throw new Error(`desk: missing built-in tool ${id}`);
   return tool;
 }
-var deskSelect = defineTool({ id: "desk.select", shortcut: "v", route: { canvasDrag: "pan", canvasDragShift: "marquee" } });
+var deskSelect = defineTool({ id: "desk.select", shortcut: "v", route: { canvasDrag: "marquee" } });
 var DESK_TOOLS = [builtin("select"), deskSelect, builtin("pan")];
 var DeskCanvas = defineCanvasType({
   id: "desk.desk",
@@ -12397,7 +12422,13 @@ var DESK_ENGINE = {
   canvasTypes: [DeskCanvas],
   rootCanvas: DeskCanvas,
   presentationFallback: DeskCanvas,
-  settings: { zoom: { min: ZOOM_MIN, max: ZOOM_MAX }, gestures: { wheel: "zoom" }, nav: { zoomThrough: { enabled: true } } }
+  settings: {
+    zoom: { min: ZOOM_MIN, max: ZOOM_MAX },
+    // Chromium encodes native pinch scale as deltaY = -100 * log(scale).
+    // exp(-deltaY * 0.01) restores that scale without damping the macOS gesture.
+    gestures: { wheel: "pan", wheelZoomCurve: "exponential", wheelZoomRate: 0.01 },
+    nav: { zoomThrough: { enabled: true } }
+  }
 };
 
 // ../objects/src/palette.ts