mirror of
https://github.com/gristlabs/grist-core.git
synced 2026-03-02 04:09:24 +00:00
(core) Fix some bugs with repositioning rows.
Summary: - Fixed an issue with manualSort values being very close floats. It is already handled by the data engine, but the client was being unnecessarily proactive and introduced a bug. - The fix also helps with rearranging rows in filtered situations: they will now stay next to the row before which they were inserted. - The fix accidentally improves (though doesn't fully fix) the issue where new columns show up in unexpected places in the raw-data column list. - Fixed another rare bug with row order not getting updated correctly when positions update. Test Plan: Added test cases for the improved behavior; fixed affected tests. Reviewers: georgegevoian Reviewed By: georgegevoian Differential Revision: https://phab.getgrist.com/D3462
This commit is contained in:
@@ -12,7 +12,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
import { insertPositions } from "app/client/lib/tableUtil";
|
||||
import { BulkColValues, UserAction } from "app/common/DocActions";
|
||||
import { nativeCompare } from "app/common/gutil";
|
||||
import { obsArray, ObsArray } from "grainjs";
|
||||
@@ -155,24 +154,21 @@ export class TreeNodeRecord implements TreeNode {
|
||||
const indentations = records.map((rec, i) => rec.indentation + indent - records[0].indentation);
|
||||
|
||||
// adjust positions
|
||||
let upperPos, lowerPos: number|null;
|
||||
let upperPos: number|null;
|
||||
if (nextChild) {
|
||||
const index = nextChild.index;
|
||||
upperPos = this._records[index].pagePos;
|
||||
lowerPos = index ? this._records[index - 1].pagePos : null;
|
||||
} else {
|
||||
const lastIndex = this.findLastIndex();
|
||||
if (lastIndex !== "root") {
|
||||
upperPos = (this._records[lastIndex + 1] || {pagePos: null}).pagePos;
|
||||
lowerPos = this._records[lastIndex].pagePos;
|
||||
} else {
|
||||
upperPos = lowerPos = null;
|
||||
upperPos = null;
|
||||
}
|
||||
}
|
||||
const positions = insertPositions(lowerPos, upperPos, records.length);
|
||||
|
||||
// do update
|
||||
const update = records.map((rec, i) => ({...rec, indentation: indentations[i], pagePos: positions[i]}));
|
||||
const update = records.map((rec, i) => ({...rec, indentation: indentations[i], pagePos: upperPos!}));
|
||||
await this.sendActions({update});
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user