Skip to content

Commit e73ebc7

Browse files
Merge origin/main into takeover of #18075
Co-Authored-By: Claude Opus 5.5 <[email protected]>
2 parents 34aab09 + c3a36af commit e73ebc7

98 files changed

Lines changed: 86687 additions & 5698 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitattributes‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33
# Batch files need CRLF for cmd.exe to parse them reliably.
44
*.cmd text eol=crlf
55
*.bat text eol=crlf
6+
# GitHub's GraphQL schema and the operations graphqlgen writes from it.
7+
packages/source-control-github/schema/** linguist-generated
8+
**/*.graphql.ts linguist-generated

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ jobs:
5252
- name: Check unused code
5353
run: vp run knip:check
5454

55+
- name: Check generated GitHub GraphQL operations
56+
run: vp run --filter @t3tools/source-control-github generate --check
57+
5558
- name: Check
5659
run: vp check
5760

‎apps/desktop/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@
4242
"tailwindcss": "^4.0.0",
4343
"vite-plus": "catalog:"
4444
},
45-
"productName": "T3 Code (Alpha)"
45+
"productName": "T3 Code (Beta)"
4646
}

‎apps/desktop/scripts/electron-launcher.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const repoRoot = NodePath.resolve(desktopDir, "..", "..");
1515
const devBundleIdSuffix = NodePath.basename(repoRoot)
1616
.toLowerCase()
1717
.replaceAll(/[^a-z0-9]+/g, "");
18-
const APP_DISPLAY_NAME = isDevelopment ? "T3 Code (Dev)" : "T3 Code (Alpha)";
18+
const APP_DISPLAY_NAME = isDevelopment ? "T3 Code (Dev)" : "T3 Code (Beta)";
1919
const APP_BUNDLE_ID = isDevelopment
2020
? `com.t3tools.t3code.dev.${devBundleIdSuffix || "local"}`
2121
: "com.t3tools.t3code";

