Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0

This commit is contained in:
Artem Tarasov 2021-04-06 18:51:50 +03:00
commit 40bfcc9dbe
5 changed files with 13 additions and 5 deletions

View File

@ -273,7 +273,7 @@ class PageLayout extends React.Component {
</SubArticleMainButton>
)}
{isArticleBodyAvailable && (
<SubArticleBody>
<SubArticleBody pinned={this.state.isArticlePinned}>
{articleBodyContent ? articleBodyContent.props.children : null}
</SubArticleBody>
)}

View File

@ -4,6 +4,7 @@ import styled from "styled-components";
import equal from "fast-deep-equal/react";
import Scrollbar from "@appserver/components/scrollbar";
import { tablet, smallTablet } from "@appserver/components/utils/device";
import { isMobile } from "react-device-detect";
const StyledArticleBody = styled.div`
${(props) => props.displayBorder && `outline: 1px dotted;`}
@ -27,6 +28,7 @@ const StyledArticleBody = styled.div`
.people-tree-menu {
margin-right: 0;
${(props) => isMobile && props.pinned && `margin-bottom: 56px`}
}
.custom-scrollbar {
@ -56,10 +58,10 @@ class ArticleBody extends React.Component {
render() {
//console.log("PageLayout ArticleBody render");
const { children } = this.props;
const { children, pinned } = this.props;
return (
<StyledArticleBody>
<StyledArticleBody pinned={pinned}>
<Scrollbar
id="articleScrollBar"
className="custom-scrollbar"

View File

@ -393,7 +393,9 @@ class FilesRowContent extends React.PureComponent {
setIsVerHistoryPanel,
fetchFileVersions,
history,
isTrashFolder,
} = this.props;
if (isTrashFolder) return;
if (!isTabletView) {
fetchFileVersions(item.id + "");

View File

@ -124,7 +124,10 @@ const SectionBodyContent = (props) => {
const onDragOver = (e) => {
e.preventDefault();
if (e.dataTransfer.items.length > 0) {
if (
e.dataTransfer.items.length > 0 &&
e.dataTransfer.dropEffect !== "none"
) {
setDragging(true);
}
};

View File

@ -77,13 +77,14 @@ class SharingRow extends React.Component {
onShowEmbeddingPanel,
onToggleLink,
externalLinkData,
canShareOwnerChange,
onShowChangeOwnerPanel,
isLoading,
internalLink,
} = this.props;
const { access } = this.state;
const canShareOwnerChange = this.props.canShareOwnerChange(item);
const { isOwner, isLocked } = item;
const { label, displayName, name, shareLink, id } = item.sharedTo;
const userName = name