Skip to content

feat(react-charting) (react-chart): enable wrapping of string x-axis labels in scatter chart #35231

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

Merged
merged 16 commits into from
Oct 6, 2025
Merged

feat(react-charting) (react-chart): enable wrapping of string x-axis labels in scatter chart #35231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4497de2
Removed separator for last item in the chartPopover list
v-baambati Sep 16, 2025
ddb66fa
Fixed callout issue for non highlighted part of the donut chart
v-baambati Sep 22, 2025
c62d379
updated chnage file
v-baambati Sep 22, 2025
86ab8a2
Merge branch 'master' of https://github.com/microsoft/fluentui into b…
v-baambati Sep 22, 2025
f0fe0bc
Merge branch 'master' into bugFixes_sept_2025
v-baambati Sep 22, 2025
16f6a52
Merge branch 'master' into bugFixes_sept_2025
v-baambati Sep 23, 2025
ee5f833
Merge branch 'master' into bugFixes_sept_2025
v-baambati Sep 23, 2025
fd8992b
Merge branch 'master' of https://github.com/microsoft/fluentui into b…
v-baambati Sep 25, 2025
67cfc24
feat(react-charting): enable wrapping of string x-axis labels in scat…
v-baambati Sep 25, 2025
80de546
added change files
v-baambati Sep 25, 2025
53f1db3
update code
v-baambati Sep 26, 2025
d8c9ddf
update code
v-baambati Sep 26, 2025
2587b27
updated snaps
v-baambati Oct 6, 2025
6e4d710
updated snapshots
v-baambati Oct 6, 2025
02eb4c1
Merge branch 'master' into bugFixes_sept_2025
v-baambati Oct 6, 2025
c2d264a
removed unwanted cpmments
v-baambati Oct 6, 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
6 changes: 6 additions & 0 deletions change/@fluentui-react-charting-f5b9fba6-92e9-4488-bec4-76dfb97edc8c.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"type": "patch",
"packageName": "@fluentui/react-charting",
"email": "[email protected]",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-charts-29ab0a00-5f28-4754-a2c6-05e177082749.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "feat: enable wrapping of string x-axis labels in scatterchart",
"packageName": "@fluentui/react-charts",
"email": "[email protected]",
"dependentChangeType": "patch"
}
3 changes: 3 additions & 0 deletions packages/charts/react-charting/src/components/DeclarativeChart/PlotlySchemaAdapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,6 +1129,7 @@ const transformPlotlyJsonToScatterTraceProps = (
let mode: string = 'tonexty';
const { legends, hideLegend } = getLegendProps(input.data, input.layout, isMultiPlot);
const yAxisTickFormat = getYAxisTickFormat(input.data[0], input.layout);
var shouldWrapLabels = false;
const chartData: ILineChartPoints[] = input.data
.map((series: Partial<PlotData>, index: number) => {
const colors = isScatterMarkers
Expand All @@ -1149,6 +1150,7 @@ const transformPlotlyJsonToScatterTraceProps = (
const isXDate = isDateArray(xValues);
const isXNumber = isNumberArray(xValues);
const isXYearCategory = isYearArray(series.x); // Consider year as categorical not numeric continuous axis
shouldWrapLabels = shouldWrapLabels || (isXString && !isXDate);
const legend: string = legends[index];
// resolve color for each legend's lines from the extracted colors
const seriesColor = resolveColor(
Expand Down Expand Up @@ -1263,6 +1265,7 @@ const transformPlotlyJsonToScatterTraceProps = (
hideLegend,
useUTC: false,
optimizeLargeData: numDataPoints > 1000,
shouldWrapLabels: shouldWrapLabels,
...getTitles(input.layout),
...getXAxisTickFormat(input.data[0], input.layout),
...yAxisTickFormat,
Expand Down
3 changes: 3 additions & 0 deletions ...harting/src/components/DeclarativeChart/__snapshots__/PlotlySchemaAdapterUT.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ Object {
"hideTickOverlap": true,
"mode": "tonexty",
"optimizeLargeData": false,
"shouldWrapLabels": false,
"supportNegativeData": true,
"useUTC": false,
"width": undefined,
Expand Down Expand Up @@ -4890,6 +4891,7 @@ Object {
"hideTickOverlap": true,
"optimizeLargeData": false,
"roundedTicks": true,
"shouldWrapLabels": false,
"supportNegativeData": true,
"useUTC": false,
"width": undefined,
Expand Down Expand Up @@ -6586,6 +6588,7 @@ Object {
"hideTickOverlap": true,
"optimizeLargeData": false,
"roundedTicks": true,
"shouldWrapLabels": false,
"showYAxisLablesTooltip": true,
"supportNegativeData": true,
"useUTC": false,
Expand Down
3 changes: 3 additions & 0 deletions packages/charts/react-charts/library/src/components/DeclarativeChart/PlotlySchemaAdapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1005,6 +1005,7 @@ const transformPlotlyJsonToScatterTraceProps = (
let mode: string = 'tonexty';
const { legends, hideLegend } = getLegendProps(input.data, input.layout, isMultiPlot);
const yAxisTickFormat = getYAxisTickFormat(input.data[0], input.layout);
var shouldWrapLabels = false;
const chartData: LineChartPoints[] = input.data
.map((series: Partial<PlotData>, index: number) => {
const colors = isScatterMarkers
Expand All @@ -1025,6 +1026,7 @@ const transformPlotlyJsonToScatterTraceProps = (
const isXDate = isDateArray(xValues);
const isXNumber = isNumberArray(xValues);
const isXYearCategory = isYearArray(series.x); // Consider year as categorical not numeric continuous axis
shouldWrapLabels = shouldWrapLabels || (isXString && !isXDate);
const legend: string = legends[index];
// resolve color for each legend's lines from the extracted colors
const seriesColor = resolveColor(extractedColors, index, legend, colorMap, isDarkTheme);
Expand Down Expand Up @@ -1105,6 +1107,7 @@ const transformPlotlyJsonToScatterTraceProps = (
hideTickOverlap: true,
hideLegend,
useUTC: false,
wrapXAxisLables: shouldWrapLabels,
optimizeLargeData: numDataPoints > 1000,
...getTitles(input.layout),
...getXAxisTickFormat(input.data[0], input.layout),
Expand Down
3 changes: 3 additions & 0 deletions ...library/src/components/DeclarativeChart/__snapshots__/PlotlySchemaAdapterUT.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4658,6 +4658,7 @@ Object {
"supportNegativeData": true,
"useUTC": false,
"width": undefined,
"wrapXAxisLables": false,
"xAxisTitle": "",
"yAxisTitle": "",
"yMaxValue": 16.562957844203055,
Expand Down Expand Up @@ -5059,6 +5060,7 @@ Object {
"supportNegativeData": true,
"useUTC": false,
"width": undefined,
"wrapXAxisLables": false,
"xAxisTitle": "",
"yAxisTitle": "",
}
Expand Down Expand Up @@ -5206,6 +5208,7 @@ Object {
"supportNegativeData": true,
"useUTC": false,
"width": undefined,
"wrapXAxisLables": false,
"xAxisTitle": "",
"yAxisTitle": "",
"yMaxValue": 1.0620659379275244,
Expand Down