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

Merge pull request #1329 from ONLYOFFICE/feature/fix-bug-reactjs

Browse source 
Feature/fix bug reactjs
This commit is contained in:
maxkadushkin 2021-11-22 11:13:19 +03:00 committed by GitHub
parent a344ed7553 a84705121b
commit 85f7f03f0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/documenteditor/mobile/src/controller/Search.jsx
View file

@ -99,7 +99,8 @@ const Search = withTranslation()(props => {
if (params.find && params.find.length) { if (params.find && params.find.length) {
api.asc_selectSearchingResults(true); if(params.highlight) api.asc_selectSearchingResults(true);
if (!api.asc_findText(params.find, params.forward, params.caseSensitive, params.highlight) ) { if (!api.asc_findText(params.find, params.forward, params.caseSensitive, params.highlight) ) {
f7.dialog.alert(null, _t.textNoTextFound); f7.dialog.alert(null, _t.textNoTextFound);
} }

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

@ -85,7 +85,7 @@ const EditText = props => {
{!isAndroid && <Icon slot="media" icon="icon-text-additional"></Icon>} {!isAndroid && <Icon slot="media" icon="icon-text-additional"></Icon>}
</ListItem> </ListItem>
</List> </List>
{paragraphObj ? ( {paragraphObj || storeFocusObjects.settings.includes('text') ? (
<Fragment> <Fragment>
<List> <List>
<ListItem className='buttons'> <ListItem className='buttons'>
@ -241,7 +241,8 @@ const PageFonts = props => {
}; };
const paragraph = props.storeFocusObjects.paragraphObject; const paragraph = props.storeFocusObjects.paragraphObject;
if (!paragraph && Device.phone) { const shapeObj = props.storeFocusObjects.shapeObject;
if (!shapeObj && !paragraph && Device.phone) {
$$('.sheet-modal.modal-in').length > 0 && f7.sheet.close(); $$('.sheet-modal.modal-in').length > 0 && f7.sheet.close();
return null; return null;
} }
@ -325,7 +326,8 @@ const PageFontColor = props => {
}; };
const paragraph = props.storeFocusObjects.paragraphObject; const paragraph = props.storeFocusObjects.paragraphObject;
if (!paragraph && Device.phone) { const shapeObj = props.storeFocusObjects.shapeObject;
if (!shapeObj && !paragraph && Device.phone) {
$$('.sheet-modal.modal-in').length > 0 && f7.sheet.close(); $$('.sheet-modal.modal-in').length > 0 && f7.sheet.close();
return null; return null;
} }
@ -391,6 +393,7 @@ const PageAdditionalFormatting = props => {
const storeTextSettings = props.storeTextSettings; const storeTextSettings = props.storeTextSettings;
const storeFocusObjects = props.storeFocusObjects; const storeFocusObjects = props.storeFocusObjects;
const paragraphObj = storeFocusObjects.paragraphObject; const paragraphObj = storeFocusObjects.paragraphObject;
const shapeObj = storeFocusObjects.shapeObject;
const isSuperscript = storeTextSettings.isSuperscript; const isSuperscript = storeTextSettings.isSuperscript;
const isSubscript = storeTextSettings.isSubscript; const isSubscript = storeTextSettings.isSubscript;
@ -408,7 +411,7 @@ const PageAdditionalFormatting = props => {
letterSpacing = (paragraphObj.get_TextSpacing() === null || paragraphObj.get_TextSpacing() === undefined) ? paragraphObj.get_TextSpacing() : Common.Utils.Metric.fnRecalcFromMM(paragraphObj.get_TextSpacing()); letterSpacing = (paragraphObj.get_TextSpacing() === null || paragraphObj.get_TextSpacing() === undefined) ? paragraphObj.get_TextSpacing() : Common.Utils.Metric.fnRecalcFromMM(paragraphObj.get_TextSpacing());
} }
if (!paragraphObj && Device.phone) { if (!shapeObj && !paragraphObj && Device.phone) {
$$('.sheet-modal.modal-in').length > 0 && f7.sheet.close(); $$('.sheet-modal.modal-in').length > 0 && f7.sheet.close();
return null; return null;
} }
@ -473,7 +476,8 @@ const PageBullets = props => {
const typeBullets = storeTextSettings.typeBullets; const typeBullets = storeTextSettings.typeBullets;
const paragraph = props.storeFocusObjects.paragraphObject; const paragraph = props.storeFocusObjects.paragraphObject;
if (!paragraph && Device.phone) { const shapeObj = props.storeFocusObjects.shapeObject;
if (!shapeObj && !paragraph && Device.phone) {
$$('.sheet-modal.modal-in').length > 0 && f7.sheet.close(); $$('.sheet-modal.modal-in').length > 0 && f7.sheet.close();
return null; return null;
} }
@ -528,7 +532,8 @@ const PageNumbers = props => {
const typeNumbers = storeTextSettings.typeNumbers; const typeNumbers = storeTextSettings.typeNumbers;
const paragraph = props.storeFocusObjects.paragraphObject; const paragraph = props.storeFocusObjects.paragraphObject;
if (!paragraph && Device.phone) { const shapeObj = props.storeFocusObjects.shapeObject;
if (!shapeObj && !paragraph && Device.phone) {
$$('.sheet-modal.modal-in').length > 0 && f7.sheet.close(); $$('.sheet-modal.modal-in').length > 0 && f7.sheet.close();
return null; return null;
} }
@ -593,7 +598,8 @@ const PageLineSpacing = props => {
const lineSpacing = storeTextSettings.lineSpacing; const lineSpacing = storeTextSettings.lineSpacing;
const paragraph = props.storeFocusObjects.paragraphObject; const paragraph = props.storeFocusObjects.paragraphObject;
if (!paragraph && Device.phone) { const shapeObj = props.storeFocusObjects.shapeObject;
if (!shapeObj && !paragraph && Device.phone) {
$$('.sheet-modal.modal-in').length > 0 && f7.sheet.close(); $$('.sheet-modal.modal-in').length > 0 && f7.sheet.close();
return null; return null;
} }

2
apps/spreadsheeteditor/mobile/src/controller/Search.jsx
View file

@ -155,7 +155,7 @@ const Search = withTranslation()(props => {
options.asc_setScanByRows(searchBy); options.asc_setScanByRows(searchBy);
options.asc_setLookIn(lookIn ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value); options.asc_setLookIn(lookIn ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value);
api.asc_selectSearchingResults(true); if (params.highlight) api.asc_selectSearchingResults(true);
if (!api.asc_findText(options)) { if (!api.asc_findText(options)) {
f7.dialog.alert(null, _t.textNoTextFound); f7.dialog.alert(null, _t.textNoTextFound);