Web: Doceditor: fixed render dialogs
This commit is contained in:
parent
4bcd966ab3
commit
5f3bf8433f
@ -123,6 +123,8 @@ function Editor({
|
||||
onSDKRequestCompareFile,
|
||||
selectFolderDialog,
|
||||
onSDKRequestSaveAs,
|
||||
isFileDialogVisible,
|
||||
isFolderDialogVisible,
|
||||
}) {
|
||||
const [isLoaded, setIsLoaded] = useState(false);
|
||||
const [documentTitle, setNewDocumentTitle] = useState("Loading...");
|
||||
@ -395,8 +397,6 @@ function Editor({
|
||||
try {
|
||||
if (!window.DocsAPI) throw new Error("DocsAPI is not defined");
|
||||
|
||||
console.log("Editor config: ", config);
|
||||
|
||||
if (isMobile) {
|
||||
config.type = "mobile";
|
||||
}
|
||||
@ -519,7 +519,6 @@ function Editor({
|
||||
newConfig
|
||||
);
|
||||
|
||||
console.log(docEditor, "docEditor");
|
||||
setIsLoaded(true);
|
||||
} catch (error) {
|
||||
console.log(error, "init error");
|
||||
@ -537,6 +536,7 @@ function Editor({
|
||||
{!isLoaded && LoaderComponent}
|
||||
</>
|
||||
)}
|
||||
|
||||
{sharingDialog}
|
||||
{selectFileDialog}
|
||||
{selectFolderDialog}
|
||||
|
@ -22,13 +22,13 @@ export const useDynamicScript = (args) => {
|
||||
const [failed, setFailed] = React.useState(false);
|
||||
|
||||
React.useEffect(() => {
|
||||
if (!args.url || args.isInit) {
|
||||
if (!args.url) {
|
||||
return;
|
||||
}
|
||||
|
||||
const exists = document.getElementById(args.id);
|
||||
|
||||
if (exists) {
|
||||
if (exists || args?.isInit) {
|
||||
setReady(true);
|
||||
setFailed(false);
|
||||
return;
|
||||
@ -95,10 +95,7 @@ const DynamicComponent = ({ system, ...rest }) => {
|
||||
throw Error("failed");
|
||||
}
|
||||
|
||||
// console.log("dynamic", rest);
|
||||
|
||||
if (ready && !isInitialized) {
|
||||
//console.log("dynamic 2", rest);
|
||||
setIsInitialized(true);
|
||||
const Component = React.lazy(loadComponent(system.scope, system.module));
|
||||
|
||||
|
@ -111,32 +111,13 @@ const withDialogs = (WrappedComponent) => {
|
||||
};
|
||||
|
||||
const fileTypeDetection = () => {
|
||||
// console.log(
|
||||
// "------",
|
||||
// insertImageAction,
|
||||
// filesType,
|
||||
// insertImageActionProps,
|
||||
// "--------"
|
||||
// );
|
||||
if (filesType === insertImageAction) {
|
||||
// console.log(
|
||||
// "filesType === insertImageAction",
|
||||
// filesType === insertImageAction
|
||||
// );
|
||||
return insertImageActionProps;
|
||||
}
|
||||
if (filesType === mailMergeAction) {
|
||||
// console.log(
|
||||
// "filesType === mailMergeAction",
|
||||
// filesType === mailMergeAction
|
||||
// );
|
||||
return mailMergeActionProps;
|
||||
}
|
||||
if (filesType === compareFilesAction) {
|
||||
// console.log(
|
||||
// "filesType === compareFilesAction",
|
||||
// filesType === compareFilesAction
|
||||
// );
|
||||
return compareFilesActionProps;
|
||||
}
|
||||
};
|
||||
@ -242,9 +223,6 @@ const withDialogs = (WrappedComponent) => {
|
||||
/>
|
||||
);
|
||||
|
||||
const typeFilter = fileTypeDetection();
|
||||
// console.log(typeFilter, "-----------------");
|
||||
|
||||
const selectFileDialog = mfReady && (
|
||||
<DynamicComponent
|
||||
system={{
|
||||
@ -257,13 +235,13 @@ const withDialogs = (WrappedComponent) => {
|
||||
isPanelVisible={isFileDialogVisible}
|
||||
onSelectFile={onSelectFile}
|
||||
onClose={onCloseFileDialog}
|
||||
{...typeFilter}
|
||||
{...fileTypeDetection()}
|
||||
titleFilesList={selectFilesListTitle()}
|
||||
headerName={t("SelectFileTitle")}
|
||||
/>
|
||||
);
|
||||
|
||||
const selectFolderDialog = mfReady && (
|
||||
const selectFolderDialog = mfReady && isFolderDialogVisible && (
|
||||
<DynamicComponent
|
||||
resetTreeFolders
|
||||
showButtons
|
||||
@ -316,8 +294,10 @@ const withDialogs = (WrappedComponent) => {
|
||||
onSDKRequestInsertImage={onSDKRequestInsertImage}
|
||||
onSDKRequestMailMergeRecipients={onSDKRequestMailMergeRecipients}
|
||||
onSDKRequestCompareFile={onSDKRequestCompareFile}
|
||||
isFileDialogVisible={isFileDialogVisible}
|
||||
selectFolderDialog={selectFolderDialog}
|
||||
onSDKRequestSaveAs={onSDKRequestSaveAs}
|
||||
isFolderDialogVisible={isFolderDialogVisible}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user