From 8170df1e9e468d13c25c3f65abf04dc1c99829cd Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Wed, 2 Jun 2021 18:33:27 +0300 Subject: [PATCH 1/8] Create multi-level list --- .../mobile/resources/less/common-ios.less | 5 +- .../resources/less/common-material.less | 5 +- apps/documenteditor/mobile/locale/en.json | 3 +- .../mobile/src/controller/Main.jsx | 8 ++ .../mobile/src/controller/edit/EditText.jsx | 6 + apps/documenteditor/mobile/src/less/app.less | 8 ++ .../mobile/src/store/textSettings.js | 7 ++ .../mobile/src/view/edit/Edit.jsx | 6 +- .../mobile/src/view/edit/EditText.jsx | 115 +++++++++++++----- 9 files changed, 124 insertions(+), 39 deletions(-) diff --git a/apps/common/mobile/resources/less/common-ios.less b/apps/common/mobile/resources/less/common-ios.less index 396a2051a..768c89836 100644 --- a/apps/common/mobile/resources/less/common-ios.less +++ b/apps/common/mobile/resources/less/common-ios.less @@ -123,9 +123,10 @@ } } - // Bullets and numbers + // Bullets, numbers and multilevels .bullets, - .numbers { + .numbers, + .multilevels { .page-content { background: @white; } diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less index c3cf6f0d3..a5dac86cb 100644 --- a/apps/common/mobile/resources/less/common-material.less +++ b/apps/common/mobile/resources/less/common-material.less @@ -272,9 +272,10 @@ } } } - // Bullets and numbers + // Bullets, numbers and multilevels .bullets, - .numbers { + .numbers, + .multilevels { .page-content { background: @white; } diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index eb22ff811..a76f25460 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -360,8 +360,7 @@ "textHighlightColor": "Highlight Color", "textAdditionalFormatting": "Additional Formatting", "textAdditional": "Additional", - "textBullets": "Bullets", - "textNumbers": "Numbers", + "textBulletsAndNumbers": "Bullets & Numbers", "textLineSpacing": "Line Spacing", "textFonts": "Fonts", "textAuto": "Auto", diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx index 161971b67..c0abeec6d 100644 --- a/apps/documenteditor/mobile/src/controller/Main.jsx +++ b/apps/documenteditor/mobile/src/controller/Main.jsx @@ -544,14 +544,22 @@ class MainController extends Component { case 0: storeTextSettings.resetBullets(subtype); storeTextSettings.resetNumbers(-1); + storeTextSettings.resetMultiLevel(-1); break; case 1: storeTextSettings.resetNumbers(subtype); storeTextSettings.resetBullets(-1); + storeTextSettings.resetMultiLevel(-1); + break; + case 2: + storeTextSettings.resetMultiLevel(subtype); + storeTextSettings.resetBullets(-1); + storeTextSettings.resetNumbers(-1); break; default: storeTextSettings.resetBullets(-1); storeTextSettings.resetNumbers(-1); + storeTextSettings.resetMultiLevel(-1); } }); this.api.asc_registerCallback('asc_onPrAlign', (align) => { diff --git a/apps/documenteditor/mobile/src/controller/edit/EditText.jsx b/apps/documenteditor/mobile/src/controller/edit/EditText.jsx index 922458b4b..af59de04a 100644 --- a/apps/documenteditor/mobile/src/controller/edit/EditText.jsx +++ b/apps/documenteditor/mobile/src/controller/edit/EditText.jsx @@ -183,6 +183,11 @@ class EditTextController extends Component { } } + onMultiLevelList(type) { + const api = Common.EditorApi.get(); + if (api) api.put_ListType(2, parseInt(type)); + } + onLineSpacing(value) { const api = Common.EditorApi.get(); if (api) { @@ -210,6 +215,7 @@ class EditTextController extends Component { onParagraphMove={this.onParagraphMove} onBullet={this.onBullet} onNumber={this.onNumber} + onMultiLevelList={this.onMultiLevelList} onLineSpacing={this.onLineSpacing} /> ) diff --git a/apps/documenteditor/mobile/src/less/app.less b/apps/documenteditor/mobile/src/less/app.less index 959e96f05..f3c36c7d0 100644 --- a/apps/documenteditor/mobile/src/less/app.less +++ b/apps/documenteditor/mobile/src/less/app.less @@ -96,3 +96,11 @@ } } +.phone, .tablet { + .swiper-container{ + position: static; + } +} + + + diff --git a/apps/documenteditor/mobile/src/store/textSettings.js b/apps/documenteditor/mobile/src/store/textSettings.js index 9f3efa926..7ebb9c62f 100644 --- a/apps/documenteditor/mobile/src/store/textSettings.js +++ b/apps/documenteditor/mobile/src/store/textSettings.js @@ -14,6 +14,7 @@ export class storeTextSettings { listType: observable, typeBullets: observable, typeNumbers: observable, + typeMultiLevel: observable, paragraphAlign: observable, textColor: observable, customTextColors: observable, @@ -32,6 +33,7 @@ export class storeTextSettings { resetListType: action, resetBullets: action, resetNumbers: action, + resetMultiLevel: action, resetParagraphAlign: action, resetTextColor: action, changeCustomTextColors: action, @@ -52,6 +54,7 @@ export class storeTextSettings { listType = undefined; typeBullets = undefined; typeNumbers = undefined; + typeMultiLevel = undefined; paragraphAlign = undefined; textColor = undefined; customTextColors = []; @@ -115,6 +118,10 @@ export class storeTextSettings { this.typeNumbers = type; } + resetMultiLevel(type) { + this.typeMultiLevel = type; + } + resetParagraphAlign (align) { let value; switch (align) { diff --git a/apps/documenteditor/mobile/src/view/edit/Edit.jsx b/apps/documenteditor/mobile/src/view/edit/Edit.jsx index bd9bb4c7a..e6d60c3f5 100644 --- a/apps/documenteditor/mobile/src/view/edit/Edit.jsx +++ b/apps/documenteditor/mobile/src/view/edit/Edit.jsx @@ -14,7 +14,7 @@ import EditChartController from "../../controller/edit/EditChart"; import EditHyperlinkController from "../../controller/edit/EditHyperlink"; import EditHeaderController from "../../controller/edit/EditHeader"; -import {PageTextFonts, PageTextAddFormatting, PageTextBullets, PageTextNumbers, PageTextLineSpacing, PageTextFontColor, PageTextCustomFontColor, PageTextBackgroundColor, PageTextCustomBackColor} from "./EditText"; +import {PageTextFonts, PageTextAddFormatting, PageTextBullets, PageTextNumbers, PageTextBulletsAndNumbers, PageTextLineSpacing, PageTextFontColor, PageTextCustomFontColor, PageTextBackgroundColor, PageTextCustomBackColor} from "./EditText"; import {ParagraphAdvSettings, PageParagraphBackColor, PageParagraphCustomColor} from "./EditParagraph"; import {PageShapeStyleNoFill, PageShapeStyle, PageShapeCustomFillColor, PageShapeBorderColor, PageShapeCustomBorderColor, PageWrap, PageReorder, PageReplace} from "./EditShape"; import {PageImageReorder, PageImageReplace, PageImageWrap, PageLinkSettings} from "./EditImage"; @@ -39,6 +39,10 @@ const routes = [ path: '/edit-text-numbers/', component: PageTextNumbers, }, + { + path: '/edit-bullets-and-numbers/', + component: PageTextBulletsAndNumbers, + }, { path: '/edit-text-line-spacing/', component: PageTextLineSpacing, diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx index e14cf43ed..696eb33bc 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditText.jsx @@ -1,6 +1,6 @@ import React, {Fragment, useState } from 'react'; import {observer, inject} from "mobx-react"; -import {f7, List, ListItem, Icon, Row, Button, Page, Navbar, NavRight, Segmented, BlockTitle, Link} from 'framework7-react'; +import {f7, Swiper, SwiperSlide, List, ListItem, Icon, Row, Button, Page, Navbar, NavRight, Segmented, BlockTitle, Link} from 'framework7-react'; import { useTranslation } from 'react-i18next'; import {Device} from '../../../../../common/mobile/utils/device'; @@ -154,19 +154,10 @@ const PageBullets = props => { ] ]; const storeTextSettings = props.storeTextSettings; - const typeBullets = storeTextSettings.typeBullets; + const typeBullets = props.typeBullets; return( - - - {Device.phone && - - - - - - } - +
{bulletArrays.map((bullets, index) => (
    {bullets.map((bullet) => ( @@ -187,7 +178,7 @@ const PageBullets = props => { ))}
))} - +
) }; @@ -207,19 +198,12 @@ const PageNumbers = props => { {type: 7, thumb: 'number-07.png'} ] ]; + const storeTextSettings = props.storeTextSettings; - const typeNumbers = storeTextSettings.typeNumbers; + const typeNumbers = props.typeNumbers; + return( - - - {Device.phone && - - - - - - } - +
{numberArrays.map((numbers, index) => (
    {numbers.map((number) => ( @@ -240,10 +224,78 @@ const PageNumbers = props => { ))}
))} - +
) }; +const PageMultiLevel = props => { + const { t } = useTranslation(); + + const arrayMultiLevel = [ + {type: -1, thumb: ''}, + {type: 1, thumb: 'multi-bracket.png'}, + {type: 2, thumb: 'multi-dot.png'}, + {type: 3, thumb: 'multi-bullets.png'}, + ]; + + const storeTextSettings = props.storeTextSettings; + const typeMultiLevel = props.typeMultiLevel; + + console.log(typeMultiLevel) + + return( +
+
    + {arrayMultiLevel.map((item) => ( +
  • { + if (item.type === -1) { + storeTextSettings.resetMultiLevel(-1); + } + props.onMultiLevelList(item.type); + }}> + {item.thumb.length < 1 ? +
    + +
    : +
    + } +
    • + ))} +
+
+ ) + +} + +const PageBulletsAndNumbers = props => { + const { t } = useTranslation(); + + const storeTextSettings = props.storeTextSettings; + const typeNumbers = storeTextSettings.typeNumbers; + const typeBullets = storeTextSettings.typeBullets; + const typeMultiLevel = storeTextSettings.typeMultiLevel; + + return ( + + + {Device.phone && + + + + + + } + + + + + + + + ) +} + const PageLineSpacing = props => { const { t } = useTranslation(); const storeTextSettings = props.storeTextSettings; @@ -501,16 +553,13 @@ const EditText = props => { - {!isAndroid && } - - {!isAndroid && } - @@ -526,6 +575,7 @@ const PageTextFonts = inject("storeTextSettings", "storeFocusObjects")(observer( const PageTextAddFormatting = inject("storeTextSettings", "storeFocusObjects")(observer(PageAdditionalFormatting)); const PageTextBullets = inject("storeTextSettings")(observer(PageBullets)); const PageTextNumbers = inject("storeTextSettings")(observer(PageNumbers)); +const PageTextBulletsAndNumbers = inject("storeTextSettings")(observer(PageBulletsAndNumbers)); const PageTextLineSpacing = inject("storeTextSettings")(observer(PageLineSpacing)); const PageTextFontColor = inject("storeTextSettings", "storePalette")(observer(PageFontColor)); const PageTextCustomFontColor = inject("storeTextSettings", "storePalette")(observer(PageCustomFontColor)); @@ -539,6 +589,7 @@ export { PageTextAddFormatting, PageTextBullets, PageTextNumbers, + PageTextBulletsAndNumbers, PageTextLineSpacing, PageTextFontColor, PageTextCustomFontColor, From b53941b2d5225cba67a03a057a585b4196543571 Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Thu, 3 Jun 2021 11:33:32 +0300 Subject: [PATCH 2/8] Add icons multilevel --- .../resources/img/multilevels/multi-bracket.png | Bin 0 -> 1586 bytes .../resources/img/multilevels/multi-bullets.png | Bin 0 -> 1307 bytes .../resources/img/multilevels/multi-dot.png | Bin 0 -> 808 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 apps/documenteditor/mobile/resources/img/multilevels/multi-bracket.png create mode 100644 apps/documenteditor/mobile/resources/img/multilevels/multi-bullets.png create mode 100644 apps/documenteditor/mobile/resources/img/multilevels/multi-dot.png diff --git a/apps/documenteditor/mobile/resources/img/multilevels/multi-bracket.png b/apps/documenteditor/mobile/resources/img/multilevels/multi-bracket.png new file mode 100644 index 0000000000000000000000000000000000000000..c7bb0a2491f4bf55ca82a6aca2dcefdb12be550c GIT binary patch literal 1586 zcmb7Ec`(}v6#nIKMO5kv%DRG9sc7q1XBuooQ4Q;=Bd*32Wur8utwdR>Dx_;hk&0>+ zaTYB~v2}#D#8F38MWd9dV|A@7(M@M|X8+om?jPU#=Dly`{qw!|-E?=u$-q=$0079~ zog4@vrhbE@xTwCc4Sp#isaPl9H~>)6{RR-8fLa#~L2(2e7N{9iTM{);(ka(d08met z76gj{fLI^i;glx@w89J^Ogky0)e64At&~X+6%uI7;z`Aa;7Udn(2zorusE6@CYGZJ zuPBg!g(C9AP$!PYCh)BJ#XovC%ITa#giSHxhrAz_(-Hz#m!_+|W2^AU@*dFhch9)*wY3xSq z&N_a5DiTMIu(EjxCIdksgBrc@BZkz%8mZP-;2l&hfDj-%TAS^InBpg;$I|Ar9nOFx z_b2o($?jq$JNOHyv2_dE9vtwEE}n)jt!WM7@@O<>br7Co@AY1S0?!iUKIp7;)_*xQ z>86?LF3+$sYf&t6*3(>iYyu+IQo$UpNF?=~(0IlOHPvtvj;Pr$-uUEX)~yHSa+B-A zuj-&KSN#m^?d`?C5}KYAuA7?lBP%{bK3UQ7?Zk{}nkgPyEn(3r7}-qCb@gi=8LmZi zEV=(J6n)nvdq(&$=iTEc)x9?BPAHe%_?H%xt=?IOnN zp-i7>LsIoKZHBCd8-B$SLLe+xrWXP536s$LbN zWfy`k)a(Rs2Ez2HTnquCZps*Mr?p^kXM?luMR=bM;Y7i>fHrrR36?Pgcd*o-f0T|2 z*MtWZb+~6tn|Ri5V+mTL*MPRkE2V##Tx`5NqnPj9Jvp$Xgf=1(P@|84trUGUgDaz9 zJ)K;9;*K9WpL#g3bO<53Wt1X0PIJCKI^bz^m4`h&J9MdDQ9nhkZ!mV5nKL%23L*|~ zyErYcyO)3W(+-+3B`CioJX7~P;BAnnQ*Aij3TY%Ekx0Qvr7|oJWIZ%mTM?Pn$F~>y zMoKh}p%4wD++ZVHZ#I+3LDk{+aYOy;X$4^a>dy8=5cDfQ%FJq*5hvjA!w!lz z{K<=8zZn@0luo{!l*HZ?_akllalnp+;C=V>+zU;+FFZP#ng^U;mj*(*2SbTyBjQ;f zBw1D-EXmG_t(9uQl_=3<5uS4C$HMR&_9L!W5;VF%!XW!~h%N-$tx&Wt=eVixm;p*i zHS9?R76^8(y4pVdKo?)5jN0AHaO@dSWtHUhP|Q2wh>~>`fF3iaRA(GUyWbA?i&gAe zEpE+WufT(#MkQPoOh*8;%bS$z(I&49^JQ_to#nFrjuyN8BY$dhU8Uwhl*42HClbGX g;XetR56b#t7w@unChCU6qA214yrY{#4VIYlH+CMfX#fBK literal 0 HcmV?d00001 diff --git a/apps/documenteditor/mobile/resources/img/multilevels/multi-bullets.png b/apps/documenteditor/mobile/resources/img/multilevels/multi-bullets.png new file mode 100644 index 0000000000000000000000000000000000000000..0069e0c7d9985475ab73203834c66e69b1d75db6 GIT binary patch literal 1307 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSoCO|{#S9E$svykh8Km+7D9BhG zS+=Mv%vtc1<$`p{MNyT59n2zM83Z=IUS-KJVV}G0)TwF*;~&p_@&CW) zG})Z>_ww)Uk?i-~vi0k~Ud0Vtcp8`G@~>OpZqM6zFs&|)p+JMdLWDtvi-C`op`EG0 zneo6vh6e#K;pa>xR&(d&wXt*tGhR9%|I&@~(2vwxMo+z0U4?P2N>6O;s4?Tw&l=N%+9LcoW0tV?T{mW=PhY6aMk^ z>Z@13vTb+l-~T(6Ym(-VN4>qhFTQ;o5L2B5U?;DeH{Dx96ui zY~S=<*!;$h>93ep^?kPV7vOu_bp5&P^K9M=#fAS(Zr{Ew&tuSh@WJkt4l{WIO6Q!f zY--S$!?##vKeIdxsFDM+?BD-AqC52&Bhb|N zUGsMwK4!Zqzw_GPvJZ2z{#)di`rmo<n8J6H6K0cel+S>Z=-o1NGo%cNQZ8(`?R8>*2 zLs-yHv&nuBr^0y-p__L*IPM-le%!k<RlpNk$!2aOO*Tyju_WBeD9fjQX7?j+Fo*15&BUo_~6XHxnCQln`UsFN@JY; zDYWHaLV?0_v#rq^zBYC#+>Un6QsiJX;r3|Qst_W{xBMK?ov*jq1qi16KKN^aT+>Xh zY5V@G*uFVdxW}lr&O&D1N{(mwwFc*|v5PFUImod=ca@V*fL@AteH99)$MA54DU)EiVCg$w@{Q2{GHTBc~dKYer z_t;oizE5Y5$}HBp+vQxJlp-BlB_$`#UcfTp+HQSE6IF@q)BAVqu+Xeh{$<|QBG?Z0xaYYgi>%weE3p%9vM4u*6uGnJd#Ze3w~9~j$ZQf=knr07Qb~QPM{1LRg8yrO zd7-aM&Yz2YIC=Uo~K^x|GOu757z?i=FMy4fBy_yeKoc5y39V~hTOmZe^qLJn(}qGr0?ICSoNz_7?{OpFludjb6+Bf4JC&I6&+Y!bu|H16mM~WR7!Nd`9D#8h5>WK aXLeVcY>s2T?Z8rwfx*+&&t;ucLK6TrgE?*h literal 0 HcmV?d00001 diff --git a/apps/documenteditor/mobile/resources/img/multilevels/multi-dot.png b/apps/documenteditor/mobile/resources/img/multilevels/multi-dot.png new file mode 100644 index 0000000000000000000000000000000000000000..c7bde8c018bdb6c013ad1cf93495077843ce3bf7 GIT binary patch literal 808 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSoCO|{#S9E$svykh8Km+7D9BhG zu~iHTv1I@3?j{#o-+H@@y<{Q1z(xq8!2=U#fT zrHXCE>tE&jUY@kwo59Hki$z|#qFJ^UYa&sigwBqo_hVY zF;wXFZ$*fz)~~;W0;;@E7GtD%r5alGd~%5PH8^?R5UqOjq{_BK&@xWsnaToehnaf^Okflxk&}(@i4|hHeCqX?2 jmfi9Hzp#cH(1ZK`Z}Y64nPF}NOxO&bu6{1-oD!M Date: Thu, 3 Jun 2021 19:36:07 +0300 Subject: [PATCH 3/8] Installing checkboxes --- apps/documenteditor/mobile/src/controller/Main.jsx | 8 -------- apps/documenteditor/mobile/src/view/edit/EditText.jsx | 11 ++++------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx index c0abeec6d..161971b67 100644 --- a/apps/documenteditor/mobile/src/controller/Main.jsx +++ b/apps/documenteditor/mobile/src/controller/Main.jsx @@ -544,22 +544,14 @@ class MainController extends Component { case 0: storeTextSettings.resetBullets(subtype); storeTextSettings.resetNumbers(-1); - storeTextSettings.resetMultiLevel(-1); break; case 1: storeTextSettings.resetNumbers(subtype); storeTextSettings.resetBullets(-1); - storeTextSettings.resetMultiLevel(-1); - break; - case 2: - storeTextSettings.resetMultiLevel(subtype); - storeTextSettings.resetBullets(-1); - storeTextSettings.resetNumbers(-1); break; default: storeTextSettings.resetBullets(-1); storeTextSettings.resetNumbers(-1); - storeTextSettings.resetMultiLevel(-1); } }); this.api.asc_registerCallback('asc_onPrAlign', (align) => { diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx index 696eb33bc..db4a7ed14 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditText.jsx @@ -241,17 +241,13 @@ const PageMultiLevel = props => { const storeTextSettings = props.storeTextSettings; const typeMultiLevel = props.typeMultiLevel; - console.log(typeMultiLevel) - return(
    {arrayMultiLevel.map((item) => ( -
  • { - if (item.type === -1) { - storeTextSettings.resetMultiLevel(-1); - } +
  • { + item.type === -1 ? storeTextSettings.resetMultiLevel(-1) : storeTextSettings.resetMultiLevel(null); props.onMultiLevelList(item.type); }}> {item.thumb.length < 1 ? @@ -558,6 +554,7 @@ const EditText = props => { onNumber: props.onNumber, onMultiLevelList: props.onMultiLevelList }}> +
    {storeTextSettings.listType === 1 ? 'Numbers' : ' Bullets'}
    {!isAndroid && } Date: Mon, 7 Jun 2021 18:06:55 +0300 Subject: [PATCH 4/8] addition to the lists --- .../mobile/resources/less/common-ios.less | 14 +++- .../resources/less/common-material.less | 14 +++- .../mobile/src/view/edit/EditText.jsx | 69 ++++++++++--------- 3 files changed, 63 insertions(+), 34 deletions(-) diff --git a/apps/common/mobile/resources/less/common-ios.less b/apps/common/mobile/resources/less/common-ios.less index 768c89836..50bfec078 100644 --- a/apps/common/mobile/resources/less/common-ios.less +++ b/apps/common/mobile/resources/less/common-ios.less @@ -139,10 +139,22 @@ margin-top: 10px; } + .list { + margin: 0; + } + + .list .item-content { + padding-left: 0; + min-height: 65px; + .item-inner{ + padding: 0; + } + } + li { width: 70px; height: 70px; - margin-right: 1px; + margin: 0 7px auto; border: 1px solid #c4c4c4; html.pixel-ratio-2 & { border: 0.5px solid #c4c4c4; diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less index a5dac86cb..5ed9000da 100644 --- a/apps/common/mobile/resources/less/common-material.less +++ b/apps/common/mobile/resources/less/common-material.less @@ -288,10 +288,22 @@ margin-top: 10px; } + .list { + margin: 0; + } + + .list .item-content { + padding-left: 0; + min-height: 65px; + .item-inner{ + padding: 0; + } + } + li { width: 70px; height: 70px; - margin-right: 1px; + margin: 0 7px auto; border: 1px solid @gray; html.pixel-ratio-2 & { border: 0.5px solid @gray; diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx index db4a7ed14..8a770f17c 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditText.jsx @@ -1,6 +1,6 @@ import React, {Fragment, useState } from 'react'; import {observer, inject} from "mobx-react"; -import {f7, Swiper, SwiperSlide, List, ListItem, Icon, Row, Button, Page, Navbar, NavRight, Segmented, BlockTitle, Link} from 'framework7-react'; +import {f7, Swiper, View, SwiperSlide, List, ListItem, Icon, Row, Button, Page, Navbar, NavRight, Segmented, BlockTitle, Link} from 'framework7-react'; import { useTranslation } from 'react-i18next'; import {Device} from '../../../../../common/mobile/utils/device'; @@ -157,28 +157,30 @@ const PageBullets = props => { const typeBullets = props.typeBullets; return( -
    + {bulletArrays.map((bullets, index) => ( -
      + {bullets.map((bullet) => ( -
    • { if (bullet.type === -1) { storeTextSettings.resetBullets(-1); + props.f7router.back(); } props.onBullet(bullet.type) + props.f7router.back(); }}> {bullet.thumb.length < 1 ? -
      + -
      : -
      + : + } -
      • + ))} -
    + ))} -
    + ) }; @@ -203,28 +205,30 @@ const PageNumbers = props => { const typeNumbers = props.typeNumbers; return( -
    + {numberArrays.map((numbers, index) => ( -
      + {numbers.map((number) => ( -
    • { if (number.type === -1) { storeTextSettings.resetNumbers(-1); + props.f7router.back(); } props.onNumber(number.type) + props.f7router.back(); }}> {number.thumb.length < 1 ? -
      + -
      : -
      + : + } -
      • + ))} -
    + ))} -
    + ) }; @@ -242,24 +246,25 @@ const PageMultiLevel = props => { const typeMultiLevel = props.typeMultiLevel; return( -
    -
      + + {arrayMultiLevel.map((item) => ( -
    • { item.type === -1 ? storeTextSettings.resetMultiLevel(-1) : storeTextSettings.resetMultiLevel(null); props.onMultiLevelList(item.type); + props.f7router.back(); }}> {item.thumb.length < 1 ? -
      + -
      : -
      + : + } -
      • + ))} -
    -
    + + ) } @@ -283,10 +288,10 @@ const PageBulletsAndNumbers = props => { } - - - - + + + + ) From f2f0feda8d6d3f24d310333bbd5e115a54a6f3d4 Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 7 Jun 2021 21:36:41 +0300 Subject: [PATCH 5/8] =?UTF-8?q?=D0=A1ode=20refactoring?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/documenteditor/mobile/src/view/edit/Edit.jsx | 10 +--------- apps/documenteditor/mobile/src/view/edit/EditText.jsx | 6 ------ 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/edit/Edit.jsx b/apps/documenteditor/mobile/src/view/edit/Edit.jsx index e6d60c3f5..69f550188 100644 --- a/apps/documenteditor/mobile/src/view/edit/Edit.jsx +++ b/apps/documenteditor/mobile/src/view/edit/Edit.jsx @@ -14,7 +14,7 @@ import EditChartController from "../../controller/edit/EditChart"; import EditHyperlinkController from "../../controller/edit/EditHyperlink"; import EditHeaderController from "../../controller/edit/EditHeader"; -import {PageTextFonts, PageTextAddFormatting, PageTextBullets, PageTextNumbers, PageTextBulletsAndNumbers, PageTextLineSpacing, PageTextFontColor, PageTextCustomFontColor, PageTextBackgroundColor, PageTextCustomBackColor} from "./EditText"; +import {PageTextFonts, PageTextAddFormatting, PageTextBulletsAndNumbers, PageTextLineSpacing, PageTextFontColor, PageTextCustomFontColor, PageTextBackgroundColor, PageTextCustomBackColor} from "./EditText"; import {ParagraphAdvSettings, PageParagraphBackColor, PageParagraphCustomColor} from "./EditParagraph"; import {PageShapeStyleNoFill, PageShapeStyle, PageShapeCustomFillColor, PageShapeBorderColor, PageShapeCustomBorderColor, PageWrap, PageReorder, PageReplace} from "./EditShape"; import {PageImageReorder, PageImageReplace, PageImageWrap, PageLinkSettings} from "./EditImage"; @@ -31,14 +31,6 @@ const routes = [ path: '/edit-text-add-formatting/', component: PageTextAddFormatting, }, - { - path: '/edit-text-bullets/', - component: PageTextBullets, - }, - { - path: '/edit-text-numbers/', - component: PageTextNumbers, - }, { path: '/edit-bullets-and-numbers/', component: PageTextBulletsAndNumbers, diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx index 8a770f17c..ea785621a 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditText.jsx @@ -165,7 +165,6 @@ const PageBullets = props => { onClick={() => { if (bullet.type === -1) { storeTextSettings.resetBullets(-1); - props.f7router.back(); } props.onBullet(bullet.type) props.f7router.back(); @@ -213,7 +212,6 @@ const PageNumbers = props => { onClick={() => { if (number.type === -1) { storeTextSettings.resetNumbers(-1); - props.f7router.back(); } props.onNumber(number.type) props.f7router.back(); @@ -575,8 +573,6 @@ const EditText = props => { const EditTextContainer = inject("storeTextSettings", "storeFocusObjects")(observer(EditText)); const PageTextFonts = inject("storeTextSettings", "storeFocusObjects")(observer(PageFonts)); const PageTextAddFormatting = inject("storeTextSettings", "storeFocusObjects")(observer(PageAdditionalFormatting)); -const PageTextBullets = inject("storeTextSettings")(observer(PageBullets)); -const PageTextNumbers = inject("storeTextSettings")(observer(PageNumbers)); const PageTextBulletsAndNumbers = inject("storeTextSettings")(observer(PageBulletsAndNumbers)); const PageTextLineSpacing = inject("storeTextSettings")(observer(PageLineSpacing)); const PageTextFontColor = inject("storeTextSettings", "storePalette")(observer(PageFontColor)); @@ -589,8 +585,6 @@ export { EditTextContainer as EditText, PageTextFonts, PageTextAddFormatting, - PageTextBullets, - PageTextNumbers, PageTextBulletsAndNumbers, PageTextLineSpacing, PageTextFontColor, From 15160e4f951293be4d616c732637ef1fecb5c15b Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Tue, 8 Jun 2021 15:20:50 +0300 Subject: [PATCH 6/8] Edit list styles --- .../mobile/resources/less/common-ios.less | 18 +++++++----------- .../mobile/resources/less/common-material.less | 17 +++++++---------- .../mobile/src/less/app-ios.less | 10 ++++++---- apps/documenteditor/mobile/src/less/app.less | 13 ++++++++++++- 4 files changed, 32 insertions(+), 26 deletions(-) diff --git a/apps/common/mobile/resources/less/common-ios.less b/apps/common/mobile/resources/less/common-ios.less index 50bfec078..3c57ca9ef 100644 --- a/apps/common/mobile/resources/less/common-ios.less +++ b/apps/common/mobile/resources/less/common-ios.less @@ -127,25 +127,22 @@ .bullets, .numbers, .multilevels { - .page-content { - background: @white; - } - - .row { + .row ul { + display: flex; justify-content: space-around; + width: 100%; } ul { margin-top: 10px; + padding: 0 5px; } - - .list { - margin: 0; + .list{ + margin: 5px; } - .list .item-content { padding-left: 0; - min-height: 65px; + min-height: 68px; .item-inner{ padding: 0; } @@ -154,7 +151,6 @@ li { width: 70px; height: 70px; - margin: 0 7px auto; border: 1px solid #c4c4c4; html.pixel-ratio-2 & { border: 0.5px solid #c4c4c4; diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less index 5ed9000da..901cf98f3 100644 --- a/apps/common/mobile/resources/less/common-material.less +++ b/apps/common/mobile/resources/less/common-material.less @@ -276,25 +276,23 @@ .bullets, .numbers, .multilevels { - .page-content { - background: @white; - } - - .row { + .row ul { + display: flex; justify-content: space-around; + width: 100%; } ul { margin-top: 10px; + padding: 0 5px; } - - .list { - margin: 0; + .list{ + margin: 5px; } .list .item-content { padding-left: 0; - min-height: 65px; + min-height: 68px; .item-inner{ padding: 0; } @@ -303,7 +301,6 @@ li { width: 70px; height: 70px; - margin: 0 7px auto; border: 1px solid @gray; html.pixel-ratio-2 & { border: 0.5px solid @gray; diff --git a/apps/documenteditor/mobile/src/less/app-ios.less b/apps/documenteditor/mobile/src/less/app-ios.less index fefaee26d..c565dd189 100644 --- a/apps/documenteditor/mobile/src/less/app-ios.less +++ b/apps/documenteditor/mobile/src/less/app-ios.less @@ -1,7 +1,9 @@ - -.device-ios { - - +.ios { + .view { + .page-content{ + background: #fff; + } + } } // Color Schemes diff --git a/apps/documenteditor/mobile/src/less/app.less b/apps/documenteditor/mobile/src/less/app.less index f3c36c7d0..197a37327 100644 --- a/apps/documenteditor/mobile/src/less/app.less +++ b/apps/documenteditor/mobile/src/less/app.less @@ -102,5 +102,16 @@ } } - +.simple-list li:after, .links-list a:after, .list .item-inner:after { + display: none; +} +.device-ios .popover__titled .list:last-child li:last-child:after { + display: none; +} +.list ul:before { + display: none; +} +.list ul:after{ + display: none; +} From 4c3323f12e0f930afa6e7cc8e43e5257e252164f Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Wed, 9 Jun 2021 17:26:36 +0300 Subject: [PATCH 7/8] Style editing and selector --- .../mobile/resources/less/common-ios.less | 13 +++++++++++++ .../mobile/resources/less/common-material.less | 13 +++++++++++++ apps/documenteditor/mobile/src/less/app.less | 14 +++----------- .../mobile/src/view/edit/EditText.jsx | 18 +++++++++++++++--- 4 files changed, 44 insertions(+), 14 deletions(-) diff --git a/apps/common/mobile/resources/less/common-ios.less b/apps/common/mobile/resources/less/common-ios.less index 3c57ca9ef..70d529575 100644 --- a/apps/common/mobile/resources/less/common-ios.less +++ b/apps/common/mobile/resources/less/common-ios.less @@ -148,6 +148,19 @@ } } + .simple-list li:after, .links-list a:after, .list .item-inner:after { + display: none; + } + .device-ios .popover__titled .list:last-child li:last-child:after { + display: none; + } + .list ul:before { + display: none; + } + .list ul:after{ + display: none; + } + li { width: 70px; height: 70px; diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less index 901cf98f3..6cf5024e1 100644 --- a/apps/common/mobile/resources/less/common-material.less +++ b/apps/common/mobile/resources/less/common-material.less @@ -298,6 +298,19 @@ } } + .simple-list li:after, .links-list a:after, .list .item-inner:after { + display: none; + } + .device-ios .popover__titled .list:last-child li:last-child:after { + display: none; + } + .list ul:before { + display: none; + } + .list ul:after{ + display: none; + } + li { width: 70px; height: 70px; diff --git a/apps/documenteditor/mobile/src/less/app.less b/apps/documenteditor/mobile/src/less/app.less index 197a37327..98aae597a 100644 --- a/apps/documenteditor/mobile/src/less/app.less +++ b/apps/documenteditor/mobile/src/less/app.less @@ -102,16 +102,8 @@ } } -.simple-list li:after, .links-list a:after, .list .item-inner:after { - display: none; -} -.device-ios .popover__titled .list:last-child li:last-child:after { - display: none; -} -.list ul:before { - display: none; -} -.list ul:after{ - display: none; +.swiper-pagination-bullet-active{ + background: #000; } + diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx index ea785621a..c00b22cfc 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditText.jsx @@ -161,7 +161,8 @@ const PageBullets = props => { {bulletArrays.map((bullets, index) => ( {bullets.map((bullet) => ( - { if (bullet.type === -1) { storeTextSettings.resetBullets(-1); @@ -208,7 +209,8 @@ const PageNumbers = props => { {numberArrays.map((numbers, index) => ( {numbers.map((number) => ( - { if (number.type === -1) { storeTextSettings.resetNumbers(-1); @@ -480,6 +482,16 @@ const EditText = props => { const isStrikethrough = storeTextSettings.isStrikethrough; const paragraphAlign = storeTextSettings.paragraphAlign; + let previewList; + switch(storeTextSettings.listType) { + case -1: previewList = '' + break; + case 0: previewList = 'Bullets' + break; + case 1: previewList = 'Numbers' + break; + } + const fontColorPreview = fontColor !== 'auto' ? : ; @@ -557,7 +569,7 @@ const EditText = props => { onNumber: props.onNumber, onMultiLevelList: props.onMultiLevelList }}> -
    {storeTextSettings.listType === 1 ? 'Numbers' : ' Bullets'}
    +
    {previewList}
    {!isAndroid && }     Date: Thu, 10 Jun 2021 15:28:21 +0300 Subject: [PATCH 8/8] Add multilevel list presentation --- .../mobile/resources/less/common-ios.less | 43 +++--- .../resources/less/common-material.less | 39 +++--- apps/documenteditor/mobile/src/less/app.less | 9 +- .../mobile/src/view/edit/EditText.jsx | 33 +++-- apps/presentationeditor/mobile/locale/en.json | 10 +- .../mobile/src/less/app-ios.less | 8 +- .../mobile/src/less/app.less | 16 +++ .../mobile/src/view/edit/Edit.jsx | 10 +- .../mobile/src/view/edit/EditText.jsx | 126 +++++++++++------- 9 files changed, 165 insertions(+), 129 deletions(-) diff --git a/apps/common/mobile/resources/less/common-ios.less b/apps/common/mobile/resources/less/common-ios.less index 70d529575..ecaaf9dd3 100644 --- a/apps/common/mobile/resources/less/common-ios.less +++ b/apps/common/mobile/resources/less/common-ios.less @@ -127,40 +127,37 @@ .bullets, .numbers, .multilevels { - .row ul { - display: flex; - justify-content: space-around; - width: 100%; - } - - ul { - margin-top: 10px; - padding: 0 5px; - } .list{ margin: 5px; + ul { + &:before, &:after { + display: none; + } + display: flex; + justify-content: space-around; + width: 100%; + margin-top: 10px; + padding: 0 5px; + } + &:first-child li:first-child, &:last-child li:last-child { + border-radius: 0; + } + &:last-child li:last-child:after { + display: none; + } } + .list .item-content { padding-left: 0; min-height: 68px; .item-inner{ padding: 0; + &:after { + display: none; + } } } - .simple-list li:after, .links-list a:after, .list .item-inner:after { - display: none; - } - .device-ios .popover__titled .list:last-child li:last-child:after { - display: none; - } - .list ul:before { - display: none; - } - .list ul:after{ - display: none; - } - li { width: 70px; height: 70px; diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less index 6cf5024e1..f10da7a7f 100644 --- a/apps/common/mobile/resources/less/common-material.less +++ b/apps/common/mobile/resources/less/common-material.less @@ -276,18 +276,21 @@ .bullets, .numbers, .multilevels { - .row ul { - display: flex; - justify-content: space-around; - width: 100%; - } - - ul { - margin-top: 10px; - padding: 0 5px; - } .list{ margin: 5px; + ul { + &:before, &:after { + display: none; + } + display: flex; + justify-content: space-around; + width: 100%; + margin-top: 10px; + padding: 0 5px; + } + &:first-child li:first-child, &:last-child li:last-child { + border-radius: 0; + } } .list .item-content { @@ -295,22 +298,12 @@ min-height: 68px; .item-inner{ padding: 0; + &:after { + display: none; + } } } - .simple-list li:after, .links-list a:after, .list .item-inner:after { - display: none; - } - .device-ios .popover__titled .list:last-child li:last-child:after { - display: none; - } - .list ul:before { - display: none; - } - .list ul:after{ - display: none; - } - li { width: 70px; height: 70px; diff --git a/apps/documenteditor/mobile/src/less/app.less b/apps/documenteditor/mobile/src/less/app.less index 98aae597a..30e7e21e1 100644 --- a/apps/documenteditor/mobile/src/less/app.less +++ b/apps/documenteditor/mobile/src/less/app.less @@ -96,6 +96,12 @@ } } +.item-content { + .preview{ + color: @gray; + } +} + .phone, .tablet { .swiper-container{ position: static; @@ -103,7 +109,8 @@ } .swiper-pagination-bullet-active{ - background: #000; + background: @black; } + diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx index c00b22cfc..ec5acafa6 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditText.jsx @@ -154,7 +154,7 @@ const PageBullets = props => { ] ]; const storeTextSettings = props.storeTextSettings; - const typeBullets = props.typeBullets; + const typeBullets = storeTextSettings.typeBullets; return( @@ -202,7 +202,7 @@ const PageNumbers = props => { ]; const storeTextSettings = props.storeTextSettings; - const typeNumbers = props.typeNumbers; + const typeNumbers = storeTextSettings.typeNumbers; return( @@ -243,7 +243,7 @@ const PageMultiLevel = props => { ]; const storeTextSettings = props.storeTextSettings; - const typeMultiLevel = props.typeMultiLevel; + const typeMultiLevel = storeTextSettings.typeMultiLevel; return( @@ -271,11 +271,7 @@ const PageMultiLevel = props => { const PageBulletsAndNumbers = props => { const { t } = useTranslation(); - const storeTextSettings = props.storeTextSettings; - const typeNumbers = storeTextSettings.typeNumbers; - const typeBullets = storeTextSettings.typeBullets; - const typeMultiLevel = storeTextSettings.typeMultiLevel; return ( @@ -289,9 +285,9 @@ const PageBulletsAndNumbers = props => { } - - - + + + ) @@ -484,12 +480,15 @@ const EditText = props => { let previewList; switch(storeTextSettings.listType) { - case -1: previewList = '' - break; - case 0: previewList = 'Bullets' - break; - case 1: previewList = 'Numbers' - break; + case -1: + previewList = ''; + break; + case 0: + previewList = 'Bullets'; + break; + case 1: + previewList = 'Numbers'; + break; } const fontColorPreview = fontColor !== 'auto' ? @@ -569,7 +568,7 @@ const EditText = props => { onNumber: props.onNumber, onMultiLevelList: props.onMultiLevelList }}> -
    {previewList}
    +
    {previewList}
    {!isAndroid && }     Please contact your Document Server administrator.", - "errorUpdateVersion": "The file version has been changed. The page will be reloaded.", "titleUpdateVersion": "Version changed", "textHasMacros": "The file contains automatic macros.
    Do you want to run macros?", @@ -303,8 +300,7 @@ "textHighlightColor": "Highlight Color", "textAdditionalFormatting": "Additional Formatting", "textAdditional": "Additional", - "textBullets": "Bullets", - "textNumbers": "Numbers", + "textBulletsAndNumbers": "Bullets & Numbers", "textLineSpacing": "Line Spacing", "textFonts": "Fonts", "textAuto": "Auto", diff --git a/apps/presentationeditor/mobile/src/less/app-ios.less b/apps/presentationeditor/mobile/src/less/app-ios.less index dda949856..71f59edee 100644 --- a/apps/presentationeditor/mobile/src/less/app-ios.less +++ b/apps/presentationeditor/mobile/src/less/app-ios.less @@ -1,6 +1,8 @@ - .device-ios { - - + .view { + .page-content{ + background: #fff; + } + } } diff --git a/apps/presentationeditor/mobile/src/less/app.less b/apps/presentationeditor/mobile/src/less/app.less index cc4000288..289e67d0e 100644 --- a/apps/presentationeditor/mobile/src/less/app.less +++ b/apps/presentationeditor/mobile/src/less/app.less @@ -83,3 +83,19 @@ } } } + +.item-content { + .preview{ + color: @gray; + } +} + +.phone, .tablet { + .swiper-container{ + position: static; + } +} + +.swiper-pagination-bullet-active{ + background: @black; +} diff --git a/apps/presentationeditor/mobile/src/view/edit/Edit.jsx b/apps/presentationeditor/mobile/src/view/edit/Edit.jsx index 3f9537494..8d00aeb60 100644 --- a/apps/presentationeditor/mobile/src/view/edit/Edit.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/Edit.jsx @@ -14,7 +14,7 @@ import EditChartController from "../../controller/edit/EditChart"; import { EditLinkController } from "../../controller/edit/EditLink"; import { Theme, Layout, Transition, Type, Effect, StyleFillColor, CustomFillColor } from './EditSlide'; -import { PageTextFonts, PageTextFontColor, PageTextCustomFontColor, PageTextAddFormatting, PageTextBullets, PageTextNumbers, PageTextLineSpacing } from './EditText'; +import { PageTextFonts, PageTextFontColor, PageTextCustomFontColor, PageTextAddFormatting, PageTextBulletsAndNumbers, PageTextLineSpacing } from './EditText'; import { PageShapeStyle, PageShapeStyleNoFill, PageReplaceContainer, PageReorderContainer, PageAlignContainer, PageShapeBorderColor, PageShapeCustomBorderColor, PageShapeCustomFillColor } from './EditShape'; import { PageImageReplace, PageImageReorder, PageImageAlign, PageLinkSettings } from './EditImage'; import { PageTableStyle, PageTableStyleOptions, PageTableCustomFillColor, PageTableBorderColor, PageTableCustomBorderColor, PageTableReorder, PageTableAlign } from './EditTable'; @@ -73,12 +73,8 @@ const routes = [ component: PageTextAddFormatting }, { - path: '/edit-text-bullets/', - component: PageTextBullets - }, - { - path: '/edit-text-numbers/', - component: PageTextNumbers + path: '/edit-bullets-and-numbers/', + component: PageTextBulletsAndNumbers }, { path: '/edit-text-line-spacing/', diff --git a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx index d7bd881f5..987108023 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx @@ -1,6 +1,6 @@ import React, {Fragment, useState} from 'react'; import {observer, inject} from "mobx-react"; -import {f7, List, ListItem, Icon, Row, Button, Page, Navbar, Segmented, BlockTitle, NavRight, Link} from 'framework7-react'; +import {f7, Swiper, View, SwiperSlide, List, ListItem, Icon, Row, Button, Page, Navbar, Segmented, BlockTitle, NavRight, Link} from 'framework7-react'; import { useTranslation } from 'react-i18next'; import {Device} from '../../../../../common/mobile/utils/device'; import { ThemeColorPalette, CustomColorPicker } from '../../../../../common/mobile/lib/component/ThemeColorPalette.jsx'; @@ -27,6 +27,18 @@ const EditText = props => { const paragraphObj = storeFocusObjects.paragraphObject; let spaceBefore; let spaceAfter; + let previewList; + switch(storeTextSettings.listType) { + case -1: + previewList = ''; + break; + case 0: + previewList = 'Bullets'; + break; + case 1: + previewList = 'Numbers'; + break; + } if(paragraphObj) { spaceBefore = paragraphObj.get_Spacing().get_Before() < 0 ? paragraphObj.get_Spacing().get_Before() : Common.Utils.Metric.fnRecalcFromMM(paragraphObj.get_Spacing().get_Before()); @@ -114,16 +126,13 @@ const EditText = props => {     - +
    {previewList}
    {!isAndroid && }     - - {!isAndroid && } - @@ -421,32 +430,31 @@ const PageBullets = props => { return null; } - return ( - - - {Device.phone && - - - - - - } - + return( + {bulletArrays.map((bullets, index) => ( -
      + {bullets.map((bullet) => ( -
    • {props.onBullet(bullet.type)}}> + { + if (bullet.type === -1) { + storeTextSettings.resetBullets(-1); + } + props.onBullet(bullet.type) + props.f7router.back(); + }}> {bullet.thumb.length < 1 ? -
      + -
      : -
      + : + } -
      • + ))} -
    +     ))} - + ) }; @@ -477,9 +485,43 @@ const PageNumbers = props => { return null; } + return( + + {numberArrays.map((numbers, index) => ( + + {numbers.map((number) => ( + { + if (number.type === -1) { + storeTextSettings.resetNumbers(-1); + } + props.onNumber(number.type) + props.f7router.back(); + }}> + {number.thumb.length < 1 ? + + + : + + } + + ))} + + ))} + + ) +}; + +const PageBulletsAndNumbers = props => { + const { t } = useTranslation(); + const _t = t('View.Edit', {returnObjects: true}); + const storeTextSettings = props.storeTextSettings; + const storeFocusObjects = props.storeFocusObjects; + return ( - - + + {Device.phone && @@ -488,23 +530,13 @@ const PageNumbers = props => { } - {numberArrays.map((numbers, index) => ( -
      - {numbers.map((number) => ( -
    • {props.onNumber(number.type)}}> - {number.thumb.length < 1 ? -
      - -
      : -
      - } -
      • - ))} -
    - ))} + + + +     ) -}; +} const PageLineSpacing = props => { const { t } = useTranslation(); @@ -546,8 +578,7 @@ const PageTextFonts = inject("storeTextSettings", "storeFocusObjects")(observer( const PageTextFontColor = inject("storeTextSettings", "storePalette", "storeFocusObjects")(observer(PageFontColor)); const PageTextCustomFontColor = inject("storeTextSettings", "storePalette")(observer(PageCustomFontColor)); const PageTextAddFormatting = inject("storeTextSettings", "storeFocusObjects")(observer(PageAdditionalFormatting)); -const PageTextBullets = inject("storeTextSettings", "storeFocusObjects")(observer(PageBullets)); -const PageTextNumbers = inject("storeTextSettings", "storeFocusObjects")(observer(PageNumbers)); +const PageTextBulletsAndNumbers = inject("storeTextSettings", "storeFocusObjects")(observer(PageBulletsAndNumbers)); const PageTextLineSpacing = inject("storeTextSettings", "storeFocusObjects")(observer(PageLineSpacing)); export { @@ -556,7 +587,6 @@ export { PageTextFontColor, PageTextCustomFontColor, PageTextAddFormatting, - PageTextBullets, - PageTextNumbers, + PageTextBulletsAndNumbers, PageTextLineSpacing }; \ No newline at end of file