@carbon/ibm-products 2.43.2-canary.191 → 2.43.2-canary.194

package/es/components/AboutModal/AboutModal.js

@@ -6,11 +6,12 @@
  */
 
 import { objectWithoutProperties as _objectWithoutProperties, extends as _extends, objectSpread2 as _objectSpread2 } from '../../_virtual/_rollupPluginBabelHelpers.js';
-import { ComposedModal, ModalHeader, ModalBody, Theme, ModalFooter } from '@carbon/react';
+import { unstable_FeatureFlags, ComposedModal, ModalHeader, ModalBody, Theme, ModalFooter } from '@carbon/react';
 import React__default, { useRef, useEffect } from 'react';
 import PropTypes from '../../node_modules/prop-types/index.js';
 import cx from 'classnames';
 import { getDevtoolsProps } from '../../global/js/utils/devtools.js';
+import { useFocus } from '../../global/js/hooks/useFocus.js';
 import { pkg } from '../../settings.js';
 import { usePortalTarget } from '../../global/js/hooks/usePortalTarget.js';
 import uuidv4 from '../../global/js/utils/uuidv4.js';
@@ -45,9 +46,13 @@ var AboutModal = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
     version = _ref.version,
     rest = _objectWithoutProperties(_ref, _excluded);
   var bodyRef = useRef(null);
+  var localRef = useRef();
+  var modalRef = ref || localRef;
   var contentRef = useRef(null);
   var contentId = uuidv4();
   var renderPortalUse = usePortalTarget(portalTargetIn);
+  var _useFocus = useFocus(modalRef),
+    firstElement = _useFocus.firstElement;
 
   // We can't add a ref directly to the ModalBody, so track it in a ref
   // as the parent of the current bodyRef element
@@ -55,16 +60,28 @@ var AboutModal = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
     var _contentRef$current;
     bodyRef.current = (_contentRef$current = contentRef.current) === null || _contentRef$current === void 0 ? void 0 : _contentRef$current.parentElement;
   }, [bodyRef]);
-  return renderPortalUse( /*#__PURE__*/React__default.createElement(ComposedModal, _extends({}, rest, {
+  useEffect(function () {
+    if (open) {
+      setTimeout(function () {
+        return firstElement === null || firstElement === void 0 ? void 0 : firstElement.focus();
+      }, 0);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [open]);
+  return renderPortalUse( /*#__PURE__*/React__default.createElement(unstable_FeatureFlags, {
+    flags: {
+      'enable-experimental-focus-wrap-without-sentinels': true
+    }
+  }, /*#__PURE__*/React__default.createElement(ComposedModal, _extends({}, rest, {
     className: cx(blockClass,
     // Apply the block class to the main HTML element
     className // Apply any supplied class names to the main HTML element.
     ),
-    "aria-label": modalAriaLabel
+    "aria-label": modalAriaLabel,
+    ref: modalRef
   }, _objectSpread2({
     onClose: onClose,
-    open: open,
-    ref: ref
+    open: open
   }, getDevtoolsProps(componentName))), /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__logo")
   }, logo), /*#__PURE__*/React__default.createElement(ModalHeader, {
@@ -95,7 +112,7 @@ var AboutModal = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
     theme: "g100"
   }, /*#__PURE__*/React__default.createElement(ModalFooter, {
     className: "".concat(blockClass, "__footer")
-  }, additionalInfo))));
+  }, additionalInfo)))));
 });
 
 // Return a placeholder if not released and not enabled by feature flag

package/lib/components/AboutModal/AboutModal.js

@@ -15,6 +15,7 @@ var React = require('react');
 var index = require('../../node_modules/prop-types/index.js');
 var cx = require('classnames');
 var devtools = require('../../global/js/utils/devtools.js');
+var useFocus = require('../../global/js/hooks/useFocus.js');
 var settings = require('../../settings.js');
 var usePortalTarget = require('../../global/js/hooks/usePortalTarget.js');
 var uuidv4 = require('../../global/js/utils/uuidv4.js');
