Skip to content

Commit f9e474a

Browse files
amgleitmanAdam Gleitman
andauthored
Use a V2 variant style for Notification's action button (#2472)
* Use V2 font variant for notification action button * Update Podfile * Change files Co-authored-by: Adam Gleitman <[email protected]>
1 parent 084e4a2 commit f9e474a

File tree

5 files changed

+19
-10
lines changed

5 files changed

+19
-10
lines changed

apps/fluent-tester/ios/Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ PODS:
1010
- React-jsi (= 0.68.5)
1111
- ReactCommon/turbomodule/core (= 0.68.5)
1212
- fmt (6.2.1)
13-
- FRNAvatar (0.16.30):
13+
- FRNAvatar (0.17.2):
1414
- MicrosoftFluentUI (= 0.10.0)
1515
- React
16-
- FRNDatePicker (0.7.3):
16+
- FRNDatePicker (0.7.4):
1717
- MicrosoftFluentUI (= 0.10.0)
1818
- React
1919
- FRNFontMetrics (0.3.0):
@@ -603,8 +603,8 @@ SPEC CHECKSUMS:
603603
FBLazyVector: 2b47ff52037bd9ae07cc9b051c9975797814b736
604604
FBReactNativeSpec: dd89c4a5591e20015aa55c6efbf9c7740a83efbf
605605
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
606-
FRNAvatar: b57500ffd4955a077c6318e7485de44f4a663042
607-
FRNDatePicker: 898a7629602571ab16ba018407397608874bca2e
606+
FRNAvatar: 6b0c2d8a484aa0829f64397cf23ef5c56feefa63
607+
FRNDatePicker: 009ab6e4e003a9e5d720fb4aea27b94e6cc8a946
608608
FRNFontMetrics: c756b9bb1627909a7673b68caf7a7b14239c212e
609609
glog: 476ee3e89abb49e07f822b48323c51c57124b572
610610
MicrosoftFluentUI: f6db695718efb93f4ca9bdc366c00b80a1f91dba
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Use V2 font variant for notification action button",
4+
"packageName": "@fluentui-react-native/notification",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Update Podfile",
4+
"packageName": "@fluentui-react-native/tester",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

packages/components/Notification/src/Notification.helper.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@ export const NotificationButton = stagedComponent((props: NotificationButtonProp
6060
backgroundColor: 'transparent',
6161
color: props.color,
6262
iconColor: props.color,
63-
fontSize: 15,
64-
fontWeight: '600',
65-
fontLineHeight: 20,
66-
fontLetterSpacing: -0.23, // iOS only prop
6763
disabled: {
6864
color: props.disabledColor,
6965
},
@@ -76,6 +72,7 @@ export const NotificationButton = stagedComponent((props: NotificationButtonProp
7672
minWidth: 0,
7773
padding: globalTokens.sizeNone,
7874
paddingHorizontal: globalTokens.sizeNone,
75+
variant: 'body2Strong',
7976
},
8077
},
8178
});

packages/components/Notification/src/__tests__/__snapshots__/Notification.test.tsx.snap

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,6 @@ exports[`Notification component tests Notification default 1`] = `
218218
"fontFamily": "System",
219219
"fontSize": 15,
220220
"fontWeight": "600",
221-
"letterSpacing": -0.23,
222-
"lineHeight": 20,
223221
"margin": 0,
224222
"marginBottom": 0,
225223
"marginEnd": 0,

0 commit comments

Comments
 (0)