From 872d0dae0de5e894e4daa7885d3c7f5be12a8794 Mon Sep 17 00:00:00 2001 From: Artem Tarasov Date: Wed, 26 Aug 2020 13:55:04 +0300 Subject: [PATCH] Fixed MainButton accessibility when going to Settings --- .../components/Article/MainButton/index.js | 4 +-- .../pages/Settings/Section/Body/index.js | 29 +++++++++++++++---- .../src/components/pages/Settings/index.js | 2 +- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/products/ASC.Files/Client/src/components/Article/MainButton/index.js b/products/ASC.Files/Client/src/components/Article/MainButton/index.js index 4e3f9b0914..32591788fc 100644 --- a/products/ASC.Files/Client/src/components/Article/MainButton/index.js +++ b/products/ASC.Files/Client/src/components/Article/MainButton/index.js @@ -51,11 +51,11 @@ class PureArticleMainButtonContent extends React.Component { render() { //console.log("Files ArticleMainButtonContent render"); - const { t, isCanCreate } = this.props; + const { t, isCanCreate, isDisabled } = this.props; return ( diff --git a/products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js b/products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js index 1d89b8ed8a..d628086b70 100644 --- a/products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js +++ b/products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js @@ -1,10 +1,13 @@ import React from 'react'; import styled from 'styled-components'; +import { connect } from 'react-redux'; import { Heading, ToggleButton } from 'asc-web-components'; +import { setStoreOriginal } from '../../../../../store/files/actions'; + const StyledSettings = styled.div` display: grid; grid-gap: 10px; @@ -23,6 +26,9 @@ class SectionBodyContent extends React.Component { constructor(props) { super(props); + this.state = { + originalCopy: false + } } componentDidMount() { @@ -40,6 +46,13 @@ class SectionBodyContent extends React.Component { document.title = 'ASC.Files'; } + onChangeOriginalCopy = () => { + const { originalCopy } = this.state; + const { setStoreOriginal } = this.props; + setStoreOriginal({ set: !originalCopy }); + this.setState({ originalCopy: !originalCopy }); + } + renderAdminSettings = () => { const { intermediateVersion, @@ -69,23 +82,27 @@ class SectionBodyContent extends React.Component { renderCommonSettings = () => { const { - originalCopy, trash, recent, favorites, templates, updateOrCreate, keepIntermediate, + setStoreOriginal, t } = this.props; + const { + originalCopy + } = this.state; + return ( console.log(e)} + onChange={this.onChangeOriginalCopy} isChecked={originalCopy} /> { - + return (<>) } render() { @@ -148,7 +165,7 @@ class SectionBodyContent extends React.Component { if(setting === 'common') content = this.renderCommonSettings(); if(setting === 'thirdParty') - content = this.renderAdminSettings(); + content = this.renderClouds(); return content; } @@ -156,4 +173,4 @@ class SectionBodyContent extends React.Component { } -export default SectionBodyContent; \ No newline at end of file +export default connect(null, {setStoreOriginal})(SectionBodyContent); \ No newline at end of file diff --git a/products/ASC.Files/Client/src/components/pages/Settings/index.js b/products/ASC.Files/Client/src/components/pages/Settings/index.js index 073e7b1df1..dfd37ce83c 100644 --- a/products/ASC.Files/Client/src/components/pages/Settings/index.js +++ b/products/ASC.Files/Client/src/components/pages/Settings/index.js @@ -71,7 +71,7 @@ class PureSettings extends React.Component { - +