IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	packages/shared/components/context-menu-button/ContextMenuButton.tsx
This commit is contained in:
Alexey Safronov 2024-03-06 12:51:12 +04:00
commit 562dbf039d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/doceditor/src/components/Editor.tsx
View File

@ -10,7 +10,7 @@ import { EditorProps, TGoBack } from "@/types";
import useInit from "@/hooks/useInit";
import useEditorEvents from "@/hooks/useEditorEvents";
import { FolderType } from "@docspace/shared/enums";
import { FolderType, ThemeKeys } from "@docspace/shared/enums";
import { getBackUrl } from "@/utils";
import { IS_DESKTOP_EDITOR, IZ_ZOOM } from "@/utils/constants";
import {
@ -142,7 +142,7 @@ const Editor = ({
...newConfig.editorConfig.customization,
...sdkCustomization,
goback: { ...goBack },
uiTheme: getEditorTheme(theme),
uiTheme: getEditorTheme(theme as ThemeKeys),
};
//if (newConfig.document && newConfig.document.info)

2
packages/doceditor/src/hooks/useError.ts
View File

@ -33,7 +33,7 @@ const useError = ({ error, editorUrl, t }: UseErrorProps) => {
} else {
const tempElm = document.getElementById("loader");
const isLoadingDocumentError = error !== null;
const isLoadingDocumentError = !!error;
const isLoadedDocument = !error && editorUrl;
if (tempElm && (isLoadingDocumentError || isLoadedDocument))