diff --git a/change/@fluentui-react-charting-4f8e08b2-0b16-4f95-a37e-3c37c4bcb904.json b/change/@fluentui-react-charting-4f8e08b2-0b16-4f95-a37e-3c37c4bcb904.json new file mode 100644 index 0000000000000..3cdca6b8bb3c1 --- /dev/null +++ b/change/@fluentui-react-charting-4f8e08b2-0b16-4f95-a37e-3c37c4bcb904.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "set reference line legends after the main chart legends", + "packageName": "@fluentui/react-charting", + "email": "anushgupta@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-charts-b9303617-253d-4830-bbb1-b4207ec9791a.json b/change/@fluentui-react-charts-b9303617-253d-4830-bbb1-b4207ec9791a.json new file mode 100644 index 0000000000000..545d1febb16d6 --- /dev/null +++ b/change/@fluentui-react-charts-b9303617-253d-4830-bbb1-b4207ec9791a.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "set reference line legends after the main chart legends", + "packageName": "@fluentui/react-charts", + "email": "anushgupta@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/packages/charts/react-charting/src/components/VerticalStackedBarChart/VerticalStackedBarChart.base.tsx b/packages/charts/react-charting/src/components/VerticalStackedBarChart/VerticalStackedBarChart.base.tsx index c1f4428895572..a58aacba2c91c 100644 --- a/packages/charts/react-charting/src/components/VerticalStackedBarChart/VerticalStackedBarChart.base.tsx +++ b/packages/charts/react-charting/src/components/VerticalStackedBarChart/VerticalStackedBarChart.base.tsx @@ -707,7 +707,7 @@ export class VerticalStackedBarChartBase legendsOfLine.push(legend); }); } - const totalLegends: ILegend[] = legendsOfLine.concat(actions); + const totalLegends: ILegend[] = actions.concat(legendsOfLine); return ( { const bars = screen.getAllByText((content, element) => element!.tagName.toLowerCase() === 'rect'); const line = screen.getAllByText((content, element) => element!.tagName.toLowerCase() === 'line'); const legends = screen.getAllByText((content, element) => element!.tagName.toLowerCase() === 'button'); - fireEvent.mouseOver(legends[0]); + fireEvent.mouseOver(legends[3]); // Assert expect(line[8].getAttribute('opacity')).toEqual('1'); expect(bars[0]).toHaveStyle('opacity: 0.1'); @@ -436,7 +436,7 @@ describe('Vertical stacked bar chart - Subcomponent Legends', () => { const legends = screen.getAllByText((content, element) => element!.tagName.toLowerCase() === 'button'); const bars = screen.getAllByText((content, element) => element!.tagName.toLowerCase() === 'rect'); const line = screen.getAllByText((content, element) => element!.tagName.toLowerCase() === 'line'); - fireEvent.mouseOver(legends![1]); + fireEvent.mouseOver(legends![0]); // Assert expect(line[8].getAttribute('opacity')).toEqual('0.1'); diff --git a/packages/charts/react-charting/src/components/VerticalStackedBarChart/__snapshots__/VerticalStackedBarChartRTL.test.tsx.snap b/packages/charts/react-charting/src/components/VerticalStackedBarChart/__snapshots__/VerticalStackedBarChartRTL.test.tsx.snap index d06bc8369943c..a4aa96cb56048 100644 --- a/packages/charts/react-charting/src/components/VerticalStackedBarChart/__snapshots__/VerticalStackedBarChartRTL.test.tsx.snap +++ b/packages/charts/react-charting/src/components/VerticalStackedBarChart/__snapshots__/VerticalStackedBarChartRTL.test.tsx.snap @@ -593,7 +593,7 @@ exports[`Vertical stacked bar chart - Screen resolution Should remain unchanged role="none" > @@ -693,7 +693,7 @@ exports[`Vertical stacked bar chart - Screen resolution Should remain unchanged role="none" > @@ -793,7 +793,7 @@ exports[`Vertical stacked bar chart - Screen resolution Should remain unchanged role="none" > @@ -893,7 +893,7 @@ exports[`Vertical stacked bar chart - Screen resolution Should remain unchanged role="none" > @@ -1587,7 +1587,7 @@ exports[`Vertical stacked bar chart - Screen resolution Should remain unchanged role="none" > @@ -1687,7 +1687,7 @@ exports[`Vertical stacked bar chart - Screen resolution Should remain unchanged role="none" > @@ -1787,7 +1787,7 @@ exports[`Vertical stacked bar chart - Screen resolution Should remain unchanged role="none" > @@ -1887,7 +1887,7 @@ exports[`Vertical stacked bar chart - Screen resolution Should remain unchanged role="none" > @@ -2581,7 +2581,7 @@ exports[`Vertical stacked bar chart - Subcomponent Line Should render the vertic role="none" > @@ -2681,7 +2681,7 @@ exports[`Vertical stacked bar chart - Subcomponent Line Should render the vertic role="none" > @@ -2781,7 +2781,7 @@ exports[`Vertical stacked bar chart - Subcomponent Line Should render the vertic role="none" > @@ -2881,7 +2881,7 @@ exports[`Vertical stacked bar chart - Subcomponent Line Should render the vertic role="none" > @@ -10372,7 +10372,7 @@ exports[`Vertical stacked bar chart rendering Should render the vertical stacked role="none" > @@ -10472,7 +10472,7 @@ exports[`Vertical stacked bar chart rendering Should render the vertical stacked role="none" > @@ -10572,7 +10572,7 @@ exports[`Vertical stacked bar chart rendering Should render the vertical stacked role="none" > @@ -10672,7 +10672,7 @@ exports[`Vertical stacked bar chart rendering Should render the vertical stacked role="none" > diff --git a/packages/charts/react-charts/library/src/components/VerticalStackedBarChart/VerticalStackedBarChart.test.tsx b/packages/charts/react-charts/library/src/components/VerticalStackedBarChart/VerticalStackedBarChart.test.tsx index 8dd5591f113eb..c593ffcb5287c 100644 --- a/packages/charts/react-charts/library/src/components/VerticalStackedBarChart/VerticalStackedBarChart.test.tsx +++ b/packages/charts/react-charts/library/src/components/VerticalStackedBarChart/VerticalStackedBarChart.test.tsx @@ -392,7 +392,7 @@ describe('Vertical stacked bar chart - Subcomponent Legends', () => { const bars = screen.getAllByText((content, element) => element!.tagName.toLowerCase() === 'rect'); const line = screen.getAllByText((content, element) => element!.tagName.toLowerCase() === 'line'); const legends = screen.getAllByText((content, element) => element!.tagName.toLowerCase() === 'button'); - fireEvent.mouseOver(legends[0]); + fireEvent.mouseOver(legends[3]); // Assert expect(line[8].getAttribute('opacity')).toEqual('1'); expect(bars[0]).toHaveAttribute('opacity', '0.1'); @@ -415,7 +415,7 @@ describe('Vertical stacked bar chart - Subcomponent Legends', () => { const legends = screen.getAllByText((content, element) => element!.tagName.toLowerCase() === 'button'); const bars = screen.getAllByText((content, element) => element!.tagName.toLowerCase() === 'rect'); const line = screen.getAllByText((content, element) => element!.tagName.toLowerCase() === 'line'); - fireEvent.mouseOver(legends![1]); + fireEvent.mouseOver(legends![0]); // Assert expect(line[8].getAttribute('opacity')).toEqual('0.1'); diff --git a/packages/charts/react-charts/library/src/components/VerticalStackedBarChart/VerticalStackedBarChart.tsx b/packages/charts/react-charts/library/src/components/VerticalStackedBarChart/VerticalStackedBarChart.tsx index a77868c7d068f..2a68ee72c93c5 100644 --- a/packages/charts/react-charts/library/src/components/VerticalStackedBarChart/VerticalStackedBarChart.tsx +++ b/packages/charts/react-charts/library/src/components/VerticalStackedBarChart/VerticalStackedBarChart.tsx @@ -224,7 +224,7 @@ export const VerticalStackedBarChart: React.FunctionComponent @@ -946,79 +946,79 @@ exports[`Vertical stacked bar chart - Screen resolution Should remain unchanged style="text-align: unset;" > @@ -3145,21 +3145,21 @@ exports[`VerticalStackedBarChart - mouse events Should render customized callout class="fui-legend__legendContainer" > @@ -3167,21 +3167,21 @@ exports[`VerticalStackedBarChart - mouse events Should render customized callout class="fui-legend__legendContainer" > @@ -3189,21 +3189,21 @@ exports[`VerticalStackedBarChart - mouse events Should render customized callout class="fui-legend__legendContainer" >