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

Merge pull request #1304 from ONLYOFFICE/feature/fix-bug-reactjs

Browse source 
Feature/fix bug reactjs
This commit is contained in:
maxkadushkin 2021-11-15 12:24:47 +03:00 committed by GitHub
parent e39cc547d7 2d0c152ee1
commit 45538869ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/common/mobile/lib/view/collaboration/Review.jsx
View file

@ -26,11 +26,7 @@ const PageReview = props => {
<List> <List>
{canReview && {canReview &&
<ListItem title={_t.textTrackChanges} className={isDisableAllSettings ? 'disabled' : ''}> <ListItem title={_t.textTrackChanges} className={isDisableAllSettings ? 'disabled' : ''}>
<Toggle checked={props.trackChanges} onToggleChange={ <Toggle checked={props.trackChanges} onToggleChange={() => props.onTrackChanges(!props.trackChanges)}/>
(prev) => {
props.onTrackChanges(!prev);
}
}/>
</ListItem> </ListItem>
} }
{!props.isRestrictedEdit && {!props.isRestrictedEdit &&

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

@ -113,6 +113,14 @@
.swiper-pagination-bullet-active{ .swiper-pagination-bullet-active{
background: @black; background: @black;
} }
.multilevels {
li:not(:first-child){
border:none;
.item-content {
min-height: 70px;
}
}
}
} }

12
apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx
View file

@ -25,11 +25,13 @@ const StatusbarView = inject('storeAppOptions', 'sheets', 'users')(observer(prop
return ( return (
<Fragment> <Fragment>
<View id="idx-statusbar" className="statusbar" style={viewStyle}> <View id="idx-statusbar" className="statusbar" style={viewStyle}>
<div id="idx-box-add-tab" className={`${isDisconnected || isWorkbookLocked || isProtectedWorkbook ? 'disabled' : ''}`}> {isEdit &&
<Link href={false} id="idx-btn-addtab" className={`tab${isDisabledEditSheet || isDisconnected || isWorkbookLocked || isProtectedWorkbook ? ' disabled' : ''}`} onClick={props.onAddTabClicked}> <div id="idx-box-add-tab" className={`${isDisconnected || isWorkbookLocked || isProtectedWorkbook ? 'disabled' : ''}`}>
<Icon className="icon icon-plus" /> <Link href={false} id="idx-btn-addtab" className={`tab${isDisabledEditSheet || isDisconnected || isWorkbookLocked || isProtectedWorkbook ? ' disabled' : ''}`} onClick={props.onAddTabClicked}>
</Link> <Icon className="icon icon-plus" />
</div> </Link>
</div>
}
<div className="statusbar--box-tabs"> <div className="statusbar--box-tabs">
<ul className="sheet-tabs bottom"> <ul className="sheet-tabs bottom">
{allSheets.map((model,i) => {allSheets.map((model,i) =>

4
apps/spreadsheeteditor/mobile/src/view/add/AddFilter.jsx
View file

@ -27,9 +27,7 @@ const AddSortAndFilter = props => {
<List> <List>
<ListItem title={_t.textFilter}> <ListItem title={_t.textFilter}>
<Toggle checked={isFilter} <Toggle checked={isFilter}
onToggleChange={(prev) => { onToggleChange={() => props.onInsertFilter(!isFilter)}/>
props.onInsertFilter(!prev);
}}/>
</ListItem> </ListItem>
</List> </List>
} }