From dc50581e7cfca0f1c4ffde5241c00cd7b82ed0db Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Fri, 16 Jul 2021 16:18:10 +0300 Subject: [PATCH 1/5] [DE PE] Fix Bug 47943 --- apps/documenteditor/mobile/src/view/edit/EditText.jsx | 4 ++-- apps/presentationeditor/mobile/src/view/edit/EditText.jsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx index e14cf43edf..d8198ac2cf 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditText.jsx @@ -119,13 +119,13 @@ const PageAdditionalFormatting = props => { - {!isAndroid &&
{letterSpacing + ' ' + Common.Utils.Metric.getCurrentMetricName()}
} + {!isAndroid &&
{(Number.isInteger(letterSpacing) ? letterSpacing : letterSpacing.toFixed(2)) + ' ' + Common.Utils.Metric.getCurrentMetricName()}
}
- {isAndroid && } + {isAndroid && } diff --git a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx index cb78c48006..d6a9875131 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx @@ -377,13 +377,13 @@ const PageAdditionalFormatting = props => { - {!isAndroid &&
{Number(letterSpacing).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName()}
} + {!isAndroid &&
{(Number.isInteger(letterSpacing) ? letterSpacing : letterSpacing.toFixed(2)) + ' ' + Common.Utils.Metric.getCurrentMetricName()}
}
- {isAndroid && } + {isAndroid && } From dcca2e189efa689d932051047b58b69935850a30 Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Mon, 19 Jul 2021 16:26:51 +0300 Subject: [PATCH 2/5] Fix Bug 50903 --- apps/common/mobile/lib/component/ThemeColorPalette.jsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/common/mobile/lib/component/ThemeColorPalette.jsx b/apps/common/mobile/lib/component/ThemeColorPalette.jsx index b0637aa453..ea46284f1d 100644 --- a/apps/common/mobile/lib/component/ThemeColorPalette.jsx +++ b/apps/common/mobile/lib/component/ThemeColorPalette.jsx @@ -45,7 +45,7 @@ const StandartColors = ({ options, standartColors, onColorClick, curColor }) => ) }; -const CustomColors = ({ options, customColors, onColorClick, curColor }) => { +const CustomColors = ({ options, customColors, isTypeColors, onColorClick, curColor }) => { const colors = customColors.length > 0 ? customColors : []; const emptyItems = []; if (colors.length < options.customcolors) { @@ -64,7 +64,7 @@ const CustomColors = ({ options, customColors, onColorClick, curColor }) => { {colors && colors.length > 0 && colors.map((color, index) => { return( {onColorClick(color)}} > @@ -100,6 +100,7 @@ const ThemeColorPalette = props => { themeColors[row].push(effect); }); const standartColors = Common.Utils.ThemeColor.getStandartColors(); + let isTypeColors = standartColors.some( value => value === curColor ); // custom color let customColors = props.customColors; if (customColors.length < 1) { @@ -120,7 +121,7 @@ const ThemeColorPalette = props => {
{ _t.textCustomColors }
- +
From 54fb6bb1428e869f68f5ed74f787272c73861f73 Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Tue, 20 Jul 2021 12:10:13 +0300 Subject: [PATCH 3/5] Fix Bug 49412 --- apps/documenteditor/mobile/src/view/edit/EditImage.jsx | 7 ++++--- apps/documenteditor/mobile/src/view/edit/EditShape.jsx | 7 +++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/edit/EditImage.jsx b/apps/documenteditor/mobile/src/view/edit/EditImage.jsx index d87558efc8..e8ed780a6f 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditImage.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditImage.jsx @@ -239,6 +239,7 @@ const EditImage = props => { const storeFocusObjects = props.storeFocusObjects; const imageObject = storeFocusObjects.imageObject; const pluginGuid = imageObject.asc_getPluginGuid(); + const wrapType = props.storeImageSettings.getWrapType(imageObject); return ( @@ -254,9 +255,9 @@ const EditImage = props => { onReplaceByFile: props.onReplaceByFile, onReplaceByUrl: props.onReplaceByUrl }}> - + }}> } {props.onDefaulSize()}}/> @@ -266,7 +267,7 @@ const EditImage = props => { ) }; -const EditImageContainer = inject("storeFocusObjects")(observer(EditImage)); +const EditImageContainer = inject("storeFocusObjects", "storeImageSettings")(observer(EditImage)); const PageWrapContainer = inject("storeFocusObjects", "storeImageSettings")(observer(PageWrap)); const PageReplaceContainer = inject("storeFocusObjects")(observer(PageReplace)); const PageReorderContainer = inject("storeFocusObjects")(observer(PageReorder)); diff --git a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx index b4c785b50d..85095537b4 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx @@ -506,9 +506,8 @@ const EditShape = props => { const { t } = useTranslation(); const _t = t('Edit', {returnObjects: true}); const canFill = props.storeFocusObjects.shapeObject.get_ShapeProperties().get_CanFill(); - const storeShapeSettings = props.storeShapeSettings; const shapeObject = props.storeFocusObjects.shapeObject; - const wrapType = storeShapeSettings.getWrapType(shapeObject); + const wrapType = props.storeShapeSettings.getWrapType(shapeObject); let disableRemove = !!props.storeFocusObjects.paragraphObject; @@ -537,9 +536,9 @@ const EditShape = props => { - + }}> } {props.onRemoveShape()}} className={`button-red button-fill button-raised${disableRemove ? ' disabled' : ''}`} /> From 68ecdfa60e27a5d0b606eae2f601a800047d05f8 Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Tue, 20 Jul 2021 15:10:02 +0300 Subject: [PATCH 4/5] Fix Bug 51307 --- apps/spreadsheeteditor/mobile/src/less/app.less | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/spreadsheeteditor/mobile/src/less/app.less b/apps/spreadsheeteditor/mobile/src/less/app.less index a3bcb96d93..66c3cd23a0 100644 --- a/apps/spreadsheeteditor/mobile/src/less/app.less +++ b/apps/spreadsheeteditor/mobile/src/less/app.less @@ -84,3 +84,9 @@ } } } + +.item-input-wrap { + input[type = number] { + -moz-appearance: textfield; + } +} From 4e3144a159868bfeb3809a6aea93a33f6af9ba76 Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Thu, 22 Jul 2021 14:11:29 +0300 Subject: [PATCH 5/5] Refactoring and fix typeSort --- .../mobile/src/controller/FilterOptions.jsx | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/src/controller/FilterOptions.jsx b/apps/spreadsheeteditor/mobile/src/controller/FilterOptions.jsx index d1c950bb6a..131ba83e47 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/FilterOptions.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/FilterOptions.jsx @@ -63,6 +63,7 @@ const FilterOptionsController = () => { const onClearFilter = () => { const api = Common.EditorApi.get(); if(api) api.asc_clearFilter(); + setCheckSort(''); }; const onDeleteFilter = () => { @@ -79,21 +80,17 @@ const FilterOptionsController = () => { const setClearDisable = (config) => { let arr = config.asc_getValues(); let lenCheck = arr.filter((item) => item.visible == true).length; - lenCheck == arr.length ? setIsValid(true) : setIsValid(false) + lenCheck == arr.length ? setIsValid(true) : setIsValid(false); }; const setDataFilterCells = (config) => { - function isNumeric(value) { - return !isNaN(parseFloat(value)) && isFinite(value); - } - let value = null, isnumber = null, arrCells = []; config.asc_getValues().forEach((item, index) => { value = item.asc_getText(); - isnumber = isNumeric(value); + isnumber = !isNaN(parseFloat(value)) && isFinite(value); arrCells.push({ id : index, @@ -111,12 +108,7 @@ const FilterOptionsController = () => { const onUpdateCell = (id, state) => { const api = Common.EditorApi.get(); - if ( id == 'all' ) { - listVal.forEach(item => item.check = state); - } else { - listVal[id].check = state; - } - + id == 'all' ? listVal.forEach(item => item.check = state) : listVal[id].check = state; setListValue([...listVal]); if ( listVal.some(item => item.check) ) {