Sancaros/phantasmal-world
1
0
Fork 0
mirror of https://github.com/DaanVandenBosch/phantasmal-world.git synced 2025-04-04 06:28:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed bug that would result in nested tabs "forgetting" which tab was active.

Browse Source
This commit is contained in:
Daan Vanden Bosch 2022-11-01 22:47:51 +01:00
parent 4a2b859cad
commit 9cbc12cc24
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
web/src/main/kotlin/world/phantasmal/web/core/controllers/PathAwareTabContainerController.kt
View File

@ -1,7 +1,7 @@
package world.phantasmal.web.core.controllers package world.phantasmal.web.core.controllers
import world.phantasmal.cell.Cell import world.phantasmal.cell.Cell
import world.phantasmal.cell.map import world.phantasmal.cell.mutableCell
import world.phantasmal.cell.mutateDeferred import world.phantasmal.cell.mutateDeferred
import world.phantasmal.web.core.PwToolType import world.phantasmal.web.core.PwToolType
import world.phantasmal.web.core.stores.UiStore import world.phantasmal.web.core.stores.UiStore
@ -17,17 +17,27 @@ open class PathAwareTabContainerController<T : PathAwareTab>(
private val tool: PwToolType, private val tool: PwToolType,
final override val tabs: List<T>, final override val tabs: List<T>,
) : TabContainerController<T>() { ) : TabContainerController<T>() {
final override val activeTab: Cell<T?> = private val _activeTab = mutableCell(tabs.firstOrNull())
map(uiStore.currentTool, uiStore.path) { currentTool, path -> final override val activeTab: Cell<T?> = _activeTab
init {
observeNow(uiStore.currentTool, uiStore.path) { currentTool, path ->
if (currentTool == tool) { if (currentTool == tool) {
tabs.find { path.startsWith(it.path) } ?: tabs.firstOrNull() val aTab = _activeTab.value
} else {
null if (aTab == null || !path.startsWith(aTab.path)) {
val newActiveTab = tabs.find { path.startsWith(it.path) }
if (newActiveTab != null) {
mutateDeferred {
_activeTab.value = newActiveTab
}
}
}
} }
} }
init { setPathPrefix(_activeTab.value, replace = true)
setPathPrefix(activeTab.value, replace = true)
} }
final override fun setActiveTab(tab: T?) { final override fun setActiveTab(tab: T?) {
@ -39,9 +49,7 @@ open class PathAwareTabContainerController<T : PathAwareTab>(
if (visible) { if (visible) {
mutateDeferred { mutateDeferred {
if (!disposed) { setPathPrefix(_activeTab.value, replace = true)
setPathPrefix(activeTab.value, replace = true)
}
} }
} }
} }