cozy-ui 95.10.0 → 95.11.1

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+## [95.11.1](https://github.com/cozy/cozy-ui/compare/v95.11.0...v95.11.1) (2023-11-20)
+
+
+### Bug Fixes
+
+* **BottomSheet:** Did not compare peek heights correctly ([600c430](https://github.com/cozy/cozy-ui/commit/600c430))
+* **BottomSheet:** Did not set default currentIndex correctly ([e22c482](https://github.com/cozy/cozy-ui/commit/e22c482))
+* **BottomSheet:** Did not set topPosition and snapIndex correctly ([c23ee5a](https://github.com/cozy/cozy-ui/commit/c23ee5a))
+
+# [95.11.0](https://github.com/cozy/cozy-ui/compare/v95.10.0...v95.11.0) (2023-11-20)
+
+
+### Features
+
+* Add missing `bicNumber` attribute ([ed37277](https://github.com/cozy/cozy-ui/commit/ed37277))
+* Remove last occurence of `mespapiers.migrated.metadata` flag ([11c3147](https://github.com/cozy/cozy-ui/commit/11c3147))
+
 # [95.10.0](https://github.com/cozy/cozy-ui/compare/v95.9.0...v95.10.0) (2023-11-14)
 
 

package/package.json

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

package/react/BottomSheet/BottomSheet.jsx

@@ -155,7 +155,7 @@ const BottomSheet = memo(
     const [isHidden, setIsHidden] = useState(false)
     const [showBackdrop, setShowBackdrop] = useState(backdrop)
     const [peekHeights, setPeekHeights] = useState(null)
-    const [currentIndex, setCurrentIndex] = useState()
+    const [currentIndex, setCurrentIndex] = useState(1) // as setInitPos use computedMediumHeight
     const [bottomSpacerHeight, setBottomSpacerHeight] = useState(0)
     const [initPos, setInitPos] = useState(0)
     const prevInitPos = useRef()
@@ -189,12 +189,10 @@ const BottomSheet = memo(
     }, [onClose])
 
     const handleOnIndexChange = snapIndex => {
-      const maxHeightSnapIndex = peekHeights.length - 1
-
       setCurrentIndex(snapIndex)
       setTopPosition({
         snapIndex,
-        maxHeightSnapIndex,
+        peekHeights,
         isTopPosition,
         setIsTopPosition
       })
@@ -251,25 +249,29 @@ const BottomSheet = memo(
         actionButtonsBottomMargin
       })
 
-      if (computedMediumHeight >= maxHeight) {
-        setIsTopPosition(true)
-      } else {
-        setIsTopPosition(false)
-      }
-
       const newPeekHeights = [
         ...new Set([minHeight, computedMediumHeight, maxHeight])
       ]
 
-      const hasPeekHeightsChanged = peekHeights !== newPeekHeights
+      const hasPeekHeightsChanged =
+        peekHeights?.toString() !== newPeekHeights?.toString()
 
-      if (hasPeekHeightsChanged && isTopPosition) {
-        setCurrentIndex(v => v - 1)
-      }
+      // lower the BottomSheet after a refresh if it was as top position and peek changed
+      const snapIndex =
+        hasPeekHeightsChanged && isTopPosition
+          ? currentIndex - 1 - (currentIndex - (newPeekHeights.length - 1))
+          : currentIndex
 
+      setCurrentIndex(snapIndex)
       setPeekHeights(newPeekHeights)
       prevInitPos.current = initPos
       setInitPos(computedMediumHeight)
+      setTopPosition({
+        snapIndex,
+        peekHeights: newPeekHeights,
+        isTopPosition,
+        setIsTopPosition
+      })
       // Used so that the BottomSheet can be opened to the top without stopping at the content height
       setBottomSpacerHeight(bottomSpacerHeight)
 

package/react/BottomSheet/helpers.js

@@ -84,10 +84,12 @@ export const makeOverridenChildren = (children, headerContentRef) => {
 
 export const setTopPosition = ({
   snapIndex,
-  maxHeightSnapIndex,
+  peekHeights,
   isTopPosition,
   setIsTopPosition
 }) => {
+  const maxHeightSnapIndex = peekHeights.length - 1
+
   if (snapIndex > maxHeightSnapIndex) {
     setIsTopPosition(true)
   }

package/react/BottomSheet/helpers.spec.js

@@ -161,7 +161,7 @@ describe('setTopPosition', () => {
 
       setTopPosition({
         snapIndex: 3,
-        maxHeightSnapIndex: 2,
+        peekHeights: [0, 100, 200],
         setIsTopPosition
       })
 
@@ -173,7 +173,7 @@ describe('setTopPosition', () => {
 
       setTopPosition({
         snapIndex: 2,
-        maxHeightSnapIndex: 2,
+        peekHeights: [0, 100, 200],
         isTopPosition: false,
         setIsTopPosition
       })
@@ -186,7 +186,7 @@ describe('setTopPosition', () => {
 
       setTopPosition({
         snapIndex: 1,
-        maxHeightSnapIndex: 2,
+        peekHeights: [0, 100, 200],
         isTopPosition: true,
         setIsTopPosition
       })
@@ -201,7 +201,7 @@ describe('setTopPosition', () => {
 
       setTopPosition({
         snapIndex: 2,
-        maxHeightSnapIndex: 2,
+        peekHeights: [0, 100, 200],
         isTopPosition: true,
         setIsTopPosition
       })
@@ -214,7 +214,7 @@ describe('setTopPosition', () => {
 
       setTopPosition({
         snapIndex: 1,
-        maxHeightSnapIndex: 2,
+        peekHeights: [0, 100, 200],
         isTopPosition: false,
         setIsTopPosition
       })

package/react/Viewer/helpers.js

@@ -1,5 +1,4 @@
 import { models, generateWebLink } from 'cozy-client'
-import flag from 'cozy-flags'
 
 const {
   isEncrypted,
@@ -22,23 +21,14 @@ export const knownDateMetadataNames = [
   'date',
   'datetime'
 ]
-export const knownInformationMetadataNames = flag(
-  'mespapiers.migrated.metadata'
-)
-  ? ['number', 'country', 'refTaxIncome', 'contractType', 'noticePeriod']
-  : [
-      'number',
-      'cafFileNumber',
-      'cardNumber',
-      'vinNumber',
-      'ibanNumber',
-      'bicNumber',
-      'country',
-      'passportNumber',
-      'refTaxIncome',
-      'contractType',
-      'noticePeriod'
-    ]
+export const knownInformationMetadataNames = [
+  'number',
+  'bicNumber',
+  'country',
+  'refTaxIncome',
+  'contractType',
+  'noticePeriod'
+]
 export const knownOtherMetadataNames = ['contact', 'page', 'qualification']
 
 export const getCurrentModel = metadataName => {

package/transpiled/react/BottomSheet/BottomSheet.js

@@ -171,10 +171,11 @@ var BottomSheet = /*#__PURE__*/memo(function (_ref3) {
       peekHeights = _useState10[0],
       setPeekHeights = _useState10[1];
 
-  var _useState11 = useState(),
+  var _useState11 = useState(1),
       _useState12 = _slicedToArray(_useState11, 2),
       currentIndex = _useState12[0],
-      setCurrentIndex = _useState12[1];
+      setCurrentIndex = _useState12[1]; // as setInitPos use computedMediumHeight
+
 
   var _useState13 = useState(0),
       _useState14 = _slicedToArray(_useState13, 2),
@@ -212,11 +213,10 @@ var BottomSheet = /*#__PURE__*/memo(function (_ref3) {
   }, [onClose]);
 
   var handleOnIndexChange = function handleOnIndexChange(snapIndex) {
-    var maxHeightSnapIndex = peekHeights.length - 1;
     setCurrentIndex(snapIndex);
     setTopPosition({
       snapIndex: snapIndex,
-      maxHeightSnapIndex: maxHeightSnapIndex,
+      peekHeights: peekHeights,
       isTopPosition: isTopPosition,
       setIsTopPosition: setIsTopPosition
     });
@@ -268,25 +268,21 @@ var BottomSheet = /*#__PURE__*/memo(function (_ref3) {
       actionButtonsBottomMargin: actionButtonsBottomMargin
     });
 
-    if (computedMediumHeight >= maxHeight) {
-      setIsTopPosition(true);
-    } else {
-      setIsTopPosition(false);
-    }
-
     var newPeekHeights = _toConsumableArray(new Set([minHeight, computedMediumHeight, maxHeight]));
 
-    var hasPeekHeightsChanged = peekHeights !== newPeekHeights;
-
-    if (hasPeekHeightsChanged && isTopPosition) {
-      setCurrentIndex(function (v) {
-        return v - 1;
-      });
-    }
+    var hasPeekHeightsChanged = (peekHeights === null || peekHeights === void 0 ? void 0 : peekHeights.toString()) !== (newPeekHeights === null || newPeekHeights === void 0 ? void 0 : newPeekHeights.toString()); // lower the BottomSheet after a refresh if it was as top position and peek changed
 
+    var snapIndex = hasPeekHeightsChanged && isTopPosition ? currentIndex - 1 - (currentIndex - (newPeekHeights.length - 1)) : currentIndex;
+    setCurrentIndex(snapIndex);
     setPeekHeights(newPeekHeights);
     prevInitPos.current = initPos;
-    setInitPos(computedMediumHeight); // Used so that the BottomSheet can be opened to the top without stopping at the content height
+    setInitPos(computedMediumHeight);
+    setTopPosition({
+      snapIndex: snapIndex,
+      peekHeights: newPeekHeights,
+      isTopPosition: isTopPosition,
+      setIsTopPosition: setIsTopPosition
+    }); // Used so that the BottomSheet can be opened to the top without stopping at the content height
 
     setBottomSpacerHeight(bottomSpacerHeight); // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [// initPos is missing, because we need the previous value

package/transpiled/react/BottomSheet/helpers.js

@@ -64,9 +64,10 @@ export var makeOverridenChildren = function makeOverridenChildren(children, head
 };
 export var setTopPosition = function setTopPosition(_ref3) {
   var snapIndex = _ref3.snapIndex,
-      maxHeightSnapIndex = _ref3.maxHeightSnapIndex,
+      peekHeights = _ref3.peekHeights,
       isTopPosition = _ref3.isTopPosition,
       setIsTopPosition = _ref3.setIsTopPosition;
+  var maxHeightSnapIndex = peekHeights.length - 1;
 
   if (snapIndex > maxHeightSnapIndex) {
     setIsTopPosition(true);

package/transpiled/react/Viewer/helpers.js

@@ -8,7 +8,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { models, generateWebLink } from 'cozy-client';
-import flag from 'cozy-flags';
 var _models$file = models.file,
     isEncrypted = _models$file.isEncrypted,
     isFromKonnector = _models$file.isFromKonnector,
@@ -16,7 +15,7 @@ var _models$file = models.file,
     hasCertifications = _models$file.hasCertifications,
     normalize = _models$file.normalize;
 export var knownDateMetadataNames = ['AObtentionDate', 'BObtentionDate', 'CObtentionDate', 'DObtentionDate', 'obtentionDate', 'expirationDate', 'referencedDate', 'issueDate', 'shootingDate', 'date', 'datetime'];
-export var knownInformationMetadataNames = flag('mespapiers.migrated.metadata') ? ['number', 'country', 'refTaxIncome', 'contractType', 'noticePeriod'] : ['number', 'cafFileNumber', 'cardNumber', 'vinNumber', 'ibanNumber', 'bicNumber', 'country', 'passportNumber', 'refTaxIncome', 'contractType', 'noticePeriod'];
+export var knownInformationMetadataNames = ['number', 'bicNumber', 'country', 'refTaxIncome', 'contractType', 'noticePeriod'];
 export var knownOtherMetadataNames = ['contact', 'page', 'qualification'];
 export var getCurrentModel = function getCurrentModel(metadataName) {
   if (knownDateMetadataNames.includes(metadataName) || knownInformationMetadataNames.includes(metadataName)) {