@patternfly/react-core 4.211.3 → 4.211.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -0
- package/dist/esm/components/Modal/Modal.d.ts +4 -0
- package/dist/esm/components/Modal/Modal.d.ts.map +1 -1
- package/dist/esm/components/Modal/Modal.js +2 -2
- package/dist/esm/components/Modal/Modal.js.map +1 -1
- package/dist/esm/components/Modal/ModalContent.d.ts +4 -0
- package/dist/esm/components/Modal/ModalContent.d.ts.map +1 -1
- package/dist/esm/components/Modal/ModalContent.js +3 -2
- package/dist/esm/components/Modal/ModalContent.js.map +1 -1
- package/dist/js/components/Modal/Modal.d.ts +4 -0
- package/dist/js/components/Modal/Modal.d.ts.map +1 -1
- package/dist/js/components/Modal/Modal.js +2 -2
- package/dist/js/components/Modal/Modal.js.map +1 -1
- package/dist/js/components/Modal/ModalContent.d.ts +4 -0
- package/dist/js/components/Modal/ModalContent.d.ts.map +1 -1
- package/dist/js/components/Modal/ModalContent.js +3 -2
- package/dist/js/components/Modal/ModalContent.js.map +1 -1
- package/dist/umd/react-core.css +5 -0
- package/dist/umd/react-core.js +5 -4
- package/dist/umd/react-core.min.css +5 -0
- package/dist/umd/react-core.min.js +1 -1
- package/package.json +6 -6
- package/src/components/Modal/Modal.tsx +8 -0
- package/src/components/Modal/ModalContent.tsx +14 -1
- package/src/components/Modal/__tests__/Modal.test.tsx +56 -0
- package/src/components/Modal/examples/Modal.md +7 -0
- package/src/components/Modal/examples/ModalWithOverflowingContent.tsx +71 -0
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,14 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## 4.211.4 (2022-05-09)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @patternfly/react-core
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
6
14
|
## 4.211.3 (2022-05-06)
|
|
7
15
|
|
|
8
16
|
|
|
@@ -26,6 +26,10 @@ export interface ModalProps extends React.HTMLProps<HTMLDivElement>, OUIAProps {
|
|
|
26
26
|
'aria-label'?: string;
|
|
27
27
|
/** Id to use for Modal Box descriptor */
|
|
28
28
|
'aria-describedby'?: string;
|
|
29
|
+
/** Accessible label applied to the modal box body. This should be used to communicate important information about the modal box body div if needed, such as that it is scrollable */
|
|
30
|
+
bodyAriaLabel?: string;
|
|
31
|
+
/** Accessible role applied to the modal box body. This will default to region if a body aria label is applied. Set to a more appropriate role as applicable based on the modal content and context */
|
|
32
|
+
bodyAriaRole?: string;
|
|
29
33
|
/** Flag to show the close button in the header area of the modal */
|
|
30
34
|
showClose?: boolean;
|
|
31
35
|
/** Custom footer */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Modal.d.ts","sourceRoot":"","sources":["../../../../src/components/Modal/Modal.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Modal.d.ts","sourceRoot":"","sources":["../../../../src/components/Modal/Modal.tsx"],"names":[],"mappings":"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"}
|
|
@@ -101,12 +101,12 @@ export class Modal extends React.Component {
|
|
|
101
101
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
102
102
|
appendTo,
|
|
103
103
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
104
|
-
onEscapePress, 'aria-labelledby': ariaLabelledby, 'aria-label': ariaLabel, 'aria-describedby': ariaDescribedby, title, titleIconVariant, titleLabel, ouiaId, ouiaSafe } = _a, props = __rest(_a, ["appendTo", "onEscapePress", 'aria-labelledby', 'aria-label', 'aria-describedby', "title", "titleIconVariant", "titleLabel", "ouiaId", "ouiaSafe"]);
|
|
104
|
+
onEscapePress, 'aria-labelledby': ariaLabelledby, 'aria-label': ariaLabel, 'aria-describedby': ariaDescribedby, bodyAriaLabel, bodyAriaRole, title, titleIconVariant, titleLabel, ouiaId, ouiaSafe } = _a, props = __rest(_a, ["appendTo", "onEscapePress", 'aria-labelledby', 'aria-label', 'aria-describedby', "bodyAriaLabel", "bodyAriaRole", "title", "titleIconVariant", "titleLabel", "ouiaId", "ouiaSafe"]);
|
|
105
105
|
const { container } = this.state;
|
|
106
106
|
if (!canUseDOM || !container) {
|
|
107
107
|
return null;
|
|
108
108
|
}
|
|
109
|
-
return ReactDOM.createPortal(React.createElement(ModalContent, Object.assign({}, props, { boxId: this.boxId, labelId: this.labelId, descriptorId: this.descriptorId, title: title, titleIconVariant: titleIconVariant, titleLabel: titleLabel, "aria-label": ariaLabel, "aria-describedby": ariaDescribedby, "aria-labelledby": ariaLabelledby, ouiaId: ouiaId !== undefined ? ouiaId : this.state.ouiaStateId, ouiaSafe: ouiaSafe })), container);
|
|
109
|
+
return ReactDOM.createPortal(React.createElement(ModalContent, Object.assign({}, props, { boxId: this.boxId, labelId: this.labelId, descriptorId: this.descriptorId, title: title, titleIconVariant: titleIconVariant, titleLabel: titleLabel, "aria-label": ariaLabel, "aria-describedby": ariaDescribedby, "aria-labelledby": ariaLabelledby, bodyAriaLabel: bodyAriaLabel, bodyAriaRole: bodyAriaRole, ouiaId: ouiaId !== undefined ? ouiaId : this.state.ouiaStateId, ouiaSafe: ouiaSafe })), container);
|
|
110
110
|
}
|
|
111
111
|
}
|
|
112
112
|
Modal.displayName = 'Modal';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Modal.js","sourceRoot":"","sources":["../../../../src/components/Modal/Modal.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,QAAQ,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAgB,MAAM,eAAe,CAAC;AACnE,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,MAAM,MAAM,2DAA2D,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAa,gBAAgB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"Modal.js","sourceRoot":"","sources":["../../../../src/components/Modal/Modal.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,QAAQ,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAgB,MAAM,eAAe,CAAC;AACnE,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,MAAM,MAAM,2DAA2D,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAa,gBAAgB,EAAE,MAAM,eAAe,CAAC;AA6D5D,MAAM,CAAN,IAAY,YAKX;AALD,WAAY,YAAY;IACtB,+BAAe,CAAA;IACf,iCAAiB,CAAA;IACjB,+BAAe,CAAA;IACf,mCAAmB,CAAA;AACrB,CAAC,EALW,YAAY,KAAZ,YAAY,QAKvB;AAOD,MAAM,OAAO,KAAM,SAAQ,KAAK,CAAC,SAAiC;IA0BhE,YAAY,KAAiB;QAC3B,KAAK,CAAC,KAAK,CAAC,CAAC;QAxBf,UAAK,GAAG,EAAE,CAAC;QACX,YAAO,GAAG,EAAE,CAAC;QACb,iBAAY,GAAG,EAAE,CAAC;QAoClB,sBAAiB,GAAG,CAAC,KAAoB,EAAQ,EAAE;YACjD,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACrC,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,UAAU,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;gBAC/D,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;aAC7D;QACH,CAAC,CAAC;QAEF,eAAU,GAAG,CAAC,QAA2C,EAAE,EAAE;YAC3D,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;gBAClC,OAAO,QAAQ,EAAE,CAAC;aACnB;YACD,OAAO,QAAQ,IAAI,QAAQ,CAAC,IAAI,CAAC;QACnC,CAAC,CAAC;QAEF,oCAA+B,GAAG,CAAC,IAAa,EAAE,EAAE;YAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAChC,MAAM,MAAM,GAAgB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YACtD,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC;YACrC,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;gBAC5C,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE;oBAClC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,aAAa,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;iBAC5F;aACF;QACH,CAAC,CAAC;QAEF,YAAO,GAAG,CAAC,KAAoB,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,EAAE,CAAC;QAtCxF,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QACnC,MAAM,UAAU,GAAG,QAAQ,GAAG,CAAC,CAAC;QAChC,MAAM,eAAe,GAAG,QAAQ,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,EAAE,IAAI,iBAAiB,QAAQ,EAAE,CAAC;QACrD,IAAI,CAAC,OAAO,GAAG,iBAAiB,UAAU,EAAE,CAAC;QAC7C,IAAI,CAAC,YAAY,GAAG,iBAAiB,eAAe,EAAE,CAAC;QAEvD,IAAI,CAAC,KAAK,GAAG;YACX,SAAS,EAAE,SAAS;YACpB,WAAW,EAAE,gBAAgB,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC;SAChE,CAAC;IACJ,CAAC;IA6BD,iBAAiB;QACf,MAAM,EACJ,QAAQ,EACR,KAAK,EACL,YAAY,EAAE,SAAS,EACvB,iBAAiB,EAAE,cAAc,EACjC,gBAAgB,EAChB,MAAM,EACP,GAAG,IAAI,CAAC,KAAK,CAAC;QACf,MAAM,MAAM,GAAgB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACtD,MAAM,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAChD,IAAI,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QAC7B,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAC9B,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;QAElE,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YACrB,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;SAChD;aAAM;YACL,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;SACnD;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;YAClF,sCAAsC;YACtC,OAAO,CAAC,KAAK,CAAC,qEAAqE,CAAC,CAAC;SACtF;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,gBAAgB,IAAI,MAAM,CAAC,EAAE;YAC3F,sCAAsC;YACtC,OAAO,CAAC,KAAK,CACX,oKAAoK,CACrK,CAAC;SACH;IACH,CAAC;IAED,kBAAkB;QAChB,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAChC,MAAM,MAAM,GAAgB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACtD,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YACrB,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;YAC/C,IAAI,CAAC,+BAA+B,CAAC,IAAI,CAAC,CAAC;SAC5C;aAAM;YACL,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;YAClD,IAAI,CAAC,+BAA+B,CAAC,KAAK,CAAC,CAAC;SAC7C;IACH,CAAC;IAED,oBAAoB;QAClB,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAChC,MAAM,MAAM,GAAgB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACtD,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE;YACxB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;SAC1C;QACD,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;QACrE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,MAAM;QACJ,MAAM,KAgBF,IAAI,CAAC,KAAK,EAhBR;QACJ,6DAA6D;QAC7D,QAAQ;QACR,6DAA6D;QAC7D,aAAa,EACb,iBAAiB,EAAE,cAAc,EACjC,YAAY,EAAE,SAAS,EACvB,kBAAkB,EAAE,eAAe,EACnC,aAAa,EACb,YAAY,EACZ,KAAK,EACL,gBAAgB,EAChB,UAAU,EACV,MAAM,EACN,QAAQ,OAEI,EADT,KAAK,cAfJ,oLAgBL,CAAa,CAAC;QACf,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAEjC,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,EAAE;YAC5B,OAAO,IAAI,CAAC;SACb;QAED,OAAO,QAAQ,CAAC,YAAY,CAC1B,oBAAC,YAAY,oBACP,KAAK,IACT,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,OAAO,EAAE,IAAI,CAAC,OAAO,EACrB,YAAY,EAAE,IAAI,CAAC,YAAY,EAC/B,KAAK,EAAE,KAAK,EACZ,gBAAgB,EAAE,gBAAgB,EAClC,UAAU,EAAE,UAAU,gBACV,SAAS,sBACH,eAAe,qBAChB,cAAc,EAC/B,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAC9D,QAAQ,EAAE,QAAQ,IAClB,EACF,SAAS,CACV,CAAC;IACJ,CAAC;;AAtKM,iBAAW,GAAG,OAAO,CAAC;AACtB,eAAS,GAAG,CAAC,CAAC;AAKd,kBAAY,GAA6B;IAC9C,SAAS,EAAE,EAAE;IACb,MAAM,EAAE,KAAK;IACb,KAAK,EAAE,EAAE;IACT,gBAAgB,EAAE,IAAI;IACtB,UAAU,EAAE,EAAE;IACd,YAAY,EAAE,EAAE;IAChB,SAAS,EAAE,IAAI;IACf,kBAAkB,EAAE,EAAE;IACtB,iBAAiB,EAAE,EAAE;IACrB,EAAE,EAAE,SAAS;IACb,OAAO,EAAE,EAAW;IACpB,OAAO,EAAE,GAAG,EAAE,CAAC,SAAgB;IAC/B,OAAO,EAAE,SAAS;IAClB,gBAAgB,EAAE,KAAK;IACvB,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI;IAC7B,QAAQ,EAAE,IAAI;CACf,CAAC"}
|
|
@@ -33,6 +33,10 @@ export interface ModalContentProps extends OUIAProps {
|
|
|
33
33
|
'aria-label'?: string;
|
|
34
34
|
/** Id of Modal Box description */
|
|
35
35
|
'aria-describedby'?: string;
|
|
36
|
+
/** Accessible label applied to the modal box body. This should be used to communicate important information about the modal box body div if needed, such as that it is scrollable */
|
|
37
|
+
bodyAriaLabel?: string;
|
|
38
|
+
/** Accessible role applied to the modal box body. This will default to region if a body aria label is applied. Set to a more appropriate role as applicable based on the modal content and context */
|
|
39
|
+
bodyAriaRole?: string;
|
|
36
40
|
/** Flag to show the close button in the header area of the modal */
|
|
37
41
|
showClose?: boolean;
|
|
38
42
|
/** Default width of the content. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModalContent.d.ts","sourceRoot":"","sources":["../../../../src/components/Modal/ModalContent.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,OAAO,EAAgB,SAAS,EAAE,MAAM,eAAe,CAAC;AAWxD,MAAM,WAAW,iBAAkB,SAAQ,SAAS;IAClD,yCAAyC;IACzC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,6CAA6C;IAC7C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2BAA2B;IAC3B,OAAO,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,GAAG,SAAS,CAAC;IACnD,sCAAsC;IACtC,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,6EAA6E;IAC7E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,6BAA6B;IAC7B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,gFAAgF;IAChF,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB,iDAAiD;IACjD,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACvB,+BAA+B;IAC/B,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC9B,oFAAoF;IACpF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;uCAEmC;IACnC,gBAAgB,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,GAAG,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACpG,mDAAmD;IACnD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4BAA4B;IAC5B,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,qCAAqC;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kCAAkC;IAClC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,oEAAoE;IACpE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,oCAAoC;IACpC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,oBAAoB;IACpB,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB,uFAAuF;IACvF,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,sDAAsD;IACtD,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,mCAAmC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,+BAA+B;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,6BAA6B;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,iCAAiC;IACjC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,oFAAoF;IACpF,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,iBAAiB,CAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"ModalContent.d.ts","sourceRoot":"","sources":["../../../../src/components/Modal/ModalContent.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,OAAO,EAAgB,SAAS,EAAE,MAAM,eAAe,CAAC;AAWxD,MAAM,WAAW,iBAAkB,SAAQ,SAAS;IAClD,yCAAyC;IACzC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,6CAA6C;IAC7C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2BAA2B;IAC3B,OAAO,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,GAAG,SAAS,CAAC;IACnD,sCAAsC;IACtC,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,6EAA6E;IAC7E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,6BAA6B;IAC7B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,gFAAgF;IAChF,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB,iDAAiD;IACjD,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACvB,+BAA+B;IAC/B,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC9B,oFAAoF;IACpF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;uCAEmC;IACnC,gBAAgB,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,GAAG,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACpG,mDAAmD;IACnD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4BAA4B;IAC5B,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,qCAAqC;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kCAAkC;IAClC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,qLAAqL;IACrL,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,sMAAsM;IACtM,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oEAAoE;IACpE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,oCAAoC;IACpC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,oBAAoB;IACpB,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB,uFAAuF;IACvF,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,sDAAsD;IACtD,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,mCAAmC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,+BAA+B;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,6BAA6B;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,iCAAiC;IACjC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,oFAAoF;IACpF,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,iBAAiB,CAAC,iBAAiB,CAuHnE,CAAC"}
|
|
@@ -14,7 +14,7 @@ import { ModalBoxDescription } from './ModalBoxDescription';
|
|
|
14
14
|
import { ModalBoxHeader } from './ModalBoxHeader';
|
|
15
15
|
import { ModalBoxTitle, isVariantIcon } from './ModalBoxTitle';
|
|
16
16
|
export const ModalContent = (_a) => {
|
|
17
|
-
var { children, className = '', isOpen = false, header = null, help = null, description = null, title = '', titleIconVariant = null, titleLabel = '', 'aria-label': ariaLabel = '', 'aria-describedby': ariaDescribedby, 'aria-labelledby': ariaLabelledby, showClose = true, footer = null, actions = [], onClose = () => undefined, variant = 'default', position, positionOffset, width = -1, boxId, labelId, descriptorId, disableFocusTrap = false, hasNoBodyWrapper = false, ouiaId, ouiaSafe = true } = _a, props = __rest(_a, ["children", "className", "isOpen", "header", "help", "description", "title", "titleIconVariant", "titleLabel", 'aria-label', 'aria-describedby', 'aria-labelledby', "showClose", "footer", "actions", "onClose", "variant", "position", "positionOffset", "width", "boxId", "labelId", "descriptorId", "disableFocusTrap", "hasNoBodyWrapper", "ouiaId", "ouiaSafe"]);
|
|
17
|
+
var { children, className = '', isOpen = false, header = null, help = null, description = null, title = '', titleIconVariant = null, titleLabel = '', 'aria-label': ariaLabel = '', 'aria-describedby': ariaDescribedby, 'aria-labelledby': ariaLabelledby, bodyAriaLabel, bodyAriaRole, showClose = true, footer = null, actions = [], onClose = () => undefined, variant = 'default', position, positionOffset, width = -1, boxId, labelId, descriptorId, disableFocusTrap = false, hasNoBodyWrapper = false, ouiaId, ouiaSafe = true } = _a, props = __rest(_a, ["children", "className", "isOpen", "header", "help", "description", "title", "titleIconVariant", "titleLabel", 'aria-label', 'aria-describedby', 'aria-labelledby', "bodyAriaLabel", "bodyAriaRole", "showClose", "footer", "actions", "onClose", "variant", "position", "positionOffset", "width", "boxId", "labelId", "descriptorId", "disableFocusTrap", "hasNoBodyWrapper", "ouiaId", "ouiaSafe"]);
|
|
18
18
|
if (!isOpen) {
|
|
19
19
|
return null;
|
|
20
20
|
}
|
|
@@ -22,7 +22,8 @@ export const ModalContent = (_a) => {
|
|
|
22
22
|
React.createElement(ModalBoxTitle, { title: title, titleIconVariant: titleIconVariant, titleLabel: titleLabel, id: labelId }),
|
|
23
23
|
description && React.createElement(ModalBoxDescription, { id: descriptorId }, description))));
|
|
24
24
|
const modalBoxFooter = footer ? (React.createElement(ModalBoxFooter, null, footer)) : (actions.length > 0 && React.createElement(ModalBoxFooter, null, actions));
|
|
25
|
-
const
|
|
25
|
+
const defaultModalBodyAriaRole = bodyAriaLabel ? 'region' : undefined;
|
|
26
|
+
const modalBody = hasNoBodyWrapper ? (children) : (React.createElement(ModalBoxBody, Object.assign({ "aria-label": bodyAriaLabel, role: bodyAriaRole || defaultModalBodyAriaRole }, props, (!description && !ariaDescribedby && { id: descriptorId })), children));
|
|
26
27
|
const boxStyle = width === -1 ? {} : { width };
|
|
27
28
|
const ariaLabelledbyFormatted = () => {
|
|
28
29
|
if (ariaLabelledby === null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModalContent.js","sourceRoot":"","sources":["../../../../src/components/Modal/ModalContent.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,WAAW,MAAM,4DAA4D,CAAC;AACrF,OAAO,cAAc,MAAM,wDAAwD,CAAC;AACpF,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAa,MAAM,eAAe,CAAC;AAExD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"ModalContent.js","sourceRoot":"","sources":["../../../../src/components/Modal/ModalContent.tsx"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,10 @@ export interface ModalProps extends React.HTMLProps<HTMLDivElement>, OUIAProps {
|
|
|
26
26
|
'aria-label'?: string;
|
|
27
27
|
/** Id to use for Modal Box descriptor */
|
|
28
28
|
'aria-describedby'?: string;
|
|
29
|
+
/** Accessible label applied to the modal box body. This should be used to communicate important information about the modal box body div if needed, such as that it is scrollable */
|
|
30
|
+
bodyAriaLabel?: string;
|
|
31
|
+
/** Accessible role applied to the modal box body. This will default to region if a body aria label is applied. Set to a more appropriate role as applicable based on the modal content and context */
|
|
32
|
+
bodyAriaRole?: string;
|
|
29
33
|
/** Flag to show the close button in the header area of the modal */
|
|
30
34
|
showClose?: boolean;
|
|
31
35
|
/** Custom footer */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Modal.d.ts","sourceRoot":"","sources":["../../../../src/components/Modal/Modal.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Modal.d.ts","sourceRoot":"","sources":["../../../../src/components/Modal/Modal.tsx"],"names":[],"mappings":"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"}
|
|
@@ -104,12 +104,12 @@ class Modal extends React.Component {
|
|
|
104
104
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
105
105
|
appendTo,
|
|
106
106
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
107
|
-
onEscapePress, 'aria-labelledby': ariaLabelledby, 'aria-label': ariaLabel, 'aria-describedby': ariaDescribedby, title, titleIconVariant, titleLabel, ouiaId, ouiaSafe } = _a, props = tslib_1.__rest(_a, ["appendTo", "onEscapePress", 'aria-labelledby', 'aria-label', 'aria-describedby', "title", "titleIconVariant", "titleLabel", "ouiaId", "ouiaSafe"]);
|
|
107
|
+
onEscapePress, 'aria-labelledby': ariaLabelledby, 'aria-label': ariaLabel, 'aria-describedby': ariaDescribedby, bodyAriaLabel, bodyAriaRole, title, titleIconVariant, titleLabel, ouiaId, ouiaSafe } = _a, props = tslib_1.__rest(_a, ["appendTo", "onEscapePress", 'aria-labelledby', 'aria-label', 'aria-describedby', "bodyAriaLabel", "bodyAriaRole", "title", "titleIconVariant", "titleLabel", "ouiaId", "ouiaSafe"]);
|
|
108
108
|
const { container } = this.state;
|
|
109
109
|
if (!helpers_1.canUseDOM || !container) {
|
|
110
110
|
return null;
|
|
111
111
|
}
|
|
112
|
-
return ReactDOM.createPortal(React.createElement(ModalContent_1.ModalContent, Object.assign({}, props, { boxId: this.boxId, labelId: this.labelId, descriptorId: this.descriptorId, title: title, titleIconVariant: titleIconVariant, titleLabel: titleLabel, "aria-label": ariaLabel, "aria-describedby": ariaDescribedby, "aria-labelledby": ariaLabelledby, ouiaId: ouiaId !== undefined ? ouiaId : this.state.ouiaStateId, ouiaSafe: ouiaSafe })), container);
|
|
112
|
+
return ReactDOM.createPortal(React.createElement(ModalContent_1.ModalContent, Object.assign({}, props, { boxId: this.boxId, labelId: this.labelId, descriptorId: this.descriptorId, title: title, titleIconVariant: titleIconVariant, titleLabel: titleLabel, "aria-label": ariaLabel, "aria-describedby": ariaDescribedby, "aria-labelledby": ariaLabelledby, bodyAriaLabel: bodyAriaLabel, bodyAriaRole: bodyAriaRole, ouiaId: ouiaId !== undefined ? ouiaId : this.state.ouiaStateId, ouiaSafe: ouiaSafe })), container);
|
|
113
113
|
}
|
|
114
114
|
}
|
|
115
115
|
exports.Modal = Modal;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Modal.js","sourceRoot":"","sources":["../../../../src/components/Modal/Modal.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,4DAAsC;AACtC,2CAAmE;AACnE,2DAA+C;AAC/C,iHAA+E;AAC/E,iDAA8C;AAC9C,2CAA4D;
|
|
1
|
+
{"version":3,"file":"Modal.js","sourceRoot":"","sources":["../../../../src/components/Modal/Modal.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,4DAAsC;AACtC,2CAAmE;AACnE,2DAA+C;AAC/C,iHAA+E;AAC/E,iDAA8C;AAC9C,2CAA4D;AA6D5D,IAAY,YAKX;AALD,WAAY,YAAY;IACtB,+BAAe,CAAA;IACf,iCAAiB,CAAA;IACjB,+BAAe,CAAA;IACf,mCAAmB,CAAA;AACrB,CAAC,EALW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAKvB;AAOD,MAAa,KAAM,SAAQ,KAAK,CAAC,SAAiC;IA0BhE,YAAY,KAAiB;QAC3B,KAAK,CAAC,KAAK,CAAC,CAAC;QAxBf,UAAK,GAAG,EAAE,CAAC;QACX,YAAO,GAAG,EAAE,CAAC;QACb,iBAAY,GAAG,EAAE,CAAC;QAoClB,sBAAiB,GAAG,CAAC,KAAoB,EAAQ,EAAE;YACjD,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACrC,IAAI,KAAK,CAAC,OAAO,KAAK,mBAAS,CAAC,UAAU,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;gBAC/D,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;aAC7D;QACH,CAAC,CAAC;QAEF,eAAU,GAAG,CAAC,QAA2C,EAAE,EAAE;YAC3D,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;gBAClC,OAAO,QAAQ,EAAE,CAAC;aACnB;YACD,OAAO,QAAQ,IAAI,QAAQ,CAAC,IAAI,CAAC;QACnC,CAAC,CAAC;QAEF,oCAA+B,GAAG,CAAC,IAAa,EAAE,EAAE;YAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAChC,MAAM,MAAM,GAAgB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YACtD,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC;YACrC,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;gBAC5C,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE;oBAClC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,aAAa,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;iBAC5F;aACF;QACH,CAAC,CAAC;QAEF,YAAO,GAAG,CAAC,KAAoB,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,EAAE,CAAC;QAtCxF,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QACnC,MAAM,UAAU,GAAG,QAAQ,GAAG,CAAC,CAAC;QAChC,MAAM,eAAe,GAAG,QAAQ,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,EAAE,IAAI,iBAAiB,QAAQ,EAAE,CAAC;QACrD,IAAI,CAAC,OAAO,GAAG,iBAAiB,UAAU,EAAE,CAAC;QAC7C,IAAI,CAAC,YAAY,GAAG,iBAAiB,eAAe,EAAE,CAAC;QAEvD,IAAI,CAAC,KAAK,GAAG;YACX,SAAS,EAAE,SAAS;YACpB,WAAW,EAAE,0BAAgB,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC;SAChE,CAAC;IACJ,CAAC;IA6BD,iBAAiB;QACf,MAAM,EACJ,QAAQ,EACR,KAAK,EACL,YAAY,EAAE,SAAS,EACvB,iBAAiB,EAAE,cAAc,EACjC,gBAAgB,EAChB,MAAM,EACP,GAAG,IAAI,CAAC,KAAK,CAAC;QACf,MAAM,MAAM,GAAgB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACtD,MAAM,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAChD,IAAI,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QAC7B,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAC9B,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;QAElE,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YACrB,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,kBAAG,CAAC,kBAAM,CAAC,YAAY,CAAC,CAAC,CAAC;SAChD;aAAM;YACL,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,kBAAG,CAAC,kBAAM,CAAC,YAAY,CAAC,CAAC,CAAC;SACnD;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;YAClF,sCAAsC;YACtC,OAAO,CAAC,KAAK,CAAC,qEAAqE,CAAC,CAAC;SACtF;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,gBAAgB,IAAI,MAAM,CAAC,EAAE;YAC3F,sCAAsC;YACtC,OAAO,CAAC,KAAK,CACX,oKAAoK,CACrK,CAAC;SACH;IACH,CAAC;IAED,kBAAkB;QAChB,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAChC,MAAM,MAAM,GAAgB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACtD,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YACrB,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,kBAAG,CAAC,kBAAM,CAAC,YAAY,CAAC,CAAC,CAAC;YAC/C,IAAI,CAAC,+BAA+B,CAAC,IAAI,CAAC,CAAC;SAC5C;aAAM;YACL,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,kBAAG,CAAC,kBAAM,CAAC,YAAY,CAAC,CAAC,CAAC;YAClD,IAAI,CAAC,+BAA+B,CAAC,KAAK,CAAC,CAAC;SAC7C;IACH,CAAC;IAED,oBAAoB;QAClB,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAChC,MAAM,MAAM,GAAgB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACtD,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE;YACxB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;SAC1C;QACD,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;QACrE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,kBAAG,CAAC,kBAAM,CAAC,YAAY,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,MAAM;QACJ,MAAM,KAgBF,IAAI,CAAC,KAAK,EAhBR;QACJ,6DAA6D;QAC7D,QAAQ;QACR,6DAA6D;QAC7D,aAAa,EACb,iBAAiB,EAAE,cAAc,EACjC,YAAY,EAAE,SAAS,EACvB,kBAAkB,EAAE,eAAe,EACnC,aAAa,EACb,YAAY,EACZ,KAAK,EACL,gBAAgB,EAChB,UAAU,EACV,MAAM,EACN,QAAQ,OAEI,EADT,KAAK,sBAfJ,oLAgBL,CAAa,CAAC;QACf,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAEjC,IAAI,CAAC,mBAAS,IAAI,CAAC,SAAS,EAAE;YAC5B,OAAO,IAAI,CAAC;SACb;QAED,OAAO,QAAQ,CAAC,YAAY,CAC1B,oBAAC,2BAAY,oBACP,KAAK,IACT,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,OAAO,EAAE,IAAI,CAAC,OAAO,EACrB,YAAY,EAAE,IAAI,CAAC,YAAY,EAC/B,KAAK,EAAE,KAAK,EACZ,gBAAgB,EAAE,gBAAgB,EAClC,UAAU,EAAE,UAAU,gBACV,SAAS,sBACH,eAAe,qBAChB,cAAc,EAC/B,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAC9D,QAAQ,EAAE,QAAQ,IAClB,EACF,SAAS,CACV,CAAC;IACJ,CAAC;;AAvKH,sBAwKC;AAvKQ,iBAAW,GAAG,OAAO,CAAC;AACtB,eAAS,GAAG,CAAC,CAAC;AAKd,kBAAY,GAA6B;IAC9C,SAAS,EAAE,EAAE;IACb,MAAM,EAAE,KAAK;IACb,KAAK,EAAE,EAAE;IACT,gBAAgB,EAAE,IAAI;IACtB,UAAU,EAAE,EAAE;IACd,YAAY,EAAE,EAAE;IAChB,SAAS,EAAE,IAAI;IACf,kBAAkB,EAAE,EAAE;IACtB,iBAAiB,EAAE,EAAE;IACrB,EAAE,EAAE,SAAS;IACb,OAAO,EAAE,EAAW;IACpB,OAAO,EAAE,GAAG,EAAE,CAAC,SAAgB;IAC/B,OAAO,EAAE,SAAS;IAClB,gBAAgB,EAAE,KAAK;IACvB,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI;IAC7B,QAAQ,EAAE,IAAI;CACf,CAAC"}
|
|
@@ -33,6 +33,10 @@ export interface ModalContentProps extends OUIAProps {
|
|
|
33
33
|
'aria-label'?: string;
|
|
34
34
|
/** Id of Modal Box description */
|
|
35
35
|
'aria-describedby'?: string;
|
|
36
|
+
/** Accessible label applied to the modal box body. This should be used to communicate important information about the modal box body div if needed, such as that it is scrollable */
|
|
37
|
+
bodyAriaLabel?: string;
|
|
38
|
+
/** Accessible role applied to the modal box body. This will default to region if a body aria label is applied. Set to a more appropriate role as applicable based on the modal content and context */
|
|
39
|
+
bodyAriaRole?: string;
|
|
36
40
|
/** Flag to show the close button in the header area of the modal */
|
|
37
41
|
showClose?: boolean;
|
|
38
42
|
/** Default width of the content. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModalContent.d.ts","sourceRoot":"","sources":["../../../../src/components/Modal/ModalContent.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,OAAO,EAAgB,SAAS,EAAE,MAAM,eAAe,CAAC;AAWxD,MAAM,WAAW,iBAAkB,SAAQ,SAAS;IAClD,yCAAyC;IACzC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,6CAA6C;IAC7C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2BAA2B;IAC3B,OAAO,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,GAAG,SAAS,CAAC;IACnD,sCAAsC;IACtC,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,6EAA6E;IAC7E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,6BAA6B;IAC7B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,gFAAgF;IAChF,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB,iDAAiD;IACjD,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACvB,+BAA+B;IAC/B,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC9B,oFAAoF;IACpF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;uCAEmC;IACnC,gBAAgB,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,GAAG,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACpG,mDAAmD;IACnD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4BAA4B;IAC5B,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,qCAAqC;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kCAAkC;IAClC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,oEAAoE;IACpE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,oCAAoC;IACpC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,oBAAoB;IACpB,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB,uFAAuF;IACvF,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,sDAAsD;IACtD,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,mCAAmC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,+BAA+B;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,6BAA6B;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,iCAAiC;IACjC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,oFAAoF;IACpF,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,iBAAiB,CAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"ModalContent.d.ts","sourceRoot":"","sources":["../../../../src/components/Modal/ModalContent.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,OAAO,EAAgB,SAAS,EAAE,MAAM,eAAe,CAAC;AAWxD,MAAM,WAAW,iBAAkB,SAAQ,SAAS;IAClD,yCAAyC;IACzC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,6CAA6C;IAC7C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2BAA2B;IAC3B,OAAO,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,GAAG,SAAS,CAAC;IACnD,sCAAsC;IACtC,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,6EAA6E;IAC7E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,6BAA6B;IAC7B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,gFAAgF;IAChF,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB,iDAAiD;IACjD,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACvB,+BAA+B;IAC/B,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC9B,oFAAoF;IACpF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;uCAEmC;IACnC,gBAAgB,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,GAAG,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACpG,mDAAmD;IACnD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4BAA4B;IAC5B,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,qCAAqC;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kCAAkC;IAClC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,qLAAqL;IACrL,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,sMAAsM;IACtM,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oEAAoE;IACpE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,oCAAoC;IACpC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,oBAAoB;IACpB,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB,uFAAuF;IACvF,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,sDAAsD;IACtD,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,mCAAmC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,+BAA+B;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,6BAA6B;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,iCAAiC;IACjC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,oFAAoF;IACpF,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,iBAAiB,CAAC,iBAAiB,CAuHnE,CAAC"}
|
|
@@ -17,7 +17,7 @@ const ModalBoxDescription_1 = require("./ModalBoxDescription");
|
|
|
17
17
|
const ModalBoxHeader_1 = require("./ModalBoxHeader");
|
|
18
18
|
const ModalBoxTitle_1 = require("./ModalBoxTitle");
|
|
19
19
|
const ModalContent = (_a) => {
|
|
20
|
-
var { children, className = '', isOpen = false, header = null, help = null, description = null, title = '', titleIconVariant = null, titleLabel = '', 'aria-label': ariaLabel = '', 'aria-describedby': ariaDescribedby, 'aria-labelledby': ariaLabelledby, showClose = true, footer = null, actions = [], onClose = () => undefined, variant = 'default', position, positionOffset, width = -1, boxId, labelId, descriptorId, disableFocusTrap = false, hasNoBodyWrapper = false, ouiaId, ouiaSafe = true } = _a, props = tslib_1.__rest(_a, ["children", "className", "isOpen", "header", "help", "description", "title", "titleIconVariant", "titleLabel", 'aria-label', 'aria-describedby', 'aria-labelledby', "showClose", "footer", "actions", "onClose", "variant", "position", "positionOffset", "width", "boxId", "labelId", "descriptorId", "disableFocusTrap", "hasNoBodyWrapper", "ouiaId", "ouiaSafe"]);
|
|
20
|
+
var { children, className = '', isOpen = false, header = null, help = null, description = null, title = '', titleIconVariant = null, titleLabel = '', 'aria-label': ariaLabel = '', 'aria-describedby': ariaDescribedby, 'aria-labelledby': ariaLabelledby, bodyAriaLabel, bodyAriaRole, showClose = true, footer = null, actions = [], onClose = () => undefined, variant = 'default', position, positionOffset, width = -1, boxId, labelId, descriptorId, disableFocusTrap = false, hasNoBodyWrapper = false, ouiaId, ouiaSafe = true } = _a, props = tslib_1.__rest(_a, ["children", "className", "isOpen", "header", "help", "description", "title", "titleIconVariant", "titleLabel", 'aria-label', 'aria-describedby', 'aria-labelledby', "bodyAriaLabel", "bodyAriaRole", "showClose", "footer", "actions", "onClose", "variant", "position", "positionOffset", "width", "boxId", "labelId", "descriptorId", "disableFocusTrap", "hasNoBodyWrapper", "ouiaId", "ouiaSafe"]);
|
|
21
21
|
if (!isOpen) {
|
|
22
22
|
return null;
|
|
23
23
|
}
|
|
@@ -25,7 +25,8 @@ const ModalContent = (_a) => {
|
|
|
25
25
|
React.createElement(ModalBoxTitle_1.ModalBoxTitle, { title: title, titleIconVariant: titleIconVariant, titleLabel: titleLabel, id: labelId }),
|
|
26
26
|
description && React.createElement(ModalBoxDescription_1.ModalBoxDescription, { id: descriptorId }, description))));
|
|
27
27
|
const modalBoxFooter = footer ? (React.createElement(ModalBoxFooter_1.ModalBoxFooter, null, footer)) : (actions.length > 0 && React.createElement(ModalBoxFooter_1.ModalBoxFooter, null, actions));
|
|
28
|
-
const
|
|
28
|
+
const defaultModalBodyAriaRole = bodyAriaLabel ? 'region' : undefined;
|
|
29
|
+
const modalBody = hasNoBodyWrapper ? (children) : (React.createElement(ModalBoxBody_1.ModalBoxBody, Object.assign({ "aria-label": bodyAriaLabel, role: bodyAriaRole || defaultModalBodyAriaRole }, props, (!description && !ariaDescribedby && { id: descriptorId })), children));
|
|
29
30
|
const boxStyle = width === -1 ? {} : { width };
|
|
30
31
|
const ariaLabelledbyFormatted = () => {
|
|
31
32
|
if (ariaLabelledby === null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModalContent.js","sourceRoot":"","sources":["../../../../src/components/Modal/ModalContent.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,2CAA0C;AAC1C,mHAAqF;AACrF,8GAAoF;AACpF,2DAA+C;AAC/C,2CAAwD;AAExD,mDAAgD;AAChD,iDAA8C;AAC9C,+DAA4D;AAC5D,yCAAsC;AACtC,qDAAkD;AAClD,+DAA4D;AAC5D,qDAAkD;AAClD,mDAA+D;
|
|
1
|
+
{"version":3,"file":"ModalContent.js","sourceRoot":"","sources":["../../../../src/components/Modal/ModalContent.tsx"],"names":[],"mappings":"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"}
|
package/dist/umd/react-core.css
CHANGED
|
@@ -3123,6 +3123,7 @@ label.pf-c-check, .pf-c-check__label,
|
|
|
3123
3123
|
position: relative;
|
|
3124
3124
|
display: inline-flex;
|
|
3125
3125
|
align-items: center;
|
|
3126
|
+
min-width: 0;
|
|
3126
3127
|
padding: var(--pf-c-chip--PaddingTop) var(--pf-c-chip--PaddingRight) var(--pf-c-chip--PaddingBottom) var(--pf-c-chip--PaddingLeft);
|
|
3127
3128
|
list-style: none;
|
|
3128
3129
|
background-color: var(--pf-c-chip--BackgroundColor);
|
|
@@ -3230,6 +3231,7 @@ label.pf-c-check, .pf-c-check__label,
|
|
|
3230
3231
|
flex: 1;
|
|
3231
3232
|
flex-wrap: wrap;
|
|
3232
3233
|
align-items: baseline;
|
|
3234
|
+
min-width: 0;
|
|
3233
3235
|
}
|
|
3234
3236
|
|
|
3235
3237
|
.pf-c-chip-group__list {
|
|
@@ -3242,10 +3244,13 @@ label.pf-c-check, .pf-c-check__label,
|
|
|
3242
3244
|
display: inline-flex;
|
|
3243
3245
|
flex-wrap: wrap;
|
|
3244
3246
|
align-items: center;
|
|
3247
|
+
min-width: 0;
|
|
3248
|
+
max-width: 100%;
|
|
3245
3249
|
}
|
|
3246
3250
|
|
|
3247
3251
|
.pf-c-chip-group__list-item {
|
|
3248
3252
|
display: inline-flex;
|
|
3253
|
+
min-width: 0;
|
|
3249
3254
|
margin-right: var(--pf-c-chip-group__list-item--MarginRight);
|
|
3250
3255
|
margin-bottom: var(--pf-c-chip-group__list-item--MarginBottom);
|
|
3251
3256
|
}
|
package/dist/umd/react-core.js
CHANGED
|
@@ -15334,7 +15334,7 @@
|
|
|
15334
15334
|
ModalBoxTitle.displayName = 'ModalBoxTitle';
|
|
15335
15335
|
|
|
15336
15336
|
const ModalContent = (_a) => {
|
|
15337
|
-
var { children, className = '', isOpen = false, header = null, help = null, description = null, title = '', titleIconVariant = null, titleLabel = '', 'aria-label': ariaLabel = '', 'aria-describedby': ariaDescribedby, 'aria-labelledby': ariaLabelledby, showClose = true, footer = null, actions = [], onClose = () => undefined, variant = 'default', position, positionOffset, width = -1, boxId, labelId, descriptorId, disableFocusTrap = false, hasNoBodyWrapper = false, ouiaId, ouiaSafe = true } = _a, props = __rest$1(_a, ["children", "className", "isOpen", "header", "help", "description", "title", "titleIconVariant", "titleLabel", 'aria-label', 'aria-describedby', 'aria-labelledby', "showClose", "footer", "actions", "onClose", "variant", "position", "positionOffset", "width", "boxId", "labelId", "descriptorId", "disableFocusTrap", "hasNoBodyWrapper", "ouiaId", "ouiaSafe"]);
|
|
15337
|
+
var { children, className = '', isOpen = false, header = null, help = null, description = null, title = '', titleIconVariant = null, titleLabel = '', 'aria-label': ariaLabel = '', 'aria-describedby': ariaDescribedby, 'aria-labelledby': ariaLabelledby, bodyAriaLabel, bodyAriaRole, showClose = true, footer = null, actions = [], onClose = () => undefined, variant = 'default', position, positionOffset, width = -1, boxId, labelId, descriptorId, disableFocusTrap = false, hasNoBodyWrapper = false, ouiaId, ouiaSafe = true } = _a, props = __rest$1(_a, ["children", "className", "isOpen", "header", "help", "description", "title", "titleIconVariant", "titleLabel", 'aria-label', 'aria-describedby', 'aria-labelledby', "bodyAriaLabel", "bodyAriaRole", "showClose", "footer", "actions", "onClose", "variant", "position", "positionOffset", "width", "boxId", "labelId", "descriptorId", "disableFocusTrap", "hasNoBodyWrapper", "ouiaId", "ouiaSafe"]);
|
|
15338
15338
|
if (!isOpen) {
|
|
15339
15339
|
return null;
|
|
15340
15340
|
}
|
|
@@ -15342,7 +15342,8 @@
|
|
|
15342
15342
|
React__namespace.createElement(ModalBoxTitle, { title: title, titleIconVariant: titleIconVariant, titleLabel: titleLabel, id: labelId }),
|
|
15343
15343
|
description && React__namespace.createElement(ModalBoxDescription, { id: descriptorId }, description))));
|
|
15344
15344
|
const modalBoxFooter = footer ? (React__namespace.createElement(ModalBoxFooter, null, footer)) : (actions.length > 0 && React__namespace.createElement(ModalBoxFooter, null, actions));
|
|
15345
|
-
const
|
|
15345
|
+
const defaultModalBodyAriaRole = bodyAriaLabel ? 'region' : undefined;
|
|
15346
|
+
const modalBody = hasNoBodyWrapper ? (children) : (React__namespace.createElement(ModalBoxBody, Object.assign({ "aria-label": bodyAriaLabel, role: bodyAriaRole || defaultModalBodyAriaRole }, props, (!description && !ariaDescribedby && { id: descriptorId })), children));
|
|
15346
15347
|
const boxStyle = width === -1 ? {} : { width };
|
|
15347
15348
|
const ariaLabelledbyFormatted = () => {
|
|
15348
15349
|
if (ariaLabelledby === null) {
|
|
@@ -15466,12 +15467,12 @@
|
|
|
15466
15467
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
15467
15468
|
appendTo,
|
|
15468
15469
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
15469
|
-
onEscapePress, 'aria-labelledby': ariaLabelledby, 'aria-label': ariaLabel, 'aria-describedby': ariaDescribedby, title, titleIconVariant, titleLabel, ouiaId, ouiaSafe } = _a, props = __rest$1(_a, ["appendTo", "onEscapePress", 'aria-labelledby', 'aria-label', 'aria-describedby', "title", "titleIconVariant", "titleLabel", "ouiaId", "ouiaSafe"]);
|
|
15470
|
+
onEscapePress, 'aria-labelledby': ariaLabelledby, 'aria-label': ariaLabel, 'aria-describedby': ariaDescribedby, bodyAriaLabel, bodyAriaRole, title, titleIconVariant, titleLabel, ouiaId, ouiaSafe } = _a, props = __rest$1(_a, ["appendTo", "onEscapePress", 'aria-labelledby', 'aria-label', 'aria-describedby', "bodyAriaLabel", "bodyAriaRole", "title", "titleIconVariant", "titleLabel", "ouiaId", "ouiaSafe"]);
|
|
15470
15471
|
const { container } = this.state;
|
|
15471
15472
|
if (!canUseDOM || !container) {
|
|
15472
15473
|
return null;
|
|
15473
15474
|
}
|
|
15474
|
-
return ReactDOM__namespace.createPortal(React__namespace.createElement(ModalContent, Object.assign({}, props, { boxId: this.boxId, labelId: this.labelId, descriptorId: this.descriptorId, title: title, titleIconVariant: titleIconVariant, titleLabel: titleLabel, "aria-label": ariaLabel, "aria-describedby": ariaDescribedby, "aria-labelledby": ariaLabelledby, ouiaId: ouiaId !== undefined ? ouiaId : this.state.ouiaStateId, ouiaSafe: ouiaSafe })), container);
|
|
15475
|
+
return ReactDOM__namespace.createPortal(React__namespace.createElement(ModalContent, Object.assign({}, props, { boxId: this.boxId, labelId: this.labelId, descriptorId: this.descriptorId, title: title, titleIconVariant: titleIconVariant, titleLabel: titleLabel, "aria-label": ariaLabel, "aria-describedby": ariaDescribedby, "aria-labelledby": ariaLabelledby, bodyAriaLabel: bodyAriaLabel, bodyAriaRole: bodyAriaRole, ouiaId: ouiaId !== undefined ? ouiaId : this.state.ouiaStateId, ouiaSafe: ouiaSafe })), container);
|
|
15475
15476
|
}
|
|
15476
15477
|
}
|
|
15477
15478
|
Modal.displayName = 'Modal';
|
|
@@ -3123,6 +3123,7 @@ label.pf-c-check, .pf-c-check__label,
|
|
|
3123
3123
|
position: relative;
|
|
3124
3124
|
display: inline-flex;
|
|
3125
3125
|
align-items: center;
|
|
3126
|
+
min-width: 0;
|
|
3126
3127
|
padding: var(--pf-c-chip--PaddingTop) var(--pf-c-chip--PaddingRight) var(--pf-c-chip--PaddingBottom) var(--pf-c-chip--PaddingLeft);
|
|
3127
3128
|
list-style: none;
|
|
3128
3129
|
background-color: var(--pf-c-chip--BackgroundColor);
|
|
@@ -3230,6 +3231,7 @@ label.pf-c-check, .pf-c-check__label,
|
|
|
3230
3231
|
flex: 1;
|
|
3231
3232
|
flex-wrap: wrap;
|
|
3232
3233
|
align-items: baseline;
|
|
3234
|
+
min-width: 0;
|
|
3233
3235
|
}
|
|
3234
3236
|
|
|
3235
3237
|
.pf-c-chip-group__list {
|
|
@@ -3242,10 +3244,13 @@ label.pf-c-check, .pf-c-check__label,
|
|
|
3242
3244
|
display: inline-flex;
|
|
3243
3245
|
flex-wrap: wrap;
|
|
3244
3246
|
align-items: center;
|
|
3247
|
+
min-width: 0;
|
|
3248
|
+
max-width: 100%;
|
|
3245
3249
|
}
|
|
3246
3250
|
|
|
3247
3251
|
.pf-c-chip-group__list-item {
|
|
3248
3252
|
display: inline-flex;
|
|
3253
|
+
min-width: 0;
|
|
3249
3254
|
margin-right: var(--pf-c-chip-group__list-item--MarginRight);
|
|
3250
3255
|
margin-bottom: var(--pf-c-chip-group__list-item--MarginBottom);
|
|
3251
3256
|
}
|