Skip to content

Commit

Permalink
Change to the UseFontIcon to actually use the computed prop (#3286)
Browse files Browse the repository at this point in the history
* small change to use output of function

this should merge the styles as expected.

* Change files
  • Loading branch information
gremlin529 authored Dec 6, 2023
1 parent 4e2be3c commit 7d39eed
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "small change to use output of function",
"packageName": "@fluentui-react-native/icon",
"email": "[email protected]",
"dependentChangeType": "patch"
}
4 changes: 2 additions & 2 deletions packages/components/Icon/src/FontIcon/useFontIcon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ export const useFontIcon = (props: FontIconProps): FontIconProps => {
[color, fontSize, fontFamily],
)[0];

mergeStyles(style, styleOrig);
const mergedStyle = mergeStyles(style, styleOrig);

return {
accessible: accessible ?? true,
style,
style: mergedStyle,
...rest,
};
};
Expand Down

0 comments on commit 7d39eed

Please sign in to comment.