From dfde71420f6ee682c243b1b5e3dd80e8976aa27a Mon Sep 17 00:00:00 2001
From: Alexey Safronov <Alexey.Safronov@onlyoffice.com>
Date: Fri, 5 Apr 2024 12:43:02 +0400
Subject: [PATCH 1/2] Fix Bug 67229 - Files. Loader animation does not work on
 macOS in Safari.

---
 .../loader/sub-components/Track.tsx           | 75 +++++++++++++++----
 1 file changed, 60 insertions(+), 15 deletions(-)

diff --git a/packages/shared/components/loader/sub-components/Track.tsx b/packages/shared/components/loader/sub-components/Track.tsx
index eebb75b328..38b55b6d16 100644
--- a/packages/shared/components/loader/sub-components/Track.tsx
+++ b/packages/shared/components/loader/sub-components/Track.tsx
@@ -126,37 +126,82 @@ const Track = ({
         <path
           d="M 0,-100 A 100,100 0 0,1 86.6,-50"
           stroke={`url(#spinner-color-${id}-1)`}
-        />
+        >
+          <animateTransform
+            from="0 0 0"
+            to="360 0 0"
+            attributeName="transform"
+            type="rotate"
+            repeatCount="indefinite"
+            dur="1300ms"
+          />
+        </path>
         <path
           d="M 86.6,-50 A 100,100 0 0,1 86.6,50"
           stroke={`url(#spinner-color-${id}-2)`}
-        />
+        >
+          <animateTransform
+            from="0 0 0"
+            to="360 0 0"
+            attributeName="transform"
+            type="rotate"
+            repeatCount="indefinite"
+            dur="1300ms"
+          />
+        </path>
         <path
           d="M 86.6,50 A 100,100 0 0,1 0,100"
           stroke={`url(#spinner-color-${id}-3)`}
-        />
+        >
+          <animateTransform
+            from="0 0 0"
+            to="360 0 0"
+            attributeName="transform"
+            type="rotate"
+            repeatCount="indefinite"
+            dur="1300ms"
+          />
+        </path>
         <path
           d="M 0,100 A 100,100 0 0,1 -86.6,50"
           stroke={`url(#spinner-color-${id}-4)`}
-        />
+        >
+          <animateTransform
+            from="0 0 0"
+            to="360 0 0"
+            attributeName="transform"
+            type="rotate"
+            repeatCount="indefinite"
+            dur="1300ms"
+          />
+        </path>
         <path
           d="M -86.6,50 A 100,100 0 0,1 -86.6,-50"
           stroke={`url(#spinner-color-${id}-5)`}
-        />
+        >
+          <animateTransform
+            from="0 0 0"
+            to="360 0 0"
+            attributeName="transform"
+            type="rotate"
+            repeatCount="indefinite"
+            dur="1300ms"
+          />
+        </path>
         <path
           d="M -86.6,-50 A 100,100 0 0,1 0,-100"
           stroke={`url(#spinner-color-${id}-6)`}
-        />
+        >
+          <animateTransform
+            from="0 0 0"
+            to="360 0 0"
+            attributeName="transform"
+            type="rotate"
+            repeatCount="indefinite"
+            dur="1300ms"
+          />
+        </path>
       </g>
-
-      <animateTransform
-        from="0 0 0"
-        to="360 0 0"
-        attributeName="transform"
-        type="rotate"
-        repeatCount="indefinite"
-        dur="1300ms"
-      />
     </StyledTrack>
   );
 };

From 03e0c78187e8fee9a702408505eba069836664ba Mon Sep 17 00:00:00 2001
From: Aleksandr Lushkin <aleksandr.lushkin@onlyoffice.com>
Date: Fri, 5 Apr 2024 11:32:23 +0200
Subject: [PATCH 2/2] Client: Accounts: Fix showing wrong context menu by
 clicking on right mouse button or context menu button

---
 packages/client/src/HOCs/withPeopleContent.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/HOCs/withPeopleContent.js b/packages/client/src/HOCs/withPeopleContent.js
index d44b78301e..e246f0d62e 100644
--- a/packages/client/src/HOCs/withPeopleContent.js
+++ b/packages/client/src/HOCs/withPeopleContent.js
@@ -62,8 +62,8 @@ export default function withContent(WrappedContent) {
     ) => {
       if (isContextClick) {
         checked
-          ? setBufferSelection(user, addToSelection)
-          : setBufferSelection(null);
+          ? setBufferSelection(null)
+          : setBufferSelection(user, addToSelection);
         return;
       }