@pingux/astro 2.148.0-alpha.0 → 2.148.0-alpha.1

package/lib/components/Modal/Modal.js

@@ -7,9 +7,11 @@ import _Object$getOwnPropertyDescriptors from "@babel/runtime-corejs3/core-js-st
 import _Object$defineProperties from "@babel/runtime-corejs3/core-js-stable/object/define-properties";
 import _Object$defineProperty from "@babel/runtime-corejs3/core-js-stable/object/define-property";
 import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
+import _toArray from "@babel/runtime-corejs3/helpers/esm/toArray";
 import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/esm/objectWithoutProperties";
 var _excluded = ["className", "closeButton", "hasAutoFocus", "hasCloseButton", "id", "isClosedOnBlur", "isDismissable", "isKeyboardDismissDisabled", "isOpen", "role", "size", "state", "title", "onClose", "shouldCloseOnInteractOutside", "children", "contentProps", "containerProps", "headerContainerProps"];
+import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 import React, { forwardRef } from 'react';
@@ -21,6 +23,7 @@ import Box from '../Box';
 import Icon from '../Icon';
 import IconButton from '../IconButton';
 import Text from '../Text';
+import ModalHeader from './ModalHeader';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var Modal = /*#__PURE__*/forwardRef(function (props, ref) {
   var _useStatusClasses2;
@@ -84,7 +87,12 @@ var Modal = /*#__PURE__*/forwardRef(function (props, ref) {
   var isOpenNoTransition = (state === null || state === void 0 ? void 0 : state.isTransitioning) === undefined && isOpen === true;
   var _useStatusClasses = useStatusClasses(className, (_useStatusClasses2 = {}, _defineProperty(_useStatusClasses2, "is-".concat(size || 'custom'), size), _defineProperty(_useStatusClasses2, "isOpen", isOpen), _defineProperty(_useStatusClasses2, "isTransitioning", state === null || state === void 0 ? void 0 : state.isTransitioning), _defineProperty(_useStatusClasses2, "isOpenNoTransition", isOpenNoTransition), _useStatusClasses2)),
     classNames = _useStatusClasses.classNames;
-  var titleContent = title && (isOnyx ? ___EmotionJSX(Box, {
+  var _React$Children$toArr = React.Children.toArray(children),
+    _React$Children$toArr2 = _toArray(_React$Children$toArr),
+    header = _React$Children$toArr2[0],
+    siblings = _sliceInstanceProperty(_React$Children$toArr2).call(_React$Children$toArr2, 1);
+  var hasHeaderContent = /*#__PURE__*/React.isValidElement(header) && header.type === ModalHeader;
+  var titleContent = !hasHeaderContent && title && (isOnyx ? ___EmotionJSX(Box, {
     variant: "modal.header"
   }, ___EmotionJSX(Text, _extends({}, titleProps, {
     variant: "modalTitle",
@@ -107,7 +115,7 @@ var Modal = /*#__PURE__*/forwardRef(function (props, ref) {
   }, propsContentProps, dialogProps, modalProps, {
     ref: modalRef,
     "aria-modal": true
-  }), ___EmotionJSX(Box, _extends({
+  }), titleContent && ___EmotionJSX(Box, _extends({
     variant: "modal.headingContainer"
   }, headerContainerProps), hasCloseButton && (closeButton !== null && closeButton !== void 0 ? closeButton : ___EmotionJSX(IconButton, {
     "aria-label": "Close modal window",
@@ -119,8 +127,9 @@ var Modal = /*#__PURE__*/forwardRef(function (props, ref) {
     title: {
       name: 'Close Icon'
     }
-  }))), titleContent), ___EmotionJSX(Box, {
-    pt: "md"
+  }))), titleContent), isOnyx ? children : ___EmotionJSX(Box, {
+    pt: "md",
+    px: "lg"
   }, children)))));
 });
 Modal.defaultProps = {

package/lib/components/Modal/Modal.stories.js

@@ -3,8 +3,8 @@ import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
 import React, { useState } from 'react';
 import { withDesign } from 'storybook-addon-designs';
 import DocsLayout from '../../../.storybook/storybookDocsLayout';
-import { useModalState } from '../../hooks';
-import { Box, Button, Item, Menu, Modal, OverlayProvider, PopoverMenu, RadioField, RadioGroupField, SearchField, SelectField, Text } from '../../index';
+import { useGetTheme, useModalState } from '../../hooks';
+import { Box, Button, Item, Menu, Modal, ModalBody, ModalFooter, ModalHeader, OverlayProvider, PopoverMenu, RadioField, RadioGroupField, SearchField, SelectField, Text } from '../../index';
 import { FIGMA_LINKS } from '../../utils/designUtils/figmaLinks';
 import { modalSizes } from '../../utils/devUtils/constants/modalSizes';
 import ModalReadme from './Modal.mdx';
@@ -89,21 +89,6 @@ export default {
 };
 export var Default = function Default(args) {
   var state = useModalState();
-  var ModalBodyContent = ___EmotionJSX(Box, null, ___EmotionJSX(Text, null, "Do you want to continue with this action that you\u2018re performing?"), ___EmotionJSX(Box, {
-    isRow: true,
-    mr: "auto",
-    width: "100%",
-    variant: "modal.buttonsContainer"
-  }, ___EmotionJSX(Button, {
-    variant: "primary",
-    onPress: state.close,
-    mr: "md",
-    "aria-label": "Continue"
-  }, "Continue"), ___EmotionJSX(Button, {
-    variant: "link",
-    onPress: state.close,
-    "aria-label": "Cancel"
-  }, "Cancel")));
   return (
     // Application must be wrapped in an OverlayProvider so that it can be hidden from screen
     // readers when an overlay opens.
@@ -113,10 +98,16 @@ export var Default = function Default(args) {
       tabIndex: state.isOpen ? -1 : 0
     }, "Open Modal"), (state.isOpen || state.isTransitioning) && ___EmotionJSX(Modal, _extends({}, args, {
       isOpen: state.isOpen,
+      state: state
+    }), ___EmotionJSX(ModalHeader, {
+      hasCloseButton: true,
       onClose: state.close,
-      state: state,
       title: "Continue"
-    }), ModalBodyContent))
+    }), ___EmotionJSX(ModalBody, null, ___EmotionJSX(Box, null, ___EmotionJSX(Text, null, "Do you want to continue with this action that you\u2018re performing?"))), ___EmotionJSX(ModalFooter, {
+      onSubmit: state.close,
+      onCancel: state.close,
+      primaryButtonText: "Continue"
+    })))
   );
 };
 Default.parameters = {
@@ -136,27 +127,53 @@ export var LargeContent = function LargeContent(args) {
       tabIndex: state.isOpen ? -1 : 0
     }, "Open Modal"), state.isOpen && ___EmotionJSX(Modal, _extends({}, args, {
       isOpen: state.isOpen,
+      onClose: state.close
+    }), ___EmotionJSX(ModalHeader, {
+      hasCloseButton: true,
       onClose: state.close,
       title: "Lorem Ipsum"
-    }), ___EmotionJSX(Box, {
+    }), ___EmotionJSX(ModalBody, null, ___EmotionJSX(Box, {
       gap: "lg"
-    }, ___EmotionJSX(Text, null, "Lorem ipsum dolor sit amet, consectetur adipiscing elit."), ___EmotionJSX(Text, null, "Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."), ___EmotionJSX(Text, null, "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris."), ___EmotionJSX(Text, null, "Nisi ut aliquip ex ea commodo consequat."), ___EmotionJSX(Text, null, "Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore."), ___EmotionJSX(Text, null, "Eu fugiat nulla pariatur."), ___EmotionJSX(Text, null, "Excepteur sint occaecat cupidatat non proident."), ___EmotionJSX(Text, null, "Sunt in culpa qui officia deserunt mollit anim id est laborum."), ___EmotionJSX(Text, null, "Lorem ipsum dolor sit amet, consectetur adipiscing elit."), ___EmotionJSX(Text, null, "Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."), ___EmotionJSX(Text, null, "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris."), ___EmotionJSX(Text, null, "Nisi ut aliquip ex ea commodo consequat."), ___EmotionJSX(Text, null, "Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore."), ___EmotionJSX(Text, null, "Eu fugiat nulla pariatur."), ___EmotionJSX(Text, null, "Excepteur sint occaecat cupidatat non proident."), ___EmotionJSX(Text, null, "Sunt in culpa qui officia deserunt mollit anim id est laborum."), ___EmotionJSX(Text, null, "Lorem ipsum dolor sit amet, consectetur adipiscing elit."), ___EmotionJSX(Text, null, "Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."), ___EmotionJSX(Text, null, "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris."), ___EmotionJSX(Text, null, "Nisi ut aliquip ex ea commodo consequat."), ___EmotionJSX(Text, null, "Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore.")), ___EmotionJSX(Box, {
-      isRow: true,
-      variant: "modal.buttonsContainer"
-    }, ___EmotionJSX(Button, {
-      variant: "primary",
-      onPress: state.close,
-      mr: "md",
-      "aria-label": "Continue"
-    }, "Continue"), ___EmotionJSX(Button, {
-      variant: "link",
-      onPress: state.close,
-      "aria-label": "Cancel"
-    }, "Cancel"))))
+    }, ___EmotionJSX(Text, null, "Lorem ipsum dolor sit amet, consectetur adipiscing elit."), ___EmotionJSX(Text, null, "Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."), ___EmotionJSX(Text, null, "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris."), ___EmotionJSX(Text, null, "Nisi ut aliquip ex ea commodo consequat."), ___EmotionJSX(Text, null, "Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore."), ___EmotionJSX(Text, null, "Eu fugiat nulla pariatur."), ___EmotionJSX(Text, null, "Excepteur sint occaecat cupidatat non proident."), ___EmotionJSX(Text, null, "Sunt in culpa qui officia deserunt mollit anim id est laborum."), ___EmotionJSX(Text, null, "Lorem ipsum dolor sit amet, consectetur adipiscing elit."), ___EmotionJSX(Text, null, "Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."), ___EmotionJSX(Text, null, "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris."), ___EmotionJSX(Text, null, "Nisi ut aliquip ex ea commodo consequat."), ___EmotionJSX(Text, null, "Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore."), ___EmotionJSX(Text, null, "Eu fugiat nulla pariatur."), ___EmotionJSX(Text, null, "Excepteur sint occaecat cupidatat non proident."), ___EmotionJSX(Text, null, "Sunt in culpa qui officia deserunt mollit anim id est laborum."), ___EmotionJSX(Text, null, "Lorem ipsum dolor sit amet, consectetur adipiscing elit."), ___EmotionJSX(Text, null, "Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."), ___EmotionJSX(Text, null, "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris."), ___EmotionJSX(Text, null, "Nisi ut aliquip ex ea commodo consequat."), ___EmotionJSX(Text, null, "Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore."))), ___EmotionJSX(ModalFooter, {
+      onSubmit: state.close,
+      onCancel: state.close
+    })))
+  );
+};
+export var LargeContentWithScroll = function LargeContentWithScroll(args) {
+  var state = useModalState();
+  return (
+    // Application must be wrapped in an OverlayProvider so that it can be hidden from screen
+    // readers when an overlay opens.
+    ___EmotionJSX(OverlayProvider, null, ___EmotionJSX(Button, {
+      onPress: state.open,
+      "aria-label": "Open modal",
+      tabIndex: state.isOpen ? -1 : 0
+    }, "Open Modal"), state.isOpen && ___EmotionJSX(Modal, _extends({}, args, {
+      isOpen: state.isOpen,
+      onClose: state.close
+    }), ___EmotionJSX(ModalHeader, {
+      hasCloseButton: true,
+      onClose: state.close,
+      title: "Lorem Ipsum"
+    }), ___EmotionJSX(ModalBody, {
+      isScrollable: true,
+      scrollProps: {
+        maxHeight: '400px'
+      }
+    }, ___EmotionJSX(Box, {
+      gap: "lg",
+      pr: "lg"
+    }, ___EmotionJSX(Text, null, "Lorem ipsum dolor sit amet, consectetur adipiscing elit."), ___EmotionJSX(Text, null, "Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."), ___EmotionJSX(Text, null, "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris."), ___EmotionJSX(Text, null, "Nisi ut aliquip ex ea commodo consequat."), ___EmotionJSX(Text, null, "Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore."), ___EmotionJSX(Text, null, "Eu fugiat nulla pariatur."), ___EmotionJSX(Text, null, "Excepteur sint occaecat cupidatat non proident."), ___EmotionJSX(Text, null, "Sunt in culpa qui officia deserunt mollit anim id est laborum."), ___EmotionJSX(Text, null, "Lorem ipsum dolor sit amet, consectetur adipiscing elit."), ___EmotionJSX(Text, null, "Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."), ___EmotionJSX(Text, null, "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris."), ___EmotionJSX(Text, null, "Nisi ut aliquip ex ea commodo consequat."), ___EmotionJSX(Text, null, "Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore."), ___EmotionJSX(Text, null, "Eu fugiat nulla pariatur."), ___EmotionJSX(Text, null, "Excepteur sint occaecat cupidatat non proident."), ___EmotionJSX(Text, null, "Sunt in culpa qui officia deserunt mollit anim id est laborum."), ___EmotionJSX(Text, null, "Lorem ipsum dolor sit amet, consectetur adipiscing elit."), ___EmotionJSX(Text, null, "Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."), ___EmotionJSX(Text, null, "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris."), ___EmotionJSX(Text, null, "Nisi ut aliquip ex ea commodo consequat."), ___EmotionJSX(Text, null, "Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore."))), ___EmotionJSX(ModalFooter, {
+      onSubmit: state.close,
+      onCancel: state.close
+    })))
   );
 };
 export var WithInputField = function WithInputField() {
   var state = useModalState();
+  var _useGetTheme = useGetTheme(),
+    isOnyx = _useGetTheme.themeState.isOnyx;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
@@ -177,8 +194,9 @@ export var WithInputField = function WithInputField() {
   }, "Open Modal"), state.isOpen && ___EmotionJSX(Modal, {
     isOpen: state.isOpen,
     onClose: state.close
-  }, ___EmotionJSX(Box, {
-    gap: "lg"
+  }, ___EmotionJSX(ModalBody, null, ___EmotionJSX(Box, {
+    gap: "lg",
+    pt: isOnyx ? '' : 'lg'
   }, ___EmotionJSX(Text, null, "Lorem ipsum dolor sit amet consectetur"), ___EmotionJSX(SelectField, {
     label: "Select an option"
   }, ___EmotionJSX(Item, null, "Red"), ___EmotionJSX(Item, null, "Green"), ___EmotionJSX(Item, null, "Blue")), ___EmotionJSX(RadioGroupField, {
@@ -217,19 +235,10 @@ export var WithInputField = function WithInputField() {
       key: item.key,
       textValue: item.name
     }, item.name);
-  }), ___EmotionJSX(Box, {
-    isRow: true,
-    variant: "modal.buttonsContainer"
-  }, ___EmotionJSX(Button, {
-    variant: "primary",
-    onPress: state.close,
-    mr: "md",
-    "aria-label": "Continue"
-  }, "Continue"), ___EmotionJSX(Button, {
-    variant: "link",
-    onPress: state.close,
-    "aria-label": "Cancel"
-  }, "Cancel")))));
+  }))), ___EmotionJSX(ModalFooter, {
+    onSubmit: state.close,
+    onCancel: state.close
+  })));
 };
 export var WithPopoverMenu = function WithPopoverMenu() {
   var state = useModalState();

package/lib/components/Modal/Modal.styles.js

@@ -23,22 +23,15 @@ var container = {
   background: '#00000040',
   display: 'flex',
   alignItems: 'center',
-  justifyContent: 'center'
+  overflowY: 'auto'
 };
 var content = {
-  position: 'relative',
   outline: 'none',
   background: 'white',
   color: 'black',
-  pt: 'md',
-  pr: 'lg',
-  pb: 'lg',
-  pl: 'lg',
   boxShadow: 'standard',
   borderRadius: 3,
-  maxHeight: 'calc(100vh - 80px)',
-  // 100% of the window minus 40px on top and bottom
-  overflowY: 'auto',
+  margin: 'auto',
   '&.is-extra-small': {
     maxWidth: 'none',
     width: 'container.xs'
@@ -61,28 +54,41 @@ var content = {
   }
 };
 var headingContainer = {
-  position: 'sticky',
-  top: '-md',
-  mt: '-md',
-  mb: '-md',
-  mr: '-lg',
-  pt: 'md',
-  pr: 'lg',
-  pb: 'md',
-  backgroundColor: 'background.base'
+  position: 'relative',
+  backgroundColor: 'background.base',
+  px: 'lg',
+  py: 'md'
 };
-var buttonsContainer = {
-  position: 'sticky',
-  bottom: '-lg',
-  p: 0,
-  mb: '-lg',
-  pb: 'lg',
-  pt: 'lg',
+var header = {
+  position: 'relative',
+  backgroundColor: 'background.base',
+  pb: 'md'
+};
+var body = {};
+export var closeButton = {
+  position: 'absolute',
+  top: 0,
+  right: -14,
+  alignSelf: 'auto',
+  width: '22px',
+  height: '22px'
+};
+var bodyContainer = {
+  px: 'lg'
+};
+var footer = {
+  py: 'lg',
   background: 'white',
   '& > button': {
     flexGrow: 0
   }
 };
+var buttonsContainer = {
+  p: 0,
+  pb: 'lg',
+  pt: 'lg',
+  background: 'white'
+};
 var title = _objectSpread(_objectSpread({}, text.title), {}, {
   mr: 'sm',
   fontWeight: 3
@@ -91,6 +97,7 @@ export var modalCloseButton = {
   position: 'absolute',
   top: 14,
   right: 10,
+  alignSelf: 'auto',
   width: '22px',
   height: '22px'
 };
@@ -99,7 +106,12 @@ export default {
   container: container,
   content: content,
   headingContainer: headingContainer,
-  buttonsContainer: buttonsContainer,
+  bodyContainer: bodyContainer,
   title: title,
-  modalCloseButton: modalCloseButton
+  modalCloseButton: modalCloseButton,
+  buttonsContainer: buttonsContainer,
+  header: header,
+  body: body,
+  footer: footer,
+  closeButton: closeButton
 };

package/lib/components/Modal/ModalBody.js

@@ -0,0 +1,20 @@
+import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
+import React, { forwardRef } from 'react';
+import Box from '../Box';
+import { jsx as ___EmotionJSX } from "@emotion/react";
+var ModalBody = /*#__PURE__*/forwardRef(function (props, ref) {
+  var children = props.children,
+    isScrollable = props.isScrollable,
+    _props$scrollProps = props.scrollProps,
+    scrollProps = _props$scrollProps === void 0 ? {} : _props$scrollProps,
+    containerProps = props.containerProps;
+  return ___EmotionJSX(Box, _extends({
+    variant: "modal.body",
+    ref: ref
+  }, containerProps), isScrollable ? ___EmotionJSX(Box, _extends({
+    width: "calc(100% + 24px)",
+    overflowY: "auto"
+  }, scrollProps), children) : children);
+});
+ModalBody.displayName = 'ModalBody';
+export default ModalBody;

package/lib/components/Modal/ModalBody.test.js

@@ -0,0 +1,61 @@
+import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
+import React from 'react';
+import { render, screen } from '../../utils/testUtils/testWrapper';
+import { universalComponentTests } from '../../utils/testUtils/universalComponentTest';
+import ModalBody from './ModalBody';
+import { jsx as ___EmotionJSX } from "@emotion/react";
+var defaultProps = {
+  children: ''
+};
+var testId = 'scrollBoxTestId';
+var scrollProps = {
+  'data-testid': testId,
+  'maxHeight': '100px'
+};
+var getComponent = function getComponent() {
+  var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return render(___EmotionJSX(ModalBody, _extends({}, defaultProps, props)));
+};
+// Needs to be added to each components test file
+universalComponentTests({
+  renderComponent: function renderComponent(props) {
+    return ___EmotionJSX(ModalBody, props);
+  }
+});
+describe('ModalBody', function () {
+  test('rendered', function () {
+    getComponent({
+      children: 'Lorem Ipsum'
+    });
+    screen.getByText(/lorem ipsum/i);
+  });
+  test('children as React node', function () {
+    var ChildrenNode = function ChildrenNode() {
+      return ___EmotionJSX("div", {
+        "data-testid": "custom-node"
+      }, "Custom Node");
+    };
+    getComponent({
+      children: ___EmotionJSX(ChildrenNode, null)
+    });
+    screen.getByTestId('custom-node');
+    screen.getByText(/custom node/i);
+  });
+  test('isScrollable adds ScrollBox wrapper', function () {
+    var ChildrenNode = function ChildrenNode() {
+      return ___EmotionJSX("div", {
+        "data-testid": "custom-node"
+      }, "Custom Node");
+    };
+    getComponent({
+      scrollProps: scrollProps,
+      isScrollable: true,
+      children: ___EmotionJSX(ChildrenNode, null)
+    });
+    var scrollBoxComponent = screen.getByTestId(testId);
+    expect(scrollBoxComponent).toBeInTheDocument();
+    expect(scrollBoxComponent).toHaveStyle({
+      maxHeight: '100px'
+    });
+  });
+});

package/lib/components/Modal/ModalFooter.js

@@ -0,0 +1,34 @@
+import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
+import React, { forwardRef } from 'react';
+import Button from '../Button';
+import ButtonBar from '../ButtonBar';
+import { jsx as ___EmotionJSX } from "@emotion/react";
+var ModalFooter = /*#__PURE__*/forwardRef(function (props, ref) {
+  var onSubmit = props.onSubmit,
+    onCancel = props.onCancel,
+    footerProps = props.footerProps,
+    children = props.children,
+    _props$primaryButtonT = props.primaryButtonText,
+    primaryButtonText = _props$primaryButtonT === void 0 ? 'Save' : _props$primaryButtonT,
+    _props$secondaryButto = props.secondaryButtonText,
+    secondaryButtonText = _props$secondaryButto === void 0 ? 'Cancel' : _props$secondaryButto;
+
+  // eslint-disable-next-line react/jsx-no-useless-fragment
+  if (children) return ___EmotionJSX(React.Fragment, null, children);
+  return ___EmotionJSX(ButtonBar, _extends({
+    variant: "modal.footer",
+    as: "footer",
+    ref: ref
+  }, footerProps), ___EmotionJSX(Button, {
+    variant: "primary",
+    onPress: onSubmit,
+    mr: "md",
+    "aria-label": primaryButtonText
+  }, primaryButtonText), ___EmotionJSX(Button, {
+    variant: "link",
+    onPress: onCancel,
+    "aria-label": secondaryButtonText
+  }, secondaryButtonText));
+});
+ModalFooter.displayName = 'ModalFooter';
+export default ModalFooter;

package/lib/components/Modal/ModalFooter.test.js

@@ -0,0 +1,95 @@
+import _Object$defineProperty from "@babel/runtime-corejs3/core-js-stable/object/define-property";
+import _Symbol from "@babel/runtime-corejs3/core-js-stable/symbol";
+import _Object$create from "@babel/runtime-corejs3/core-js-stable/object/create";
+import _Object$getPrototypeOf from "@babel/runtime-corejs3/core-js-stable/object/get-prototype-of";
+import _forEachInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/for-each";
+import _Object$setPrototypeOf from "@babel/runtime-corejs3/core-js-stable/object/set-prototype-of";
+import _Promise from "@babel/runtime-corejs3/core-js-stable/promise";
+import _reverseInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/reverse";
+import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
+import _typeof from "@babel/runtime-corejs3/helpers/esm/typeof";
+import _asyncToGenerator from "@babel/runtime-corejs3/helpers/esm/asyncToGenerator";
+import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = _Object$defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof _Symbol ? _Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return _Object$defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = _Object$create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = _Object$getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = _Object$create(IteratorPrototype); function defineIteratorMethods(prototype) { var _context2; _forEachInstanceProperty(_context2 = ["next", "throw", "return"]).call(_context2, function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], _forEachInstanceProperty(tryLocsList).call(tryLocsList, pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return _Object$setPrototypeOf ? _Object$setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = _Object$create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = _Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return _reverseInstanceProperty(keys).call(keys), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { var _context3; if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, _forEachInstanceProperty(_context3 = this.tryEntries).call(_context3, resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+_sliceInstanceProperty(name).call(name, 1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+import React from 'react';
+import userEvent from '@testing-library/user-event';
+import { render, screen } from '../../utils/testUtils/testWrapper';
+import { universalComponentTests } from '../../utils/testUtils/universalComponentTest';
+import ModalFooter from './ModalFooter';
+import { jsx as ___EmotionJSX } from "@emotion/react";
+var defaultProps = {
+  children: ''
+};
+var getComponent = function getComponent() {
+  var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return render(___EmotionJSX(ModalFooter, _extends({}, defaultProps, props)));
+};
+// Needs to be added to each components test file
+universalComponentTests({
+  renderComponent: function renderComponent(props) {
+    return ___EmotionJSX(ModalFooter, props);
+  }
+});
+describe('ModalFooter', function () {
+  test('rendered', function () {
+    getComponent({
+      children: 'ModalFooter'
+    });
+    screen.getByText(/modalfooter/i);
+  });
+  test('onSubmit and onCancel are called when buttons are clicked', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var onSubmit, onCancel, saveButton, cancelButton;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          onSubmit = jest.fn();
+          onCancel = jest.fn();
+          getComponent({
+            onSubmit: onSubmit,
+            onCancel: onCancel
+          });
+          saveButton = screen.getByRole('button', {
+            name: /save/i
+          });
+          cancelButton = screen.getByRole('button', {
+            name: /cancel/i
+          });
+          _context.next = 7;
+          return userEvent.click(saveButton);
+        case 7:
+          _context.next = 9;
+          return userEvent.click(cancelButton);
+        case 9:
+          expect(onSubmit).toHaveBeenCalledTimes(1);
+          expect(onCancel).toHaveBeenCalledTimes(1);
+        case 11:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })));
+  test('does not render buttons when children are provided', function () {
+    getComponent({
+      children: ___EmotionJSX("div", null, "Custom Footer")
+    });
+    expect(screen.getByText(/custom footer/i)).toBeInTheDocument();
+    expect(screen.queryByRole('button', {
+      name: /save/i
+    })).not.toBeInTheDocument();
+    expect(screen.queryByRole('button', {
+      name: /cancel/i
+    })).not.toBeInTheDocument();
+  });
+  test('primaryButtonText and secondaryButtonText props change button text', function () {
+    getComponent({
+      primaryButtonText: 'Submit',
+      secondaryButtonText: 'Dismiss'
+    });
+    expect(screen.getByRole('button', {
+      name: /submit/i
+    })).toBeInTheDocument();
+    expect(screen.getByRole('button', {
+      name: /dismiss/i
+    })).toBeInTheDocument();
+  });
+});

package/lib/components/Modal/ModalHeader.js

@@ -0,0 +1,47 @@
+import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
+import React, { forwardRef } from 'react';
+import CloseIcon from '@pingux/mdi-react/CloseIcon';
+import Box from '../Box';
+import Icon from '../Icon';
+import IconButton from '../IconButton';
+import Text from '../Text';
+import { jsx as ___EmotionJSX } from "@emotion/react";
+var ModalHeader = /*#__PURE__*/forwardRef(function (props, ref) {
+  var closeButton = props.closeButton,
+    hasCloseButton = props.hasCloseButton,
+    title = props.title,
+    onClose = props.onClose,
+    containerProps = props.containerProps,
+    titleProps = props.titleProps,
+    hasNoSeparator = props.hasNoSeparator;
+  var titleContent = typeof title === 'string' && title ? ___EmotionJSX(Box, {
+    flex: "1"
+  }, ___EmotionJSX(Text, _extends({}, titleProps, {
+    variant: "modalTitle",
+    role: "heading",
+    "aria-level": 1
+  }), title)) : title;
+  return ___EmotionJSX(Box, _extends({
+    variant: "modal.header",
+    isRow: true,
+    justifyContent: "space-between",
+    alignItems: "center",
+    as: "header",
+    ref: ref,
+    sx: {
+      borderBottomWidth: hasNoSeparator ? '0px' : '1px'
+    }
+  }, containerProps), titleContent, hasCloseButton && (closeButton !== null && closeButton !== void 0 ? closeButton : ___EmotionJSX(IconButton, {
+    "aria-label": "Close modal window",
+    "data-id": "icon-button__close-modal-window",
+    variant: "modalHeaderCloseButton",
+    onPress: onClose
+  }, ___EmotionJSX(Icon, {
+    icon: CloseIcon,
+    title: {
+      name: 'Close Icon'
+    }
+  }))));
+});
+ModalHeader.displayName = 'ModalHeader';
+export default ModalHeader;