@carbon/ibm-products 2.43.2-canary.242 → 2.43.2-canary.244

package/es/components/ExportModal/ExportModal.js

@@ -6,13 +6,13 @@
  */
 
 import { objectWithoutProperties as _objectWithoutProperties, slicedToArray as _slicedToArray, defineProperty as _defineProperty, extends as _extends, objectSpread2 as _objectSpread2 } from '../../_virtual/_rollupPluginBabelHelpers.js';
-import { ComposedModal, ModalHeader, ModalBody, FormGroup, RadioButtonGroup, RadioButton, TextInput, PasswordInput, Loading, ModalFooter, Button } from '@carbon/react';
+import { unstable_FeatureFlags, ComposedModal, ModalHeader, ModalBody, FormGroup, RadioButtonGroup, RadioButton, TextInput, PasswordInput, Loading, ModalFooter, Button } from '@carbon/react';
 import { CheckmarkFilled, ErrorFilled } from '@carbon/react/icons';
 import React__default, { forwardRef, useState, useEffect, useRef } from 'react';
 import PropTypes from '../../node_modules/prop-types/index.js';
 import cx from 'classnames';
 import { getDevtoolsProps } from '../../global/js/utils/devtools.js';
-import { pkg } from '../../settings.js';
+import { pkg, carbon } from '../../settings.js';
 import { usePortalTarget } from '../../global/js/hooks/usePortalTarget.js';
 import uuidv4 from '../../global/js/utils/uuidv4.js';
 
@@ -58,6 +58,7 @@ var ExportModal = /*#__PURE__*/forwardRef(function (_ref, ref) {
     _ref$validExtensions = _ref.validExtensions,
     validExtensions = _ref$validExtensions === void 0 ? defaults.validExtensions : _ref$validExtensions,
     rest = _objectWithoutProperties(_ref, _excluded);
+  var blockClass = "".concat(pkg.prefix, "--export-modal");
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     name = _useState2[0],
@@ -80,6 +81,12 @@ var ExportModal = /*#__PURE__*/forwardRef(function (_ref, ref) {
       setExtension(preformattedExtensions === null || preformattedExtensions === void 0 || (_preformattedExtensio2 = preformattedExtensions[0]) === null || _preformattedExtensio2 === void 0 ? void 0 : _preformattedExtensio2.extension);
     }
   }, [filename, preformattedExtensions, open]);
+  useEffect(function () {
+    if (successful) {
+      var button = document.querySelector(".".concat(blockClass, " .").concat(carbon.prefix, "--modal-close-button button"));
+      button === null || button === void 0 || button.focus();
+    }
+  }, [successful, blockClass]);
   var onNameChangeHandler = function onNameChangeHandler(evt) {
     setName(evt.target.value);
   };
@@ -106,7 +113,6 @@ var ExportModal = /*#__PURE__*/forwardRef(function (_ref, ref) {
     }
     return false;
   };
-  var blockClass = "".concat(pkg.prefix, "--export-modal");
   var internalId = useRef(uuidv4());
   var primaryButtonDisabled = loading || !name || hasInvalidExtension();
   var submitted = loading || error || successful;
@@ -119,7 +125,11 @@ var ExportModal = /*#__PURE__*/forwardRef(function (_ref, ref) {
     invalidText: invalidInputText,
     onBlur: onBlurHandler
   }, 'data-modal-primary-focus', true);
-  return renderPortalUse( /*#__PURE__*/React__default.createElement(ComposedModal, _extends({}, rest, {
+  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, className),
     "aria-label": title,
     size: "sm",
@@ -179,7 +189,7 @@ var ExportModal = /*#__PURE__*/forwardRef(function (_ref, ref) {
     kind: "primary",
     onClick: onSubmitHandler,
     disabled: primaryButtonDisabled
-  }, primaryButtonText))));
+  }, primaryButtonText)))));
 });
 
 // Return a placeholder if not released and not enabled by feature flag

package/lib/components/ExportModal/ExportModal.js

@@ -67,6 +67,7 @@ exports.ExportModal = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     _ref$validExtensions = _ref.validExtensions,
     validExtensions = _ref$validExtensions === void 0 ? defaults.validExtensions : _ref$validExtensions,
     rest = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
+  var blockClass = "".concat(settings.pkg.prefix, "--export-modal");
   var _useState = React.useState(''),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     name = _useState2[0],
@@ -89,6 +90,12 @@ exports.ExportModal = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       setExtension(preformattedExtensions === null || preformattedExtensions === void 0 || (_preformattedExtensio2 = preformattedExtensions[0]) === null || _preformattedExtensio2 === void 0 ? void 0 : _preformattedExtensio2.extension);
     }
   }, [filename, preformattedExtensions, open]);
+  React.useEffect(function () {
+    if (successful) {
+      var button = document.querySelector(".".concat(blockClass, " .").concat(settings.carbon.prefix, "--modal-close-button button"));
+      button === null || button === void 0 || button.focus();
+    }
+  }, [successful, blockClass]);
   var onNameChangeHandler = function onNameChangeHandler(evt) {
     setName(evt.target.value);
   };
@@ -115,7 +122,6 @@ exports.ExportModal = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     }
     return false;
   };
-  var blockClass = "".concat(settings.pkg.prefix, "--export-modal");
   var internalId = React.useRef(uuidv4["default"]());
   var primaryButtonDisabled = loading || !name || hasInvalidExtension();
   var submitted = loading || error || successful;
@@ -128,7 +134,11 @@ exports.ExportModal = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     invalidText: invalidInputText,
     onBlur: onBlurHandler
   }, 'data-modal-primary-focus', true);
-  return renderPortalUse( /*#__PURE__*/React__default["default"].createElement(react.ComposedModal, _rollupPluginBabelHelpers["extends"]({}, rest, {
+  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, className),
     "aria-label": title,
     size: "sm",
@@ -188,7 +198,7 @@ exports.ExportModal = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     kind: "primary",
     onClick: onSubmitHandler,
     disabled: primaryButtonDisabled
-  }, primaryButtonText))));
+  }, primaryButtonText)))));
 });
 
 // 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.242+f076047b5",
+  "version": "2.43.2-canary.244+ef4bfa87d",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -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": "f076047b593235b01b9c4666194c080e0b4a3b4e"
+  "gitHead": "ef4bfa87d454eba9ce8b4cb83a464e95d66a189e"
 }