@@ -54,9 +55,13 @@ exports.AboutModal = /*#__PURE__*/React__default["default"].forwardRef(function
     version = _ref.version,
     rest = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
   var bodyRef = React.useRef(null);
+  var localRef = React.useRef();
+  var modalRef = ref || localRef;
   var contentRef = React.useRef(null);
   var contentId = uuidv4["default"]();
   var renderPortalUse = usePortalTarget.usePortalTarget(portalTargetIn);
+  var _useFocus = useFocus.useFocus(modalRef),
+    firstElement = _useFocus.firstElement;
 
   // We can't add a ref directly to the ModalBody, so track it in a ref
   // as the parent of the current bodyRef element
@@ -64,16 +69,28 @@ exports.AboutModal = /*#__PURE__*/React__default["default"].forwardRef(function
     var _contentRef$current;
     bodyRef.current = (_contentRef$current = contentRef.current) === null || _contentRef$current === void 0 ? void 0 : _contentRef$current.parentElement;
   }, [bodyRef]);
-  return renderPortalUse( /*#__PURE__*/React__default["default"].createElement(react.ComposedModal, _rollupPluginBabelHelpers["extends"]({}, rest, {
+  React.useEffect(function () {
+    if (open) {
+      setTimeout(function () {
+        return firstElement === null || firstElement === void 0 ? void 0 : firstElement.focus();
+      }, 0);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [open]);
+  return renderPortalUse( /*#__PURE__*/React__default["default"].createElement(react.unstable_FeatureFlags, {
+    flags: {
+      'enable-experimental-focus-wrap-without-sentinels': true
+    }
+  }, /*#__PURE__*/React__default["default"].createElement(react.ComposedModal, _rollupPluginBabelHelpers["extends"]({}, rest, {
     className: cx__default["default"](blockClass,
     // Apply the block class to the main HTML element
     className // Apply any supplied class names to the main HTML element.
     ),
-    "aria-label": modalAriaLabel
+    "aria-label": modalAriaLabel,
+    ref: modalRef
   }, _rollupPluginBabelHelpers.objectSpread2({
     onClose: onClose,
-    open: open,
-    ref: ref
+    open: open
   }, devtools.getDevtoolsProps(componentName))), /*#__PURE__*/React__default["default"].createElement("div", {
     className: "".concat(blockClass, "__logo")
   }, logo), /*#__PURE__*/React__default["default"].createElement(react.ModalHeader, {
@@ -104,7 +121,7 @@ exports.AboutModal = /*#__PURE__*/React__default["default"].forwardRef(function
     theme: "g100"
   }, /*#__PURE__*/React__default["default"].createElement(react.ModalFooter, {
     className: "".concat(blockClass, "__footer")
-  }, additionalInfo))));
+  }, additionalInfo)))));
 });
 
 // Return a placeholder if not released and not enabled by feature flag

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "2.43.2-canary.191+694128bb7",
+  "version": "2.43.2-canary.194+e37beeafa",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -81,7 +81,7 @@
     "fs-extra": "^11.2.0",
     "glob": "^10.3.10",
     "jest": "^29.7.0",
-    "jest-config-ibm-cloud-cognitive": "^1.7.0",
+    "jest-config-ibm-cloud-cognitive": "^1.8.0-rc.0",
     "jest-environment-jsdom": "^29.7.0",
     "namor": "^1.1.2",
     "npm-check-updates": "^16.14.12",
@@ -96,7 +96,7 @@
   "dependencies": {
     "@babel/runtime": "^7.23.9",
     "@carbon/feature-flags": "^0.20.0",
-    "@carbon/ibm-products-styles": "^2.39.1-canary.201+694128bb7",
+    "@carbon/ibm-products-styles": "^2.45.0-rc.0",
     "@carbon/telemetry": "^0.1.0",
     "@dnd-kit/core": "^6.0.8",
     "@dnd-kit/modifiers": "^7.0.0",
@@ -120,5 +120,5 @@
     "react": "^16.8.6 || ^17.0.1 || ^18.2.0",
     "react-dom": "^16.8.6 || ^17.0.1 || ^18.2.0"
   },
-  "gitHead": "694128bb707a2400d67e6618af3fea3f3ffba86f"
+  "gitHead": "e37beeafa1f592de3c9a38930487ed7cf4e8239b"
 }