@ringcentral/juno 1.12.1 → 1.12.2

package/components/Dialog/Dialog.js

@@ -32,7 +32,7 @@ var _RcDialog = react_1.forwardRef(function (inProps, ref) {
     }, [maxWidthProp, size]);
     var contextValue = react_1.useMemo(function () { return ({ size: childrenSize }); }, [childrenSize]);
     var onExited = PortalHost_1.useUnmountPortalHandler(TransitionPropsProp === null || TransitionPropsProp === void 0 ? void 0 : TransitionPropsProp.onExited);
-    var TransitionProps = react_1.useMemo(function () { return foundation_1.combineProps({ onExited: onExited }, TransitionPropsProp); }, [TransitionPropsProp, onExited]);
+    var TransitionProps = tslib_1.__assign(tslib_1.__assign({}, TransitionPropsProp), { onExited: onExited });
     return (react_1.default.createElement(Dialog_1.default, tslib_1.__assign({ ref: ref, fullWidth: fullWidth, container: externalWindow === null || externalWindow === void 0 ? void 0 : externalWindow.document.body, maxWidth: maxWidth, fullScreen: size === 'fullScreen' ? true : undefined, classes: classes, TransitionProps: TransitionProps }, rest),
         react_1.default.createElement(DialogContext_1.RcDialogContext.Provider, { value: contextValue }, children)));
 });

package/components/PopupBox/PopupBox.js

