Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.0.1
This commit is contained in:
commit
fce26690f9
@ -3,8 +3,10 @@ import React from "react";
|
||||
import { inject, observer } from "mobx-react";
|
||||
import styled, { css } from "styled-components";
|
||||
import Base from "@docspace/components/themes/base";
|
||||
import NoUserSelect from "@docspace/components/utils/commonStyles";
|
||||
|
||||
const StyledIcon = styled.img`
|
||||
${NoUserSelect}
|
||||
${(props) =>
|
||||
props.isRoom &&
|
||||
css`
|
||||
|
@ -27,7 +27,7 @@ const FilesListRow = ({
|
||||
>
|
||||
<div className="selection-panel_icon">{element}</div>
|
||||
<div className="selection-panel_text">
|
||||
<Text fontSize="14px" fontWeight={600}>
|
||||
<Text fontSize="14px" fontWeight={600} noSelect>
|
||||
{title}
|
||||
</Text>
|
||||
</div>
|
||||
|
@ -95,6 +95,7 @@ const SelectionPanelBody = ({
|
||||
className="selection-panel_title"
|
||||
fontSize="12px"
|
||||
fontWeight={600}
|
||||
noSelect
|
||||
>
|
||||
{folderSelection
|
||||
? t("FolderContents", { folderTitle })
|
||||
|
@ -43,6 +43,10 @@ const SectionBodyContent = (props) => {
|
||||
onClickBack,
|
||||
} = props;
|
||||
|
||||
useEffect(() => {
|
||||
return () => window?.getSelection()?.removeAllRanges();
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
const customScrollElm = document.querySelector(
|
||||
"#customScrollBar > .scroll-body"
|
||||
|
@ -6,6 +6,7 @@ import Tree from "rc-tree";
|
||||
import "rc-tree/assets/index.css";
|
||||
import Badge from "../badge";
|
||||
import Base from "../themes/base";
|
||||
import NoUserSelect from "../utils/commonStyles";
|
||||
|
||||
const StyledTree = styled(Tree)`
|
||||
span.rc-tree-node-content-wrapper,
|
||||
@ -76,6 +77,7 @@ const StyledTree = styled(Tree)`
|
||||
vertical-align: 5px;
|
||||
}
|
||||
span.rc-tree-title {
|
||||
${NoUserSelect}
|
||||
width: calc(100% - 32px);
|
||||
font-weight: 600;
|
||||
overflow: hidden;
|
||||
|
@ -196,7 +196,7 @@ function Editor({
|
||||
}
|
||||
};
|
||||
|
||||
const getDefaultFileName = () => {
|
||||
const getDefaultFileName = (withExt = false) => {
|
||||
const documentType = config?.documentType;
|
||||
|
||||
const fileExt =
|
||||
@ -204,20 +204,31 @@ function Editor({
|
||||
? "docx"
|
||||
: documentType === "slide"
|
||||
? "pptx"
|
||||
: "xlsx";
|
||||
: documentType === "cell"
|
||||
? "xlsx"
|
||||
: "docxf";
|
||||
|
||||
let fileName = t("Common:NewDocument");
|
||||
|
||||
switch (fileExt) {
|
||||
case "docx":
|
||||
return t("Common:NewDocument");
|
||||
case "xlsx":
|
||||
return t("Common:NewSpreadsheet");
|
||||
fileName = t("Common:NewSpreadsheet");
|
||||
break;
|
||||
case "pptx":
|
||||
return t("Common:NewPresentation");
|
||||
fileName = t("Common:NewPresentation");
|
||||
break;
|
||||
case "docxf":
|
||||
return t("Common:NewMasterForm");
|
||||
fileName = t("Common:NewMasterForm");
|
||||
break;
|
||||
default:
|
||||
return t("Common:NewFolder");
|
||||
break;
|
||||
}
|
||||
|
||||
if (withExt) {
|
||||
fileName = `${fileName}.${fileExt}`;
|
||||
}
|
||||
|
||||
return fileName;
|
||||
};
|
||||
|
||||
const throttledChangeTitle = throttle(() => changeTitle(), 500);
|
||||
@ -274,7 +285,7 @@ function Editor({
|
||||
};
|
||||
|
||||
const onSDKRequestCreateNew = (event) => {
|
||||
const defaultFileName = getDefaultFileName();
|
||||
const defaultFileName = getDefaultFileName(true);
|
||||
|
||||
createFile(fileInfo.folderId, defaultFileName)
|
||||
.then((newFile) => {
|
||||
@ -647,16 +658,21 @@ function Editor({
|
||||
onRequestCreateNew = onSDKRequestCreateNew;
|
||||
} else {
|
||||
//FireFox security issue fix (onRequestCreateNew will be blocked)
|
||||
const documentType = config?.documentType;
|
||||
const documentType = config?.documentType || "word";
|
||||
const defaultFileName = getDefaultFileName();
|
||||
|
||||
config.editorConfig.createUrl = combineUrl(
|
||||
const url = new URL(
|
||||
combineUrl(
|
||||
window.location.origin,
|
||||
window.DocSpaceConfig?.proxy?.url,
|
||||
`/filehandler.ashx?action=create&doctype=${documentType}&title=${encodeURIComponent(
|
||||
defaultFileName
|
||||
)}`
|
||||
"/filehandler.ashx"
|
||||
)
|
||||
);
|
||||
url.searchParams.append("action", "create");
|
||||
url.searchParams.append("doctype", documentType);
|
||||
url.searchParams.append("title", defaultFileName);
|
||||
|
||||
config.editorConfig.createUrl = url.toString();
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user