From a65dfa2408c53d042134c36b0cc776fd4bd7ed7b Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Wed, 1 Sep 2021 14:20:17 +0300 Subject: [PATCH 01/54] [DE] Fix Bug 47375 --- apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx b/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx index 0f1118b02..4d0d6edcf 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx @@ -222,7 +222,7 @@ const EditParagraph = props => { }}> {_t.textParagraphStyles} - + {paragraphStyles.map((style, index) => ( Date: Wed, 1 Sep 2021 15:23:48 +0300 Subject: [PATCH 02/54] [DE PE SSE] Fix Bug 52264 --- apps/documenteditor/mobile/src/view/Toolbar.jsx | 2 +- apps/presentationeditor/mobile/src/view/Toolbar.jsx | 2 +- apps/spreadsheeteditor/mobile/src/view/Toolbar.jsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/Toolbar.jsx b/apps/documenteditor/mobile/src/view/Toolbar.jsx index 6a801fdd1..513b5418c 100644 --- a/apps/documenteditor/mobile/src/view/Toolbar.jsx +++ b/apps/documenteditor/mobile/src/view/Toolbar.jsx @@ -35,7 +35,7 @@ const ToolbarView = props => { })} { Device.phone ? null : } {props.displayCollaboration && window.matchMedia("(min-width: 360px)").matches ? props.openOptions('coauth')}> : null} - props.openOptions('settings')}> + props.openOptions('settings')}> ) diff --git a/apps/presentationeditor/mobile/src/view/Toolbar.jsx b/apps/presentationeditor/mobile/src/view/Toolbar.jsx index d5cc8e502..cd479b3a3 100644 --- a/apps/presentationeditor/mobile/src/view/Toolbar.jsx +++ b/apps/presentationeditor/mobile/src/view/Toolbar.jsx @@ -36,7 +36,7 @@ const ToolbarView = props => { })} { Device.phone ? null : } {props.displayCollaboration && window.matchMedia("(min-width: 375px)").matches ? props.openOptions('coauth')}> : null} - props.openOptions('settings')}> + props.openOptions('settings')}> ) diff --git a/apps/spreadsheeteditor/mobile/src/view/Toolbar.jsx b/apps/spreadsheeteditor/mobile/src/view/Toolbar.jsx index 3ffaa264b..2c7b38da4 100644 --- a/apps/spreadsheeteditor/mobile/src/view/Toolbar.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/Toolbar.jsx @@ -30,7 +30,7 @@ const ToolbarView = props => { })} { Device.phone ? null : } {props.displayCollaboration && window.matchMedia("(min-width: 360px)").matches ? props.openOptions('coauth')}> : null} - props.openOptions('settings')}> + props.openOptions('settings')}> ) From ce7791ea195a351e92637301ab154492d4dc27f2 Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Fri, 3 Sep 2021 16:20:39 +0300 Subject: [PATCH 03/54] [DE PE SSE] Fix Bug 52362 --- apps/common/mobile/resources/less/common-material.less | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less index 65c4f182d..b762db944 100644 --- a/apps/common/mobile/resources/less/common-material.less +++ b/apps/common/mobile/resources/less/common-material.less @@ -35,6 +35,12 @@ --f7-touch-ripple-color: transparent; } + .segmented { + .button { + --f7-touch-ripple-color: var(--f7-list-link-pressed-bg-color); + } + } + --f7-input-focused-border-color: @themeColor; --f7-label-focused-text-color: @themeColor; From f1421ac2edef2e02c4f48b0d68bbadc93ded17d3 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Mon, 6 Sep 2021 21:55:10 +0300 Subject: [PATCH 04/54] [SSE mobile] Make tablet version --- apps/common/mobile/resources/less/common.less | 36 ++++--- .../mobile/src/controller/CellEditor.jsx | 11 +- .../mobile/src/view/CellEditor.jsx | 102 ++++++++++++------ 3 files changed, 104 insertions(+), 45 deletions(-) diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index d14b0f595..9090b089b 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -880,27 +880,37 @@ input[type="number"]::-webkit-inner-spin-button { .functions-list { height: 175px; overflow-y: auto; - position: absolute; - top: 30px; - right: 0; + overflow-x: hidden; + // position: absolute; + // top: 30px; + // right: 0; background-color: @white; .list { - margin: 0; - ul:before { - display: none; - } - .item-content { - padding-left: 0; - } - .item-inner { - padding-left: calc(var(--f7-list-item-padding-horizontal) + var(--f7-safe-area-left) - var(--menu-list-offset)); - } + // margin: 0; + // ul:before { + // display: none; + // } + // .item-content { + // padding-left: 0; + // } + // .item-inner { + // padding-left: calc(var(--f7-list-item-padding-horizontal) + var(--f7-safe-area-left) - var(--menu-list-offset)); + // } .item-title { font-size: 15px; } } } +.target-function-list { + position: absolute; + left: 0; + top: 0; + bottom: 0; + width: 0; + height: 100%; +} + diff --git a/apps/spreadsheeteditor/mobile/src/controller/CellEditor.jsx b/apps/spreadsheeteditor/mobile/src/controller/CellEditor.jsx index fe0a15874..9f41efbd5 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/CellEditor.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/CellEditor.jsx @@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react'; import CellEditorView from '../view/CellEditor'; import { f7 } from 'framework7-react'; +import { Device } from '../../../../common/mobile/utils/device'; const CellEditor = props => { useEffect(() => { @@ -24,7 +25,15 @@ const CellEditor = props => { setCoauthDisabled(info.asc_getLocked() === true || info.asc_getLockedTable() === true || info.asc_getLockedPivotTable()===true); } - const onFormulaCompleteMenu = funcArr => setFuncArr(funcArr); + const onFormulaCompleteMenu = funcArr => { + setFuncArr(funcArr); + + if(!Device.isPhone && funcArr) { + f7.popover.open('#idx-functions-list', '#idx-list-target'); + } else { + f7.popover.close('#idx-functions-list'); + } + } const insertFormula = (name, type) => { const api = Common.EditorApi.get(); diff --git a/apps/spreadsheeteditor/mobile/src/view/CellEditor.jsx b/apps/spreadsheeteditor/mobile/src/view/CellEditor.jsx index bdafdfa0e..d932403a5 100644 --- a/apps/spreadsheeteditor/mobile/src/view/CellEditor.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/CellEditor.jsx @@ -1,5 +1,5 @@ -import React, { useState } from 'react'; +import React, { Fragment, useState } from 'react'; import { Input, View, Button, Link, Popover, ListItem, List, Icon, f7 } from 'framework7-react'; import {observer, inject} from "mobx-react"; // import {PageFunctionInfo} from "./add/AddFunction"; @@ -14,6 +14,45 @@ const contentStyle = { flexGrow: 1 }; +const FunctionsList = props => { + const isPhone = Device.isPhone; + const functions = props.functions; + const funcArr = props.funcArr; + + return ( +
+ + {funcArr.map((elem, index) => { + return ( + props.insertFormula(elem.name, elem.type)}> +
{ + e.stopPropagation(); + let functionInfo = functions[elem.name]; + + if(functionInfo) { + if(isPhone) { + f7.dialog.create({ + title: functionInfo.caption, + content: `

${functionInfo.caption} ${functionInfo.args}

+

${functionInfo.descr}

`, + buttons: [{text: 'Ok'}] + }).open(); + } else { + console.log('other'); + } + } + }}> + +
+ + ) + })} + +
+ ) +} + const CellEditorView = props => { const [expanded, setExpanded] = useState(false); const isPhone = Device.isPhone; @@ -27,7 +66,9 @@ const CellEditorView = props => { setExpanded(!expanded); }; - return + return ( + <> +
+