|
|
@ -187,7 +187,6 @@ fun TabsTray(
|
|
|
|
browserStore = browserStore,
|
|
|
|
browserStore = browserStore,
|
|
|
|
tabsTrayStore = tabsTrayStore,
|
|
|
|
tabsTrayStore = tabsTrayStore,
|
|
|
|
displayTabsInGrid = displayTabsInGrid,
|
|
|
|
displayTabsInGrid = displayTabsInGrid,
|
|
|
|
selectionMode = multiselectMode,
|
|
|
|
|
|
|
|
onTabClose = onTabClose,
|
|
|
|
onTabClose = onTabClose,
|
|
|
|
onTabMediaClick = onTabMediaClick,
|
|
|
|
onTabMediaClick = onTabMediaClick,
|
|
|
|
onTabClick = handleTabClick,
|
|
|
|
onTabClick = handleTabClick,
|
|
|
@ -208,7 +207,6 @@ fun TabsTray(
|
|
|
|
browserStore = browserStore,
|
|
|
|
browserStore = browserStore,
|
|
|
|
tabsTrayStore = tabsTrayStore,
|
|
|
|
tabsTrayStore = tabsTrayStore,
|
|
|
|
displayTabsInGrid = displayTabsInGrid,
|
|
|
|
displayTabsInGrid = displayTabsInGrid,
|
|
|
|
selectionMode = multiselectMode,
|
|
|
|
|
|
|
|
onTabClose = onTabClose,
|
|
|
|
onTabClose = onTabClose,
|
|
|
|
onTabMediaClick = onTabMediaClick,
|
|
|
|
onTabMediaClick = onTabMediaClick,
|
|
|
|
onTabClick = handleTabClick,
|
|
|
|
onTabClick = handleTabClick,
|
|
|
@ -235,7 +233,6 @@ private fun NormalTabsPage(
|
|
|
|
browserStore: BrowserStore,
|
|
|
|
browserStore: BrowserStore,
|
|
|
|
tabsTrayStore: TabsTrayStore,
|
|
|
|
tabsTrayStore: TabsTrayStore,
|
|
|
|
displayTabsInGrid: Boolean,
|
|
|
|
displayTabsInGrid: Boolean,
|
|
|
|
selectionMode: TabsTrayState.Mode,
|
|
|
|
|
|
|
|
onTabClose: (TabSessionState) -> Unit,
|
|
|
|
onTabClose: (TabSessionState) -> Unit,
|
|
|
|
onTabMediaClick: (TabSessionState) -> Unit,
|
|
|
|
onTabMediaClick: (TabSessionState) -> Unit,
|
|
|
|
onTabClick: (TabSessionState) -> Unit,
|
|
|
|
onTabClick: (TabSessionState) -> Unit,
|
|
|
@ -257,6 +254,8 @@ private fun NormalTabsPage(
|
|
|
|
.observeAsComposableState { state -> state.normalTabs }.value ?: emptyList()
|
|
|
|
.observeAsComposableState { state -> state.normalTabs }.value ?: emptyList()
|
|
|
|
val inactiveTabs = tabsTrayStore
|
|
|
|
val inactiveTabs = tabsTrayStore
|
|
|
|
.observeAsComposableState { state -> state.inactiveTabs }.value ?: emptyList()
|
|
|
|
.observeAsComposableState { state -> state.inactiveTabs }.value ?: emptyList()
|
|
|
|
|
|
|
|
val selectionMode = tabsTrayStore
|
|
|
|
|
|
|
|
.observeAsComposableState { state -> state.mode }.value ?: TabsTrayState.Mode.Normal
|
|
|
|
|
|
|
|
|
|
|
|
if (normalTabs.isNotEmpty() || inactiveTabs.isNotEmpty()) {
|
|
|
|
if (normalTabs.isNotEmpty() || inactiveTabs.isNotEmpty()) {
|
|
|
|
val showInactiveTabsAutoCloseDialog =
|
|
|
|
val showInactiveTabsAutoCloseDialog =
|
|
|
@ -314,7 +313,6 @@ private fun PrivateTabsPage(
|
|
|
|
browserStore: BrowserStore,
|
|
|
|
browserStore: BrowserStore,
|
|
|
|
tabsTrayStore: TabsTrayStore,
|
|
|
|
tabsTrayStore: TabsTrayStore,
|
|
|
|
displayTabsInGrid: Boolean,
|
|
|
|
displayTabsInGrid: Boolean,
|
|
|
|
selectionMode: TabsTrayState.Mode,
|
|
|
|
|
|
|
|
onTabClose: (TabSessionState) -> Unit,
|
|
|
|
onTabClose: (TabSessionState) -> Unit,
|
|
|
|
onTabMediaClick: (TabSessionState) -> Unit,
|
|
|
|
onTabMediaClick: (TabSessionState) -> Unit,
|
|
|
|
onTabClick: (TabSessionState) -> Unit,
|
|
|
|
onTabClick: (TabSessionState) -> Unit,
|
|
|
@ -324,6 +322,8 @@ private fun PrivateTabsPage(
|
|
|
|
.observeAsComposableState { state -> state.selectedTabId }.value
|
|
|
|
.observeAsComposableState { state -> state.selectedTabId }.value
|
|
|
|
val privateTabs = tabsTrayStore
|
|
|
|
val privateTabs = tabsTrayStore
|
|
|
|
.observeAsComposableState { state -> state.privateTabs }.value ?: emptyList()
|
|
|
|
.observeAsComposableState { state -> state.privateTabs }.value ?: emptyList()
|
|
|
|
|
|
|
|
val selectionMode = tabsTrayStore
|
|
|
|
|
|
|
|
.observeAsComposableState { state -> state.mode }.value ?: TabsTrayState.Mode.Normal
|
|
|
|
|
|
|
|
|
|
|
|
if (privateTabs.isNotEmpty()) {
|
|
|
|
if (privateTabs.isNotEmpty()) {
|
|
|
|
TabLayout(
|
|
|
|
TabLayout(
|
|
|
|