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.

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

fix: Update ChartWidget fontFamily handling to respect system default #38784

Merged
merged 2 commits into from
Jan 21, 2025
Merged

fix: Update ChartWidget fontFamily handling to respect system default #38784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7e8bb5
fix: Update ChartWidget fontFamily handling to respect system default…
rahulbarwal Jan 21, 2025
1978a03
fix: Update ChartWidget font family test to remove fallback usage
rahulbarwal Jan 21, 2025
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
4 changes: 2 additions & 2 deletions app/client/src/widgets/ChartWidget/widget/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ describe("emptyChartData", () => {
};

describe("font family", () => {
it("uses theme font family with Nunito Sans fallback", () => {
it("Does not use any font family as a fallback", () => {
const widget = new ChartWidget(defaultProps);
const view = widget.renderChartWithData();

Expand All @@ -69,7 +69,7 @@ describe("emptyChartData", () => {
).renderChartWithData();

expect(viewWithoutFont.props.children.props.fontFamily).toEqual(
"Nunito Sans",
undefined,
);
});
});
Expand Down
6 changes: 5 additions & 1 deletion app/client/src/widgets/ChartWidget/widget/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,11 @@ class ChartWidget extends BaseWidget<ChartWidgetProps, WidgetState> {
customEChartConfig={this.props.customEChartConfig}
customFusionChartConfig={this.props.customFusionChartConfig}
dimensions={this.props}
fontFamily={this.props.fontFamily ?? "Nunito Sans"}
fontFamily={
this.props.fontFamily !== "System Default"
? this.props.fontFamily
: undefined
}
hasOnDataPointClick={Boolean(this.props.onDataPointClick)}
isLoading={this.props.isLoading}
isVisible={this.props.isVisible}
Expand Down
Loading