Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
This commit is contained in:
commit
1870e125f9
@ -18,7 +18,7 @@ const textStyle = {
|
||||
};
|
||||
|
||||
class SectionHeaderContent extends React.Component {
|
||||
onBackClick = () => {
|
||||
onClickBack = () => {
|
||||
const { history, settings, resetGroup } = this.props;
|
||||
|
||||
resetGroup();
|
||||
@ -38,7 +38,7 @@ class SectionHeaderContent extends React.Component {
|
||||
color="#A3A9AE"
|
||||
hoverColor="#657077"
|
||||
isFill={true}
|
||||
onClick={this.onBackClick}
|
||||
onClick={this.onClickBack}
|
||||
/>
|
||||
<Headline type="content" style={textStyle}>{headerText}</Headline>
|
||||
</div>
|
||||
|
@ -247,6 +247,7 @@ class SectionFilterContent extends React.Component {
|
||||
onFilter={this.onFilter}
|
||||
directionAscLabel={t("DirectionAscLabel")}
|
||||
directionDescLabel={t("DirectionDescLabel")}
|
||||
placeholder={t("FilterPlaceholder")}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
@ -53,5 +53,7 @@
|
||||
"DirectionAscLabel":"A-Z",
|
||||
"DirectionDescLabel":"Z-A",
|
||||
|
||||
"DefaultSelectLabel": "Select"
|
||||
"DefaultSelectLabel": "Select",
|
||||
|
||||
"FilterPlaceholder": "Search"
|
||||
}
|
@ -53,5 +53,7 @@
|
||||
"DirectionAscLabel":"А-Я",
|
||||
"DirectionDescLabel":"Я-А",
|
||||
|
||||
"DefaultSelectLabel": "Выберите"
|
||||
"DefaultSelectLabel": "Выберите",
|
||||
|
||||
"FilterPlaceholder": "Поиск"
|
||||
}
|
@ -1,9 +1,9 @@
|
||||
import React from "react";
|
||||
import React, { useCallback } from "react";
|
||||
import { connect } from "react-redux";
|
||||
import { IconButton } from "asc-web-components";
|
||||
import { Headline } from 'asc-web-common';
|
||||
import { withRouter } from "react-router";
|
||||
import { useTranslation } from 'react-i18next';
|
||||
// import { useTranslation } from 'react-i18next';
|
||||
|
||||
const wrapperStyle = {
|
||||
display: "flex",
|
||||
@ -19,6 +19,10 @@ const SectionHeaderContent = props => {
|
||||
const { history, settings } = props;
|
||||
//const { t } = useTranslation();
|
||||
|
||||
const onClickBack = useCallback(() => {
|
||||
history.push(settings.homepage);
|
||||
}, [history, settings]);
|
||||
|
||||
return (
|
||||
<div style={wrapperStyle}>
|
||||
<div style={{ width: "16px" }}>
|
||||
@ -28,7 +32,7 @@ const SectionHeaderContent = props => {
|
||||
size="16"
|
||||
hoverColor="#657077"
|
||||
isFill={true}
|
||||
onClick={() => history.push(settings.homepage)}
|
||||
onClick={onClickBack}
|
||||
/>
|
||||
</div>
|
||||
<Headline type="content" truncate={true} style={textStyle}>
|
||||
|
@ -358,8 +358,10 @@ class SectionHeaderContent extends React.PureComponent {
|
||||
}
|
||||
};
|
||||
|
||||
goBack = () => {
|
||||
this.props.history.goBack();
|
||||
onClickBack = () => {
|
||||
const { history, settings } = this.props;
|
||||
|
||||
history.push(settings.homepage);
|
||||
};
|
||||
|
||||
render() {
|
||||
@ -375,7 +377,7 @@ class SectionHeaderContent extends React.PureComponent {
|
||||
size="16"
|
||||
hoverColor="#657077"
|
||||
isFill={true}
|
||||
onClick={this.goBack}
|
||||
onClick={this.onClickBack}
|
||||
/>
|
||||
<HeaderContainer type='content' truncate={true}>
|
||||
{profile.displayName}
|
||||
|
@ -22,7 +22,7 @@ const HeaderContainer = styled(Headline)`
|
||||
`;
|
||||
|
||||
const SectionHeaderContent = (props) => {
|
||||
const { profile, history, settings, match } = props;
|
||||
const { profile, history, match } = props;
|
||||
const { type } = match.params;
|
||||
const { t } = useTranslation();
|
||||
|
||||
@ -34,7 +34,7 @@ const SectionHeaderContent = (props) => {
|
||||
? profile.displayName
|
||||
: "";
|
||||
|
||||
const onClick = useCallback(() => {
|
||||
const onClickBack = useCallback(() => {
|
||||
history.goBack();
|
||||
}, [history]);
|
||||
|
||||
@ -46,7 +46,7 @@ const SectionHeaderContent = (props) => {
|
||||
size="16"
|
||||
hoverColor="#657077"
|
||||
isFill={true}
|
||||
onClick={onClick}
|
||||
onClick={onClickBack}
|
||||
/>
|
||||
<HeaderContainer
|
||||
type='content'
|
||||
|
@ -1,4 +1,4 @@
|
||||
import React from "react";
|
||||
import React, { useCallback } from "react";
|
||||
import { connect } from "react-redux";
|
||||
import { IconButton } from "asc-web-components";
|
||||
import { Headline } from 'asc-web-common';
|
||||
@ -19,6 +19,10 @@ const SectionHeaderContent = props => {
|
||||
const { history, settings } = props;
|
||||
const { t } = useTranslation();
|
||||
|
||||
const onClickBack = useCallback(() => {
|
||||
history.push(settings.homepage);
|
||||
}, [history, settings]);
|
||||
|
||||
return (
|
||||
<div style={wrapperStyle}>
|
||||
<div style={{ width: "16px" }}>
|
||||
@ -28,7 +32,7 @@ const SectionHeaderContent = props => {
|
||||
size="16"
|
||||
hoverColor="#657077"
|
||||
isFill={true}
|
||||
onClick={() => history.push(settings.homepage)}
|
||||
onClick={onClickBack}
|
||||
/>
|
||||
</div>
|
||||
<Headline type="content" truncate={true} style={textStyle}>
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "asc-web-components",
|
||||
"version": "1.0.267",
|
||||
"version": "1.0.270",
|
||||
"description": "Ascensio System SIA component library",
|
||||
"license": "AGPL-3.0",
|
||||
"main": "dist/asc-web-components.js",
|
||||
|
@ -428,7 +428,7 @@ class FilterInput extends React.Component {
|
||||
let iconSize = 32;
|
||||
switch (this.props.size) {
|
||||
case 'base':
|
||||
iconSize = 32;
|
||||
iconSize = 33;
|
||||
break;
|
||||
case 'middle':
|
||||
case 'big':
|
||||
|
@ -36,6 +36,10 @@ const CloseButton = styled.div`
|
||||
|
||||
&:hover{
|
||||
cursor: pointer;
|
||||
|
||||
&:before, &:after {
|
||||
background-color: #555F65;
|
||||
}
|
||||
}
|
||||
|
||||
&:before, &:after {
|
||||
@ -45,10 +49,6 @@ const CloseButton = styled.div`
|
||||
height: 20px;
|
||||
width: 1px;
|
||||
background-color: #D0D5DA;
|
||||
|
||||
:hover{
|
||||
background-color: #555F65;
|
||||
}
|
||||
}
|
||||
|
||||
&:before {
|
||||
|
@ -15,7 +15,8 @@ const StyledIconBlock = styled.div`
|
||||
cursor: ${props =>
|
||||
props.isDisabled || !props.isClickable ? "default" : "pointer"};
|
||||
height: 100%;
|
||||
padding-right: 7px;
|
||||
padding-right: 8px;
|
||||
padding-left: 1px;
|
||||
-webkit-tap-highlight-color: rgba(0,0,0,0);
|
||||
`;
|
||||
|
||||
@ -83,6 +84,7 @@ class InputBlock extends React.Component {
|
||||
keepCharPositions,
|
||||
iconName,
|
||||
iconColor,
|
||||
hoverColor,
|
||||
isIconFill,
|
||||
onIconClick,
|
||||
iconSize
|
||||
@ -155,6 +157,7 @@ class InputBlock extends React.Component {
|
||||
<IconButton
|
||||
size={iconButtonSize}
|
||||
color={iconColor}
|
||||
hoverColor={hoverColor}
|
||||
iconName={iconName}
|
||||
isFill={isIconFill}
|
||||
isDisabled={isDisabled}
|
||||
@ -195,6 +198,7 @@ InputBlock.propTypes = {
|
||||
value: PropTypes.string,
|
||||
iconName: PropTypes.string,
|
||||
iconColor: PropTypes.string,
|
||||
hoverColor: PropTypes.string,
|
||||
iconSize: PropTypes.number,
|
||||
isIconFill: PropTypes.bool,
|
||||
onIconClick: PropTypes.func,
|
||||
@ -222,6 +226,7 @@ InputBlock.defaultProps = {
|
||||
value: '',
|
||||
iconName: "",
|
||||
iconColor: "#ffffff",
|
||||
hoverColor: "#ffffff",
|
||||
isIconFill: false,
|
||||
isDisabled: false,
|
||||
keepCharPositions: false
|
||||
|
@ -70,7 +70,7 @@ const StyledMainButton = styled.div`
|
||||
box-sizing: border-box;
|
||||
background-color: ${props =>
|
||||
props.isDisabled ? disableBackgroundColor : backgroundColor};
|
||||
padding: 5px 11px;
|
||||
padding: 5px 10px;
|
||||
border-radius: 3px;
|
||||
-moz-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
|
@ -83,7 +83,8 @@ class SearchInput extends React.Component {
|
||||
iconName={!!this.state.inputValue || this.props.showClearButton ? "CrossIcon" : "SearchIcon"}
|
||||
isIconFill={true}
|
||||
iconSize={clearButtonSize}
|
||||
iconColor={"#A3A9AE"}
|
||||
iconColor={"#D0D5DA"}
|
||||
hoverColor={"#555F65"}
|
||||
onIconClick={!!this.state.inputValue || this.props.showClearButton ? this.clearSearch : undefined}
|
||||
size={this.props.size}
|
||||
scale={true}
|
||||
|
@ -57,22 +57,22 @@ const StyledInput = styled(Input).attrs((props) => ({
|
||||
transition: all 0.2s ease 0s;
|
||||
|
||||
::-webkit-input-placeholder {
|
||||
color: ${props => props.isDisabled ? '#D0D5DA' : '#A3A9AE'};
|
||||
color: ${props => props.isDisabled ? '#D0D5DA' : '#D0D5DA'};
|
||||
font-family: 'Open Sans',sans-serif
|
||||
}
|
||||
|
||||
:-moz-placeholder {
|
||||
color: ${props => props.isDisabled ? '#D0D5DA' : '#A3A9AE'};
|
||||
color: ${props => props.isDisabled ? '#D0D5DA' : '#D0D5DA'};
|
||||
font-family: 'Open Sans',sans-serif
|
||||
}
|
||||
|
||||
::-moz-placeholder {
|
||||
color: ${props => props.isDisabled ? '#D0D5DA' : '#A3A9AE'};
|
||||
color: ${props => props.isDisabled ? '#D0D5DA' : '#D0D5DA'};
|
||||
font-family: 'Open Sans',sans-serif
|
||||
}
|
||||
|
||||
:-ms-input-placeholder {
|
||||
color: ${props => props.isDisabled ? '#D0D5DA' : '#A3A9AE'};
|
||||
color: ${props => props.isDisabled ? '#D0D5DA' : '#D0D5DA'};
|
||||
font-family: 'Open Sans',sans-serif
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user