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

(core) Fixing bug with the import preview being not responsive

Browse Source 
Summary: Fixing the bug by setting viewInstance on the temp viewsection record

Test Plan: Added

Reviewers: dsagal

Reviewed By: dsagal

Subscribers: dsagal

Differential Revision: https://phab.getgrist.com/D3848
This commit is contained in:
Jarosław Sadziński 2023-04-04 09:51:34 +02:00
parent 5730262c69
commit 7aa83858bd
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/client/components/GristDoc.ts
View File

@ -393,7 +393,16 @@ export class GristDoc extends DisposableWithEvents {
})); }));
// Importer takes a function for creating previews. // Importer takes a function for creating previews.
const createPreview = (vs: ViewSectionRec) => GridView.create(this, vs, true); const createPreview = (vs: ViewSectionRec) => {
const preview = GridView.create(this, vs, true);
// We need to set the instance to the newly created section. This is important, as
// GristDoc is responsible for changing the cursor position not the cursor itself. Final
// cursor position is determined by finding active (or visible) section and passing this
// command (setCursor) to its instance.
vs.viewInstance(preview);
preview.autoDisposeCallback(() => vs.viewInstance(null));
return preview;
};
const importSourceElems = ImportSourceElement.fromArray(this.docPluginManager.pluginsList); const importSourceElems = ImportSourceElement.fromArray(this.docPluginManager.pluginsList);
const importMenuItems = [ const importMenuItems = [
@ -593,6 +602,16 @@ export class GristDoc extends DisposableWithEvents {
public async setCursorPos(cursorPos: CursorPos) { public async setCursorPos(cursorPos: CursorPos) {
if (cursorPos.sectionId && cursorPos.sectionId !== this.externalSectionId.get()) { if (cursorPos.sectionId && cursorPos.sectionId !== this.externalSectionId.get()) {
const desiredSection: ViewSectionRec = this.docModel.viewSections.getRowModel(cursorPos.sectionId); const desiredSection: ViewSectionRec = this.docModel.viewSections.getRowModel(cursorPos.sectionId);
// If this is completely unknown section (without a parent), it is probably an import preview.
if (!desiredSection.parentId.peek() && !desiredSection.isRaw.peek()) {
const view = desiredSection.viewInstance.peek();
// Make sure we have a view instance here - it will prove our assumption that this is
// an import preview. Section might also be disconnected during undo/redo.
if (view && !view.isDisposed()) {
view.setCursorPos(cursorPos);
return;
}
}
if (desiredSection.view.peek().getRowId() !== this.activeViewId.get()) { if (desiredSection.view.peek().getRowId() !== this.activeViewId.get()) {
// This may be asynchronous. In other cases, the change is synchronous, and some code // This may be asynchronous. In other cases, the change is synchronous, and some code
// relies on it (doesn't wait for this function to resolve). // relies on it (doesn't wait for this function to resolve).

5
test/nbrowser/gristUtils.ts
View File

@ -248,6 +248,7 @@ export async function expandSection(title?: string) {
? driver.findContent(`.test-viewsection-title`, exactMatch(title)).findClosest(".viewsection_title") ? driver.findContent(`.test-viewsection-title`, exactMatch(title)).findClosest(".viewsection_title")
: driver.find(".active_section"); : driver.find(".active_section");
await select.find(".test-section-menu-expandSection").click(); await select.find(".test-section-menu-expandSection").click();
await driver.findWait('.test-viewLayout-overlay .test-close-button', 500);
} }
export async function getSectionId() { export async function getSectionId() {
@ -541,9 +542,9 @@ export async function rightClick(cell: WebElement) {
* section. RowNum is a 1-based number as in the row headers, and col is a 0-based index for * section. RowNum is a 1-based number as in the row headers, and col is a 0-based index for
* grid view or field name for detail view. * grid view or field name for detail view.
*/ */
export async function getCursorPosition() { export async function getCursorPosition(section?: WebElement) {
return await retryOnStale(async () => { return await retryOnStale(async () => {
const section = await driver.findWait('.active_section', 4000); section = section ?? await driver.findWait('.active_section', 4000);
const cursor = await section.findWait('.active_cursor', 1000); const cursor = await section.findWait('.active_cursor', 1000);
// Query assuming the cursor is in a GridView and a DetailView, then use whichever query data // Query assuming the cursor is in a GridView and a DetailView, then use whichever query data
// works out. // works out.