Skip to content

Commit 00bb148

Browse files
interactivellamainteractivellama
committed
Merge branch 'master' of github.com:salesforce/design-system-react into event-parameter-standardize2
# Conflicts: # package.json
2 parents 77bb78b + ed2772f commit 00bb148

File tree

23 files changed

+8469
-7030
lines changed

23 files changed

+8469
-7030
lines changed

‎.babelrc

Lines changed: 49 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,62 @@
11
{
2-
"env": {
3-
"development": {
4-
"presets": [["env", {
2+
"presets": [
3+
[
4+
"@babel/preset-env",
5+
{
56
"targets": {
6-
"browsers": ["last 2 versions", "ie 11"],
7+
"browsers": [
8+
"last 2 versions",
9+
"ie 11"
10+
],
711
"node": "8.9.4"
812
}
9-
}], "react"],
10-
"plugins": ["transform-object-rest-spread", "transform-class-properties", "transform-export-extensions"]
11-
},
13+
}
14+
],
15+
"@babel/preset-react"
16+
],
17+
"plugins": [
18+
"@babel/plugin-proposal-object-rest-spread",
19+
"@babel/plugin-proposal-class-properties",
20+
"@babel/plugin-proposal-export-default-from",
21+
"@babel/plugin-proposal-export-namespace-from",
22+
"root-import"
23+
],
24+
"env": {
1225
"amd": {
13-
"presets": [["env", {
14-
"targets": {
15-
"browsers": ["last 2 versions", "ie 11"],
16-
"node": "8.9.4"
17-
}
18-
}], "react"],
19-
"plugins": ["import-noop", "transform-object-rest-spread", "transform-class-properties", "transform-export-extensions"]
20-
},
21-
"commonjs": {
22-
"presets": [["env", {
23-
"targets": {
24-
"browsers": ["last 2 versions", "ie 11"],
25-
"node": "8.9.4"
26-
}
27-
}], "react"],
28-
"plugins": ["import-noop", "transform-object-rest-spread", "transform-class-properties", "transform-export-extensions"]
26+
"plugins": ["import-noop"]
2927
},
3028
"esm": {
31-
"presets": [["env", {
32-
"targets": {
33-
"browsers": ["last 2 versions", "ie 11"],
34-
"node": "8.9.4"
35-
},
36-
"modules": false
37-
}], "react"],
38-
"plugins": ["transform-object-rest-spread", "transform-class-properties", "transform-export-extensions"]
29+
"presets": [
30+
[
31+
"@babel/preset-env",
32+
{
33+
"targets": {
34+
"browsers": [
35+
"last 2 versions",
36+
"ie 11"
37+
],
38+
"node": "8.9.4"
39+
},
40+
"modules": false
41+
}
42+
],
43+
"@babel/preset-react"
44+
],
45+
"plugins": [
46+
"@babel/plugin-proposal-object-rest-spread",
47+
"@babel/plugin-proposal-class-properties",
48+
"@babel/plugin-proposal-export-default-from",
49+
"@babel/plugin-proposal-export-namespace-from"
50+
]
51+
},
52+
"commonjs": {
53+
"plugins": ["import-noop"]
3954
},
4055
"test": {
41-
"presets": [["env", {
42-
"targets": {
43-
"browsers": ["last 2 versions", "ie 11"]
44-
}
45-
}], "react"],
46-
"plugins": ["istanbul", "transform-object-rest-spread", "transform-class-properties", "transform-export-extensions"]
56+
"plugins": ["istanbul"]
4757
}
4858
},
4959
"ignore": [
50-
"preset/**"
60+
"preset/**",
5161
],
52-
"plugins": [
53-
"root-import"
54-
]
55-
}
62+
}

‎RELEASENOTES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ These are changes that have backwards-compatible solutions present and that comp
5353
* Datepicker: Change the year picklist initial focus to currently selected year
5454
* Datepicker: Focus input only if menu was previously open and not just requested to close
5555
* Inline Edit UX pattern updated for keyboard: New pattern is that it'll tab to the close button, and if you're focused on the close button and tab again, it'll blur the field.
56+
* `Dropdown` with `overflowBoundaryElement` and `align=right` use max-width instead of inherited children width.
5657

