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

[SSE] Correct routing

Browse source
This commit is contained in:
ShimaginAndrey 2022-01-24 17:18:12 +03:00
parent 1d9ef74b37
commit 6bd49b1c79
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -90,7 +90,7 @@ const PageTabColor = inject("storePalette")(observer(props => {
useEffect(() => { useEffect(() => {
if (allSheets.length !== 0) { if (allSheets.length !== 0) {
let color = sheets.at(activeIndex).color; let color = sheets.at(activeIndex).color;
if(sheets.at(activeIndex).color !== null) { if(color !== null) {
sheets.changeTabColor('' + Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b())); sheets.changeTabColor('' + Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()));
} else { } else {
sheets.changeTabColor('transparent'); sheets.changeTabColor('transparent');
@ -112,7 +112,7 @@ const PageTabColor = inject("storePalette")(observer(props => {
Device.isPhone ? f7.sheet.close('.tab-color-sheet') : f7.popover.close('#idx-tab-color-popover'); Device.isPhone ? f7.sheet.close('.tab-color-sheet') : f7.popover.close('#idx-tab-color-popover');
} else { } else {
f7.views.current.router.navigate('/sheet-tab-custom-color/', {props:{onSetWorkSheetColor: props.onSetWorkSheetColor, sheets}}); f7.views.tabColorView.router.navigate('/sheet-tab-custom-color/', {props:{onSetWorkSheetColor: props.onSetWorkSheetColor, sheets}});
} }
}; };
@ -240,13 +240,13 @@ const StatusbarView = inject('storeAppOptions', 'sheets', 'users')(observer(prop
f7.navbar.show('.main-navbar'); f7.navbar.show('.main-navbar');
$$('.statusbar').css('top', '0%'); $$('.statusbar').css('top', '0%');
}}> }}>
<View routes={routes}> <View routes={routes} name='tabColorView'>
<PageTabColor sheets={sheets} onSetWorkSheetColor={props.onSetWorkSheetColor}/> <PageTabColor sheets={sheets} onSetWorkSheetColor={props.onSetWorkSheetColor}/>
</View> </View>
</Sheet> </Sheet>
: :
<Popover id="idx-tab-color-popover" backdrop={false}> <Popover id="idx-tab-color-popover" backdrop={false}>
<View style={{height: '450px'}} routes={routes}> <View style={{height: '450px'}} routes={routes} name='tabColorView'>
<PageTabColor sheets={sheets} onSetWorkSheetColor={props.onSetWorkSheetColor}/> <PageTabColor sheets={sheets} onSetWorkSheetColor={props.onSetWorkSheetColor}/>
</View> </View>
</Popover> </Popover>