cozy-ui 111.15.1 → 111.16.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [111.16.0](https://github.com/cozy/cozy-ui/compare/v111.15.2...v111.16.0) (2024-10-10)
+
+
+### Features
+
+* **Icon:** Add `img` tag and `.png` file support ([c1eeb5d](https://github.com/cozy/cozy-ui/commit/c1eeb5d))
+
+## [111.15.2](https://github.com/cozy/cozy-ui/compare/v111.15.1...v111.15.2) (2024-10-09)
+
+
+### Bug Fixes
+
+* **BottomSheet:** Add safe area and flagship app height to compute toolbar height ([f452eca](https://github.com/cozy/cozy-ui/commit/f452eca))
+
 ## [111.15.1](https://github.com/cozy/cozy-ui/compare/v111.15.0...v111.15.1) (2024-10-09)
 
 

package/package.json

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

package/react/BottomSheet/helpers.js

@@ -14,7 +14,11 @@ export const computeToolbarHeight = (toolbarProps = {}) => {
     computedToolbarHeight = ref.current.offsetHeight
   }
 
-  return computedToolbarHeight
+  return (
+    computedToolbarHeight +
+    (getFlagshipMetadata().statusBarHeight || 0) +
+    getSafeAreaValue('top')
+  )
 }
 
 export const computeMaxHeight = toolbarProps => {

package/react/BottomSheet/helpers.spec.js

@@ -22,19 +22,19 @@ describe('computeMaxHeight', () => {
   it('should return correct value if no arg', () => {
     const res = computeMaxHeight({})
 
-    expect(res).toBe(799)
+    expect(res).toBe(784)
   })
 
   it('should return correct value with height arg', () => {
     const res = computeMaxHeight({ height: 50 })
 
-    expect(res).toBe(750)
+    expect(res).toBe(735)
   })
 
   it('should return correct value with ref arg', () => {
     const res = computeMaxHeight({ ref: { current: { offsetHeight: 50 } } })
 
-    expect(res).toBe(750)
+    expect(res).toBe(735)
   })
 })
 
@@ -397,7 +397,7 @@ describe('computeBottomSpacer', () => {
           offset: 0
         })
 
-        expect(res).toBe(1)
+        expect(res).toBe(16)
       })
 
       it('should return the toolbar height', () => {
@@ -409,7 +409,7 @@ describe('computeBottomSpacer', () => {
           offset: 0
         })
 
-        expect(res).toBe(50)
+        expect(res).toBe(65)
       })
 
       it('should return the offset value and border', () => {
@@ -420,7 +420,7 @@ describe('computeBottomSpacer', () => {
           offset: 48
         })
 
-        expect(res).toBe(49)
+        expect(res).toBe(64)
       })
 
       it('should return the offset value and border and toolbar height', () => {
@@ -432,7 +432,7 @@ describe('computeBottomSpacer', () => {
           offset: 48
         })
 
-        expect(res).toBe(98)
+        expect(res).toBe(113)
       })
     })
   })
@@ -495,7 +495,7 @@ describe('computeBottomSpacer', () => {
           offset: 0
         })
 
-        expect(res).toBe(1)
+        expect(res).toBe(16)
       })
 
       it('should return the toolbar height', () => {
@@ -507,7 +507,7 @@ describe('computeBottomSpacer', () => {
           offset: 0
         })
 
-        expect(res).toBe(50)
+        expect(res).toBe(65)
       })
 
       it('should return the offset value', () => {
@@ -518,7 +518,7 @@ describe('computeBottomSpacer', () => {
           offset: 48
         })
 
-        expect(res).toBe(49)
+        expect(res).toBe(64)
       })
 
       it('should return the offset value and toolbar height', () => {
@@ -530,7 +530,7 @@ describe('computeBottomSpacer', () => {
           offset: 48
         })
 
-        expect(res).toBe(98)
+        expect(res).toBe(113)
       })
     })
   })
@@ -540,18 +540,18 @@ describe('computeToolbarHeight', () => {
   it('should return the height prop', () => {
     const res = computeToolbarHeight({ height: 50 })
 
-    expect(res).toBe(50)
+    expect(res).toBe(65)
   })
 
   it('should return the height from ref', () => {
     const res = computeToolbarHeight({ ref: { current: { offsetHeight: 50 } } })
 
-    expect(res).toBe(50)
+    expect(res).toBe(65)
   })
 
   it('should return default value', () => {
     const res = computeToolbarHeight()
 
-    expect(res).toBe(1)
+    expect(res).toBe(16)
   })
 })

