Skip to content

Commit 2b6f9b6

Browse files
chpalacCharles Assuncao
andauthored
fix(Tooltip): fix order of spread for trigger (#18875)
* fix: order os spread props for tooltip trigger * add changelog Co-authored-by: Charles Assuncao <charles.assuncao@microsoft.com>
1 parent 394b16b commit 2b6f9b6

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

packages/fluentui/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
2323
- Wrap ChatMessage header elements correctly @Hirse ([#18837](https://github.com/microsoft/fluentui/pull/18837))
2424
- Align ChatMessageDetails color with ChatMessage header @Hirse ([#18840](https://github.com/microsoft/fluentui/pull/18840))
2525
- Fix compact hover background in dark themes @Hirse ([#18842](https://github.com/microsoft/fluentui/pull/18842))
26+
- Fix `Tooltip` trigger order of props being spread @chassunc ([#18875](https://github.com/microsoft/fluentui/pull/18875))
2627

2728
### Features
2829
- Add Onyx 600, Silver 100 to color palette and some color tokens @codepretty ([#18827](https://github.com/microsoft/fluentui/pull/18827))

packages/fluentui/react-northstar/src/components/Tooltip/Tooltip.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ export const Tooltip: React.FC<TooltipProps> &
237237
<Ref innerRef={triggerRef}>
238238
{React.cloneElement(
239239
triggerElement,
240-
getA11Props('trigger', { ...triggerElement.props, ...triggerProps, ...unhandledProps }),
240+
getA11Props('trigger', { ...unhandledProps, ...triggerElement.props, ...triggerProps }),
241241
)}
242242
</Ref>
243243
)}

0 commit comments

Comments
 (0)