spreadsheet ui

frontend/test/arthur/domain/lane_test.cljs

@@ -42,6 +42,37 @@
       :wave (assoc-in (drawing :wave 0 10) [:nodes :mark :channels [:xform :pos]]
                       (ch/keyed {0 [0 0] 9 [900 0]} :linear))}}))
 
+(deftest sheet-copy-clips-without-resetting-source-or-local-keys
+  (let [doc (document)
+        payload (lane/sheet-range doc :main [:girl] [9 11])
+        copied (first (first (:columns payload)))
+        result (lane/paste-range doc :main [:girl] 1 payload random-uuid)
+        nodes (get-in (:clip result) [:symbols :main :nodes])
+        pasted (first (filter #(and (= :wave (node/source %))
+                                   (= [1 3] (node/placed-span %))) (vals nodes)))]
+    (is (= 2 (:duration payload)))
+    (is (= [1 3] (:span copied)))
+    (is (= (:playback copied) (:playback pasted)))
+    (is (= [1 3] (:span pasted)))
+    (is (= :wave (node/source pasted)))
+    (is (empty? (clip/problems (:clip result))))
+    (is (= [0 1] (node/placed-span (:a nodes))))
+    (is (some #(= [3 4] (node/placed-span %)) (vals nodes)))))
+
+(deftest sheet-paste-preserves-gaps-and-refuses-overflow-and-incompatible-clocks
+  (let [doc (document)
+        gap (:clip (lane/blank doc :main :girl [1 3] {:id :remainder}))
+        payload (lane/sheet-range gap :main [:girl] [0 4])
+        result (lane/paste-range gap :main [:girl] 4 payload random-uuid)
+        cels (symbol/lane-cels (get-in (:clip result) [:symbols :main :nodes]) :girl)]
+    (is (empty? (clip/problems (:clip result))))
+    (is (not-any? #(let [[a b] (node/placed-span %)] (and (< a 7) (> b 5))) cels))
+    (is (:refused (lane/paste-range doc :main [:girl] 10 payload random-uuid)))
+    (is (:refused (lane/paste-range doc :main [] 0 payload random-uuid)))
+    (is (:refused (lane/sheet-range
+                  (assoc-in doc [:symbols :main :nodes :girl :time] {:rate 2})
+                  :main [:girl] [0 4])))))
+
 (defn sample [doc fs]
   (let [r (clip/resolver doc :main nil pal/index-of nil)]
     (into {} (map (fn [f] [f (into {} (map (juxt :node :cx)) (r f))])) fs)))

frontend/test/browser/lane.mjs

@@ -75,7 +75,7 @@ try {
   // its `aria-label`, which is also what a screen reader is told it is.
   // Two bars carry commands: the location bar says where an edit lands and holds
   // what creates things there, the transport strip holds what acts on a cel.
-  const bars = ['.loc', '.pane.time .pane-head'];
+  const bars = ['.loc', '.pane.time .pane-head', '.section'];
   const within = (suffix) => bars.map((b) => `${b} ${suffix}`).join(', ');
   const named = label =>
     `(b => b.textContent.trim() === ${JSON.stringify(label)}` +
@@ -113,7 +113,10 @@ try {
     await sleep(180);
     await shut();
   };
-  const shot = async () => (await evaluate('laneSnapshot()'));
+  // UUIDs expose a mutable hash cache through clj->js; compare their identity,
+  // not that implementation detail, when asserting exact undo restoration.
+  const shot = async () => JSON.parse(JSON.stringify(await evaluate('laneSnapshot()'),
+    (_key, value) => value?.uuid ?? value));
   const instances = s => Object.values(s.clip.symbols.main.nodes).filter(n => n.kind === 'instance')
     .sort((a, b) => a.time.at - b.time.at);
   await click('lane');
@@ -285,7 +288,7 @@ try {
   // only appears once a sheet has more than one lane.
   await click('timeline');
   assert.equal(await evaluate('document.querySelectorAll(".tl-cel").length'), 5);
-  await click('+ lane');
+  await click('lane');
   await click('cel sheet');
   assert.equal(await evaluate('document.querySelectorAll(".cs-head:not(.cs-frame)").length'), 2);
   await evaluate(`([...document.querySelectorAll('.cs-cell')].slice(0, 2)
@@ -301,6 +304,76 @@ try {
     'clicking a gap selects that column before overwrite');
   assert.equal(s.history.done.length, before.history.done.length + 12,
     'correction, lane creation, and overwrite are separate undo steps');
+  // Real pointer capture and keyboard events exercise the spreadsheet surface.
+  const cellAt = async (c, f) => evaluate(`(() => {
+    const el = document.querySelector('[data-cs-col="${c}"][data-cs-frame="${f}"]');
+    el.scrollIntoView({block: 'center'});
+    const r = el.getBoundingClientRect();
+    return {x: r.x + r.width / 2, y: r.y + r.height / 2};
+  })()`);
+  const mouse = (type, p) => send('Input.dispatchMouseEvent', {
+    type, ...p, button: 'left', buttons: type === 'mouseReleased' ? 0 : 1, clickCount: 1,
+  });
+  const key = async (key, extra = {}) => {
+    await send('Input.dispatchKeyEvent', {type: 'keyDown', key, ...extra});
+    await send('Input.dispatchKeyEvent', {type: 'keyUp', key, ...extra});
+    await sleep(120);
+  };
+  const start = await cellAt(0, 0);
+  await mouse('mousePressed', start);
+  await mouse('mouseMoved', await cellAt(1, 2));
+  await mouse('mouseReleased', await cellAt(1, 2));
+  await sleep(150);
+  assert.equal(await evaluate('document.querySelectorAll(".cs-cell.selected").length'), 6);
+  await key('c', {modifiers: 2});
+  const dest = await cellAt(0, 10);
+  await mouse('mousePressed', dest);
+  await mouse('mouseReleased', dest);
+  await sleep(120);
+  const beforePaste = await shot();
+  await key('v', {modifiers: 2});
+  const pasted = await shot();
+  assert.equal(pasted.history.done.length, beforePaste.history.done.length + 1,
+    'multi-lane paste is one undo step');
+  assert.deepEqual(Object.keys(pasted.clip.symbols), Object.keys(beforePaste.clip.symbols),
+    'copy reuses the drawings');
+  await key('z', {modifiers: 2});
+  assert.deepEqual((await shot()).clip, beforePaste.clip, 'undo restores the entire rectangle');
+  await key('ArrowDown', {modifiers: 8});
+  assert.equal(await evaluate('document.querySelectorAll(".cs-cell.selected").length'), 2);
+  const first = await cellAt(0, 0);
+  await mouse('mousePressed', first);
+  await mouse('mouseReleased', first);
+  await sleep(150);
+  const handle = await evaluate(`(() => {
+    const r = document.querySelector('.cs-fill-handle').getBoundingClientRect();
+    return {x: r.x + r.width / 2, y: r.y + r.height / 2};
+  })()`);
+  const beforeHold = await shot();
+  await mouse('mousePressed', handle);
+  await mouse('mouseMoved', await cellAt(0, 4));
+  await mouse('mouseReleased', await cellAt(0, 4));
+  await sleep(150);
+  const afterHold = await shot();
+  assert.equal(afterHold.history.done.length, beforeHold.history.done.length + 1,
+    'a hold drag commits once');
+  assert.equal(instances(afterHold).filter(n => {
+    const old = instances(beforeHold).find(o => o.id === n.id);
+    return old && n.span[1] !== old.span[1] && n.time.at + n.span[1] === 5;
+  }).length, 1, 'the dragged hold ends at the previewed boundary');
+  await key('z', {modifiers: 2});
+  assert.deepEqual((await shot()).clip, beforeHold.clip);
+  await key('Delete');
+  const cleared = await shot();
+  assert.equal(cleared.history.done.length, beforeHold.history.done.length + 1,
+    'Delete clears selected frames in one step, without the global node-delete handler');
+  assert.equal(cleared.clip.symbols.main.frames, beforeHold.clip.symbols.main.frames);
+  await key('z', {modifiers: 2});
+  assert.deepEqual((await shot()).clip, beforeHold.clip);
+  await key('x', {modifiers: 2});
+  assert.equal((await shot()).history.done.length, beforeHold.history.done.length + 1);
+  await key('z', {modifiers: 2});
+  assert.deepEqual((await shot()).clip, beforeHold.clip, 'cut is independently undoable');
   assert.equal(errors.length, 0, JSON.stringify(errors));
   console.log('PASS: lane commands and corrections agree from timeline and cel sheet; no server writes');
 } finally {