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

Web: Common: Imported tablet size from utils to compare with window size

Browse Source
This commit is contained in:
TatianaLopaeva 2020-11-18 14:10:30 +03:00
parent 8038a48ce5
commit 3ea59223f4
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/ASC.Web.Common/src/components/GroupSelector/GroupSelector.js
View File

@ -5,14 +5,16 @@ import i18n from "./i18n";
import AdvancedSelector from "../AdvancedSelector";
import { getGroupList } from "../../api/groups";
import { changeLanguage } from "../../utils";
import { utils } from "asc-web-components";
const { size } = utils.device;
class GroupSelector extends React.Component {
constructor(props) {
super(props);
const { isOpen } = props;
this.state = this.getDefaultState(isOpen, []);
this.isTablet = window.innerWidth < 1024;
this.isTablet = window.innerWidth < size.tablet;
}
componentDidMount() {

5
web/ASC.Web.Common/src/components/Layout/index.js
View File

@ -1,6 +1,9 @@
import React, { useEffect, useState } from "react";
import styled from "styled-components";
import MobileLayout from "./MobileLayout";
import { utils } from "asc-web-components";
const { size } = utils.device;
const StyledContainer = styled.div`
width: 100%;
@ -9,7 +12,7 @@ const StyledContainer = styled.div`
const Layout = (props) => {
const { children } = props;
const isTablet = window.innerWidth < 1024;
const isTablet = window.innerWidth < size.tablet;
const [windowWidth, setWindowWidth] = useState({
matches: isTablet,

4
web/ASC.Web.Common/src/components/PageLayout/sub-components/section-body.js
View File

@ -6,7 +6,7 @@ import SelectedFrame from "./SelectedFrame";
import isEqual from "lodash/isEqual";
import { LayoutContextConsumer } from "asc-web-common";
const { tablet } = utils.device;
const { tablet, size } = utils.device;
const commonStyles = css`
flex-grow: 1;
@ -111,7 +111,7 @@ class SectionBody extends React.Component {
: {};
const scrollProp = uploadFiles ? { ref: this.scrollRef } : {};
const isTablet = window.innerWidth < 1024;
const isTablet = window.innerWidth < size.tablet;
return uploadFiles ? (
<StyledDropZoneBody

4
web/ASC.Web.Common/src/components/PrivateRoute/PrivateRoute.js
View File

@ -8,7 +8,9 @@ import { getCurrentUser, isAdmin, isMe } from "../../store/auth/selectors.js";
import { AUTH_KEY } from "../../constants";
import { Error401, Error404 } from "../../pages/errors";
import isEmpty from "lodash/isEmpty";
import { utils } from "asc-web-components";
const { size } = utils.device;
const PrivateRoute = ({ component: Component, ...rest }) => {
const {
isAdmin,
@ -19,7 +21,7 @@ const PrivateRoute = ({ component: Component, ...rest }) => {
computedMatch,
} = rest;
const { userId } = computedMatch.params;
const isTablet = window.innerWidth < 1024;
const isTablet = window.innerWidth < size.tablet;
useEffect(() => {
isTablet &&