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

Web: Doceditor: fixed render dialogs

Browse Source
This commit is contained in:
Artem Tarasov 2022-03-27 00:04:29 +03:00
parent 4bcd966ab3
commit 5f3bf8433f
3 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/ASC.Web.Editor/src/Editor.js
View File

@ -123,6 +123,8 @@ function Editor({
onSDKRequestCompareFile, onSDKRequestCompareFile,
selectFolderDialog, selectFolderDialog,
onSDKRequestSaveAs, onSDKRequestSaveAs,
isFileDialogVisible,
isFolderDialogVisible,
}) { }) {
const [isLoaded, setIsLoaded] = useState(false); const [isLoaded, setIsLoaded] = useState(false);
const [documentTitle, setNewDocumentTitle] = useState("Loading..."); const [documentTitle, setNewDocumentTitle] = useState("Loading...");
@ -395,8 +397,6 @@ function Editor({
try { try {
if (!window.DocsAPI) throw new Error("DocsAPI is not defined"); if (!window.DocsAPI) throw new Error("DocsAPI is not defined");
console.log("Editor config: ", config);
if (isMobile) { if (isMobile) {
config.type = "mobile"; config.type = "mobile";
} }
@ -519,7 +519,6 @@ function Editor({
newConfig newConfig
); );
console.log(docEditor, "docEditor");
setIsLoaded(true); setIsLoaded(true);
} catch (error) { } catch (error) {
console.log(error, "init error"); console.log(error, "init error");
@ -537,6 +536,7 @@ function Editor({
{!isLoaded && LoaderComponent} {!isLoaded && LoaderComponent}
</> </>
)} )}
{sharingDialog} {sharingDialog}
{selectFileDialog} {selectFileDialog}
{selectFolderDialog} {selectFolderDialog}

7
web/ASC.Web.Editor/src/components/dynamic.js
View File

@ -22,13 +22,13 @@ export const useDynamicScript = (args) => {
const [failed, setFailed] = React.useState(false); const [failed, setFailed] = React.useState(false);
React.useEffect(() => { React.useEffect(() => {
if (!args.url || args.isInit) { if (!args.url) {
return; return;
} }
const exists = document.getElementById(args.id); const exists = document.getElementById(args.id);
if (exists) { if (exists || args?.isInit) {
setReady(true); setReady(true);
setFailed(false); setFailed(false);
return; return;
@ -95,10 +95,7 @@ const DynamicComponent = ({ system, ...rest }) => {
throw Error("failed"); throw Error("failed");
} }
// console.log("dynamic", rest);
if (ready && !isInitialized) { if (ready && !isInitialized) {
//console.log("dynamic 2", rest);
setIsInitialized(true); setIsInitialized(true);
const Component = React.lazy(loadComponent(system.scope, system.module)); const Component = React.lazy(loadComponent(system.scope, system.module));

28
web/ASC.Web.Editor/src/helpers/withDialogs.js
View File

@ -111,32 +111,13 @@ const withDialogs = (WrappedComponent) => {
}; };
const fileTypeDetection = () => { const fileTypeDetection = () => {
// console.log(
// "------",
// insertImageAction,
// filesType,
// insertImageActionProps,
// "--------"
// );
if (filesType === insertImageAction) { if (filesType === insertImageAction) {
// console.log(
// "filesType === insertImageAction",
// filesType === insertImageAction
// );
return insertImageActionProps; return insertImageActionProps;
} }
if (filesType === mailMergeAction) { if (filesType === mailMergeAction) {
// console.log(
// "filesType === mailMergeAction",
// filesType === mailMergeAction
// );
return mailMergeActionProps; return mailMergeActionProps;
} }
if (filesType === compareFilesAction) { if (filesType === compareFilesAction) {
// console.log(
// "filesType === compareFilesAction",
// filesType === compareFilesAction
// );
return compareFilesActionProps; return compareFilesActionProps;
} }
}; };
@ -242,9 +223,6 @@ const withDialogs = (WrappedComponent) => {
/> />
); );
const typeFilter = fileTypeDetection();
// console.log(typeFilter, "-----------------");
const selectFileDialog = mfReady && ( const selectFileDialog = mfReady && (
<DynamicComponent <DynamicComponent
system={{ system={{
@ -257,13 +235,13 @@ const withDialogs = (WrappedComponent) => {
isPanelVisible={isFileDialogVisible} isPanelVisible={isFileDialogVisible}
onSelectFile={onSelectFile} onSelectFile={onSelectFile}
onClose={onCloseFileDialog} onClose={onCloseFileDialog}
{...typeFilter} {...fileTypeDetection()}
titleFilesList={selectFilesListTitle()} titleFilesList={selectFilesListTitle()}
headerName={t("SelectFileTitle")} headerName={t("SelectFileTitle")}
/> />
); );
const selectFolderDialog = mfReady && ( const selectFolderDialog = mfReady && isFolderDialogVisible && (
<DynamicComponent <DynamicComponent
resetTreeFolders resetTreeFolders
showButtons showButtons
@ -316,8 +294,10 @@ const withDialogs = (WrappedComponent) => {
onSDKRequestInsertImage={onSDKRequestInsertImage} onSDKRequestInsertImage={onSDKRequestInsertImage}
onSDKRequestMailMergeRecipients={onSDKRequestMailMergeRecipients} onSDKRequestMailMergeRecipients={onSDKRequestMailMergeRecipients}
onSDKRequestCompareFile={onSDKRequestCompareFile} onSDKRequestCompareFile={onSDKRequestCompareFile}
isFileDialogVisible={isFileDialogVisible}
selectFolderDialog={selectFolderDialog} selectFolderDialog={selectFolderDialog}
onSDKRequestSaveAs={onSDKRequestSaveAs} onSDKRequestSaveAs={onSDKRequestSaveAs}
isFolderDialogVisible={isFolderDialogVisible}
/> />
); );
}; };