Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/platform-build-gates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
- name: Install Android SDK platform
shell: bash
run: |
yes | "${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager" --licenses >/dev/null
yes | "${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager" --licenses >/dev/null || true
"${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager" "platforms;android-36" "build-tools;36.0.0"

- name: Build Android
Expand All @@ -107,7 +107,7 @@ jobs:
dotnet-version: ${{ env.DOTNET_VERSION }}

- name: Install iOS workload
run: dotnet workload install ios --skip-manifest-update --disable-parallel --no-http-cache
run: dotnet workload install ios android --skip-manifest-update --disable-parallel --no-http-cache

- name: Build iOS Simulator
run: >-
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"Uno.Sdk": "6.5.36"
},
"sdk": {
"version": "10.0.109",
"version": "10.0.103",
"rollForward": "latestMinor",
"allowPrerelease": false
},
Expand Down
6 changes: 3 additions & 3 deletions scripts/gates/wasm-focus-boundary-smoke.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import {
} from "./wasm-smoke-lib/settings-shell.mjs";

const baseUrl = normalizeBaseUrl(process.argv[2], "wasm-focus-boundary-smoke.mjs");
const diagnosticsPagePattern = /Diagnostics and logs|诊断与日志|Live logs|日志|Gamepad input|手柄输入/;
const gamepadStart = { labels: [], automationIds: ["Diagnostics.GamepadStart"] };
const gamepadRefresh = { labels: [], automationIds: ["Diagnostics.GamepadRefresh"] };
const diagnosticsPagePattern = /Diagnostics and logs|诊断与日志|Live logs|日志|Gamepad input|手柄输入|Diagnostics_ConnectionTitle|连接|Agent:/;
const gamepadStart = { labels: [], automationIds: ["Diagnostics.GamepadStart"], elementTags: ["BUTTON"] };
const gamepadRefresh = { labels: [], automationIds: ["Diagnostics.GamepadRefresh"], elementTags: ["BUTTON"] };
const browser = await chromium.launch({ headless: true });

try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ public static ChatConversationSurfaceState Resolve(ChatConversationSurfaceStateI
&& (!input.IsSessionActive
|| !MatchesCurrentSession(input.CurrentSessionId, input.PendingShellActivationConversationId)
|| !input.IsChatShellVisibleForRemoteUi);
var shouldPromoteLayoutLoadingToBlockingPresenter =
input.IsLayoutLoading
&& (isVisibleTranscriptStaleForCurrentSession || isCurrentVisibleConversationSupersededByShellIntent);

var activationOverlayVisible =
shouldShowConnectionLifecycleOverlay
Expand All @@ -69,13 +66,11 @@ public static ChatConversationSurfaceState Resolve(ChatConversationSurfaceStateI
&& (!hasVisibleTranscriptContent
|| isSessionSwitchOverlayBlockingVisibleTranscript
|| isVisibleTranscriptStaleForCurrentSession
|| isCurrentVisibleConversationSupersededByShellIntent))
|| shouldPromoteLayoutLoadingToBlockingPresenter;
|| isCurrentVisibleConversationSupersededByShellIntent));
var shouldShowLoadingOverlayStatusPill =
activationOverlayVisible && !string.IsNullOrWhiteSpace(overlayStatusText);
var shouldShowLoadingOverlayPresenter =
(activationOverlayVisible && (shouldShowBlockingLoadingMask || shouldShowLoadingOverlayStatusPill))
|| shouldPromoteLayoutLoadingToBlockingPresenter;
(activationOverlayVisible && (shouldShowBlockingLoadingMask || shouldShowLoadingOverlayStatusPill));
var isOverlayVisible = activationOverlayVisible || shouldShowLayoutLoading;
var shouldShowActiveConversationRoot =
input.IsSessionActive
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,4 +199,31 @@ public void Resolve_WhenShellIntentStartsBeforeSessionIsActive_UsesShellIntentAs
Assert.True(state.ShouldShowLoadingOverlayStatusPill);
Assert.Equal(ChatViewModel.LoadingOverlayStage.PreparingSession, state.OverlayLoadingStage);
}

[Fact]
public void Resolve_LayoutLoadingState_DoesNotOverrideVisibilityState()
{
var state = ChatConversationSurfaceStatePresenter.Resolve(new ChatConversationSurfaceStateInput(
IsSessionActive: true,
CurrentSessionId: "conv-1",
MessageHistoryCount: 1,
VisibleTranscriptConversationId: "conv-2",
IsChatShellVisibleForRemoteUi: true,
IsConnecting: false,
IsInitializing: false,
IsHydrating: false,
IsLayoutLoading: true,
IsSessionSwitching: false,
SessionSwitchOverlayConversationId: null,
SessionSwitchPreviewConversationId: null,
ConnectionLifecycleOverlayConversationId: null,
HistoryOverlayConversationId: null,
PendingShellActivationConversationId: null,
HydrationLoadedMessageCount: 0));

Assert.False(state.IsActivationOverlayVisible);
Assert.True(state.IsOverlayVisible);
Assert.False(state.ShouldShowBlockingLoadingMask);
Assert.False(state.ShouldShowLoadingOverlayPresenter);
}
}
Loading