cozy-ui 57.9.2 → 57.10.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [57.10.0](https://github.com/cozy/cozy-ui/compare/v57.9.2...v57.10.0) (2021-11-29)
+
+
+### Features
+
+* Forward remaining props to AppIcon ([ed86adf](https://github.com/cozy/cozy-ui/commit/ed86adf))
+
 ## [57.9.2](https://github.com/cozy/cozy-ui/compare/v57.9.1...v57.9.2) (2021-11-23)
 
 

package/package.json

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

package/react/SquareAppIcon/Readme.md

@@ -10,6 +10,7 @@ import { useCozyTheme } from 'cozy-ui/transpiled/react/CozyTheme'
 import cloudWallpaper from '../../docs/cloud-wallpaper.jpg'
 
 const theme = useCozyTheme()
+const app = { name: "Test App", slug: "testapp", type: "app" }
 
 ;
 
@@ -17,13 +18,13 @@ const theme = useCozyTheme()
 <Grid container spacing={1} style={{ background: `center / cover no-repeat url(${cloudWallpaper})` }}
 >
   <Grid item>
-    <SquareAppIcon app="testapp" name="Normal" />
+    <SquareAppIcon app={app} name="Normal" />
   </Grid>
   <Grid item>
-    <SquareAppIcon app="testapp" name="Maintenance" variant="maintenance" />
+    <SquareAppIcon app={app} name="Maintenance" variant="maintenance" />
   </Grid>
   <Grid item>
-    <SquareAppIcon app="testapp" name="Error" variant="error" />
+    <SquareAppIcon app={app} name="Error" variant="error" />
   </Grid>
   <Grid item>
     <SquareAppIcon name="Add" variant="add" />

package/react/SquareAppIcon/index.jsx

@@ -2,13 +2,13 @@ import React from 'react'
 import cx from 'classnames'
 import PropTypes from 'prop-types'
 import { makeStyles } from '@material-ui/styles'
+import get from 'lodash/get'
 
 import AppIcon from '../AppIcon'
 import Badge from '../Badge'
 import InfosBadge from '../InfosBadge'
 import { nameToColor } from '../Avatar'
 import Typography from '../Typography'
-import { AppDoctype } from '../proptypes'
 import Icon from '../Icon'
 import iconPlus from '../Icons/Plus'
 import iconWarning from '../Icons/WarningCircle'
@@ -61,9 +61,15 @@ const useStyles = makeStyles(theme => ({
   }
 }))
 
-export const SquareAppIcon = ({ app, type, name, variant, IconContent }) => {
+export const SquareAppIcon = ({
+  name,
+  variant,
+  IconContent,
+  ...appIconProps
+}) => {
   const classes = useStyles()
-  const appName = name || (app && app.name) || app || ''
+  const appName =
+    name || get(appIconProps, 'app.name') || get(appIconProps, 'app') || ''
   const letter = appName[0] || ''
 
   return (
@@ -119,7 +125,7 @@ export const SquareAppIcon = ({ app, type, name, variant, IconContent }) => {
               ) : IconContent ? (
                 IconContent
               ) : (
-                <AppIcon app={app} type={type} />
+                <AppIcon {...appIconProps} />
               )}
             </div>
           )}
@@ -137,7 +143,6 @@ export const SquareAppIcon = ({ app, type, name, variant, IconContent }) => {
 }
 
 SquareAppIcon.propTypes = {
-  app: PropTypes.oneOfType([AppDoctype, PropTypes.string]),
   name: PropTypes.string,
   variant: PropTypes.oneOf([
     'ghost',
@@ -146,8 +151,7 @@ SquareAppIcon.propTypes = {
     'add',
     'shortcut'
   ]),
-  IconContent: PropTypes.node,
-  type: PropTypes.oneOf(['app', 'konnector'])
+  IconContent: PropTypes.node
 }
 
 export default SquareAppIcon

package/transpiled/react/SquareAppIcon/index.js

@@ -1,14 +1,15 @@
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
 import { makeStyles } from '@material-ui/styles';
+import get from 'lodash/get';
 import AppIcon from "cozy-ui/transpiled/react/AppIcon";
 import Badge from "cozy-ui/transpiled/react/Badge";
 import InfosBadge from "cozy-ui/transpiled/react/InfosBadge";
 import { nameToColor } from "cozy-ui/transpiled/react/Avatar";
 import Typography from "cozy-ui/transpiled/react/Typography";
-import { AppDoctype } from "cozy-ui/transpiled/react/proptypes";
 import Icon from "cozy-ui/transpiled/react/Icon";
 import iconPlus from "cozy-ui/transpiled/react/Icons/Plus";
 import iconWarning from "cozy-ui/transpiled/react/Icons/WarningCircle";
@@ -74,13 +75,13 @@ var useStyles = makeStyles(function (theme) {
 export var SquareAppIcon = function SquareAppIcon(_ref) {
   var _cx;
 
-  var app = _ref.app,
-      type = _ref.type,
-      name = _ref.name,
+  var name = _ref.name,
       variant = _ref.variant,
-      IconContent = _ref.IconContent;
+      IconContent = _ref.IconContent,
+      appIconProps = _objectWithoutProperties(_ref, ["name", "variant", "IconContent"]);
+
   var classes = useStyles();
-  var appName = name || app && app.name || app || '';
+  var appName = name || get(appIconProps, 'app.name') || get(appIconProps, 'app') || '';
   var letter = appName[0] || '';
   return React.createElement("div", {
     "data-testid": "square-app-icon",
@@ -115,20 +116,15 @@ export var SquareAppIcon = function SquareAppIcon(_ref) {
   }, variant === 'add' ? React.createElement(Icon, {
     icon: iconPlus,
     color: color
-  }) : IconContent ? IconContent : React.createElement(AppIcon, {
-    app: app,
-    type: type
-  })))), React.createElement(Typography, {
+  }) : IconContent ? IconContent : React.createElement(AppIcon, appIconProps)))), React.createElement(Typography, {
     className: cx(classes.name, 'u-spacellipsis'),
     variant: "h6",
     align: "center"
   }, appName));
 };
 SquareAppIcon.propTypes = {
-  app: PropTypes.oneOfType([AppDoctype, PropTypes.string]),
   name: PropTypes.string,
   variant: PropTypes.oneOf(['ghost', 'maintenance', 'error', 'add', 'shortcut']),
-  IconContent: PropTypes.node,
-  type: PropTypes.oneOf(['app', 'konnector'])
+  IconContent: PropTypes.node
 };
 export default SquareAppIcon;