diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index 5e6633c9f..2b3f3df2d 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -28,6 +28,10 @@ pointer-events: none; } +.text-content { + padding: 14px 10px 0 10px; +} + .shapes { li { width: 70px; diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index b6004ece5..1f05770b6 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -217,7 +217,8 @@ "textFirstColumn": "First Column", "textLastColumn": "Last Column", "textBandedColumn": "Banded Column", - "textType": "Type" + "textType": "Type", + "textNoStyles": "No styles for this type of charts." }, "Add": { "textTable": "Table", diff --git a/apps/documenteditor/mobile/src/controller/edit/EditChart.jsx b/apps/documenteditor/mobile/src/controller/edit/EditChart.jsx index b33b1b29e..2e7293f28 100644 --- a/apps/documenteditor/mobile/src/controller/edit/EditChart.jsx +++ b/apps/documenteditor/mobile/src/controller/edit/EditChart.jsx @@ -14,8 +14,16 @@ class EditChartController extends Component { this.onBorderColor = this.onBorderColor.bind(this); this.onBorderSize = this.onBorderSize.bind(this); - const api = Common.EditorApi.get(); - props.storeChartSettings.updateChartStyles(api.asc_getChartPreviews(props.storeFocusObjects.chartObject.get_ChartProperties().getType())); + const type = props.storeFocusObjects.chartObject.get_ChartProperties().getType(); + if (type==Asc.c_oAscChartTypeSettings.comboBarLine || + type==Asc.c_oAscChartTypeSettings.comboBarLineSecondary || + type==Asc.c_oAscChartTypeSettings.comboAreaBar || + type==Asc.c_oAscChartTypeSettings.comboCustom) { + props.storeChartSettings.clearChartStyles(); + } else { + const api = Common.EditorApi.get(); + props.storeChartSettings.updateChartStyles(api.asc_getChartPreviews(type)); + } } onRemoveChart () { diff --git a/apps/documenteditor/mobile/src/store/chartSettings.js b/apps/documenteditor/mobile/src/store/chartSettings.js index 8efe74546..90485f462 100644 --- a/apps/documenteditor/mobile/src/store/chartSettings.js +++ b/apps/documenteditor/mobile/src/store/chartSettings.js @@ -56,11 +56,15 @@ export class storeChartSettings { } // style - @observable chartStyles; + @observable chartStyles = null; + @action clearChartStyles () { + this.chartStyles = null; + } @action updateChartStyles (styles) { this.chartStyles = styles; } @computed get styles () { + if (!this.chartStyles) return null; const widthContainer = document.querySelector(".page-content").clientWidth; const columns = parseInt(widthContainer / 70); // magic let row = -1; diff --git a/apps/documenteditor/mobile/src/view/edit/EditChart.jsx b/apps/documenteditor/mobile/src/view/edit/EditChart.jsx index 7c62b7bdc..1c88133a8 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditChart.jsx @@ -175,7 +175,7 @@ const PageStyle = props => {
- {styles.map((row, rowIndex) => { + {styles ? styles.map((row, rowIndex) => { return ( ) - })} + }) : +
{_t.textNoStyles}
+ }
diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index 7207ffc45..3c745e374 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -228,7 +228,8 @@ "textStyleOptions": "Style Options", "textRemoveTable": "Remove Table", "textCellMargins": "Cell Margins", - "textRemoveChart": "Remove Chart" + "textRemoveChart": "Remove Chart", + "textNoStyles": "No styles for this type of charts." } }, "Common": { diff --git a/apps/presentationeditor/mobile/src/controller/edit/EditChart.jsx b/apps/presentationeditor/mobile/src/controller/edit/EditChart.jsx index 10274945a..a26798154 100644 --- a/apps/presentationeditor/mobile/src/controller/edit/EditChart.jsx +++ b/apps/presentationeditor/mobile/src/controller/edit/EditChart.jsx @@ -12,8 +12,16 @@ class EditChartController extends Component { this.onBorderColor = this.onBorderColor.bind(this); this.onBorderSize = this.onBorderSize.bind(this); - const api = Common.EditorApi.get(); - props.storeChartSettings.updateChartStyles(api.asc_getChartPreviews(props.storeFocusObjects.chartObject.getType())); + const type = props.storeFocusObjects.chartObject.getType(); + if (type==Asc.c_oAscChartTypeSettings.comboBarLine || + type==Asc.c_oAscChartTypeSettings.comboBarLineSecondary || + type==Asc.c_oAscChartTypeSettings.comboAreaBar || + type==Asc.c_oAscChartTypeSettings.comboCustom) { + props.storeChartSettings.clearChartStyles(); + } else { + const api = Common.EditorApi.get(); + props.storeChartSettings.updateChartStyles(api.asc_getChartPreviews(type)); + } } onRemoveChart () { diff --git a/apps/presentationeditor/mobile/src/store/chartSettings.js b/apps/presentationeditor/mobile/src/store/chartSettings.js index 622cd0c43..42eeee22f 100644 --- a/apps/presentationeditor/mobile/src/store/chartSettings.js +++ b/apps/presentationeditor/mobile/src/store/chartSettings.js @@ -4,13 +4,18 @@ export class storeChartSettings { // Style - @observable chartStyles; + @observable chartStyles = null; + + @action clearChartStyles () { + this.chartStyles = null; + } @action updateChartStyles (styles) { this.chartStyles = styles; } @computed get styles () { + if (!this.chartStyles) return null; const widthContainer = document.querySelector(".page-content").clientWidth; const columns = parseInt(widthContainer / 70); // magic let row = -1; diff --git a/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx b/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx index 376930be0..81cddaeeb 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx @@ -187,7 +187,7 @@ const PageStyle = props => {
- {styles.map((row, rowIndex) => { + {styles ? styles.map((row, rowIndex) => { return ( ) - })} + }) : +
{_t.textNoStyles}
+ }