Skip to content

Commit de943c1

Browse files
interactivellamainteractivellama
committed
Merge branch 'master' of github.com:salesforce/design-system-react into prefer-object-spread
# Conflicts: # package-lock.json
2 parents cb43c5e + 4e26336 commit de943c1

File tree

91 files changed

+951
-564
lines changed

Some content is hidden

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

91 files changed

+951
-564
lines changed

‎RELEASENOTES.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,18 @@ These are changes that have backwards-compatible solutions present and that comp
3131

3232
### Latest Release
3333

34+
## Release 0.8.20
35+
36+
**Bugfixes**
37+
38+
* Fix bug in `Dropdown` component where getIndexByValue() needs to look at nextProps.options when componentWillreceiveProps() is called.
39+
* Datepicker: Make year Combobox menu width match the width of its input/button.
40+
41+
**Maintenance**
42+
43+
* Documentation update on how to use Design System React within Create React App.
44+
* Consolidate assistiveText props under one object for the following: `DataTable`, `Icon`, `Search`, `PanelFilterGroup`, `Spinner`, `Tree`, `TextArea`.
45+
3446
## Release 0.8.19
3547

3648
**Major Features**

‎components/app-launcher/__docs__/storybook-stories.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ const DemoAppLauncher = createReactClass({
280280
onChange={this.onSearch}
281281
onClear={this.onClear}
282282
placeholder="Find an app"
283-
assistiveText="Find an app"
283+
assistiveText={{ label: 'Find an app' }}
284284
value={this.state.search}
285285
/>
286286
);
@@ -368,7 +368,7 @@ const DemoAppLauncherNoHeaderButton = createReactClass({
368368
<Search
369369
onChange={this.onSearch}
370370
placeholder="Find an app"
371-
assistiveText="Find an app"
371+
assistiveText={{ label: 'Find an app' }}
372372
/>
373373
);
374374

@@ -457,7 +457,7 @@ const DemoAppLauncherWithSeveralSections = createReactClass({
457457
<Search
458458
onChange={this.onSearch}
459459
placeholder="Find an app"
460-
assistiveText="Find an app"
460+
assistiveText={{ label: 'Find an app' }}
461461
/>
462462
);
463463
const modalHeaderButton = (

‎components/avatar/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class Avatar extends React.Component {
139139
}.icon;
140140
return (
141141
<UtilityIcon
142-
assistiveText={iconAssistiveText}
142+
assistiveText={{ label: iconAssistiveText }}
143143
category="standard"
144144
name={variant === 'entity' ? 'account' : 'user'}
145145
/>

‎components/combobox/__examples__/base-custom-menu-item.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const accountsWithIcon = accounts.map((elem) => ({
5656
...{
5757
icon: (
5858
<Icon
59-
assistiveText="Account"
59+
assistiveText={{ label: 'Account' }}
6060
category="standard"
6161
size="x-small"
6262
name={elem.type}

‎components/combobox/__examples__/base-inherit-menu-width.jsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,13 @@ const accounts = [
4949
const accountsWithIcon = accounts.map((elem) => ({
5050
...elem,
5151
...{
52-
icon: <Icon assistiveText="Account" category="standard" name={elem.type} />,
52+
icon: (
53+
<Icon
54+
assistiveText={{ label: 'Account' }}
55+
category="standard"
56+
name={elem.type}
57+
/>
58+
),
5359
},
5460
}));
5561

‎components/combobox/__examples__/base-menu-separator.jsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,13 @@ const accounts = [
5656
const accountsWithIcon = accounts.map((elem) => ({
5757
...elem,
5858
...{
59-
icon: <Icon assistiveText="Account" category="standard" name={elem.type} />,
59+
icon: (
60+
<Icon
61+
assistiveText={{ label: 'Account' }}
62+
category="standard"
63+
name={elem.type}
64+
/>
65+
),
6066
},
6167
}));
6268

‎components/combobox/__examples__/base-menu-subheader.jsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,13 @@ const accounts = [
6262
const accountsWithIcon = accounts.map((elem) => ({
6363
...elem,
6464
...{
65-
icon: <Icon assistiveText="Account" category="standard" name={elem.type} />,
65+
icon: (
66+
<Icon
67+
assistiveText={{ label: 'Account' }}
68+
category="standard"
69+
name={elem.type}
70+
/>
71+
),
6672
},
6773
}));
6874

‎components/combobox/__examples__/base-predefined-options-only.jsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,13 @@ const accounts = [
5555
const accountsWithIcon = accounts.map((elem) => ({
5656
...elem,
5757
...{
58-
icon: <Icon assistiveText="Account" category="standard" name={elem.type} />,
58+
icon: (
59+
<Icon
60+
assistiveText={{ label: 'Account' }}
61+
category="standard"
62+
name={elem.type}
63+
/>
64+
),
5965
},
6066
}));
6167

‎components/combobox/__examples__/base.jsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,13 @@ const accounts = [
5454
const accountsWithIcon = accounts.map((elem) => ({
5555
...elem,
5656
...{
57-
icon: <Icon assistiveText="Account" category="standard" name={elem.type} />,
57+
icon: (
58+
<Icon
59+
assistiveText={{ label: 'Account' }}
60+
category="standard"
61+
name={elem.type}
62+
/>
63+
),
5864
},
5965
}));
6066

‎components/combobox/__examples__/inline-multiple.jsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,13 @@ const accounts = [
5454
const accountsWithIcon = accounts.map((elem) => ({
5555
...elem,
5656
...{
57-
icon: <Icon assistiveText="Account" category="standard" name={elem.type} />,
57+
icon: (
58+
<Icon
59+
assistiveText={{ label: 'Account' }}
60+
category="standard"
61+
name={elem.type}
62+
/>
63+
),
5864
},
5965
}));
6066

‎components/combobox/__examples__/inline-single.jsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,13 @@ const accounts = [
5454
const accountsWithIcon = accounts.map((elem) => ({
5555
...elem,
5656
...{
57-
icon: <Icon assistiveText="Account" category="standard" name={elem.type} />,
57+
icon: (
58+
<Icon
59+
assistiveText={{ label: 'Account' }}
60+
category="standard"
61+
name={elem.type}
62+
/>
63+
),
5864
},
5965
}));
6066

‎components/combobox/__examples__/readonly-single-selection-custom-menu-item.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const accountsWithIcon = accounts.map((elem) => ({
5656
...{
5757
icon: (
5858
<Icon
59-
assistiveText="Account"
59+
assistiveText={{ label: 'Account' }}
6060
category="standard"
6161
size="x-small"
6262
name={elem.type}

‎components/combobox/__examples__/required-input-error-state.jsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,13 @@ const accounts = [
5454
const accountsWithIcon = accounts.map((elem) => ({
5555
...elem,
5656
...{
57-
icon: <Icon assistiveText="Account" category="standard" name={elem.type} />,
57+
icon: (
58+
<Icon
59+
assistiveText={{ label: 'Account' }}
60+
category="standard"
61+
name={elem.type}
62+
/>
63+
),
5864
},
5965
}));
6066

‎components/combobox/__examples__/snapshot/base-open-class-name.jsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,13 @@ const accounts = [
2828
const accountsWithIcon = accounts.map((elem) => ({
2929
...elem,
3030
...{
31-
icon: <Icon assistiveText="Account" category="standard" name={elem.type} />,
31+
icon: (
32+
<Icon
33+
assistiveText={{ label: 'Account' }}
34+
category="standard"
35+
name={elem.type}
36+
/>
37+
),
3238
},
3339
}));
3440

‎components/combobox/__examples__/snapshot/base-open.jsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,13 @@ const accounts = [
2323
const accountsWithIcon = accounts.map((elem) => ({
2424
...elem,
2525
...{
26-
icon: <Icon assistiveText="Account" category="standard" name={elem.type} />,
26+
icon: (
27+
<Icon
28+
assistiveText={{ label: 'Account' }}
29+
category="standard"
30+
name={elem.type}
31+
/>
32+
),
2733
},
2834
}));
2935

‎components/combobox/__examples__/snapshot/base-selected.jsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,13 @@ const accounts = [
2323
const accountsWithIcon = accounts.map((elem) => ({
2424
...elem,
2525
...{
26-
icon: <Icon assistiveText="Account" category="standard" name={elem.type} />,
26+
icon: (
27+
<Icon
28+
assistiveText={{ label: 'Account' }}
29+
category="standard"
30+
name={elem.type}
31+
/>
32+
),
2733
},
2834
}));
2935

‎components/combobox/__examples__/snapshot/inline-multiple-selection-selected.jsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,13 @@ const accounts = [
5454
const accountsWithIcon = accounts.map((elem) => ({
5555
...elem,
5656
...{
57-
icon: <Icon assistiveText="Account" category="standard" name={elem.type} />,
57+
icon: (
58+
<Icon
59+
assistiveText={{ label: 'Account' }}
60+
category="standard"
61+
name={elem.type}
62+
/>
63+
),
5864
},
5965
}));
6066

‎components/combobox/__examples__/snapshot/inline-multiple-selection.jsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,13 @@ const accounts = [
5454
const accountsWithIcon = accounts.map((elem) => ({
5555
...elem,
5656
...{
57-
icon: <Icon assistiveText="Account" category="standard" name={elem.type} />,
57+
icon: (
58+
<Icon
59+
assistiveText={{ label: 'Account' }}
60+
category="standard"
61+
name={elem.type}
62+
/>
63+
),
5864
},
5965
}));
6066

‎components/combobox/__examples__/snapshot/inline-single-selection-selected.jsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,13 @@ const accounts = [
5454
const accountsWithIcon = accounts.map((elem) => ({
5555
...elem,
5656
...{
57-
icon: <Icon assistiveText="Account" category="standard" name={elem.type} />,
57+
icon: (
58+
<Icon
59+
assistiveText={{ label: 'Account' }}
60+
category="standard"
61+
name={elem.type}
62+
/>
63+
),
5864
},
5965
}));
6066

‎components/combobox/__examples__/snapshot/inline-single-selection.jsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,13 @@ const accounts = [
5454
const accountsWithIcon = accounts.map((elem) => ({
5555
...elem,
5656
...{
57-
icon: <Icon assistiveText="Account" category="standard" name={elem.type} />,
57+
icon: (
58+
<Icon
59+
assistiveText={{ label: 'Account' }}
60+
category="standard"
61+
name={elem.type}
62+
/>
63+
),
5864
},
5965
}));
6066

‎components/combobox/__tests__/combobox.browser-test.jsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,13 @@ const accounts = [
7979

8080
const accountsWithIcon = accounts.map((elem) =>
8181
assign(elem, {
82-
icon: <Icon assistiveText="Account" category="standard" name={elem.type} />,
82+
icon: (
83+
<Icon
84+
assistiveText={{ label: 'Account' }}
85+
category="standard"
86+
name={elem.type}
87+
/>
88+
),
8389
})
8490
);
8591

0 commit comments

Comments
 (0)