Skip to content

Fix monotonic layout realization during temporary overlay visibility #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
google-labs-jules wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix monotonic layout realization during temporary overlay visibility #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0f01ed
Fix monotonic layout realization during temporary overlay visibility
google-labs-jules[bot] Jun 29, 2026
ba79029
Fix monotonic layout realization during temporary overlay visibility
google-labs-jules[bot] Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions ...Presentation.Core/ViewModels/Chat/Overlay/ChatConversationSurfaceProjectionCoordinator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,31 @@ namespace SalmonEgg.Presentation.Core.ViewModels.Chat.Overlay;

internal sealed class ChatConversationSurfaceProjectionCoordinator
{
private bool _hasLoadedActiveConversationRoot;
private bool _hasLoadedTranscriptSurface;

public ChatConversationSurfaceProjection Project(ChatConversationSurfaceStateInput input)
{
var state = ChatConversationSurfaceStatePresenter.Resolve(input);

if (state.ShouldShowActiveConversationRoot)
{
_hasLoadedActiveConversationRoot = true;
}

if (state.ShouldShowTranscriptSurface)
{
_hasLoadedTranscriptSurface = true;
}

return new ChatConversationSurfaceProjection(
state.IsActivationOverlayVisible,
state.IsOverlayVisible,
state.ShouldShowActiveConversationRoot,
state.ShouldShowActiveConversationRoot,
_hasLoadedActiveConversationRoot,
state.ShouldShowSessionHeader,
state.ShouldShowTranscriptSurface,
state.ShouldShowTranscriptSurface,
_hasLoadedTranscriptSurface,
state.ShouldShowConversationInputSurface,
state.ShouldShowBlockingLoadingMask,
state.ShouldShowLoadingOverlayStatusPill,
Expand Down
12 changes: 6 additions & 6 deletions tests/SalmonEgg.Presentation.Core.Tests/Chat/ChatViewModelTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11367,10 +11367,10 @@ await fixture.UpdateStateAsync(state => state with
runtimeState.IsSessionActivationInProgress = true;

Assert.False(fixture.ViewModel.ShouldShowActiveConversationRoot);
Assert.False(fixture.ViewModel.ShouldLoadActiveConversationRoot);
Assert.True(fixture.ViewModel.ShouldLoadActiveConversationRoot);
Assert.False(fixture.ViewModel.ShouldShowSessionHeader);
Assert.False(fixture.ViewModel.ShouldShowTranscriptSurface);
Assert.False(fixture.ViewModel.ShouldLoadTranscriptSurface);
Assert.True(fixture.ViewModel.ShouldLoadTranscriptSurface);
Assert.False(fixture.ViewModel.ShouldShowConversationInputSurface);
Assert.Equal(SessionNamePolicy.CreateDefault("conv-1"), fixture.ViewModel.CurrentSessionDisplayName);
Assert.Equal(string.Empty, fixture.ViewModel.PresentedSessionHeaderDisplayName);
Expand Down Expand Up @@ -12427,10 +12427,10 @@ await fixture.DispatchConnectionAsync(new SetNewSessionDraftAction(new NewSessio
syncContext.RunAll();

Assert.False(fixture.ViewModel.ShouldShowActiveConversationRoot);
Assert.False(fixture.ViewModel.ShouldLoadActiveConversationRoot);
Assert.True(fixture.ViewModel.ShouldLoadActiveConversationRoot);
Assert.False(fixture.ViewModel.ShouldShowSessionHeader);
Assert.False(fixture.ViewModel.ShouldShowTranscriptSurface);
Assert.False(fixture.ViewModel.ShouldLoadTranscriptSurface);
Assert.True(fixture.ViewModel.ShouldLoadTranscriptSurface);
Assert.False(fixture.ViewModel.ShouldShowConversationInputSurface);

var switchTask = fixture.ViewModel.SwitchConversationAsync("conv-2");
Expand All @@ -12447,10 +12447,10 @@ await fixture.DispatchConnectionAsync(new SetNewSessionDraftAction(new NewSessio
syncContext.RunAll();

Assert.False(fixture.ViewModel.ShouldShowActiveConversationRoot);
Assert.False(fixture.ViewModel.ShouldLoadActiveConversationRoot);
Assert.True(fixture.ViewModel.ShouldLoadActiveConversationRoot);
Assert.False(fixture.ViewModel.ShouldShowSessionHeader);
Assert.False(fixture.ViewModel.ShouldShowTranscriptSurface);
Assert.False(fixture.ViewModel.ShouldLoadTranscriptSurface);
Assert.True(fixture.ViewModel.ShouldLoadTranscriptSurface);
Assert.False(fixture.ViewModel.ShouldShowConversationInputSurface);
Assert.Equal("conv-2", runtimeState.DesiredSessionId);
Assert.True(runtimeState.IsSessionActivationInProgress);
Expand Down
4 changes: 2 additions & 2 deletions ...Presentation.Core.Tests/Chat/Overlay/ChatConversationSurfaceProjectionCoordinatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public void Project_WhenActiveConversationRootWasShown_KeepsLoadStateWhenLaterHi
Assert.True(visible.ShouldShowActiveConversationRoot);
Assert.True(visible.ShouldLoadActiveConversationRoot);
Assert.False(hidden.ShouldShowActiveConversationRoot);
Assert.False(hidden.ShouldLoadActiveConversationRoot);
Assert.True(hidden.ShouldLoadActiveConversationRoot);
}

[Fact]
Expand Down Expand Up @@ -97,6 +97,6 @@ public void Project_WhenTranscriptSurfaceWasShown_KeepsLoadStateWhenLaterHidden(
Assert.True(visible.ShouldShowTranscriptSurface);
Assert.True(visible.ShouldLoadTranscriptSurface);
Assert.False(hidden.ShouldShowTranscriptSurface);
Assert.False(hidden.ShouldLoadTranscriptSurface);
Assert.True(hidden.ShouldLoadTranscriptSurface);
}
}
10 changes: 5 additions & 5 deletions tests/SalmonEgg.Presentation.Core.Tests/Input/GamepadContextIntentDispatcherSourceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public sealed class GamepadContextIntentDispatcherSourceTests
[Fact]
public void MainShellContextDispatcher_UsesFocusedAncestorConsumerPattern()
{
var code = File.ReadAllText(@"..\..\..\..\..\SalmonEgg\SalmonEgg\Presentation\Services\Input\MainShellGamepadContextIntentDispatcher.cs");
var code = File.ReadAllText("../../../../../SalmonEgg/SalmonEgg/Presentation/Services/Input/MainShellGamepadContextIntentDispatcher.cs");

Assert.Contains("IGamepadContextIntentConsumer", code);
Assert.Contains("TryConsumeContextIntent", code);
Expand All @@ -19,7 +19,7 @@ public void MainShellContextDispatcher_UsesFocusedAncestorConsumerPattern()
[Fact]
public void WindowsGamepadInputService_MapsTriggersToContextIntentEvents()
{
var code = File.ReadAllText(@"..\..\..\..\..\SalmonEgg\SalmonEgg\Presentation\Services\Input\WindowsGamepadInputService.cs");
var code = File.ReadAllText("../../../../../SalmonEgg/SalmonEgg/Presentation/Services/Input/WindowsGamepadInputService.cs");

Assert.Contains("GamepadContextIntentProcessor", code);
Assert.Contains("ContextIntentRaised", code);
Expand All @@ -31,7 +31,7 @@ public void WindowsGamepadInputService_MapsTriggersToContextIntentEvents()
[Fact]
public void WindowsMainPage_BridgesNativeTriggerKeysThroughContextDispatcher()
{
var code = File.ReadAllText(@"..\..\..\..\..\SalmonEgg\SalmonEgg\Platforms\Windows\MainPage.Windows.cs");
var code = File.ReadAllText("../../../../../SalmonEgg/SalmonEgg/Platforms/Windows/MainPage.Windows.cs");

Assert.Contains("case Windows.System.VirtualKey.GamepadLeftTrigger:", code);
Assert.Contains("case Windows.System.VirtualKey.GamepadRightTrigger:", code);
Expand All @@ -45,7 +45,7 @@ public void WindowsMainPage_BridgesNativeTriggerKeysThroughContextDispatcher()
[Fact]
public void SettingsPageBase_ImplementsContextIntentConsumer()
{
var code = File.ReadAllText(@"..\..\..\..\..\SalmonEgg\SalmonEgg\Presentation\Views\SettingsPageBase.cs");
var code = File.ReadAllText("../../../../../SalmonEgg/SalmonEgg/Presentation/Views/SettingsPageBase.cs");

Assert.Contains("IGamepadContextIntentConsumer", code);
Assert.Contains("TryConsumeContextIntent", code);
Expand All @@ -56,7 +56,7 @@ public void SettingsPageBase_ImplementsContextIntentConsumer()
public void MainShellContextDispatcher_RetriesFromRootContentWhenFocusedElementIsNotConsumable()
{
var code = File.ReadAllText(
@"..\..\..\..\..\SalmonEgg\SalmonEgg\Presentation\Services\Input\MainShellGamepadContextIntentDispatcher.cs");
"../../../../../SalmonEgg/SalmonEgg/Presentation/Services/Input/MainShellGamepadContextIntentDispatcher.cs");

Assert.Contains("TryDispatchFromRoot(focused, intent)", code, System.StringComparison.Ordinal);
Assert.Contains("TryDispatchFromRoot(GetCurrentRootContent(), intent)", code, System.StringComparison.Ordinal);
Expand Down
4 changes: 2 additions & 2 deletions tests/SalmonEgg.Presentation.Core.Tests/Input/GamepadShortcutDispatcherSourceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public sealed class GamepadShortcutDispatcherSourceTests
[Fact]
public void MainShellShortcutDispatcher_UsesFocusedAncestorShortcutConsumerPattern()
{
var code = File.ReadAllText(@"..\..\..\..\..\SalmonEgg\SalmonEgg\Presentation\Services\Input\MainShellGamepadShortcutDispatcher.cs");
var code = File.ReadAllText("../../../../../SalmonEgg/SalmonEgg/Presentation/Services/Input/MainShellGamepadShortcutDispatcher.cs");

Assert.Contains("IGamepadShortcutConsumer", code);
Assert.Contains("TryConsumeShortcutIntent", code);
Expand All @@ -19,7 +19,7 @@ public void MainShellShortcutDispatcher_UsesFocusedAncestorShortcutConsumerPatte
[Fact]
public void WindowsGamepadInputService_MapsYToShortcutEvent_NotNavigationIntent()
{
var code = File.ReadAllText(@"..\..\..\..\..\SalmonEgg\SalmonEgg\Presentation\Services\Input\WindowsGamepadInputService.cs");
var code = File.ReadAllText("../../../../../SalmonEgg/SalmonEgg/Presentation/Services/Input/WindowsGamepadInputService.cs");

Assert.Contains("GamepadButtons.Y", code);
Assert.Contains("ShortcutRaised", code);
Expand Down
10 changes: 5 additions & 5 deletions tests/SalmonEgg.Presentation.Core.Tests/Input/NativeVoiceInputServiceSourceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public sealed class NativeVoiceInputServiceSourceTests
[Fact]
public void NativeVoiceInputService_DoesNotReuseRecognizerAcrossVoiceSessions()
{
var code = File.ReadAllText(@"..\..\..\..\..\SalmonEgg\SalmonEgg\Presentation\Services\Input\NativeVoiceInputService.cs");
var code = File.ReadAllText("../../../../../SalmonEgg/SalmonEgg/Presentation/Services/Input/NativeVoiceInputService.cs");

Assert.Contains("CreateSessionRecognizerAsync", code);
Assert.DoesNotContain("string.Equals(_activeLanguageTag, normalizedLanguage", code);
Expand All @@ -17,7 +17,7 @@ public void NativeVoiceInputService_DoesNotReuseRecognizerAcrossVoiceSessions()
[Fact]
public void NativeVoiceInputService_DisposesRecognizerWhenSessionCompletes()
{
var code = File.ReadAllText(@"..\..\..\..\..\SalmonEgg\SalmonEgg\Presentation\Services\Input\NativeVoiceInputService.cs");
var code = File.ReadAllText("../../../../../SalmonEgg/SalmonEgg/Presentation/Services/Input/NativeVoiceInputService.cs");

Assert.Contains("DisposeRecognizer();", code);
Assert.Contains("finally", code);
Expand All @@ -26,7 +26,7 @@ public void NativeVoiceInputService_DisposesRecognizerWhenSessionCompletes()
[Fact]
public void NativeVoiceInputService_UsesGracefulStopBeforeFallingBackToCancel()
{
var code = File.ReadAllText(@"..\..\..\..\..\SalmonEgg\SalmonEgg\Presentation\Services\Input\NativeVoiceInputService.cs");
var code = File.ReadAllText("../../../../../SalmonEgg/SalmonEgg/Presentation/Services/Input/NativeVoiceInputService.cs");

Assert.Contains(".StopAsync()", code);
Assert.Contains(".CancelAsync()", code);
Expand All @@ -35,7 +35,7 @@ public void NativeVoiceInputService_UsesGracefulStopBeforeFallingBackToCancel()
[Fact]
public void NativeVoiceInputService_BoundsStopAndCancelWithTimeouts()
{
var code = File.ReadAllText(@"..\..\..\..\..\SalmonEgg\SalmonEgg\Presentation\Services\Input\NativeVoiceInputService.cs");
var code = File.ReadAllText("../../../../../SalmonEgg/SalmonEgg/Presentation/Services/Input/NativeVoiceInputService.cs");

Assert.Contains("VoiceInputStopTimeout", code);
Assert.Contains("VoiceInputCancelTimeout", code);
Expand All @@ -47,7 +47,7 @@ public void NativeVoiceInputService_BoundsStopAndCancelWithTimeouts()
[Fact]
public void NativeVoiceInputService_PerformsMicrophonePreflightOnUiThreadBeforeStartingRecognition()
{
var code = File.ReadAllText(@"..\..\..\..\..\SalmonEgg\SalmonEgg\Presentation\Services\Input\NativeVoiceInputService.cs");
var code = File.ReadAllText("../../../../../SalmonEgg/SalmonEgg/Presentation/Services/Input/NativeVoiceInputService.cs");

Assert.Contains("MediaCaptureInitializationSettings", code);
Assert.Contains("StreamingCaptureMode = StreamingCaptureMode.Audio", code);
Expand Down
2 changes: 1 addition & 1 deletion tests/SalmonEgg.Presentation.Core.Tests/Input/VoiceInputLoggingSourceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public sealed class VoiceInputLoggingSourceTests
[Fact]
public void ChatViewModel_DoesNotDuplicateFirstPartialLoggingOwnedByVoiceService()
{
var code = File.ReadAllText(@"..\..\..\..\..\src\SalmonEgg.Presentation.Core\ViewModels\Chat\ChatViewModel.CommandWorkflow.cs");
var code = File.ReadAllText("../../../../../src/SalmonEgg.Presentation.Core/ViewModels/Chat/ChatViewModel.CommandWorkflow.cs");

Assert.DoesNotContain("Voice input first partial received.", code);
}
Expand Down
Loading