@coreui/react 5.9.0 → 5.9.2
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/README.md +1 -1
- package/dist/cjs/components/dropdown/CDropdown.js +1 -1
- package/dist/cjs/components/dropdown/CDropdown.js.map +1 -1
- package/dist/cjs/components/focus-trap/CFocusTrap.js +23 -6
- package/dist/cjs/components/focus-trap/CFocusTrap.js.map +1 -1
- package/dist/cjs/components/focus-trap/utils.d.ts +10 -0
- package/dist/cjs/components/focus-trap/utils.js +25 -0
- package/dist/cjs/components/focus-trap/utils.js.map +1 -1
- package/dist/cjs/components/form/CFormSelect.js +1 -0
- package/dist/cjs/components/form/CFormSelect.js.map +1 -1
- package/dist/cjs/components/modal/CModal.js +10 -11
- package/dist/cjs/components/modal/CModal.js.map +1 -1
- package/dist/esm/components/dropdown/CDropdown.js +1 -1
- package/dist/esm/components/dropdown/CDropdown.js.map +1 -1
- package/dist/esm/components/focus-trap/CFocusTrap.js +24 -7
- package/dist/esm/components/focus-trap/CFocusTrap.js.map +1 -1
- package/dist/esm/components/focus-trap/utils.d.ts +10 -0
- package/dist/esm/components/focus-trap/utils.js +25 -1
- package/dist/esm/components/focus-trap/utils.js.map +1 -1
- package/dist/esm/components/form/CFormSelect.js +1 -0
- package/dist/esm/components/form/CFormSelect.js.map +1 -1
- package/dist/esm/components/modal/CModal.js +10 -11
- package/dist/esm/components/modal/CModal.js.map +1 -1
- package/package.json +12 -12
- package/src/components/dropdown/CDropdown.tsx +1 -1
- package/src/components/focus-trap/CFocusTrap.tsx +33 -8
- package/src/components/focus-trap/utils.ts +24 -0
- package/src/components/form/CFormSelect.tsx +2 -0
- package/src/components/modal/CModal.tsx +30 -31
package/README.md
CHANGED
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
|
|
47
47
|
Several quick start options are available:
|
|
48
48
|
|
|
49
|
-
- [Download the latest release](https://github.com/coreui/coreui-react/archive/v5.9.
|
|
49
|
+
- [Download the latest release](https://github.com/coreui/coreui-react/archive/v5.9.2.zip)
|
|
50
50
|
- Clone the repo: `git clone https://github.com/coreui/coreui-react.git`
|
|
51
51
|
- Install with [npm](https://www.npmjs.com/): `npm install @coreui/react`
|
|
52
52
|
- Install with [yarn](https://yarnpkg.com/): `yarn add @coreui/react`
|
|
@@ -120,7 +120,7 @@ const CDropdown = React.forwardRef((_a, ref) => {
|
|
|
120
120
|
return;
|
|
121
121
|
}
|
|
122
122
|
const target = event.target;
|
|
123
|
-
const FORM_TAG_RE = /^(input|select|option|textarea|form
|
|
123
|
+
const FORM_TAG_RE = /^(input|select|option|textarea|form)$/i;
|
|
124
124
|
if (isOnMenu && target && FORM_TAG_RE.test(target.tagName)) {
|
|
125
125
|
return;
|
|
126
126
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CDropdown.js","sources":["../../../../src/components/dropdown/CDropdown.tsx"],"sourcesContent":[null],"names":["forwardRef","__rest","useRef","useForkedRef","useState","usePopper","useCallback","useMemo","getPlacement","isRTL","useEffect","getReferenceElement","getNextActiveElement","CDropdownContext","CFocusTrap","classNames","placementPropType"],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CDropdown.js","sources":["../../../../src/components/dropdown/CDropdown.tsx"],"sourcesContent":[null],"names":["forwardRef","__rest","useRef","useForkedRef","useState","usePopper","useCallback","useMemo","getPlacement","isRTL","useEffect","getReferenceElement","getNextActiveElement","CDropdownContext","CFocusTrap","classNames","placementPropType"],"mappings":"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"}
|
|
@@ -64,8 +64,9 @@ const CFocusTrap = ({ active = true, additionalContainer, children, focusFirstEl
|
|
|
64
64
|
const elements = utils.focusableChildren(container);
|
|
65
65
|
if (elements.length === 0) {
|
|
66
66
|
container.focus({ preventScroll: true });
|
|
67
|
+
return;
|
|
67
68
|
}
|
|
68
|
-
|
|
69
|
+
if (lastTabNavDirectionRef.current === 'backward') {
|
|
69
70
|
(_a = elements.at(-1)) === null || _a === void 0 ? void 0 : _a.focus({ preventScroll: true });
|
|
70
71
|
}
|
|
71
72
|
else {
|
|
@@ -79,17 +80,30 @@ const CFocusTrap = ({ active = true, additionalContainer, children, focusFirstEl
|
|
|
79
80
|
}
|
|
80
81
|
tabEventSourceRef.current = container;
|
|
81
82
|
lastTabNavDirectionRef.current = event.shiftKey ? 'backward' : 'forward';
|
|
82
|
-
if (!_additionalContainer) {
|
|
83
|
-
return;
|
|
84
|
-
}
|
|
85
83
|
const containerElements = utils.focusableChildren(container);
|
|
86
|
-
const additionalElements = utils.focusableChildren(_additionalContainer);
|
|
84
|
+
const additionalElements = _additionalContainer ? utils.focusableChildren(_additionalContainer) : [];
|
|
87
85
|
if (containerElements.length === 0 && additionalElements.length === 0) {
|
|
88
86
|
// No focusable elements, prevent tab
|
|
89
87
|
event.preventDefault();
|
|
90
88
|
return;
|
|
91
89
|
}
|
|
90
|
+
const focusableElements = [...containerElements, ...additionalElements];
|
|
91
|
+
const firstFocusableElement = focusableElements[0];
|
|
92
|
+
const lastFocusableElement = focusableElements.at(-1);
|
|
92
93
|
const activeElement = document.activeElement;
|
|
94
|
+
if (event.shiftKey && activeElement === firstFocusableElement) {
|
|
95
|
+
event.preventDefault();
|
|
96
|
+
lastFocusableElement.focus();
|
|
97
|
+
return;
|
|
98
|
+
}
|
|
99
|
+
if (!event.shiftKey && activeElement === lastFocusableElement) {
|
|
100
|
+
event.preventDefault();
|
|
101
|
+
firstFocusableElement.focus();
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
104
|
+
if (!_additionalContainer) {
|
|
105
|
+
return;
|
|
106
|
+
}
|
|
93
107
|
const isInContainer = containerElements.includes(activeElement);
|
|
94
108
|
const isInAdditional = additionalElements.includes(activeElement);
|
|
95
109
|
// Handle tab navigation between container and additional elements
|
|
@@ -151,7 +165,10 @@ const CFocusTrap = ({ active = true, additionalContainer, children, focusFirstEl
|
|
|
151
165
|
}, [active, additionalContainer, focusFirstElement, onActivate, onDeactivate, restoreFocus]);
|
|
152
166
|
// Attach our ref to the ONLY child — no extra wrappers
|
|
153
167
|
const onlyChild = React.Children.only(children);
|
|
154
|
-
|
|
168
|
+
// Handle different ref access patterns between React versions
|
|
169
|
+
// React 19+: ref is accessed via element.props.ref
|
|
170
|
+
// React 18 and earlier: ref is accessed via element.ref
|
|
171
|
+
const childRef = utils.getChildRef(onlyChild);
|
|
155
172
|
const mergedRef = utils.mergeRefs(childRef, (node) => {
|
|
156
173
|
containerRef.current = node;
|
|
157
174
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CFocusTrap.js","sources":["../../../../src/components/focus-trap/CFocusTrap.tsx"],"sourcesContent":[null],"names":["useRef","useEffect","focusableChildren","mergeRefs","cloneElement"],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CFocusTrap.js","sources":["../../../../src/components/focus-trap/CFocusTrap.tsx"],"sourcesContent":[null],"names":["useRef","useEffect","focusableChildren","getChildRef","mergeRefs","cloneElement"],"mappings":"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"}
|
|
@@ -6,6 +6,16 @@ import React from 'react';
|
|
|
6
6
|
* @returns Array of focusable HTML elements
|
|
7
7
|
*/
|
|
8
8
|
export declare const focusableChildren: (element: HTMLElement) => HTMLElement[];
|
|
9
|
+
/**
|
|
10
|
+
* Extracts the ref from a React element, handling version differences between React 18 and 19+.
|
|
11
|
+
*
|
|
12
|
+
* In React 18 and earlier, refs are stored directly on the element object.
|
|
13
|
+
* In React 19+, refs are stored in the element's props object due to changes in React's internals.
|
|
14
|
+
* This function automatically detects the React version and uses the appropriate access pattern.
|
|
15
|
+
* @param child - The React element to extract the ref from
|
|
16
|
+
* @returns The ref attached to the element, or undefined if no ref is present
|
|
17
|
+
*/
|
|
18
|
+
export declare const getChildRef: (child: React.ReactElement) => React.Ref<HTMLElement> | undefined;
|
|
9
19
|
/**
|
|
10
20
|
* Checks if an element is disabled.
|
|
11
21
|
* Considers various ways an element can be disabled including CSS classes and attributes.
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
+
var React = require('react');
|
|
4
|
+
|
|
3
5
|
/**
|
|
4
6
|
* Gets all focusable child elements within a container.
|
|
5
7
|
* Uses a comprehensive selector to find elements that can receive focus.
|
|
@@ -20,6 +22,28 @@ const focusableChildren = (element) => {
|
|
|
20
22
|
const elements = [...element.querySelectorAll(focusableSelectors)];
|
|
21
23
|
return elements.filter((el) => !isDisabled(el) && isVisible(el));
|
|
22
24
|
};
|
|
25
|
+
/**
|
|
26
|
+
* Extracts the ref from a React element, handling version differences between React 18 and 19+.
|
|
27
|
+
*
|
|
28
|
+
* In React 18 and earlier, refs are stored directly on the element object.
|
|
29
|
+
* In React 19+, refs are stored in the element's props object due to changes in React's internals.
|
|
30
|
+
* This function automatically detects the React version and uses the appropriate access pattern.
|
|
31
|
+
* @param child - The React element to extract the ref from
|
|
32
|
+
* @returns The ref attached to the element, or undefined if no ref is present
|
|
33
|
+
*/
|
|
34
|
+
const getChildRef = (child) => {
|
|
35
|
+
var _a, _b, _c;
|
|
36
|
+
const major = Number((_c = (_b = (_a = React.version) === null || _a === void 0 ? void 0 : _a.split) === null || _b === void 0 ? void 0 : _b.call(_a, '.')[0]) !== null && _c !== void 0 ? _c : 18);
|
|
37
|
+
// React 18 stores ref directly on the element
|
|
38
|
+
if (major <= 18 && 'ref' in child && child.ref !== undefined) {
|
|
39
|
+
return child.ref;
|
|
40
|
+
}
|
|
41
|
+
// React 19 stores ref in props
|
|
42
|
+
if (child.props && typeof child.props === 'object' && 'ref' in child.props) {
|
|
43
|
+
return child.props.ref;
|
|
44
|
+
}
|
|
45
|
+
return undefined;
|
|
46
|
+
};
|
|
23
47
|
/**
|
|
24
48
|
* Checks if an element is disabled.
|
|
25
49
|
* Considers various ways an element can be disabled including CSS classes and attributes.
|
|
@@ -101,6 +125,7 @@ const mergeRefs = (...refs) => (node) => {
|
|
|
101
125
|
};
|
|
102
126
|
|
|
103
127
|
exports.focusableChildren = focusableChildren;
|
|
128
|
+
exports.getChildRef = getChildRef;
|
|
104
129
|
exports.isDisabled = isDisabled;
|
|
105
130
|
exports.isElement = isElement;
|
|
106
131
|
exports.isVisible = isVisible;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sources":["../../../../src/components/focus-trap/utils.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sources":["../../../../src/components/focus-trap/utils.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,7 @@ const CFormSelect = React.forwardRef((_a, ref) => {
|
|
|
17
17
|
? options.map((option, index) => {
|
|
18
18
|
return (React.createElement("option", Object.assign({}, (typeof option === 'object' &&
|
|
19
19
|
option.disabled && { disabled: option.disabled }), (typeof option === 'object' &&
|
|
20
|
+
option.selected && { selected: option.selected }), (typeof option === 'object' &&
|
|
20
21
|
option.value !== undefined && { value: option.value }), { key: index }), typeof option === 'string' ? option : option.label));
|
|
21
22
|
})
|
|
22
23
|
: children)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CFormSelect.js","sources":["../../../../src/components/form/CFormSelect.tsx"],"sourcesContent":[null],"names":["forwardRef","__rest","CFormControlWrapper","classNames"],"mappings":";;;;;;;;AA+CO,MAAM,WAAW,GAAGA,gBAAU,CACnC,CACE,EAkBC,EACD,GAAG,KACD;AApBF,IAAA,IAAA,EACE,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,QAAQ,EACR,EAAE,EACF,OAAO,EACP,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,eAAe,EACf,KAAK,EAAA,GAAA,EAEN,EADI,IAAI,GAAAC,gBAAA,CAAA,EAAA,EAjBT,4MAkBC,CADQ;IAIT,QACE,KAAA,CAAA,aAAA,CAACC,uCAAmB,EAAA,EAClB,WAAW,EAAE,IAAI,CAAC,kBAAkB,CAAC,EACrC,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa,EAC5B,iBAAiB,EAAE,iBAAiB,EACpC,aAAa,EAAE,aAAa,EAC5B,EAAE,EAAE,EAAE,EACN,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,IAAI,EACV,eAAe,EAAE,eAAe,EAChC,KAAK,EAAE,KAAK,EAAA;QAEZ,KAAA,CAAA,aAAA,CAAA,QAAA,EAAA,MAAA,CAAA,MAAA,CAAA,EACE,EAAE,EAAE,EAAE,EACN,SAAS,EAAEC,aAAU,CACnB,aAAa,EACb;AACE,gBAAA,CAAC,CAAA,YAAA,EAAe,IAAI,CAAA,CAAE,GAAG,IAAI;AAC7B,gBAAA,YAAY,EAAE,OAAO;AACrB,gBAAA,UAAU,EAAE,KAAK;AAClB,aAAA,EACD,SAAS,CACV,EACD,IAAI,EAAE,QAAQ,EAAA,EACV,IAAI,EAAA,EACR,GAAG,EAAE,GAAG,KAEP;cACG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,KAAI;AAC5B,gBAAA,QACE,KAAA,CAAA,aAAA,CAAA,QAAA,EAAA,MAAA,CAAA,MAAA,CAAA,EAAA,GACO,OAAO,MAAM,KAAK,QAAQ;AAC7B,oBAAA,MAAM,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,IAC7C,OAAO,MAAM,KAAK,QAAQ;AAC7B,oBAAA,MAAM,CAAC,KAAK,KAAK,SAAS,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,GAAC,EACxD,GAAG,EAAE,KAAK,EAAA,CAAA,EAET,OAAO,MAAM,KAAK,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC,KAAK,CAC5C;AAEb,YAAA,CAAC;AACH,cAAE,QAAQ,CACL,CACW;AAE1B,CAAC;AAGH,WAAW,CAAC,SAAS,GAAA,MAAA,CAAA,MAAA,CAAA,EACnB,SAAS,EAAE,SAAS,CAAC,MAAM,EAC3B,QAAQ,EAAE,SAAS,CAAC,MAAM,EAC1B,OAAO,EAAE,SAAS,CAAC,KAAK,EAAA,EACrBD,uCAAmB,CAAC,SAAS,CACjC;AAED,WAAW,CAAC,WAAW,GAAG,aAAa;;;;"}
|
|
1
|
+
{"version":3,"file":"CFormSelect.js","sources":["../../../../src/components/form/CFormSelect.tsx"],"sourcesContent":[null],"names":["forwardRef","__rest","CFormControlWrapper","classNames"],"mappings":";;;;;;;;AA+CO,MAAM,WAAW,GAAGA,gBAAU,CACnC,CACE,EAkBC,EACD,GAAG,KACD;AApBF,IAAA,IAAA,EACE,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,QAAQ,EACR,EAAE,EACF,OAAO,EACP,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,eAAe,EACf,KAAK,EAAA,GAAA,EAEN,EADI,IAAI,GAAAC,gBAAA,CAAA,EAAA,EAjBT,4MAkBC,CADQ;IAIT,QACE,KAAA,CAAA,aAAA,CAACC,uCAAmB,EAAA,EAClB,WAAW,EAAE,IAAI,CAAC,kBAAkB,CAAC,EACrC,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa,EAC5B,iBAAiB,EAAE,iBAAiB,EACpC,aAAa,EAAE,aAAa,EAC5B,EAAE,EAAE,EAAE,EACN,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,IAAI,EACV,eAAe,EAAE,eAAe,EAChC,KAAK,EAAE,KAAK,EAAA;QAEZ,KAAA,CAAA,aAAA,CAAA,QAAA,EAAA,MAAA,CAAA,MAAA,CAAA,EACE,EAAE,EAAE,EAAE,EACN,SAAS,EAAEC,aAAU,CACnB,aAAa,EACb;AACE,gBAAA,CAAC,CAAA,YAAA,EAAe,IAAI,CAAA,CAAE,GAAG,IAAI;AAC7B,gBAAA,YAAY,EAAE,OAAO;AACrB,gBAAA,UAAU,EAAE,KAAK;AAClB,aAAA,EACD,SAAS,CACV,EACD,IAAI,EAAE,QAAQ,EAAA,EACV,IAAI,EAAA,EACR,GAAG,EAAE,GAAG,KAEP;cACG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,KAAI;AAC5B,gBAAA,QACE,KAAA,CAAA,aAAA,CAAA,QAAA,EAAA,MAAA,CAAA,MAAA,CAAA,EAAA,GACO,OAAO,MAAM,KAAK,QAAQ;AAC7B,oBAAA,MAAM,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,IAC7C,OAAO,MAAM,KAAK,QAAQ;AAC7B,oBAAA,MAAM,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,IAC7C,OAAO,MAAM,KAAK,QAAQ;AAC7B,oBAAA,MAAM,CAAC,KAAK,KAAK,SAAS,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,GAAC,EACxD,GAAG,EAAE,KAAK,EAAA,CAAA,EAET,OAAO,MAAM,KAAK,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC,KAAK,CAC5C;AAEb,YAAA,CAAC;AACH,cAAE,QAAQ,CACL,CACW;AAE1B,CAAC;AAGH,WAAW,CAAC,SAAS,GAAA,MAAA,CAAA,MAAA,CAAA,EACnB,SAAS,EAAE,SAAS,CAAC,MAAM,EAC3B,QAAQ,EAAE,SAAS,CAAC,MAAM,EAC1B,OAAO,EAAE,SAAS,CAAC,KAAK,EAAA,EACrBD,uCAAmB,CAAC,SAAS,CACjC;AAED,WAAW,CAAC,WAAW,GAAG,aAAa;;;;"}
|
|
@@ -17,7 +17,6 @@ var Transition = require('../../node_modules/react-transition-group/esm/Transiti
|
|
|
17
17
|
const CModal = React.forwardRef((_a, ref) => {
|
|
18
18
|
var { children, alignment, backdrop = true, className, container, duration = 150, focus = true, fullscreen, keyboard = true, onClose, onClosePrevented, onShow, portal = true, scrollable, size, transition = true, unmountOnClose = true, visible } = _a, rest = tslib_es6.__rest(_a, ["children", "alignment", "backdrop", "className", "container", "duration", "focus", "fullscreen", "keyboard", "onClose", "onClosePrevented", "onShow", "portal", "scrollable", "size", "transition", "unmountOnClose", "visible"]);
|
|
19
19
|
const modalRef = React.useRef(null);
|
|
20
|
-
const modalContentRef = React.useRef(null);
|
|
21
20
|
const forkedRef = useForkedRef.useForkedRef(ref, modalRef);
|
|
22
21
|
const [_visible, setVisible] = React.useState(visible);
|
|
23
22
|
const [staticBackdrop, setStaticBackdrop] = React.useState(false);
|
|
@@ -85,16 +84,16 @@ const CModal = React.forwardRef((_a, ref) => {
|
|
|
85
84
|
return (React.createElement(React.Fragment, null,
|
|
86
85
|
React.createElement(Transition.default, { in: _visible, mountOnEnter: true, nodeRef: modalRef, onEnter: onShow, onExit: onClose, unmountOnExit: unmountOnClose, timeout: transition ? duration : 0 }, (state) => (React.createElement(CConditionalPortal.CConditionalPortal, { container: container, portal: portal },
|
|
87
86
|
React.createElement(CModalContext.CModalContext.Provider, { value: contextValues },
|
|
88
|
-
React.createElement(
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
React.createElement(
|
|
97
|
-
React.createElement(CModalContent.CModalContent,
|
|
87
|
+
React.createElement(CFocusTrap.CFocusTrap, { active: focus && state === 'entered' },
|
|
88
|
+
React.createElement("div", Object.assign({ className: index.default('modal', {
|
|
89
|
+
'modal-static': staticBackdrop,
|
|
90
|
+
fade: transition,
|
|
91
|
+
show: state === 'entered',
|
|
92
|
+
}, className), tabIndex: -1 }, (_visible
|
|
93
|
+
? { 'aria-modal': true, role: 'dialog' }
|
|
94
|
+
: { 'aria-hidden': 'true' }), { style: Object.assign({}, (state !== 'exited' && { display: 'block' })) }, rest, { ref: forkedRef }),
|
|
95
|
+
React.createElement(CModalDialog.CModalDialog, { alignment: alignment, fullscreen: fullscreen, scrollable: scrollable, size: size },
|
|
96
|
+
React.createElement(CModalContent.CModalContent, null, children)))))))),
|
|
98
97
|
backdrop && (React.createElement(CConditionalPortal.CConditionalPortal, { container: container, portal: portal },
|
|
99
98
|
React.createElement(CBackdrop.CBackdrop, { visible: _visible })))));
|
|
100
99
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CModal.js","sources":["../../../../src/components/modal/CModal.tsx"],"sourcesContent":[null],"names":["forwardRef","__rest","useRef","useForkedRef","useState","useEffect","useLayoutEffect","Transition","CConditionalPortal","CModalContext","
|
|
1
|
+
{"version":3,"file":"CModal.js","sources":["../../../../src/components/modal/CModal.tsx"],"sourcesContent":[null],"names":["forwardRef","__rest","useRef","useForkedRef","useState","useEffect","useLayoutEffect","Transition","CConditionalPortal","CModalContext","CFocusTrap","classNames","CModalDialog","CModalContent","CBackdrop"],"mappings":"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"}
|
|
@@ -118,7 +118,7 @@ const CDropdown = forwardRef((_a, ref) => {
|
|
|
118
118
|
return;
|
|
119
119
|
}
|
|
120
120
|
const target = event.target;
|
|
121
|
-
const FORM_TAG_RE = /^(input|select|option|textarea|form
|
|
121
|
+
const FORM_TAG_RE = /^(input|select|option|textarea|form)$/i;
|
|
122
122
|
if (isOnMenu && target && FORM_TAG_RE.test(target.tagName)) {
|
|
123
123
|
return;
|
|
124
124
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CDropdown.js","sources":["../../../../src/components/dropdown/CDropdown.tsx"],"sourcesContent":[null],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CDropdown.js","sources":["../../../../src/components/dropdown/CDropdown.tsx"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React, { useRef, useEffect, cloneElement } from 'react';
|
|
2
|
-
import { focusableChildren, mergeRefs } from './utils.js';
|
|
2
|
+
import { focusableChildren, getChildRef, mergeRefs } from './utils.js';
|
|
3
3
|
|
|
4
4
|
const CFocusTrap = ({ active = true, additionalContainer, children, focusFirstElement = false, onActivate, onDeactivate, restoreFocus = true, }) => {
|
|
5
5
|
const containerRef = useRef(null);
|
|
@@ -62,8 +62,9 @@ const CFocusTrap = ({ active = true, additionalContainer, children, focusFirstEl
|
|
|
62
62
|
const elements = focusableChildren(container);
|
|
63
63
|
if (elements.length === 0) {
|
|
64
64
|
container.focus({ preventScroll: true });
|
|
65
|
+
return;
|
|
65
66
|
}
|
|
66
|
-
|
|
67
|
+
if (lastTabNavDirectionRef.current === 'backward') {
|
|
67
68
|
(_a = elements.at(-1)) === null || _a === void 0 ? void 0 : _a.focus({ preventScroll: true });
|
|
68
69
|
}
|
|
69
70
|
else {
|
|
@@ -77,17 +78,30 @@ const CFocusTrap = ({ active = true, additionalContainer, children, focusFirstEl
|
|
|
77
78
|
}
|
|
78
79
|
tabEventSourceRef.current = container;
|
|
79
80
|
lastTabNavDirectionRef.current = event.shiftKey ? 'backward' : 'forward';
|
|
80
|
-
if (!_additionalContainer) {
|
|
81
|
-
return;
|
|
82
|
-
}
|
|
83
81
|
const containerElements = focusableChildren(container);
|
|
84
|
-
const additionalElements = focusableChildren(_additionalContainer);
|
|
82
|
+
const additionalElements = _additionalContainer ? focusableChildren(_additionalContainer) : [];
|
|
85
83
|
if (containerElements.length === 0 && additionalElements.length === 0) {
|
|
86
84
|
// No focusable elements, prevent tab
|
|
87
85
|
event.preventDefault();
|
|
88
86
|
return;
|
|
89
87
|
}
|
|
88
|
+
const focusableElements = [...containerElements, ...additionalElements];
|
|
89
|
+
const firstFocusableElement = focusableElements[0];
|
|
90
|
+
const lastFocusableElement = focusableElements.at(-1);
|
|
90
91
|
const activeElement = document.activeElement;
|
|
92
|
+
if (event.shiftKey && activeElement === firstFocusableElement) {
|
|
93
|
+
event.preventDefault();
|
|
94
|
+
lastFocusableElement.focus();
|
|
95
|
+
return;
|
|
96
|
+
}
|
|
97
|
+
if (!event.shiftKey && activeElement === lastFocusableElement) {
|
|
98
|
+
event.preventDefault();
|
|
99
|
+
firstFocusableElement.focus();
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
102
|
+
if (!_additionalContainer) {
|
|
103
|
+
return;
|
|
104
|
+
}
|
|
91
105
|
const isInContainer = containerElements.includes(activeElement);
|
|
92
106
|
const isInAdditional = additionalElements.includes(activeElement);
|
|
93
107
|
// Handle tab navigation between container and additional elements
|
|
@@ -149,7 +163,10 @@ const CFocusTrap = ({ active = true, additionalContainer, children, focusFirstEl
|
|
|
149
163
|
}, [active, additionalContainer, focusFirstElement, onActivate, onDeactivate, restoreFocus]);
|
|
150
164
|
// Attach our ref to the ONLY child — no extra wrappers
|
|
151
165
|
const onlyChild = React.Children.only(children);
|
|
152
|
-
|
|
166
|
+
// Handle different ref access patterns between React versions
|
|
167
|
+
// React 19+: ref is accessed via element.props.ref
|
|
168
|
+
// React 18 and earlier: ref is accessed via element.ref
|
|
169
|
+
const childRef = getChildRef(onlyChild);
|
|
153
170
|
const mergedRef = mergeRefs(childRef, (node) => {
|
|
154
171
|
containerRef.current = node;
|
|
155
172
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CFocusTrap.js","sources":["../../../../src/components/focus-trap/CFocusTrap.tsx"],"sourcesContent":[null],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CFocusTrap.js","sources":["../../../../src/components/focus-trap/CFocusTrap.tsx"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,16 @@ import React from 'react';
|
|
|
6
6
|
* @returns Array of focusable HTML elements
|
|
7
7
|
*/
|
|
8
8
|
export declare const focusableChildren: (element: HTMLElement) => HTMLElement[];
|
|
9
|
+
/**
|
|
10
|
+
* Extracts the ref from a React element, handling version differences between React 18 and 19+.
|
|
11
|
+
*
|
|
12
|
+
* In React 18 and earlier, refs are stored directly on the element object.
|
|
13
|
+
* In React 19+, refs are stored in the element's props object due to changes in React's internals.
|
|
14
|
+
* This function automatically detects the React version and uses the appropriate access pattern.
|
|
15
|
+
* @param child - The React element to extract the ref from
|
|
16
|
+
* @returns The ref attached to the element, or undefined if no ref is present
|
|
17
|
+
*/
|
|
18
|
+
export declare const getChildRef: (child: React.ReactElement) => React.Ref<HTMLElement> | undefined;
|
|
9
19
|
/**
|
|
10
20
|
* Checks if an element is disabled.
|
|
11
21
|
* Considers various ways an element can be disabled including CSS classes and attributes.
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
|
|
1
3
|
/**
|
|
2
4
|
* Gets all focusable child elements within a container.
|
|
3
5
|
* Uses a comprehensive selector to find elements that can receive focus.
|
|
@@ -18,6 +20,28 @@ const focusableChildren = (element) => {
|
|
|
18
20
|
const elements = [...element.querySelectorAll(focusableSelectors)];
|
|
19
21
|
return elements.filter((el) => !isDisabled(el) && isVisible(el));
|
|
20
22
|
};
|
|
23
|
+
/**
|
|
24
|
+
* Extracts the ref from a React element, handling version differences between React 18 and 19+.
|
|
25
|
+
*
|
|
26
|
+
* In React 18 and earlier, refs are stored directly on the element object.
|
|
27
|
+
* In React 19+, refs are stored in the element's props object due to changes in React's internals.
|
|
28
|
+
* This function automatically detects the React version and uses the appropriate access pattern.
|
|
29
|
+
* @param child - The React element to extract the ref from
|
|
30
|
+
* @returns The ref attached to the element, or undefined if no ref is present
|
|
31
|
+
*/
|
|
32
|
+
const getChildRef = (child) => {
|
|
33
|
+
var _a, _b, _c;
|
|
34
|
+
const major = Number((_c = (_b = (_a = React.version) === null || _a === void 0 ? void 0 : _a.split) === null || _b === void 0 ? void 0 : _b.call(_a, '.')[0]) !== null && _c !== void 0 ? _c : 18);
|
|
35
|
+
// React 18 stores ref directly on the element
|
|
36
|
+
if (major <= 18 && 'ref' in child && child.ref !== undefined) {
|
|
37
|
+
return child.ref;
|
|
38
|
+
}
|
|
39
|
+
// React 19 stores ref in props
|
|
40
|
+
if (child.props && typeof child.props === 'object' && 'ref' in child.props) {
|
|
41
|
+
return child.props.ref;
|
|
42
|
+
}
|
|
43
|
+
return undefined;
|
|
44
|
+
};
|
|
21
45
|
/**
|
|
22
46
|
* Checks if an element is disabled.
|
|
23
47
|
* Considers various ways an element can be disabled including CSS classes and attributes.
|
|
@@ -98,5 +122,5 @@ const mergeRefs = (...refs) => (node) => {
|
|
|
98
122
|
});
|
|
99
123
|
};
|
|
100
124
|
|
|
101
|
-
export { focusableChildren, isDisabled, isElement, isVisible, mergeRefs };
|
|
125
|
+
export { focusableChildren, getChildRef, isDisabled, isElement, isVisible, mergeRefs };
|
|
102
126
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sources":["../../../../src/components/focus-trap/utils.ts"],"sourcesContent":[null],"names":[],"mappings":"AAEA;;;;;AAKG;AACI,MAAM,iBAAiB,GAAG,CAAC,OAAoB,KAAmB;AACvE,IAAA,MAAM,kBAAkB,GAAG;QACzB,SAAS;QACT,wBAAwB;QACxB,uBAAuB;QACvB,0BAA0B;QAC1B,wBAAwB;QACxB,SAAS;QACT,iCAAiC;QACjC,0BAA0B;AAC3B,KAAA,CAAC,IAAI,CAAC,GAAG,CAAC;IAEX,MAAM,QAAQ,GAAG,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAc,kBAAkB,CAAC,CAAkB;IAEhG,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,SAAS,CAAC,EAAE,CAAC,CAAC;AAClE;AAEA;;;;;AAKG;AACI,MAAM,UAAU,GAAG,CAAC,OAAoB,KAAa;IAC1D,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,QAAQ,KAAK,IAAI,CAAC,YAAY,EAAE;AACtD,QAAA,OAAO,IAAI;IACb;IAEA,IAAI,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;AAC1C,QAAA,OAAO,IAAI;IACb;IAEA,IAAI,UAAU,IAAI,OAAO,IAAI,OAAO,OAAO,CAAC,QAAQ,KAAK,SAAS,EAAE;QAClE,OAAO,OAAO,CAAC,QAAQ;IACzB;AAEA,IAAA,OAAO,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,OAAO;AACzF;AAEA;;;;;AAKG;AACI,MAAM,SAAS,GAAG,CAAC,MAAe,KAAuB;IAC9D,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;AACzC,QAAA,OAAO,KAAK;IACd;IAEA,OAAO,UAAU,IAAI,MAAM,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,QAAQ;AACpE;AAEA;;;;;AAKG;AACI,MAAM,SAAS,GAAG,CAAC,OAAoB,KAAa;AACzD,IAAA,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE;AAChE,QAAA,OAAO,KAAK;IACd;AAEA,IAAA,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC,gBAAgB,CAAC,YAAY,CAAC,KAAK,SAAS;;IAG/F,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC;IAE5D,IAAI,CAAC,aAAa,EAAE;AAClB,QAAA,OAAO,gBAAgB;IACzB;AAEA,IAAA,IAAI,aAAa,KAAK,OAAO,EAAE;QAC7B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC;;QAG1C,IAAI,CAAA,OAAO,KAAA,IAAA,IAAP,OAAO,KAAA,MAAA,GAAA,MAAA,GAAP,OAAO,CAAE,UAAU,MAAK,aAAa,EAAE;AACzC,YAAA,OAAO,KAAK;QACd;IACF;AAEA,IAAA,OAAO,gBAAgB;AACzB;AAEA;;;;;AAKG;AACI,MAAM,SAAS,GACpB,CAAI,GAAG,IAAkC,KACzC,CAAC,IAAO,KAAI;AACV,IAAA,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,KAAI;AACnB,QAAA,IAAI,CAAC,GAAG;YAAE;AACV,QAAA,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE;YAC7B,GAAG,CAAC,IAAI,CAAC;QACX;aAAO;AACL,YAAA,IAAI;gBACF;AAAE,gBAAA,GAA0B,CAAC,OAAO,GAAG,IAAI;YAC7C;AAAE,YAAA,OAAA,EAAA,EAAM;;YAER;QACF;AACF,IAAA,CAAC,CAAC;AACJ;;;;"}
|
|
1
|
+
{"version":3,"file":"utils.js","sources":["../../../../src/components/focus-trap/utils.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ const CFormSelect = forwardRef((_a, ref) => {
|
|
|
15
15
|
? options.map((option, index) => {
|
|
16
16
|
return (React.createElement("option", Object.assign({}, (typeof option === 'object' &&
|
|
17
17
|
option.disabled && { disabled: option.disabled }), (typeof option === 'object' &&
|
|
18
|
+
option.selected && { selected: option.selected }), (typeof option === 'object' &&
|
|
18
19
|
option.value !== undefined && { value: option.value }), { key: index }), typeof option === 'string' ? option : option.label));
|
|
19
20
|
})
|
|
20
21
|
: children)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CFormSelect.js","sources":["../../../../src/components/form/CFormSelect.tsx"],"sourcesContent":[null],"names":[],"mappings":";;;;;;AA+CO,MAAM,WAAW,GAAG,UAAU,CACnC,CACE,EAkBC,EACD,GAAG,KACD;AApBF,IAAA,IAAA,EACE,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,QAAQ,EACR,EAAE,EACF,OAAO,EACP,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,eAAe,EACf,KAAK,EAAA,GAAA,EAEN,EADI,IAAI,GAAA,MAAA,CAAA,EAAA,EAjBT,4MAkBC,CADQ;IAIT,QACE,KAAA,CAAA,aAAA,CAAC,mBAAmB,EAAA,EAClB,WAAW,EAAE,IAAI,CAAC,kBAAkB,CAAC,EACrC,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa,EAC5B,iBAAiB,EAAE,iBAAiB,EACpC,aAAa,EAAE,aAAa,EAC5B,EAAE,EAAE,EAAE,EACN,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,IAAI,EACV,eAAe,EAAE,eAAe,EAChC,KAAK,EAAE,KAAK,EAAA;QAEZ,KAAA,CAAA,aAAA,CAAA,QAAA,EAAA,MAAA,CAAA,MAAA,CAAA,EACE,EAAE,EAAE,EAAE,EACN,SAAS,EAAE,UAAU,CACnB,aAAa,EACb;AACE,gBAAA,CAAC,CAAA,YAAA,EAAe,IAAI,CAAA,CAAE,GAAG,IAAI;AAC7B,gBAAA,YAAY,EAAE,OAAO;AACrB,gBAAA,UAAU,EAAE,KAAK;AAClB,aAAA,EACD,SAAS,CACV,EACD,IAAI,EAAE,QAAQ,EAAA,EACV,IAAI,EAAA,EACR,GAAG,EAAE,GAAG,KAEP;cACG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,KAAI;AAC5B,gBAAA,QACE,KAAA,CAAA,aAAA,CAAA,QAAA,EAAA,MAAA,CAAA,MAAA,CAAA,EAAA,GACO,OAAO,MAAM,KAAK,QAAQ;AAC7B,oBAAA,MAAM,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,IAC7C,OAAO,MAAM,KAAK,QAAQ;AAC7B,oBAAA,MAAM,CAAC,KAAK,KAAK,SAAS,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,GAAC,EACxD,GAAG,EAAE,KAAK,EAAA,CAAA,EAET,OAAO,MAAM,KAAK,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC,KAAK,CAC5C;AAEb,YAAA,CAAC;AACH,cAAE,QAAQ,CACL,CACW;AAE1B,CAAC;AAGH,WAAW,CAAC,SAAS,GAAA,MAAA,CAAA,MAAA,CAAA,EACnB,SAAS,EAAE,SAAS,CAAC,MAAM,EAC3B,QAAQ,EAAE,SAAS,CAAC,MAAM,EAC1B,OAAO,EAAE,SAAS,CAAC,KAAK,EAAA,EACrB,mBAAmB,CAAC,SAAS,CACjC;AAED,WAAW,CAAC,WAAW,GAAG,aAAa;;;;"}
|
|
1
|
+
{"version":3,"file":"CFormSelect.js","sources":["../../../../src/components/form/CFormSelect.tsx"],"sourcesContent":[null],"names":[],"mappings":";;;;;;AA+CO,MAAM,WAAW,GAAG,UAAU,CACnC,CACE,EAkBC,EACD,GAAG,KACD;AApBF,IAAA,IAAA,EACE,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,QAAQ,EACR,EAAE,EACF,OAAO,EACP,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,eAAe,EACf,KAAK,EAAA,GAAA,EAEN,EADI,IAAI,GAAA,MAAA,CAAA,EAAA,EAjBT,4MAkBC,CADQ;IAIT,QACE,KAAA,CAAA,aAAA,CAAC,mBAAmB,EAAA,EAClB,WAAW,EAAE,IAAI,CAAC,kBAAkB,CAAC,EACrC,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa,EAC5B,iBAAiB,EAAE,iBAAiB,EACpC,aAAa,EAAE,aAAa,EAC5B,EAAE,EAAE,EAAE,EACN,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,IAAI,EACV,eAAe,EAAE,eAAe,EAChC,KAAK,EAAE,KAAK,EAAA;QAEZ,KAAA,CAAA,aAAA,CAAA,QAAA,EAAA,MAAA,CAAA,MAAA,CAAA,EACE,EAAE,EAAE,EAAE,EACN,SAAS,EAAE,UAAU,CACnB,aAAa,EACb;AACE,gBAAA,CAAC,CAAA,YAAA,EAAe,IAAI,CAAA,CAAE,GAAG,IAAI;AAC7B,gBAAA,YAAY,EAAE,OAAO;AACrB,gBAAA,UAAU,EAAE,KAAK;AAClB,aAAA,EACD,SAAS,CACV,EACD,IAAI,EAAE,QAAQ,EAAA,EACV,IAAI,EAAA,EACR,GAAG,EAAE,GAAG,KAEP;cACG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,KAAI;AAC5B,gBAAA,QACE,KAAA,CAAA,aAAA,CAAA,QAAA,EAAA,MAAA,CAAA,MAAA,CAAA,EAAA,GACO,OAAO,MAAM,KAAK,QAAQ;AAC7B,oBAAA,MAAM,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,IAC7C,OAAO,MAAM,KAAK,QAAQ;AAC7B,oBAAA,MAAM,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,IAC7C,OAAO,MAAM,KAAK,QAAQ;AAC7B,oBAAA,MAAM,CAAC,KAAK,KAAK,SAAS,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,GAAC,EACxD,GAAG,EAAE,KAAK,EAAA,CAAA,EAET,OAAO,MAAM,KAAK,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC,KAAK,CAC5C;AAEb,YAAA,CAAC;AACH,cAAE,QAAQ,CACL,CACW;AAE1B,CAAC;AAGH,WAAW,CAAC,SAAS,GAAA,MAAA,CAAA,MAAA,CAAA,EACnB,SAAS,EAAE,SAAS,CAAC,MAAM,EAC3B,QAAQ,EAAE,SAAS,CAAC,MAAM,EAC1B,OAAO,EAAE,SAAS,CAAC,KAAK,EAAA,EACrB,mBAAmB,CAAC,SAAS,CACjC;AAED,WAAW,CAAC,WAAW,GAAG,aAAa;;;;"}
|
|
@@ -15,7 +15,6 @@ import Transition from '../../node_modules/react-transition-group/esm/Transition
|
|
|
15
15
|
const CModal = forwardRef((_a, ref) => {
|
|
16
16
|
var { children, alignment, backdrop = true, className, container, duration = 150, focus = true, fullscreen, keyboard = true, onClose, onClosePrevented, onShow, portal = true, scrollable, size, transition = true, unmountOnClose = true, visible } = _a, rest = __rest(_a, ["children", "alignment", "backdrop", "className", "container", "duration", "focus", "fullscreen", "keyboard", "onClose", "onClosePrevented", "onShow", "portal", "scrollable", "size", "transition", "unmountOnClose", "visible"]);
|
|
17
17
|
const modalRef = useRef(null);
|
|
18
|
-
const modalContentRef = useRef(null);
|
|
19
18
|
const forkedRef = useForkedRef(ref, modalRef);
|
|
20
19
|
const [_visible, setVisible] = useState(visible);
|
|
21
20
|
const [staticBackdrop, setStaticBackdrop] = useState(false);
|
|
@@ -83,16 +82,16 @@ const CModal = forwardRef((_a, ref) => {
|
|
|
83
82
|
return (React.createElement(React.Fragment, null,
|
|
84
83
|
React.createElement(Transition, { in: _visible, mountOnEnter: true, nodeRef: modalRef, onEnter: onShow, onExit: onClose, unmountOnExit: unmountOnClose, timeout: transition ? duration : 0 }, (state) => (React.createElement(CConditionalPortal, { container: container, portal: portal },
|
|
85
84
|
React.createElement(CModalContext.Provider, { value: contextValues },
|
|
86
|
-
React.createElement(
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
React.createElement(
|
|
95
|
-
React.createElement(CModalContent,
|
|
85
|
+
React.createElement(CFocusTrap, { active: focus && state === 'entered' },
|
|
86
|
+
React.createElement("div", Object.assign({ className: classNames('modal', {
|
|
87
|
+
'modal-static': staticBackdrop,
|
|
88
|
+
fade: transition,
|
|
89
|
+
show: state === 'entered',
|
|
90
|
+
}, className), tabIndex: -1 }, (_visible
|
|
91
|
+
? { 'aria-modal': true, role: 'dialog' }
|
|
92
|
+
: { 'aria-hidden': 'true' }), { style: Object.assign({}, (state !== 'exited' && { display: 'block' })) }, rest, { ref: forkedRef }),
|
|
93
|
+
React.createElement(CModalDialog, { alignment: alignment, fullscreen: fullscreen, scrollable: scrollable, size: size },
|
|
94
|
+
React.createElement(CModalContent, null, children)))))))),
|
|
96
95
|
backdrop && (React.createElement(CConditionalPortal, { container: container, portal: portal },
|
|
97
96
|
React.createElement(CBackdrop, { visible: _visible })))));
|
|
98
97
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CModal.js","sources":["../../../../src/components/modal/CModal.tsx"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;;;;;;AAgGO,MAAM,MAAM,GAAG,UAAU,CAC9B,CACE,EAoBC,EACD,GAAG,KACD;QAtBF,EACE,QAAQ,EACR,SAAS,EACT,QAAQ,GAAG,IAAI,EACf,SAAS,EACT,SAAS,EACT,QAAQ,GAAG,GAAG,EACd,KAAK,GAAG,IAAI,EACZ,UAAU,EACV,QAAQ,GAAG,IAAI,EACf,OAAO,EACP,gBAAgB,EAChB,MAAM,EACN,MAAM,GAAG,IAAI,EACb,UAAU,EACV,IAAI,EACJ,UAAU,GAAG,IAAI,EACjB,cAAc,GAAG,IAAI,EACrB,OAAO,EAAA,GAAA,EAER,EADI,IAAI,GAAA,MAAA,CAAA,EAAA,EAnBT,CAAA,UAAA,EAAA,WAAA,EAAA,UAAA,EAAA,WAAA,EAAA,WAAA,EAAA,UAAA,EAAA,OAAA,EAAA,YAAA,EAAA,UAAA,EAAA,SAAA,EAAA,kBAAA,EAAA,QAAA,EAAA,QAAA,EAAA,YAAA,EAAA,MAAA,EAAA,YAAA,EAAA,gBAAA,EAAA,SAAA,CAoBC,CADQ;AAIT,IAAA,MAAM,QAAQ,GAAG,MAAM,CAAiB,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"CModal.js","sources":["../../../../src/components/modal/CModal.tsx"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@coreui/react",
|
|
3
|
-
"version": "5.9.
|
|
3
|
+
"version": "5.9.2",
|
|
4
4
|
"description": "UI Components Library for React.js",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react",
|
|
@@ -46,28 +46,28 @@
|
|
|
46
46
|
"prop-types": "^15.8.1"
|
|
47
47
|
},
|
|
48
48
|
"devDependencies": {
|
|
49
|
-
"@rollup/plugin-commonjs": "^
|
|
50
|
-
"@rollup/plugin-node-resolve": "^16.0.
|
|
51
|
-
"@rollup/plugin-typescript": "^12.
|
|
49
|
+
"@rollup/plugin-commonjs": "^29.0.0",
|
|
50
|
+
"@rollup/plugin-node-resolve": "^16.0.3",
|
|
51
|
+
"@rollup/plugin-typescript": "^12.3.0",
|
|
52
52
|
"@testing-library/dom": "^10.4.1",
|
|
53
|
-
"@testing-library/jest-dom": "^6.
|
|
53
|
+
"@testing-library/jest-dom": "^6.9.1",
|
|
54
54
|
"@testing-library/react": "^16.3.0",
|
|
55
|
-
"@types/jest": "^
|
|
55
|
+
"@types/jest": "^30.0.0",
|
|
56
56
|
"@types/prop-types": "15.7.15",
|
|
57
|
-
"@types/react": "^19.
|
|
58
|
-
"@types/react-dom": "^19.
|
|
57
|
+
"@types/react": "^19.2.7",
|
|
58
|
+
"@types/react-dom": "^19.2.3",
|
|
59
59
|
"@types/react-transition-group": "^4.4.12",
|
|
60
60
|
"classnames": "^2.5.1",
|
|
61
|
-
"cross-env": "^10.
|
|
61
|
+
"cross-env": "^10.1.0",
|
|
62
62
|
"jest": "^29.7.0",
|
|
63
63
|
"jest-environment-jsdom": "^29.7.0",
|
|
64
64
|
"react": "^18.3.1",
|
|
65
65
|
"react-dom": "^18.3.1",
|
|
66
66
|
"react-transition-group": "^4.4.5",
|
|
67
|
-
"rollup": "^4.
|
|
68
|
-
"ts-jest": "^29.4.
|
|
67
|
+
"rollup": "^4.53.3",
|
|
68
|
+
"ts-jest": "^29.4.6",
|
|
69
69
|
"tslib": "^2.8.1",
|
|
70
|
-
"typescript": "^5.9.
|
|
70
|
+
"typescript": "^5.9.3"
|
|
71
71
|
},
|
|
72
72
|
"peerDependencies": {
|
|
73
73
|
"react": ">=17",
|
|
@@ -368,7 +368,7 @@ export const CDropdown: PolymorphicRefForwardingComponent<'div', CDropdownProps>
|
|
|
368
368
|
}
|
|
369
369
|
|
|
370
370
|
const target = event.target as HTMLElement | null
|
|
371
|
-
const FORM_TAG_RE = /^(input|select|option|textarea|form
|
|
371
|
+
const FORM_TAG_RE = /^(input|select|option|textarea|form)$/i
|
|
372
372
|
|
|
373
373
|
if (isOnMenu && target && FORM_TAG_RE.test(target.tagName)) {
|
|
374
374
|
return
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React, { FC, ReactElement, cloneElement, useEffect, useRef } from 'react'
|
|
2
|
-
import { mergeRefs, focusableChildren } from './utils'
|
|
2
|
+
import { mergeRefs, focusableChildren, getChildRef } from './utils'
|
|
3
3
|
|
|
4
4
|
export interface CFocusTrapProps {
|
|
5
5
|
/**
|
|
@@ -146,7 +146,10 @@ export const CFocusTrap: FC<CFocusTrapProps> = ({
|
|
|
146
146
|
|
|
147
147
|
if (elements.length === 0) {
|
|
148
148
|
container.focus({ preventScroll: true })
|
|
149
|
-
|
|
149
|
+
return
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
if (lastTabNavDirectionRef.current === 'backward') {
|
|
150
153
|
elements.at(-1)?.focus({ preventScroll: true })
|
|
151
154
|
} else {
|
|
152
155
|
elements[0].focus({ preventScroll: true })
|
|
@@ -161,12 +164,8 @@ export const CFocusTrap: FC<CFocusTrapProps> = ({
|
|
|
161
164
|
tabEventSourceRef.current = container
|
|
162
165
|
lastTabNavDirectionRef.current = event.shiftKey ? 'backward' : 'forward'
|
|
163
166
|
|
|
164
|
-
if (!_additionalContainer) {
|
|
165
|
-
return
|
|
166
|
-
}
|
|
167
|
-
|
|
168
167
|
const containerElements = focusableChildren(container)
|
|
169
|
-
const additionalElements = focusableChildren(_additionalContainer)
|
|
168
|
+
const additionalElements = _additionalContainer ? focusableChildren(_additionalContainer) : []
|
|
170
169
|
|
|
171
170
|
if (containerElements.length === 0 && additionalElements.length === 0) {
|
|
172
171
|
// No focusable elements, prevent tab
|
|
@@ -174,7 +173,28 @@ export const CFocusTrap: FC<CFocusTrapProps> = ({
|
|
|
174
173
|
return
|
|
175
174
|
}
|
|
176
175
|
|
|
176
|
+
const focusableElements = [...containerElements, ...additionalElements]
|
|
177
|
+
|
|
178
|
+
const firstFocusableElement = focusableElements[0] as HTMLElement
|
|
179
|
+
const lastFocusableElement = focusableElements.at(-1) as HTMLElement
|
|
177
180
|
const activeElement = document.activeElement as HTMLElement
|
|
181
|
+
|
|
182
|
+
if (event.shiftKey && activeElement === firstFocusableElement) {
|
|
183
|
+
event.preventDefault()
|
|
184
|
+
lastFocusableElement.focus()
|
|
185
|
+
return
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
if (!event.shiftKey && activeElement === lastFocusableElement) {
|
|
189
|
+
event.preventDefault()
|
|
190
|
+
firstFocusableElement.focus()
|
|
191
|
+
return
|
|
192
|
+
}
|
|
193
|
+
|
|
194
|
+
if (!_additionalContainer) {
|
|
195
|
+
return
|
|
196
|
+
}
|
|
197
|
+
|
|
178
198
|
const isInContainer = containerElements.includes(activeElement)
|
|
179
199
|
const isInAdditional = additionalElements.includes(activeElement)
|
|
180
200
|
|
|
@@ -245,7 +265,12 @@ export const CFocusTrap: FC<CFocusTrapProps> = ({
|
|
|
245
265
|
|
|
246
266
|
// Attach our ref to the ONLY child — no extra wrappers
|
|
247
267
|
const onlyChild = React.Children.only(children)
|
|
248
|
-
|
|
268
|
+
|
|
269
|
+
// Handle different ref access patterns between React versions
|
|
270
|
+
// React 19+: ref is accessed via element.props.ref
|
|
271
|
+
// React 18 and earlier: ref is accessed via element.ref
|
|
272
|
+
const childRef: React.Ref<HTMLElement> | undefined = getChildRef(onlyChild)
|
|
273
|
+
|
|
249
274
|
const mergedRef = mergeRefs(childRef, (node: HTMLElement | null) => {
|
|
250
275
|
containerRef.current = node
|
|
251
276
|
})
|
|
@@ -23,6 +23,30 @@ export const focusableChildren = (element: HTMLElement): HTMLElement[] => {
|
|
|
23
23
|
return elements.filter((el) => !isDisabled(el) && isVisible(el))
|
|
24
24
|
}
|
|
25
25
|
|
|
26
|
+
/**
|
|
27
|
+
* Extracts the ref from a React element, handling version differences between React 18 and 19+.
|
|
28
|
+
*
|
|
29
|
+
* In React 18 and earlier, refs are stored directly on the element object.
|
|
30
|
+
* In React 19+, refs are stored in the element's props object due to changes in React's internals.
|
|
31
|
+
* This function automatically detects the React version and uses the appropriate access pattern.
|
|
32
|
+
* @param child - The React element to extract the ref from
|
|
33
|
+
* @returns The ref attached to the element, or undefined if no ref is present
|
|
34
|
+
*/
|
|
35
|
+
export const getChildRef = (child: React.ReactElement): React.Ref<HTMLElement> | undefined => {
|
|
36
|
+
const major = Number(React.version?.split?.('.')[0] ?? 18)
|
|
37
|
+
// React 18 stores ref directly on the element
|
|
38
|
+
if (major <= 18 && 'ref' in child && child.ref !== undefined) {
|
|
39
|
+
return (child as React.ReactElement & { ref?: React.Ref<HTMLElement> }).ref
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
// React 19 stores ref in props
|
|
43
|
+
if (child.props && typeof child.props === 'object' && 'ref' in child.props) {
|
|
44
|
+
return (child.props as { ref?: React.Ref<HTMLElement> }).ref
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
return undefined
|
|
48
|
+
}
|
|
49
|
+
|
|
26
50
|
/**
|
|
27
51
|
* Checks if an element is disabled.
|
|
28
52
|
* Considers various ways an element can be disabled including CSS classes and attributes.
|
|
@@ -104,6 +104,8 @@ export const CFormSelect = forwardRef<HTMLSelectElement, CFormSelectProps>(
|
|
|
104
104
|
<option
|
|
105
105
|
{...(typeof option === 'object' &&
|
|
106
106
|
option.disabled && { disabled: option.disabled })}
|
|
107
|
+
{...(typeof option === 'object' &&
|
|
108
|
+
option.selected && { selected: option.selected })}
|
|
107
109
|
{...(typeof option === 'object' &&
|
|
108
110
|
option.value !== undefined && { value: option.value })}
|
|
109
111
|
key={index}
|
|
@@ -120,7 +120,6 @@ export const CModal = forwardRef<HTMLDivElement, CModalProps>(
|
|
|
120
120
|
ref
|
|
121
121
|
) => {
|
|
122
122
|
const modalRef = useRef<HTMLDivElement>(null)
|
|
123
|
-
const modalContentRef = useRef<HTMLDivElement>(null)
|
|
124
123
|
const forkedRef = useForkedRef(ref, modalRef)
|
|
125
124
|
|
|
126
125
|
const [_visible, setVisible] = useState(visible)
|
|
@@ -213,37 +212,37 @@ export const CModal = forwardRef<HTMLDivElement, CModalProps>(
|
|
|
213
212
|
{(state) => (
|
|
214
213
|
<CConditionalPortal container={container} portal={portal}>
|
|
215
214
|
<CModalContext.Provider value={contextValues}>
|
|
216
|
-
<
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
<CModalDialog
|
|
237
|
-
alignment={alignment}
|
|
238
|
-
fullscreen={fullscreen}
|
|
239
|
-
scrollable={scrollable}
|
|
240
|
-
size={size}
|
|
215
|
+
<CFocusTrap active={focus && state === 'entered'}>
|
|
216
|
+
<div
|
|
217
|
+
className={classNames(
|
|
218
|
+
'modal',
|
|
219
|
+
{
|
|
220
|
+
'modal-static': staticBackdrop,
|
|
221
|
+
fade: transition,
|
|
222
|
+
show: state === 'entered',
|
|
223
|
+
},
|
|
224
|
+
className
|
|
225
|
+
)}
|
|
226
|
+
tabIndex={-1}
|
|
227
|
+
{...(_visible
|
|
228
|
+
? { 'aria-modal': true, role: 'dialog' }
|
|
229
|
+
: { 'aria-hidden': 'true' })}
|
|
230
|
+
style={{
|
|
231
|
+
...(state !== 'exited' && { display: 'block' }),
|
|
232
|
+
}}
|
|
233
|
+
{...rest}
|
|
234
|
+
ref={forkedRef}
|
|
241
235
|
>
|
|
242
|
-
<
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
236
|
+
<CModalDialog
|
|
237
|
+
alignment={alignment}
|
|
238
|
+
fullscreen={fullscreen}
|
|
239
|
+
scrollable={scrollable}
|
|
240
|
+
size={size}
|
|
241
|
+
>
|
|
242
|
+
<CModalContent>{children}</CModalContent>
|
|
243
|
+
</CModalDialog>
|
|
244
|
+
</div>
|
|
245
|
+
</CFocusTrap>
|
|
247
246
|
</CModalContext.Provider>
|
|
248
247
|
</CConditionalPortal>
|
|
249
248
|
)}
|