Skip to content

[pull] master from microsoft:master #280

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
pull merged 2 commits into from
Dec 19, 2025
Merged

[pull] master from microsoft:master #280

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
cacbad9
fix(react-charts): fix a11y bugs (#35584)
Anush2303 Dec 19, 2025
02ee2ee
chore: bump storybook to 8.6.15 and resolve CVE-2025-68429 (#35587)
mainframev Dec 19, 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
7 changes: 7 additions & 0 deletions change/@fluentui-react-charts-2aba5b31-2b08-45fd-a972-cb967de08260.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix accessibility issues ",
"packageName": "@fluentui/react-charts",
"email": "anushgupta@microsoft.com",
"dependentChangeType": "patch"
}
32 changes: 16 additions & 16 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,22 +89,22 @@
"@react-native/babel-preset": "0.73.21",
"@rnx-kit/eslint-plugin": "0.8.6",
"@rollup/plugin-node-resolve": "13.3.0",
"@storybook/addon-a11y": "8.6.14",
"@storybook/addon-actions": "8.6.14",
"@storybook/addon-docs": "8.6.14",
"@storybook/addon-essentials": "8.6.14",
"@storybook/addon-links": "8.6.14",
"@storybook/addon-mdx-gfm": "8.6.14",
"@storybook/blocks": "8.6.14",
"@storybook/components": "8.6.14",
"@storybook/core-events": "8.6.14",
"@storybook/core-server": "8.6.14",
"@storybook/addon-a11y": "8.6.15",
"@storybook/addon-actions": "8.6.15",
"@storybook/addon-docs": "8.6.15",
"@storybook/addon-essentials": "8.6.15",
"@storybook/addon-links": "8.6.15",
"@storybook/addon-mdx-gfm": "8.6.15",
"@storybook/blocks": "8.6.15",
"@storybook/components": "8.6.15",
"@storybook/core-events": "8.6.15",
"@storybook/core-server": "8.6.15",
"@storybook/icons": "1.3.2",
"@storybook/manager-api": "8.6.14",
"@storybook/preview-api": "8.6.14",
"@storybook/react": "8.6.14",
"@storybook/react-webpack5": "8.6.14",
"@storybook/theming": "8.6.14",
"@storybook/manager-api": "8.6.15",
"@storybook/preview-api": "8.6.15",
"@storybook/react": "8.6.15",
"@storybook/react-webpack5": "8.6.15",
"@storybook/theming": "8.6.15",
"@swc/cli": "0.7.7",
"@swc/core": "1.11.24",
"@swc/helpers": "0.5.1",
Expand Down Expand Up @@ -300,7 +300,7 @@
"schema-utils": "3.1.1",
"semver": "^6.2.0",
"source-map-loader": "4.0.0",
"storybook": "8.6.14",
"storybook": "8.6.15",
"storybook-addon-performance": "0.17.3",
"storywright": "0.0.27-storybook7.14",
"strip-ansi": "6.0.0",
Expand Down
18 changes: 10 additions & 8 deletions packages/charts/react-charts/library/src/components/GaugeChart/GaugeChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,14 +386,16 @@ export const GaugeChart: React.FunctionComponent<GaugeChartProps> = React.forwar
const hoverXValue: string =
'Current value is ' + getChartValueLabel(props.chartValue, _minValue, _maxValue, props.chartValueFormat, true);
// eslint-disable-next-line @typescript-eslint/no-shadow
const hoverYValues: YValue[] = _segments.map(segment => {
const yValue: YValue = {
legend: segment.legend,
y: getSegmentLabel(segment, _minValue, _maxValue, props.variant),
color: segment.color,
};
return yValue;
});
const hoverYValues: YValue[] = _segments
.filter(segment => _noLegendHighlighted() || _legendHighlighted(segment.legend))
.map(segment => {
const yValue: YValue = {
legend: segment.legend,
y: getSegmentLabel(segment, _minValue, _maxValue, props.variant),
color: segment.color,
};
return yValue;
});
setPopoverOpen(
['Needle', 'Chart value'].includes(legend) || _noLegendHighlighted() || _legendHighlighted(legend),
);
Expand Down
2 changes: 1 addition & 1 deletion ...s/react-charts/library/src/components/GroupedVerticalBarChart/GroupedVerticalBarChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,7 +870,7 @@ export const GroupedVerticalBarChart: React.FC<GroupedVerticalBarChartProps> = R
opacity={shouldHighlight ? 1 : 0.1}
onMouseOver={e => _onLineHover(e, series, seriesIdx, pointIdx, scaleLineX)}
onMouseLeave={_onBarLeave}
data-is-focusable={shouldHighlight}
tabIndex={shouldHighlight ? 0 : undefined}
onFocus={e => _onLineFocus(e, series, seriesIdx, pointIdx)}
onBlur={_onBarLeave}
role="img"
Expand Down
14 changes: 12 additions & 2 deletions packages/charts/react-charts/library/src/components/Legends/OverflowMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,19 @@ export const OverflowMenu: React.FC<{
const remainingItemsCount = itemIds.length - overflowCount;
const menuList = [];
for (let i = remainingItemsCount; i < itemIds.length; i++) {
const buttonElement = items[i];
menuList.push(
<MenuItem tabIndex={-1} key={i}>
{items[i]}
<MenuItem
tabIndex={-1}
key={i}
onClick={e => {
const button = buttonElement.props;
if (button.onClick) {
button.onClick(e);
}
}}
>
{buttonElement}
</MenuItem>,
);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/storybook/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"dependencies": {
"@fluentui/react": "^8.125.3",
"@fluentui/theme": "^2.7.2",
"@storybook/addon-essentials": "8.6.14",
"@storybook/addon-essentials": "8.6.15",
"@fluentui/azure-themes": "^8.6.146",
"@fluentui/theme-samples": "^8.7.222",
"tslib": "^2.1.0"
Expand Down
Loading
Loading