cozy-sharing 28.11.2 → 29.0.0

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [29.0.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@28.11.3...cozy-sharing@29.0.0) (2026-03-24)
+
+### Features
+
+- **cozy-ui-plus:** Upgrade cozy-ui ([b01d192](https://github.com/cozy/cozy-libs/commit/b01d1926f00a81ff2eb2c0b03378ea06fefd5fcc))
+
+### BREAKING CHANGES
+
+- **cozy-ui-plus:** You must have `cozy-ui >= 138.1.0`
+
+## [28.11.3](https://github.com/cozy/cozy-libs/compare/cozy-sharing@28.11.2...cozy-sharing@28.11.3) (2026-03-23)
+
+### Bug Fixes
+
+- **cozy-sharing:** Accumulate recipients in federated folder sharing ([a626ee4](https://github.com/cozy/cozy-libs/commit/a626ee4793486d1dcdb5e419a59f39caee6f09f7))
+- **cozy-sharing:** Normalize recipient id in dedup helper ([6bd9292](https://github.com/cozy/cozy-libs/commit/6bd9292ef50f01307f6bfb335812dfc4ecce5c25))
+- Remove warning on cozy-flags missing dependency ([25f9864](https://github.com/cozy/cozy-libs/commit/25f98641a5f9c1f22fa759abe7382d422d4567ef))
+
 ## [28.11.2](https://github.com/cozy/cozy-libs/compare/cozy-sharing@28.11.1...cozy-sharing@28.11.2) (2026-03-18)
 
 ### Bug Fixes

package/dist/components/FederatedFolder/FederatedFolderModal.js

@@ -10,7 +10,7 @@ import { useI18n } from 'twake-i18n';
 import { DumbFederatedFolderModal } from './DumbFederatedFolderModal';
 import withLocales from '../../hoc/withLocales';
 import { useSharingContext } from '../../hooks/useSharingContext';
-import { formatRecipients, moveRecipientToReadWrite, moveRecipientToReadOnly, RECIPIENT_INDEX_PREFIX } from '../SharedDrive/helpers';
+import { formatRecipients, mergeAndDeduplicateRecipients, moveRecipientToReadWrite, moveRecipientToReadOnly, RECIPIENT_INDEX_PREFIX } from '../SharedDrive/helpers';
 export var FederatedFolderModal = withLocales(function (_ref) {
   var onClose = _ref.onClose,
       existingDocument = _ref.document;
@@ -98,9 +98,11 @@ export var FederatedFolderModal = withLocales(function (_ref) {
       folderName = _useState6[0];
 
   var onShare = function onShare(params) {
-    setFederatedRecipients({
-      recipients: params.recipients || [],
-      readOnlyRecipients: params.readOnlyRecipients || []
+    setFederatedRecipients(function (prev) {
+      return {
+        recipients: mergeAndDeduplicateRecipients([prev.recipients, params.recipients || []]),
+        readOnlyRecipients: mergeAndDeduplicateRecipients([prev.readOnlyRecipients, params.readOnlyRecipients || []])
+      };
     });
   };
 

package/dist/components/FederatedFolder/FederatedFolderModal.spec.js

@@ -68,15 +68,33 @@ jest.mock('./DumbFederatedFolderModal', function () {
           return onShare({
             recipients: [{
               _id: 'r1',
+              id: 'r1',
               displayName: 'Alice'
             }],
             readOnlyRecipients: [{
               _id: 'r2',
+              id: 'r2',
               displayName: 'Bob'
             }]
           });
         }
       }, "Share"), /*#__PURE__*/React.createElement("button", {
+        "data-testid": "btn-share-other",
+        onClick: function onClick() {
+          return onShare({
+            recipients: [{
+              _id: 'r1',
+              id: 'r1',
+              displayName: 'Alice'
+            }, {
+              _id: 'r3',
+              id: 'r3',
+              displayName: 'Charlie'
+            }],
+            readOnlyRecipients: []
+          });
+        }
+      }, "Share Other"), /*#__PURE__*/React.createElement("button", {
         "data-testid": "btn-send",
         onClick: onSend
       }, "Send"), /*#__PURE__*/React.createElement("button", {
@@ -285,17 +303,49 @@ describe('FederatedFolderModal', function () {
         }
       }, _callee5);
     })));
-  });
-  describe('onSend callback', function () {
-    it('should call share with correct parameters', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
+    it('should accumulate recipients when onShare is called multiple times', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
       var _setup6, getByTestId;
 
       return _regeneratorRuntime.wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
-            mockShare.mockResolvedValueOnce({});
             _setup6 = setup(), getByTestId = _setup6.getByTestId;
-            _context6.next = 4;
+            _context6.next = 3;
+            return waitFor(function () {
+              expect(getByTestId('recipients-count').textContent).toBe('0');
+            });
+
+          case 3:
+            fireEvent.click(getByTestId('btn-share'));
+            _context6.next = 6;
+            return waitFor(function () {
+              expect(getByTestId('recipients-count').textContent).toBe('2');
+            });
+
+          case 6:
+            fireEvent.click(getByTestId('btn-share-other'));
+            _context6.next = 9;
+            return waitFor(function () {
+              expect(getByTestId('recipients-count').textContent).toBe('3');
+            });
+
+          case 9:
+          case "end":
+            return _context6.stop();
+        }
+      }, _callee6);
+    })));
+  });
+  describe('onSend callback', function () {
+    it('should call share with correct parameters', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
+      var _setup7, getByTestId;
+
+      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
+          case 0:
+            mockShare.mockResolvedValueOnce({});
+            _setup7 = setup(), getByTestId = _setup7.getByTestId;
+            _context7.next = 4;
             return waitFor(function () {
               expect(getByTestId('btn-send')).toBeTruthy();
             });
@@ -303,17 +353,19 @@ describe('FederatedFolderModal', function () {
           case 4:
             fireEvent.click(getByTestId('btn-share'));
             fireEvent.click(getByTestId('btn-send'));
-            _context6.next = 8;
+            _context7.next = 8;
             return waitFor(function () {
               expect(mockShare).toHaveBeenCalledWith({
                 description: 'My Test Folder',
                 document: mockDocument,
                 recipients: [{
                   _id: 'r1',
+                  id: 'r1',
                   displayName: 'Alice'
                 }],
                 readOnlyRecipients: [{
                   _id: 'r2',
+                  id: 'r2',
                   displayName: 'Bob'
                 }],
                 sharedDrive: true,
@@ -323,26 +375,26 @@ describe('FederatedFolderModal', function () {
 
           case 8:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
-      }, _callee6);
+      }, _callee7);
     })));
-    it('should show success alert and close modal on successful share', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
-      var _setup7, getByTestId;
+    it('should show success alert and close modal on successful share', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
+      var _setup8, getByTestId;
 
-      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
+      return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
           case 0:
             mockShare.mockResolvedValueOnce({});
-            _setup7 = setup(), getByTestId = _setup7.getByTestId;
-            _context7.next = 4;
+            _setup8 = setup(), getByTestId = _setup8.getByTestId;
+            _context8.next = 4;
             return waitFor(function () {
               expect(getByTestId('btn-send')).toBeTruthy();
             });
 
           case 4:
             fireEvent.click(getByTestId('btn-send'));
-            _context7.next = 7;
+            _context8.next = 7;
             return waitFor(function () {
               expect(mockShowAlert).toHaveBeenCalledWith({
                 message: 'Folder has been shared',
@@ -354,26 +406,26 @@ describe('FederatedFolderModal', function () {
 
           case 7:
           case "end":
-            return _context7.stop();
+            return _context8.stop();
         }
-      }, _callee7);
+      }, _callee8);
     })));
-    it('should show error alert when share fails', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
-      var _setup8, getByTestId;
+    it('should show error alert when share fails', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
+      var _setup9, getByTestId;
 
-      return _regeneratorRuntime.wrap(function _callee8$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+      return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
           case 0:
             mockShare.mockRejectedValueOnce(new Error('Share failed'));
-            _setup8 = setup(), getByTestId = _setup8.getByTestId;
-            _context8.next = 4;
+            _setup9 = setup(), getByTestId = _setup9.getByTestId;
+            _context9.next = 4;
             return waitFor(function () {
               expect(getByTestId('btn-send')).toBeTruthy();
             });
 
           case 4:
             fireEvent.click(getByTestId('btn-send'));
-            _context8.next = 7;
+            _context9.next = 7;
             return waitFor(function () {
               expect(mockShowAlert).toHaveBeenCalledWith({
                 message: 'Error while sharing folder',
@@ -385,20 +437,20 @@ describe('FederatedFolderModal', function () {
 
           case 7:
           case "end":
-            return _context8.stop();
+            return _context9.stop();
         }
-      }, _callee8);
+      }, _callee9);
     })));
   });
   describe('onSetType callback', function () {
-    it('should move recipient from readOnlyRecipients to recipients when setting two-way', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
-      var _setup9, getByTestId;
+    it('should move recipient from readOnlyRecipients to recipients when setting two-way', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
+      var _setup10, getByTestId;
 
-      return _regeneratorRuntime.wrap(function _callee9$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
+      return _regeneratorRuntime.wrap(function _callee10$(_context10) {
+        while (1) switch (_context10.prev = _context10.next) {
           case 0:
-            _setup9 = setup(), getByTestId = _setup9.getByTestId;
-            _context9.next = 3;
+            _setup10 = setup(), getByTestId = _setup10.getByTestId;
+            _context10.next = 3;
             return waitFor(function () {
               expect(getByTestId('btn-share')).toBeTruthy();
             });
@@ -406,7 +458,7 @@ describe('FederatedFolderModal', function () {
           case 3:
             fireEvent.click(getByTestId('btn-share')); // After btn-share: combined recipients = 2 (1 readWrite + 1 readOnly)
 
-            _context9.next = 6;
+            _context10.next = 6;
             return waitFor(function () {
               expect(getByTestId('recipients-count').textContent).toBe('2');
               expect(getByTestId('readOnly-recipients-count').textContent).toBe('1');
@@ -415,7 +467,7 @@ describe('FederatedFolderModal', function () {
           case 6:
             fireEvent.click(getByTestId('btn-set-type-two-way')); // After setting two-way: Bob moves from readOnlyRecipients to recipients
 
-            _context9.next = 9;
+            _context10.next = 9;
             return waitFor(function () {
               expect(getByTestId('recipients-count').textContent).toBe('2');
               expect(getByTestId('readOnly-recipients-count').textContent).toBe('0');
@@ -423,18 +475,18 @@ describe('FederatedFolderModal', function () {
 
           case 9:
           case "end":
-            return _context9.stop();
+            return _context10.stop();
         }
-      }, _callee9);
+      }, _callee10);
     })));
-    it('should move recipient from recipients to readOnlyRecipients when setting one-way', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
-      var _setup10, getByTestId;
+    it('should move recipient from recipients to readOnlyRecipients when setting one-way', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11() {
+      var _setup11, getByTestId;
 
-      return _regeneratorRuntime.wrap(function _callee10$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
+      return _regeneratorRuntime.wrap(function _callee11$(_context11) {
+        while (1) switch (_context11.prev = _context11.next) {
           case 0:
-            _setup10 = setup(), getByTestId = _setup10.getByTestId;
-            _context10.next = 3;
+            _setup11 = setup(), getByTestId = _setup11.getByTestId;
+            _context11.next = 3;
             return waitFor(function () {
               expect(getByTestId('btn-share')).toBeTruthy();
             });
@@ -442,7 +494,7 @@ describe('FederatedFolderModal', function () {
           case 3:
             fireEvent.click(getByTestId('btn-share')); // After btn-share: combined recipients = 2 (1 readWrite + 1 readOnly)
 
-            _context10.next = 6;
+            _context11.next = 6;
             return waitFor(function () {
               expect(getByTestId('recipients-count').textContent).toBe('2');
               expect(getByTestId('readOnly-recipients-count').textContent).toBe('1');
@@ -452,7 +504,7 @@ describe('FederatedFolderModal', function () {
             fireEvent.click(getByTestId('btn-set-type-one-way')); // After setting one-way: Alice moves from recipients to readOnlyRecipients
             // Combined count stays at 2, but readOnlyRecipients increases from 1 to 2
 
-            _context10.next = 9;
+            _context11.next = 9;
             return waitFor(function () {
               expect(getByTestId('recipients-count').textContent).toBe('2');
               expect(getByTestId('readOnly-recipients-count').textContent).toBe('2');
@@ -460,54 +512,54 @@ describe('FederatedFolderModal', function () {
 
           case 9:
           case "end":
-            return _context10.stop();
+            return _context11.stop();
         }
-      }, _callee10);
+      }, _callee11);
     })));
   });
   describe('onRevoke callback', function () {
-    it('should remove recipient from both lists', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11() {
-      var _setup11, getByTestId;
+    it('should remove recipient from both lists', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
+      var _setup12, getByTestId;
 
-      return _regeneratorRuntime.wrap(function _callee11$(_context11) {
-        while (1) switch (_context11.prev = _context11.next) {
+      return _regeneratorRuntime.wrap(function _callee12$(_context12) {
+        while (1) switch (_context12.prev = _context12.next) {
           case 0:
-            _setup11 = setup(), getByTestId = _setup11.getByTestId;
-            _context11.next = 3;
+            _setup12 = setup(), getByTestId = _setup12.getByTestId;
+            _context12.next = 3;
             return waitFor(function () {
               expect(getByTestId('btn-share')).toBeTruthy();
             });
 
           case 3:
             fireEvent.click(getByTestId('btn-share'));
-            _context11.next = 6;
+            _context12.next = 6;
             return waitFor(function () {
               expect(getByTestId('recipients-count').textContent).toBe('2');
             });
 
           case 6:
             fireEvent.click(getByTestId('btn-revoke'));
-            _context11.next = 9;
+            _context12.next = 9;
             return waitFor(function () {
               expect(getByTestId('recipients-count').textContent).toBe('1');
             });
 
           case 9:
           case "end":
-            return _context11.stop();
+            return _context12.stop();
         }
-      }, _callee11);
+      }, _callee12);
     })));
   });
   describe('onClose callback', function () {
-    it('should call onClose when close button is clicked', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
-      var _setup12, getByTestId;
+    it('should call onClose when close button is clicked', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
+      var _setup13, getByTestId;
 
-      return _regeneratorRuntime.wrap(function _callee12$(_context12) {
-        while (1) switch (_context12.prev = _context12.next) {
+      return _regeneratorRuntime.wrap(function _callee13$(_context13) {
+        while (1) switch (_context13.prev = _context13.next) {
           case 0:
-            _setup12 = setup(), getByTestId = _setup12.getByTestId;
-            _context12.next = 3;
+            _setup13 = setup(), getByTestId = _setup13.getByTestId;
+            _context13.next = 3;
             return waitFor(function () {
               expect(getByTestId('btn-close')).toBeTruthy();
             });
@@ -518,9 +570,9 @@ describe('FederatedFolderModal', function () {
 
           case 5:
           case "end":
-            return _context12.stop();
+            return _context13.stop();
         }
-      }, _callee12);
+      }, _callee13);
     })));
   });
   describe('existing recipients', function () {
@@ -541,54 +593,54 @@ describe('FederatedFolderModal', function () {
       sharingId: 'abc',
       memberIndex: 1
     }];
-    it('should display existing recipients from getRecipients', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
-      var _setup13, getByTestId;
+    it('should display existing recipients from getRecipients', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14() {
+      var _setup14, getByTestId;
 
-      return _regeneratorRuntime.wrap(function _callee13$(_context13) {
-        while (1) switch (_context13.prev = _context13.next) {
+      return _regeneratorRuntime.wrap(function _callee14$(_context14) {
+        while (1) switch (_context14.prev = _context14.next) {
           case 0:
             mockGetRecipients.mockReturnValue(existingRecipients);
-            _setup13 = setup(), getByTestId = _setup13.getByTestId;
-            _context13.next = 4;
+            _setup14 = setup(), getByTestId = _setup14.getByTestId;
+            _context14.next = 4;
             return waitFor(function () {
               expect(getByTestId('recipients-count').textContent).toBe('2');
             });
 
           case 4:
           case "end":
-            return _context13.stop();
+            return _context14.stop();
         }
-      }, _callee13);
+      }, _callee14);
     })));
-    it('should pass existing recipients as currentRecipients', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14() {
-      var _setup14, getByTestId;
+    it('should pass existing recipients as currentRecipients', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15() {
+      var _setup15, getByTestId;
 
-      return _regeneratorRuntime.wrap(function _callee14$(_context14) {
-        while (1) switch (_context14.prev = _context14.next) {
+      return _regeneratorRuntime.wrap(function _callee15$(_context15) {
+        while (1) switch (_context15.prev = _context15.next) {
           case 0:
             mockGetRecipients.mockReturnValue(existingRecipients);
-            _setup14 = setup(), getByTestId = _setup14.getByTestId;
-            _context14.next = 4;
+            _setup15 = setup(), getByTestId = _setup15.getByTestId;
+            _context15.next = 4;
             return waitFor(function () {
               expect(getByTestId('recipients-count').textContent).toBe('2');
             });
 
           case 4:
           case "end":
-            return _context14.stop();
+            return _context15.stop();
         }
-      }, _callee14);
+      }, _callee15);
     })));
-    it('should call revoke for existing member', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15() {
-      var _setup15, getByTestId;
+    it('should call revoke for existing member', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16() {
+      var _setup16, getByTestId;
 
-      return _regeneratorRuntime.wrap(function _callee15$(_context15) {
-        while (1) switch (_context15.prev = _context15.next) {
+      return _regeneratorRuntime.wrap(function _callee16$(_context16) {
+        while (1) switch (_context16.prev = _context16.next) {
           case 0:
             mockGetRecipients.mockReturnValue(existingRecipients);
             mockRevoke.mockResolvedValueOnce({});
-            _setup15 = setup(), getByTestId = _setup15.getByTestId;
-            _context15.next = 5;
+            _setup16 = setup(), getByTestId = _setup16.getByTestId;
+            _context16.next = 5;
             return waitFor(function () {
               expect(getByTestId('dumb-modal')).toBeTruthy();
             });
@@ -596,7 +648,7 @@ describe('FederatedFolderModal', function () {
           case 5:
             // Simulate revoke of an existing member (non-virtual-shared-drive index)
             fireEvent.click(getByTestId('btn-revoke-existing'));
-            _context15.next = 8;
+            _context16.next = 8;
             return waitFor(function () {
               expect(mockRevoke).toHaveBeenCalledWith({
                 _id: 'folder-123'
@@ -605,27 +657,27 @@ describe('FederatedFolderModal', function () {
 
           case 8:
           case "end":
-            return _context15.stop();
+            return _context16.stop();
         }
-      }, _callee15);
+      }, _callee16);
     })));
   });
   describe('createContact callback', function () {
-    it('should call client.create when creating a contact', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16() {
-      var _setup16, getByTestId;
+    it('should call client.create when creating a contact', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee17() {
+      var _setup17, getByTestId;
 
-      return _regeneratorRuntime.wrap(function _callee16$(_context16) {
-        while (1) switch (_context16.prev = _context16.next) {
+      return _regeneratorRuntime.wrap(function _callee17$(_context17) {
+        while (1) switch (_context17.prev = _context17.next) {
           case 0:
-            _setup16 = setup(), getByTestId = _setup16.getByTestId;
-            _context16.next = 3;
+            _setup17 = setup(), getByTestId = _setup17.getByTestId;
+            _context17.next = 3;
             return waitFor(function () {
               expect(getByTestId('btn-create-contact')).toBeTruthy();
             });
 
           case 3:
             fireEvent.click(getByTestId('btn-create-contact'));
-            _context16.next = 6;
+            _context17.next = 6;
             return waitFor(function () {
               expect(client.create).toHaveBeenCalledWith('io.cozy.contacts', {
                 email: 'test@example.com'
@@ -634,9 +686,9 @@ describe('FederatedFolderModal', function () {
 
           case 6:
           case "end":
-            return _context16.stop();
+            return _context17.stop();
         }
-      }, _callee16);
+      }, _callee17);
     })));
   });
 });

package/dist/components/SharedDrive/helpers.js

@@ -1,18 +1,41 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 import { models } from 'cozy-client';
 var ContactModel = models.contact;
 export var RECIPIENT_INDEX_PREFIX = 'virtual-shared-drive-sharing-';
 export var mergeAndDeduplicateRecipients = function mergeAndDeduplicateRecipients(arrays) {
-  var combinedArray = arrays.flat();
+  var combinedArray = arrays.flat().map(function (item) {
+    return _objectSpread(_objectSpread({}, item), {}, {
+      id: item.id || item._id
+    });
+  });
   var seenIds = new Set();
-  var uniqueArray = combinedArray.filter(function (item) {
-    if (!seenIds.has(item.id)) {
-      seenIds.add(item.id);
-      return true;
+  var uniqueArray = combinedArray.reduce(function (acc, item) {
+    var id = item.id || item._id;
+
+    if (id == null) {
+      // Recipients without any identifier are kept as-is to avoid silent data loss
+      acc.push(item);
+      return acc;
     }
 
-    return false;
-  });
+    if (!seenIds.has(id)) {
+      seenIds.add(id); // Ensure both id and _id exist for downstream compatibility
+
+      var normalizedItem = !item.id || !item._id ? _objectSpread(_objectSpread({}, item), {}, {
+        id: item.id || item._id,
+        _id: item._id || item.id
+      }) : item;
+      acc.push(normalizedItem);
+    }
+
+    return acc;
+  }, []);
   return uniqueArray;
 };
 export var moveRecipientToReadWrite = function moveRecipientToReadWrite(federatedRecipients, _id) {

package/dist/components/SharedDrive/helpers.spec.js

@@ -0,0 +1,208 @@
+import { mergeAndDeduplicateRecipients, moveRecipientToReadWrite, moveRecipientToReadOnly, formatRecipients, RECIPIENT_INDEX_PREFIX } from './helpers';
+describe('mergeAndDeduplicateRecipients', function () {
+  it('should merge multiple arrays into one', function () {
+    var result = mergeAndDeduplicateRecipients([[{
+      id: '1',
+      name: 'Alice'
+    }], [{
+      id: '2',
+      name: 'Bob'
+    }]]);
+    expect(result).toEqual([{
+      id: '1',
+      _id: '1',
+      name: 'Alice'
+    }, {
+      id: '2',
+      _id: '2',
+      name: 'Bob'
+    }]);
+  });
+  it('should deduplicate recipients with the same id', function () {
+    var result = mergeAndDeduplicateRecipients([[{
+      id: '1',
+      name: 'Alice'
+    }], [{
+      id: '1',
+      name: 'Alice'
+    }]]);
+    expect(result).toEqual([{
+      id: '1',
+      _id: '1',
+      name: 'Alice'
+    }]);
+  });
+  it('should normalize _id to id for deduplication', function () {
+    var result = mergeAndDeduplicateRecipients([[{
+      _id: '1',
+      name: 'Alice'
+    }], [{
+      _id: '2',
+      name: 'Bob'
+    }]]);
+    expect(result).toEqual([{
+      _id: '1',
+      id: '1',
+      name: 'Alice'
+    }, {
+      _id: '2',
+      id: '2',
+      name: 'Bob'
+    }]);
+  });
+  it('should deduplicate recipients when one has id and the other has _id', function () {
+    var result = mergeAndDeduplicateRecipients([[{
+      id: '1',
+      name: 'Alice'
+    }], [{
+      _id: '1',
+      name: 'Alice'
+    }]]);
+    expect(result).toEqual([{
+      id: '1',
+      _id: '1',
+      name: 'Alice'
+    }]);
+  });
+  it('should prefer existing id over _id when both are present', function () {
+    var result = mergeAndDeduplicateRecipients([[{
+      id: 'real-id',
+      _id: 'other-id',
+      name: 'Alice'
+    }]]);
+    expect(result).toEqual([{
+      id: 'real-id',
+      _id: 'other-id',
+      name: 'Alice'
+    }]);
+  });
+  it('should handle empty arrays', function () {
+    var result = mergeAndDeduplicateRecipients([[], []]);
+    expect(result).toEqual([]);
+  });
+});
+describe('moveRecipientToReadWrite', function () {
+  it('should move a recipient from readOnly to readWrite', function () {
+    var state = {
+      recipients: [{
+        _id: '1',
+        name: 'Alice'
+      }],
+      readOnlyRecipients: [{
+        _id: '2',
+        name: 'Bob'
+      }]
+    };
+    var result = moveRecipientToReadWrite(state, '2');
+    expect(result.recipients).toEqual([{
+      _id: '1',
+      name: 'Alice'
+    }, {
+      _id: '2',
+      name: 'Bob'
+    }]);
+    expect(result.readOnlyRecipients).toEqual([]);
+  });
+  it('should return unchanged state if recipient not found', function () {
+    var state = {
+      recipients: [{
+        _id: '1',
+        name: 'Alice'
+      }],
+      readOnlyRecipients: []
+    };
+    var result = moveRecipientToReadWrite(state, '999');
+    expect(result).toBe(state);
+  });
+});
+describe('moveRecipientToReadOnly', function () {
+  it('should move a recipient from readWrite to readOnly', function () {
+    var state = {
+      recipients: [{
+        _id: '1',
+        name: 'Alice'
+      }],
+      readOnlyRecipients: [{
+        _id: '2',
+        name: 'Bob'
+      }]
+    };
+    var result = moveRecipientToReadOnly(state, '1');
+    expect(result.recipients).toEqual([]);
+    expect(result.readOnlyRecipients).toEqual([{
+      _id: '2',
+      name: 'Bob'
+    }, {
+      _id: '1',
+      name: 'Alice'
+    }]);
+  });
+  it('should return unchanged state if recipient not found', function () {
+    var state = {
+      recipients: [],
+      readOnlyRecipients: [{
+        _id: '1',
+        name: 'Alice'
+      }]
+    };
+    var result = moveRecipientToReadOnly(state, '999');
+    expect(result).toBe(state);
+  });
+});
+describe('formatRecipients', function () {
+  it('should format readWrite and readOnly recipients with correct types', function () {
+    var input = {
+      recipients: [{
+        _id: '1',
+        displayName: 'Alice',
+        email: [{
+          address: 'alice@example.com',
+          primary: true
+        }]
+      }],
+      readOnlyRecipients: [{
+        _id: '2',
+        displayName: 'Bob',
+        email: [{
+          address: 'bob@example.com',
+          primary: true
+        }]
+      }]
+    };
+    var result = formatRecipients(input);
+    expect(result).toHaveLength(2);
+    expect(result[0]).toMatchObject({
+      index: "".concat(RECIPIENT_INDEX_PREFIX, "1"),
+      type: 'two-way',
+      public_name: 'Alice'
+    });
+    expect(result[1]).toMatchObject({
+      index: "".concat(RECIPIENT_INDEX_PREFIX, "2"),
+      type: 'one-way',
+      public_name: 'Bob'
+    });
+  });
+  it('should sort recipients by public_name', function () {
+    var input = {
+      recipients: [{
+        _id: '1',
+        displayName: 'Zara',
+        email: [{
+          address: 'zara@example.com',
+          primary: true
+        }]
+      }, {
+        _id: '2',
+        displayName: 'Alice',
+        email: [{
+          address: 'alice@example.com',
+          primary: true
+        }]
+      }],
+      readOnlyRecipients: []
+    };
+    var result = formatRecipients(input);
+    expect(result[0].public_name).toBe('Alice');
+    expect(result[1].public_name).toBe('Zara');
+  });
+});

package/dist/components/__snapshots__/SharedStatus.spec.js.snap

@@ -3,7 +3,7 @@
 exports[`SharedStatus component should display the link if there is a link 1`] = `
 <div>
   <div
-    class="TwakeTheme--light-normal u-dc"
+    class="TwakeTheme--light u-dc"
   >
     <span
       class="shared-status"
@@ -47,7 +47,7 @@ exports[`SharedStatus component should display the link if there is a link 1`] =
 exports[`SharedStatus component should have the right display if there is several recipients 1`] = `
 <div>
   <div
-    class="TwakeTheme--light-normal u-dc"
+    class="TwakeTheme--light u-dc"
   >
     <span
       class="shared-status"
@@ -84,7 +84,7 @@ exports[`SharedStatus component should have the right display if there is severa
 exports[`SharedStatus component should just render a span if no sharing 1`] = `
 <div>
   <div
-    class="TwakeTheme--light-normal u-dc"
+    class="TwakeTheme--light u-dc"
   >
     <span
       class="shared-status"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "28.11.2",
+  "version": "29.0.0",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -59,7 +59,7 @@
     "cozy-intent": "^2.31.1",
     "cozy-minilog": "^3.10.1",
     "cozy-ui": "^135.0.0",
-    "cozy-ui-plus": "^5.3.1",
+    "cozy-ui-plus": "^6.0.0",
     "jest": "30.3.0",
     "jest-environment-jsdom": "30.3.0",
     "react": "16.12.0",
@@ -71,6 +71,7 @@
   "peerDependencies": {
     "cozy-client": ">=60.22.0",
     "cozy-device-helper": ">=3.7.1",
+    "cozy-flags": ">=4.8.1",
     "cozy-intent": ">=2.29.1",
     "cozy-minilog": ">=3.9.1",
     "cozy-ui": ">=135.0.0",
@@ -83,5 +84,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "71eb651f7f5d805b8ac0af2f74cdc754d01395e2"
+  "gitHead": "4c152ef7f2acafb450df245f5ce58638cbdb6be3"
 }

package/src/components/FederatedFolder/FederatedFolderModal.jsx

@@ -10,6 +10,7 @@ import withLocales from '../../hoc/withLocales'
 import { useSharingContext } from '../../hooks/useSharingContext'
 import {
   formatRecipients,
+  mergeAndDeduplicateRecipients,
   moveRecipientToReadWrite,
   moveRecipientToReadOnly,
   RECIPIENT_INDEX_PREFIX
@@ -66,10 +67,16 @@ export const FederatedFolderModal = withLocales(
     const [folderName] = useState(existingDocument?.name || '')
 
     const onShare = params => {
-      setFederatedRecipients({
-        recipients: params.recipients || [],
-        readOnlyRecipients: params.readOnlyRecipients || []
-      })
+      setFederatedRecipients(prev => ({
+        recipients: mergeAndDeduplicateRecipients([
+          prev.recipients,
+          params.recipients || []
+        ]),
+        readOnlyRecipients: mergeAndDeduplicateRecipients([
+          prev.readOnlyRecipients,
+          params.readOnlyRecipients || []
+        ])
+      }))
     }
 
     const onSend = async () => {

package/src/components/FederatedFolder/FederatedFolderModal.spec.jsx

@@ -55,13 +55,27 @@ jest.mock('./DumbFederatedFolderModal', () => ({
         data-testid="btn-share"
         onClick={() =>
           onShare({
-            recipients: [{ _id: 'r1', displayName: 'Alice' }],
-            readOnlyRecipients: [{ _id: 'r2', displayName: 'Bob' }]
+            recipients: [{ _id: 'r1', id: 'r1', displayName: 'Alice' }],
+            readOnlyRecipients: [{ _id: 'r2', id: 'r2', displayName: 'Bob' }]
           })
         }
       >
         Share
       </button>
+      <button
+        data-testid="btn-share-other"
+        onClick={() =>
+          onShare({
+            recipients: [
+              { _id: 'r1', id: 'r1', displayName: 'Alice' },
+              { _id: 'r3', id: 'r3', displayName: 'Charlie' }
+            ],
+            readOnlyRecipients: []
+          })
+        }
+      >
+        Share Other
+      </button>
       <button data-testid="btn-send" onClick={onSend}>
         Send
       </button>
@@ -213,6 +227,26 @@ describe('FederatedFolderModal', () => {
         expect(getByTestId('recipients-count').textContent).toBe('2')
       })
     })
+
+    it('should accumulate recipients when onShare is called multiple times', async () => {
+      const { getByTestId } = setup()
+
+      await waitFor(() => {
+        expect(getByTestId('recipients-count').textContent).toBe('0')
+      })
+
+      fireEvent.click(getByTestId('btn-share'))
+
+      await waitFor(() => {
+        expect(getByTestId('recipients-count').textContent).toBe('2')
+      })
+
+      fireEvent.click(getByTestId('btn-share-other'))
+
+      await waitFor(() => {
+        expect(getByTestId('recipients-count').textContent).toBe('3')
+      })
+    })
   })
 
   describe('onSend callback', () => {
@@ -231,8 +265,8 @@ describe('FederatedFolderModal', () => {
         expect(mockShare).toHaveBeenCalledWith({
           description: 'My Test Folder',
           document: mockDocument,
-          recipients: [{ _id: 'r1', displayName: 'Alice' }],
-          readOnlyRecipients: [{ _id: 'r2', displayName: 'Bob' }],
+          recipients: [{ _id: 'r1', id: 'r1', displayName: 'Alice' }],
+          readOnlyRecipients: [{ _id: 'r2', id: 'r2', displayName: 'Bob' }],
           sharedDrive: true,
           openSharing: false
         })

package/src/components/SharedDrive/helpers.js

@@ -5,17 +5,34 @@ const ContactModel = models.contact
 export const RECIPIENT_INDEX_PREFIX = 'virtual-shared-drive-sharing-'
 
 export const mergeAndDeduplicateRecipients = arrays => {
-  const combinedArray = arrays.flat()
+  const combinedArray = arrays.flat().map(item => ({
+    ...item,
+    id: item.id || item._id
+  }))
 
   const seenIds = new Set()
 
-  const uniqueArray = combinedArray.filter(item => {
-    if (!seenIds.has(item.id)) {
-      seenIds.add(item.id)
-      return true
+  const uniqueArray = combinedArray.reduce((acc, item) => {
+    const id = item.id || item._id
+
+    if (id == null) {
+      // Recipients without any identifier are kept as-is to avoid silent data loss
+      acc.push(item)
+      return acc
     }
-    return false
-  })
+
+    if (!seenIds.has(id)) {
+      seenIds.add(id)
+      // Ensure both id and _id exist for downstream compatibility
+      const normalizedItem =
+        !item.id || !item._id
+          ? { ...item, id: item.id || item._id, _id: item._id || item.id }
+          : item
+      acc.push(normalizedItem)
+    }
+
+    return acc
+  }, [])
 
   return uniqueArray
 }

package/src/components/SharedDrive/helpers.spec.js

@@ -0,0 +1,161 @@
+import {
+  mergeAndDeduplicateRecipients,
+  moveRecipientToReadWrite,
+  moveRecipientToReadOnly,
+  formatRecipients,
+  RECIPIENT_INDEX_PREFIX
+} from './helpers'
+
+describe('mergeAndDeduplicateRecipients', () => {
+  it('should merge multiple arrays into one', () => {
+    const result = mergeAndDeduplicateRecipients([
+      [{ id: '1', name: 'Alice' }],
+      [{ id: '2', name: 'Bob' }]
+    ])
+    expect(result).toEqual([
+      { id: '1', _id: '1', name: 'Alice' },
+      { id: '2', _id: '2', name: 'Bob' }
+    ])
+  })
+
+  it('should deduplicate recipients with the same id', () => {
+    const result = mergeAndDeduplicateRecipients([
+      [{ id: '1', name: 'Alice' }],
+      [{ id: '1', name: 'Alice' }]
+    ])
+    expect(result).toEqual([{ id: '1', _id: '1', name: 'Alice' }])
+  })
+
+  it('should normalize _id to id for deduplication', () => {
+    const result = mergeAndDeduplicateRecipients([
+      [{ _id: '1', name: 'Alice' }],
+      [{ _id: '2', name: 'Bob' }]
+    ])
+    expect(result).toEqual([
+      { _id: '1', id: '1', name: 'Alice' },
+      { _id: '2', id: '2', name: 'Bob' }
+    ])
+  })
+
+  it('should deduplicate recipients when one has id and the other has _id', () => {
+    const result = mergeAndDeduplicateRecipients([
+      [{ id: '1', name: 'Alice' }],
+      [{ _id: '1', name: 'Alice' }]
+    ])
+    expect(result).toEqual([{ id: '1', _id: '1', name: 'Alice' }])
+  })
+
+  it('should prefer existing id over _id when both are present', () => {
+    const result = mergeAndDeduplicateRecipients([
+      [{ id: 'real-id', _id: 'other-id', name: 'Alice' }]
+    ])
+    expect(result).toEqual([{ id: 'real-id', _id: 'other-id', name: 'Alice' }])
+  })
+
+  it('should handle empty arrays', () => {
+    const result = mergeAndDeduplicateRecipients([[], []])
+    expect(result).toEqual([])
+  })
+})
+
+describe('moveRecipientToReadWrite', () => {
+  it('should move a recipient from readOnly to readWrite', () => {
+    const state = {
+      recipients: [{ _id: '1', name: 'Alice' }],
+      readOnlyRecipients: [{ _id: '2', name: 'Bob' }]
+    }
+    const result = moveRecipientToReadWrite(state, '2')
+    expect(result.recipients).toEqual([
+      { _id: '1', name: 'Alice' },
+      { _id: '2', name: 'Bob' }
+    ])
+    expect(result.readOnlyRecipients).toEqual([])
+  })
+
+  it('should return unchanged state if recipient not found', () => {
+    const state = {
+      recipients: [{ _id: '1', name: 'Alice' }],
+      readOnlyRecipients: []
+    }
+    const result = moveRecipientToReadWrite(state, '999')
+    expect(result).toBe(state)
+  })
+})
+
+describe('moveRecipientToReadOnly', () => {
+  it('should move a recipient from readWrite to readOnly', () => {
+    const state = {
+      recipients: [{ _id: '1', name: 'Alice' }],
+      readOnlyRecipients: [{ _id: '2', name: 'Bob' }]
+    }
+    const result = moveRecipientToReadOnly(state, '1')
+    expect(result.recipients).toEqual([])
+    expect(result.readOnlyRecipients).toEqual([
+      { _id: '2', name: 'Bob' },
+      { _id: '1', name: 'Alice' }
+    ])
+  })
+
+  it('should return unchanged state if recipient not found', () => {
+    const state = {
+      recipients: [],
+      readOnlyRecipients: [{ _id: '1', name: 'Alice' }]
+    }
+    const result = moveRecipientToReadOnly(state, '999')
+    expect(result).toBe(state)
+  })
+})
+
+describe('formatRecipients', () => {
+  it('should format readWrite and readOnly recipients with correct types', () => {
+    const input = {
+      recipients: [
+        {
+          _id: '1',
+          displayName: 'Alice',
+          email: [{ address: 'alice@example.com', primary: true }]
+        }
+      ],
+      readOnlyRecipients: [
+        {
+          _id: '2',
+          displayName: 'Bob',
+          email: [{ address: 'bob@example.com', primary: true }]
+        }
+      ]
+    }
+    const result = formatRecipients(input)
+    expect(result).toHaveLength(2)
+    expect(result[0]).toMatchObject({
+      index: `${RECIPIENT_INDEX_PREFIX}1`,
+      type: 'two-way',
+      public_name: 'Alice'
+    })
+    expect(result[1]).toMatchObject({
+      index: `${RECIPIENT_INDEX_PREFIX}2`,
+      type: 'one-way',
+      public_name: 'Bob'
+    })
+  })
+
+  it('should sort recipients by public_name', () => {
+    const input = {
+      recipients: [
+        {
+          _id: '1',
+          displayName: 'Zara',
+          email: [{ address: 'zara@example.com', primary: true }]
+        },
+        {
+          _id: '2',
+          displayName: 'Alice',
+          email: [{ address: 'alice@example.com', primary: true }]
+        }
+      ],
+      readOnlyRecipients: []
+    }
+    const result = formatRecipients(input)
+    expect(result[0].public_name).toBe('Alice')
+    expect(result[1].public_name).toBe('Zara')
+  })
+})

package/src/components/__snapshots__/SharedStatus.spec.js.snap

@@ -3,7 +3,7 @@
 exports[`SharedStatus component should display the link if there is a link 1`] = `
 <div>
   <div
-    class="TwakeTheme--light-normal u-dc"
+    class="TwakeTheme--light u-dc"
   >
     <span
       class="shared-status"
@@ -47,7 +47,7 @@ exports[`SharedStatus component should display the link if there is a link 1`] =
 exports[`SharedStatus component should have the right display if there is several recipients 1`] = `
 <div>
   <div
-    class="TwakeTheme--light-normal u-dc"
+    class="TwakeTheme--light u-dc"
   >
     <span
       class="shared-status"
@@ -84,7 +84,7 @@ exports[`SharedStatus component should have the right display if there is severa
 exports[`SharedStatus component should just render a span if no sharing 1`] = `
 <div>
   <div
-    class="TwakeTheme--light-normal u-dc"
+    class="TwakeTheme--light u-dc"
   >
     <span
       class="shared-status"