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

[DE PE mobile] Fix Bug 54406

Browse source
This commit is contained in:
SergeyEzhin 2022-03-28 19:03:06 +04:00
parent 8a04370f3a
commit 0aea122a82
2 changed files with 11 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -207,11 +207,7 @@ const PageBullets = observer(props => {
<ListItem key={'bullet-' + bullet.type} data-type={bullet.type} className={(bullet.type === typeBullets) &&
(storeTextSettings.listType === 0 || storeTextSettings.listType === -1) ? 'active' : ''}
onClick={() => {
if (bullet.type === -1) {
storeTextSettings.resetBullets(-1);
} else {
storeTextSettings.resetBullets(bullet.type);
}
storeTextSettings.resetBullets(bullet.type);
props.onBullet(bullet.type);
}}>
{bullet.thumb.length < 1 ?
@ -256,11 +252,7 @@ const PageNumbers = observer(props => {
<ListItem key={'number-' + number.type} data-type={number.type} className={(number.type === typeNumbers) &&
(storeTextSettings.listType === 1 || storeTextSettings.listType === -1) ? 'active' : ''}
onClick={() => {
if (number.type === -1) {
storeTextSettings.resetNumbers(-1);
} else {
storeTextSettings.resetNumbers(number.type);
}
storeTextSettings.resetNumbers(number.type);
props.onNumber(number.type);
}}>
{number.thumb.length < 1 ?

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

@ -490,7 +490,7 @@ const PageAdditionalFormatting = props => {
)
};
const PageBullets = props => {
const PageBullets = observer(props => {
const { t } = useTranslation();
const _t = t('View.Edit', {returnObjects: true});
const bulletArrays = [
@ -525,11 +525,8 @@ const PageBullets = props => {
<ListItem key={'bullet-' + bullet.type} data-type={bullet.type} className={(bullet.type === typeBullets) &&
(storeTextSettings.listType === 0 || storeTextSettings.listType === -1) ? 'active' : ''}
onClick={() => {
if (bullet.type === -1) {
storeTextSettings.resetBullets(-1);
}
props.onBullet(bullet.type)
props.f7router.back();
storeTextSettings.resetBullets(bullet.type);
props.onBullet(bullet.type);
}}>
{bullet.thumb.length < 1 ?
<Icon className="thumb" style={{position: 'relative'}}>
@ -543,9 +540,9 @@ const PageBullets = props => {
))}
</View>
)
};
});
const PageNumbers = props => {
const PageNumbers = observer(props => {
const { t } = useTranslation();
const _t = t('View.Edit', {returnObjects: true});
const numberArrays = [
@ -573,7 +570,7 @@ const PageNumbers = props => {
return null;
}
return(
return (
<View className='numbers dataview'>
{numberArrays.map((numbers, index) => (
<List className="row" style={{listStyle: 'none'}} key={'numbers-' + index}>
@ -581,11 +578,8 @@ const PageNumbers = props => {
<ListItem key={'number-' + number.type} data-type={number.type} className={(number.type === typeNumbers) &&
(storeTextSettings.listType === 1 || storeTextSettings.listType === -1) ? 'active' : ''}
onClick={() => {
if (number.type === -1) {
storeTextSettings.resetNumbers(-1);
}
props.onNumber(number.type)
props.f7router.back();
storeTextSettings.resetNumbers(number.type);
props.onNumber(number.type);
}}>
{number.thumb.length < 1 ?
<Icon className="thumb" style={{position: 'relative'}}>
@ -599,7 +593,7 @@ const PageNumbers = props => {
))}
</View>
)
};
});
const PageBulletsAndNumbers = props => {
const { t } = useTranslation();