Merge branch 'release/v2.6.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.6.0

packages/client/src/pages/PortalSettings/categories/common/Branding/whitelabel.js

@@ -179,6 +179,7 @@ const WhiteLabel = (props) => {
         options.fontSize,
         isDocsEditorName ? "#fff" : "#000",
         options.alignCenter,
+        options.isEditor,
       );
       const logoDark = generateLogo(
         options.width,
@@ -187,6 +188,7 @@ const WhiteLabel = (props) => {
         options.fontSize,
         "#fff",
         options.alignCenter,
+        options.isEditor,
       );
       newLogos[i].path.light = logoLight;
       newLogos[i].path.dark = logoDark;

packages/client/src/pages/PortalSettings/utils/whiteLabelHelper.js

@@ -34,14 +34,16 @@ export const generateLogo = (
   text,
   fontSize = 18,
   fontColor = "#000",
-  alignCenter,
+  alignCenter = false,
+  isEditor = false,
 ) => {
   const canvas = document.createElement("canvas");
   canvas.width = width;
   canvas.height = height;
 
+  console.log("isEditor", isEditor);
   const ctx = canvas.getContext("2d");
-  const x = alignCenter ? width / 2 : 0;
+  const x = alignCenter ? width / 2 : isEditor ? 10 : 0;
   const y = (height - fontSize) / 2;
   ctx.fillStyle = "transparent";
   ctx.clearRect(0, 0, width, height);
@@ -87,6 +89,8 @@ export const getLogoOptions = (index, text, width, height) => {
         text,
         width,
         height,
+        alignCenter: false,
+        isEditor: true,
       };
     case 4:
       return {
@@ -94,6 +98,8 @@ export const getLogoOptions = (index, text, width, height) => {
         text,
         width,
         height,
+        alignCenter: false,
+        isEditor: true,
       };
     case 5:
       return {

packages/doceditor/src/components/completed-form/CompletedForm.tsx

@@ -140,7 +140,9 @@ export const CompletedForm = ({
   };
 
   const copyLinkFile = async () => {
-    const url = getFolderUrl(completedForm.folderId, false);
+    const origin = window.location.origin;
+
+    const url = `${origin}/doceditor?fileId=${completedForm.id}`;
 
     await copyShareLink(url);
     toastr.success(t("Common:LinkCopySuccess"));