Skip to content

[FW][FIX] selection input: highlight color not sync with range color #5811

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.

Sign up for GitHub

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

Closed
fw-bot wants to merge 1 commit into from
Closed

[FW][FIX] selection input: highlight color not sync with range color #5811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions src/components/selection_input/selection_input_store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export class SelectionInputStore extends SpreadsheetStore {
"confirm",
"updateColors",
] as const;
ranges: RangeInputValue[] = [];
private ranges: RangeInputValue[] = [];
focusedRangeIndex: number | null = null;
private inputSheetId: UID;
private focusStore = this.get(FocusStore);
Expand Down Expand Up @@ -166,6 +166,11 @@ export class SelectionInputStore extends SpreadsheetStore {

updateColors(colors: Color[]) {
this.colors = colors;
const colorGenerator = new ColorGenerator(this.ranges.length, this.colors);
this.ranges = this.ranges.map((range) => ({
...range,
color: colorGenerator.next(),
}));
}

confirm() {
Expand Down Expand Up @@ -206,14 +211,13 @@ export class SelectionInputStore extends SpreadsheetStore {
* e.g. ["A1", "Sheet2!B3", "E12"]
*/
get selectionInputs(): (RangeInputValue & { isFocused: boolean; isValidRange: boolean })[] {
const generator = new ColorGenerator(this.ranges.length, this.colors);
return this.ranges.map((input, index) =>
Object.assign({}, input, {
color:
this.hasMainFocus &&
this.focusedRangeIndex !== null &&
this.getters.isRangeValid(input.xc)
? generator.next()
? input.color
: null,
isFocused: this.hasMainFocus && this.focusedRangeIndex === index,
isValidRange: input.xc === "" || this.getters.isRangeValid(input.xc),
Expand Down
21 changes: 14 additions & 7 deletions tests/selection_input/selection_input_component.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { SelectionInput } from "../../src/components/selection_input/selection_i
import { ColorGenerator, toCartesian, toZone } from "../../src/helpers";
import { useStoreProvider } from "../../src/store_engine";
import { ModelStore } from "../../src/stores";
import { HighlightStore } from "../../src/stores/highlight_store";
import { Color, SpreadsheetChildEnv } from "../../src/types";
import {
activateSheet,
Expand Down Expand Up @@ -234,20 +235,26 @@ describe("Selection Input", () => {
// data series of a chart, as the color of the removed range won't be passed anymore to
// the colors function in the chart's side panel's props.
let colors = ["#FF0000", "#00FF00"];
await createSelectionInput({
const { parent, env } = await createSelectionInput({
initialRanges: ["A1", "B1"],
colors: colors,
});
simulateClick(fixture.querySelectorAll("input")[0]);
await nextTick();
const highlightStore = env.getStore(HighlightStore);
await simulateClick(fixture.querySelectorAll("input")[0]);
expect(fixture.querySelectorAll("input")[0].getAttribute("style")).toBe("color:#FF0000; ");
expect(fixture.querySelectorAll("input")[1].getAttribute("style")).toBe("color:#00FF00; ");
colors[0] = "#0000FF";
colors[1] = "#FF00FF";
simulateClick(fixture.querySelectorAll("input")[1]);
await nextTick();
expect(highlightStore.highlights).toMatchObject([
{ color: "#FF0000", zone: toZone("A1") },
{ color: "#00FF00", zone: toZone("B1") },
]);
parent.colors = ["#0000FF", "#FF00FF"];
await simulateClick(fixture.querySelectorAll("input")[1]);
expect(fixture.querySelectorAll("input")[0].getAttribute("style")).toBe("color:#0000FF; ");
expect(fixture.querySelectorAll("input")[1].getAttribute("style")).toBe("color:#FF00FF; ");
expect(highlightStore.highlights).toMatchObject([
{ color: "#0000FF", zone: toZone("A1") },
{ color: "#FF00FF", zone: toZone("B1") },
]);
});

test("can select full column as unbounded zone by clicking on header", async () => {
Expand Down