cozy-ui 111.18.0 → 111.18.1

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [111.18.1](https://github.com/cozy/cozy-ui/compare/v111.18.0...v111.18.1) (2024-10-14)
+
+
+### Bug Fixes
+
+* **Dialog:** Classnames wasn't merged if set ([8a9453c](https://github.com/cozy/cozy-ui/commit/8a9453c))
+* **FixedDialog:** Bottom divider wasn't fullwidth when small size dialog ([ecceb97](https://github.com/cozy/cozy-ui/commit/ecceb97))
+
 # [111.18.0](https://github.com/cozy/cozy-ui/compare/v111.17.0...v111.18.0) (2024-10-14)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-ui",
-  "version": "111.18.0",
+  "version": "111.18.1",
   "description": "Cozy apps UI SDK",
   "main": "./index.js",
   "bin": {

package/react/CozyDialogs/FixedDialog.jsx

@@ -51,7 +51,7 @@ const FixedDialog = props => {
       <DialogContent {...dialogContentProps}>
         <div className="dialogContentInner">{content}</div>
       </DialogContent>
-      <Divider />
+      <Divider {...dividerProps} />
       {actions && (
         <DialogActions
           {...dialogActionsProps}

package/react/Dialog/index.jsx

@@ -1,15 +1,21 @@
 import { default as MUIDialog } from '@material-ui/core/Dialog'
+import cx from 'classnames'
 import React from 'react'
 
 import { useDialogEffects } from './DialogEffects'
 import { useCozyTheme } from '../providers/CozyTheme'
 
-const Dialog = props => {
+const Dialog = ({ className, ...props }) => {
   const { type, variant } = useCozyTheme()
 
   useDialogEffects(props.open, props.fullScreen)
 
-  return <MUIDialog className={`CozyTheme--${type}-${variant}`} {...props} />
+  return (
+    <MUIDialog
+      className={cx(`CozyTheme--${type}-${variant}`, className)}
+      {...props}
+    />
+  )
 }
 
 Dialog.defaultProps = {

package/transpiled/react/CozyDialogs/FixedDialog.js

@@ -37,7 +37,7 @@ var FixedDialog = function FixedDialog(props) {
     onClick: onBackOrClose
   }), title && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DialogTitle, dialogTitleProps, title), /*#__PURE__*/React.createElement(Divider, dividerProps)), /*#__PURE__*/React.createElement(DialogContent, dialogContentProps, /*#__PURE__*/React.createElement("div", {
     className: "dialogContentInner"
-  }, content)), /*#__PURE__*/React.createElement(Divider, null), actions && /*#__PURE__*/React.createElement(DialogActions, _extends({}, dialogActionsProps, {
+  }, content)), /*#__PURE__*/React.createElement(Divider, dividerProps), actions && /*#__PURE__*/React.createElement(DialogActions, _extends({}, dialogActionsProps, {
     disableSpacing: true,
     className: cx({
       columnLayout: actionsLayout == 'column'

package/transpiled/react/Dialog/index.js

@@ -1,17 +1,23 @@
 import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["className"];
 import { default as MUIDialog } from '@material-ui/core/Dialog';
+import cx from 'classnames';
 import React from 'react';
 import { useDialogEffects } from "cozy-ui/transpiled/react/Dialog/DialogEffects";
 import { useCozyTheme } from "cozy-ui/transpiled/react/providers/CozyTheme";
 
-var Dialog = function Dialog(props) {
+var Dialog = function Dialog(_ref) {
+  var className = _ref.className,
+      props = _objectWithoutProperties(_ref, _excluded);
+
   var _useCozyTheme = useCozyTheme(),
       type = _useCozyTheme.type,
       variant = _useCozyTheme.variant;
 
   useDialogEffects(props.open, props.fullScreen);
   return /*#__PURE__*/React.createElement(MUIDialog, _extends({
-    className: "CozyTheme--".concat(type, "-").concat(variant)
+    className: cx("CozyTheme--".concat(type, "-").concat(variant), className)
   }, props));
 };