5758
**Maintenance**
5859
* Require `iconCategory` if `iconName` is set. `utility` used to be the default icon category. `iconCategory` is now required.

‎components/accordion/__tests__/__snapshots__/accordion.snapshot-test.jsx.snap

Lines changed: 0 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,10 @@ exports[`Base DOM Snapshot 1`] = `
1919
>
2020
<button
2121
aria-controls="1-accordion-panel"
22-
aria-describedby={undefined}
2322
aria-expanded={false}
24-
aria-haspopup={undefined}
2523
className="slds-button slds-button_reset slds-accordion__summary-action"
2624
disabled={false}
27-
id={undefined}
28-
onBlur={undefined}
2925
onClick={[Function]}
30-
onFocus={undefined}
31-
onKeyDown={undefined}
32-
onKeyPress={undefined}
33-
onKeyUp={undefined}
34-
onMouseDown={undefined}
35-
onMouseEnter={undefined}
36-
onMouseLeave={undefined}
37-
tabIndex={undefined}
38-
title={undefined}
3926
type="button"
4027
>
4128
<svg
@@ -57,33 +44,19 @@ exports[`Base DOM Snapshot 1`] = `
5744
<div
5845
className="slds-dropdown-trigger slds-dropdown-trigger--click"
5946
id="ButtonGroupExampleDropdown"
60-
onBlur={undefined}
6147
onClick={[Function]}
6248
onFocus={null}
6349
onKeyDown={[Function]}
64-
onMouseDown={undefined}
6550
onMouseEnter={null}
6651
onMouseLeave={null}
6752
>
6853
<button
69-
aria-controls={undefined}
70-
aria-describedby={undefined}
7154
aria-expanded={false}
7255
aria-haspopup={true}
7356
className="slds-button slds-button--icon-border-filled slds-button--icon-x-small ignore-click-ButtonGroupExampleDropdown slds-shrink-none"
7457
disabled={false}
75-
id={undefined}
76-
onBlur={undefined}
7758
onClick={[Function]}
78-
onFocus={undefined}
79-
onKeyDown={undefined}
80-
onKeyPress={undefined}
81-
onKeyUp={undefined}
82-
onMouseDown={undefined}
83-
onMouseEnter={undefined}
84-
onMouseLeave={undefined}
8559
tabIndex="0"
86-
title={undefined}
8760
type="button"
8861
>
8962
<svg
@@ -125,23 +98,10 @@ exports[`Base DOM Snapshot 1`] = `
12598
>
12699
<button
127100
aria-controls="2-accordion-panel"
128-
aria-describedby={undefined}
129101
aria-expanded={false}
130-
aria-haspopup={undefined}
131102
className="slds-button slds-button_reset slds-accordion__summary-action"
132103
disabled={false}
133-
id={undefined}
134-
onBlur={undefined}
135104
onClick={[Function]}
136-
onFocus={undefined}
137-
onKeyDown={undefined}
138-
onKeyPress={undefined}
139-
onKeyUp={undefined}
140-
onMouseDown={undefined}
141-
onMouseEnter={undefined}
142-
onMouseLeave={undefined}
143-
tabIndex={undefined}
144-
title={undefined}
145105
type="button"
146106
>
147107
<svg
@@ -163,33 +123,19 @@ exports[`Base DOM Snapshot 1`] = `
163123
<div
164124
className="slds-dropdown-trigger slds-dropdown-trigger--click"
165125
id="ButtonGroupExampleDropdown"
166-
onBlur={undefined}
167126
onClick={[Function]}
168127
onFocus={null}
169128
onKeyDown={[Function]}
170-
onMouseDown={undefined}
171129
onMouseEnter={null}
172130
onMouseLeave={null}
173131
>
174132
<button
175-
aria-controls={undefined}
176-
aria-describedby={undefined}
177133
aria-expanded={false}
178134
aria-haspopup={true}
179135
className="slds-button slds-button--icon-border-filled slds-button--icon-x-small ignore-click-ButtonGroupExampleDropdown slds-shrink-none"
180136
disabled={false}
181-
id={undefined}
182-
onBlur={undefined}
183137
onClick={[Function]}
184-
onFocus={undefined}
185-
onKeyDown={undefined}
186-
onKeyPress={undefined}
187-
onKeyUp={undefined}
188-
onMouseDown={undefined}
189-
onMouseEnter={undefined}
190-
onMouseLeave={undefined}
191138
tabIndex="0"
192-
title={undefined}
193139
type="button"
194140
>
195141
<svg
@@ -231,23 +177,10 @@ exports[`Base DOM Snapshot 1`] = `
231177
>
232178
<button
233179
aria-controls="3-accordion-panel"
234-
aria-describedby={undefined}
235180
aria-expanded={false}
236-
aria-haspopup={undefined}
237181
className="slds-button slds-button_reset slds-accordion__summary-action"
238182
disabled={false}
239-
id={undefined}
240-
onBlur={undefined}
241183
onClick={[Function]}
242-
onFocus={undefined}
243-
onKeyDown={undefined}
244-
onKeyPress={undefined}
245-
onKeyUp={undefined}
246-
onMouseDown={undefined}
247-
onMouseEnter={undefined}
248-
onMouseLeave={undefined}
249-
tabIndex={undefined}
250-
title={undefined}
251184
type="button"
252185
>
253186
<svg
@@ -269,33 +202,19 @@ exports[`Base DOM Snapshot 1`] = `
269202
<div
270203
className="slds-dropdown-trigger slds-dropdown-trigger--click"
271204
id="ButtonGroupExampleDropdown"
272-
onBlur={undefined}
273205
onClick={[Function]}
274206
onFocus={null}
275207
onKeyDown={[Function]}
276-
onMouseDown={undefined}
277208
onMouseEnter={null}
278209
onMouseLeave={null}
279210
>
280211
<button
281-
aria-controls={undefined}
282-
aria-describedby={undefined}
283212
aria-expanded={false}
284213
aria-haspopup={true}
285214
className="slds-button slds-button--icon-border-filled slds-button--icon-x-small ignore-click-ButtonGroupExampleDropdown slds-shrink-none"
286215
disabled={false}
287-
id={undefined}
288-
onBlur={undefined}
289216
onClick={[Function]}
290-
onFocus={undefined}
291-
onKeyDown={undefined}
292-
onKeyPress={undefined}
293-
onKeyUp={undefined}
294-
onMouseDown={undefined}
295-
onMouseEnter={undefined}
296-
onMouseLeave={undefined}
297217
tabIndex="0"
298-
title={undefined}
299218
type="button"
300219
>
301220
<svg
@@ -380,23 +299,10 @@ exports[`Base Open DOM Snapshot 1`] = `
380299
>
381300
<button
382301
aria-controls="1-accordion-panel"
383-
aria-describedby={undefined}
384302
aria-expanded={true}
385-
aria-haspopup={undefined}
386303
className="slds-button slds-button_reset slds-accordion__summary-action"
387304
disabled={false}
388-
id={undefined}
389-
onBlur={undefined}
390305
onClick={[Function]}
391-
onFocus={undefined}
392-
onKeyDown={undefined}
393-
onKeyPress={undefined}
394-
onKeyUp={undefined}
395-
onMouseDown={undefined}
396-
onMouseEnter={undefined}
397-
onMouseLeave={undefined}
398-
tabIndex={undefined}
399-
title={undefined}
400306
type="button"
401307
>
402308
<svg
@@ -439,23 +345,10 @@ exports[`Base Open DOM Snapshot 1`] = `
439345
>
440346
<button
441347
aria-controls="2-accordion-panel"
442-
aria-describedby={undefined}
443348
aria-expanded={true}
444-
aria-haspopup={undefined}
445349
className="slds-button slds-button_reset slds-accordion__summary-action"
446350
disabled={false}
447-
id={undefined}
448-
onBlur={undefined}
449351
onClick={[Function]}
450-
onFocus={undefined}
451-
onKeyDown={undefined}
452-
onKeyPress={undefined}
453-
onKeyUp={undefined}
454-
onMouseDown={undefined}
455-
onMouseEnter={undefined}
456-
onMouseLeave={undefined}
457-
tabIndex={undefined}
458-
title={undefined}
459352
type="button"
460353
>
461354
<svg

0 commit comments

Comments
 (0)