diff --git a/apps/fluent-tester/src/TestComponents/RadioGroupV1/CustomizedRadioGroup.tsx b/apps/fluent-tester/src/TestComponents/RadioGroupV1/CustomizedRadioGroup.tsx index c0e32e88ef..936c6a35f7 100644 --- a/apps/fluent-tester/src/TestComponents/RadioGroupV1/CustomizedRadioGroup.tsx +++ b/apps/fluent-tester/src/TestComponents/RadioGroupV1/CustomizedRadioGroup.tsx @@ -38,7 +38,7 @@ export const CustomizedRadioGroup: React.FunctionComponent = () => { const [marginRight, setMarginRight] = React.useState(6); const [marginBottom, setMarginBottom] = React.useState(6); const [marginLeft, setMarginLeft] = React.useState(4); - const [labelMarginTop, setLabelMarginTop] = React.useState(5); + const [labelMarginVertical, setLabelMarginVertical] = React.useState(4); const [labelMarginRight, setLabelMarginRight] = React.useState(2); const [labelMarginLeft, setLabelMarginLeft] = React.useState(0); const [subtextMarginTop, setSubtextMarginTop] = React.useState(2); @@ -71,7 +71,7 @@ export const CustomizedRadioGroup: React.FunctionComponent = () => { marginRight, marginBottom, marginLeft, - labelMarginTop, + labelMarginVertical, labelMarginRight, labelMarginLeft, subtextMarginTop, @@ -138,7 +138,7 @@ export const CustomizedRadioGroup: React.FunctionComponent = () => { marginRight, marginBottom, marginLeft, - labelMarginTop, + labelMarginVertical, labelMarginRight, labelMarginLeft, subtextMarginTop, @@ -315,12 +315,12 @@ export const CustomizedRadioGroup: React.FunctionComponent = () => { }} /> { - setLabelMarginTop(parseInt(e.nativeEvent.text.toString())); + setLabelMarginVertical(parseInt(e.nativeEvent.text.toString())); }} /> ; - - /** - * Whether to use native focus visuals for the component - * @default true - */ - enableFocusRing?: boolean; } ``` diff --git a/packages/experimental/RadioGroup/assets/controlled_radiogroup.png b/packages/experimental/RadioGroup/assets/controlled_radiogroup.png index 3418c9f06a..f9aba0f269 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 bfd5ed664e..2eb565f70c 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 8fdc699443..87144b6aa9 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 74898c198d..91a561089b 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 50e2af2013..c6445d9c01 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 9a5de775cc..b8deefccca 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 e9af7ec04a..e7d79c6d40 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 56f77ec3db..4c68d23021 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/Radio.styling.ts b/packages/experimental/RadioGroup/src/Radio/Radio.styling.ts index 7e63cd5e91..62e622f77d 100644 --- a/packages/experimental/RadioGroup/src/Radio/Radio.styling.ts +++ b/packages/experimental/RadioGroup/src/Radio/Radio.styling.ts @@ -13,23 +13,22 @@ export const stylingSettings: UseStylingOptions ({ + (tokens: RadioTokens) => ({ style: { display: 'flex', alignItems: tokens.alignItems, flexDirection: tokens.flexDirection, paddingHorizontal: tokens.rootHorizontalPadding, paddingVertical: tokens.rootVerticalPadding, - ...borderStyles.from(tokens, theme), }, android_ripple: { color: tokens.rippleColor }, }), - ['flexDirection', 'rootHorizontalPadding', 'rootVerticalPadding', 'rippleColor', 'alignItems', ...borderStyles.keys], + ['flexDirection', 'rootHorizontalPadding', 'rootVerticalPadding', 'rippleColor', 'alignItems'], ), button: buildProps( (tokens: RadioTokens) => ({ style: { - backgroundColor: 'transparent', + backgroundColor: tokens.radioOuterCircleBackground, width: tokens.radioOuterCircleSize, height: tokens.radioOuterCircleSize, alignItems: 'center', @@ -46,6 +45,7 @@ export const stylingSettings: UseStylingOptions ({ + (tokens: RadioTokens, theme: Theme) => ({ style: { alignItems: tokens.labelAlignItems, flexDirection: 'column', marginRight: tokens.labelMarginRight, marginLeft: tokens.labelMarginLeft, padding: tokens.labelPadding, + paddingRight: 0, + ...borderStyles.from(tokens, theme), }, }), - ['labelAlignItems', 'labelMarginRight', 'labelMarginLeft', 'labelPadding'], + ['labelAlignItems', 'labelMarginRight', 'labelMarginLeft', 'labelPadding', ...borderStyles.keys], ), label: buildProps( (tokens: RadioTokens, theme: Theme) => ({ variant: tokens.variant, style: { - marginTop: tokens.labelMarginTop, + marginVertical: tokens.labelMarginVertical, + marginHorizontal: 2, color: tokens.color, ...fontStyles.from(tokens, theme), }, }), - ['variant', 'labelMarginTop', 'color', ...fontStyles.keys], + ['variant', 'labelMarginVertical', 'color', ...fontStyles.keys], ), subtext: buildProps( (tokens: RadioTokens) => ({ @@ -99,6 +102,7 @@ export const stylingSettings: UseStylingOptions({ // now return the handler for finishing render return (final: RadioProps) => { const { label, subtext, ...mergedProps } = mergeProps(radio.props, final); - const { onPress, disabled } = mergedProps; + const { onPress, disabled, onPressIn, onPressOut } = mergedProps; const isMobile = Platform.OS === 'android' || Platform.OS === 'ios'; const labelComponent = ( @@ -53,7 +53,14 @@ export const Radio = compose({ return ( - + {labelComponent} diff --git a/packages/experimental/RadioGroup/src/Radio/Radio.types.ts b/packages/experimental/RadioGroup/src/Radio/Radio.types.ts index e5c129845a..a13602f5eb 100644 --- a/packages/experimental/RadioGroup/src/Radio/Radio.types.ts +++ b/packages/experimental/RadioGroup/src/Radio/Radio.types.ts @@ -60,6 +60,11 @@ export interface RadioTokens extends FontTokens, IColorTokens, IForegroundColorT */ radioBorderWidth?: number; + /** + * Background color of outer circle + */ + radioOuterCircleBackground?: ColorValue; + /** * The flex direction of the root */ @@ -98,7 +103,7 @@ export interface RadioTokens extends FontTokens, IColorTokens, IForegroundColorT /** * Label's top margin. */ - labelMarginTop?: ViewStyle['marginTop']; + labelMarginVertical?: ViewStyle['marginVertical']; /** * Label's right margin. diff --git a/packages/experimental/RadioGroup/src/Radio/RadioTokens.ts b/packages/experimental/RadioGroup/src/Radio/RadioTokens.ts index 0af2c4ee7d..7775be09fa 100644 --- a/packages/experimental/RadioGroup/src/Radio/RadioTokens.ts +++ b/packages/experimental/RadioGroup/src/Radio/RadioTokens.ts @@ -17,14 +17,14 @@ export const defaultRadioTokens: TokenSettings = (t: Theme) radioBorderStyle: 'solid', radioBorder: t.colors.neutralStrokeAccessible, color: t.colors.neutralForeground3, - radioOuterCircleSize: 20, - radioInnerCircleSize: 10, - labelMarginTop: globalTokens.size40 + 1, + radioOuterCircleSize: globalTokens.size200, + radioInnerCircleSize: globalTokens.size100, + labelMarginVertical: globalTokens.size40, labelMarginRight: globalTokens.size20, labelMarginLeft: globalTokens.sizeNone, subtextVariant: 'caption1', - subtextMarginTop: globalTokens.size20, - subtextMarginBottom: globalTokens.size20, + subtextMarginTop: globalTokens.sizeNone, + subtextMarginBottom: globalTokens.size40 + 1, marginTop: globalTokens.size60, marginRight: globalTokens.size60, marginBottom: globalTokens.size60, @@ -77,8 +77,6 @@ export const defaultRadioTokens: TokenSettings = (t: Theme) }, focused: { - borderColor: t.colors.focusBorder, - selected: { // Checked, Focused radioVisibility: 1, diff --git a/packages/experimental/RadioGroup/src/Radio/RadioTokens.win32.ts b/packages/experimental/RadioGroup/src/Radio/RadioTokens.win32.ts new file mode 100644 index 0000000000..f5a899eec4 --- /dev/null +++ b/packages/experimental/RadioGroup/src/Radio/RadioTokens.win32.ts @@ -0,0 +1,111 @@ +import type { Theme } from '@fluentui-react-native/framework'; +import { globalTokens } from '@fluentui-react-native/theme-tokens'; +import type { TokenSettings } from '@fluentui-react-native/use-styling'; + +import type { RadioTokens } from './Radio.types'; + +export const defaultRadioTokens: TokenSettings = (t: Theme) => + ({ + rootHorizontalPadding: globalTokens.size40, + borderColor: t.colors.transparentStroke, + borderStyle: 'solid', + borderWidth: globalTokens.stroke.width20, + borderRadius: globalTokens.corner.radius40, + radioBorderWidth: globalTokens.stroke.width10, + radioVisibility: 0, + variant: 'subheaderStandard', + radioBorderStyle: 'solid', + radioBorder: t.colors.neutralStrokeAccessible, + color: t.colors.neutralForeground1, + radioOuterCircleSize: globalTokens.size160, + radioInnerCircleSize: globalTokens.size80, + radioOuterCircleBackground: t.colors.neutralBackground1, + labelMarginVertical: globalTokens.size20, + labelMarginRight: globalTokens.sizeNone, + labelMarginLeft: globalTokens.sizeNone, + subtextVariant: 'caption1', + subtextMarginTop: globalTokens.sizeNone, + subtextMarginBottom: globalTokens.size40 + 1, + marginTop: globalTokens.size60, + marginRight: globalTokens.size40, + marginBottom: globalTokens.size60, + marginLeft: globalTokens.size40, + flexDirection: 'row', + alignItems: 'flex-start', + labelAlignItems: 'flex-start', + + labelPositionBelow: { + flexDirection: 'column', + alignItems: 'center', + labelAlignItems: 'center', + labelMarginRight: globalTokens.sizeNone, + labelMarginVertical: globalTokens.size20, + labelPadding: globalTokens.size20, + marginLeft: globalTokens.size60, + marginRight: globalTokens.size60, + }, + + disabled: { + // Unchecked, Disabled + radioOuterCircleBackground: t.colors.neutralBackgroundDisabled, + radioBorder: t.colors.neutralStrokeDisabled, + color: t.colors.neutralForegroundDisabled, + radioVisibility: 0, + }, + + hovered: { + // Unchecked, Hover + radioOuterCircleBackground: t.colors.neutralBackground1, + radioBorder: t.colors.neutralStrokeAccessibleHover, + color: t.colors.neutralForeground1, + + selected: { + // Checked, Hover + radioOuterCircleBackground: t.colors.brandBackgroundHover, + radioBorder: t.colors.compoundBrandStroke1Hover, + radioFill: t.colors.neutralForegroundOnBrand, + color: t.colors.neutralForeground1, + radioVisibility: 1, + radioInnerCircleSize: 10, + }, + }, + + pressed: { + // Unchecked, Pressed + radioOuterCircleBackground: t.colors.neutralBackground1, + radioBorder: t.colors.neutralStrokeAccessiblePressed, + color: t.colors.neutralForeground1, + + selected: { + // Checked, Pressed + radioOuterCircleBackground: t.colors.brandBackgroundPressed, + radioBorder: t.colors.compoundBrandStroke1Pressed, + radioFill: t.colors.neutralForegroundOnBrand, + color: t.colors.neutralForeground1, + radioVisibility: 1, + radioInnerCircleSize: 6, + }, + }, + + focused: { + borderColor: t.colors.strokeFocus2, + selected: { + // Checked, Focused + radioVisibility: 1, + }, + }, + + selected: { + // Checked, Rest + radioOuterCircleBackground: t.colors.brandBackground, + radioBorder: t.colors.compoundBrandStroke1, + radioFill: t.colors.neutralForegroundOnBrand, + color: t.colors.neutralForeground1, + radioVisibility: 1, + + disabled: { + // Checked, Disabled + radioFill: t.colors.neutralForegroundDisabled, + }, + }, + } as RadioTokens); 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 4da94d4dbc..3a9a3b7713 100644 --- a/packages/experimental/RadioGroup/src/Radio/__snapshots__/RadioExperimental.test.tsx.snap +++ b/packages/experimental/RadioGroup/src/Radio/__snapshots__/RadioExperimental.test.tsx.snap @@ -20,7 +20,6 @@ exports[`Radio component tests Radio default 1`] = ` } } accessible={true} - enableFocusRing={true} focusable={true} keyDownEvents={ Array [ @@ -56,10 +55,6 @@ exports[`Radio component tests Radio default 1`] = ` style={ Object { "alignItems": "flex-start", - "borderColor": "transparent", - "borderRadius": 4, - "borderStyle": "solid", - "borderWidth": 1, "display": "flex", "flexDirection": "row", "paddingHorizontal": 4, @@ -87,18 +82,18 @@ exports[`Radio component tests Radio default 1`] = ` style={ Object { "alignItems": "center", - "backgroundColor": "transparent", + "backgroundColor": "#ffffff", "borderColor": "#616161", - "borderRadius": 10, + "borderRadius": 8, "borderStyle": "solid", "borderWidth": 1, - "height": 20, + "height": 16, "justifyContent": "center", "marginBottom": 6, "marginLeft": 4, - "marginRight": 6, + "marginRight": 4, "marginTop": 6, - "width": 20, + "width": 16, } } > @@ -106,10 +101,10 @@ exports[`Radio component tests Radio default 1`] = ` style={ Object { "backgroundColor": undefined, - "borderRadius": 5, - "height": 10, + "borderRadius": 4, + "height": 8, "opacity": 0, - "width": 10, + "width": 8, } } /> @@ -118,10 +113,15 @@ exports[`Radio component tests Radio default 1`] = ` style={ Object { "alignItems": "flex-start", + "borderColor": "transparent", + "borderRadius": 4, + "borderStyle": "solid", + "borderWidth": 2, "flexDirection": "column", "marginLeft": 0, - "marginRight": 2, + "marginRight": 0, "padding": undefined, + "paddingRight": 0, } } > @@ -131,12 +131,13 @@ exports[`Radio component tests Radio default 1`] = ` onAccessibilityTap={[Function]} style={ Object { - "color": "#616161", + "color": "#242424", "fontFamily": "Segoe UI", "fontSize": 16, "fontWeight": "400", "margin": 0, - "marginTop": 5, + "marginHorizontal": 2, + "marginVertical": 2, } } > @@ -166,7 +167,6 @@ exports[`Radio component tests Radio disabled 1`] = ` } } accessible={true} - enableFocusRing={true} focusable={false} keyDownEvents={ Array [ @@ -202,10 +202,6 @@ exports[`Radio component tests Radio disabled 1`] = ` style={ Object { "alignItems": "flex-start", - "borderColor": "transparent", - "borderRadius": 4, - "borderStyle": "solid", - "borderWidth": 1, "display": "flex", "flexDirection": "row", "paddingHorizontal": 4, @@ -238,18 +234,18 @@ exports[`Radio component tests Radio disabled 1`] = ` style={ Object { "alignItems": "center", - "backgroundColor": "transparent", - "borderColor": "#bdbdbd", - "borderRadius": 10, + "backgroundColor": "#f0f0f0", + "borderColor": "#e0e0e0", + "borderRadius": 8, "borderStyle": "solid", "borderWidth": 1, - "height": 20, + "height": 16, "justifyContent": "center", "marginBottom": 6, "marginLeft": 4, - "marginRight": 6, + "marginRight": 4, "marginTop": 6, - "width": 20, + "width": 16, } } > @@ -257,10 +253,10 @@ exports[`Radio component tests Radio disabled 1`] = ` style={ Object { "backgroundColor": undefined, - "borderRadius": 5, - "height": 10, + "borderRadius": 4, + "height": 8, "opacity": 0, - "width": 10, + "width": 8, } } /> @@ -269,10 +265,15 @@ exports[`Radio component tests Radio disabled 1`] = ` style={ Object { "alignItems": "flex-start", + "borderColor": "transparent", + "borderRadius": 4, + "borderStyle": "solid", + "borderWidth": 2, "flexDirection": "column", "marginLeft": 0, - "marginRight": 2, + "marginRight": 0, "padding": undefined, + "paddingRight": 0, } } > @@ -287,7 +288,8 @@ exports[`Radio component tests Radio disabled 1`] = ` "fontSize": 16, "fontWeight": "400", "margin": 0, - "marginTop": 5, + "marginHorizontal": 2, + "marginVertical": 2, } } > diff --git a/packages/experimental/RadioGroup/src/Radio/useRadio.win32.ts b/packages/experimental/RadioGroup/src/Radio/useRadio.win32.ts index d9f52b99a2..6b53859ae8 100644 --- a/packages/experimental/RadioGroup/src/Radio/useRadio.win32.ts +++ b/packages/experimental/RadioGroup/src/Radio/useRadio.win32.ts @@ -37,7 +37,6 @@ export const useRadio = (props: RadioProps): RadioInfo => { componentRef = defaultComponentRef, accessibilityPositionInSet, accessibilitySetSize, - enableFocusRing, ...rest } = props; @@ -170,7 +169,6 @@ export const useRadio = (props: RadioProps): RadioInfo => { accessibilitySetSize: accessibilitySetSize ?? radioGroupContext.values.length, focusable: !state.disabled, disabled: isDisabled, - enableFocusRing: enableFocusRing ?? true, onAccessibilityAction: onAccessibilityAction, ...onKeyDownProps, }, 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 a19c673916..e4acea8aba 100644 --- a/packages/experimental/RadioGroup/src/RadioGroup/__snapshots__/RadioGroupExperimental.test.tsx.snap +++ b/packages/experimental/RadioGroup/src/RadioGroup/__snapshots__/RadioGroupExperimental.test.tsx.snap @@ -79,7 +79,6 @@ exports[`RadioGroup component tests Radio not direct child of radio group 1`] = } } accessible={true} - enableFocusRing={true} focusable={true} keyDownEvents={ Array [ @@ -115,10 +114,6 @@ exports[`RadioGroup component tests Radio not direct child of radio group 1`] = style={ Object { "alignItems": "flex-start", - "borderColor": "transparent", - "borderRadius": 4, - "borderStyle": "solid", - "borderWidth": 1, "display": "flex", "flexDirection": "row", "paddingHorizontal": 4, @@ -146,18 +141,18 @@ exports[`RadioGroup component tests Radio not direct child of radio group 1`] = style={ Object { "alignItems": "center", - "backgroundColor": "transparent", + "backgroundColor": "#ffffff", "borderColor": "#616161", - "borderRadius": 10, + "borderRadius": 8, "borderStyle": "solid", "borderWidth": 1, - "height": 20, + "height": 16, "justifyContent": "center", "marginBottom": 6, "marginLeft": 4, - "marginRight": 6, + "marginRight": 4, "marginTop": 6, - "width": 20, + "width": 16, } } > @@ -165,10 +160,10 @@ exports[`RadioGroup component tests Radio not direct child of radio group 1`] = style={ Object { "backgroundColor": undefined, - "borderRadius": 5, - "height": 10, + "borderRadius": 4, + "height": 8, "opacity": 0, - "width": 10, + "width": 8, } } /> @@ -177,10 +172,15 @@ exports[`RadioGroup component tests Radio not direct child of radio group 1`] = style={ Object { "alignItems": "flex-start", + "borderColor": "transparent", + "borderRadius": 4, + "borderStyle": "solid", + "borderWidth": 2, "flexDirection": "column", "marginLeft": 0, - "marginRight": 2, + "marginRight": 0, "padding": undefined, + "paddingRight": 0, } } > @@ -190,12 +190,13 @@ exports[`RadioGroup component tests Radio not direct child of radio group 1`] = onAccessibilityTap={[Function]} style={ Object { - "color": "#616161", + "color": "#242424", "fontFamily": "Segoe UI", "fontSize": 16, "fontWeight": "400", "margin": 0, - "marginTop": 5, + "marginHorizontal": 2, + "marginVertical": 2, } } > @@ -222,7 +223,6 @@ exports[`RadioGroup component tests Radio not direct child of radio group 1`] = } } accessible={true} - enableFocusRing={true} focusable={true} keyDownEvents={ Array [ @@ -258,10 +258,6 @@ exports[`RadioGroup component tests Radio not direct child of radio group 1`] = style={ Object { "alignItems": "flex-start", - "borderColor": "transparent", - "borderRadius": 4, - "borderStyle": "solid", - "borderWidth": 1, "display": "flex", "flexDirection": "row", "paddingHorizontal": 4, @@ -289,29 +285,29 @@ exports[`RadioGroup component tests Radio not direct child of radio group 1`] = style={ Object { "alignItems": "center", - "backgroundColor": "transparent", + "backgroundColor": "#0078d4", "borderColor": "#0078d4", - "borderRadius": 10, + "borderRadius": 8, "borderStyle": "solid", "borderWidth": 1, - "height": 20, + "height": 16, "justifyContent": "center", "marginBottom": 6, "marginLeft": 4, - "marginRight": 6, + "marginRight": 4, "marginTop": 6, - "width": 20, + "width": 16, } } > @@ -320,10 +316,15 @@ exports[`RadioGroup component tests Radio not direct child of radio group 1`] = style={ Object { "alignItems": "flex-start", + "borderColor": "transparent", + "borderRadius": 4, + "borderStyle": "solid", + "borderWidth": 2, "flexDirection": "column", "marginLeft": 0, - "marginRight": 2, + "marginRight": 0, "padding": undefined, + "paddingRight": 0, } } > @@ -333,12 +334,13 @@ exports[`RadioGroup component tests Radio not direct child of radio group 1`] = onAccessibilityTap={[Function]} style={ Object { - "color": "#616161", + "color": "#242424", "fontFamily": "Segoe UI", "fontSize": 16, "fontWeight": "400", "margin": 0, - "marginTop": 5, + "marginHorizontal": 2, + "marginVertical": 2, } } > @@ -430,7 +432,6 @@ exports[`RadioGroup component tests RadioGroup default 1`] = ` } } accessible={true} - enableFocusRing={true} focusable={true} keyDownEvents={ Array [ @@ -466,10 +467,6 @@ exports[`RadioGroup component tests RadioGroup default 1`] = ` style={ Object { "alignItems": "flex-start", - "borderColor": "transparent", - "borderRadius": 4, - "borderStyle": "solid", - "borderWidth": 1, "display": "flex", "flexDirection": "row", "paddingHorizontal": 4, @@ -497,18 +494,18 @@ exports[`RadioGroup component tests RadioGroup default 1`] = ` style={ Object { "alignItems": "center", - "backgroundColor": "transparent", + "backgroundColor": "#ffffff", "borderColor": "#616161", - "borderRadius": 10, + "borderRadius": 8, "borderStyle": "solid", "borderWidth": 1, - "height": 20, + "height": 16, "justifyContent": "center", "marginBottom": 6, "marginLeft": 4, - "marginRight": 6, + "marginRight": 4, "marginTop": 6, - "width": 20, + "width": 16, } } > @@ -516,10 +513,10 @@ exports[`RadioGroup component tests RadioGroup default 1`] = ` style={ Object { "backgroundColor": undefined, - "borderRadius": 5, - "height": 10, + "borderRadius": 4, + "height": 8, "opacity": 0, - "width": 10, + "width": 8, } } /> @@ -528,10 +525,15 @@ exports[`RadioGroup component tests RadioGroup default 1`] = ` style={ Object { "alignItems": "flex-start", + "borderColor": "transparent", + "borderRadius": 4, + "borderStyle": "solid", + "borderWidth": 2, "flexDirection": "column", "marginLeft": 0, - "marginRight": 2, + "marginRight": 0, "padding": undefined, + "paddingRight": 0, } } > @@ -541,12 +543,13 @@ exports[`RadioGroup component tests RadioGroup default 1`] = ` onAccessibilityTap={[Function]} style={ Object { - "color": "#616161", + "color": "#242424", "fontFamily": "Segoe UI", "fontSize": 16, "fontWeight": "400", "margin": 0, - "marginTop": 5, + "marginHorizontal": 2, + "marginVertical": 2, } } > @@ -573,7 +576,6 @@ exports[`RadioGroup component tests RadioGroup default 1`] = ` } } accessible={true} - enableFocusRing={true} focusable={true} keyDownEvents={ Array [ @@ -609,10 +611,6 @@ exports[`RadioGroup component tests RadioGroup default 1`] = ` style={ Object { "alignItems": "flex-start", - "borderColor": "transparent", - "borderRadius": 4, - "borderStyle": "solid", - "borderWidth": 1, "display": "flex", "flexDirection": "row", "paddingHorizontal": 4, @@ -640,29 +638,29 @@ exports[`RadioGroup component tests RadioGroup default 1`] = ` style={ Object { "alignItems": "center", - "backgroundColor": "transparent", + "backgroundColor": "#0078d4", "borderColor": "#0078d4", - "borderRadius": 10, + "borderRadius": 8, "borderStyle": "solid", "borderWidth": 1, - "height": 20, + "height": 16, "justifyContent": "center", "marginBottom": 6, "marginLeft": 4, - "marginRight": 6, + "marginRight": 4, "marginTop": 6, - "width": 20, + "width": 16, } } > @@ -671,10 +669,15 @@ exports[`RadioGroup component tests RadioGroup default 1`] = ` style={ Object { "alignItems": "flex-start", + "borderColor": "transparent", + "borderRadius": 4, + "borderStyle": "solid", + "borderWidth": 2, "flexDirection": "column", "marginLeft": 0, - "marginRight": 2, + "marginRight": 0, "padding": undefined, + "paddingRight": 0, } } > @@ -684,12 +687,13 @@ exports[`RadioGroup component tests RadioGroup default 1`] = ` onAccessibilityTap={[Function]} style={ Object { - "color": "#616161", + "color": "#242424", "fontFamily": "Segoe UI", "fontSize": 16, "fontWeight": "400", "margin": 0, - "marginTop": 5, + "marginHorizontal": 2, + "marginVertical": 2, } } > @@ -781,7 +785,6 @@ exports[`RadioGroup component tests RadioGroup disabled 1`] = ` } } accessible={true} - enableFocusRing={true} focusable={false} keyDownEvents={ Array [ @@ -817,10 +820,6 @@ exports[`RadioGroup component tests RadioGroup disabled 1`] = ` style={ Object { "alignItems": "flex-start", - "borderColor": "transparent", - "borderRadius": 4, - "borderStyle": "solid", - "borderWidth": 1, "display": "flex", "flexDirection": "row", "paddingHorizontal": 4, @@ -853,18 +852,18 @@ exports[`RadioGroup component tests RadioGroup disabled 1`] = ` style={ Object { "alignItems": "center", - "backgroundColor": "transparent", - "borderColor": "#bdbdbd", - "borderRadius": 10, + "backgroundColor": "#f0f0f0", + "borderColor": "#e0e0e0", + "borderRadius": 8, "borderStyle": "solid", "borderWidth": 1, - "height": 20, + "height": 16, "justifyContent": "center", "marginBottom": 6, "marginLeft": 4, - "marginRight": 6, + "marginRight": 4, "marginTop": 6, - "width": 20, + "width": 16, } } > @@ -872,10 +871,10 @@ exports[`RadioGroup component tests RadioGroup disabled 1`] = ` style={ Object { "backgroundColor": undefined, - "borderRadius": 5, - "height": 10, + "borderRadius": 4, + "height": 8, "opacity": 0, - "width": 10, + "width": 8, } } /> @@ -884,10 +883,15 @@ exports[`RadioGroup component tests RadioGroup disabled 1`] = ` style={ Object { "alignItems": "flex-start", + "borderColor": "transparent", + "borderRadius": 4, + "borderStyle": "solid", + "borderWidth": 2, "flexDirection": "column", "marginLeft": 0, - "marginRight": 2, + "marginRight": 0, "padding": undefined, + "paddingRight": 0, } } > @@ -902,7 +906,8 @@ exports[`RadioGroup component tests RadioGroup disabled 1`] = ` "fontSize": 16, "fontWeight": "400", "margin": 0, - "marginTop": 5, + "marginHorizontal": 2, + "marginVertical": 2, } } > @@ -929,7 +934,6 @@ exports[`RadioGroup component tests RadioGroup disabled 1`] = ` } } accessible={true} - enableFocusRing={true} focusable={false} keyDownEvents={ Array [ @@ -965,10 +969,6 @@ exports[`RadioGroup component tests RadioGroup disabled 1`] = ` style={ Object { "alignItems": "flex-start", - "borderColor": "transparent", - "borderRadius": 4, - "borderStyle": "solid", - "borderWidth": 1, "display": "flex", "flexDirection": "row", "paddingHorizontal": 4, @@ -1001,18 +1001,18 @@ exports[`RadioGroup component tests RadioGroup disabled 1`] = ` style={ Object { "alignItems": "center", - "backgroundColor": "transparent", - "borderColor": "#bdbdbd", - "borderRadius": 10, + "backgroundColor": "#f0f0f0", + "borderColor": "#e0e0e0", + "borderRadius": 8, "borderStyle": "solid", "borderWidth": 1, - "height": 20, + "height": 16, "justifyContent": "center", "marginBottom": 6, "marginLeft": 4, - "marginRight": 6, + "marginRight": 4, "marginTop": 6, - "width": 20, + "width": 16, } } > @@ -1020,10 +1020,10 @@ exports[`RadioGroup component tests RadioGroup disabled 1`] = ` style={ Object { "backgroundColor": undefined, - "borderRadius": 5, - "height": 10, + "borderRadius": 4, + "height": 8, "opacity": 0, - "width": 10, + "width": 8, } } /> @@ -1032,10 +1032,15 @@ exports[`RadioGroup component tests RadioGroup disabled 1`] = ` style={ Object { "alignItems": "flex-start", + "borderColor": "transparent", + "borderRadius": 4, + "borderStyle": "solid", + "borderWidth": 2, "flexDirection": "column", "marginLeft": 0, - "marginRight": 2, + "marginRight": 0, "padding": undefined, + "paddingRight": 0, } } > @@ -1050,7 +1055,8 @@ exports[`RadioGroup component tests RadioGroup disabled 1`] = ` "fontSize": 16, "fontWeight": "400", "margin": 0, - "marginTop": 5, + "marginHorizontal": 2, + "marginVertical": 2, } } > @@ -1143,7 +1149,6 @@ exports[`RadioGroup component tests RadioGroup horizontal 1`] = ` } } accessible={true} - enableFocusRing={true} focusable={true} keyDownEvents={ Array [ @@ -1179,10 +1184,6 @@ exports[`RadioGroup component tests RadioGroup horizontal 1`] = ` style={ Object { "alignItems": "flex-start", - "borderColor": "transparent", - "borderRadius": 4, - "borderStyle": "solid", - "borderWidth": 1, "display": "flex", "flexDirection": "row", "paddingHorizontal": 4, @@ -1210,18 +1211,18 @@ exports[`RadioGroup component tests RadioGroup horizontal 1`] = ` style={ Object { "alignItems": "center", - "backgroundColor": "transparent", + "backgroundColor": "#ffffff", "borderColor": "#616161", - "borderRadius": 10, + "borderRadius": 8, "borderStyle": "solid", "borderWidth": 1, - "height": 20, + "height": 16, "justifyContent": "center", "marginBottom": 6, "marginLeft": 4, - "marginRight": 6, + "marginRight": 4, "marginTop": 6, - "width": 20, + "width": 16, } } > @@ -1229,10 +1230,10 @@ exports[`RadioGroup component tests RadioGroup horizontal 1`] = ` style={ Object { "backgroundColor": undefined, - "borderRadius": 5, - "height": 10, + "borderRadius": 4, + "height": 8, "opacity": 0, - "width": 10, + "width": 8, } } /> @@ -1241,10 +1242,15 @@ exports[`RadioGroup component tests RadioGroup horizontal 1`] = ` style={ Object { "alignItems": "flex-start", + "borderColor": "transparent", + "borderRadius": 4, + "borderStyle": "solid", + "borderWidth": 2, "flexDirection": "column", "marginLeft": 0, - "marginRight": 2, + "marginRight": 0, "padding": undefined, + "paddingRight": 0, } } > @@ -1254,12 +1260,13 @@ exports[`RadioGroup component tests RadioGroup horizontal 1`] = ` onAccessibilityTap={[Function]} style={ Object { - "color": "#616161", + "color": "#242424", "fontFamily": "Segoe UI", "fontSize": 16, "fontWeight": "400", "margin": 0, - "marginTop": 5, + "marginHorizontal": 2, + "marginVertical": 2, } } > @@ -1286,7 +1293,6 @@ exports[`RadioGroup component tests RadioGroup horizontal 1`] = ` } } accessible={true} - enableFocusRing={true} focusable={true} keyDownEvents={ Array [ @@ -1322,10 +1328,6 @@ exports[`RadioGroup component tests RadioGroup horizontal 1`] = ` style={ Object { "alignItems": "flex-start", - "borderColor": "transparent", - "borderRadius": 4, - "borderStyle": "solid", - "borderWidth": 1, "display": "flex", "flexDirection": "row", "paddingHorizontal": 4, @@ -1353,29 +1355,29 @@ exports[`RadioGroup component tests RadioGroup horizontal 1`] = ` style={ Object { "alignItems": "center", - "backgroundColor": "transparent", + "backgroundColor": "#0078d4", "borderColor": "#0078d4", - "borderRadius": 10, + "borderRadius": 8, "borderStyle": "solid", "borderWidth": 1, - "height": 20, + "height": 16, "justifyContent": "center", "marginBottom": 6, "marginLeft": 4, - "marginRight": 6, + "marginRight": 4, "marginTop": 6, - "width": 20, + "width": 16, } } > @@ -1384,10 +1386,15 @@ exports[`RadioGroup component tests RadioGroup horizontal 1`] = ` style={ Object { "alignItems": "flex-start", + "borderColor": "transparent", + "borderRadius": 4, + "borderStyle": "solid", + "borderWidth": 2, "flexDirection": "column", "marginLeft": 0, - "marginRight": 2, + "marginRight": 0, "padding": undefined, + "paddingRight": 0, } } > @@ -1397,12 +1404,13 @@ exports[`RadioGroup component tests RadioGroup horizontal 1`] = ` onAccessibilityTap={[Function]} style={ Object { - "color": "#616161", + "color": "#242424", "fontFamily": "Segoe UI", "fontSize": 16, "fontWeight": "400", "margin": 0, - "marginTop": 5, + "marginHorizontal": 2, + "marginVertical": 2, } } > @@ -1495,7 +1503,6 @@ exports[`RadioGroup component tests RadioGroup horizontal-stacked 1`] = ` } } accessible={true} - enableFocusRing={true} focusable={true} keyDownEvents={ Array [ @@ -1531,10 +1538,6 @@ exports[`RadioGroup component tests RadioGroup horizontal-stacked 1`] = ` style={ Object { "alignItems": "center", - "borderColor": "transparent", - "borderRadius": 4, - "borderStyle": "solid", - "borderWidth": 1, "display": "flex", "flexDirection": "column", "paddingHorizontal": 4, @@ -1562,18 +1565,18 @@ exports[`RadioGroup component tests RadioGroup horizontal-stacked 1`] = ` style={ Object { "alignItems": "center", - "backgroundColor": "transparent", + "backgroundColor": "#ffffff", "borderColor": "#616161", - "borderRadius": 10, + "borderRadius": 8, "borderStyle": "solid", "borderWidth": 1, - "height": 20, + "height": 16, "justifyContent": "center", "marginBottom": 6, "marginLeft": 6, "marginRight": 6, "marginTop": 6, - "width": 20, + "width": 16, } } > @@ -1581,10 +1584,10 @@ exports[`RadioGroup component tests RadioGroup horizontal-stacked 1`] = ` style={ Object { "backgroundColor": undefined, - "borderRadius": 5, - "height": 10, + "borderRadius": 4, + "height": 8, "opacity": 0, - "width": 10, + "width": 8, } } /> @@ -1593,10 +1596,15 @@ exports[`RadioGroup component tests RadioGroup horizontal-stacked 1`] = ` style={ Object { "alignItems": "center", + "borderColor": "transparent", + "borderRadius": 4, + "borderStyle": "solid", + "borderWidth": 2, "flexDirection": "column", - "marginLeft": 2, - "marginRight": 2, - "padding": undefined, + "marginLeft": 0, + "marginRight": 0, + "padding": 2, + "paddingRight": 0, } } > @@ -1606,12 +1614,13 @@ exports[`RadioGroup component tests RadioGroup horizontal-stacked 1`] = ` onAccessibilityTap={[Function]} style={ Object { - "color": "#616161", + "color": "#242424", "fontFamily": "Segoe UI", "fontSize": 16, "fontWeight": "400", "margin": 0, - "marginTop": 5, + "marginHorizontal": 2, + "marginVertical": 2, } } > @@ -1638,7 +1647,6 @@ exports[`RadioGroup component tests RadioGroup horizontal-stacked 1`] = ` } } accessible={true} - enableFocusRing={true} focusable={true} keyDownEvents={ Array [ @@ -1674,10 +1682,6 @@ exports[`RadioGroup component tests RadioGroup horizontal-stacked 1`] = ` style={ Object { "alignItems": "center", - "borderColor": "transparent", - "borderRadius": 4, - "borderStyle": "solid", - "borderWidth": 1, "display": "flex", "flexDirection": "column", "paddingHorizontal": 4, @@ -1705,29 +1709,29 @@ exports[`RadioGroup component tests RadioGroup horizontal-stacked 1`] = ` style={ Object { "alignItems": "center", - "backgroundColor": "transparent", + "backgroundColor": "#0078d4", "borderColor": "#0078d4", - "borderRadius": 10, + "borderRadius": 8, "borderStyle": "solid", "borderWidth": 1, - "height": 20, + "height": 16, "justifyContent": "center", "marginBottom": 6, "marginLeft": 6, "marginRight": 6, "marginTop": 6, - "width": 20, + "width": 16, } } > @@ -1736,10 +1740,15 @@ exports[`RadioGroup component tests RadioGroup horizontal-stacked 1`] = ` style={ Object { "alignItems": "center", + "borderColor": "transparent", + "borderRadius": 4, + "borderStyle": "solid", + "borderWidth": 2, "flexDirection": "column", - "marginLeft": 2, - "marginRight": 2, - "padding": undefined, + "marginLeft": 0, + "marginRight": 0, + "padding": 2, + "paddingRight": 0, } } > @@ -1749,12 +1758,13 @@ exports[`RadioGroup component tests RadioGroup horizontal-stacked 1`] = ` onAccessibilityTap={[Function]} style={ Object { - "color": "#616161", + "color": "#242424", "fontFamily": "Segoe UI", "fontSize": 16, "fontWeight": "400", "margin": 0, - "marginTop": 5, + "marginHorizontal": 2, + "marginVertical": 2, } } > @@ -1863,7 +1873,6 @@ exports[`RadioGroup component tests RadioGroup required 1`] = ` } } accessible={true} - enableFocusRing={true} focusable={true} keyDownEvents={ Array [ @@ -1899,10 +1908,6 @@ exports[`RadioGroup component tests RadioGroup required 1`] = ` style={ Object { "alignItems": "flex-start", - "borderColor": "transparent", - "borderRadius": 4, - "borderStyle": "solid", - "borderWidth": 1, "display": "flex", "flexDirection": "row", "paddingHorizontal": 4, @@ -1930,18 +1935,18 @@ exports[`RadioGroup component tests RadioGroup required 1`] = ` style={ Object { "alignItems": "center", - "backgroundColor": "transparent", + "backgroundColor": "#ffffff", "borderColor": "#616161", - "borderRadius": 10, + "borderRadius": 8, "borderStyle": "solid", "borderWidth": 1, - "height": 20, + "height": 16, "justifyContent": "center", "marginBottom": 6, "marginLeft": 4, - "marginRight": 6, + "marginRight": 4, "marginTop": 6, - "width": 20, + "width": 16, } } > @@ -1949,10 +1954,10 @@ exports[`RadioGroup component tests RadioGroup required 1`] = ` style={ Object { "backgroundColor": undefined, - "borderRadius": 5, - "height": 10, + "borderRadius": 4, + "height": 8, "opacity": 0, - "width": 10, + "width": 8, } } /> @@ -1961,10 +1966,15 @@ exports[`RadioGroup component tests RadioGroup required 1`] = ` style={ Object { "alignItems": "flex-start", + "borderColor": "transparent", + "borderRadius": 4, + "borderStyle": "solid", + "borderWidth": 2, "flexDirection": "column", "marginLeft": 0, - "marginRight": 2, + "marginRight": 0, "padding": undefined, + "paddingRight": 0, } } > @@ -1974,12 +1984,13 @@ exports[`RadioGroup component tests RadioGroup required 1`] = ` onAccessibilityTap={[Function]} style={ Object { - "color": "#616161", + "color": "#242424", "fontFamily": "Segoe UI", "fontSize": 16, "fontWeight": "400", "margin": 0, - "marginTop": 5, + "marginHorizontal": 2, + "marginVertical": 2, } } > @@ -2006,7 +2017,6 @@ exports[`RadioGroup component tests RadioGroup required 1`] = ` } } accessible={true} - enableFocusRing={true} focusable={true} keyDownEvents={ Array [ @@ -2042,10 +2052,6 @@ exports[`RadioGroup component tests RadioGroup required 1`] = ` style={ Object { "alignItems": "flex-start", - "borderColor": "transparent", - "borderRadius": 4, - "borderStyle": "solid", - "borderWidth": 1, "display": "flex", "flexDirection": "row", "paddingHorizontal": 4, @@ -2073,29 +2079,29 @@ exports[`RadioGroup component tests RadioGroup required 1`] = ` style={ Object { "alignItems": "center", - "backgroundColor": "transparent", + "backgroundColor": "#0078d4", "borderColor": "#0078d4", - "borderRadius": 10, + "borderRadius": 8, "borderStyle": "solid", "borderWidth": 1, - "height": 20, + "height": 16, "justifyContent": "center", "marginBottom": 6, "marginLeft": 4, - "marginRight": 6, + "marginRight": 4, "marginTop": 6, - "width": 20, + "width": 16, } } > @@ -2104,10 +2110,15 @@ exports[`RadioGroup component tests RadioGroup required 1`] = ` style={ Object { "alignItems": "flex-start", + "borderColor": "transparent", + "borderRadius": 4, + "borderStyle": "solid", + "borderWidth": 2, "flexDirection": "column", "marginLeft": 0, - "marginRight": 2, + "marginRight": 0, "padding": undefined, + "paddingRight": 0, } } > @@ -2117,12 +2128,13 @@ exports[`RadioGroup component tests RadioGroup required 1`] = ` onAccessibilityTap={[Function]} style={ Object { - "color": "#616161", + "color": "#242424", "fontFamily": "Segoe UI", "fontSize": 16, "fontWeight": "400", "margin": 0, - "marginTop": 5, + "marginHorizontal": 2, + "marginVertical": 2, } } >