logic improvements

This commit is contained in:
Fabian Freund
2026-07-07 17:45:10 +02:00
parent 1b4a74865a
commit f902ad97fd
2 changed files with 29 additions and 31 deletions
@@ -984,43 +984,33 @@ class TabRepository extends _$TabRepository {
await selectTab(newTabId);
}
} else {
final tabContainerId = await ref
.read(tabDataRepositoryProvider.notifier)
.getTabContainerId(currentTabState.id);
if (!ref.mounted) {
return;
}
final latestTabState = ref.read(tabStatesProvider)[tabId];
if (latestTabState == null) {
logger.w('Could not get tab for assignement ${event.url}');
return;
}
if (targetContainerId != tabContainerId) {
if (originUri == null) {
await ref
.read(tabDataRepositoryProvider.notifier)
.assignContainer(
latestTabState.id,
containerData,
replacementUrl: uri,
);
} else if (latestTabState.url == originUri) {
await ref
.read(tabDataRepositoryProvider.notifier)
.assignContainer(
latestTabState.id,
containerData,
closeOldTab: false,
replacementUrl: uri,
);
} else {
logger.w(
'Could not match origin url for assignment ${latestTabState.url} to request ${event.originUrl}',
);
}
if (originUri == null) {
await ref
.read(tabDataRepositoryProvider.notifier)
.assignContainer(
latestTabState.id,
containerData,
replacementUrl: uri,
);
} else if (latestTabState.url == originUri) {
await ref
.read(tabDataRepositoryProvider.notifier)
.assignContainer(
latestTabState.id,
containerData,
closeOldTab: false,
replacementUrl: uri,
);
} else {
logger.w(
'Could not match origin url for assignment ${latestTabState.url} to request ${event.originUrl}',
);
}
}
}
@@ -61,6 +61,14 @@ class TabDataRepository extends _$TabDataRepository {
final currentContainerData = await getTabContainerData(tabId);
// The tab is already in the target container, so there is nothing to
// reconcile. This guards against churn when an async assignment races a
// move that already landed the tab in [targetContainer] (recreating it
// here would spawn a redundant tab and re-trigger its load).
if (currentContainerData?.id == targetContainer.id) {
return;
}
final sameContext =
targetContainer.metadata.contextualIdentity ==
currentContainerData?.metadata.contextualIdentity;