Skip to content

Commit 26be78c

Browse files
author
Ayesha Mazumdar
authored
feat(setup-assistant): Add new Setup Assistant component, new modifiers for progress ring and indicator (#3144)
Add 'slds-progress-ring_large' modifier to make a 32x32 ring Add 'slds-progress-ring_active-step' to make progress ring blue Add 'slds-progress__list-bordered' to add borders b/w vertical progress indicator steps
1 parent e288bc9 commit 26be78c

File tree

55 files changed

+1620
-204
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1620
-204
lines changed

ui/components/_index.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,4 +246,7 @@
246246
'welcome-mat/trailhead-connected/index',
247247

248248
// Summary Detail
249-
'summary-detail/base/index';
249+
'summary-detail/base/index',
250+
251+
// Setup Assistant
252+
'setup-assistant/base/index';

ui/components/buttons/base/example.jsx

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,19 @@ import React from 'react';
55
import SvgIcon from '../../../shared/svg-icon';
66
import classNames from 'classnames';
77

8-
export let Button = props => (
9-
<button
10-
className={classNames('slds-button', props.className)}
11-
disabled={props.disabled}
12-
>
13-
{props.children}
14-
</button>
15-
);
8+
export let Button = props => {
9+
const { className, disabled, ...rest } = props;
10+
11+
return (
12+
<button
13+
className={classNames('slds-button', className)}
14+
disabled={disabled}
15+
{...rest}
16+
>
17+
{props.children}
18+
</button>
19+
);
20+
};
1621

1722
/// ////////////////////////////////////////
1823
// Export

ui/components/cards/base/_index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
* @name base
1414
* @selector .slds-card
15-
* @restrict article, div
15+
* @restrict article, div, section
1616
* @variant
1717
*/
1818
.slds-card {

ui/components/checkbox-button-group/base/_index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
/**
3636
* Creates a custom styled checkbox
3737
*
38-
* @selector .slds-checkbox_faux
38+
* @selector .slds-checkbox_button .slds-checkbox_faux
3939
* @restrict .slds-checkbox__label span, .slds-checkbox_button__label span
4040
* @required
4141
*/

ui/components/checkbox-toggle/base/example.jsx

Lines changed: 47 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,12 @@
33

44
import React from 'react';
55
import classNames from 'classnames';
6+
import _ from '../../../shared/helpers';
67

78
/// ////////////////////////////////////////
89
// Partial(s)
910
/// ////////////////////////////////////////
1011

11-
let Demo = props => (
12-
<div className="demo-only slds-size_1-of-2" {...props}>
13-
{props.children}
14-
</div>
15-
);
16-
1712
let Fieldset = props => (
1813
<fieldset className={classNames('form--element', props.className)}>
1914
<legend className="slds-form-element__legend slds-form-element__label">
@@ -41,24 +36,28 @@ export let Label = props => (
4136
);
4237

4338
export let FauxLabel = props => (
44-
<span className="slds-form-element__label slds-m-bottom_none">
39+
<span
40+
className={classNames('slds-form-element__label', 'slds-m-bottom_none', {
41+
'slds-assistive-text': props.isBare
42+
})}
43+
>
4544
{props.children}
4645
</span>
4746
);
4847

4948
export let Checkbox = props => (
5049
<input
51-
name="checkbox"
50+
name={props.uniqueId}
5251
type="checkbox"
5352
disabled={props.disabled}
5453
defaultChecked={props.checked}
55-
aria-describedby="toggle-desc"
54+
aria-describedby={props.uniqueId}
5655
/>
5756
);
5857

5958
export let Toggle = props => (
6059
<span
61-
id="toggle-desc"
60+
id={props.uniqueId}
6261
className={classNames('slds-checkbox_faux_container', props.className)}
6362
aria-live="assertive"
6463
>
@@ -75,41 +74,60 @@ export let Toggle = props => (
7574
/// ////////////////////////////////////////
7675
// State Constructor(s)
7776
/// ////////////////////////////////////////
78-
export let CheckboxToggle = props => (
79-
<Demo>
77+
78+
export const Context = props => (
79+
<div className="demo-only slds-size_1-of-2" {...props}>
80+
{props.children}
81+
</div>
82+
);
83+
84+
export let CheckboxToggle = props => {
85+
const uniqueId = _.uniqueId('checkbox-toggle-');
86+
87+
return (
8088
<LabelWrapper>
8189
<Label>
82-
<FauxLabel>Toggle Label</FauxLabel>
83-
<Checkbox />
84-
<Toggle />
90+
<FauxLabel isBare={props.isBare}>
91+
{props.title || 'Toggle Label'}
92+
</FauxLabel>
93+
<Checkbox
94+
uniqueId={uniqueId}
95+
checked={props.checked}
96+
disabled={props.disabled}
97+
/>
98+
<Toggle uniqueId={uniqueId} />
8599
</Label>
86100
</LabelWrapper>
87-
</Demo>
88-
);
101+
);
102+
};
103+
104+
export let CheckboxToggleChecked = props => {
105+
const uniqueId = _.uniqueId('checkbox-toggle-');
89106

90-
export let CheckboxToggleChecked = props => (
91-
<Demo>
107+
return (
92108
<LabelWrapper>
93109
<Label>
94110
<FauxLabel>Toggle Label</FauxLabel>
95-
<Checkbox checked />
96-
<Toggle />
111+
<Checkbox uniqueId={uniqueId} checked />
112+
<Toggle uniqueId={uniqueId} />
97113
</Label>
98114
</LabelWrapper>
99-
</Demo>
100-
);
115+
);
116+
};
101117

102-
export let CheckboxToggleDisabled = props => (
103-
<Demo>
118+
export let CheckboxToggleDisabled = props => {
119+
const uniqueId = _.uniqueId('checkbox-toggle-');
120+
121+
return (
104122
<LabelWrapper>
105123
<Label>
106124
<FauxLabel>Toggle Label</FauxLabel>
107-
<Checkbox disabled />
108-
<Toggle />
125+
<Checkbox uniqueId={uniqueId} disabled />
126+
<Toggle uniqueId={uniqueId} />
109127
</Label>
110128
</LabelWrapper>
111-
</Demo>
112-
);
129+
);
130+
};
113131

114132
/// ////////////////////////////////////////
115133
// Export

ui/components/color-picker/__tests__/__snapshots__/renders_a_base_color_picker_with_custom_tab_selected.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

ui/components/color-picker/__tests__/__snapshots__/renders_a_base_color_picker_with_custom_tab_selected_in_error_state.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

ui/components/color-picker/__tests__/__snapshots__/renders_a_base_color_picker_with_summary_error.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

ui/components/color-picker/__tests__/__snapshots__/renders_a_custom_only_color_picker.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

ui/components/color-picker/__tests__/__snapshots__/renders_a_default_base_color_picker.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)