Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-10-27 20:44:07 +00:00
Code Issues Projects Releases Wiki Activity

Renaming / comments

Browse Source 
Also removed cursorPos null tweak
This commit is contained in:
Janet Vorobyeva 2023-09-12 02:27:01 -07:00
parent ae91384f8b
commit 4dae0a5d17
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/client/components/BaseView.js
View File

@ -131,8 +131,8 @@ function BaseView(gristDoc, viewSectionModel, options) {
// Update the cursor whenever linkedRowId() changes (but only if we have any linking). // Update the cursor whenever linkedRowId() changes (but only if we have any linking).
this.autoDispose(this.linkedRowId.subscribe(rowId => { this.autoDispose(this.linkedRowId.subscribe(rowId => {
if (this.viewSection.linkingState.peek() && rowId != null) { //TODO JV: used to be that null meant "new", now it means "no cursor linking" if (this.viewSection.linkingState.peek()) {
this.setCursorPos({rowId: rowId || 'new'}, true); //true b/c not a user-edit (caused by linking) this.setCursorPos({rowId: rowId || 'new'}, true);
} }
})); }));
@ -282,14 +282,14 @@ BaseView.prototype.deleteRecords = function(source) {
/** /**
* Sets the cursor to the given position, deferring if necessary until the current query finishes * Sets the cursor to the given position, deferring if necessary until the current query finishes
* loading. silentUpdate will be set if updating as a result of cursor linking(see Cursor.setCursorPos for info) * loading. isFromLink will be set when called as result of cursor linking(see Cursor.setCursorPos for info)
*/ */
BaseView.prototype.setCursorPos = function(cursorPos, silentUpdate = false) { BaseView.prototype.setCursorPos = function(cursorPos, isFromLink = false) {
if (this.isDisposed()) { if (this.isDisposed()) {
return; return;
} }
if (!this._isLoading.peek()) { if (!this._isLoading.peek()) {
this.cursor.setCursorPos(cursorPos, silentUpdate); this.cursor.setCursorPos(cursorPos, isFromLink);
} else { } else {
// This is the first step; the second happens in onTableLoaded. // This is the first step; the second happens in onTableLoaded.
this._pendingCursorPos = cursorPos; this._pendingCursorPos = cursorPos;

18
app/client/components/Cursor.ts
View File

@ -77,12 +77,14 @@ export class Cursor extends Disposable {
private _sectionId: ko.Computed<number>; private _sectionId: ko.Computed<number>;
private _properRowId: ko.Computed<UIRowId|null>; private _properRowId: ko.Computed<UIRowId|null>;
private _lastEditedAt: ko.Observable<SequenceNum>;
// lastEditedAt is updated on _properRowId or fieldIndex update (including through setCursorPos)
// Used to determine which section takes priority for cursorLinking (specifically cycles/bidirectional linking)
private _lastEditedAt: ko.Observable<SequenceNum>;
// _silentUpdatesFlag prevents lastEditedAt from being updated, when a change in cursorPos isn't driven by the user.
// It's used when cursor linking calls setCursorPos, so that linked cursor moves don't trample lastEditedAt.
// WARNING: the flag approach relies on ko observables being resolved synchronously, may break if changed to grainjs?
private _silentUpdatesFlag: boolean = false; private _silentUpdatesFlag: boolean = false;
// lastEditedAt is updated on rowIndex or fieldIndex update (including through setCursorPos)
// _silentUpdatesFlag disables this, set when setCursorPos called from cursor link to prevent infinite loops
// WARNING: the flag approach will only work if ko observables work synchronously, which they appear to do.
constructor(baseView: BaseView, optCursorPos?: CursorPos) { constructor(baseView: BaseView, optCursorPos?: CursorPos) {
super(); super();
@ -149,13 +151,13 @@ export class Cursor extends Disposable {
* Moves the cursor to the given position. Only moves the row if rowId or rowIndex is valid, * Moves the cursor to the given position. Only moves the row if rowId or rowIndex is valid,
* preferring rowId. * preferring rowId.
* *
* silentUpdate prevents lastEditedAt from being updated, so linking doesn't cause an infinite loop of updates * isFromLink prevents lastEditedAt from being updated, so lastEdit reflects only user-driven edits
* @param cursorPos: Position as { rowId?, rowIndex?, fieldIndex? }, as from getCursorPos(). * @param cursorPos: Position as { rowId?, rowIndex?, fieldIndex? }, as from getCursorPos().
* @param silentUpdate: should only be set if this is a cascading update from cursor-linking * @param isFromLink: should be set if this is a cascading update from cursor-linking
*/ */
public setCursorPos(cursorPos: CursorPos, silentUpdate: boolean = false): void { public setCursorPos(cursorPos: CursorPos, isFromLink: boolean = false): void {
//If updating as a result of links, we want to NOT update lastEditedAt //If updating as a result of links, we want to NOT update lastEditedAt
if(silentUpdate) { this._silentUpdatesFlag = true; } if(isFromLink) { this._silentUpdatesFlag = true; }
//console.log(`CURSOR: ${silentUpdate}, silentUpdate=${this._silentUpdatesFlag}, //console.log(`CURSOR: ${silentUpdate}, silentUpdate=${this._silentUpdatesFlag},
// lastUpdated = ${this.lastUpdated.peek()}`) //TODO JV DEBUG TEMP // lastUpdated = ${this.lastUpdated.peek()}`) //TODO JV DEBUG TEMP