Skip to content

Commit 03efd6f

Browse files
github-actions[bot]github-actions[bot]
authored
Merge release/1.32.5 into main branch (#700)
* UIDS-695 node prop type (#696) * copy style.css and use directly in ToggleInput (#699)
1 parent 0324eeb commit 03efd6f

File tree

4 files changed

+391
-3
lines changed

4 files changed

+391
-3
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@user-interviews/ui-design-system",
3-
"version": "1.32.4",
3+
"version": "1.32.5",
44
"dependencies": {
55
"react-bootstrap": "^2.0.2",
66
"react-router-dom": "^5.2.0",

‎spec/__snapshots__/Storyshots.test.js.snap‎

Lines changed: 243 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19604,6 +19604,249 @@ exports[`Storyshots Components/Toast Toast With Action 1`] = `
1960419604
</div>
1960519605
`;
1960619606

19607+
exports[`Storyshots Components/ToggleInput Checked 1`] = `
19608+
<div
19609+
style={
19610+
Object {
19611+
"padding": "1rem",
19612+
}
19613+
}
19614+
>
19615+
<label
19616+
className="ToggleInput__label"
19617+
htmlFor="1"
19618+
>
19619+
<div
19620+
className="react-toggle react-toggle--checked"
19621+
onClick={[Function]}
19622+
onTouchEnd={[Function]}
19623+
onTouchMove={[Function]}
19624+
onTouchStart={[Function]}
19625+
>
19626+
<div
19627+
className="react-toggle-track"
19628+
>
19629+
<div
19630+
className="react-toggle-track-check"
19631+
>
19632+
<svg
19633+
height="11"
19634+
viewBox="0 0 14 11"
19635+
width="14"
19636+
>
19637+
<title>
19638+
switch-check
19639+
</title>
19640+
<path
19641+
d="M11.264 0L5.26 6.004 2.103 2.847 0 4.95l5.26 5.26 8.108-8.107L11.264 0"
19642+
fill="#fff"
19643+
fillRule="evenodd"
19644+
/>
19645+
</svg>
19646+
</div>
19647+
<div
19648+
className="react-toggle-track-x"
19649+
>
19650+
<svg
19651+
height="10"
19652+
viewBox="0 0 10 10"
19653+
width="10"
19654+
>
19655+
<title>
19656+
switch-x
19657+
</title>
19658+
<path
19659+
d="M9.9 2.12L7.78 0 4.95 2.828 2.12 0 0 2.12l2.83 2.83L0 7.776 2.123 9.9 4.95 7.07 7.78 9.9 9.9 7.776 7.072 4.95 9.9 2.12"
19660+
fill="#fff"
19661+
fillRule="evenodd"
19662+
/>
19663+
</svg>
19664+
</div>
19665+
</div>
19666+
<div
19667+
className="react-toggle-thumb"
19668+
/>
19669+
<input
19670+
checked={true}
19671+
className="react-toggle-screenreader-only"
19672+
disabled={false}
19673+
id="1"
19674+
onBlur={[Function]}
19675+
onChange={[Function]}
19676+
onFocus={[Function]}
19677+
type="checkbox"
19678+
value="true"
19679+
/>
19680+
</div>
19681+
<span>
19682+
Label
19683+
</span>
19684+
</label>
19685+
</div>
19686+
`;
19687+
19688+
exports[`Storyshots Components/ToggleInput Default 1`] = `
19689+
<div
19690+
style={
19691+
Object {
19692+
"padding": "1rem",
19693+
}
19694+
}
19695+
>
19696+
<label
19697+
className="ToggleInput__label"
19698+
htmlFor="1"
19699+
>
19700+
<div
19701+
className="react-toggle"
19702+
onClick={[Function]}
19703+
onTouchEnd={[Function]}
19704+
onTouchMove={[Function]}
19705+
onTouchStart={[Function]}
19706+
>
19707+
<div
19708+
className="react-toggle-track"
19709+
>
19710+
<div
19711+
className="react-toggle-track-check"
19712+
>
19713+
<svg
19714+
height="11"
19715+
viewBox="0 0 14 11"
19716+
width="14"
19717+
>
19718+
<title>
19719+
switch-check
19720+
</title>
19721+
<path
19722+
d="M11.264 0L5.26 6.004 2.103 2.847 0 4.95l5.26 5.26 8.108-8.107L11.264 0"
19723+
fill="#fff"
19724+
fillRule="evenodd"
19725+
/>
19726+
</svg>
19727+
</div>
19728+
<div
19729+
className="react-toggle-track-x"
19730+
>
19731+
<svg
19732+
height="10"
19733+
viewBox="0 0 10 10"
19734+
width="10"
19735+
>
19736+
<title>
19737+
switch-x
19738+
</title>
19739+
<path
19740+
d="M9.9 2.12L7.78 0 4.95 2.828 2.12 0 0 2.12l2.83 2.83L0 7.776 2.123 9.9 4.95 7.07 7.78 9.9 9.9 7.776 7.072 4.95 9.9 2.12"
19741+
fill="#fff"
19742+
fillRule="evenodd"
19743+
/>
19744+
</svg>
19745+
</div>
19746+
</div>
19747+
<div
19748+
className="react-toggle-thumb"
19749+
/>
19750+
<input
19751+
checked={false}
19752+
className="react-toggle-screenreader-only"
19753+
disabled={false}
19754+
id="1"
19755+
onBlur={[Function]}
19756+
onChange={[Function]}
19757+
onFocus={[Function]}
19758+
type="checkbox"
19759+
value="false"
19760+
/>
19761+
</div>
19762+
<span>
19763+
Label
19764+
</span>
19765+
</label>
19766+
</div>
19767+
`;
19768+
19769+
exports[`Storyshots Components/ToggleInput Label Left 1`] = `
19770+
<div
19771+
style={
19772+
Object {
19773+
"padding": "1rem",
19774+
}
19775+
}
19776+
>
19777+
<label
19778+
className="ToggleInput__label"
19779+
htmlFor="1"
19780+
>
19781+
<span>
19782+
Label
19783+
</span>
19784+
<div
19785+
className="react-toggle"
19786+
onClick={[Function]}
19787+
onTouchEnd={[Function]}
19788+
onTouchMove={[Function]}
19789+
onTouchStart={[Function]}
19790+
>
19791+
<div
19792+
className="react-toggle-track"
19793+
>
19794+
<div
19795+
className="react-toggle-track-check"
19796+
>
19797+
<svg
19798+
height="11"
19799+
viewBox="0 0 14 11"
19800+
width="14"
19801+
>
19802+
<title>
19803+
switch-check
19804+
</title>
19805+
<path
19806+
d="M11.264 0L5.26 6.004 2.103 2.847 0 4.95l5.26 5.26 8.108-8.107L11.264 0"
19807+
fill="#fff"
19808+
fillRule="evenodd"
19809+
/>
19810+
</svg>
19811+
</div>
19812+
<div
19813+
className="react-toggle-track-x"
19814+
>
19815+
<svg
19816+
height="10"
19817+
viewBox="0 0 10 10"
19818+
width="10"
19819+
>
19820+
<title>
19821+
switch-x
19822+
</title>
19823+
<path
19824+
d="M9.9 2.12L7.78 0 4.95 2.828 2.12 0 0 2.12l2.83 2.83L0 7.776 2.123 9.9 4.95 7.07 7.78 9.9 9.9 7.776 7.072 4.95 9.9 2.12"
19825+
fill="#fff"
19826+
fillRule="evenodd"
19827+
/>
19828+
</svg>
19829+
</div>
19830+
</div>
19831+
<div
19832+
className="react-toggle-thumb"
19833+
/>
19834+
<input
19835+
checked={false}
19836+
className="react-toggle-screenreader-only"
19837+
disabled={false}
19838+
id="1"
19839+
onBlur={[Function]}
19840+
onChange={[Function]}
19841+
onFocus={[Function]}
19842+
type="checkbox"
19843+
value="false"
19844+
/>
19845+
</div>
19846+
</label>
19847+
</div>
19848+
`;
19849+
1960719850
exports[`Storyshots Components/Tooltip Default 1`] = `
1960819851
<div
1960919852
style={

‎src/FormGroup/FormGroup.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ FormGroup.propTypes = {
126126
labelClassName: PropTypes.string,
127127
labelHelperText: PropTypes.string,
128128
labelHtmlFor: PropTypes.string,
129-
labelTooltip: PropTypes.string,
129+
labelTooltip: PropTypes.node,
130130
required: PropTypes.bool,
131131
};
132132

0 commit comments

Comments
 (0)