Skip to content

Commit 19767f7

Browse files
committed
fix(reconcileDiffs): Don't throw away REORDERs if concurrent reorder is empty
Signed-off-by: Marcel Klehr <[email protected]>
1 parent 9f7b988 commit 19767f7

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/lib/strategies/Default.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ export default class SyncProcess {
856856

857857
if (targetLocation !== this.masterLocation) {
858858
const concurrentReorder = targetReorders.find(a =>
859-
action.payload.type === a.payload.type && Mappings.mappable(mappingsSnapshot, action.payload, a.payload))
859+
action.payload.type === a.payload.type && Mappings.mappable(mappingsSnapshot, action.payload, a.payload) && a.order.length > 0)
860860
if (concurrentReorder) {
861861
return
862862
}

src/lib/strategies/Merge.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ export default class MergeSyncProcess extends DefaultSyncProcess {
194194

195195
if (targetLocation !== this.masterLocation) {
196196
const concurrentReorder = targetReorders.find(a =>
197-
action.payload.type === a.payload.type && Mappings.mappable(mappingsSnapshot, action.payload, a.payload))
197+
action.payload.type === a.payload.type && Mappings.mappable(mappingsSnapshot, action.payload, a.payload) && a.order.length > 0)
198198
if (concurrentReorder) {
199199
return
200200
}

0 commit comments

Comments
 (0)