Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1815 from ONLYOFFICE/feature/fix-bug-react

Browse source 
Feature/fix bug react
This commit is contained in:
maxkadushkin 2022-06-23 11:13:03 +03:00 committed by GitHub
parent bf13a6f9eb 43018a168c
commit 361161478b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/common/mobile/resources/less/common-ios.less
View file

@ -181,6 +181,7 @@
margin-top: 21px;
box-sizing: border-box;
box-shadow: 0 0 0 1px rgba(0, 0, 0, .15) inset;
background: @fill-white;
}
.item-after {
.color-preview {

2
apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx
View file

@ -196,7 +196,7 @@ const EditParagraph = props => {
const paragraph = props.storeFocusObjects.paragraphObject;
const curBackColor = storeParagraphSettings.backColor ? storeParagraphSettings.backColor : storeParagraphSettings.getBackgroundColor(paragraph);
const background = curBackColor !== 'transparent' ? `#${(typeof curBackColor === "object" ? curBackColor.color : curBackColor)}` : curBackColor;
const background = curBackColor !== 'transparent' ? `#${(typeof curBackColor === "object" ? curBackColor.color : curBackColor)}` : '';
const activeStyle = Device.android ? 'link no-active-state' : 'no-active-state';
return (

21
apps/documenteditor/mobile/src/view/edit/EditText.jsx
View file

@ -243,25 +243,18 @@ const PageNumbers = observer( props => {
return (
<View className='numbers dataview'>
{numberArrays.map((numbers, index) => (
<List className="row" style={{listStyle: 'none'}} key={'numbers-' + index}>
{numbers.map((number) => (
<ListItem key={'number-' + number.type} data-type={number.type} className={(number.type === typeNumbers) &&
<List className="row" style={{listStyle: 'none'}}>
{numberArrays.map( number => (
<ListItem key={'number-' + number.subtype} data-type={number.subtype} className={(number.subtype === typeNumbers) &&
(storeTextSettings.listType === 1 || storeTextSettings.listType === -1) ? 'active' : ''}
onClick={() => {
storeTextSettings.resetNumbers(number.type);
props.onNumber(number.type);
storeTextSettings.resetNumbers(number.subtype);
props.onNumber(number.subtype);
}}>
{number.thumb.length < 1 ?
<Icon className="thumb" style={{position: 'relative'}}>
<label>{t('Edit.textNone')}</label>
</Icon> :
<Icon className="thumb" icon={`icon-numbers-${number.type}`} />
}
<div id={`id-numbers-${number.subtype}`} className='item-number'></div>
</ListItem>
))}
</List>
))}
</List>
</View>
);
});

1
apps/presentationeditor/mobile/src/less/app.less
View file

@ -141,6 +141,7 @@
display: flex;
justify-content: space-between;
flex-wrap: wrap;
width: auto;
padding-left: 18px;
padding-right: 18px;
padding-bottom: 14px;

31
apps/presentationeditor/mobile/src/view/edit/EditText.jsx
View file

@ -570,25 +570,18 @@ const PageNumbers = observer(props => {
return (
<View className='numbers dataview'>
{numberArrays.map((numbers, index) => (
<List className="row" style={{listStyle: 'none'}} key={'numbers-' + index}>
{numbers.map((number) => (
<ListItem key={'number-' + number.type} data-type={number.type} className={(number.type === typeNumbers) &&
(storeTextSettings.listType === 1 || storeTextSettings.listType === -1) ? 'active' : ''}
onClick={() => {
storeTextSettings.resetNumbers(number.type);
props.onNumber(number.type);
}}>
{number.thumb.length < 1 ?
<Icon className="thumb" style={{position: 'relative'}}>
<label>{_t.textNone}</label>
</Icon> :
<Icon className="thumb" icon={`icon-numbers-${number.type}`} />
}
</ListItem>
))}
</List>
))}
<List className="row" style={{listStyle: 'none'}}>
{numberArrays.map( number => (
<ListItem key={'number-' + number.subtype} data-type={number.subtype} className={(number.subtype === typeNumbers) &&
(storeTextSettings.listType === 1 || storeTextSettings.listType === -1) ? 'active' : ''}
onClick={() => {
storeTextSettings.resetNumbers(number.subtype);
props.onNumber(number.subtype);
}}>
<div id={number.id} className='item-number'></div>
</ListItem>
))}
</List>
</View>
);
});