diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx
index 583e56a076..716c2d4447 100644
--- a/apps/documenteditor/mobile/src/controller/Main.jsx
+++ b/apps/documenteditor/mobile/src/controller/Main.jsx
@@ -536,6 +536,9 @@ class MainController extends Component {
//text settings
const storeTextSettings = this.props.storeTextSettings;
+ storeTextSettings.arrayRecentFonts = LocalStorage.getItem('dde-settings-recent-fonts');
+ storeTextSettings.arrayRecentFonts = storeTextSettings.arrayRecentFonts ? storeTextSettings.arrayRecentFonts.split(';') : [];
+
EditorUIController.initFonts && EditorUIController.initFonts(storeTextSettings);
EditorUIController.initFocusObjects && EditorUIController.initFocusObjects(this.props.storeFocusObjects);
diff --git a/apps/documenteditor/mobile/src/store/textSettings.js b/apps/documenteditor/mobile/src/store/textSettings.js
index 8e616d721e..0bc46bef3b 100644
--- a/apps/documenteditor/mobile/src/store/textSettings.js
+++ b/apps/documenteditor/mobile/src/store/textSettings.js
@@ -1,5 +1,4 @@
import {action, observable, computed, makeObservable} from 'mobx';
-import { LocalStorage } from '../../../../common/mobile/utils/LocalStorage';
export class storeTextSettings {
constructor() {
@@ -84,9 +83,6 @@ export class storeTextSettings {
});
this.fontsArray = array;
-
- this.arrayRecentFonts = LocalStorage.getItem('dde-settings-recent-fonts');
- this.arrayRecentFonts = this.arrayRecentFonts ? this.arrayRecentFonts.split(';') : [];
}
resetFontName (font) {
let name = (typeof font.get_Name) === "function" ? font.get_Name() : font.asc_getName();
@@ -187,11 +183,6 @@ export class storeTextSettings {
this.arrayRecentFonts.unshift(font);
if (this.arrayRecentFonts.length > 5) this.arrayRecentFonts.splice(4,1);
-
- let arr = [];
- this.arrayRecentFonts.forEach(item => arr.push(item));
- arr = arr.join(';');
- LocalStorage.setItem('dde-settings-recent-fonts', arr);
}
resetLineSpacing (vc) {
diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx
index 8fbe877260..8611dbcfd2 100644
--- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx
+++ b/apps/documenteditor/mobile/src/view/edit/EditText.jsx
@@ -3,8 +3,8 @@ import {observer, inject} from "mobx-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';
-
import { ThemeColorPalette, CustomColorPicker } from '../../../../../common/mobile/lib/component/ThemeColorPalette.jsx';
+import { LocalStorage } from '../../../../../common/mobile/utils/LocalStorage';
const PageFonts = props => {
const isAndroid = Device.android;
@@ -15,12 +15,18 @@ const PageFonts = props => {
const curFontName = storeTextSettings.fontName;
const fonts = storeTextSettings.fontsArray;
const arrayFonts = storeTextSettings.arrayRecentFonts;
+
+ let arr = [];
+ arrayFonts.forEach(item => arr.push(item));
+ arr = arr.join(';');
+ LocalStorage.setItem('dde-settings-recent-fonts', arr);
const [vlFonts, setVlFonts] = useState({
vlData: {
items: [],
}
});
+
const renderExternal = (vl, vlData) => {
setVlFonts((prevState) => {
let fonts = [...prevState.vlData.items];
@@ -59,18 +65,20 @@ const PageFonts = props => {
{t('Edit.textFonts')}
-
- {arrayFonts.map((item,index) => (
- {storeTextSettings.changeFontFamily(item); props.changeFontFamily(item);}}
- />
- ))}
-
+ {!!arrayFonts.length &&
+
+ {arrayFonts.map((item,index) => (
+ {storeTextSettings.changeFontFamily(item); props.changeFontFamily(item);}}
+ />
+ ))}
+
+ }
5) this.arrayRecentFonts.splice(4,1);
-
- let arr = [];
- this.arrayRecentFonts.forEach(item => arr.push(item));
- arr = arr.join(';');
- LocalStorage.setItem('ppe-settings-recent-fonts', arr);
}
resetLineSpacing (vc) {
diff --git a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx
index d14e027134..4aa5d8557b 100644
--- a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx
+++ b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx
@@ -4,6 +4,7 @@ import {f7, Swiper, View, SwiperSlide, List, ListItem, Icon, Row, Button, Page,
import { useTranslation } from 'react-i18next';
import {Device} from '../../../../../common/mobile/utils/device';
import { ThemeColorPalette, CustomColorPicker } from '../../../../../common/mobile/lib/component/ThemeColorPalette.jsx';
+import { LocalStorage } from '../../../../../common/mobile/utils/LocalStorage';
const EditText = props => {
const isAndroid = Device.android;
@@ -187,6 +188,11 @@ const PageFonts = props => {
const fonts = storeTextSettings.fontsArray;
const arrayFonts = storeTextSettings.arrayRecentFonts;
+ let arr = [];
+ arrayFonts.forEach(item => arr.push(item));
+ arr = arr.join(';');
+ LocalStorage.setItem('ppe-settings-recent-fonts', arr);
+
const [vlFonts, setVlFonts] = useState({
vlData: {
items: [],
@@ -237,18 +243,20 @@ const PageFonts = props => {
{_t.textFonts}
-
- {arrayFonts.map((item,index) => (
- {props.changeFontFamily(item)}}
- />
- ))}
-
+ {!!arrayFonts.length &&
+
+ {arrayFonts.map((item,index) => (
+ {props.changeFontFamily(item)}}
+ />
+ ))}
+
+ }
{
diff --git a/apps/spreadsheeteditor/mobile/src/store/textSettings.js b/apps/spreadsheeteditor/mobile/src/store/textSettings.js
index 198aee9748..bb4d86441e 100644
--- a/apps/spreadsheeteditor/mobile/src/store/textSettings.js
+++ b/apps/spreadsheeteditor/mobile/src/store/textSettings.js
@@ -1,5 +1,4 @@
import {action, observable, makeObservable, computed} from 'mobx';
-import { LocalStorage } from '../../../../common/mobile/utils/LocalStorage';
export class storeTextSettings {
constructor() {
@@ -88,9 +87,6 @@ export class storeTextSettings {
});
this.fontsArray = array;
-
- this.arrayRecentFonts = LocalStorage.getItem('sse-settings-recent-fonts');
- this.arrayRecentFonts = this.arrayRecentFonts ? this.arrayRecentFonts.split(';') : [];
}
initFontInfo(fontObj) {
@@ -104,11 +100,6 @@ export class storeTextSettings {
this.arrayRecentFonts.unshift(font);
if (this.arrayRecentFonts.length > 5) this.arrayRecentFonts.splice(4,1);
-
- let arr = [];
- this.arrayRecentFonts.forEach(item => arr.push(item));
- arr = arr.join(';');
- LocalStorage.setItem('sse-settings-recent-fonts', arr);
}
changeTextColor(value) {
diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditCell.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditCell.jsx
index de0d527fa8..2fa730ed99 100644
--- a/apps/spreadsheeteditor/mobile/src/view/edit/EditCell.jsx
+++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditCell.jsx
@@ -4,6 +4,7 @@ import {f7, List, ListItem, Icon, Row, Button, Page, Navbar, Segmented, BlockTit
import { useTranslation } from 'react-i18next';
import {Device} from '../../../../../common/mobile/utils/device';
import { ThemeColorPalette, CustomColorPicker } from '../../../../../common/mobile/lib/component/ThemeColorPalette.jsx';
+import { LocalStorage } from '../../../../../common/mobile/utils/LocalStorage';
const EditCell = props => {
const isAndroid = Device.android;
@@ -128,6 +129,11 @@ const PageFontsCell = props => {
const fonts = storeCellSettings.fontsArray;
const arrayFonts = storeTextSettings.arrayRecentFonts;
+ let arr = [];
+ arrayFonts.forEach(item => arr.push(item));
+ arr = arr.join(';');
+ LocalStorage.setItem('sse-settings-recent-fonts', arr);
+
const [vlFonts, setVlFonts] = useState({
vlData: {
items: [],
@@ -176,18 +182,20 @@ const PageFontsCell = props => {
{_t.textFonts}
-
- {arrayFonts.map((item,index) => (
- {props.onFontClick(item)}}
- />
- ))}
-
+ {!!arrayFonts.length &&
+
+ {arrayFonts.map((item,index) => (
+ {props.onFontClick(item)}}
+ />
+ ))}
+
+ }
{
const isAndroid = Device.android;
@@ -100,6 +101,11 @@ const PageFonts = props => {
const fonts = storeTextSettings.fontsArray;
const arrayFonts = storeTextSettings.arrayRecentFonts;
+ let arr = [];
+ arrayFonts.forEach(item => arr.push(item));
+ arr = arr.join(';');
+ LocalStorage.setItem('sse-settings-recent-fonts', arr);
+
const [vlFonts, setVlFonts] = useState({
vlData: {
items: [],
@@ -142,18 +148,20 @@ const PageFonts = props => {
{_t.textFonts}
-
- {arrayFonts.map((item,index) => (
- {props.changeFontFamily(item)}}
- />
- ))}
-
+ {!!arrayFonts.length &&
+
+ {arrayFonts.map((item,index) => (
+ {props.changeFontFamily(item)}}
+ />
+ ))}
+
+ }