package/react/CozyDialogs/Readme.md

@@ -92,6 +92,8 @@ const hideBottomSheet = () => setState({ bottomSheetOpened: false })
 const showBottomSheet = () => setState({ bottomSheetOpened: true })
 const hideSecondConfirmDialog = () => setState({ secondConfirmDialogOpened: false })
 const showSecondConfirmDialog = () => setState({ secondConfirmDialogOpened: true })
+const hideSecondDialog = () => setState({ secondDialogOpened: false })
+const showSecondDialog = () => setState({ secondDialogOpened: true })
 const hideBSConfirmDialog = () => setState({ BSConfirmDialogOpened: false })
 const showBSConfirmDialog = () => setState({ BSConfirmDialogOpened: true })
 
@@ -188,6 +190,7 @@ initialState = {
   modalOpened: isTesting(),
   bottomSheetOpened: false,
   secondConfirmDialogOpened: false,
+  secondDialogOpened: false,
   BSConfirmDialogOpened: false,
   modal: Dialog,
   size: 'medium',
@@ -323,6 +326,9 @@ const initialVariants = [{
                     <div>
                       <Button label="Show inner confirm dialog" onClick={showSecondConfirmDialog}/>
                     </div>
+                    <div>
+                      <Button label="Show inner dialog" onClick={showSecondDialog}/>
+                    </div>
                   </Stack>
                 </Typography>
 
@@ -333,6 +339,13 @@ const initialVariants = [{
                   />
                 )}
 
+                {state.secondDialogOpened && (
+                  <Dialog open onClose={hideSecondDialog}
+                    title="This is a simple title"
+                    content="This is a simple content"
+                  />
+                )}
+
                 {state.bottomSheetOpened && (
                   <BottomSheet backdrop onClose={hideBottomSheet}>
                     <BottomSheetItem>

package/react/Icon/index.jsx

@@ -51,8 +51,23 @@ function Icon(props) {
   if (!icon) return null
 
   const isIconComp = icon.type === Icon
-
-  if (isIconComp) return icon
+  const isImg = icon.type === 'img'
+
+  if (isIconComp || isImg) return icon
+
+  const isPngPath = typeof icon === 'string' && icon.includes('.png')
+
+  if (isPngPath)
+    return (
+      <img
+        src={icon}
+        className={className}
+        style={style}
+        width={width || size || DEFAULT_SIZE}
+        height={height || size || DEFAULT_SIZE}
+        {...restProps}
+      />
+    )
 
   const Svg = isFunction(icon) ? icon : makeSvgObject(icon)
 

package/transpiled/react/BottomSheet/helpers.js

@@ -14,7 +14,7 @@ export var computeToolbarHeight = function computeToolbarHeight() {
     computedToolbarHeight = ref.current.offsetHeight;
   }
 
-  return computedToolbarHeight;
+  return computedToolbarHeight + (getFlagshipMetadata().statusBarHeight || 0) + getSafeAreaValue('top');
 };
 export var computeMaxHeight = function computeMaxHeight(toolbarProps) {
   var toolbarHeight = computeToolbarHeight(toolbarProps);

package/transpiled/react/Icon/index.js

@@ -1,5 +1,5 @@
-import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 var _excluded = ["icon", "width", "height", "color", "style", "className", "preserveColor", "rotate", "size", "spin"];
 import cx from 'classnames';
@@ -56,7 +56,16 @@ function Icon(props) {
 
   if (!icon) return null;
   var isIconComp = icon.type === Icon;
-  if (isIconComp) return icon;
+  var isImg = icon.type === 'img';
+  if (isIconComp || isImg) return icon;
+  var isPngPath = typeof icon === 'string' && icon.includes('.png');
+  if (isPngPath) return /*#__PURE__*/React.createElement("img", _extends({
+    src: icon,
+    className: className,
+    style: style,
+    width: width || size || DEFAULT_SIZE,
+    height: height || size || DEFAULT_SIZE
+  }, restProps));
   var Svg = isFunction(icon) ? icon : makeSvgObject(icon);
   var selfStyle = style;
   selfStyle = Object.assign({}, selfStyle);