Merge branch 'develop' into refactoring/global-colors

.yarnrc.yml

@@ -8,4 +8,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-licenses-audit.cjs
     spec: "https://raw.githubusercontent.com/tophat/yarn-plugin-licenses/master/bundles/@yarnpkg/plugin-licenses-audit.js"
 
-yarnPath: .yarn/releases/yarn-4.0.2.cjs
+yarnPath: .yarn/releases/yarn-4.3.0.cjs

package.json

@@ -46,5 +46,5 @@
     "shx": "^0.3.4",
     "terser": "^5.16.6"
   },
-  "packageManager": "yarn@4.0.2"
+  "packageManager": "yarn@4.3.0"
 }

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

@@ -50,9 +50,8 @@ import { Tooltip } from "@docspace/shared/components/tooltip";
 import { isDesktop } from "@docspace/shared/utils";
 import LinksToViewingIconUrl from "PUBLIC_DIR/images/links-to-viewing.react.svg?url";
 import PlusIcon from "PUBLIC_DIR/images/plus.react.svg?url";
-import { ScrollbarContext } from "@docspace/shared/components/scrollbar";
+import ScrollbarContext from "@docspace/shared/components/scrollbar/custom-scrollbar/ScrollbarContext";
 
-import { Avatar } from "@docspace/shared/components/avatar";
 import { copyShareLink } from "@docspace/shared/utils/copy";
 import LinkRow from "./sub-components/LinkRow";
 

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

@@ -38,7 +38,7 @@ import { RowLoader } from "@docspace/shared/skeletons/selector";
 import { isMobile, mobile } from "@docspace/shared/utils";
 import { Text } from "@docspace/shared/components/text";
 import { StyledUserTypeHeader } from "../../../styles/members";
-import { ScrollbarContext } from "@docspace/shared/components/scrollbar";
+import ScrollbarContext from "@docspace/shared/components/scrollbar/custom-scrollbar/ScrollbarContext";
 
 const MainStyles = styled.div`
   #members-list-header {

packages/client/src/pages/PortalSettings/categories/common/index.js

@@ -67,13 +67,6 @@ const TabsCommon = (props) => {
     }
   }, [tReady, isLoadedSubmenu]);
 
-  const load = async () => {
-    const currentTab = getCurrentTab();
-    await loadBaseInfo(
-      !isMobileView ? (currentTab === 0 ? "general" : "branding") : "",
-    );
-  };
-
   const data = [
     {
       id: "general",
@@ -92,6 +85,24 @@ const TabsCommon = (props) => {
     },
   ];
 
+  const getCurrentTabId = () => {
+    const path = location.pathname;
+    const currentTab = data.find((item) => path.includes(item.id));
+    return currentTab !== -1 && data.length ? currentTab.id : data[0].id;
+  };
+
+  const currentTabId = getCurrentTabId();
+
+  const load = async () => {
+    await loadBaseInfo(
+      !isMobileView
+        ? currentTabId === "general"
+          ? "general"
+          : "branding"
+        : "",
+    );
+  };
+
   const onSelect = (e) => {
     navigate(
       combineUrl(
@@ -102,14 +113,6 @@ const TabsCommon = (props) => {
     );
   };
 
-  const getCurrentTabId = () => {
-    const path = location.pathname;
-    const currentTab = data.find((item) => path.includes(item.id));
-    return currentTab !== -1 && data.length ? currentTab.id : data[0].id;
-  };
-
-  const currentTabId = getCurrentTabId();
-
   if (!isLoadedSubmenu) return <LoaderTabs />;
 
   return (

packages/client/src/store/FilesActionsStore.js

@@ -1288,6 +1288,7 @@ class FilesActionStore {
             toastr.success(successTranslation);
           })
           .then(() => setSelected("close"))
+          .then(() => this.moveToRoomsPage())
           .catch((err) => {
             clearActiveOperations(null, items);
             setSecondaryProgressBarData({

packages/shared/components/scrollbar/custom-scrollbar/Scrollbar.tsx

@@ -50,6 +50,7 @@ import {
 } from "./types";
 import * as util from "./util";
 import { isBrowser, renderDivWithRenderer } from "./util";
+import ScrollbarContext from "./ScrollbarContext";
 
 let pageZoomLevel: number = isBrowser ? zoomLevel() : 1;
 if (isBrowser) {
@@ -147,14 +148,7 @@ export type ScrollbarState = {
   isRTL?: boolean;
 };
 
-export type ScrollbarContextValue = { parentScrollbar: Scrollbar | null };
-
-export const ScrollbarContext: React.Context<ScrollbarContextValue> =
-  React.createContext({
-    parentScrollbar: null,
-  } as ScrollbarContextValue);
-
-class Scrollbar extends React.Component<ScrollbarProps, ScrollbarState> {
+export class Scrollbar extends React.Component<ScrollbarProps, ScrollbarState> {
   // eslint-disable-next-line react/static-property-placement
   static contextType = ScrollbarContext;
 

packages/shared/components/scrollbar/custom-scrollbar/ScrollbarContext.tsx

@@ -0,0 +1,39 @@
+// (c) Copyright Ascensio System SIA 2009-2024
+//
+// This program is a free software product.
+// You can redistribute it and/or modify it under the terms
+// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
+// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
+// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
+// any third-party rights.
+//
+// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
+// of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For details, see
+// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+//
+// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
+//
+// The  interactive user interfaces in modified source and object code versions of the Program must
+// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
+//
+// Pursuant to Section 7(b) of the License you must retain the original Product logo when
+// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
+// trademark law for use of our trademarks.
+//
+// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
+// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
+// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+/* eslint-disable no-bitwise */
+/* eslint-disable react/destructuring-assignment */
+/* eslint-disable react/sort-comp */
+"use client";
+import * as React from "react";
+
+export type ScrollbarContextValue = { parentScrollbar: any | null };
+
+const ScrollbarContext: React.Context<ScrollbarContextValue> =
+  React.createContext({
+    parentScrollbar: null,
+  } as ScrollbarContextValue);
+
+export default ScrollbarContext;

packages/shared/components/scrollbar/custom-scrollbar/index.ts

@@ -26,7 +26,7 @@
 
 import Scrollbar, { ScrollbarProps, ScrollbarState } from "./Scrollbar";
 
-export { ScrollbarContext } from "./Scrollbar";
+// export { ScrollbarContext } from "./Scrollbar";
 
 export { Scrollbar };
 

packages/shared/components/scrollbar/index.tsx

@@ -28,7 +28,7 @@
 
 import { ScrollbarType } from "./Scrollbar.enums";
 import { ScrollbarComponent as Scrollbar } from "./Scrollbar";
-import { ScrollbarContext } from "./custom-scrollbar";
+// import { ScrollbarContext } from "./custom-scrollbar";
 import {
   CustomScrollbarsVirtualList,
   CustomScrollbarsVirtualListWithAutoFocus,
@@ -41,5 +41,5 @@ export {
   ScrollbarType,
   CustomScrollbarsVirtualList,
   CustomScrollbarsVirtualListWithAutoFocus,
-  ScrollbarContext,
+  // ScrollbarContext,
 };