Skip to content

RadioGroup Style Fixes 2.0 #2740

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.

Sign up for GitHub

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

Merged
gulnazsayed merged 6 commits into from
Mar 30, 2023
Merged

RadioGroup Style Fixes 2.0 #2740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
34f9a1c
fixed radio variant and radio gap
gulnazsayed Mar 29, 2023
9823663
update screenshots
gulnazsayed Mar 29, 2023
e2dd61a
Change files
gulnazsayed Mar 29, 2023
198a2f9
updated custom test radio button size
gulnazsayed Mar 29, 2023
1089d57
Update CustomizedRadioGroup.tsx
gulnazsayed Mar 29, 2023
ec9ed2c
update snapshots
gulnazsayed Mar 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ...@fluentui-react-native-experimental-radio-group-4f77e469-1f0b-42cf-ac97-b2a772a15f3f.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fixed radio variant and radio gap",
"packageName": "@fluentui-react-native/experimental-radio-group",
"email": "gulnazsayed@microsoft.com",
"dependentChangeType": "patch"
}
Binary file modified packages/experimental/RadioGroup/assets/controlled_radiogroup.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/experimental/RadioGroup/assets/disabled_item.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/experimental/RadioGroup/assets/disabled_radiogroup.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/experimental/RadioGroup/assets/horizontal_radiogroup.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/experimental/RadioGroup/assets/horizontal_stacked_radiogroup.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/experimental/RadioGroup/assets/required_radiogroup.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/experimental/RadioGroup/assets/subtext_radiogroup.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/experimental/RadioGroup/assets/uncontrolled_radiogroup.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions packages/experimental/RadioGroup/src/Radio/RadioTokens.win32.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@ export const defaultRadioTokens: TokenSettings<RadioTokens, Theme> = (t: Theme)
borderRadius: globalTokens.corner.radius40,
radioBorderWidth: globalTokens.stroke.width10,
radioVisibility: 0,
variant: 'subheaderStandard',
variant: 'body1',
radioBorderStyle: 'solid',
radioBorder: t.colors.neutralStrokeAccessible,
color: t.colors.neutralForeground1,
radioOuterCircleSize: globalTokens.size160,
radioInnerCircleSize: globalTokens.size80,
radioOuterCircleBackground: t.colors.neutralBackground1,
labelMarginVertical: globalTokens.size20,
labelMarginVertical: globalTokens.size40,
labelMarginRight: globalTokens.sizeNone,
labelMarginLeft: globalTokens.sizeNone,
subtextVariant: 'caption1',
subtextMarginTop: globalTokens.sizeNone,
subtextMarginBottom: globalTokens.size40 + 1,
marginTop: globalTokens.size60,
marginRight: globalTokens.size40,
marginRight: globalTokens.sizeNone,
marginBottom: globalTokens.size60,
marginLeft: globalTokens.size40,
flexDirection: 'row',
Expand All @@ -43,6 +43,7 @@ export const defaultRadioTokens: TokenSettings<RadioTokens, Theme> = (t: Theme)
labelPadding: globalTokens.size20,
marginLeft: globalTokens.size60,
marginRight: globalTokens.size60,
marginBottom: globalTokens.sizeNone,
},

