Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] auto-complete: hide auto-complete when selecting a cell #4987

Open
wants to merge 1 commit into
base: saas-17.4
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
import { AutoCompleteProposal, AutoCompleteProvider } from "../../../registries";
import { Get } from "../../../store_engine";
import { SpreadsheetStore } from "../../../stores";

export class AutoCompleteStore extends SpreadsheetStore {
mutators = ["useProvider", "moveSelection", "hide", "selectIndex"] as const;
selectedIndex: number | undefined = undefined;
provider: AutoCompleteProvider | undefined;

constructor(get: Get) {
super(get);
this.model.selection.observe(this, {
handleEvent: () => this.hide(),
});
this.onDispose(() => this.model.selection.stopWatching(this));
}

get selectedProposal(): AutoCompleteProposal | undefined {
if (this.selectedIndex === undefined || this.provider === undefined) {
return undefined;
Expand Down
4 changes: 4 additions & 0 deletions src/selection_stream/event_stream.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ export class EventStream<Event> {
this.observers.set(owner, { owner, callbacks });
}

stopWatching(owner: Owner) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:'(

this.observers.delete(owner);
}

/**
* Capture the stream for yourself
*/
Expand Down
5 changes: 5 additions & 0 deletions src/selection_stream/selection_stream_processor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ type StatefulStream<Event, State> = {
resetDefaultAnchor: (owner: unknown, state: State) => void;
resetAnchor: (owner: unknown, state: State) => void;
observe: (owner: unknown, callbacks: StreamCallbacks<Event>) => void;
stopWatching: (owner: unknown) => void;
release: (owner: unknown) => void;
getBackToDefault(): void;
};
Expand Down Expand Up @@ -114,6 +115,10 @@ export class SelectionStreamProcessorImpl implements SelectionStreamProcessor {
this.stream.observe(owner, callbacks);
}

stopWatching(owner: unknown) {
this.stream.stopWatching(owner);
}

release(owner: unknown) {
if (this.stream.isListening(owner)) {
this.stream.release(owner);
Expand Down
20 changes: 20 additions & 0 deletions tests/composer/composer_integration_component.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import {
import {
getActivePosition,
getActiveSheetFullScrollInfo,
getCell,
getCellContent,
getCellText,
getSelectionAnchorCellXc,
Expand All @@ -50,6 +51,7 @@ import {
typeInComposerGrid as typeInComposerGridHelper,
typeInComposerTopBar as typeInComposerTopBarHelper,
} from "../test_helpers/helpers";
import { addPivot } from "../test_helpers/pivot_helpers";

jest.mock("../../src/components/composer/content_editable_helper.ts", () =>
require("../__mocks__/content_editable_helper")
Expand Down Expand Up @@ -154,6 +156,24 @@ describe("Composer interactions", () => {
expect(fixture.querySelector(".o-grid .o-autocomplete-dropdown")).toBeNull();
});

test("autocomplete disappear when selecting a cell in the grid", async () => {
setCellContent(model, "B1", "Customer");
setCellContent(model, "B2", "Alice");

addPivot(model, "B1:B2", {
columns: [],
rows: [],
measures: [{ name: "Customer", aggregator: "count" }],
});
await keyDown({ key: "Enter" });
await typeInComposerGrid("=PIVOT(");
expect(fixture.querySelector(".o-grid .o-autocomplete-dropdown")).not.toBeNull();
await clickCell(model, "B3");
expect(fixture.querySelector(".o-grid .o-autocomplete-dropdown")).toBeNull();
await keyDown({ key: "Enter" });
expect(getCell(model, "A1")?.content).toBe("=PIVOT(B3)");
});

test("focus top bar composer does not resize grid composer when autocomplete is displayed", async () => {
await keyDown({ key: "Enter" });
const topBarComposer = document.querySelector(".o-spreadsheet-topbar .o-composer")!;
Expand Down