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

Fix Bug 48109

Browse source
This commit is contained in:
ShimaginAndrey 2021-06-15 16:22:38 +03:00
parent 237d03ea57
commit 0022202b4d
2 changed files with 42 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/documenteditor/mobile/src/view/add/Add.jsx
View file

@ -76,30 +76,36 @@ const AddLayoutContent = ({ tabs }) => {
) )
}; };
const AddTabs = props => { const AddTabs = inject("storeFocusObjects")(observer(({storeFocusObjects, showPanels, style, inPopover}) => {
const { t } = useTranslation(); const { t } = useTranslation();
const _t = t('Add', {returnObjects: true}); const _t = t('Add', {returnObjects: true});
const showPanels = props.showPanels;
const tabs = []; const tabs = [];
if (!showPanels) { const options = storeFocusObjects.settings;
if (!showPanels && options.indexOf('text') > -1) {
tabs.push({ tabs.push({
caption: _t.textTable, caption: _t.textTable,
id: 'add-table', id: 'add-table',
icon: 'icon-add-table', icon: 'icon-add-table',
component: <AddTableController/> component: <AddTableController/>
}); });
}
if(!showPanels) {
tabs.push({ tabs.push({
caption: _t.textShape, caption: _t.textShape,
id: 'add-shape', id: 'add-shape',
icon: 'icon-add-shape', icon: 'icon-add-shape',
component: <AddShapeController/> component: <AddShapeController/>
}); });
}
if(!showPanels) {
tabs.push({ tabs.push({
caption: _t.textImage, caption: _t.textImage,
id: 'add-image', id: 'add-image',
icon: 'icon-add-image', icon: 'icon-add-image',
component: <AddImageController/> component: <AddImageController/>
}); });
}
if(!showPanels) {
tabs.push({ tabs.push({
caption: _t.textOther, caption: _t.textOther,
id: 'add-other', id: 'add-other',
@ -115,14 +121,14 @@ const AddTabs = props => {
}); });
} }
return ( return (
<View style={props.style} stackPages={true} routes={routes}> <View style={style} stackPages={true} routes={routes}>
<Page pageContent={false}> <Page pageContent={false}>
<AddLayoutNavbar tabs={tabs} inPopover={props.inPopover}/> <AddLayoutNavbar tabs={tabs} inPopover={inPopover}/>
<AddLayoutContent tabs={tabs} /> <AddLayoutContent tabs={tabs} />
</Page> </Page>
</View> </View>
) )
}; }));
class AddView extends Component { class AddView extends Component {
constructor(props) { constructor(props) {

51
apps/documenteditor/mobile/src/view/add/AddOther.jsx
View file

@ -153,46 +153,55 @@ const PageFootnote = props => {
const AddOther = props => { const AddOther = props => {
const { t } = useTranslation(); const { t } = useTranslation();
const _t = t('Add', {returnObjects: true}); const _t = t('Add', {returnObjects: true});
const storeFocusObjects = props.storeFocusObjects;
let isShape = storeFocusObjects.settings.indexOf('shape') > -1,
isText = storeFocusObjects.settings.indexOf('text') > -1,
isChart = storeFocusObjects.settings.indexOf('chart') > -1;
return ( return (
<List> <List>
<ListItem title={_t.textComment} onClick={() => { {isText &&<ListItem title={_t.textComment} onClick={() => {
props.closeModal(); props.closeModal();
Common.Notifications.trigger('addcomment'); Common.Notifications.trigger('addcomment');
}}> }}>
<Icon slot="media" icon="icon-insert-comment"></Icon> <Icon slot="media" icon="icon-insert-comment"></Icon>
</ListItem> </ListItem>}
<ListItem title={_t.textLink} link={'/add-link/'} routeProps={{ {isText && <ListItem title={_t.textLink} link={'/add-link/'} routeProps={{
onInsertLink: props.onInsertLink, onInsertLink: props.onInsertLink,
getDisplayLinkText: props.getDisplayLinkText getDisplayLinkText: props.getDisplayLinkText
}}> }}>
<Icon slot="media" icon="icon-link"></Icon> <Icon slot="media" icon="icon-link"></Icon>
</ListItem> </ListItem>}
<ListItem title={_t.textPageNumber} link={'/add-page-number/'} routeProps={{ <ListItem title={_t.textPageNumber} link={'/add-page-number/'} routeProps={{
onInsertPageNumber: props.onInsertPageNumber onInsertPageNumber: props.onInsertPageNumber
}}> }}>
<Icon slot="media" icon="icon-pagenumber"></Icon> <Icon slot="media" icon="icon-pagenumber"></Icon>
</ListItem> </ListItem>
<ListItem title={_t.textBreak} link={'/add-break/'} routeProps={{ {(isShape || isChart) ? null :
onPageBreak: props.onPageBreak, <ListItem title={_t.textBreak} link={'/add-break/'} routeProps={{
onColumnBreak: props.onColumnBreak, onPageBreak: props.onPageBreak,
onInsertSectionBreak: props.onInsertSectionBreak onColumnBreak: props.onColumnBreak,
}}> onInsertSectionBreak: props.onInsertSectionBreak
<Icon slot="media" icon="icon-sectionbreak"></Icon> }}>
</ListItem> <Icon slot="media" icon="icon-sectionbreak"></Icon>
<ListItem title={_t.textFootnote} link={'/add-footnote/'} routeProps={{ </ListItem>
getFootnoteProps: props.getFootnoteProps, }
getFootnoteStartAt: props.getFootnoteStartAt, {(isShape || isChart) ? null :
onFootnoteStartAt: props.onFootnoteStartAt, <ListItem title={_t.textFootnote} link={'/add-footnote/'} routeProps={{
onInsertFootnote: props.onInsertFootnote, getFootnoteProps: props.getFootnoteProps,
initFootnoteStartAt: props.initFootnoteStartAt getFootnoteStartAt: props.getFootnoteStartAt,
}}> onFootnoteStartAt: props.onFootnoteStartAt,
<Icon slot="media" icon="icon-footnote"></Icon> onInsertFootnote: props.onInsertFootnote,
</ListItem> initFootnoteStartAt: props.initFootnoteStartAt
}}>
<Icon slot="media" icon="icon-footnote"></Icon>
</ListItem>}
</List> </List>
) )
}; };
const AddOtherContainer = inject("storeComments")(observer(AddOther)); const AddOtherContainer = inject("storeComments","storeFocusObjects")(observer(AddOther));
export {AddOtherContainer as AddOther, export {AddOtherContainer as AddOther,
PageNumber as PageAddNumber, PageNumber as PageAddNumber,