carbon-react 144.1.0 → 144.1.1

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.
Files changed (9) hide show
  1. package/esm/components/menu/menu-full-screen/menu-full-screen.component.js +2 -1
  2. package/esm/components/modal/modal.component.js +2 -1
  3. package/esm/hooks/__internal__/useModalManager/useModalManager.d.ts +2 -1
  4. package/esm/hooks/__internal__/useModalManager/useModalManager.js +14 -1
  5. package/lib/components/menu/menu-full-screen/menu-full-screen.component.js +2 -1
  6. package/lib/components/modal/modal.component.js +2 -1
  7. package/lib/hooks/__internal__/useModalManager/useModalManager.d.ts +2 -1
  8. package/lib/hooks/__internal__/useModalManager/useModalManager.js +14 -1
  9. package/package.json +1 -1
package/esm/components/menu/menu-full-screen/menu-full-screen.component.js CHANGED
@@ -54,7 +54,8 @@ export const MenuFullscreen = ({
54
54
  open: isOpen,
55
55
  closeModal,
56
56
  modalRef: menuRef,
57
- topModalOverride
57
+ topModalOverride,
58
+ focusCallToActionElement: document.activeElement
58
59
  });
59
60
  return /*#__PURE__*/React.createElement("li", null, /*#__PURE__*/React.createElement(Portal, null, /*#__PURE__*/React.createElement(CSSTransition, {
60
61
  nodeRef: menuRef,
package/esm/components/modal/modal.component.js CHANGED
@@ -58,7 +58,8 @@ const Modal = ({
58
58
  closeModal,
59
59
  modalRef: ref,
60
60
  setTriggerRefocusFlag,
61
- topModalOverride
61
+ topModalOverride,
62
+ focusCallToActionElement: document.activeElement
62
63
  });
63
64
  let background;
64
65
  let content;
package/esm/hooks/__internal__/useModalManager/useModalManager.d.ts CHANGED
@@ -6,6 +6,7 @@ declare type UseModalManagerArgs = {
6
6
  setTriggerRefocusFlag?: (flag: boolean) => void;
7
7
  triggerRefocusOnClose?: boolean;
8
8
  topModalOverride?: boolean;
9
+ focusCallToActionElement?: HTMLElement;
9
10
  };
10
- declare const useModalManager: ({ open, closeModal, modalRef, setTriggerRefocusFlag, triggerRefocusOnClose, topModalOverride, }: UseModalManagerArgs) => void;
11
+ declare const useModalManager: ({ open, closeModal, modalRef, setTriggerRefocusFlag, triggerRefocusOnClose, topModalOverride, focusCallToActionElement, }: UseModalManagerArgs) => void;
11
12
  export default useModalManager;
package/esm/hooks/__internal__/useModalManager/useModalManager.js CHANGED
@@ -6,10 +6,12 @@ const useModalManager = ({
6
6
  modalRef,
7
7
  setTriggerRefocusFlag,
8
8
  triggerRefocusOnClose = true,
9
- topModalOverride = false
9
+ topModalOverride = false,
10
+ focusCallToActionElement
10
11
  }) => {
11
12
  const listenerAdded = useRef(false);
12
13
  const modalRegistered = useRef(false);
14
+ const lastFocusedElement = useRef(null);
13
15
  const handleClose = useCallback(ev => {
14
16
  const isTopmost = ModalManager.isTopmost(modalRef.current);
15
17
  if (isTopmost) {
@@ -41,6 +43,11 @@ const useModalManager = ({
41
43
  removeListener();
42
44
  };
43
45
  }, [removeListener]);
46
+ useEffect(() => {
47
+ if (!lastFocusedElement.current && focusCallToActionElement && open) {
48
+ lastFocusedElement.current = focusCallToActionElement;
49
+ }
50
+ }, [open, focusCallToActionElement]);
44
51
  const registerModal = useCallback(ref => {
45
52
  /* istanbul ignore else */
46
53
  if (!modalRegistered.current) {
@@ -51,6 +58,12 @@ const useModalManager = ({
51
58
  const unregisterModal = useCallback(ref => {
52
59
  if (modalRegistered.current) {
53
60
  ModalManager.removeModal(ref, triggerRefocusOnClose);
61
+ if (lastFocusedElement.current) {
62
+ setTimeout(() => {
63
+ lastFocusedElement.current?.focus();
64
+ lastFocusedElement.current = null;
65
+ }, 0);
66
+ }
54
67
  modalRegistered.current = false;
55
68
  }
56
69
  }, [triggerRefocusOnClose]);
package/lib/components/menu/menu-full-screen/menu-full-screen.component.js CHANGED
@@ -63,7 +63,8 @@ const MenuFullscreen = ({
63
63
  open: isOpen,
64
64
  closeModal,
65
65
  modalRef: menuRef,
66
- topModalOverride
66
+ topModalOverride,
67
+ focusCallToActionElement: document.activeElement
67
68
  });
68
69
  return /*#__PURE__*/_react.default.createElement("li", null, /*#__PURE__*/_react.default.createElement(_portal.default, null, /*#__PURE__*/_react.default.createElement(_reactTransitionGroup.CSSTransition, {
69
70
  nodeRef: menuRef,
package/lib/components/modal/modal.component.js CHANGED
@@ -67,7 +67,8 @@ const Modal = ({
67
67
  closeModal,
68
68
  modalRef: ref,
69
69
  setTriggerRefocusFlag,
70
- topModalOverride
70
+ topModalOverride,
71
+ focusCallToActionElement: document.activeElement
71
72
  });
72
73
  let background;
73
74
  let content;
package/lib/hooks/__internal__/useModalManager/useModalManager.d.ts CHANGED
@@ -6,6 +6,7 @@ declare type UseModalManagerArgs = {
6
6
  setTriggerRefocusFlag?: (flag: boolean) => void;
7
7
  triggerRefocusOnClose?: boolean;
8
8
  topModalOverride?: boolean;
9
+ focusCallToActionElement?: HTMLElement;
9
10
  };
10
- declare const useModalManager: ({ open, closeModal, modalRef, setTriggerRefocusFlag, triggerRefocusOnClose, topModalOverride, }: UseModalManagerArgs) => void;
11
+ declare const useModalManager: ({ open, closeModal, modalRef, setTriggerRefocusFlag, triggerRefocusOnClose, topModalOverride, focusCallToActionElement, }: UseModalManagerArgs) => void;
11
12
  export default useModalManager;
package/lib/hooks/__internal__/useModalManager/useModalManager.js CHANGED
@@ -13,10 +13,12 @@ const useModalManager = ({
13
13
  modalRef,
14
14
  setTriggerRefocusFlag,
15
15
  triggerRefocusOnClose = true,
16
- topModalOverride = false
16
+ topModalOverride = false,
17
+ focusCallToActionElement
17
18
  }) => {
18
19
  const listenerAdded = (0, _react.useRef)(false);
19
20
  const modalRegistered = (0, _react.useRef)(false);
21
+ const lastFocusedElement = (0, _react.useRef)(null);
20
22
  const handleClose = (0, _react.useCallback)(ev => {
21
23
  const isTopmost = _modalManager.default.isTopmost(modalRef.current);
22
24
  if (isTopmost) {
@@ -48,6 +50,11 @@ const useModalManager = ({
48
50
  removeListener();
49
51
  };
50
52
  }, [removeListener]);
53
+ (0, _react.useEffect)(() => {
54
+ if (!lastFocusedElement.current && focusCallToActionElement && open) {
55
+ lastFocusedElement.current = focusCallToActionElement;
56
+ }
57
+ }, [open, focusCallToActionElement]);
51
58
  const registerModal = (0, _react.useCallback)(ref => {
52
59
  /* istanbul ignore else */
53
60
  if (!modalRegistered.current) {
@@ -58,6 +65,12 @@ const useModalManager = ({
58
65
  const unregisterModal = (0, _react.useCallback)(ref => {
59
66
  if (modalRegistered.current) {
60
67
  _modalManager.default.removeModal(ref, triggerRefocusOnClose);
68
+ if (lastFocusedElement.current) {
69
+ setTimeout(() => {
70
+ lastFocusedElement.current?.focus();
71
+ lastFocusedElement.current = null;
72
+ }, 0);
73
+ }
61
74
  modalRegistered.current = false;
62
75
  }
63
76
  }, [triggerRefocusOnClose]);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "carbon-react",
3
- "version": "144.1.0",
3
+ "version": "144.1.1",
4
4
  "description": "A library of reusable React components for easily building user interfaces.",
5
5
  "files": [
6
6
  "lib",