diff --git a/apps/documenteditor/mobile/src/view/edit/Edit.jsx b/apps/documenteditor/mobile/src/view/edit/Edit.jsx index 907bf9b29..77864ed67 100644 --- a/apps/documenteditor/mobile/src/view/edit/Edit.jsx +++ b/apps/documenteditor/mobile/src/view/edit/Edit.jsx @@ -291,18 +291,25 @@ const EditTabs = props => { component: }); } else { - if (settings.indexOf('text') > -1) { + if (settings.indexOf('image') > -1) { editors.push({ - caption: _t.textText, - id: 'edit-text', - component: + caption: _t.textImage, + id: 'edit-image', + component: }) } - if (settings.indexOf('paragraph') > -1) { + if (settings.indexOf('shape') > -1) { editors.push({ - caption: _t.textParagraph, - id: 'edit-paragraph', - component: + caption: _t.textShape, + id: 'edit-shape', + component: + }) + } + if (settings.indexOf('chart') > -1) { + editors.push({ + caption: _t.textChart, + id: 'edit-chart', + component: }) } if (settings.indexOf('table') > -1) { @@ -319,27 +326,6 @@ const EditTabs = props => { component: }) } - if (settings.indexOf('shape') > -1) { - editors.push({ - caption: _t.textShape, - id: 'edit-shape', - component: - }) - } - if (settings.indexOf('image') > -1) { - editors.push({ - caption: _t.textImage, - id: 'edit-image', - component: - }) - } - if (settings.indexOf('chart') > -1) { - editors.push({ - caption: _t.textChart, - id: 'edit-chart', - component: - }) - } if(inToc) { editors.push({ caption: _t.textTableOfCont, @@ -347,13 +333,20 @@ const EditTabs = props => { component: }) } - // if (settings.indexOf('hyperlink') > -1) { - // editors.push({ - // caption: _t.textHyperlink, - // id: 'edit-link', - // component: - // }) - // } + if (settings.indexOf('paragraph') > -1) { + editors.push({ + caption: _t.textParagraph, + id: 'edit-paragraph', + component: + }) + } + if (settings.indexOf('text') > -1) { + editors.push({ + caption: _t.textText, + id: 'edit-text', + component: + }) + } } return ( diff --git a/apps/presentationeditor/mobile/src/view/edit/Edit.jsx b/apps/presentationeditor/mobile/src/view/edit/Edit.jsx index 0ae622112..b47928a1d 100644 --- a/apps/presentationeditor/mobile/src/view/edit/Edit.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/Edit.jsx @@ -289,18 +289,11 @@ const EditTabs = props => { component: }); } else { - if (settings.indexOf('slide') > -1) { + if (settings.indexOf('image') > -1) { editors.push({ - caption: _t.textSlide, - id: 'edit-slide', - component: - }) - } - if (settings.indexOf('text') > -1) { - editors.push({ - caption: _t.textText, - id: 'edit-text', - component: + caption: _t.textImage, + id: 'edit-image', + component: }) } if (settings.indexOf('shape') > -1) { @@ -310,13 +303,6 @@ const EditTabs = props => { component: }) } - if (settings.indexOf('image') > -1) { - editors.push({ - caption: _t.textImage, - id: 'edit-image', - component: - }) - } if (settings.indexOf('table') > -1) { editors.push({ caption: _t.textTable, @@ -331,11 +317,18 @@ const EditTabs = props => { component: }) } - if (settings.indexOf('hyperlink') > -1) { + if (settings.indexOf('text') > -1) { editors.push({ - caption: _t.textHyperlink, - id: 'edit-link', - component: + caption: _t.textText, + id: 'edit-text', + component: + }) + } + if (settings.indexOf('slide') > -1) { + editors.push({ + caption: _t.textSlide, + id: 'edit-slide', + component: }) } } diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx index 7ae2ed12f..651bb6fc5 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx @@ -363,11 +363,11 @@ const EditTabs = props => { component: }); } else { - if (settings.indexOf('cell') > -1) { + if (!(wsProps.Objects && store.isLockedShape) && settings.indexOf('image') > -1) { editors.push({ - caption: _t.textCell, - id: 'edit-text', - component: + caption: _t.textImage, + id: 'edit-image', + component: }) } if (!(wsProps.Objects && store.isLockedShape) && settings.indexOf('shape') > -1) { @@ -377,11 +377,11 @@ const EditTabs = props => { component: }) } - if (!(wsProps.Objects && store.isLockedText) && settings.indexOf('text') > -1) { + if (settings.indexOf('cell') > -1) { editors.push({ - caption: _t.textText, + caption: _t.textCell, id: 'edit-text', - component: + component: }) } if (!(wsProps.Objects && store.isLockedShape) && settings.indexOf('chart') > -1) { @@ -391,22 +391,23 @@ const EditTabs = props => { component: }) } - if (!(wsProps.Objects && store.isLockedShape) && settings.indexOf('image') > -1) { + if (!(wsProps.Objects && store.isLockedText) && settings.indexOf('text') > -1) { editors.push({ - caption: _t.textImage, - id: 'edit-image', - component: + caption: _t.textText, + id: 'edit-text', + component: }) } - if(!wsProps.Objects) { - if (settings.indexOf('hyperlink') > -1 || (props.hyperinfo && props.isAddShapeHyperlink)) { - editors.push({ - caption: _t.textHyperlink, - id: 'edit-link', - component: - }) - } - } + + // if(!wsProps.Objects) { + // if (settings.indexOf('hyperlink') > -1 || (props.hyperinfo && props.isAddShapeHyperlink)) { + // editors.push({ + // caption: _t.textHyperlink, + // id: 'edit-link', + // component: + // }) + // } + // } } if(!editors.length) {