Correctly account for modified rows that shifted in the current delta (…

…#1564) Fixes #1554
deephaven · Nov 16, 2021 · b46f3f2 · b46f3f2
1 parent 53f9df8
commit b46f3f2
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/ViewportData.java b/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/ViewportData.java
@@ -492,11 +492,11 @@ public MergeResults merge(DeltaUpdates updates) {
             }
         }
 
-        for (Iterator<Integer> it = updated.modified.iterator(); it.hasNext();) {
-            int ii = it.next();
-            updated.added.remove(ii);
-            updated.removed.remove(ii);
-        }
+        // exclude added items from being marked as modified, since we're hiding shifts from api consumers
+        updated.modified.removeAll(updated.added);
+
+        // Any position which was both added and removed should instead be marked as modified, this cleans
+        // up anything excluded above that didn't otherwise make sense
         for (Iterator<Integer> it = updated.removed.iterator(); it.hasNext();) {
             int ii = it.next();
             if (updated.added.remove(ii)) {