cozy-sharing 31.0.2 → 31.2.0

package/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [31.2.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@31.1.0...cozy-sharing@31.2.0) (2026-05-12)
+
+### Bug Fixes
+
+- Avoid blinking recipient in share modals ([8e71bc8](https://github.com/cozy/cozy-libs/commit/8e71bc8e6a924340100247523f75d2c18912739a))
+
+### Features
+
+- Add usePendingRecipients hook ([7f8a96e](https://github.com/cozy/cozy-libs/commit/7f8a96eb35044fb6d001bf7460a84ceda34fa130))
+- Delete special shared folder recipient management ([6691c99](https://github.com/cozy/cozy-libs/commit/6691c99f698b1db6b537f5ac0a0ab69303986501))
+- Implement usePendingRecipients for FederatedFolder modal ([3564cb9](https://github.com/cozy/cozy-libs/commit/3564cb9aba9647fc63870d433cd80cf119e749ae))
+- Implement usePendingRecipients for SharedDriveForm ([129a033](https://github.com/cozy/cozy-libs/commit/129a03369a6be34ec829b74d838245e66edab4de))
+- Implement usePendingRecipients for ShareDialogCozyToCozy modal ([2d5d4c2](https://github.com/cozy/cozy-libs/commit/2d5d4c2c1419e50c9f24f8cbca0cb547d1d6bb0d))
+- Update CozyToCozy dialog to new UI and wording ([e1ec36b](https://github.com/cozy/cozy-libs/commit/e1ec36b363d88e940b42f54b281485a236775263))
+- Update ShareTypeSelect UI ([515aab4](https://github.com/cozy/cozy-libs/commit/515aab437afa502dcacd1debb932794017519845))
+
+# [31.1.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@31.0.2...cozy-sharing@31.1.0) (2026-05-07)
+
+### Bug Fixes
+
+- Autoclose sharing link permission menu ([82f6b62](https://github.com/cozy/cozy-libs/commit/82f6b62c78232805150e8c927955bb7eeb108ad4))
+- Fix hover issue in link recipient text ([dce027c](https://github.com/cozy/cozy-libs/commit/dce027c16eecf8f3309da73a1dd01d537a2cef47))
+
+### Features
+
+- Revoke member or group with button instead of action ([3fa0c4d](https://github.com/cozy/cozy-libs/commit/3fa0c4d3035d57fa65e231fbbddc5b06955b3ecb))
+- Update permission menu UI ([bc0c0ad](https://github.com/cozy/cozy-libs/commit/bc0c0ade86d86e82299397c09cdc5f4c19c1c4ac))
+- Update SharedDriveForm UI ([b3ab3ff](https://github.com/cozy/cozy-libs/commit/b3ab3ffd3881ccae74c1e3486706e7c108ed151b))
+- Update SharedDriveForm wording ([c46750b](https://github.com/cozy/cozy-libs/commit/c46750be56cbc0c99b2c3f46b069d361cadddb82))
+
 ## [31.0.2](https://github.com/cozy/cozy-libs/compare/cozy-sharing@31.0.1...cozy-sharing@31.0.2) (2026-05-07)
 
 ### Bug Fixes

package/dist/components/FederatedFolder/DumbFederatedFolderModal.js

@@ -6,19 +6,19 @@ import { DumbBatchSharedFolderModal } from '../SharedFolder/DumbBatchSharedFolde
 export var DumbFederatedFolderModal = withLocales(function (_ref) {
   var title = _ref.title,
       document = _ref.document,
-      createContact = _ref.createContact,
       recipients = _ref.recipients,
-      readOnlyRecipients = _ref.readOnlyRecipients,
       currentRecipients = _ref.currentRecipients,
       onRevoke = _ref.onRevoke,
-      onSetType = _ref.onSetType,
       onSend = _ref.onSend,
       onClose = _ref.onClose,
-      onShare = _ref.onShare,
       sharingLink = _ref.sharingLink,
       showShareByEmail = _ref.showShareByEmail,
       autoOpenShareRestriction = _ref.autoOpenShareRestriction,
-      showGenerateLinkButton = _ref.showGenerateLinkButton;
+      showGenerateLinkButton = _ref.showGenerateLinkButton,
+      pendingRecipients = _ref.pendingRecipients,
+      onPendingRecipientsChange = _ref.onPendingRecipientsChange,
+      selectedOption = _ref.selectedOption,
+      onSelectedOptionChange = _ref.onSelectedOptionChange;
 
   var _useI18n = useI18n(),
       t = _useI18n.t;
@@ -26,40 +26,39 @@ export var DumbFederatedFolderModal = withLocales(function (_ref) {
   return /*#__PURE__*/React.createElement(DumbBatchSharedFolderModal, {
     title: title,
     document: document,
-    createContact: createContact,
     recipients: recipients,
-    readOnlyRecipients: readOnlyRecipients,
     currentRecipients: currentRecipients,
     onRevoke: onRevoke,
-    onSetType: onSetType,
     onSend: onSend,
     onClose: onClose,
-    onShare: onShare,
     sharingLink: sharingLink,
     showNameField: false,
     addPeopleLabel: t('FederatedFolder.addPeople'),
-    addButtonLabel: t('FederatedFolder.add'),
     shareLabel: t('FederatedFolder.share'),
     showShareByEmail: showShareByEmail,
     autoOpenShareRestriction: autoOpenShareRestriction,
-    showGenerateLinkButton: showGenerateLinkButton
+    showGenerateLinkButton: showGenerateLinkButton,
+    pendingRecipients: pendingRecipients,
+    onPendingRecipientsChange: onPendingRecipientsChange,
+    selectedOption: selectedOption,
+    onSelectedOptionChange: onSelectedOptionChange
   });
 });
 DumbFederatedFolderModal.propTypes = {
   title: PropTypes.string,
   document: PropTypes.object,
-  createContact: PropTypes.func.isRequired,
   recipients: PropTypes.array,
-  readOnlyRecipients: PropTypes.array,
   currentRecipients: PropTypes.array,
   onRevoke: PropTypes.func.isRequired,
-  onSetType: PropTypes.func.isRequired,
   onSend: PropTypes.func.isRequired,
   onClose: PropTypes.func.isRequired,
-  onShare: PropTypes.func.isRequired,
   sharingLink: PropTypes.string,
   showShareByEmail: PropTypes.bool,
   autoOpenShareRestriction: PropTypes.bool,
-  showGenerateLinkButton: PropTypes.bool
+  showGenerateLinkButton: PropTypes.bool,
+  pendingRecipients: PropTypes.array.isRequired,
+  onPendingRecipientsChange: PropTypes.func.isRequired,
+  selectedOption: PropTypes.oneOf(['readWrite', 'readOnly']).isRequired,
+  onSelectedOptionChange: PropTypes.func.isRequired
 };
 export default DumbFederatedFolderModal;

package/dist/components/FederatedFolder/FederatedFolderModal.js

@@ -1,16 +1,16 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import PropTypes from 'prop-types';
-import React, { useState, useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useClient } from 'cozy-client';
 import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert';
 import { useI18n } from 'twake-i18n';
 import { DumbFederatedFolderModal } from './DumbFederatedFolderModal';
+import { getOrCreateFromArray } from '../../helpers/contacts';
 import withLocales from '../../hoc/withLocales';
+import { usePendingRecipients } from '../../hooks/usePendingRecipients';
 import { useSharingContext } from '../../hooks/useSharingContext';
-import { formatRecipients, mergeAndDeduplicateRecipients, moveRecipientToReadWrite, moveRecipientToReadOnly, RECIPIENT_INDEX_PREFIX } from '../SharedDrive/helpers';
 export var FederatedFolderModal = withLocales(function (_ref) {
   var onClose = _ref.onClose,
       existingDocument = _ref.document,
@@ -39,6 +39,33 @@ export var FederatedFolderModal = withLocales(function (_ref) {
       sharingLink = _useState2[0],
       setSharingLink = _useState2[1];
 
+  var _usePendingRecipients = usePendingRecipients(),
+      pendingRecipients = _usePendingRecipients.pendingRecipients,
+      setPendingRecipients = _usePendingRecipients.setPendingRecipients,
+      selectedOption = _usePendingRecipients.selectedOption,
+      setSelectedOption = _usePendingRecipients.setSelectedOption; // share from CozyProvider is wired to callbacks and realtime that
+  // makes existingDocument and existingRecipients reactive to changes.
+  // But we want it to be reactive only when we revoke a member. When we add member
+  // we close the popup and we do not want to see briefly the new contacts added
+  // in members before the modal closes. That's why when clicking on "Share"
+  // we do not use the reactive existingDocument and existingRecipients.
+
+
+  var _useState3 = useState(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      isSending = _useState4[0],
+      setIsSending = _useState4[1];
+
+  var _useState5 = useState(null),
+      _useState6 = _slicedToArray(_useState5, 2),
+      frozenDoc = _useState6[0],
+      setFrozenDoc = _useState6[1];
+
+  var _useState7 = useState(null),
+      _useState8 = _slicedToArray(_useState7, 2),
+      frozenRecipients = _useState8[0],
+      setFrozenRecipients = _useState8[1];
+
   var documentPermissions = existingDocument ? getDocumentPermissions(existingDocument._id) : [];
   useEffect(function () {
     var fetchSharingLink = /*#__PURE__*/function () {
@@ -86,68 +113,75 @@ export var FederatedFolderModal = withLocales(function (_ref) {
 
     fetchSharingLink();
   }, [existingDocument, documentPermissions, getFederatedShareLink, getSharingLink, getOwner, getSharingById]);
-
-  var _useState3 = useState({
-    recipients: [],
-    readOnlyRecipients: []
-  }),
-      _useState4 = _slicedToArray(_useState3, 2),
-      federatedRecipients = _useState4[0],
-      setFederatedRecipients = _useState4[1];
-
-  var _useState5 = useState((existingDocument === null || existingDocument === void 0 ? void 0 : existingDocument.name) || ''),
-      _useState6 = _slicedToArray(_useState5, 1),
-      folderName = _useState6[0];
-
-  var onShare = function onShare(params) {
-    setFederatedRecipients(function (prev) {
-      return {
-        recipients: mergeAndDeduplicateRecipients([prev.recipients, params.recipients || []]),
-        readOnlyRecipients: mergeAndDeduplicateRecipients([prev.readOnlyRecipients, params.readOnlyRecipients || []])
-      };
-    });
-  };
+  var folderName = (existingDocument === null || existingDocument === void 0 ? void 0 : existingDocument.name) || '';
 
   var onSend = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      var contacts, readWriteRecipients, readOnlyRecipients;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context2.prev = 0;
-            _context2.next = 3;
+            if (!(pendingRecipients.length === 0)) {
+              _context2.next = 3;
+              break;
+            }
+
+            onClose();
+            return _context2.abrupt("return");
+
+          case 3:
+            setIsSending(true);
+            setFrozenDoc(existingDocument);
+            setFrozenRecipients(existingRecipients);
+            _context2.prev = 6;
+            _context2.next = 9;
+            return getOrCreateFromArray(client, pendingRecipients, function (contact) {
+              return client.create('io.cozy.contacts', contact);
+            });
+
+          case 9:
+            contacts = _context2.sent;
+            readWriteRecipients = selectedOption === 'readOnly' ? [] : contacts;
+            readOnlyRecipients = selectedOption === 'readOnly' ? contacts : [];
+            _context2.next = 14;
             return share({
               description: folderName,
               document: existingDocument,
-              recipients: federatedRecipients.recipients,
-              readOnlyRecipients: federatedRecipients.readOnlyRecipients,
+              recipients: readWriteRecipients,
+              readOnlyRecipients: readOnlyRecipients,
               sharedDrive: true,
               openSharing: false
             });
 
-          case 3:
+          case 14:
             showAlert({
               message: t('FederatedFolder.successNotification'),
               severity: 'success',
               variant: 'filled'
             });
             onClose();
-            _context2.next = 10;
+            _context2.next = 21;
             break;
 
-          case 7:
-            _context2.prev = 7;
-            _context2.t0 = _context2["catch"](0);
+          case 18:
+            _context2.prev = 18;
+            _context2.t0 = _context2["catch"](6);
             showAlert({
               message: t('FederatedFolder.errorNotification'),
               severity: 'error',
               variant: 'filled'
             });
 
-          case 10:
+          case 21:
+            _context2.prev = 21;
+            setIsSending(false);
+            return _context2.finish(21);
+
+          case 24:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[0, 7]]);
+      }, _callee2, null, [[6, 18, 21, 24]]);
     }));
 
     return function onSend() {
@@ -155,86 +189,27 @@ export var FederatedFolderModal = withLocales(function (_ref) {
     };
   }();
 
-  var onSetType = function onSetType(index, newType) {
-    var _id = index.split(RECIPIENT_INDEX_PREFIX)[1];
-
-    if (newType === 'two-way') {
-      setFederatedRecipients(function (prev) {
-        return moveRecipientToReadWrite(prev, _id);
-      });
-    } else {
-      setFederatedRecipients(function (prev) {
-        return moveRecipientToReadOnly(prev, _id);
-      });
-    }
-  };
-
-  var onRevoke = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(documentOrIndex, sharingId, memberIndex) {
-      var _id;
-
-      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
-          case 0:
-            if (!(typeof documentOrIndex === 'string' && documentOrIndex.startsWith(RECIPIENT_INDEX_PREFIX))) {
-              _context3.next = 5;
-              break;
-            }
-
-            _id = documentOrIndex.split(RECIPIENT_INDEX_PREFIX)[1];
-            setFederatedRecipients(function (prev) {
-              return {
-                recipients: prev.recipients.filter(function (r) {
-                  return r._id !== _id;
-                }),
-                readOnlyRecipients: prev.readOnlyRecipients.filter(function (r) {
-                  return r._id !== _id;
-                })
-              };
-            });
-            _context3.next = 7;
-            break;
-
-          case 5:
-            _context3.next = 7;
-            return revoke(documentOrIndex, sharingId, memberIndex);
-
-          case 7:
-          case "end":
-            return _context3.stop();
-        }
-      }, _callee3);
-    }));
-
-    return function onRevoke(_x, _x2, _x3) {
-      return _ref4.apply(this, arguments);
-    };
-  }();
-
   var existingRecipients = existingDocument ? getRecipients(existingDocument._id) : [];
-  var recipients = [].concat(_toConsumableArray(existingRecipients), _toConsumableArray(formatRecipients(federatedRecipients)));
   var modalTitle = t('FederatedFolder.shareTitle', {
     name: folderName
   });
   var isSharedDrive = Boolean(existingDocument === null || existingDocument === void 0 ? void 0 : existingDocument.driveId);
   return /*#__PURE__*/React.createElement(DumbFederatedFolderModal, {
     title: modalTitle,
-    document: existingDocument,
-    createContact: function createContact(contact) {
-      return client.create('io.cozy.contacts', contact);
-    },
-    recipients: recipients,
-    readOnlyRecipients: federatedRecipients.readOnlyRecipients,
-    currentRecipients: existingRecipients,
-    onRevoke: onRevoke,
-    onSetType: onSetType,
+    document: isSending ? frozenDoc : existingDocument,
+    recipients: isSending ? frozenRecipients : existingRecipients,
+    currentRecipients: isSending ? frozenRecipients : existingRecipients,
+    onRevoke: revoke,
     onSend: onSend,
     onClose: onClose,
-    onShare: onShare,
     sharingLink: sharingLink,
     showShareByEmail: !isSharedDrive,
     autoOpenShareRestriction: autoOpenShareRestriction,
-    showGenerateLinkButton: showGenerateLinkButton
+    showGenerateLinkButton: showGenerateLinkButton,
+    pendingRecipients: pendingRecipients,
+    onPendingRecipientsChange: setPendingRecipients,
+    selectedOption: selectedOption,
+    onSelectedOptionChange: setSelectedOption
   });
 });
 FederatedFolderModal.propTypes = {