Skip to content
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.

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

Bundleicon fix #523

Merged
merged 30 commits into from Nov 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
31c7a3f
Automate bumping react-icons beta version number
tomi-msft Nov 23, 2021
47fae8d
revert
tomi-msft Nov 23, 2021
8f81a86
Merge branch 'master' of https://github.com/microsoft/fluentui-system…
tomi-msft Nov 23, 2021
179a3e7
Merge branch 'master' of https://github.com/microsoft/fluentui-system…
tomi-msft Nov 30, 2021
55e3032
Merge branch 'master' of https://github.com/microsoft/fluentui-system…
tomi-msft Dec 6, 2021
1cfdd33
Merge branch 'master' of https://github.com/microsoft/fluentui-system…
tomi-msft Feb 8, 2022
66d5a05
Merge branch 'master' of https://github.com/microsoft/fluentui-system…
tomi-msft Mar 1, 2022
c84e246
Merge branch 'master' of https://github.com/microsoft/fluentui-system…
tomi-msft Mar 10, 2022
80bef55
Merge branch 'master' of https://github.com/microsoft/fluentui-system…
tomi-msft Apr 14, 2022
37a69cb
Merge branch 'master' of https://github.com/microsoft/fluentui-system…
tomi-msft Apr 14, 2022
39b3d32
Merge branch 'master' of https://github.com/microsoft/fluentui-system…
tomi-msft Apr 19, 2022
9c0439c
remove manifest.json
tomi-msft Apr 19, 2022
fd04253
Merge branch 'master' of https://github.com/microsoft/fluentui-system…
tomi-msft May 5, 2022
53e77d3
Merge branch 'master' of https://github.com/microsoft/fluentui-system…
tomi-msft May 9, 2022
afb2431
Merge branch 'master' of https://github.com/microsoft/fluentui-system…
tomi-msft May 9, 2022
7507fae
Merge branch 'master' of https://github.com/microsoft/fluentui-system…
tomi-msft May 13, 2022
3b6e5f9
Merge branch 'master' of https://github.com/microsoft/fluentui-system…
tomi-msft May 20, 2022
b502589
Merge branch 'master' of https://github.com/microsoft/fluentui-system…
tomi-msft Jun 1, 2022
0d89f78
Merge branch 'master' of https://github.com/microsoft/fluentui-system…
tomi-msft Jun 9, 2022
66f1019
Merge branch 'master' of https://github.com/microsoft/fluentui-system…
tomi-msft Jun 21, 2022
6832725
Merge branch 'master' of https://github.com/microsoft/fluentui-system…
tomi-msft Jun 21, 2022
5327af7
Merge branch 'master' of https://github.com/microsoft/fluentui-system…
tomi-msft Jun 30, 2022
7b0bbb9
Release 1.1.179
fluentCI Aug 19, 2022
adab308
Merge branch 'master' of https://github.com/microsoft/fluentui-system…
tomi-msft Sep 22, 2022
10cf5fe
merge with main
tomi-msft Oct 24, 2022
3ec81c8
revert
tomi-msft Oct 24, 2022
74ea042
Merge branch 'main' of https://github.com/microsoft/fluentui-system-i…
tomi-msft Oct 31, 2022
934daf2
Merge branch 'main' of https://github.com/microsoft/fluentui-system-i…
tomi-msft Oct 31, 2022
71ecb5b
Merge branch 'main' of https://github.com/microsoft/fluentui-system-i…
tomi-msft Nov 14, 2022
8b6b21c
fix:update bundleIcon utility to handle props properly
tomi-msft Nov 14, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/react-icons/package.json
Expand Up @@ -52,7 +52,7 @@
},
"peerDependencies": {
"@griffel/react": "^1.0.0",
"react": ">=16.8.0 <18.0.0"
"react": ">=16.8.0 <=18.0.0"
},
"files": [
"lib/",
Expand Down
6 changes: 3 additions & 3 deletions packages/react-icons/src/utils/bundleIcon.tsx
Expand Up @@ -10,12 +10,12 @@ const useBundledIconStyles = makeStyles({

const bundleIcon = (FilledIcon: React.FC<FluentIconsProps>, RegularIcon: React.FC<FluentIconsProps>) => {
const Component: React.FC<FluentIconsProps> = (props) => {
const { className, primaryFill = 'currentColor', filled } = props;
const { className, primaryFill = 'currentColor', filled, ...rest } = props;
const styles = useBundledIconStyles();
return (
<React.Fragment>
<FilledIcon
{...props}
{...rest}
className={mergeClasses(
styles.root,
filled && styles.visible,
Expand All @@ -25,7 +25,7 @@ const bundleIcon = (FilledIcon: React.FC<FluentIconsProps>, RegularIcon: React.F
fill={primaryFill}
/>
<RegularIcon
{...props}
{...rest}
className={mergeClasses(
styles.root,
!filled && styles.visible,
Expand Down