@@ -12,10 +12,18 @@ var _RcPopupBox = react_1.forwardRef(function (inProps, ref) {
     // ok btn
     confirmButtonText = props.confirmButtonText, confirmButtonProps = props.confirmButtonProps, onConfirm = props.onConfirm, 
     // cancel btn
-    cancelButtonText = props.cancelButtonText, cancelButtonProps = props.cancelButtonProps, onCancel = props.onCancel, TitleProps = props.TitleProps, ContentProps = props.ContentProps, ActionsProps = props.ActionsProps, children = props.children, onClose = props.onClose, open = props.open, rest = tslib_1.__rest(props, ["childrenSize", "title", "footer", "loadingOverlay", "loading", "confirmButtonText", "confirmButtonProps", "onConfirm", "cancelButtonText", "cancelButtonProps", "onCancel", "TitleProps", "ContentProps", "ActionsProps", "children", "onClose", "open"]);
+    cancelButtonText = props.cancelButtonText, cancelButtonProps = props.cancelButtonProps, onCancel = props.onCancel, TitleProps = props.TitleProps, ContentProps = props.ContentProps, disableBackdropClickProp = props.disableBackdropClick, ActionsProps = props.ActionsProps, children = props.children, onClose = props.onClose, open = props.open, rest = tslib_1.__rest(props, ["childrenSize", "title", "footer", "loadingOverlay", "loading", "confirmButtonText", "confirmButtonProps", "onConfirm", "cancelButtonText", "cancelButtonProps", "onCancel", "TitleProps", "ContentProps", "disableBackdropClick", "ActionsProps", "children", "onClose", "open"]);
     var isXsmall = childrenSize === 'small';
-    var handleClose = react_1.useMemo(function () { return foundation_1.combineProps({ onClose: onCancel }, { onClose: onClose }); }, [onCancel, onClose]).onClose;
-    return (react_1.default.createElement(Dialog_1.RcDialog, tslib_1.__assign({ ref: ref, childrenSize: childrenSize, disableEscapeKeyDown: loading || loadingOverlay, disableBackdropClick: loading || loadingOverlay, onClose: handleClose, open: open }, rest),
+    var isLoading = loading || loadingOverlay;
+    var disableBackdropClick = disableBackdropClickProp !== null && disableBackdropClickProp !== void 0 ? disableBackdropClickProp : isLoading;
+    var handleClose = foundation_1.useEventCallback(function (e, reason) {
+        if (reason === 'backdropClick' && disableBackdropClick) {
+            return;
+        }
+        onClose === null || onClose === void 0 ? void 0 : onClose(e, reason);
+        onCancel === null || onCancel === void 0 ? void 0 : onCancel(e, reason);
+    });
+    return (react_1.default.createElement(Dialog_1.RcDialog, tslib_1.__assign({ ref: ref, childrenSize: childrenSize, disableEscapeKeyDown: isLoading, onClose: handleClose, open: open }, rest),
         react_1.default.createElement(Loading_1.RcLoading, { loading: loadingOverlay },
             react_1.default.createElement(Dialog_1.RcDialogTitle, tslib_1.__assign({ "data-test-automation-id": 'DialogTitle' }, TitleProps), title),
             react_1.default.createElement(Dialog_1.RcDialogContent, tslib_1.__assign({ "data-test-automation-id": 'DialogContent' }, ContentProps), typeof children === 'string' ? (react_1.default.createElement(Dialog_1.RcDialogContentText, null, children)) : (children)),

package/components/Snackbar/Snackbar.js

@@ -14,7 +14,7 @@ var _RcSnackbar = react_1.forwardRef(function (inProps, ref) {
     var classesProp = props.classes, size = props.size, type = props.type, message = props.message, action = props.action, ContentProps = props.ContentProps, children = props.children, TransitionPropsProp = props.TransitionProps, rest = tslib_1.__rest(props, ["classes", "size", "type", "message", "action", "ContentProps", "children", "TransitionProps"]);
     var classes = react_1.useMemo(function () { return foundation_1.combineClasses(utils_1.RcSnackbarClasses, classesProp); }, [classesProp]);
     var onExited = PortalHost_1.useUnmountPortalHandler(TransitionPropsProp === null || TransitionPropsProp === void 0 ? void 0 : TransitionPropsProp.onExited);
-    var TransitionProps = react_1.useMemo(function () { return foundation_1.combineProps({ onExited: onExited }, TransitionPropsProp); }, [TransitionPropsProp, onExited]);
+    var TransitionProps = tslib_1.__assign(tslib_1.__assign({}, TransitionPropsProp), { onExited: onExited });
     return (react_1.default.createElement(Snackbar_1.default, tslib_1.__assign({ ref: ref, classes: classes, TransitionProps: TransitionProps }, rest), children || (react_1.default.createElement(SnackbarContent_1.RcSnackbarContent, tslib_1.__assign({ size: size, type: type, message: message, action: action }, ContentProps)))));
 });
 var RcSnackbar = foundation_1.styled(_RcSnackbar)(templateObject_1 || (templateObject_1 = tslib_1.__makeTemplateObject(["\n  ", "\n"], ["\n  ", "\n"])), styles_1.SnackbarStyle);

package/es6/components/Dialog/Dialog.js

@@ -1,7 +1,7 @@
 import { __assign, __makeTemplateObject, __rest } from "tslib";
 import React, { forwardRef, useMemo } from 'react';
 import MuiDialog from '@material-ui/core/Dialog';
-import { combineClasses, combineProps, styled, useRcPortalWindowContext, useThemeProps, withDeprecatedCheck, } from '../../foundation';
+import { combineClasses, styled, useRcPortalWindowContext, useThemeProps, withDeprecatedCheck, } from '../../foundation';
 import { useUnmountPortalHandler } from '../PortalHost';
 import { DialogStyle } from './styles';
 import { RcDialogClasses } from './utils';
@@ -29,7 +29,7 @@ var _RcDialog = forwardRef(function (inProps, ref) {
     }, [maxWidthProp, size]);
     var contextValue = useMemo(function () { return ({ size: childrenSize }); }, [childrenSize]);
     var onExited = useUnmountPortalHandler(TransitionPropsProp === null || TransitionPropsProp === void 0 ? void 0 : TransitionPropsProp.onExited);
-    var TransitionProps = useMemo(function () { return combineProps({ onExited: onExited }, TransitionPropsProp); }, [TransitionPropsProp, onExited]);
+    var TransitionProps = __assign(__assign({}, TransitionPropsProp), { onExited: onExited });
     return (React.createElement(MuiDialog, __assign({ ref: ref, fullWidth: fullWidth, container: externalWindow === null || externalWindow === void 0 ? void 0 : externalWindow.document.body, maxWidth: maxWidth, fullScreen: size === 'fullScreen' ? true : undefined, classes: classes, TransitionProps: TransitionProps }, rest),
         React.createElement(RcDialogContext.Provider, { value: contextValue }, children)));
 });

package/es6/components/PopupBox/PopupBox.js

@@ -1,6 +1,6 @@
 import { __assign, __makeTemplateObject, __rest } from "tslib";
-import React, { forwardRef, useMemo } from 'react';
-import { combineProps, styled, useThemeProps, } from '../../foundation';
+import React, { forwardRef } from 'react';
+import { styled, useEventCallback, useThemeProps, } from '../../foundation';
 import { RcButton } from '../Buttons/Button';
 import { RcDialog, RcDialogActions, RcDialogContent, RcDialogContentText, RcDialogTitle, } from '../Dialog';
 import { RcLoading } from '../Loading';
@@ -10,10 +10,18 @@ var _RcPopupBox = forwardRef(function (inProps, ref) {
     // ok btn
     confirmButtonText = props.confirmButtonText, confirmButtonProps = props.confirmButtonProps, onConfirm = props.onConfirm, 
     // cancel btn
-    cancelButtonText = props.cancelButtonText, cancelButtonProps = props.cancelButtonProps, onCancel = props.onCancel, TitleProps = props.TitleProps, ContentProps = props.ContentProps, ActionsProps = props.ActionsProps, children = props.children, onClose = props.onClose, open = props.open, rest = __rest(props, ["childrenSize", "title", "footer", "loadingOverlay", "loading", "confirmButtonText", "confirmButtonProps", "onConfirm", "cancelButtonText", "cancelButtonProps", "onCancel", "TitleProps", "ContentProps", "ActionsProps", "children", "onClose", "open"]);
+    cancelButtonText = props.cancelButtonText, cancelButtonProps = props.cancelButtonProps, onCancel = props.onCancel, TitleProps = props.TitleProps, ContentProps = props.ContentProps, disableBackdropClickProp = props.disableBackdropClick, ActionsProps = props.ActionsProps, children = props.children, onClose = props.onClose, open = props.open, rest = __rest(props, ["childrenSize", "title", "footer", "loadingOverlay", "loading", "confirmButtonText", "confirmButtonProps", "onConfirm", "cancelButtonText", "cancelButtonProps", "onCancel", "TitleProps", "ContentProps", "disableBackdropClick", "ActionsProps", "children", "onClose", "open"]);
     var isXsmall = childrenSize === 'small';
-    var handleClose = useMemo(function () { return combineProps({ onClose: onCancel }, { onClose: onClose }); }, [onCancel, onClose]).onClose;
-    return (React.createElement(RcDialog, __assign({ ref: ref, childrenSize: childrenSize, disableEscapeKeyDown: loading || loadingOverlay, disableBackdropClick: loading || loadingOverlay, onClose: handleClose, open: open }, rest),
+    var isLoading = loading || loadingOverlay;
+    var disableBackdropClick = disableBackdropClickProp !== null && disableBackdropClickProp !== void 0 ? disableBackdropClickProp : isLoading;
+    var handleClose = useEventCallback(function (e, reason) {
+        if (reason === 'backdropClick' && disableBackdropClick) {
+            return;
+        }
+        onClose === null || onClose === void 0 ? void 0 : onClose(e, reason);
+        onCancel === null || onCancel === void 0 ? void 0 : onCancel(e, reason);
+    });
+    return (React.createElement(RcDialog, __assign({ ref: ref, childrenSize: childrenSize, disableEscapeKeyDown: isLoading, onClose: handleClose, open: open }, rest),
         React.createElement(RcLoading, { loading: loadingOverlay },
             React.createElement(RcDialogTitle, __assign({ "data-test-automation-id": 'DialogTitle' }, TitleProps), title),
             React.createElement(RcDialogContent, __assign({ "data-test-automation-id": 'DialogContent' }, ContentProps), typeof children === 'string' ? (React.createElement(RcDialogContentText, null, children)) : (children)),

package/es6/components/Snackbar/Snackbar.js

@@ -2,7 +2,7 @@ import { __assign, __makeTemplateObject, __rest } from "tslib";
 import React, { forwardRef, useMemo } from 'react';
 import Slide from '@material-ui/core/Slide';
 import MuiSnackbar from '@material-ui/core/Snackbar';
-import { combineClasses, combineProps, styled, useThemeProps, } from '../../foundation';
+import { combineClasses, styled, useThemeProps, } from '../../foundation';
 import { useUnmountPortalHandler } from '../PortalHost';
 import { RcSnackbarContent } from './SnackbarContent';
 import { SnackbarStyle } from './styles';
@@ -12,7 +12,7 @@ var _RcSnackbar = forwardRef(function (inProps, ref) {
     var classesProp = props.classes, size = props.size, type = props.type, message = props.message, action = props.action, ContentProps = props.ContentProps, children = props.children, TransitionPropsProp = props.TransitionProps, rest = __rest(props, ["classes", "size", "type", "message", "action", "ContentProps", "children", "TransitionProps"]);
     var classes = useMemo(function () { return combineClasses(RcSnackbarClasses, classesProp); }, [classesProp]);
     var onExited = useUnmountPortalHandler(TransitionPropsProp === null || TransitionPropsProp === void 0 ? void 0 : TransitionPropsProp.onExited);
-    var TransitionProps = useMemo(function () { return combineProps({ onExited: onExited }, TransitionPropsProp); }, [TransitionPropsProp, onExited]);
+    var TransitionProps = __assign(__assign({}, TransitionPropsProp), { onExited: onExited });
     return (React.createElement(MuiSnackbar, __assign({ ref: ref, classes: classes, TransitionProps: TransitionProps }, rest), children || (React.createElement(RcSnackbarContent, __assign({ size: size, type: type, message: message, action: action }, ContentProps)))));
 });
 var RcSnackbar = styled(_RcSnackbar)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n  ", "\n"], ["\n  ", "\n"])), SnackbarStyle);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ringcentral/juno",
-  "version": "1.12.1",
+  "version": "1.12.2",
   "main": "./index.js",
   "module": "./es6/index.js",
   "author": "RingCentral",