Skip to content

Commit c5cb666

Browse files
committed
revert changes to fluent and package.json
1 parent c8f7921 commit c5cb666

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

package.json

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -154,16 +154,6 @@
154154
"on-headers@1.0.2": "^1.1.0",
155155
"brace-expansion@1.1.11": "^1.1.12",
156156
"brace-expansion@2.0.1": "^2.0.2"
157-
},
158-
"onlyBuiltDependencies": [
159-
"@fortawesome/fontawesome-common-types",
160-
"@fortawesome/fontawesome-svg-core",
161-
"@fortawesome/free-solid-svg-icons",
162-
"core-js-pure",
163-
"esbuild",
164-
"nx",
165-
"puppeteer",
166-
"unrs-resolver"
167-
]
157+
}
168158
}
169159
}

packages/fluent/modules/widgets/core/FluentUIButton.jsx

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,11 @@ const FluentUIButton = (props) => {
1919
let renderBtn;
2020
if (!label || hideLabelsFor[type]) {
2121
renderBtn = (bprops) => (
22-
<CommandBarButton
22+
<IconButton
2323
key={type}
2424
onClick={onClick}
2525
disabled={readonly}
26-
text={label}
2726
color="primary"
28-
styles={{
29-
root: {
30-
backgroundColor: "transparent"
31-
}
32-
}}
3327
{...bprops}
3428
/>
3529
);
@@ -39,6 +33,7 @@ const FluentUIButton = (props) => {
3933
key={type}
4034
onClick={onClick}
4135
disabled={readonly}
36+
text={label}
4237
{...bprops}
4338
/>
4439
);
@@ -48,16 +43,35 @@ const FluentUIButton = (props) => {
4843
key={type}
4944
onClick={onClick}
5045
disabled={readonly}
46+
text={label}
47+
color="primary"
48+
styles={{
49+
root: {
50+
backgroundColor: "transparent"
51+
}
52+
}}
5153
{...bprops}
5254
/>
5355
);
5456
}
5557

58+
const renderDefaultButton = (bprops) => (
59+
<DefaultButton
60+
key={type}
61+
onClick={onClick}
62+
disabled={readonly}
63+
text={label}
64+
color="primary"
65+
{...bprops}
66+
/>
67+
);
68+
5669
const iconProps = {
5770
type,
5871
readonly,
5972
config,
6073
renderBtn,
74+
renderDefaultButton,
6175
};
6276
const buttonIcon = renderIcon?.(iconProps);
6377

0 commit comments

Comments
 (0)