Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1980 from ONLYOFFICE/feature/fix-bugs

Browse source 
Feature/fix bugs
This commit is contained in:
maxkadushkin 2022-09-26 13:02:22 +03:00 committed by GitHub
parent 0c2502056d 9f37a4c70d
commit 8b052cef5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 33 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/common/mobile/lib/view/Search.jsx
View file

@ -116,7 +116,12 @@ class SearchView extends Component {
expandable: true,
backdrop: false,
on: {
search: (bar, curval, prevval) => {
search: (sb, query, previousQuery) => {
const api = Common.EditorApi.get();
if(!query) {
api.asc_selectSearchingResults(false);
}
},
}
});

10
apps/common/mobile/resources/less/common.less
View file

@ -1088,16 +1088,6 @@ input[type="number"]::-webkit-inner-spin-button {
border: 0.5px solid @background-menu-divider;
}
// Navigation list
.list.navigation-list {
overflow-y: auto;
height: 265px;
.item-title {
color: @text-normal;
}
}
// Sharing Settings
.sharing-placeholder {
height: 100%;

27
apps/documenteditor/mobile/src/less/app.less
View file

@ -219,18 +219,37 @@
.sheet-modal.navigation-sheet {
box-shadow: 0px -2px 20px rgba(0, 0, 0, 0.2);
overflow: hidden;
.sheet-modal-inner {
background: @background-tertiary;
overflow: hidden;
overflow-y: auto;
}
.swipe-container {
position: fixed;
top: 0;
width: 100%;
z-index: 1000;
}
&.sheet-modal-bottom:before, &.sheet-modal:not(.sheet-modal-top):before {
display: none;
}
}
.navigation-list {
margin: 0;
.list.navigation-list {
margin-top: 72px;
.item-title {
color: @text-normal;
}
}
.navigation-sheet {
&__title {
position: fixed;
left: 0;
width: 100%;
z-index: 100;
top: 40px;
z-index: 1000;
}
}
// Picker

6
apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx
View file

@ -207,7 +207,7 @@ const EditParagraph = props => {
onStyleMenuDelete: props.onStyleMenuDelete
}}>
{curStyle &&
<div slot="inner" style={{backgroundImage: 'url(' + curStyle.image + ')', width: '100%', height: thumbSize.height + 'px', backgroundSize: 'contain', backgroundRepeat: 'no-repeat'}}></div>
<div slot="inner" style={{backgroundImage: 'url(' + curStyle.image + ')', width: '100%', height: thumbSize.height + 'px', backgroundSize: 'contain', backgroundRepeat: 'no-repeat', backgroundColor: '#fff'}}></div>
}
</ListItem>
</List>
@ -278,7 +278,7 @@ const EditParagraphStyle = props => {
}}
>
<div slot="inner"
style={{backgroundImage: 'url(' + style.image + ')', width: '100%', height: thumbSize.height + 'px', backgroundSize: 'contain', backgroundRepeat: 'no-repeat'}}
style={{backgroundImage: 'url(' + style.image + ')', width: '100%', height: thumbSize.height + 'px', backgroundSize: 'contain', backgroundRepeat: 'no-repeat', backgroundColor: '#fff'}}
></div>
{!api.asc_IsStyleDefault(style.name) && (
<div slot="inner-end">
@ -369,7 +369,7 @@ const ChangeNextParagraphStyle = props => {
}}
>
<div slot="inner"
style={{backgroundImage: 'url(' + style.image + ')', width: '100%', height: thumbSize.height + 'px', backgroundSize: 'contain', backgroundRepeat: 'no-repeat'}}
style={{backgroundImage: 'url(' + style.image + ')', width: '100%', height: thumbSize.height + 'px', backgroundSize: 'contain', backgroundRepeat: 'no-repeat', backgroundColor: '#fff'}}
></div>
</ListItem>
))}

2
apps/documenteditor/mobile/src/view/settings/Navigation.jsx
View file

@ -29,7 +29,7 @@ const NavigationPopover = inject('storeNavigation')(observer(props => {
<p className="empty-screens__text">{t('Settings.textEmptyScreens')}</p>
</div>
:
<List className="navigation-list">
<List className="navigation-list" style={!Device.phone ? { height: '352px', marginTop: 0 } : null}>
{arrHeaders.map((header, index) => {
return (
<ListItem radio key={index} title={header.isEmptyItem ? t('Settings.textBeginningDocument') : header.name} checked={header.index === currentPosition} style={{paddingLeft: header.level * 16}} onClick={() => {