Skip to content

Commit 4b65c42

Browse files
kflournoy-sfkflournoy-sf
authored
chore(modals): React examples - cleanup after recent work (#5023)
1 parent 84a1562 commit 4b65c42

File tree

9 files changed

+6
-65
lines changed

9 files changed

+6
-65
lines changed

‎ui/components/app-launcher/__tests__/__snapshots__/index.spec.js.snap

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ exports[`renders a default app launcher 1`] = `
1313
aria-labelledby="header43"
1414
aria-modal="true"
1515
className="slds-modal slds-fade-in-open slds-modal_large slds-app-launcher"
16-
closeButtonDisabled={false}
1716
role="dialog"
1817
tabIndex="-1"
1918
>
@@ -778,7 +777,6 @@ exports[`renders a dropped app launcher 1`] = `
778777
aria-labelledby="header43"
779778
aria-modal="true"
780779
className="slds-modal slds-fade-in-open slds-modal_large slds-app-launcher"
781-
closeButtonDisabled={false}
782780
role="dialog"
783781
tabIndex="-1"
784782
>
@@ -1543,7 +1541,6 @@ exports[`renders a grabbed app launcher 1`] = `
15431541
aria-labelledby="header43"
15441542
aria-modal="true"
15451543
className="slds-modal slds-fade-in-open slds-modal_large slds-app-launcher"
1546-
closeButtonDisabled={false}
15471544
role="dialog"
15481545
tabIndex="-1"
15491546
>
@@ -2308,7 +2305,6 @@ exports[`renders a moved app launcher 1`] = `
23082305
aria-labelledby="header43"
23092306
aria-modal="true"
23102307
className="slds-modal slds-fade-in-open slds-modal_large slds-app-launcher"
2311-
closeButtonDisabled={false}
23122308
role="dialog"
23132309
tabIndex="-1"
23142310
>
@@ -3073,7 +3069,6 @@ exports[`renders a search app launcher 1`] = `
30733069
aria-labelledby="header43"
30743070
aria-modal="true"
30753071
className="slds-modal slds-fade-in-open slds-modal_large slds-app-launcher"
3076-
closeButtonDisabled={false}
30773072
role="dialog"
30783073
tabIndex="-1"
30793074
>

‎ui/components/docked-composer/__tests__/__snapshots__/index.spec.js.snap

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -703,8 +703,6 @@ exports[`renders a docked composer with popout 1`] = `
703703
aria-labelledby="dialog-heading-id-1"
704704
aria-modal="true"
705705
className="slds-modal slds-fade-in-open slds-docked-composer-modal"
706-
closeButton="false"
707-
closeButtonDisabled={false}
708706
role="dialog"
709707
tabIndex="-1"
710708
>

‎ui/components/list-builder/__tests__/__snapshots__/index.spec.js.snap

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ exports[`List Builder Inline Edit renders a default list builder with inline edi
1212
<section
1313
aria-modal="true"
1414
className="slds-modal slds-fade-in-open slds-modal_large"
15-
closeButtonDisabled={false}
1615
role="dialog"
1716
tabIndex="-1"
1817
>
@@ -691,7 +690,6 @@ exports[`List Builder renders a default list builder 1`] = `
691690
aria-labelledby="id-of-modalheader-h1"
692691
aria-modal="true"
693692
className="slds-modal slds-fade-in-open slds-modal_large slds-list-builder"
694-
closeButtonDisabled={false}
695693
role="dialog"
696694
tabIndex="-1"
697695
>
@@ -1951,7 +1949,6 @@ exports[`List Builder renders a list builder with default items disabled 1`] = `
19511949
aria-labelledby="id-of-modalheader-h1"
19521950
aria-modal="true"
19531951
className="slds-modal slds-fade-in-open slds-modal_large"
1954-
closeButtonDisabled={false}
19551952
role="dialog"
19561953
tabIndex="-1"
19571954
>
@@ -3219,7 +3216,6 @@ exports[`List Builder renders a list builder with filtered results 1`] = `
32193216
aria-labelledby="id-of-modalheader-h1"
32203217
aria-modal="true"
32213218
className="slds-modal slds-fade-in-open slds-modal_large"
3222-
closeButtonDisabled={false}
32233219
role="dialog"
32243220
tabIndex="-1"
32253221
>
@@ -3928,7 +3924,6 @@ exports[`List Builder renders a list builder with hidden header 1`] = `
39283924
aria-labelledby="id-of-modalheader-h1"
39293925
aria-modal="true"
39303926
className="slds-modal slds-fade-in-open slds-modal_large"
3931-
closeButtonDisabled={false}
39323927
role="dialog"
39333928
tabIndex="-1"
39343929
>
@@ -4725,7 +4720,6 @@ exports[`List Builder renders a list builder with items disabled 1`] = `
47254720
aria-labelledby="id-of-modalheader-h1"
47264721
aria-modal="true"
47274722
className="slds-modal slds-fade-in-open slds-modal_large"
4728-
closeButtonDisabled={false}
47294723
role="dialog"
47304724
tabIndex="-1"
47314725
>
@@ -5993,7 +5987,6 @@ exports[`List Builder renders a list builder with items selected 1`] = `
59935987
aria-labelledby="id-of-modalheader-h1"
59945988
aria-modal="true"
59955989
className="slds-modal slds-fade-in-open slds-modal_large"
5996-
closeButtonDisabled={false}
59975990
role="dialog"
59985991
tabIndex="-1"
59995992
>

‎ui/components/lookups/__tests__/__snapshots__/index.spec.js.snap

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ exports[`Lookup - Advanced Modal renders a lookup with modal 1`] = `
1212
<section
1313
aria-modal="true"
1414
className="slds-modal slds-fade-in-open slds-modal_large"
15-
closeButtonDisabled={false}
1615
role="dialog"
1716
tabIndex="-1"
1817
>

‎ui/components/map/__tests__/__snapshots__/index.spec.js.snap

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,6 @@ exports[`renders a map component modal 1`] = `
530530
aria-labelledby="modal-heading-id-01"
531531
aria-modal="true"
532532
className="slds-modal slds-fade-in-open slds-modal_medium"
533-
closeButtonDisabled={false}
534533
role="dialog"
535534
tabIndex="-1"
536535
>
@@ -602,7 +601,6 @@ exports[`renders a map component modal with coordinates panel 1`] = `
602601
aria-labelledby="modal-heading-id-01"
603602
aria-modal="true"
604603
className="slds-modal slds-fade-in-open slds-modal_medium"
605-
closeButtonDisabled={false}
606604
role="dialog"
607605
tabIndex="-1"
608606
>
@@ -1123,7 +1121,6 @@ exports[`renders a map component modal with first coordinate selected 1`] = `
11231121
aria-labelledby="modal-heading-id-01"
11241122
aria-modal="true"
11251123
className="slds-modal slds-fade-in-open slds-modal_medium"
1126-
closeButtonDisabled={false}
11271124
role="dialog"
11281125
tabIndex="-1"
11291126
>
@@ -1646,7 +1643,6 @@ exports[`renders a map component modal with footer 1`] = `
16461643
aria-labelledby="modal-heading-id-01"
16471644
aria-modal="true"
16481645
className="slds-modal slds-fade-in-open slds-modal_medium"
1649-
closeButtonDisabled={false}
16501646
role="dialog"
16511647
tabIndex="-1"
16521648
>
@@ -1727,7 +1723,6 @@ exports[`renders a map component modal with second coordinate selected 1`] = `
17271723
aria-labelledby="modal-heading-id-01"
17281724
aria-modal="true"
17291725
className="slds-modal slds-fade-in-open slds-modal_medium"
1730-
closeButtonDisabled={false}
17311726
role="dialog"
17321727
tabIndex="-1"
17331728
>

‎ui/components/modals/__tests__/__snapshots__/index.spec.js.snap

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Array [
88
aria-labelledby="modal-heading-unique-id-1"
99
aria-modal="true"
1010
className="slds-modal slds-fade-in-open"
11-
closeButtonDisabled={false}
1211
role="dialog"
1312
tabIndex="-1"
1413
>
@@ -73,7 +72,6 @@ Array [
7372
aria-labelledby="modal-heading-01"
7473
aria-modal="true"
7574
className="slds-modal slds-fade-in-open"
76-
closeButtonDisabled={true}
7775
role="dialog"
7876
tabIndex="-1"
7977
>
@@ -135,7 +133,6 @@ Array [
135133
aria-labelledby="modal-heading-01"
136134
aria-modal="true"
137135
className="slds-modal slds-fade-in-open"
138-
closeButtonDisabled={false}
139136
role="dialog"
140137
tabIndex="-1"
141138
>
@@ -197,7 +194,6 @@ Array [
197194
aria-labelledby="modal-heading-01"
198195
aria-modal="true"
199196
className="slds-modal slds-fade-in-open"
200-
closeButtonDisabled={false}
201197
role="dialog"
202198
tabIndex="-1"
203199
>
@@ -259,7 +255,6 @@ Array [
259255
aria-label="Meaningful description of the modal content"
260256
aria-modal="true"
261257
className="slds-modal slds-fade-in-open"
262-
closeButtonDisabled={false}
263258
role="dialog"
264259
tabIndex="-1"
265260
>
@@ -326,7 +321,6 @@ Array [
326321
aria-labelledby="modal-heading-01"
327322
aria-modal="true"
328323
className="slds-modal slds-fade-in-open"
329-
closeButtonDisabled={false}
330324
role="dialog"
331325
tabIndex="-1"
332326
>
@@ -381,7 +375,6 @@ Array [
381375
aria-labelledby="modal-heading-01"
382376
aria-modal="true"
383377
className="slds-modal slds-fade-in-open"
384-
closeButtonDisabled={false}
385378
role="dialog"
386379
tabIndex="-1"
387380
>
@@ -433,7 +426,6 @@ Array [
433426
aria-labelledby="modal-heading-01"
434427
aria-modal="true"
435428
className="slds-modal slds-fade-in-open"
436-
closeButtonDisabled={false}
437429
role="dialog"
438430
tabIndex="-1"
439431
>
@@ -509,7 +501,6 @@ Array [
509501
aria-labelledby="modal-heading-01"
510502
aria-modal="true"
511503
className="slds-modal slds-fade-in-open slds-modal_large"
512-
closeButtonDisabled={false}
513504
role="dialog"
514505
tabIndex="-1"
515506
>
@@ -586,7 +577,6 @@ Array [
586577
aria-labelledby="modal-heading-01"
587578
aria-modal="true"
588579
className="slds-modal slds-fade-in-open slds-modal_medium"
589-
closeButtonDisabled={false}
590580
role="dialog"
591581
tabIndex="-1"
592582
>
@@ -663,7 +653,6 @@ Array [
663653
aria-labelledby="modal-heading-01"
664654
aria-modal="true"
665655
className="slds-modal slds-fade-in-open slds-modal_small"
666-
closeButtonDisabled={false}
667656
role="dialog"
668657
tabIndex="-1"
669658
>
@@ -740,32 +729,12 @@ Array [
740729
aria-labelledby="modal-heading-01"
741730
aria-modal="true"
742731
className="slds-modal slds-fade-in-open"
743-
closeButtonDisabled={true}
744732
role="dialog"
745733
tabIndex="-1"
746734
>
747735
<div
748736
className="slds-modal__container"
749737
>
750-
<button
751-
className="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse"
752-
disabled={true}
753-
onClick={[Function]}
754-
>
755-
<svg
756-
aria-hidden={true}
757-
className="slds-button__icon slds-button__icon_large"
758-
>
759-
<use
760-
xlinkHref="/assets/icons/utility-sprite/svg/symbols.svg#close"
761-
/>
762-
</svg>
763-
<span
764-
className="slds-assistive-text"
765-
>
766-
Cancel and close
767-
</span>
768-
</button>
769738
<div
770739
className="slds-modal__header"
771740
>
@@ -820,7 +789,6 @@ Array [
820789
aria-labelledby="modal-heading-01"
821790
aria-modal="true"
822791
className="slds-modal slds-fade-in-open"
823-
closeButtonDisabled={false}
824792
role="dialog"
825793
tabIndex="-1"
826794
>

‎ui/components/modals/base/example.jsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ export let Modal = (props) => (
2727
<section
2828
role="dialog"
2929
tabIndex={props.tabIndex}
30-
{...props}
3130
aria-modal="true"
31+
aria-label={props['aria-label']}
3232
aria-labelledby={props['aria-labelledby']}
3333
aria-describedby={props['aria-describedby']}
3434
className={classNames('slds-modal slds-fade-in-open', props.className)}
3535
>
3636
<div className="slds-modal__container">
3737
{
38-
props.closeButton !== 'false' ? (
38+
props.closeButton !== false ? (
3939
<ButtonIcon
4040
className="slds-modal__close slds-button_icon-inverse"
4141
iconClassName="slds-button__icon_large"
@@ -67,7 +67,7 @@ export let ModalHeader = (props) => (
6767

6868
export let ModalHeaderDeprecated = (props) => (
6969
<div className={classNames('slds-modal__header', props.className)}>
70-
{props.closeButton !== 'false' ? (
70+
{props.closeButton !== false ? (
7171
<ButtonIcon
7272
className="slds-modal__close slds-button_icon-inverse"
7373
iconClassName="slds-button__icon_large"
@@ -268,11 +268,11 @@ export let Footless = (props) => (
268268
<Backdrop>
269269
<Modal aria-labelledby="modal-heading-01">
270270
<ModalHeader>
271-
<h1 id="modal-heading-01" className="slds-modal__title slds-hyphenate" tabindex="-1">
271+
<h1 id="modal-heading-01" className="slds-modal__title slds-hyphenate">
272272
Modal header
273273
</h1>
274274
</ModalHeader>
275-
<ModalContent className="slds-p-around_medium slds-modal__content_footless">
275+
<ModalContent className="slds-p-around_medium">
276276
<p>
277277
Sit nulla est ex deserunt exercitation anim occaecat. Nostrud ullamco
278278
deserunt aute id consequat veniam incididunt duis in sint irure nisi.
@@ -448,7 +448,7 @@ export let DisabledClose = (props) => (
448448

449449
export let DeprecatedClose = (props) => (
450450
<Backdrop>
451-
<Modal aria-labelledby="modal-heading-01" closeButtonDisabled>
451+
<Modal aria-labelledby="modal-heading-01" closeButton={false}>
452452
<ModalHeaderDeprecated>
453453
<h1 id="modal-heading-01" className="slds-modal__title slds-hyphenate">
454454
Modal header

‎ui/components/prompt/__tests__/__snapshots__/index.spec.js.snap

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ exports[`Prompt renders a default prompt 1`] = `
1414
aria-labelledby="prompt-heading-id"
1515
aria-modal="true"
1616
className="slds-modal slds-fade-in-open slds-modal_prompt"
17-
closeButton="false"
18-
closeButtonDisabled={false}
1917
role="alertdialog"
2018
tabIndex="0"
2119
>

‎ui/components/welcome-mat/__tests__/__snapshots__/snapshot.spec.js.snap

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ exports[`Composed Welcome Mat Snapshots renders a deprecated welcome mat 1`] = `
66
aria-labelledby="welcome-mat-20-label"
77
aria-modal="true"
88
className="slds-modal slds-fade-in-open slds-welcome-mat"
9-
closeButtonDisabled={false}
109
role="dialog"
1110
tabIndex="-1"
1211
>
@@ -425,7 +424,6 @@ exports[`Composed Welcome Mat Snapshots renders a splash welcome mat 1`] = `
425424
aria-labelledby="welcome-mat-13-label"
426425
aria-modal="true"
427426
className="slds-modal slds-fade-in-open slds-modal_small"
428-
closeButtonDisabled={false}
429427
role="dialog"
430428
tabIndex="-1"
431429
>
@@ -543,7 +541,6 @@ exports[`Composed Welcome Mat Snapshots renders a trailhead welcome mat 1`] = `
543541
aria-labelledby="welcome-mat-7-label"
544542
aria-modal="true"
545543
className="slds-modal slds-fade-in-open slds-modal_small"
546-
closeButtonDisabled={false}
547544
role="dialog"
548545
tabIndex="-1"
549546
>
@@ -1040,7 +1037,6 @@ exports[`Composed Welcome Mat Snapshots renders a welcome mat 1`] = `
10401037
aria-labelledby="welcome-mat-1-label"
10411038
aria-modal="true"
10421039
className="slds-modal slds-fade-in-open slds-modal_small"
1043-
closeButtonDisabled={false}
10441040
role="dialog"
10451041
tabIndex="-1"
10461042
>
@@ -1507,7 +1503,6 @@ exports[`Composed Welcome Mat Snapshots renders an info-only welcome mat 1`] = `
15071503
aria-labelledby="welcome-mat-14-label"
15081504
aria-modal="true"
15091505
className="slds-modal slds-fade-in-open slds-modal_small"
1510-
closeButtonDisabled={false}
15111506
role="dialog"
15121507
tabIndex="-1"
15131508
>

0 commit comments

Comments
 (0)