From 6f7df4f08d002e81ef5bb75bfd93919f73baf03e Mon Sep 17 00:00:00 2001
From: yile <wannengxin@gmail.com>
Date: Fri, 30 Jun 2023 21:50:32 +0800
Subject: [PATCH] Fixed a bug when transform op the r component is always true

---
 lib/json1.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/json1.ts b/lib/json1.ts
index 98c02bf..1fb7f3c 100644
--- a/lib/json1.ts
+++ b/lib/json1.ts
@@ -2063,7 +2063,7 @@ function tryTransform(op1: JSONOp, op2: JSONOp, direction: 'left' | 'right'): {
         // Copy the remove from op1.
         if (!removed2) {
           log('copying remove')
-          w.write('r', true) //c1.r
+          w.write('r', c1.r) //c1.r
         }
 
         if (removed2 || iAmMoved) {
@@ -2606,7 +2606,7 @@ function tryTransform(op1: JSONOp, op2: JSONOp, direction: 'left' | 'right'): {
     eachDrop(r2, w, (slot2, r, w) => {
       if (cancelledOp2[slot2] && !discardedOp2Drop[slot2]) {
         log('removing at held drop2', slot2)
-        w.write('r', true)
+        w.write('r', heldPickWrites[slot2]?.getComponent().r ?? true)
       }
 
       if (heldPickWrites[slot2]) {