Update client library to properly handle new screen navigation settings
This commit is contained in:
parent
6480d62a1b
commit
84d5d69aa8
|
@ -47,6 +47,20 @@ const createScreenStore = () => {
|
||||||
// If we don't have a legacy custom layout, build a layout structure
|
// If we don't have a legacy custom layout, build a layout structure
|
||||||
// from the screen navigation settings
|
// from the screen navigation settings
|
||||||
if (!activeLayout) {
|
if (!activeLayout) {
|
||||||
|
let navigationProps = {
|
||||||
|
navigation: "None",
|
||||||
|
}
|
||||||
|
if (activeScreen.showNavigation) {
|
||||||
|
navigationProps = activeScreen.navigation
|
||||||
|
|
||||||
|
// Legacy - if this is a legacy screen without any navigation
|
||||||
|
// settings fall back to just showing the app title
|
||||||
|
if (!navigationProps) {
|
||||||
|
navigationProps = {
|
||||||
|
title: activeScreen.navigation ?? $appStore.application?.name,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
activeLayout = {
|
activeLayout = {
|
||||||
_id: "layout",
|
_id: "layout",
|
||||||
props: {
|
props: {
|
||||||
|
@ -66,11 +80,7 @@ const createScreenStore = () => {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
// If this is a legacy screen without any navigation settings,
|
...navigationProps,
|
||||||
// fall back to just showing the app title
|
|
||||||
...(activeScreen.navigation || {
|
|
||||||
title: $appStore.application?.name,
|
|
||||||
}),
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue