Skip to content

Commit 9e67df3

Browse files
authored
fix(gaugechart): fix gauge chart style hook to merge style from props (#34604)
1 parent 8bae075 commit 9e67df3

File tree

2 files changed

+52
-16
lines changed

2 files changed

+52
-16
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Fix GaugeChart so it can merge customer provided styles to the chart",
4+
"packageName": "@fluentui/react-charts",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

packages/charts/react-charts/library/src/components/GaugeChart/useGaugeChartStyles.styles.ts

Lines changed: 45 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -118,25 +118,54 @@ export const useGaugeChartStyles = (props: GaugeChartProps): GaugeChartStyles =>
118118
const baseStyles = useStyles();
119119

120120
return {
121-
root: mergeClasses(gaugeChartClassNames.root, baseStyles.root),
122-
chart: mergeClasses(gaugeChartClassNames.chart, baseStyles.chart),
123-
limits: mergeClasses(gaugeChartClassNames.limits, baseStyles.limits),
124-
chartValue: mergeClasses(gaugeChartClassNames.chartValue, baseStyles.chartValue),
125-
sublabel: mergeClasses(gaugeChartClassNames.sublabel, baseStyles.sublabel),
126-
needle: mergeClasses(gaugeChartClassNames.needle, baseStyles.needle),
127-
chartTitle: mergeClasses(gaugeChartClassNames.chartTitle, baseStyles.chartTitle),
128-
segment: mergeClasses(gaugeChartClassNames.segment, baseStyles.segment),
129-
gradientSegment: mergeClasses(gaugeChartClassNames.gradientSegment, baseStyles.gradientSegment),
130-
calloutContentRoot: mergeClasses(gaugeChartClassNames.calloutContentRoot, baseStyles.calloutContentRoot),
121+
root: mergeClasses(gaugeChartClassNames.root, baseStyles.root, props.styles?.root),
122+
chart: mergeClasses(gaugeChartClassNames.chart, baseStyles.chart, props.styles?.chart),
123+
limits: mergeClasses(gaugeChartClassNames.limits, baseStyles.limits, props.styles?.limits),
124+
chartValue: mergeClasses(gaugeChartClassNames.chartValue, baseStyles.chartValue, props.styles?.chartValue),
125+
sublabel: mergeClasses(gaugeChartClassNames.sublabel, baseStyles.sublabel, props.styles?.sublabel),
126+
needle: mergeClasses(gaugeChartClassNames.needle, baseStyles.needle, props.styles?.needle),
127+
chartTitle: mergeClasses(gaugeChartClassNames.chartTitle, baseStyles.chartTitle, props.styles?.chartTitle),
128+
segment: mergeClasses(gaugeChartClassNames.segment, baseStyles.segment, props.styles?.segment),
129+
gradientSegment: mergeClasses(
130+
gaugeChartClassNames.gradientSegment,
131+
baseStyles.gradientSegment,
132+
props.styles?.gradientSegment,
133+
),
134+
calloutContentRoot: mergeClasses(
135+
gaugeChartClassNames.calloutContentRoot,
136+
baseStyles.calloutContentRoot,
137+
props.styles?.calloutContentRoot,
138+
),
131139
calloutDateTimeContainer: mergeClasses(
132140
gaugeChartClassNames.calloutDateTimeContainer,
133141
baseStyles.calloutDateTimeContainer,
142+
props.styles?.calloutDateTimeContainer,
143+
),
144+
calloutContentX: mergeClasses(
145+
gaugeChartClassNames.calloutContentX,
146+
baseStyles.calloutContentX,
147+
props.styles?.calloutContentX,
148+
),
149+
calloutBlockContainer: mergeClasses(
150+
gaugeChartClassNames.calloutBlockContainer,
151+
baseStyles.calloutBlockContainer,
152+
props.styles?.calloutBlockContainer,
153+
),
154+
shapeStyles: mergeClasses(gaugeChartClassNames.shapeStyles, baseStyles.shapeStyles, props.styles?.shapeStyles),
155+
calloutlegendText: mergeClasses(
156+
gaugeChartClassNames.calloutlegendText,
157+
baseStyles.calloutlegendText,
158+
props.styles?.calloutlegendText,
159+
),
160+
calloutContentY: mergeClasses(
161+
gaugeChartClassNames.calloutContentY,
162+
baseStyles.calloutContentY,
163+
props.styles?.calloutContentY,
164+
),
165+
descriptionMessage: mergeClasses(
166+
gaugeChartClassNames.descriptionMessage,
167+
baseStyles.descriptionMessage,
168+
props.styles?.descriptionMessage,
134169
),
135-
calloutContentX: mergeClasses(gaugeChartClassNames.calloutContentX, baseStyles.calloutContentX),
136-
calloutBlockContainer: mergeClasses(gaugeChartClassNames.calloutBlockContainer, baseStyles.calloutBlockContainer),
137-
shapeStyles: mergeClasses(gaugeChartClassNames.shapeStyles, baseStyles.shapeStyles),
138-
calloutlegendText: mergeClasses(gaugeChartClassNames.calloutlegendText, baseStyles.calloutlegendText),
139-
calloutContentY: mergeClasses(gaugeChartClassNames.calloutContentY, baseStyles.calloutContentY),
140-
descriptionMessage: mergeClasses(gaugeChartClassNames.descriptionMessage, baseStyles.descriptionMessage),
141170
};
142171
};

0 commit comments

Comments
 (0)