@trilogy-ds/react 4.4.0-beta-3 → 4.4.0
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/lib/components/modal/Modal.js +12 -10
- package/lib/version.d.ts +1 -1
- package/lib/version.js +2 -2
- package/package.json +1 -1
|
@@ -22,7 +22,7 @@ import { ComponentName } from '../enumsComponentsName';
|
|
|
22
22
|
* - -------------------------- NATIVE PROPERTIES -------------------------------
|
|
23
23
|
*/
|
|
24
24
|
var Modal = React.forwardRef(function (_a, ref) {
|
|
25
|
-
var children = _a.children, className = _a.className, id = _a.id, _b = _a.accessibilityLabel, accessibilityLabel = _b === void 0 ? 'Close' : _b, active = _a.active, onClose = _a.onClose, panel = _a.panel, size = _a.size, _c = _a.hideCloseButton, hideCloseButton = _c === void 0 ? false : _c, trigger = _a.trigger, title = _a.title, others = __rest(_a, ["children", "className", "id", "accessibilityLabel", "active", "onClose", "panel", "size", "hideCloseButton", "trigger", "title"]);
|
|
25
|
+
var children = _a.children, className = _a.className, id = _a.id, _b = _a.accessibilityLabel, accessibilityLabel = _b === void 0 ? 'Close' : _b, active = _a.active, onClose = _a.onClose, unClosable = _a.unClosable, panel = _a.panel, size = _a.size, _c = _a.hideCloseButton, hideCloseButton = _c === void 0 ? false : _c, trigger = _a.trigger, title = _a.title, others = __rest(_a, ["children", "className", "id", "accessibilityLabel", "active", "onClose", "unClosable", "panel", "size", "hideCloseButton", "trigger", "title"]);
|
|
26
26
|
var modalContentRef = useRef(null);
|
|
27
27
|
var _d = __read(useState(active || false), 2), display = _d[0], setDisplay = _d[1];
|
|
28
28
|
var styled = useTrilogyContext().styled;
|
|
@@ -32,10 +32,12 @@ var Modal = React.forwardRef(function (_a, ref) {
|
|
|
32
32
|
var focusableElementsRef = useRef(null);
|
|
33
33
|
var currentFocusIndexRef = useRef(0);
|
|
34
34
|
var handleClose = React.useCallback(function (onCloseFunc, e) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
onCloseFunc
|
|
35
|
+
if (!unClosable) {
|
|
36
|
+
setDisplay(false);
|
|
37
|
+
refBtnModal.current && refBtnModal.current.focus();
|
|
38
|
+
if (onCloseFunc)
|
|
39
|
+
onCloseFunc(e);
|
|
40
|
+
}
|
|
39
41
|
}, [refBtnModal.current]);
|
|
40
42
|
var classes = hashClass(styled, clsx('modal', display && is('active'), size && is(size), panel && is('panel'), className));
|
|
41
43
|
var onKeyDown = useCallback(function (e) {
|
|
@@ -49,7 +51,7 @@ var Modal = React.forwardRef(function (_a, ref) {
|
|
|
49
51
|
focusableElementsRef.current[nextIndex].focus();
|
|
50
52
|
}
|
|
51
53
|
}
|
|
52
|
-
if (display && e.key === 'Escape') {
|
|
54
|
+
if (!unClosable && display && e.key === 'Escape') {
|
|
53
55
|
e.preventDefault();
|
|
54
56
|
setDisplay(false);
|
|
55
57
|
refBtnModal.current && refBtnModal.current.focus();
|
|
@@ -67,8 +69,8 @@ var Modal = React.forwardRef(function (_a, ref) {
|
|
|
67
69
|
});
|
|
68
70
|
}, [active, currentFocusIndexRef, refBtnModal]);
|
|
69
71
|
useEffect(function () {
|
|
70
|
-
display && focusableElementsRef.current && focusableElementsRef.current[0].focus();
|
|
71
|
-
}, [display, focusableElementsRef]);
|
|
72
|
+
!hideCloseButton && display && focusableElementsRef.current && focusableElementsRef.current[0].focus();
|
|
73
|
+
}, [hideCloseButton, display, focusableElementsRef]);
|
|
72
74
|
useEffect(function () {
|
|
73
75
|
if (modalContentRef.current) {
|
|
74
76
|
focusableElementsRef.current = modalContentRef.current.querySelectorAll('button:not(:disabled), input:not(:disabled), a, select:not(:disabled), textarea:not(:disabled), details:not([aria-disabled="true"]) > summary');
|
|
@@ -84,7 +86,7 @@ var Modal = React.forwardRef(function (_a, ref) {
|
|
|
84
86
|
} }, others),
|
|
85
87
|
React.createElement("div", { ref: modalContentRef, className: hashClass(styled, clsx('modal-content')) },
|
|
86
88
|
React.createElement("div", { className: hashClass(styled, clsx('modal-header')) },
|
|
87
|
-
hideCloseButton
|
|
89
|
+
!hideCloseButton && (React.createElement("button", { onClick: function (e) {
|
|
88
90
|
handleClose(onClose, e);
|
|
89
91
|
}, className: hashClass(styled, clsx('modal-close', is('large'))), type: ButtonType.BUTTON },
|
|
90
92
|
React.createElement("span", { className: hashClass(styled, clsx('sr-only')) }, accessibilityLabelButtonClose))),
|
|
@@ -93,4 +95,4 @@ var Modal = React.forwardRef(function (_a, ref) {
|
|
|
93
95
|
});
|
|
94
96
|
Modal.displayName = ComponentName.Modal;
|
|
95
97
|
export default Modal;
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
98
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9kYWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9jb21wb25lbnRzL21vZGFsL01vZGFsLnRzeCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHFCQUFxQixDQUFBO0FBQ2hELE9BQU8sRUFBRSxLQUFLLEVBQUUsV0FBVyxFQUFFLFdBQVcsRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBQ3BFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGlCQUFpQixDQUFBO0FBRW5ELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQTtBQUN4RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQy9CLE9BQU8sRUFBRSw2QkFBNkIsRUFBRSxNQUFNLG9DQUFvQyxDQUFBO0FBQ2xGLE9BQU8sSUFBSSxNQUFNLE1BQU0sQ0FBQTtBQUN2QixPQUFPLEtBQUssRUFBRSxFQUFpQixXQUFXLEVBQUUsU0FBUyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0sT0FBTyxDQUFBO0FBQzdGLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQTtBQUd0RDs7Ozs7Ozs7Ozs7O0dBWUc7QUFDSCxJQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsVUFBVSxDQUM1QixVQUNFLEVBY0MsRUFDRCxHQUFHO0lBZEQsSUFBQSxRQUFRLGNBQUEsRUFDUixTQUFTLGVBQUEsRUFDVCxFQUFFLFFBQUEsRUFDRiwwQkFBNEIsRUFBNUIsa0JBQWtCLG1CQUFHLE9BQU8sS0FBQSxFQUM1QixNQUFNLFlBQUEsRUFDTixPQUFPLGFBQUEsRUFDUCxVQUFVLGdCQUFBLEVBQ1YsS0FBSyxXQUFBLEVBQ0wsSUFBSSxVQUFBLEVBQ0osdUJBQXVCLEVBQXZCLGVBQWUsbUJBQUcsS0FBSyxLQUFBLEVBQ3ZCLE9BQU8sYUFBQSxFQUNQLEtBQUssV0FBQSxFQUNGLE1BQU0sY0Fi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
|
package/lib/version.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const version = "4.4.0
|
|
1
|
+
export declare const version = "4.4.0";
|
package/lib/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export var version = "4.4.0
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
1
|
+
export var version = "4.4.0";
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3ZlcnNpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxDQUFDLElBQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQSJ9
|