diff --git a/change/@fluentui-react-native-experimental-radio-group-4f77e469-1f0b-42cf-ac97-b2a772a15f3f.json b/change/@fluentui-react-native-experimental-radio-group-4f77e469-1f0b-42cf-ac97-b2a772a15f3f.json new file mode 100644 index 0000000000..436196d5a6 --- /dev/null +++ b/change/@fluentui-react-native-experimental-radio-group-4f77e469-1f0b-42cf-ac97-b2a772a15f3f.json @@ -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" +} diff --git a/packages/experimental/RadioGroup/assets/controlled_radiogroup.png b/packages/experimental/RadioGroup/assets/controlled_radiogroup.png index f9aba0f269..ad94c7f8a6 100644 Binary files a/packages/experimental/RadioGroup/assets/controlled_radiogroup.png and b/packages/experimental/RadioGroup/assets/controlled_radiogroup.png differ diff --git a/packages/experimental/RadioGroup/assets/disabled_item.png b/packages/experimental/RadioGroup/assets/disabled_item.png index 2eb565f70c..ef5ab8e13b 100644 Binary files a/packages/experimental/RadioGroup/assets/disabled_item.png and b/packages/experimental/RadioGroup/assets/disabled_item.png differ diff --git a/packages/experimental/RadioGroup/assets/disabled_radiogroup.png b/packages/experimental/RadioGroup/assets/disabled_radiogroup.png index 87144b6aa9..6e4df53a0a 100644 Binary files a/packages/experimental/RadioGroup/assets/disabled_radiogroup.png and b/packages/experimental/RadioGroup/assets/disabled_radiogroup.png differ diff --git a/packages/experimental/RadioGroup/assets/horizontal_radiogroup.png b/packages/experimental/RadioGroup/assets/horizontal_radiogroup.png index 91a561089b..5a1cf9ce19 100644 Binary files a/packages/experimental/RadioGroup/assets/horizontal_radiogroup.png and b/packages/experimental/RadioGroup/assets/horizontal_radiogroup.png differ diff --git a/packages/experimental/RadioGroup/assets/horizontal_stacked_radiogroup.png b/packages/experimental/RadioGroup/assets/horizontal_stacked_radiogroup.png index c6445d9c01..2025edd09a 100644 Binary files a/packages/experimental/RadioGroup/assets/horizontal_stacked_radiogroup.png and b/packages/experimental/RadioGroup/assets/horizontal_stacked_radiogroup.png differ diff --git a/packages/experimental/RadioGroup/assets/required_radiogroup.png b/packages/experimental/RadioGroup/assets/required_radiogroup.png index b8deefccca..977b153bbe 100644 Binary files a/packages/experimental/RadioGroup/assets/required_radiogroup.png and b/packages/experimental/RadioGroup/assets/required_radiogroup.png differ diff --git a/packages/experimental/RadioGroup/assets/subtext_radiogroup.png b/packages/experimental/RadioGroup/assets/subtext_radiogroup.png index e7d79c6d40..dfcba8dd16 100644 Binary files a/packages/experimental/RadioGroup/assets/subtext_radiogroup.png and b/packages/experimental/RadioGroup/assets/subtext_radiogroup.png differ diff --git a/packages/experimental/RadioGroup/assets/uncontrolled_radiogroup.png b/packages/experimental/RadioGroup/assets/uncontrolled_radiogroup.png index 4c68d23021..eada0acc4f 100644 Binary files a/packages/experimental/RadioGroup/assets/uncontrolled_radiogroup.png and b/packages/experimental/RadioGroup/assets/uncontrolled_radiogroup.png differ diff --git a/packages/experimental/RadioGroup/src/Radio/RadioTokens.win32.ts b/packages/experimental/RadioGroup/src/Radio/RadioTokens.win32.ts index f5a899eec4..8a2ad65e48 100644 --- a/packages/experimental/RadioGroup/src/Radio/RadioTokens.win32.ts +++ b/packages/experimental/RadioGroup/src/Radio/RadioTokens.win32.ts @@ -13,21 +13,21 @@ export const defaultRadioTokens: TokenSettings = (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', @@ -43,6 +43,7 @@ export const defaultRadioTokens: TokenSettings = (t: Theme) labelPadding: globalTokens.size20, marginLeft: globalTokens.size60, marginRight: globalTokens.size60, + marginBottom: globalTokens.sizeNone, }, disabled: { diff --git a/packages/experimental/RadioGroup/src/Radio/__snapshots__/RadioExperimental.test.tsx.snap b/packages/experimental/RadioGroup/src/Radio/__snapshots__/RadioExperimental.test.tsx.snap index 3a9a3b7713..e4618d7ac0 100644 --- a/packages/experimental/RadioGroup/src/Radio/__snapshots__/RadioExperimental.test.tsx.snap +++ b/packages/experimental/RadioGroup/src/Radio/__snapshots__/RadioExperimental.test.tsx.snap @@ -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, } @@ -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, } } > @@ -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, } @@ -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, } } > diff --git a/packages/experimental/RadioGroup/src/RadioGroup/__snapshots__/RadioGroupExperimental.test.tsx.snap b/packages/experimental/RadioGroup/src/RadioGroup/__snapshots__/RadioGroupExperimental.test.tsx.snap index e4acea8aba..7735197734 100644 --- a/packages/experimental/RadioGroup/src/RadioGroup/__snapshots__/RadioGroupExperimental.test.tsx.snap +++ b/packages/experimental/RadioGroup/src/RadioGroup/__snapshots__/RadioGroupExperimental.test.tsx.snap @@ -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, } @@ -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, } } > @@ -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, } @@ -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, } } > @@ -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, } @@ -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, } } > @@ -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, } @@ -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, } } > @@ -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, } @@ -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, } } > @@ -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, } @@ -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, } } > @@ -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, } @@ -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, } } > @@ -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, } @@ -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, } } > @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, } @@ -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, } } > @@ -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, } @@ -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, } } >