Merge branch 'bugfix/rc-2.5.0' of github.com:ONLYOFFICE/DocSpace-client into bugfix/rc-2.5.0

packages/doceditor/src/components/Root.tsx

@@ -88,6 +88,7 @@ const Root = ({
     getIsDisabledSelectFolderDialog,
     isVisibleSelectFolderDialog,
     titleSelectorFolderDialog,
+    extensionSelectorFolderDialog,
   } = useSelectFolderDialog({});
   const {
     onSDKRequestInsertImage,
@@ -173,6 +174,7 @@ const Root = ({
                   getIsDisabled={getIsDisabledSelectFolderDialog}
                   i18n={i18n}
                   filesSettings={filesSettings}
+                  fileSaveAsExtension={extensionSelectorFolderDialog}
                 />
               )}
               {selectFileDialogVisible && !!socketHelper && (

packages/doceditor/src/components/SelectFolderDialog.tsx

@@ -19,6 +19,7 @@ const SelectFolderDialog = ({
   getIsDisabled,
   filesSettings,
   i18n,
+  fileSaveAsExtension,
 }: SelectFolderDialogProps) => {
   const { t } = useTranslation();
   const sessionPath = sessionStorage.getItem("filesSelectorPath");
@@ -30,6 +31,9 @@ const SelectFolderDialog = ({
     cancelButtonId: "select-file-modal-cancel",
   };
 
+  const withFooterCheckbox =
+    fileSaveAsExtension !== "zip" && fileInfo.fileExst !== "fb2";
+
   return (
     <FilesSelectorWrapper
       i18nProp={i18n}
@@ -57,7 +61,7 @@ const SelectFolderDialog = ({
       rootFolderType={fileInfo.rootFolderType}
       embedded={false}
       withFooterInput
-      withFooterCheckbox={fileInfo.fileExst !== "fb2"}
+      withFooterCheckbox={withFooterCheckbox}
       descriptionText=""
       currentDeviceType={DeviceType.desktop}
       getFilesArchiveError={() => ""}

packages/doceditor/src/hooks/useSelectFolderDialog.ts

@@ -102,6 +102,7 @@ const useSelectFolderDialog = ({}: UseSelectFolderDialogProps) => {
     getIsDisabledSelectFolderDialog: getIsDisabled,
     isVisibleSelectFolderDialog: isVisible,
     titleSelectorFolderDialog: title,
+    extensionSelectorFolderDialog: extension,
   };
 };
 

packages/doceditor/src/types/index.ts

@@ -244,6 +244,7 @@ export interface SelectFolderDialogProps {
   fileInfo: TFile;
   filesSettings: TFilesSettings;
   i18n: i18n;
+  fileSaveAsExtension?: string;
 }
 
 export interface SelectFileDialogProps {