From ad63fe3e765af240077e83f8773d6235e1b2460c Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Mon, 7 Feb 2022 15:28:38 +0400 Subject: [PATCH] [SSE mobile] Fix Bug 55374 --- .../mobile/src/controller/DropdownList.jsx | 12 ++++++------ .../spreadsheeteditor/mobile/src/controller/Main.jsx | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/src/controller/DropdownList.jsx b/apps/spreadsheeteditor/mobile/src/controller/DropdownList.jsx index 13aa8701e..763add287 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/DropdownList.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/DropdownList.jsx @@ -13,16 +13,16 @@ class DropdownListController extends Component { isOpen: false }; - Common.Notifications.on('openDropdownList', addArr => { - this.initDropdownList(addArr); + Common.Notifications.on('openDropdownList', (textArr, addArr) => { + this.initDropdownList(textArr, addArr); }); } - initDropdownList(addArr) { - this.listItems = addArr.map(item => { + initDropdownList(textArr, addArr) { + this.listItems = textArr.map((item, index) => { return { - caption: item.getTextValue(), - value: item + caption: item, + value: addArr ? addArr[index] : item }; }); diff --git a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx index 44be0b004..2a7548f21 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx @@ -455,7 +455,7 @@ class MainController extends Component { dropdownListTarget.css({left: `${showPoint[0]}px`, top: `${showPoint[1]}px`}); } - Common.Notifications.trigger('openDropdownList', addArr); + Common.Notifications.trigger('openDropdownList', textArr, addArr); } else { !validation && f7.dialog.create({ title: t('Controller.Main.notcriticalErrorTitle'),