Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2025-06-13 20:53:59 +00:00
Code Issues Projects Releases Wiki Activity

lint

Browse Source
This commit is contained in:
Janet Vorobyeva 2023-09-19 00:11:23 -07:00
parent d3800564d8
commit 46456fd439
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,8 +136,8 @@ export class Cursor extends Disposable {
// For determining priority, this cursor will become the latest edited whether we call it once or twice.
// For updating observables, the double-update might cause cursor-linking observables in LinkingState to
// double-update, but it should be transient and get resolved immediately.
this.autoDispose(this._properRowId.subscribe(() => { this.cursorEdited(); }));
this.autoDispose(this.fieldIndex.subscribe(() => { this.cursorEdited(); }));
this.autoDispose(this._properRowId.subscribe(() => { this._cursorEdited(); }));
this.autoDispose(this.fieldIndex.subscribe(() => { this._cursorEdited(); }));
// On dispose, save the current cursor position to the section model.
this.onDispose(() => { baseView.viewSection.lastCursorPos = this.getCursorPos(); });
@ -183,7 +183,7 @@ export class Cursor extends Disposable {
this.fieldIndex(cursorPos.fieldIndex);
}
// NOTE: cursorEdited
// NOTE: _cursorEdited
// We primarily update cursorEdited counter from a this._properRowId.subscribe(), since that catches updates
// from many sources (setCursorPos, arrowKeys, save/load, filter/sort-changes, etc)
// However, when deleting a row with several sections linked together, there can be a case where this fails:
@ -192,7 +192,7 @@ export class Cursor extends Disposable {
// This caused a bug when several viewSections were cursor-linked to each other and a row was deleted.
// We can explicitly call cursorEdited again here. It'll cause cursorEdited to be called twice sometimes,
// but that shouldn't cause any problems, since we don't care about edit counts, just who was edited latest.
this.cursorEdited()
this._cursorEdited();
} finally { // Make sure we reset this even on error
this._silentUpdatesFlag = false;
@ -211,7 +211,7 @@ export class Cursor extends Disposable {
// _EXCEPT FOR: when cursor is set by linking
// this is used to determine which widget/cursor has most recently been touched,
// and therefore which one should be used to drive linking if there's a conflict
private cursorEdited(): void {
private _cursorEdited(): void {
// If updating as a result of links, we want to NOT update lastEdited
if (!this._silentUpdatesFlag)
{ this._lastEditedAt(nextSequenceNum()); }

4
app/client/ui/selectBy.ts
View File

@ -163,8 +163,8 @@ function isValidLink(source: LinkNode, target: LinkNode) {
// they would stop being ancestors of src)
// NOTE: we're guaranteed to hit target before the end of the array (because of the `if(...includes...)` above)
// ALSO NOTE: isAncestorSameTableCursorLink may be 1 shorter than ancestors, but it's accounted for by the above
let i = 0
while(true) {
let i = 0;
for (;;) {
if (source.ancestors[i] == target.section.getRowId()) {
// We made it! All is well
break;