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

Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2

Browse Source
This commit is contained in:
mushka 2022-06-03 13:46:01 +03:00
commit 86bc5236cd
6 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/asc-web-components/themes/base.js
View File

@ -574,6 +574,8 @@ const Base = {
margin: " 0 auto",
minHeight: "100%",
colorDisabledFileIcons: "#f3f4f4",
content: {
backgroundColor: white,
modalPadding: "0 12px 12px",

2
packages/asc-web-components/themes/dark.js
View File

@ -572,6 +572,8 @@ const Dark = {
margin: " 0 auto",
minHeight: "100%",
colorDisabledFileIcons: "#5c5c5c",
content: {
backgroundColor: black,
modalBorderRadius: "6px",

9
products/ASC.Files/Client/src/components/EditingWrapperComponent.js
View File

@ -196,6 +196,9 @@ const EditingWrapperComponent = (props) => {
const [OkIconIsHovered, setIsHoveredOk] = useState(false);
const [CancelIconIsHovered, setIsHoveredCancel] = useState(false);
const [isTouchOK, setIsTouchOK] = useState(false);
const [isTouchCancel, setIsTouchCancel] = useState(false);
const [isLoading, setIsLoading] = useState(false);
const inputRef = React.useRef(null);
@ -226,7 +229,9 @@ const EditingWrapperComponent = (props) => {
if (
(e.relatedTarget && e.relatedTarget.classList.contains("edit-button")) ||
OkIconIsHovered ||
CancelIconIsHovered
CancelIconIsHovered ||
isTouchOK ||
isTouchCancel
)
return false;
@ -274,6 +279,7 @@ const EditingWrapperComponent = (props) => {
data-itemid={itemId}
onMouseEnter={setIsHoveredOkHandler}
onMouseLeave={setIsHoveredOkHandler}
onTouchStart={() => setIsTouchOK(true)}
isHovered={OkIconIsHovered}
title=""
/>
@ -287,6 +293,7 @@ const EditingWrapperComponent = (props) => {
data-action="cancel"
onMouseEnter={setIsHoveredCancelHandler}
onMouseLeave={setIsHoveredCancelHandler}
onTouchStart={() => setIsTouchCancel(true)}
isHovered={CancelIconIsHovered}
title=""
/>

7
products/ASC.Files/Client/src/components/panels/SelectionPanel/StyledSelectionPanel.js
View File

@ -146,8 +146,10 @@ const StyledRow = styled.div`
::after {
position: absolute;
display: block;
background-color: #f3f4f4;
border-top-right-radius: 50%;
background-color: ${(props) =>
props.theme.modalDialog.colorDisabledFileIcons};
border-top-right-radius: 45%;
left: 18px;
top: 6px;
width: 27px;
@ -159,6 +161,7 @@ const StyledRow = styled.div`
.selection-panel_text p {
color: ${(props) => props.theme.text.disableColor};
}
cursor: default;
`}
`;

2
products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
View File

@ -351,7 +351,7 @@ export default inject(
const exst = item?.fileInfo?.fileExst;
splitted = item.file.name.split(".");
ext = exst ? fileExst : splitted.length > 1 ? "." + splitted.pop() : "";
ext = exst ? exst : splitted.length > 1 ? "." + splitted.pop() : "";
name = splitted[0];
} else {
ext = item.fileInfo.fileExst;

7
web/ASC.Web.Client/src/components/SmartBanner/index.js
View File

@ -55,7 +55,12 @@ const ReactSmartBanner = (props) => {
kindle: "kindle-fire-app",
};
return isMobile && isBannerVisible && ready ? (
const isTouchDevice =
"ontouchstart" in window ||
navigator.maxTouchPoints > 0 ||
navigator.msMaxTouchPoints > 0;
return isMobile && isBannerVisible && ready && isTouchDevice ? (
<Wrapper>
<SmartBanner
title={t("SmartBanner:AppName")}