cozy-ui 70.2.2 → 70.2.3

package/.bundlemonrc

@@ -12,8 +12,7 @@
   ],
   "groups": [
     {
-        "path": "transpiled/react/**",
-        "maxPercentIncrease": 0.5,
+        "path": "transpiled/react/**"
     },
 ],
   "reportOutput": ["github"]

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [70.2.3](https://github.com/cozy/cozy-ui/compare/v70.2.2...v70.2.3) (2022-07-26)
+
+
+### Bug Fixes
+
+* **BottomSheet:** Remove bouncerSafer when clicking in backdrop ([93233dd](https://github.com/cozy/cozy-ui/commit/93233dd))
+* **CozyDialogs:** Close and Back button z-index ([a943399](https://github.com/cozy/cozy-ui/commit/a943399))
+
 ## [70.2.2](https://github.com/cozy/cozy-ui/compare/v70.2.1...v70.2.2) (2022-07-26)
 
 

package/package.json

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

package/react/BottomSheet/BottomSheet.jsx

@@ -16,10 +16,10 @@ import {
   computeMinHeight,
   makeOverridenChildren,
   setTopPosition,
-  setBottomPosition
+  setBottomPosition,
+  minimizeAndClose
 } from './helpers'
-
-const ANIMATION_DURATION = 250
+import { ANIMATION_DURATION } from './constants'
 
 const createStyles = ({ squared, hasToolbarProps }) => ({
   root: {
@@ -125,13 +125,6 @@ const BottomSheet = ({
     onClose && onClose()
   }, [onClose])
 
-  const handleMinimizeAndClose = () => {
-    if (backdrop) {
-      setCurrentIndex(0)
-      setTimeout(handleClose, ANIMATION_DURATION)
-    }
-  }
-
   const handleOnIndexChange = snapIndex => {
     const maxHeightSnapIndex = peekHeights.length - 1
 
@@ -232,7 +225,17 @@ const BottomSheet = ({
           hidden={isHidden}
           snapPointSeekerMode="next"
         >
-          <ClickAwayListener onClickAway={handleMinimizeAndClose}>
+          <ClickAwayListener
+            onClickAway={() =>
+              minimizeAndClose({
+                backdrop,
+                setCurrentIndex,
+                setIsTopPosition,
+                setIsBottomPosition,
+                handleClose
+              })
+            }
+          >
             <span>
               <div ref={innerContentRef}>
                 <Paper

package/react/BottomSheet/constants.js

@@ -0,0 +1 @@
+export const ANIMATION_DURATION = 250

package/react/BottomSheet/helpers.js

@@ -1,6 +1,8 @@
 import React from 'react'
 import { getFlagshipMetadata } from 'cozy-device-helper'
 
+import { ANIMATION_DURATION } from './constants'
+
 export const computeMaxHeight = toolbarProps => {
   const { ref, height } = toolbarProps
   let computedToolbarHeight = 1
@@ -94,3 +96,18 @@ export const setBottomPosition = ({
     setIsBottomPosition(false)
   }
 }
+
+export const minimizeAndClose = ({
+  backdrop,
+  setCurrentIndex,
+  setIsTopPosition,
+  setIsBottomPosition,
+  handleClose
+}) => {
+  if (backdrop) {
+    setCurrentIndex(0)
+    setIsTopPosition(false)
+    setIsBottomPosition(true)
+    setTimeout(handleClose, ANIMATION_DURATION)
+  }
+}

package/react/BottomSheet/helpers.spec.js

@@ -3,7 +3,8 @@ import {
   computeMediumHeight,
   computeMinHeight,
   setTopPosition,
-  setBottomPosition
+  setBottomPosition,
+  minimizeAndClose
 } from './helpers'
 
 jest.mock('cozy-device-helper', () => ({
@@ -233,3 +234,51 @@ describe('setBottomPosition', () => {
     })
   })
 })
+
+describe('minimizeAndClose', () => {
+  jest.useFakeTimers()
+
+  it('should not trigger function if no backdrop', () => {
+    const setCurrentIndex = jest.fn()
+    const setIsTopPosition = jest.fn()
+    const setIsBottomPosition = jest.fn()
+    const handleClose = jest.fn()
+
+    minimizeAndClose({
+      backdrop: false,
+      setCurrentIndex,
+      setIsTopPosition,
+      setIsBottomPosition,
+      handleClose
+    })
+
+    jest.runAllTimers()
+
+    expect(setCurrentIndex).not.toHaveBeenCalled()
+    expect(setIsTopPosition).not.toHaveBeenCalled()
+    expect(setIsBottomPosition).not.toHaveBeenCalled()
+    expect(handleClose).not.toHaveBeenCalled()
+  })
+
+  it('should trigger every function if backdrop is true', () => {
+    const setCurrentIndex = jest.fn()
+    const setIsTopPosition = jest.fn()
+    const setIsBottomPosition = jest.fn()
+    const handleClose = jest.fn()
+
+    minimizeAndClose({
+      backdrop: true,
+      setCurrentIndex,
+      setIsTopPosition,
+      setIsBottomPosition,
+      handleClose
+    })
+
+    jest.runAllTimers()
+
+    expect(setCurrentIndex).toHaveBeenCalledWith(0)
+    expect(setIsTopPosition).toHaveBeenCalledWith(false)
+    expect(setIsBottomPosition).toHaveBeenCalledWith(true)
+    expect(handleClose).toHaveBeenCalled()
+  })
+})

package/react/CozyDialogs/styles.styl

@@ -4,7 +4,7 @@
     position absolute
     top 1.15rem
     right 1.15rem
-    z-index var(--zIndex-modal) //needed for an iOS bug https://github.com/cozy/cozy-ui/pull/1790
+    z-index 1
     transform translateY(var(--flagship-top-height))
     +small-screen()
         top 0.25rem
@@ -14,7 +14,7 @@
     position absolute
     top 1.15rem
     left 1.15rem
-    z-index var(--zIndex-modal) //needed for an iOS bug https://github.com/cozy/cozy-ui/pull/1790
+    z-index 1
     +small-screen()
         top 0.25rem
         left 0.25rem

package/transpiled/react/BottomSheet/BottomSheet.js

@@ -16,8 +16,8 @@ import Stack from "cozy-ui/transpiled/react/Stack";
 import Paper from "cozy-ui/transpiled/react/Paper";
 import ClickAwayListener from "cozy-ui/transpiled/react/ClickAwayListener";
 import BackdropOrFragment from "cozy-ui/transpiled/react/BottomSheet/BackdropOrFragment";
-import { computeMaxHeight, computeMediumHeight, computeMinHeight, makeOverridenChildren, setTopPosition, setBottomPosition } from "cozy-ui/transpiled/react/BottomSheet/helpers";
-var ANIMATION_DURATION = 250;
+import { computeMaxHeight, computeMediumHeight, computeMinHeight, makeOverridenChildren, setTopPosition, setBottomPosition, minimizeAndClose } from "cozy-ui/transpiled/react/BottomSheet/helpers";
+import { ANIMATION_DURATION } from "cozy-ui/transpiled/react/BottomSheet/constants";
 
 var createStyles = function createStyles(_ref) {
   var squared = _ref.squared,
@@ -148,13 +148,6 @@ var BottomSheet = function BottomSheet(_ref2) {
     onClose && onClose();
   }, [onClose]);
 
-  var handleMinimizeAndClose = function handleMinimizeAndClose() {
-    if (backdrop) {
-      setCurrentIndex(0);
-      setTimeout(handleClose, ANIMATION_DURATION);
-    }
-  };
-
   var handleOnIndexChange = function handleOnIndexChange(snapIndex) {
     var maxHeightSnapIndex = peekHeights.length - 1;
     setCurrentIndex(snapIndex);
@@ -239,7 +232,15 @@ var BottomSheet = function BottomSheet(_ref2) {
     hidden: isHidden,
     snapPointSeekerMode: "next"
   }, /*#__PURE__*/React.createElement(ClickAwayListener, {
-    onClickAway: handleMinimizeAndClose
+    onClickAway: function onClickAway() {
+      return minimizeAndClose({
+        backdrop: backdrop,
+        setCurrentIndex: setCurrentIndex,
+        setIsTopPosition: setIsTopPosition,
+        setIsBottomPosition: setIsBottomPosition,
+        handleClose: handleClose
+      });
+    }
   }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("div", {
     ref: innerContentRef
   }, /*#__PURE__*/React.createElement(Paper, {

package/transpiled/react/BottomSheet/constants.js

@@ -0,0 +1 @@
+export var ANIMATION_DURATION = 250;

package/transpiled/react/BottomSheet/helpers.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import { getFlagshipMetadata } from 'cozy-device-helper';
+import { ANIMATION_DURATION } from "cozy-ui/transpiled/react/BottomSheet/constants";
 export var computeMaxHeight = function computeMaxHeight(toolbarProps) {
   var ref = toolbarProps.ref,
       height = toolbarProps.height;
@@ -82,4 +83,18 @@ export var setBottomPosition = function setBottomPosition(_ref4) {
   if (snapIndex !== 0 && isBottomPosition) {
     setIsBottomPosition(false);
   }
+};
+export var minimizeAndClose = function minimizeAndClose(_ref5) {
+  var backdrop = _ref5.backdrop,
+      setCurrentIndex = _ref5.setCurrentIndex,
+      setIsTopPosition = _ref5.setIsTopPosition,
+      setIsBottomPosition = _ref5.setIsBottomPosition,
+      handleClose = _ref5.handleClose;
+
+  if (backdrop) {
+    setCurrentIndex(0);
+    setIsTopPosition(false);
+    setIsBottomPosition(true);
+    setTimeout(handleClose, ANIMATION_DURATION);
+  }
 };