From 98884306914d694296c55666754eaf6475dc08a7 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Fri, 28 May 2021 12:18:26 +0300 Subject: [PATCH 1/3] [DE PE SSE mobile] Bug 48861 --- apps/documenteditor/mobile/src/view/edit/EditImage.jsx | 6 +++++- apps/presentationeditor/mobile/src/view/edit/EditImage.jsx | 5 ++++- apps/spreadsheeteditor/mobile/src/view/edit/EditImage.jsx | 5 ++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/edit/EditImage.jsx b/apps/documenteditor/mobile/src/view/edit/EditImage.jsx index 26795d0e3..9d662f30f 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditImage.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditImage.jsx @@ -236,6 +236,10 @@ const PageReorder = props => { const EditImage = props => { const { t } = useTranslation(); const _t = t('Edit', {returnObjects: true}); + const storeFocusObjects = props.storeFocusObjects; + const imageObject = storeFocusObjects.imageObject; + const pluginGuid = imageObject.asc_getPluginGuid(); + return ( @@ -246,7 +250,7 @@ const EditImage = props => { onOverlap: props.onOverlap, onWrapDistance: props.onWrapDistance }}> - diff --git a/apps/presentationeditor/mobile/src/view/edit/EditImage.jsx b/apps/presentationeditor/mobile/src/view/edit/EditImage.jsx index e5ca3d134..436735fcd 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditImage.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditImage.jsx @@ -8,11 +8,14 @@ import {Device} from '../../../../../common/mobile/utils/device'; const EditImage = props => { const { t } = useTranslation(); const _t = t('View.Edit', {returnObjects: true}); + const storeFocusObjects = props.storeFocusObjects; + const imageObject = storeFocusObjects.imageObject; + const pluginGuid = imageObject.asc_getPluginGuid(); return ( - diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditImage.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditImage.jsx index a71943fa3..f1662a2e6 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditImage.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditImage.jsx @@ -7,11 +7,14 @@ import {Device} from '../../../../../common/mobile/utils/device'; const EditImage = props => { const { t } = useTranslation(); const _t = t('View.Edit', {returnObjects: true}); + const storeFocusObjects = props.storeFocusObjects; + const imageObject = storeFocusObjects.imageObject; + const pluginGuid = imageObject.asc_getPluginGuid(); return ( - From edd4ed6629590dbb958a343922e79611e5289750 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Fri, 28 May 2021 15:12:21 +0300 Subject: [PATCH 2/3] [SSE mobile] Bug 48058 --- apps/spreadsheeteditor/mobile/locale/en.json | 2 ++ .../mobile/src/controller/add/AddChart.jsx | 27 +++++++++++++++---- .../mobile/src/view/add/Add.jsx | 2 +- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 49889fc50..c2662e79b 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -222,6 +222,8 @@ "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", "textEmptyImgUrl": "You need to specify image URL.", "notcriticalErrorTitle": "Warning", + "errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:
opening price, max price, min price, closing price.", + "errorMaxRows": "ERROR! The maximum number of data series per chart is 255.", "textLink": "Link", "textAddLink": "Add Link", "textLinkType": "Link Type", diff --git a/apps/spreadsheeteditor/mobile/src/controller/add/AddChart.jsx b/apps/spreadsheeteditor/mobile/src/controller/add/AddChart.jsx index 55d1b8e3a..b560d9519 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/add/AddChart.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/add/AddChart.jsx @@ -1,6 +1,7 @@ import React, {Component} from 'react'; import { f7 } from 'framework7-react'; import {Device} from '../../../../../common/mobile/utils/device'; +import { withTranslation } from 'react-i18next'; import AddChart from '../../view/add/AddChart'; @@ -20,10 +21,24 @@ class AddChartController extends Component { onInsertChart (type) { const api = Common.EditorApi.get(); - const settings = api.asc_getChartObject(); - settings.changeType(type); - api.asc_addChartDrawingObject(settings); - this.closeModal(); + const { t } = this.props; + const _t = t('View.Add', {returnObjects: true}); + const settings = api.asc_getChartObject(true); + const info = api.asc_getCellInfo(); + const selType = info.asc_getSelectionType(); + const isChartEdit = (selType == Asc.c_oAscSelectionType.RangeChart || selType == Asc.c_oAscSelectionType.RangeChartText); + + if (settings) { + isChartEdit ? settings.changeType(type) : settings.putType(type); + let range = settings.getRange(), + isValid = !!range ? api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.Chart, range, true, !settings.getInColumns(), settings.getType()) : Asc.c_oAscError.ID.No; + if (isValid == Asc.c_oAscError.ID.No) { + isChartEdit ? api.asc_editChartDrawingObject(settings) : api.asc_addChartDrawingObject(settings); + this.closeModal(); + } else { + f7.dialog.alert((isValid == Asc.c_oAscError.ID.StockChartError) ? _t.errorStockChart : ((isValid == Asc.c_oAscError.ID.MaxDataSeriesError) ? _t.errorMaxRows : _t.txtInvalidRange), _t.notcriticalErrorTitle); + } + } } render () { @@ -34,4 +49,6 @@ class AddChartController extends Component { } } -export default AddChartController; \ No newline at end of file +const AddChartControllerTranslated = withTranslation()(AddChartController); + +export {AddChartControllerTranslated as AddChartController}; \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/src/view/add/Add.jsx b/apps/spreadsheeteditor/mobile/src/view/add/Add.jsx index 3fd709181..b98e305ce 100644 --- a/apps/spreadsheeteditor/mobile/src/view/add/Add.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/add/Add.jsx @@ -5,7 +5,7 @@ import {f7} from 'framework7-react'; import { observer, inject } from "mobx-react"; import {Device} from '../../../../../common/mobile/utils/device'; -import AddChartController from "../../controller/add/AddChart"; +import {AddChartController} from "../../controller/add/AddChart"; import {AddFunctionController} from "../../controller/add/AddFunction"; import {PageFunctionGroup, PageFunctionInfo} from "./AddFunction"; import AddShapeController from "../../controller/add/AddShape"; From e9eb6fceda63ac31d9d8a29deea71750a828b8d3 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Sun, 30 May 2021 16:34:15 +0300 Subject: [PATCH 3/3] [DE PE SSE mobile] Corrected buttons --- .../mobile/resources/less/common-ios.less | 4 +++ .../resources/less/common-material.less | 27 ++++++++++++------- apps/common/mobile/resources/less/common.less | 6 ++--- .../mobile/src/view/add/AddImage.jsx | 2 +- .../mobile/src/view/add/AddLink.jsx | 2 +- .../mobile/src/view/add/AddOther.jsx | 2 +- .../mobile/src/view/edit/EditChart.jsx | 2 +- .../mobile/src/view/edit/EditHyperlink.jsx | 2 +- .../mobile/src/view/edit/EditImage.jsx | 4 +-- .../mobile/src/view/edit/EditShape.jsx | 2 +- .../mobile/src/view/edit/EditTable.jsx | 4 ++- .../mobile/src/view/add/AddImage.jsx | 2 +- .../mobile/src/view/add/AddLink.jsx | 2 +- .../mobile/src/view/edit/EditChart.jsx | 2 +- .../mobile/src/view/edit/EditImage.jsx | 4 +-- .../mobile/src/view/edit/EditLink.jsx | 6 ++--- .../mobile/src/view/edit/EditShape.jsx | 4 +-- .../mobile/src/view/edit/EditSlide.jsx | 6 ++--- .../mobile/src/view/edit/EditTable.jsx | 2 +- .../mobile/src/view/add/AddImage.jsx | 2 +- .../mobile/src/view/add/AddLink.jsx | 2 +- .../mobile/src/view/edit/EditChart.jsx | 2 +- .../mobile/src/view/edit/EditImage.jsx | 4 +-- .../mobile/src/view/edit/EditLink.jsx | 4 +-- .../mobile/src/view/edit/EditShape.jsx | 4 +-- 25 files changed, 58 insertions(+), 45 deletions(-) diff --git a/apps/common/mobile/resources/less/common-ios.less b/apps/common/mobile/resources/less/common-ios.less index 5bea40077..396a2051a 100644 --- a/apps/common/mobile/resources/less/common-ios.less +++ b/apps/common/mobile/resources/less/common-ios.less @@ -355,6 +355,10 @@ color: red; } + .list-button { + position: initial; + } + .block-title { position: relative; overflow: hidden; diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less index 4a6742756..c3cf6f0d3 100644 --- a/apps/common/mobile/resources/less/common-material.less +++ b/apps/common/mobile/resources/less/common-material.less @@ -103,7 +103,8 @@ .button-fill { color: @white; - background-color: @themeColor; + // background-color: @themeColor; + background-color: transparent; } .button-raised { @@ -116,14 +117,19 @@ } .buttons-list { - li { - margin: 20px 16px; - color: @white; - border-radius: 2px; - text-transform: uppercase; - height: 36px; - min-height: 36px; - font-size: 14px; + ul { + &::before, &::after { + display: none; + } + li { + margin: 20px 16px; + color: @white; + border-radius: 2px; + text-transform: uppercase; + height: 36px; + min-height: 36px; + font-size: 14px; + } } } @@ -142,7 +148,8 @@ font-size: 14px; font-weight: 500; border-radius: 2px; - margin: 20px 16px; + // margin: 20px 16px; + margin: 0; } .button-raised .list-button { box-shadow: 0 1px 3px rgba(0,0,0,.12), 0 1px 2px rgba(0,0,0,.24); diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index 77219dcec..39db52afd 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -339,9 +339,9 @@ .buttons-list { ul { - &::before, &::after { - display: none; - } + // &::before, &::after { + // display: none; + // } li { border: 0; font-weight: normal; diff --git a/apps/documenteditor/mobile/src/view/add/AddImage.jsx b/apps/documenteditor/mobile/src/view/add/AddImage.jsx index 066f03c8a..1fed2d95a 100644 --- a/apps/documenteditor/mobile/src/view/add/AddImage.jsx +++ b/apps/documenteditor/mobile/src/view/add/AddImage.jsx @@ -20,7 +20,7 @@ const PageLinkSettings = props => { > - + {props.onInsertByUrl(stateValue)}}> diff --git a/apps/documenteditor/mobile/src/view/add/AddLink.jsx b/apps/documenteditor/mobile/src/view/add/AddLink.jsx index 8239d3819..479ed3603 100644 --- a/apps/documenteditor/mobile/src/view/add/AddLink.jsx +++ b/apps/documenteditor/mobile/src/view/add/AddLink.jsx @@ -39,7 +39,7 @@ const PageLink = props => { onChange={(event) => {setTip(event.target.value)}} > - + { props.onInsertLink(stateLink, stateDisplay, stateTip) }}> diff --git a/apps/documenteditor/mobile/src/view/add/AddOther.jsx b/apps/documenteditor/mobile/src/view/add/AddOther.jsx index 0ea3485a1..f32b48ae0 100644 --- a/apps/documenteditor/mobile/src/view/add/AddOther.jsx +++ b/apps/documenteditor/mobile/src/view/add/AddOther.jsx @@ -141,7 +141,7 @@ const PageFootnote = props => { ) })} - + { props.onInsertFootnote(stateFormat, stateStartAt, stateLocation); }}> diff --git a/apps/documenteditor/mobile/src/view/edit/EditChart.jsx b/apps/documenteditor/mobile/src/view/edit/EditChart.jsx index 4a013cf20..a539c9339 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditChart.jsx @@ -446,7 +446,7 @@ const EditChart = props => { onReorder: props.onReorder }}> - + {props.onRemoveChart()}} className='button-red button-fill button-raised'/> diff --git a/apps/documenteditor/mobile/src/view/edit/EditHyperlink.jsx b/apps/documenteditor/mobile/src/view/edit/EditHyperlink.jsx index b05207cc8..9509f0a54 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditHyperlink.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditHyperlink.jsx @@ -38,7 +38,7 @@ const EditHyperlink = props => { onChange={(event) => {setTip(event.target.value)}} > - + { props.onEditLink(stateLink, stateDisplay, stateTip) }}> diff --git a/apps/documenteditor/mobile/src/view/edit/EditImage.jsx b/apps/documenteditor/mobile/src/view/edit/EditImage.jsx index 9d662f30f..d87558efc 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditImage.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditImage.jsx @@ -156,7 +156,7 @@ const PageLinkSettings = props => { > - + {onReplace()}}> @@ -258,7 +258,7 @@ const EditImage = props => { onReorder: props.onReorder }}> - + {props.onDefaulSize()}}/> {props.onRemoveImage()}}/> diff --git a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx index 093bb735a..bd7168253 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx @@ -536,7 +536,7 @@ const EditShape = props => { onReorder: props.onReorder }}> - + {props.onRemoveShape()}} className='button-red button-fill button-raised'/> diff --git a/apps/documenteditor/mobile/src/view/edit/EditTable.jsx b/apps/documenteditor/mobile/src/view/edit/EditTable.jsx index e1eb03bd4..85f24591b 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditTable.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditTable.jsx @@ -560,7 +560,9 @@ const EditTable = props => { - {props.onRemoveTable()}} className='button-red button-fill button-raised'> + + {props.onRemoveTable()}} className='button-red button-fill button-raised'> + { > - + {props.onInsertByUrl(stateValue)}}> diff --git a/apps/presentationeditor/mobile/src/view/add/AddLink.jsx b/apps/presentationeditor/mobile/src/view/add/AddLink.jsx index 7d1b3bcaf..4894ac965 100644 --- a/apps/presentationeditor/mobile/src/view/add/AddLink.jsx +++ b/apps/presentationeditor/mobile/src/view/add/AddLink.jsx @@ -143,7 +143,7 @@ const PageLink = props => { /> - { props.onInsertLink(typeLink, (typeLink === 1 ? diff --git a/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx b/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx index 7371610c2..abb6e96a7 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx @@ -346,7 +346,7 @@ const EditChart = props => { onAlign: props.onAlign }}> - + {props.onRemoveChart()}} className='button-red button-fill button-raised'/> diff --git a/apps/presentationeditor/mobile/src/view/edit/EditImage.jsx b/apps/presentationeditor/mobile/src/view/edit/EditImage.jsx index 436735fcd..21ab126e1 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditImage.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditImage.jsx @@ -27,8 +27,8 @@ const EditImage = props => { }}> - {_t.textActualSize} - {_t.textRemoveImage} + {_t.textActualSize} + {_t.textRemoveImage} ) diff --git a/apps/presentationeditor/mobile/src/view/edit/EditLink.jsx b/apps/presentationeditor/mobile/src/view/edit/EditLink.jsx index 04534f3cf..0eb57f819 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditLink.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditLink.jsx @@ -171,7 +171,7 @@ const PageLink = props => { /> - { props.onEditLink(typeLink, (typeLink === 1 ? @@ -179,8 +179,8 @@ const PageLink = props => { {linkTo: linkTo, numberTo: numberTo, display: stateDisplay, tip: screenTip, displayDisabled: displayDisabled})); }} /> - { props.onRemoveLink() }} diff --git a/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx b/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx index 5f93af329..e34641ddc 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx @@ -1,6 +1,6 @@ import React, {Fragment, useState} from 'react'; import {observer, inject} from "mobx-react"; -import {f7, Page, Navbar, List, ListItem, Row, BlockTitle, Link, Toggle, Icon, View, NavRight, ListItemCell, Range, Button, Segmented, Tab, Tabs} from 'framework7-react'; +import {f7, Page, Navbar, List, ListItem, Row, BlockTitle, Link, Toggle, Icon, View, NavRight, ListItemCell, Range, Button, Segmented, Tab, Tabs, ListButton} from 'framework7-react'; import { ThemeColorPalette, CustomColorPicker } from '../../../../../common/mobile/lib/component/ThemeColorPalette.jsx'; import { useTranslation } from 'react-i18next'; import {Device} from '../../../../../common/mobile/utils/device'; @@ -39,7 +39,7 @@ const EditShape = props => { }}> - {_t.textRemoveShape} + {_t.textRemoveShape} ) diff --git a/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx b/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx index 07685bd1e..8e1927567 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx @@ -1,6 +1,6 @@ import React, {Fragment, useState} from 'react'; import {observer, inject} from "mobx-react"; -import {f7, Page, Navbar, List, ListItem, Row, BlockTitle, Link, Toggle, Icon, View, NavRight, ListItemCell, Range, Button, Segmented} from 'framework7-react'; +import {f7, Page, Navbar, List, ListItem, Row, BlockTitle, Link, Toggle, Icon, View, NavRight, ListItemCell, Range, Button, Segmented, ListButton} from 'framework7-react'; import { ThemeColorPalette, CustomColorPicker } from '../../../../../common/mobile/lib/component/ThemeColorPalette.jsx'; import { useTranslation } from 'react-i18next'; import {Device} from '../../../../../common/mobile/utils/device'; @@ -32,8 +32,8 @@ const EditSlide = props => { }}> - {_t.textDuplicateSlide} - {_t.textDeleteSlide} + {_t.textDuplicateSlide} + {_t.textDeleteSlide} ) diff --git a/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx b/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx index bd0544906..5adbad185 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx @@ -446,7 +446,7 @@ const EditTable = props => { - {props.onRemoveTable()}} className='button button-raised button-red'> + {props.onRemoveTable()}} className='button-red button-fill button-raised'> diff --git a/apps/spreadsheeteditor/mobile/src/view/add/AddImage.jsx b/apps/spreadsheeteditor/mobile/src/view/add/AddImage.jsx index c71fbc56b..a23ad9a3c 100644 --- a/apps/spreadsheeteditor/mobile/src/view/add/AddImage.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/add/AddImage.jsx @@ -36,7 +36,7 @@ const PageLinkSettings = props => { > - + {props.onInsertByUrl(stateValue)}}> diff --git a/apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx b/apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx index 2b2086bc1..bb107b16e 100644 --- a/apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx @@ -129,7 +129,7 @@ const AddLinkView = props => { className={isIos ? 'list-input-right' : ''} /> - + {props.onInsertLink(typeLink === 'ext' ? diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx index 539fdc2e8..7662e68fa 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx @@ -1466,7 +1466,7 @@ const EditChart = props => { onReorder: props.onReorder }}> - + {props.onRemoveChart()}} className='button-red button-fill button-raised'/> diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditImage.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditImage.jsx index f1662a2e6..800494c90 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditImage.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditImage.jsx @@ -23,8 +23,8 @@ const EditImage = props => { }}> - {_t.textActualSize} - {_t.textRemoveImage} + {_t.textActualSize} + {_t.textRemoveImage} ) diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditLink.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditLink.jsx index 24db43a7c..5b8772a34 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditLink.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditLink.jsx @@ -157,7 +157,7 @@ const EditLink = props => { className={isIos ? 'list-input-right' : ''} /> - + {props.onEditLink(typeLink === 1 ? @@ -165,7 +165,7 @@ const EditLink = props => { {type: 2, url: range, sheet: curSheet, text: stateDisplayText, tooltip: screenTip})}} /> props.onRemoveLink()} /> diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx index f4fcb7c19..985780506 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx @@ -1,6 +1,6 @@ import React, {Fragment, useState} from 'react'; import {observer, inject} from "mobx-react"; -import {f7, Page, Navbar, NavRight, List, ListItem, Link, Icon, Range, Tab, Tabs} from 'framework7-react'; +import {f7, Page, Navbar, NavRight, List, ListItem, Link, Icon, Range, Tab, Tabs, ListButton} from 'framework7-react'; import { ThemeColorPalette, CustomColorPicker } from '../../../../../common/mobile/lib/component/ThemeColorPalette.jsx'; import { useTranslation } from 'react-i18next'; import {Device} from '../../../../../common/mobile/utils/device'; @@ -36,7 +36,7 @@ const EditShape = props => { }}> - {_t.textRemoveShape} + {_t.textRemoveShape} )