diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index c9b62e1f0e..0f25b202f6 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -328,6 +328,7 @@ "txtWidth": "Width", "txtHeight": "Height", "textCellSize": "Rows & columns size", + "textCellOptions": "Cell options", "textLevels": "Levels", "textLineSpacing": "Line spacing", "textLink": "Link", diff --git a/apps/documenteditor/mobile/src/controller/edit/EditTable.jsx b/apps/documenteditor/mobile/src/controller/edit/EditTable.jsx index ac86a5af42..0f7f2877d8 100644 --- a/apps/documenteditor/mobile/src/controller/edit/EditTable.jsx +++ b/apps/documenteditor/mobile/src/controller/edit/EditTable.jsx @@ -108,6 +108,14 @@ class EditTableController extends Component { api.tblApply(properties); } } + onOptionCellWrap (value) { + const api = Common.EditorApi.get(); + if (api) { + const properties = new Asc.CTableProp(); + properties.put_CellsNoWrap(value); + api.tblApply(properties); + } + } onWrapType (value) { const api = Common.EditorApi.get(); if (api) { @@ -263,6 +271,7 @@ class EditTableController extends Component { onGetTableStylesPreviews = {this.onGetTableStylesPreviews} onDistributeTable = {this.onDistributeTable} onChangeTableDimension = {this.onChangeTableDimension} + onOptionCellWrap = {this.onOptionCellWrap} /> ) } diff --git a/apps/documenteditor/mobile/src/store/tableSettings.js b/apps/documenteditor/mobile/src/store/tableSettings.js index a07fcd0ebf..8b782f7dc6 100644 --- a/apps/documenteditor/mobile/src/store/tableSettings.js +++ b/apps/documenteditor/mobile/src/store/tableSettings.js @@ -74,10 +74,13 @@ export class storeTableSettings { return tableObject.get_TablePaddings().get_Top(); } getRowHeight (tableObject) { - return tableObject.get_RowHeight() + return tableObject.get_RowHeight(); } getColumnWidth (tableObject) { - return tableObject.get_ColumnWidth() + return tableObject.get_ColumnWidth(); + } + getCellWrapOption (tableObject) { + return tableObject.get_CellsNoWrap(); } // Fill color diff --git a/apps/documenteditor/mobile/src/view/edit/EditTable.jsx b/apps/documenteditor/mobile/src/view/edit/EditTable.jsx index ac18790db5..15b8836571 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditTable.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditTable.jsx @@ -42,16 +42,18 @@ const PageTableOptions = props => { const tableObject = storeFocusObjects.tableObject; const storeTableSettings = props.storeTableSettings; - let distance, isRepeat, isResize, columnWidth, rowHeight, displayRowHeight, displayColumnWidth; + let distance, isRepeat, isResize, columnWidth, rowHeight, displayRowHeight, displayColumnWidth, isCellNoWrap; if (tableObject) { distance = Common.Utils.Metric.fnRecalcFromMM(storeTableSettings.getCellMargins(tableObject)); isRepeat = storeTableSettings.getRepeatOption(tableObject); isResize = storeTableSettings.getResizeOption(tableObject); + isCellNoWrap = storeTableSettings.getCellWrapOption(tableObject); rowHeight = Common.Utils.Metric.fnRecalcFromMM(storeTableSettings.getRowHeight(tableObject)); columnWidth = Common.Utils.Metric.fnRecalcFromMM(storeTableSettings.getColumnWidth(tableObject)); displayRowHeight = Number(rowHeight.toFixed(2)); displayColumnWidth = Number(columnWidth.toFixed(2)); } + const [stateDistance, setDistance] = useState(distance); if (!tableObject && Device.phone) { @@ -130,6 +132,14 @@ const PageTableOptions = props => { + + {_t.textCellOptions} + + + {props.onOptionCellWrap(!isCellNoWrap)}} /> + + + {_t.textCellMargins} @@ -692,6 +702,7 @@ const EditTable = props => { onOptionRepeat: props.onOptionRepeat, onDistributeTable: props.onDistributeTable, onChangeTableDimension: props.onChangeTableDimension, + onOptionCellWrap: props.onOptionCellWrap }}>