diff --git a/apps/documenteditor/mobile/src/controller/add/AddTable.jsx b/apps/documenteditor/mobile/src/controller/add/AddTable.jsx index b0ff95107c..0322e015ee 100644 --- a/apps/documenteditor/mobile/src/controller/add/AddTable.jsx +++ b/apps/documenteditor/mobile/src/controller/add/AddTable.jsx @@ -9,9 +9,6 @@ class AddTableController extends Component { constructor (props) { super(props); this.onStyleClick = this.onStyleClick.bind(this); - - const api = Common.EditorApi.get(); - api.asc_GetDefaultTableStyles(); } closeModal () { diff --git a/apps/documenteditor/mobile/src/controller/settings/DocumentSettings.jsx b/apps/documenteditor/mobile/src/controller/settings/DocumentSettings.jsx index 2769368ce6..a336121173 100644 --- a/apps/documenteditor/mobile/src/controller/settings/DocumentSettings.jsx +++ b/apps/documenteditor/mobile/src/controller/settings/DocumentSettings.jsx @@ -11,6 +11,7 @@ class DocumentSettingsController extends Component { this.getMargins = this.getMargins.bind(this); this.applyMargins = this.applyMargins.bind(this); this.onFormatChange = this.onFormatChange.bind(this); + this.onColorSchemeChange = this.onColorSchemeChange.bind(this); } onPageOrientation (value){ @@ -107,6 +108,7 @@ class DocumentSettingsController extends Component { onColorSchemeChange(newScheme) { const api = Common.EditorApi.get(); api.asc_ChangeColorSchemeByIdx(+newScheme); + this.props.storeTableSettings.setStyles([], 'default'); } render () { @@ -122,4 +124,4 @@ class DocumentSettingsController extends Component { } } -export default inject("storeDocumentSettings")(observer(withTranslation()(DocumentSettingsController))); \ No newline at end of file +export default inject("storeDocumentSettings", 'storeTableSettings')(observer(withTranslation()(DocumentSettingsController))); \ No newline at end of file diff --git a/apps/documenteditor/mobile/src/store/tableSettings.js b/apps/documenteditor/mobile/src/store/tableSettings.js index 1bd19c4570..41fd7ef368 100644 --- a/apps/documenteditor/mobile/src/store/tableSettings.js +++ b/apps/documenteditor/mobile/src/store/tableSettings.js @@ -14,10 +14,12 @@ export class storeTableSettings { updateCellBorderColor: action, setAutoColor: action, colorAuto: observable, + arrayStylesDefault: observable, }); } arrayStyles = []; + arrayStylesDefault = []; colorAuto = 'auto'; setAutoColor(value) { @@ -28,7 +30,7 @@ export class storeTableSettings { this.arrayStyles = []; } - setStyles (arrStyles) { + setStyles (arrStyles, typeStyles) { let styles = []; for (let template of arrStyles) { styles.push({ @@ -36,6 +38,10 @@ export class storeTableSettings { templateId : template.asc_getId() }); } + + if(typeStyles === 'default') { + return this.arrayStylesDefault = styles; + } return this.arrayStyles = styles; } diff --git a/apps/documenteditor/mobile/src/view/add/Add.jsx b/apps/documenteditor/mobile/src/view/add/Add.jsx index 365bcc5663..0d60f581c5 100644 --- a/apps/documenteditor/mobile/src/view/add/Add.jsx +++ b/apps/documenteditor/mobile/src/view/add/Add.jsx @@ -179,9 +179,12 @@ const AddTabs = inject("storeFocusObjects", "storeTableSettings")(observer(({sto component: }); } + const onGetTableStylesPreviews = () => { - const api = Common.EditorApi.get(); - setTimeout(() => storeTableSettings.setStyles(api.asc_getTableStylesPreviews(true)), 1); + if(storeTableSettings.arrayStylesDefault.length == 0) { + const api = Common.EditorApi.get(); + setTimeout(() => storeTableSettings.setStyles(api.asc_getTableStylesPreviews(true), 'default'), 1); + } } return ( diff --git a/apps/documenteditor/mobile/src/view/add/AddTable.jsx b/apps/documenteditor/mobile/src/view/add/AddTable.jsx index f11b794573..9a75d2470a 100644 --- a/apps/documenteditor/mobile/src/view/add/AddTable.jsx +++ b/apps/documenteditor/mobile/src/view/add/AddTable.jsx @@ -6,7 +6,7 @@ import {Device} from '../../../../../common/mobile/utils/device'; const AddTable = props => { const storeTableSettings = props.storeTableSettings; - const styles = storeTableSettings.arrayStyles; + const styles = storeTableSettings.arrayStylesDefault; return (
diff --git a/apps/documenteditor/mobile/src/view/edit/EditTable.jsx b/apps/documenteditor/mobile/src/view/edit/EditTable.jsx index 7e993375ec..c479c158cc 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditTable.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditTable.jsx @@ -226,11 +226,9 @@ const PageStyleOptions = props => { isBandVer = tableLook.get_BandVer(); } - const openIndicator = () => props.onGetTableStylesPreviews(); - return ( - + {Device.phone && diff --git a/apps/presentationeditor/mobile/src/controller/add/AddOther.jsx b/apps/presentationeditor/mobile/src/controller/add/AddOther.jsx index 3b8edb68bb..e6060381d5 100644 --- a/apps/presentationeditor/mobile/src/controller/add/AddOther.jsx +++ b/apps/presentationeditor/mobile/src/controller/add/AddOther.jsx @@ -10,10 +10,7 @@ class AddOtherController extends Component { constructor (props) { super(props); this.onStyleClick = this.onStyleClick.bind(this); - this.initStyleTable = this.initStyleTable.bind(this); this.onGetTableStylesPreviews = this.onGetTableStylesPreviews.bind(this); - - this.initTable = false; } closeModal () { @@ -24,14 +21,6 @@ class AddOtherController extends Component { } } - initStyleTable () { - if (!this.initTable) { - const api = Common.EditorApi.get(); - api.asc_GetDefaultTableStyles(); - this.initTable = true; - } - } - onStyleClick (type) { const api = Common.EditorApi.get(); @@ -93,8 +82,10 @@ class AddOtherController extends Component { } onGetTableStylesPreviews = () => { - const api = Common.EditorApi.get(); - setTimeout(() => this.props.storeTableSettings.setStyles(api.asc_getTableStylesPreviews(true)), 1); + if(this.props.storeTableSettings.arrayStylesDefault.length == 0) { + const api = Common.EditorApi.get(); + setTimeout(() => this.props.storeTableSettings.setStyles(api.asc_getTableStylesPreviews(true), 'default'), 1); + } } hideAddComment () { @@ -127,7 +118,6 @@ class AddOtherController extends Component { return ( diff --git a/apps/presentationeditor/mobile/src/controller/settings/PresentationSettings.jsx b/apps/presentationeditor/mobile/src/controller/settings/PresentationSettings.jsx index cb3c6803de..c18cdae00c 100644 --- a/apps/presentationeditor/mobile/src/controller/settings/PresentationSettings.jsx +++ b/apps/presentationeditor/mobile/src/controller/settings/PresentationSettings.jsx @@ -7,6 +7,7 @@ class PresentationSettingsController extends Component { super(props); this.initSlideSize = this.initSlideSize.bind(this); this.onSlideSize = this.onSlideSize.bind(this); + this.onColorSchemeChange = this.onColorSchemeChange.bind(this); this.initSlideSize(); } @@ -47,6 +48,7 @@ class PresentationSettingsController extends Component { onColorSchemeChange(newScheme) { const api = Common.EditorApi.get(); api.asc_ChangeColorSchemeByIdx(newScheme); + this.props.storeTableSettings.setStyles([], 'default'); } @@ -62,4 +64,4 @@ class PresentationSettingsController extends Component { } } -export default inject("storePresentationSettings")(observer(PresentationSettingsController)); \ No newline at end of file +export default inject("storePresentationSettings", "storeTableSettings")(observer(PresentationSettingsController)); \ No newline at end of file diff --git a/apps/presentationeditor/mobile/src/store/tableSettings.js b/apps/presentationeditor/mobile/src/store/tableSettings.js index 7296cfc161..5e433263fe 100644 --- a/apps/presentationeditor/mobile/src/store/tableSettings.js +++ b/apps/presentationeditor/mobile/src/store/tableSettings.js @@ -14,10 +14,12 @@ export class storeTableSettings { updateCellBorderColor: action, setAutoColor: action, colorAuto: observable, + arrayStylesDefault: observable, }); } arrayStyles = []; + arrayStylesDefault = []; colorAuto = 'auto'; setAutoColor(value) { @@ -28,7 +30,7 @@ export class storeTableSettings { this.arrayStyles = []; } - setStyles (arrStyles) { + setStyles (arrStyles, typeStyles) { let styles = []; for (let template of arrStyles) { styles.push({ @@ -36,6 +38,10 @@ export class storeTableSettings { templateId : template.asc_getId() }); } + + if(typeStyles === 'default') { + return this.arrayStylesDefault = styles; + } return this.arrayStyles = styles; } diff --git a/apps/presentationeditor/mobile/src/view/add/AddOther.jsx b/apps/presentationeditor/mobile/src/view/add/AddOther.jsx index e337874e99..2eb8d5f4a6 100644 --- a/apps/presentationeditor/mobile/src/view/add/AddOther.jsx +++ b/apps/presentationeditor/mobile/src/view/add/AddOther.jsx @@ -5,11 +5,10 @@ import { useTranslation } from 'react-i18next'; import {Device} from "../../../../../common/mobile/utils/device"; const PageTable = props => { - props.initStyleTable(); const { t } = useTranslation(); const _t = t('View.Add', {returnObjects: true}); const storeTableSettings = props.storeTableSettings; - const styles = storeTableSettings.arrayStyles; + const styles = storeTableSettings.arrayStylesDefault; return ( @@ -50,7 +49,6 @@ const AddOther = props => { props.onGetTableStylesPreviews()} routeProps={{ onStyleClick: props.onStyleClick, - initStyleTable: props.initStyleTable }}> diff --git a/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx b/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx index 8c0423fe49..95dd241223 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx @@ -66,11 +66,9 @@ const PageStyleOptions = props => { isBandVer = tableLook.get_BandVer(); } - const openIndicator = () => props.onGetTableStylesPreviews(); - return ( - + {Device.phone &&