Skip to content

[FIX] carousel: custom color don't use carousels #8825

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

Open
hokolomopo wants to merge 1 commit into
base: 19.0
Choose a base branch
from
Open

[FIX] carousel: custom color don't use carousels #8825

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
16 changes: 16 additions & 0 deletions src/plugins/ui_core_views/custom_colors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,19 @@ export class CustomColorsPlugin extends CoreViewPlugin<CustomColorState> {
for (const chartId of this.getters.getChartIds(sheetId)) {
this.tryToAddColors(this.getChartColors(chartId));
}
for (const figureId of this.getters.getFigures(sheetId)) {
this.tryToAddColors(this.getCarouselColors(sheetId, figureId.id));
}
}
break;
case "UPDATE_CHART":
case "CREATE_CHART":
this.tryToAddColors(this.getChartColors(cmd.chartId));
break;
case "CREATE_CAROUSEL":
case "UPDATE_CAROUSEL":
this.tryToAddColors(this.getCarouselColors(cmd.sheetId, cmd.figureId));
break;
case "UPDATE_CELL":
case "ADD_CONDITIONAL_FORMAT":
case "SET_BORDER":
Expand Down Expand Up @@ -172,6 +179,15 @@ export class CustomColorsPlugin extends CoreViewPlugin<CustomColorState> {
return [...colors].map((color) => color[1]); // color[1] is the first capturing group of the regex
}

private getCarouselColors(sheetId: UID, figureId: UID): Color[] {
const figure = this.getters.getFigure(sheetId, figureId);
if (figure?.tag !== "carousel") {
return [];
}
const titleColor = this.getters.getCarousel(figureId).title?.color;
return titleColor ? [titleColor] : [];
}

private getTableColors(sheetId: UID): Color[] {
const tables = this.getters.getTables(sheetId);
return tables.flatMap((table) => {
Expand Down
14 changes: 14 additions & 0 deletions tests/colors/custom_colors_plugin.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ import { Model } from "../../src";
import { TABLE_PRESETS } from "../../src/helpers/table_presets";
import { TableStyle, UID } from "../../src/types";
import {
createCarousel,
createChart,
createScorecardChart,
createTable,
redo,
setStyle,
undo,
updateCarousel,
} from "../test_helpers/commands_helpers";
import { createColorScale, createEqualCF, target, toRangesData } from "../test_helpers/helpers";

Expand Down Expand Up @@ -221,6 +223,18 @@ describe("custom colors are correctly handled when editing charts", () => {
const importedModel = new Model(model.exportData());
expect(importedModel.getters.getCustomColors()).toEqual(["#654987", "#123456"]);
});

test("Carousel title color are taken into account", () => {
expect(model.getters.getCustomColors()).toEqual([]);
createCarousel(model, { title: { text: "Hello", color: "#123456" }, items: [] }, "id");
expect(model.getters.getCustomColors()).toEqual(["#123456"]);

updateCarousel(model, "id", { title: { text: "Hello", color: "#654321" }, items: [] });
expect(model.getters.getCustomColors()).toEqual(["#654321", "#123456"]);

const model2 = new Model(model.exportData());
expect(model2.getters.getCustomColors()).toEqual(["#654321"]);
});
});

test("custom colors from config", () => {
Expand Down