Merge hotfix/v3.0.4 into master

2025-04-18 13:44:09 +03:00 · 2025-02-21 08:52:15 +00:00 · 2025-02-21 08:52:15 +00:00 · 1eccd0ef6b
commit 1eccd0ef6b
parent 75798eb1e3 3e8334b64d
13 changed files with 42 additions and 37 deletions
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "docspace",
-  "version": "3.0.1",
+  "version": "3.0.4",
  "private": true,
  "workspaces": {
    "packages": [
--- a/packages/client/package.json
+++ b/packages/client/package.json
@ -1,6 +1,6 @@
 {
  "name": "@docspace/client",
-  "version": "3.0.1",
+  "version": "3.0.4",
  "private": true,
  "homepage": "",
  "scripts": {
--- a/packages/client/src/store/ContextOptionsStore.js
+++ b/packages/client/src/store/ContextOptionsStore.js
@ -87,11 +87,7 @@ import { isMobile, isMobileOnly, isTablet } from "react-device-detect";
 import config from "PACKAGE_FILE";
 import { toastr } from "@docspace/shared/components/toast";
 import { combineUrl } from "@docspace/shared/utils/combineUrl";
-import {
-  isDesktop,
-  isLockedSharedRoom,
-  trimSeparator,
-} from "@docspace/shared/utils";
+import { isLockedSharedRoom, trimSeparator } from "@docspace/shared/utils";
 import { getDefaultAccessUser } from "@docspace/shared/utils/getDefaultAccessUser";
 import { copyShareLink } from "@docspace/shared/utils/copy";
 import {
@ -2573,21 +2569,19 @@ class ContextOptionsStore {
      });
    }

-    const formActions = isDesktop()
-      ? [
-          {
-            id: "personal_form-template",
-            icon: FormReactSvgUrl,
-            label: t("Translations:NewForm"),
-            key: "new-form-base",
-            items: [
-              createTemplateForm,
-              createTemplateNewFormFile,
-              templateOformsGallery,
-            ],
-          },
-        ]
-      : [createTemplateForm, createTemplateNewFormFile, templateOformsGallery];
+    const formActions = [
+      {
+        id: "personal_form-template",
+        icon: FormReactSvgUrl,
+        label: t("Translations:NewForm"),
+        key: "new-form-base",
+        items: [
+          createTemplateForm,
+          createTemplateNewFormFile,
+          templateOformsGallery,
+        ],
+      },
+    ];

    const showUploadFolder = !(isMobile || isTablet);
    const options = isRoomsFolder
--- a/packages/doceditor/package.json
+++ b/packages/doceditor/package.json
@ -1,6 +1,6 @@
 {
  "name": "@docspace/doceditor",
-  "version": "3.0.1",
+  "version": "3.0.4",
  "private": true,
  "scripts": {
    "build": "node ./scripts/buildTranslations.js && next build",
@ -13,7 +13,7 @@
    "deploy": "node ./scripts/deploy.js"
  },
  "dependencies": {
-    "@onlyoffice/document-editor-react": "^1.5.1",
+    "@onlyoffice/document-editor-react": "^1.6.0",
    "@serdnam/pino-cloudwatch-transport": "^1.0.4",
    "i18next": "^20.6.1",
    "moment": "^2.30.1",
--- a/packages/doceditor/src/app/(root)/page.tsx
+++ b/packages/doceditor/src/app/(root)/page.tsx
@ -182,7 +182,11 @@ async function Page({ searchParams }: RootPageProps) {
    <>
      <Root {...data} shareKey={share} />
      {url && (
-        <Script id="editor-api" strategy="beforeInteractive" src={docApiUrl} />
+        <Script
+          id="onlyoffice-api-script"
+          strategy="beforeInteractive"
+          src={docApiUrl}
+        />
      )}
    </>
  );
--- a/packages/doceditor/src/components/Editor.tsx
+++ b/packages/doceditor/src/components/Editor.tsx
@ -280,7 +280,7 @@ const Editor = ({
    newConfig.events.onRequestSharingSettings = onSDKRequestSharingSettings;
  }

-  if (!fileInfo?.providerKey) {
+  if (!fileInfo?.providerKey && user) {
    newConfig.events.onRequestReferenceData = onSDKRequestReferenceData;

    if (!IS_ZOOM) {
--- a/packages/login/package.json
+++ b/packages/login/package.json
@ -1,6 +1,6 @@
 {
  "name": "@docspace/login",
-  "version": "3.0.1",
+  "version": "3.0.4",
  "private": true,
  "scripts": {
    "build": "node ./scripts/buildTranslations.js && next build",
--- a/packages/management/package.json
+++ b/packages/management/package.json
@ -1,6 +1,6 @@
 {
  "name": "@docspace/management",
-  "version": "3.0.1",
+  "version": "3.0.4",
  "private": true,
  "homepage": "/management",
  "scripts": {
--- a/packages/shared/components/context-menu/ContextMenu.tsx
+++ b/packages/shared/components/context-menu/ContextMenu.tsx
@ -108,6 +108,7 @@ const ContextMenu = React.forwardRef<ContextMenuRefType, ContextMenuProps>(
      withBackdrop,
      model: propsModel,
      badgeUrl,
+      headerOnlyMobile = false,
    } = props;

    const onMenuClick = () => {
@ -454,6 +455,7 @@ const ContextMenu = React.forwardRef<ContextMenuRefType, ContextMenuProps>(
      const withHeader = !!header?.title;
      const defaultIcon = !!header?.color;
      const isCoverExist = !!header?.cover;
+      const isHeaderMobileSubMenu = headerOnlyMobile && showMobileMenu;

      return (
        <StyledContextMenu
@ -461,7 +463,7 @@ const ContextMenu = React.forwardRef<ContextMenuRefType, ContextMenuProps>(
          articleWidth={articleWidth}
          isRoom={isRoom}
          fillIcon={fillIcon}
-          isIconExist={isIconExist}
+          isIconExist={isIconExist || isHeaderMobileSubMenu}
          data-testid="context-menu"
          isCoverExist={isCoverExist}
        >
@ -484,9 +486,9 @@ const ContextMenu = React.forwardRef<ContextMenuRefType, ContextMenuProps>(
              onClick={onMenuClick}
              onMouseEnter={onMenuMouseEnter}
            >
-              {changeView && withHeader && (
+              {changeView && (withHeader || isHeaderMobileSubMenu) && (
                <div className="contextmenu-header">
-                  {isIconExist &&
+                  {(isIconExist || isHeaderMobileSubMenu) &&
                    (showMobileMenu ? (
                      <IconButton
                        className="edit_icon"
--- a/packages/shared/components/context-menu/ContextMenu.types.ts
+++ b/packages/shared/components/context-menu/ContextMenu.types.ts
@ -161,6 +161,7 @@ export interface ContextMenuProps {
  isArchive?: boolean;
  ref?: React.RefObject<HTMLDivElement>;
  badgeUrl?: string;
+  headerOnlyMobile?: boolean;
 }

 export type TContextMenuRef = {
--- a/packages/shared/components/navigation/sub-components/PlusBtn.tsx
+++ b/packages/shared/components/navigation/sub-components/PlusBtn.tsx
@ -31,6 +31,7 @@ import PlusReactSvgUrl from "PUBLIC_DIR/images/icons/17/plus.svg?url";
 import { IconButton } from "../../icon-button";
 import { ContextMenu, TContextMenuRef } from "../../context-menu";
 import { IPlusButtonProps } from "../Navigation.types";
+import { isMobile } from "../../../utils";

 const PlusButton = ({
  className,
@ -85,6 +86,9 @@ const PlusButton = ({
        scaled={false}
        // directionX="right"
        leftOffset={isFrame ? 190 : 150}
+        headerOnlyMobile
+        ignoreChangeView
+        withBackdrop={isMobile()}
      />
    </div>
  );
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@ -1,6 +1,6 @@
 {
  "name": "@docspace/shared",
-  "version": "3.0.1",
+  "version": "3.0.4",
  "private": true,
  "scripts": {
    "build": "echo 'skip it'",
--- a/yarn.lock
+++ b/yarn.lock
@ -2797,7 +2797,7 @@ __metadata:
  version: 0.0.0-use.local
  resolution: "@docspace/doceditor@workspace:packages/doceditor"
  dependencies:
-    "@onlyoffice/document-editor-react": "npm:^1.5.1"
+    "@onlyoffice/document-editor-react": "npm:^1.6.0"
    "@serdnam/pino-cloudwatch-transport": "npm:^1.0.4"
    "@svgr/webpack": "npm:^8.1.0"
    "@types/nconf": "npm:^0"
@ -4799,15 +4799,15 @@ __metadata:
  languageName: node
  linkType: hard

-"@onlyoffice/document-editor-react@npm:^1.5.1":
-  version: 1.5.1
-  resolution: "@onlyoffice/document-editor-react@npm:1.5.1"
+"@onlyoffice/document-editor-react@npm:^1.6.0":
+  version: 1.6.0
+  resolution: "@onlyoffice/document-editor-react@npm:1.6.0"
  dependencies:
    lodash: "npm:4.17.21"
  peerDependencies:
    react: ^16.9.0 || ^17 || ^18
    react-dom: ^16.9.0 || ^17 || ^18
-  checksum: 10/f70f876afc7518a58a5fc0a8e1d644883e87471c6a5c0d035a73eb7c1911b059f751b14f123a83aaaaac64fcabfa76b984056f427778eaa62f12bcf2a1ace4b3
+  checksum: 10/d86b6f04444424d607b69ce65f43ac936dab7fc036158043d3fec7777edc524e13056c64f2c10860e561339813042b21be1885047bd7b9ce70525454cdb7f576
  languageName: node
  linkType: hard