Merge branch 'hotfix/v2.5.1' into develop

packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/TagInput/TagDropdown.js

@@ -93,6 +93,7 @@ const TagDropdown = ({
         heightTablet={32}
         key={i}
         label={tag}
+        onMouseDown={preventDefault}
         onClick={() => addFetchedTag(tag)}
       />
     ));

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

@@ -71,6 +71,7 @@ const Members = ({
   setExternalLink,
   withPublicRoomBlock,
   fetchMembers,
+  fetchMoreMembers,
   membersIsLoading,
   searchValue,
   searchResultIsLoading,
@@ -96,19 +97,7 @@ const Members = ({
   }, [infoPanelSelection, searchValue]);
 
   const loadNextPage = async () => {
-    const roomId = infoPanelSelection.id;
+    await fetchMoreMembers(t, withoutTitlesAndLinks);
-    const fetchedMembers = await fetchMembers(t, false, withoutTitlesAndLinks);
-    const { users, administrators, expected, groups } = fetchedMembers;
-
-    const newMembers = {
-      roomId: roomId,
-      administrators: [...infoPanelMembers.administrators, ...administrators],
-      users: [...infoPanelMembers.users, ...users],
-      expected: [...infoPanelMembers.expected, ...expected],
-      groups: [...infoPanelMembers.groups, ...groups],
-    };
-
-    setInfoPanelMembers(newMembers);
   };
 
   if (membersIsLoading) return <InfoPanelViewLoader view="members" />;
@@ -301,6 +290,7 @@ export default inject(
       infoPanelMembers,
       setInfoPanelMembers,
       fetchMembers,
+      fetchMoreMembers,
       membersIsLoading,
       withPublicRoomBlock,
       searchValue,
@@ -344,6 +334,7 @@ export default inject(
       setExternalLink,
       withPublicRoomBlock,
       fetchMembers,
+      fetchMoreMembers,
       membersIsLoading,
       searchValue,
       searchResultIsLoading,

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

@@ -89,7 +89,7 @@ const MembersList = (props) => {
   });
 
   const listOfTitles = list
-    .filter((x) => x.props.isTitle)
+    .filter((x) => x.props.user?.isTitle)
     .map((item) => {
       return {
         displayName: item.props.user.displayName,

packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/RowView/userContent.js

@@ -47,7 +47,7 @@ const StyledRowContent = styled(RowContent)`
 
     .badges {
       flex-direction: row-reverse;
-      margin-top: 10px;
+
       margin-inline-end: 12px;
 
       .paid-badge {

packages/client/src/pages/Home/Section/AccountsBody/People/RowView/userContent.js

@@ -46,7 +46,7 @@ const StyledRowContent = styled(RowContent)`
 
     .badges {
       flex-direction: row-reverse;
-      margin-top: 9px;
+
       margin-inline-end: 12px;
 
       .paid-badge {

packages/client/src/store/InfoPanelStore.js

@@ -133,8 +133,10 @@ class InfoPanelStore {
   };
 
   setSearchValue = (value) => {
+    if (value !== this.searchValue) {
       this.setSearchResultIsLoading(true);
       this.searchValue = value;
+    }
   };
 
   resetSearch = () => {
@@ -651,6 +653,38 @@ class InfoPanelStore {
     };
   };
 
+  fetchMoreMembers = async (t, withoutTitles) => {
+    const roomId = this.infoPanelSelection.id;
+    const oldMembers = this.infoPanelMembers;
+
+    const data = await this.filesStore.getRoomMembers(roomId, false);
+
+    const newMembers = this.convertMembers(t, data, false, true);
+
+    const mergedMembers = {
+      roomId: roomId,
+      administrators: [
+        ...oldMembers.administrators,
+        ...newMembers.administrators,
+      ],
+      users: [...oldMembers.users, ...newMembers.users],
+      expected: [...oldMembers.expected, ...newMembers.expectedMembers],
+      groups: [...oldMembers.groups, ...newMembers.groups],
+    };
+
+    if (!withoutTitles) {
+      this.addMembersTitle(
+        t,
+        mergedMembers.administrators,
+        mergedMembers.users,
+        mergedMembers.expected,
+        mergedMembers.groups,
+      );
+    }
+
+    this.setInfoPanelMembers(mergedMembers);
+  };
+
   addInfoPanelMembers = (t, members) => {
     const convertedMembers = this.convertMembers(t, members);
 

packages/doceditor/src/components/Root.tsx

@@ -63,6 +63,8 @@ const Root = ({
   fileId,
   hash,
 }: TResponse) => {
+  const editorRef = React.useRef<null | HTMLElement>(null);
+
   const documentserverUrl = config?.editorUrl ?? error?.editorUrl;
   const fileInfo = config?.file;
 
@@ -141,9 +143,19 @@ const Root = ({
       isSharingDialogVisible ||
       isVisibleSelectFolderDialog ||
       selectFileDialogVisible
-    )
+    ) {
       calculateAsideHeight();
 
+      const activeElement = document.activeElement as HTMLElement | null;
+
+      if (activeElement && activeElement.tagName === "IFRAME") {
+        editorRef.current = activeElement;
+        activeElement.blur();
+      }
+    } else if (editorRef.current) {
+      editorRef.current.focus();
+    }
+
     if (isSharingDialogVisible) {
       setTimeout(calculateAsideHeight, 10);
     }

packages/shared/utils/image-flags.ts

@@ -52,6 +52,7 @@ import RoReactSvgUrl from "PUBLIC_DIR/images/flags/ro.react.svg?url";
 import RuReactSvgUrl from "PUBLIC_DIR/images/flags/ru.react.svg?url";
 import SkReactSvgUrl from "PUBLIC_DIR/images/flags/sk.react.svg?url";
 import SlReactSvgUrl from "PUBLIC_DIR/images/flags/sl.react.svg?url";
+import SiReactSvgUrl from "PUBLIC_DIR/images/flags/si.react.svg?url";
 import SrLatnRSReactSvgUrl from "PUBLIC_DIR/images/flags/sr-Latn-RS.react.svg?url";
 import TrReactSvgUrl from "PUBLIC_DIR/images/flags/tr.react.svg?url";
 import UkUAReactSvgUrl from "PUBLIC_DIR/images/flags/uk-UA.react.svg?url";
@@ -87,6 +88,7 @@ export const flagsIcons = new Map([
   ["ru.react.svg", RuReactSvgUrl],
   ["sk.react.svg", SkReactSvgUrl],
   ["sl.react.svg", SlReactSvgUrl],
+  ["si.react.svg", SiReactSvgUrl],
   ["sr-Latn-RS.react.svg", SrLatnRSReactSvgUrl],
   ["tr.react.svg", TrReactSvgUrl],
   ["uk-UA.react.svg", UkUAReactSvgUrl],