Skip to content

Commit d1ca107

Browse files
github-actions[bot]jasonbasuilrroppolocareful-axebrianCollinsUI
authored
Merge release/1.26.1 into develop branch (#518)
* allows Tooltip to open on hover (#487) * Prepare hotfix 1.24.1 (#492) * Merge release/1.25.0 into main branch (#494) * HOTFIX update tooltip primary variant to ux-emerald (#415) * Feature RS-8352 Tabs (#477) Add Tabs and Tabs with react-bootstrap and styled-components * feature/UIDS-442 add Button to DS (#450) Adds react-bootstrap and Button component to the Design System * Bug/UIDS-484 Set node version on nightly visual tests (#485) * chore/UIDS-476 documentation updates (#486) * Chore/ Add Percy snapshots for buttons (#488) * Chore/ Delete old sample file for cypress tests (#482) * Merge hotfix/1.24.1 into develop branch (#493) * allows Tooltip to open on hover (#487) * Prepare release 1.25.0 Co-authored-by: Rachel Roppolo <[email protected]> Co-authored-by: Jane Sebastian <[email protected]> Co-authored-by: Jason Basuil <[email protected]> Co-authored-by: brianCollinsUI <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * update relative bootstrap imports (#497) * Prepare hotfix 1.25.1 (#498) * Merge release/1.26.0 into main branch (#513) * HOTFIX update tooltip primary variant to ux-emerald (#415) * Feature RS-8352 Tabs (#477) Add Tabs and Tabs with react-bootstrap and styled-components * feature/UIDS-442 add Button to DS (#450) Adds react-bootstrap and Button component to the Design System * Bug/UIDS-484 Set node version on nightly visual tests (#485) * chore/UIDS-476 documentation updates (#486) * Chore/ Add Percy snapshots for buttons (#488) * Chore/ Delete old sample file for cypress tests (#482) * Merge hotfix/1.24.1 into develop branch (#493) * allows Tooltip to open on hover (#487) * Merge release/1.25.0 into develop branch (#495) * allows Tooltip to open on hover (#487) * Prepare hotfix 1.24.1 (#492) * Prepare release 1.25.0 Co-authored-by: Jason Basuil <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Merge hotfix/1.25.1 into develop branch (#499) * allows Tooltip to open on hover (#487) * Prepare hotfix 1.24.1 (#492) * Merge release/1.25.0 into main branch (#494) * HOTFIX update tooltip primary variant to ux-emerald (#415) * Feature RS-8352 Tabs (#477) Add Tabs and Tabs with react-bootstrap and styled-components * feature/UIDS-442 add Button to DS (#450) Adds react-bootstrap and Button component to the Design System * Bug/UIDS-484 Set node version on nightly visual tests (#485) * chore/UIDS-476 documentation updates (#486) * Chore/ Add Percy snapshots for buttons (#488) * Chore/ Delete old sample file for cypress tests (#482) * Merge hotfix/1.24.1 into develop branch (#493) * allows Tooltip to open on hover (#487) * Prepare release 1.25.0 Co-authored-by: Rachel Roppolo <[email protected]> Co-authored-by: Jane Sebastian <[email protected]> Co-authored-by: Jason Basuil <[email protected]> Co-authored-by: brianCollinsUI <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * update relative bootstrap imports (#497) * Prepare hotfix 1.25.1 Co-authored-by: Jason Basuil <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Rachel Roppolo <[email protected]> Co-authored-by: Jane Sebastian <[email protected]> Co-authored-by: brianCollinsUI <[email protected]> * Chore/wait a bit longer for things to render on some percy snapshots (#503) * UIDS-438 Add AsyncCreatableSelect (#500) * UIDS-506 Update Form to handle GET method (#507) Previously passing a GET method would have worked for Rails, but it wouldn't put the params in the URL which is the expected behavior. This makes it so we properly pass GET directly to the form method parameter. One other thing this does is remove the CSRF params if GET is passed. These are ignored in GET and thus aren't necessary and would add extra params to the URL. One potential upgrade that was left on the cutting room floor was passing any extra props directly to the form component. * CHORE Fix node version in deploy action (#510) * CHORE Fix yaml spacing on deploy action (#512) * feature/UIDS-312 add Dropdown to DS (#502) * adds Dropdown and subcomponents * adds DropdownIconToggle * creates shared button mixins * remove children proptype, consolidate shared proptypes * add Percy snapshots for Dropdowns * Prepare release 1.26.0 Co-authored-by: Rachel Roppolo <[email protected]> Co-authored-by: Jane Sebastian <[email protected]> Co-authored-by: Jason Basuil <[email protected]> Co-authored-by: brianCollinsUI <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Bob Saris <[email protected]> * Prepare release 1.26.1 Co-authored-by: Jason Basuil <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Rachel Roppolo <[email protected]> Co-authored-by: Jane Sebastian <[email protected]> Co-authored-by: brianCollinsUI <[email protected]> Co-authored-by: Bob Saris <[email protected]>
1 parent 14440de commit d1ca107

File tree

3 files changed

+149
-2
lines changed

3 files changed

+149
-2
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.26.0",
3+
"version": "1.26.1",
44
"dependencies": {
55
"react-bootstrap": "^2.0.2",
66
"react-router-dom": "^5.2.0",

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

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2887,6 +2887,154 @@ exports[`Storyshots Design System/Dropdown Sizes 1`] = `
28872887
</div>
28882888
`;
28892889

2890+
exports[`Storyshots Design System/Dropdown Default 1`] = `
2891+
<div
2892+
style={
2893+
Object {
2894+
"padding": "1rem",
2895+
}
2896+
}
2897+
>
2898+
<div
2899+
className="Dropdown dropdown"
2900+
>
2901+
<button
2902+
aria-expanded={false}
2903+
className="DropdownToggle dropdown-toggle btn btn-primary"
2904+
disabled={false}
2905+
onClick={[Function]}
2906+
type="button"
2907+
>
2908+
<svg
2909+
aria-hidden="true"
2910+
className="svg-inline--fa fa-file-alt fa-w-12 icon-left"
2911+
data-icon="file-alt"
2912+
data-prefix="far"
2913+
focusable="false"
2914+
role="img"
2915+
style={Object {}}
2916+
viewBox="0 0 384 512"
2917+
xmlns="http://www.w3.org/2000/svg"
2918+
>
2919+
<path
2920+
d="M288 248v28c0 6.6-5.4 12-12 12H108c-6.6 0-12-5.4-12-12v-28c0-6.6 5.4-12 12-12h168c6.6 0 12 5.4 12 12zm-12 72H108c-6.6 0-12 5.4-12 12v28c0 6.6 5.4 12 12 12h168c6.6 0 12-5.4 12-12v-28c0-6.6-5.4-12-12-12zm108-188.1V464c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V48C0 21.5 21.5 0 48 0h204.1C264.8 0 277 5.1 286 14.1L369.9 98c9 8.9 14.1 21.2 14.1 33.9zm-128-80V128h76.1L256 51.9zM336 464V176H232c-13.3 0-24-10.7-24-24V48H48v416h288z"
2921+
fill="currentColor"
2922+
style={Object {}}
2923+
/>
2924+
</svg>
2925+
Dropdown toggle
2926+
</button>
2927+
</div>
2928+
<br />
2929+
<div
2930+
className="Dropdown dropdown"
2931+
>
2932+
<button
2933+
aria-expanded={false}
2934+
className="DropdownToggle dropdown-toggle btn btn-outline-primary"
2935+
disabled={false}
2936+
onClick={[Function]}
2937+
type="button"
2938+
>
2939+
<svg
2940+
aria-hidden="true"
2941+
className="svg-inline--fa fa-file-alt fa-w-12 icon-left"
2942+
data-icon="file-alt"
2943+
data-prefix="far"
2944+
focusable="false"
2945+
role="img"
2946+
style={Object {}}
2947+
viewBox="0 0 384 512"
2948+
xmlns="http://www.w3.org/2000/svg"
2949+
>
2950+
<path
2951+
d="M288 248v28c0 6.6-5.4 12-12 12H108c-6.6 0-12-5.4-12-12v-28c0-6.6 5.4-12 12-12h168c6.6 0 12 5.4 12 12zm-12 72H108c-6.6 0-12 5.4-12 12v28c0 6.6 5.4 12 12 12h168c6.6 0 12-5.4 12-12v-28c0-6.6-5.4-12-12-12zm108-188.1V464c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V48C0 21.5 21.5 0 48 0h204.1C264.8 0 277 5.1 286 14.1L369.9 98c9 8.9 14.1 21.2 14.1 33.9zm-128-80V128h76.1L256 51.9zM336 464V176H232c-13.3 0-24-10.7-24-24V48H48v416h288z"
2952+
fill="currentColor"
2953+
style={Object {}}
2954+
/>
2955+
</svg>
2956+
Dropdown toggle
2957+
</button>
2958+
</div>
2959+
</div>
2960+
`;
2961+
2962+
exports[`Storyshots Design System/Dropdown Icon 1`] = `
2963+
<div
2964+
style={
2965+
Object {
2966+
"padding": "1rem",
2967+
}
2968+
}
2969+
>
2970+
<div
2971+
className="Dropdown dropdown"
2972+
>
2973+
<button
2974+
className="DropdownIconToggle"
2975+
onClick={[Function]}
2976+
type="button"
2977+
>
2978+
<svg
2979+
aria-hidden="true"
2980+
className="svg-inline--fa fa-ellipsis-v fa-w-6 "
2981+
data-icon="ellipsis-v"
2982+
data-prefix="fas"
2983+
focusable="false"
2984+
role="img"
2985+
style={Object {}}
2986+
viewBox="0 0 192 512"
2987+
xmlns="http://www.w3.org/2000/svg"
2988+
>
2989+
<path
2990+
d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
2991+
fill="currentColor"
2992+
style={Object {}}
2993+
/>
2994+
</svg>
2995+
</button>
2996+
</div>
2997+
</div>
2998+
`;
2999+
3000+
exports[`Storyshots Design System/Dropdown Sizes 1`] = `
3001+
<div
3002+
style={
3003+
Object {
3004+
"padding": "1rem",
3005+
}
3006+
}
3007+
>
3008+
<div
3009+
className="Dropdown dropdown"
3010+
>
3011+
<button
3012+
aria-expanded={false}
3013+
className="DropdownToggle dropdown-toggle btn btn-outline-primary btn-sm"
3014+
disabled={false}
3015+
onClick={[Function]}
3016+
type="button"
3017+
>
3018+
Small toggle
3019+
</button>
3020+
</div>
3021+
<br />
3022+
<div
3023+
className="Dropdown dropdown"
3024+
>
3025+
<button
3026+
aria-expanded={false}
3027+
className="DropdownToggle dropdown-toggle btn btn-outline-primary btn-md"
3028+
disabled={false}
3029+
onClick={[Function]}
3030+
type="button"
3031+
>
3032+
Medium toggle
3033+
</button>
3034+
</div>
3035+
</div>
3036+
`;
3037+
28903038
exports[`Storyshots Design System/Form Default 1`] = `
28913039
<div
28923040
style={

‎yarn.lock‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@
147147
"@babel/types" "^7.16.7"
148148
jsesc "^2.5.1"
149149
source-map "^0.5.0"
150-
151150
"@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.13":
152151
version "7.12.13"
153152
resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab"

0 commit comments

Comments
 (0)