@carbon/react 1.29.1 → 1.30.0

package/lib/components/Modal/Modal.js

@@ -75,35 +75,29 @@ const Modal = /*#__PURE__*/React__default["default"].forwardRef(function Modal(_
   const modalHeadingId = `${prefix}--modal-header__heading--${modalInstanceId}`;
   const modalBodyId = `${prefix}--modal-body--${modalInstanceId}`;
   const modalCloseButtonClass = `${prefix}--modal-close`;
-
   function isCloseButton(element) {
     return !onSecondarySubmit && element === secondaryButton.current || element.classList.contains(modalCloseButtonClass);
   }
-
   function handleKeyDown(evt) {
     if (open) {
       if (match.match(evt, keys.Escape)) {
         onRequestClose(evt);
       }
-
       if (match.match(evt, keys.Enter) && shouldSubmitOnEnter && !isCloseButton(evt.target)) {
         onRequestSubmit(evt);
       }
     }
   }
-
   function handleMousedown(evt) {
     if (innerModal.current && !innerModal.current.contains(evt.target) && !wrapFocus.elementOrParentIsFloatingMenu(evt.target, selectorsFloatingMenus) && !preventCloseOnClickOutside) {
       onRequestClose(evt);
     }
   }
-
   function handleBlur(_ref2) {
     let {
       target: oldActiveNode,
       relatedTarget: currentActiveNode
     } = _ref2;
-
     if (open && currentActiveNode && oldActiveNode) {
       const {
         current: bodyNode
@@ -124,7 +118,6 @@ const Modal = /*#__PURE__*/React__default["default"].forwardRef(function Modal(_
       });
     }
   }
-
   const onSecondaryButtonClick = onSecondarySubmit ? onSecondarySubmit : onRequestClose;
   const modalClasses = cx__default["default"](`${prefix}--modal`, {
     [`${prefix}--modal-tall`]: !passiveModal,
@@ -151,16 +144,13 @@ const Modal = /*#__PURE__*/React__default["default"].forwardRef(function Modal(_
     'aria-labelledby': getAriaLabelledBy
   } : {};
   const alertDialogProps = {};
-
   if (alert && passiveModal) {
     alertDialogProps.role = 'alert';
   }
-
   if (alert && !passiveModal) {
     alertDialogProps.role = 'alertdialog';
     alertDialogProps['aria-describedby'] = modalBodyId;
   }
-
   React.useEffect(() => {
     return () => {
       toggleClass["default"](document.body, `${prefix}--body--with-modal-open`, false);
@@ -173,22 +163,17 @@ const Modal = /*#__PURE__*/React__default["default"].forwardRef(function Modal(_
     const initialFocus = focusContainerElement => {
       const containerElement = focusContainerElement || innerModal.current;
       const primaryFocusElement = containerElement ? containerElement.querySelector(danger ? `.${prefix}--btn--secondary` : selectorPrimaryFocus) : null;
-
       if (primaryFocusElement) {
         return primaryFocusElement;
       }
-
       return button && button.current;
     };
-
     const focusButton = focusContainerElement => {
       const target = initialFocus(focusContainerElement);
-
       if (target) {
         target.focus();
       }
     };
-
     if (open) {
       focusButton(innerModal.current);
     }
@@ -225,9 +210,7 @@ const Modal = /*#__PURE__*/React__default["default"].forwardRef(function Modal(_
   }, modalHeading), !passiveModal && modalButton), /*#__PURE__*/React__default["default"].createElement("div", _rollupPluginBabelHelpers["extends"]({
     id: modalBodyId,
     className: contentClasses
-  }, hasScrollingContentProps, {
-    "aria-labelledby": getAriaLabelledBy
-  }), children), hasScrollingContent && /*#__PURE__*/React__default["default"].createElement("div", {
+  }, hasScrollingContentProps), children), hasScrollingContent && /*#__PURE__*/React__default["default"].createElement("div", {
     className: `${prefix}--modal-content--overflow-indicator`
   }), !passiveModal && /*#__PURE__*/React__default["default"].createElement(ButtonSet["default"], {
     className: footerClasses
@@ -276,115 +259,93 @@ Modal.propTypes = {
    * Should go hand in hand with the danger prop.
    */
   alert: PropTypes__default["default"].bool,
-
   /**
    * Required props for the accessibility label of the header
    */
   ['aria-label']: requiredIfGivenPropIsTruthy["default"]('hasScrollingContent', PropTypes__default["default"].string),
-
   /**
    * Provide the contents of your Modal
    */
   children: PropTypes__default["default"].node,
-
   /**
    * Specify an optional className to be applied to the modal root node
    */
   className: PropTypes__default["default"].string,
-
   /**
    * Specify an label for the close button of the modal; defaults to close
    */
   closeButtonLabel: PropTypes__default["default"].string,
-
   /**
    * Specify whether the Modal is for dangerous actions
    */
   danger: PropTypes__default["default"].bool,
-
   /**
    * Specify whether the modal contains scrolling content
    */
   hasScrollingContent: PropTypes__default["default"].bool,
-
   /**
    * Specify the DOM element ID of the top-level node.
    */
   id: PropTypes__default["default"].string,
-
   /**
    * Specify whether or not the Modal content should have any inner padding.
    */
   isFullWidth: PropTypes__default["default"].bool,
-
   /**
    * Specify a label to be read by screen readers on the modal root node
    */
   modalAriaLabel: PropTypes__default["default"].string,
-
   /**
    * Specify the content of the modal header title.
    */
   modalHeading: PropTypes__default["default"].node,
-
   /**
    * Specify the content of the modal header label.
    */
   modalLabel: PropTypes__default["default"].node,
-
   /**
    * Specify a handler for keypresses.
    */
   onKeyDown: PropTypes__default["default"].func,
-
   /**
    * Specify a handler for closing modal.
    * The handler should care of closing modal, e.g. changing `open` prop.
    */
   onRequestClose: PropTypes__default["default"].func,
-
   /**
    * Specify a handler for "submitting" modal.
    * The handler should care of closing modal, e.g. changing `open` prop, if necessary.
    */
   onRequestSubmit: PropTypes__default["default"].func,
-
   /**
    * Specify a handler for the secondary button.
    * Useful if separate handler from `onRequestClose` is desirable
    */
   onSecondarySubmit: PropTypes__default["default"].func,
-
   /**
    * Specify whether the Modal is currently open
    */
   open: PropTypes__default["default"].bool,
-
   /**
    * Specify whether the modal should be button-less
    */
   passiveModal: PropTypes__default["default"].bool,
-
   /**
    * Prevent closing on click outside of modal
    */
   preventCloseOnClickOutside: PropTypes__default["default"].bool,
-
   /**
    * Specify whether the Button should be disabled, or not
    */
   primaryButtonDisabled: PropTypes__default["default"].bool,
-
   /**
    * Specify the text for the primary button
    */
   primaryButtonText: PropTypes__default["default"].node,
-
   /**
    * Specify the text for the secondary button
    */
   secondaryButtonText: PropTypes__default["default"].node,
-
   /**
    * Specify an array of config objects for secondary buttons
    * (`Array<{
@@ -397,7 +358,6 @@ Modal.propTypes = {
       if (!Array.isArray(props.secondaryButtons) || props.secondaryButtons.length !== 2) {
         return new Error(`${propName} needs to be an array of two button config objects`);
       }
-
       const shape = {
         buttonText: PropTypes__default["default"].node,
         onClick: PropTypes__default["default"].func
@@ -406,27 +366,22 @@ Modal.propTypes = {
         PropTypes__default["default"].checkPropTypes(shape, secondaryButton, propName, componentName);
       });
     }
-
     return null;
   },
-
   /**
    * Specify a CSS selector that matches the DOM element that should
    * be focused when the Modal opens
    */
   selectorPrimaryFocus: PropTypes__default["default"].string,
-
   /**
    * Specify CSS selectors that match DOM elements working as floating menus.
    * Focusing on those elements won't trigger "focus-wrap" behavior
    */
   selectorsFloatingMenus: PropTypes__default["default"].arrayOf(PropTypes__default["default"].string),
-
   /**
    * Specify if Enter key should be used as "submit" action
    */
   shouldSubmitOnEnter: PropTypes__default["default"].bool,
-
   /**
    * Specify the size variant.
    */

package/lib/components/ModalWrapper/ModalWrapper.js

@@ -26,24 +26,18 @@ let didWarnAboutDeprecation = false;
 class ModalWrapper extends React__default["default"].Component {
   constructor() {
     super(...arguments);
-
     _rollupPluginBabelHelpers.defineProperty(this, "triggerButton", /*#__PURE__*/React__default["default"].createRef());
-
     _rollupPluginBabelHelpers.defineProperty(this, "modal", /*#__PURE__*/React__default["default"].createRef());
-
     _rollupPluginBabelHelpers.defineProperty(this, "state", {
       isOpen: false
     });
-
     _rollupPluginBabelHelpers.defineProperty(this, "handleOpen", () => {
       this.setState({
         isOpen: true
       });
     });
-
     _rollupPluginBabelHelpers.defineProperty(this, "handleClose", evt => {
       const innerModal = this.modal.current.querySelector('div');
-
       if (this.modal.current && evt && !innerModal.contains(evt.target) && this.props.preventCloseOnClickOutside) {
         return;
       } else {
@@ -52,27 +46,22 @@ class ModalWrapper extends React__default["default"].Component {
         }, () => this.triggerButton.current.focus());
       }
     });
-
     _rollupPluginBabelHelpers.defineProperty(this, "handleOnRequestSubmit", () => {
       const {
         handleSubmit,
         shouldCloseAfterSubmit
       } = this.props;
-
       if (handleSubmit && shouldCloseAfterSubmit) {
         handleSubmit();
         this.handleClose();
       }
-
       handleSubmit();
     });
   }
-
   if(__DEV__) {
     process.env.NODE_ENV !== "production" ? warning.warning(didWarnAboutDeprecation, '`<ModalWrapper>` has been deprecated in favor of `<ComposedModal/>` and will be removed in the next major version, `@carbon/react@v2.x`') : void 0;
     didWarnAboutDeprecation = true;
   }
-
   render() {
     const {
       children,
@@ -92,7 +81,8 @@ class ModalWrapper extends React__default["default"].Component {
       // eslint-disable-line no-unused-vars
       ...other
     } = this.props;
-    const props = { ...other,
+    const props = {
+      ...other,
       selectorPrimaryFocus,
       open: this.state.isOpen,
       onRequestClose: this.handleClose,
@@ -118,9 +108,7 @@ class ModalWrapper extends React__default["default"].Component {
       ref: this.modal
     }, props), children));
   }
-
 }
-
 _rollupPluginBabelHelpers.defineProperty(ModalWrapper, "propTypes", {
   buttonTriggerClassName: PropTypes__default["default"].string,
   buttonTriggerText: PropTypes__default["default"].node,
@@ -146,7 +134,6 @@ _rollupPluginBabelHelpers.defineProperty(ModalWrapper, "propTypes", {
   triggerButtonKind: PropTypes__default["default"].oneOf(types.ButtonKinds),
   withHeader: PropTypes__default["default"].bool
 });
-
 _rollupPluginBabelHelpers.defineProperty(ModalWrapper, "defaultProps", {
   shouldCloseAfterSubmit: true,
   primaryButtonText: 'Save',