‎apps/desktop/src/app/DesktopAppIdentity.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,8 @@ describe("DesktopAppIdentity", () => {
217217
const identity = yield* DesktopAppIdentity.DesktopAppIdentity;
218218
yield* identity.configure;
219219

220-
assert.deepEqual(calls.setName, ["T3 Code Alpha"]);
221-
assert.equal(calls.setAboutPanelOptions[0]?.applicationName, "T3 Code (Alpha)");
220+
assert.deepEqual(calls.setName, ["T3 Code Beta"]);
221+
assert.equal(calls.setAboutPanelOptions[0]?.applicationName, "T3 Code (Beta)");
222222
assert.equal(calls.setAboutPanelOptions[0]?.applicationVersion, "1.2.3");
223223
assert.equal(calls.setAboutPanelOptions[0]?.version, "0123456789ab");
224224
// Packaged: the bundle's own icon stands, so a custom one the user
@@ -238,7 +238,7 @@ describe("DesktopAppIdentity", () => {
238238
});
239239

240240
it.effect.each([
241-
{ stage: "Alpha", environment: {} },
241+
{ stage: "Beta", environment: {} },
242242
{
243243
stage: "Nightly",
244244
environment: { appVersion: "0.0.43-nightly.20260929.2428" },

‎apps/desktop/src/app/DesktopEnvironment.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ function resolveDesktopAppStageLabel(input: {
103103
return "Dev";
104104
}
105105

106-
return isNightlyDesktopVersion(input.appVersion) ? "Nightly" : "Alpha";
106+
return isNightlyDesktopVersion(input.appVersion) ? "Nightly" : "Beta";
107107
}
108108

109109
export function resolveDesktopAppBranding(input: {

‎apps/desktop/src/app/DesktopPreReadyPlatform.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ describe("DesktopPreReadyPlatform", () => {
175175
const identity = yield* Effect.promise(() => portalIdentity);
176176
assert.equal(identity.desktopName, "com.t3tools.T3Code.desktop");
177177
assert.include(identity.desktopEntry ?? "", 'Exec="/Applications/current.AppImage" %U');
178-
assert.include(identity.desktopEntry ?? "", "Name=T3 Code (Alpha)");
178+
assert.include(identity.desktopEntry ?? "", "Name=T3 Code (Beta)");
179179
assert.include(identity.desktopEntry ?? "", "MimeType=x-scheme-handler/t3code;");
180180
assert.include(
181181
identity.desktopEntry ?? "",

‎apps/mobile/modules/t3-native-controls/ios/T3NativeControlsModule.swift‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import AVFoundation
12
import ExpoModulesCore
23
import Security
34
import UIKit
@@ -97,6 +98,18 @@ public final class T3NativeControlsModule: Module {
9798
dismissVideoPresentation(identifier: identifier)
9899
}
99100

101+
// expo-video activates the session for inline playback but never deactivates
102+
// it. Any other category or mode means another feature (recording) owns it.
103+
@JS
104+
@MainActor
105+
func releaseVideoAudioSession() async {
106+
// The fullscreen presentation releases the session in its own teardown.
107+
guard videoPresentation == nil else { return }
108+
let session = AVAudioSession.sharedInstance()
109+
guard session.category == .playback, session.mode == .moviePlayback else { return }
110+
try? session.setActive(false, options: [.notifyOthersOnDeactivation])
111+
}
112+
100113
@JS
101114
@MainActor
102115
func dismissFile(identifier: String) async {

‎apps/mobile/modules/t3-native-controls/ios/T3NativeVideoPresentation.swift‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,19 @@ final class T3NativeVideoPresentation: NSObject, AVPlayerViewControllerDelegate,
152152
if let backgroundObserver { NotificationCenter.default.removeObserver(backgroundObserver) }
153153
backgroundObserver = nil
154154
let audioSession = AVAudioSession.sharedInstance()
155+
// Still what present() set, allowing the .mixWithOthers flip expo-video
156+
// makes when the inline players pause under this preview. A recorder that
157+
// claimed the session since owns it.
155158
if let previousAudioSession, audioSession.category == .playback,
156-
audioSession.mode == .moviePlayback, audioSession.categoryOptions.isEmpty {
157-
// AVPlayer owns activation. Deactivating the shared session here could
158-
// stop another player or recorder that was active before this preview.
159+
audioSession.mode == .moviePlayback,
160+
audioSession.categoryOptions.isSubset(of: [.mixWithOthers]) {
159161
try? audioSession.setCategory(
160162
previousAudioSession.category,
161163
mode: previousAudioSession.mode,
162164
options: previousAudioSession.options
163165
)
166+
// Deactivating with notification lets interrupted apps resume.
167+
try? audioSession.setActive(false, options: [.notifyOthersOnDeactivation])
164168
}
165169
completion(playbackError)
166170
}

‎apps/mobile/src/components/AudioFilePreview.tsx‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { useAudioPlayer, useAudioPlayerStatus } from "expo-audio";
2-
import { useState } from "react";
2+
import { useEffect, useState } from "react";
33
import { Pressable, View } from "react-native";
44
import { AppText as Text } from "./AppText";
5+
import { useFullscreenVideoOpen, useMediaAudioSessionHold } from "../lib/videoAudioSession";
56

67
function timestamp(seconds: number) {
78
const value = Number.isFinite(seconds) ? Math.max(0, Math.floor(seconds)) : 0;
@@ -12,6 +13,12 @@ export function AudioFilePreview(props: { uri: string; onRetry: () => void }) {
1213
const player = useAudioPlayer({ uri: props.uri }, { updateInterval: 500 });
1314
const status = useAudioPlayerStatus(player);
1415
const [seekError, setSeekError] = useState(false);
16+
// Video teardown deactivates the shared iOS session, which would stop this player.
17+
useMediaAudioSessionHold(status.playing);
18+
const fullscreenVideoOpen = useFullscreenVideoOpen();
19+
useEffect(() => {
20+
if (fullscreenVideoOpen) player.pause();
21+
}, [fullscreenVideoOpen, player]);
1522
const seek = (seconds: number, play = false) => {
1623
setSeekError(false);
1724
void player

0 commit comments

Comments
 (0)