Edit code v2

apps/documenteditor/mobile/src/controller/Main.jsx

@@ -536,8 +536,7 @@ class MainController extends Component {
 
         //text settings
         const storeTextSettings = this.props.storeTextSettings;
-        storeTextSettings.arrayRecentFonts = LocalStorage.getItem('dde-settings-recent-fonts');
+        storeTextSettings.resetFontsRecent(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);

apps/documenteditor/mobile/src/store/textSettings.js

@@ -23,6 +23,7 @@ export class storeTextSettings {
             backgroundColor: observable,
             initEditorFonts: action,
             resetFontName: action,
+            resetFontsRecent:action,
             resetFontSize: action,
             resetIsBold: action,
             resetIsItalic: action,
@@ -88,6 +89,12 @@ export class storeTextSettings {
         let name = (typeof font.get_Name) === "function" ? font.get_Name() : font.asc_getName();
         this.fontName = name;
     }
+
+    resetFontsRecent(fonts) {
+        this.arrayRecentFonts = fonts;
+        this.arrayRecentFonts = this.arrayRecentFonts ? this.arrayRecentFonts.split(';') : [];
+    }
+
     resetFontSize (size) {
         this.fontSize = size;
     }

apps/documenteditor/mobile/src/view/edit/EditText.jsx

@@ -16,10 +16,12 @@ const PageFonts = props => {
     const fonts = storeTextSettings.fontsArray;
     const arrayFonts = storeTextSettings.arrayRecentFonts;
 
+    const addRecentStorage = () => {
         let arr = [];
         arrayFonts.forEach(item => arr.push(item));
         arr = arr.join(';');
         LocalStorage.setItem('dde-settings-recent-fonts', arr);
+    }
     
     const [vlFonts, setVlFonts] = useState({
         vlData: {
@@ -92,7 +94,7 @@ const PageFonts = props => {
                             title={item.name}
                             style={{fontFamily: `${item.name}`}}
                             onClick={() => {storeTextSettings.changeFontFamily(item.name); props.changeFontFamily(item.name);
-                                storeTextSettings.addFontToRecent(item.name)}}
+                                storeTextSettings.addFontToRecent(item.name); addRecentStorage()}}
                         ></ListItem>
                     ))}
                 </ul>

apps/presentationeditor/mobile/src/controller/Main.jsx

@@ -325,8 +325,7 @@ class MainController extends Component {
         // Text settings 
 
         const storeTextSettings = this.props.storeTextSettings;
-        storeTextSettings.arrayRecentFonts = LocalStorage.getItem('ppe-settings-recent-fonts');
+        storeTextSettings.resetFontsRecent(LocalStorage.getItem('ppe-settings-recent-fonts'));
-        storeTextSettings.arrayRecentFonts = storeTextSettings.arrayRecentFonts ? storeTextSettings.arrayRecentFonts.split(';') : [];
 
         EditorUIController.initFonts && EditorUIController.initFonts(storeTextSettings);
 

apps/presentationeditor/mobile/src/store/textSettings.js

@@ -24,6 +24,7 @@ export class storeTextSettings {
             lineSpacing: observable,
             initEditorFonts: action,
             resetFontName: action,
+            resetFontsRecent:action,
             resetFontSize: action,
             resetIsBold: action,
             resetIsItalic: action,
@@ -91,6 +92,11 @@ export class storeTextSettings {
         this.fontName = name;
     }
 
+    resetFontsRecent(fonts) {
+        this.arrayRecentFonts = fonts;
+        this.arrayRecentFonts = this.arrayRecentFonts ? this.arrayRecentFonts.split(';') : [];
+    }
+
     resetFontSize (size) {
         this.fontSize = size;
     }

apps/presentationeditor/mobile/src/view/edit/EditText.jsx

@@ -188,10 +188,12 @@ const PageFonts = props => {
     const fonts = storeTextSettings.fontsArray;
     const arrayFonts = storeTextSettings.arrayRecentFonts;
 
+    const addRecentStorage = () => {
         let arr = [];
         arrayFonts.forEach(item => arr.push(item));
         arr = arr.join(';');
         LocalStorage.setItem('ppe-settings-recent-fonts', arr);
+    }
 
     const [vlFonts, setVlFonts] = useState({
         vlData: {
@@ -269,7 +271,8 @@ const PageFonts = props => {
                             checked={curFontName === item.name}
                             title={item.name}
                             style={{fontFamily: `${item.name}`}}
-                            onClick={() => {props.changeFontFamily(item.name); storeTextSettings.addFontToRecent(item.name)}}
+                            onClick={() => {props.changeFontFamily(item.name); storeTextSettings.addFontToRecent(item.name);
+                                addRecentStorage()}}
                         ></ListItem>
                     ))}
                 </ul>

apps/spreadsheeteditor/mobile/src/controller/Main.jsx

@@ -351,8 +351,7 @@ class MainController extends Component {
         // Text settings 
 
         const storeTextSettings = this.props.storeTextSettings;
-        storeTextSettings.arrayRecentFonts = LocalStorage.getItem('sse-settings-recent-fonts');
+        storeTextSettings.resetFontsRecent(LocalStorage.getItem('sse-settings-recent-fonts'));
-        storeTextSettings.arrayRecentFonts = storeTextSettings.arrayRecentFonts ? storeTextSettings.arrayRecentFonts.split(';') : [];
 
         // Spreadsheet Settings
 

apps/spreadsheeteditor/mobile/src/store/textSettings.js

@@ -16,6 +16,7 @@ export class storeTextSettings {
             paragraphAlign: observable,
             paragraphValign: observable,
             textIn: observable,
+            resetFontsRecent:action,
             initTextSettings: action,
             initFontSettings: action,
             initEditorFonts: action,
@@ -127,6 +128,11 @@ export class storeTextSettings {
         return value;
     }
 
+    resetFontsRecent(fonts) {
+        this.arrayRecentFonts = fonts;
+        this.arrayRecentFonts = this.arrayRecentFonts ? this.arrayRecentFonts.split(';') : [];
+    }
+
     changeCustomTextColors (colors) {
         this.customTextColors = colors;
     }

apps/spreadsheeteditor/mobile/src/view/edit/EditCell.jsx

@@ -129,10 +129,12 @@ const PageFontsCell = props => {
     const fonts = storeCellSettings.fontsArray;
     const arrayFonts = storeTextSettings.arrayRecentFonts;
 
+    const addRecentStorage = () => {
         let arr = [];
         arrayFonts.forEach(item => arr.push(item));
         arr = arr.join(';');
         LocalStorage.setItem('sse-settings-recent-fonts', arr);
+    }
 
     const [vlFonts, setVlFonts] = useState({
         vlData: {
@@ -208,7 +210,8 @@ const PageFontsCell = props => {
                             checked={curFontName === item.name}
                             title={item.name}
                             style={{fontFamily: `${item.name}`}}
-                            onClick={() => {props.onFontClick(item.name); storeTextSettings.addFontToRecent(item.name)}}
+                            onClick={() => {props.onFontClick(item.name); storeTextSettings.addFontToRecent(item.name);
+                                addRecentStorage()}}
                         ></ListItem>
                     ))}
                 </ul>

apps/spreadsheeteditor/mobile/src/view/edit/EditText.jsx

@@ -101,10 +101,12 @@ const PageFonts = props => {
     const fonts = storeTextSettings.fontsArray;
     const arrayFonts = storeTextSettings.arrayRecentFonts;
 
+    const addRecentStorage = () => {
         let arr = [];
         arrayFonts.forEach(item => arr.push(item));
         arr = arr.join(';');
         LocalStorage.setItem('sse-settings-recent-fonts', arr);
+    }
 
     const [vlFonts, setVlFonts] = useState({
         vlData: {
@@ -174,7 +176,8 @@ const PageFonts = props => {
                             checked={curFontName === item.name}
                             title={item.name}
                             style={{fontFamily: `${item.name}`}}
-                            onClick={() => {props.changeFontFamily(item.name); storeTextSettings.addFontToRecent(item.name)}}
+                            onClick={() => {props.changeFontFamily(item.name); storeTextSettings.addFontToRecent(item.name);
+                                addRecentStorage()}}
                         ></ListItem>
                     ))}
                 </ul>