Merge branch 'bugfix/ui' of https://github.com/ONLYOFFICE/DocSpace-client into bugfix/ui

packages/client/src/pages/Home/InfoPanel/Body/views/Members/MembersList.js

@@ -91,7 +91,7 @@ const MembersList = (props) => {
 
   const { interfaceDirection } = useTheme();
 
-  const itemsCount = hasNextPage ? members.length + 1 : members.length;
+  const itemsCount = members.length;
 
   const canInviteUserInRoomAbility = security?.EditAccess;
   const [isNextPageLoading, setIsNextPageLoading] = useState(false);

packages/client/src/pages/Home/InfoPanel/Body/views/Members/index.js

@@ -88,7 +88,7 @@ const Members = ({
     });
 
     let hasPrevAdminsTitle =
-      members?.roomId === roomId
+      members?.roomId === roomId && !clearFilter
         ? getHasPrevTitle(members?.administrators, "administration")
         : false;
 
@@ -101,7 +101,7 @@ const Members = ({
     }
 
     let hasPrevUsersTitle =
-      members?.roomId === roomId
+      members?.roomId === roomId && !clearFilter
         ? getHasPrevTitle(members?.users, "user")
         : false;
 
@@ -110,7 +110,7 @@ const Members = ({
     }
 
     let hasPrevExpectedTitle =
-      members?.roomId === roomId
+      members?.roomId === roomId && !clearFilter
         ? getHasPrevTitle(members?.expected, "expected")
         : false;
 
@@ -191,6 +191,7 @@ const Members = ({
     const { users, administrators, expected } = fetchedMembers;
 
     const newMembers = {
+      roomId: roomId,
       administrators: [...members.administrators, ...administrators],
       users: [...members.users, ...users],
       expected: [...members.expected, ...expected],

packages/components/context-menu-button/index.js

@@ -9,7 +9,7 @@ import Backdrop from "../backdrop";
 import Aside from "../aside";
 import Heading from "../heading";
 import Link from "../link";
-import { desktop, isTablet } from "../utils/device";
+import { desktop, isTablet, isMobile } from "../utils/device";
 
 import {
   StyledBodyContent,
@@ -214,7 +214,7 @@ class ContextMenuButton extends React.Component {
             forwardedRef={this.ref}
             clickOutsideAction={this.clickOutsideAction}
             columnCount={columnCount}
-            withBackdrop={isTablet()}
+            withBackdrop={isTablet() || isMobile()}
             zIndex={zIndex}
             isDefaultMode={usePortal}
           >