Skip to content

Commit f14a1a1

Browse files
author
Kubit
committed
Change mandatory prop label on Toggle
1 parent 5e36cfd commit f14a1a1

File tree

2 files changed

+27
-24
lines changed

2 files changed

+27
-24
lines changed

src/components/toggleWithLabel/toggleWithLabelStandAlone.tsx

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,34 +36,37 @@ const ToggleWithLabelStandAloneComponent = (
3636
return (
3737
<ToggleWithLabelStyled
3838
ref={ref}
39+
as={label ? 'fieldset' : 'div'}
3940
displayRow={displayRow}
4041
labelPosition={labelPosition}
4142
styles={styles}
4243
onClick={props.onClick}
4344
>
44-
<Text
45-
component={TextComponentType.LEGEND}
46-
customTypography={legendStyles}
47-
dataTestId={`${props.dataTestId}Label`}
48-
id={labelId}
49-
variant={textVariant ?? styles?.legend?.font_variant}
50-
{...label}
51-
>
52-
{label.content}
53-
{required && (
54-
<Text
55-
aria-hidden={true}
56-
color={styles?.required?.color}
57-
component={TextComponentType.SPAN}
58-
dataTestId={`${props.dataTestId}Required`}
59-
variant={styles?.required?.font_variant}
60-
weight={styles?.required?.font_weight}
61-
{...requiredSymbol}
62-
>
63-
{requiredSymbol?.content}
64-
</Text>
65-
)}
66-
</Text>
45+
{label && (
46+
<Text
47+
component={TextComponentType.LEGEND}
48+
customTypography={legendStyles}
49+
dataTestId={`${props.dataTestId}Label`}
50+
id={labelId}
51+
variant={textVariant ?? styles?.legend?.font_variant}
52+
{...label}
53+
>
54+
{label.content}
55+
{required && (
56+
<Text
57+
aria-hidden={true}
58+
color={styles?.required?.color}
59+
component={TextComponentType.SPAN}
60+
dataTestId={`${props.dataTestId}Required`}
61+
variant={styles?.required?.font_variant}
62+
weight={styles?.required?.font_weight}
63+
{...requiredSymbol}
64+
>
65+
{requiredSymbol?.content}
66+
</Text>
67+
)}
68+
</Text>
69+
)}
6770
<Toggle
6871
{...props}
6972
ref={props.toggleRef}

src/components/toggleWithLabel/types/toggleWithLabel.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export type ToggleRequiredSymbolType = Omit<IText<string>, 'children'> & {
2525
type propsToOmit = 'variant' | 'aria-describedby' | 'screenReaderId' | 'ctv' | 'cts' | 'extraCt';
2626

2727
export interface IToggleWithLabelStandAlone extends Omit<IToggleUnControlled, propsToOmit> {
28-
label: ToggleLabelType;
28+
label?: ToggleLabelType;
2929
styles?: ToggleWithLabelStylePropsType;
3030
requiredSymbol?: ToggleRequiredSymbolType;
3131
required: boolean;

0 commit comments

Comments
 (0)