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

Web: Client/Components: Fix dropDown styles on wizard

Browse Source
This commit is contained in:
Alexey Kostenko 2020-09-15 09:02:24 +03:00
parent d731e2cafa
commit 72ac3e9b15
3 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
web/ASC.Web.Client/src/components/pages/Wizard/sub-components/settings-container.js
View File

@ -80,33 +80,35 @@ const SettingsContainer = ({
<Text fontSize="13px">{t('language')}</Text>
<ComboBox
className="drop-down"
options={languages}
selectedOption={{
key: selectLanguage.key,
label: selectLanguage.label
}}
noBorder={true}
scaled={false}
size='content'
dropDownMaxHeight={300}
onSelect={onSelectLanguageHandler}
/>
className="drop-down"
options={languages}
selectedOption={{
key: selectLanguage.key,
label: selectLanguage.label
}}
noBorder={true}
scaled={false}
size='content'
dropDownMaxHeight={300}
onSelect={onSelectLanguageHandler}
textOverflow={true}
/>
<Text className="title" fontSize="13px">{t('timezone')}</Text>
<ComboBox
className="drop-down"
options={timezones}
selectedOption={{
key: selectTimezone.key,
label: selectTimezone.label
}}
noBorder={true}
dropDownMaxHeight={300}
scaled={false}
size='content'
onSelect={onSelectTimezoneHandler}
/>
className="drop-down"
options={timezones}
selectedOption={{
key: selectTimezone.key,
label: selectTimezone.label
}}
noBorder={true}
dropDownMaxHeight={300}
scaled={false}
size='content'
onSelect={onSelectTimezoneHandler}
textOverflow={true}
/>
</StyledContainer>
);

7
web/ASC.Web.Components/src/components/combobox/index.js
View File

@ -97,7 +97,8 @@ class ComboBox extends React.Component {
noBorder,
scaledOptions,
displayType,
toggleAction } = this.props;
toggleAction,
textOverflow } = this.props;
const { isOpen, selectedOption } = this.state;
const dropDownMaxHeightProp = dropDownMaxHeight
@ -156,6 +157,7 @@ class ComboBox extends React.Component {
? advancedOptions
: options.map((option) =>
<DropDownItem {...option}
textOverflow={textOverflow}
key={option.key}
disabled={
option.disabled
@ -189,7 +191,8 @@ ComboBox.propTypes = {
selectedOption: PropTypes.object.isRequired,
size: PropTypes.oneOf(['base', 'middle', 'big', 'huge', 'content']),
style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
toggleAction: PropTypes.func
toggleAction: PropTypes.func,
textOverflow: PropTypes.bool
}
ComboBox.defaultProps = {

8
web/ASC.Web.Components/src/components/drop-down-item/index.js
View File

@ -25,7 +25,7 @@ const disabledAndHeaderStyle = css`
`;
const StyledDropdownItem = styled.div`
display: flex;
display:${props => props.textOverflow ? "block" : "flex"};
width: 100%;
max-width: 500px;
border: 0px;
@ -127,7 +127,8 @@ DropDownItem.propTypes = {
children: PropTypes.any,
className: PropTypes.string,
id: PropTypes.string,
style: PropTypes.oneOfType([PropTypes.object, PropTypes.array])
style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
textOverflow: PropTypes.bool
};
DropDownItem.defaultProps = {
@ -136,7 +137,8 @@ DropDownItem.defaultProps = {
tabIndex: -1,
label: '',
disabled: false,
noHover: false
noHover: false,
textOverflow: false
};
export default DropDownItem