disabled: {
Expand Down
12 changes: 6 additions & 6 deletions packages/experimental/RadioGroup/src/Radio/__snapshots__/RadioExperimental.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ exports[`Radio component tests Radio default 1`] = `
"justifyContent": "center",
"marginBottom": 6,
"marginLeft": 4,
"marginRight": 4,
"marginRight": 0,
"marginTop": 6,
"width": 16,
}
Expand Down Expand Up @@ -133,11 +133,11 @@ exports[`Radio component tests Radio default 1`] = `
Object {
"color": "#242424",
"fontFamily": "Segoe UI",
"fontSize": 16,
"fontSize": 12,
"fontWeight": "400",
"margin": 0,
"marginHorizontal": 2,
"marginVertical": 2,
"marginVertical": 4,
}
}
>
Expand Down Expand Up @@ -243,7 +243,7 @@ exports[`Radio component tests Radio disabled 1`] = `
"justifyContent": "center",
"marginBottom": 6,
"marginLeft": 4,
"marginRight": 4,
"marginRight": 0,
"marginTop": 6,
"width": 16,
}
Expand Down Expand Up @@ -285,11 +285,11 @@ exports[`Radio component tests Radio disabled 1`] = `
Object {
"color": "#bdbdbd",
"fontFamily": "Segoe UI",
"fontSize": 16,
"fontSize": 12,
"fontWeight": "400",
"margin": 0,
"marginHorizontal": 2,
"marginVertical": 2,
"marginVertical": 4,
}
}
>
Expand Down
68 changes: 34 additions & 34 deletions ...experimental/RadioGroup/src/RadioGroup/__snapshots__/RadioGroupExperimental.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ exports[`RadioGroup component tests Radio not direct child of radio group 1`] =
"justifyContent": "center",
"marginBottom": 6,
"marginLeft": 4,
"marginRight": 4,
"marginRight": 0,
"marginTop": 6,
"width": 16,
}
Expand Down Expand Up @@ -192,11 +192,11 @@ exports[`RadioGroup component tests Radio not direct child of radio group 1`] =
Object {
"color": "#242424",
"fontFamily": "Segoe UI",
"fontSize": 16,
"fontSize": 12,
"fontWeight": "400",
"margin": 0,
"marginHorizontal": 2,
"marginVertical": 2,
"marginVertical": 4,
}
}
>
Expand Down Expand Up @@ -294,7 +294,7 @@ exports[`RadioGroup component tests Radio not direct child of radio group 1`] =
"justifyContent": "center",
"marginBottom": 6,
"marginLeft": 4,
"marginRight": 4,
"marginRight": 0,
"marginTop": 6,
"width": 16,
}
Expand Down Expand Up @@ -336,11 +336,11 @@ exports[`RadioGroup component tests Radio not direct child of radio group 1`] =
Object {
"color": "#242424",
"fontFamily": "Segoe UI",
"fontSize": 16,
"fontSize": 12,
"fontWeight": "400",
"margin": 0,
"marginHorizontal": 2,
"marginVertical": 2,
"marginVertical": 4,
}
}
>
Expand Down Expand Up @@ -503,7 +503,7 @@ exports[`RadioGroup component tests RadioGroup default 1`] = `
"justifyContent": "center",
"marginBottom": 6,
"marginLeft": 4,
"marginRight": 4,
"marginRight": 0,
"marginTop": 6,
"width": 16,
}
Expand Down Expand Up @@ -545,11 +545,11 @@ exports[`RadioGroup component tests RadioGroup default 1`] = `
Object {
"color": "#242424",
"fontFamily": "Segoe UI",
"fontSize": 16,
"fontSize": 12,
"fontWeight": "400",
"margin": 0,
"marginHorizontal": 2,
"marginVertical": 2,
"marginVertical": 4,
}
}
>
Expand Down Expand Up @@ -647,7 +647,7 @@ exports[`RadioGroup component tests RadioGroup default 1`] = `
"justifyContent": "center",
"marginBottom": 6,
"marginLeft": 4,
"marginRight": 4,
"marginRight": 0,
"marginTop": 6,
"width": 16,
}
Expand Down Expand Up @@ -689,11 +689,11 @@ exports[`RadioGroup component tests RadioGroup default 1`] = `
Object {
"color": "#242424",
"fontFamily": "Segoe UI",
"fontSize": 16,
"fontSize": 12,
"fontWeight": "400",
"margin": 0,
"marginHorizontal": 2,
"marginVertical": 2,
"marginVertical": 4,
}
}
>
Expand Down Expand Up @@ -861,7 +861,7 @@ exports[`RadioGroup component tests RadioGroup disabled 1`] = `
"justifyContent": "center",
"marginBottom": 6,
"marginLeft": 4,
"marginRight": 4,
"marginRight": 0,
"marginTop": 6,
"width": 16,
}
Expand Down Expand Up @@ -903,11 +903,11 @@ exports[`RadioGroup component tests RadioGroup disabled 1`] = `
Object {
"color": "#bdbdbd",
"fontFamily": "Segoe UI",
"fontSize": 16,
"fontSize": 12,
"fontWeight": "400",
"margin": 0,
"marginHorizontal": 2,
"marginVertical": 2,
"marginVertical": 4,
}
}
>
Expand Down Expand Up @@ -1010,7 +1010,7 @@ exports[`RadioGroup component tests RadioGroup disabled 1`] = `
"justifyContent": "center",
"marginBottom": 6,
"marginLeft": 4,
"marginRight": 4,
"marginRight": 0,
"marginTop": 6,
"width": 16,
}
Expand Down Expand Up @@ -1052,11 +1052,11 @@ exports[`RadioGroup component tests RadioGroup disabled 1`] = `
Object {
"color": "#bdbdbd",
"fontFamily": "Segoe UI",
"fontSize": 16,
"fontSize": 12,
"fontWeight": "400",
"margin": 0,
"marginHorizontal": 2,
"marginVertical": 2,
"marginVertical": 4,
}
}
>
Expand Down Expand Up @@ -1220,7 +1220,7 @@ exports[`RadioGroup component tests RadioGroup horizontal 1`] = `
"justifyContent": "center",
"marginBottom": 6,
"marginLeft": 4,
"marginRight": 4,
"marginRight": 0,
"marginTop": 6,
"width": 16,
}
Expand Down Expand Up @@ -1262,11 +1262,11 @@ exports[`RadioGroup component tests RadioGroup horizontal 1`] = `
Object {
"color": "#242424",
"fontFamily": "Segoe UI",
"fontSize": 16,
"fontSize": 12,
"fontWeight": "400",
"margin": 0,
"marginHorizontal": 2,
"marginVertical": 2,
"marginVertical": 4,
}
}
>
Expand Down Expand Up @@ -1364,7 +1364,7 @@ exports[`RadioGroup component tests RadioGroup horizontal 1`] = `
"justifyContent": "center",
"marginBottom": 6,
"marginLeft": 4,
"marginRight": 4,
"marginRight": 0,
"marginTop": 6,
"width": 16,
}
Expand Down Expand Up @@ -1406,11 +1406,11 @@ exports[`RadioGroup component tests RadioGroup horizontal 1`] = `
Object {
"color": "#242424",
"fontFamily": "Segoe UI",
"fontSize": 16,
"fontSize": 12,
"fontWeight": "400",
"margin": 0,
"marginHorizontal": 2,
"marginVertical": 2,
"marginVertical": 4,
}
}
>
Expand Down Expand Up @@ -1572,7 +1572,7 @@ exports[`RadioGroup component tests RadioGroup horizontal-stacked 1`] = `
"borderWidth": 1,
"height": 16,
"justifyContent": "center",
"marginBottom": 6,
"marginBottom": 0,
"marginLeft": 6,
"marginRight": 6,
"marginTop": 6,
Expand Down Expand Up @@ -1616,7 +1616,7 @@ exports[`RadioGroup component tests RadioGroup horizontal-stacked 1`] = `
Object {
"color": "#242424",
"fontFamily": "Segoe UI",
"fontSize": 16,
"fontSize": 12,
"fontWeight": "400",
"margin": 0,
"marginHorizontal": 2,
Expand Down Expand Up @@ -1716,7 +1716,7 @@ exports[`RadioGroup component tests RadioGroup horizontal-stacked 1`] = `
"borderWidth": 1,
"height": 16,
"justifyContent": "center",
"marginBottom": 6,
"marginBottom": 0,
"marginLeft": 6,
"marginRight": 6,
"marginTop": 6,
Expand Down Expand Up @@ -1760,7 +1760,7 @@ exports[`RadioGroup component tests RadioGroup horizontal-stacked 1`] = `
Object {
"color": "#242424",
"fontFamily": "Segoe UI",
"fontSize": 16,
"fontSize": 12,
"fontWeight": "400",
"margin": 0,
"marginHorizontal": 2,
Expand Down Expand Up @@ -1944,7 +1944,7 @@ exports[`RadioGroup component tests RadioGroup required 1`] = `
"justifyContent": "center",
"marginBottom": 6,
"marginLeft": 4,
"marginRight": 4,
"marginRight": 0,
"marginTop": 6,
"width": 16,
}
Expand Down Expand Up @@ -1986,11 +1986,11 @@ exports[`RadioGroup component tests RadioGroup required 1`] = `
Object {
"color": "#242424",
"fontFamily": "Segoe UI",
"fontSize": 16,
"fontSize": 12,
"fontWeight": "400",
"margin": 0,
"marginHorizontal": 2,
"marginVertical": 2,
"marginVertical": 4,
}
}
>
Expand Down Expand Up @@ -2088,7 +2088,7 @@ exports[`RadioGroup component tests RadioGroup required 1`] = `
"justifyContent": "center",
"marginBottom": 6,
"marginLeft": 4,
"marginRight": 4,
"marginRight": 0,
"marginTop": 6,
"width": 16,
}
Expand Down Expand Up @@ -2130,11 +2130,11 @@ exports[`RadioGroup component tests RadioGroup required 1`] = `
Object {
"color": "#242424",
"fontFamily": "Segoe UI",
"fontSize": 16,
"fontSize": 12,
"fontWeight": "400",
"margin": 0,
"marginHorizontal": 2,
"marginVertical": 2,
"marginVertical": 4,
}
}
>
Expand Down