@charcoal-ui/react 2.0.0 → 2.0.1

package/dist/components/Modal/index.d.ts

@@ -1,13 +1,15 @@
 import React from 'react';
-import { OverlayProps } from '@react-aria/overlays';
+import { AriaModalOverlayProps } from '@react-aria/overlays';
 import { AriaDialogProps } from '@react-types/dialog';
 import { ButtonProps } from '../Button';
-export declare type ModalProps = OverlayProps & AriaDialogProps & {
+export declare type ModalProps = AriaModalOverlayProps & AriaDialogProps & {
     children: React.ReactNode;
     zIndex?: number;
     title: string;
     size?: 'S' | 'M' | 'L';
     bottomSheet?: boolean | 'full';
+    isOpen: boolean;
+    onClose: () => void;
     portalContainer?: HTMLElement;
 };
 export default function Modal({ children, zIndex, portalContainer, ...props }: ModalProps): JSX.Element;

package/dist/components/Modal/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/Modal/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6B,MAAM,OAAO,CAAA;AACjD,OAAO,EAEL,YAAY,EAIb,MAAM,sBAAsB,CAAA;AAK7B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAMrD,OAAe,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAG/C,oBAAY,UAAU,GAAG,YAAY,GACnC,eAAe,GAAG;IAChB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAA;IACtB,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAI9B,eAAe,CAAC,EAAE,WAAW,CAAA;CAC9B,CAAA;AAIH,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,EAC5B,QAAQ,EACR,MAAwB,EACxB,eAAe,EACf,GAAG,KAAK,EACT,EAAE,UAAU,eA6EZ;AAgFD,wBAAgB,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,cAAc,CAAC,kBAAkB,CAAC,eAOzE;AAQD,wBAAgB,kBAAkB,CAAC,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,WAAW,sBAYrE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/Modal/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6B,MAAM,OAAO,CAAA;AACjD,OAAO,EACL,qBAAqB,EAKtB,MAAM,sBAAsB,CAAA;AAK7B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAMrD,OAAe,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAG/C,oBAAY,UAAU,GAAG,qBAAqB,GAC5C,eAAe,GAAG;IAChB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAA;IACtB,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC9B,MAAM,EAAE,OAAO,CAAA;IACf,OAAO,EAAE,MAAM,IAAI,CAAA;IAInB,eAAe,CAAC,EAAE,WAAW,CAAA;CAC9B,CAAA;AAIH,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,EAC5B,QAAQ,EACR,MAAwB,EACxB,eAAe,EACf,GAAG,KAAK,EACT,EAAE,UAAU,eA+FZ;AAgFD,wBAAgB,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,cAAc,CAAC,kBAAkB,CAAC,eAOzE;AAQD,wBAAgB,kBAAkB,CAAC,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,WAAW,sBAYrE"}

package/dist/index.cjs

@@ -1082,7 +1082,6 @@ function Modal(_ref) {
   var children = _ref.children,
       _ref$zIndex = _ref.zIndex,
       zIndex = _ref$zIndex === void 0 ? DEFAULT_Z_INDEX : _ref$zIndex,
-      portalContainer = _ref.portalContainer,
       props = _objectWithoutPropertiesLoose(_ref, _excluded$5);
 
   var title = props.title,
@@ -1102,8 +1101,19 @@ function Modal(_ref) {
 
   overlays.usePreventScroll();
 
-  var _useModal = overlays.useModal(),
-      modalProps = _useModal.modalProps;
+  var _useModalOverlay = overlays.useModalOverlay(props, {
+    close: onClose,
+    isOpen: isOpen,
+    // these props are not used actually.
+    // https://github.com/adobe/react-spectrum/blob/df14e3fb129b94b310f0397a701b83f006b51dfe/packages/%40react-aria/overlays/src/useModalOverlay.ts
+    open: function open() {// nope
+    },
+    setOpen: function setOpen() {// nope
+    },
+    toggle: function toggle() {// nope
+    }
+  }, ref),
+      modalProps = _useModalOverlay.modalProps;
 
   var _useDialog = dialog.useDialog(props, ref),
       dialogProps = _useDialog.dialogProps,
@@ -1136,9 +1146,7 @@ function Modal(_ref) {
   return transition(function (_ref2, item) {
     var backgroundColor = _ref2.backgroundColor,
         transform = _ref2.transform;
-    return item && /*#__PURE__*/React__default["default"].createElement(overlays.OverlayContainer, {
-      portalContainer: portalContainer
-    }, /*#__PURE__*/React__default["default"].createElement(ModalBackground, _extends({
+    return item && /*#__PURE__*/React__default["default"].createElement(overlays.Overlay, null, /*#__PURE__*/React__default["default"].createElement(ModalBackground, _extends({
       zIndex: zIndex
     }, underlayProps, {
       style: transitionEnabled ? {