stephen/StikDebug
1
0
Fork 0
mirror of https://github.com/StikDebug/StikDebug.git synced 2026-10-15 20:10:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix an issue with the script sheet

Browse source
This commit is contained in:
Stephen 2026-05-31 20:53:38 -04:00
parent 577e9ba574
commit ec278d6963
2 changed files with 30 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

28
StikDebug/JSSupport/RunJSView.swift
View file

@ -12,7 +12,8 @@ import idevice
typealias RemoteServerHandle = OpaquePointer
typealias ScreenshotClientHandle = OpaquePointer
final class RunJSViewModel: ObservableObject, @unchecked Sendable {
final class RunJSViewModel: ObservableObject, Identifiable, @unchecked Sendable {
let id = UUID()
var context: JSContext?
@Published var logs: [String] = []
@Published var scriptName: String = "Script"
@ -34,8 +35,14 @@ final class RunJSViewModel: ObservableObject, @unchecked Sendable {
}
func runScript(data: Data, name: String? = nil) throws {
let scriptContent = String(data: data, encoding: .utf8)
scriptName = name ?? "Script"
let displayName = name ?? "Script"
DispatchQueue.main.async {
self.scriptName = displayName
}
guard let scriptContent = String(data: data, encoding: .utf8) else {
throw CocoaError(.fileReadCorruptFile)
}
let getPidFunction: @convention(block) () -> Int = {
return self.pid
@ -210,9 +217,18 @@ struct RunJSView: View {
var body: some View {
ScrollViewReader { proxy in
List {
ForEach(Array(model.logs.enumerated()), id: \.offset) { index, logStr in
Text(logStr)
.id(index)
if model.logs.isEmpty {
HStack(spacing: 12) {
ProgressView()
.controlSize(.small)
Text("Starting script...")
.foregroundStyle(.secondary)
}
} else {
ForEach(Array(model.logs.enumerated()), id: \.offset) { index, logStr in
Text(logStr)
.id(index)
}
}
}
.navigationTitle("Running \(model.scriptName)")

22
StikDebug/Views/HomeView.swift
View file

@ -19,7 +19,6 @@ struct HomeView: View {
@State private var isShowingPairingFilePicker = false
@State private var debugFeedback: DebugFeedback?
@State private var pendingExternalURLAction: HomeExternalAction?
@State private var isShowingScriptRunner = false
@State private var scriptRunModel: RunJSViewModel?
private let timer = Timer.publish(every: 1, on: .main, in: .common).autoconnect()
@ -80,18 +79,15 @@ struct HomeView: View {
allowedContentTypes: PairingFileStore.supportedContentTypes,
onCompletion: importPairingFile
)
.sheet(isPresented: $isShowingScriptRunner) {
.sheet(item: $scriptRunModel) { model in
NavigationStack {
if let scriptRunModel {
RunJSView(model: scriptRunModel)
.toolbar {
ToolbarItem(placement: .topBarTrailing) {
Button("Done") { isShowingScriptRunner = false }
}
RunJSView(model: model)
.toolbar {
ToolbarItem(placement: .topBarTrailing) {
Button("Done") { scriptRunModel = nil }
}
.navigationTitle(selectedScript)
.navigationBarTitleDisplayMode(.inline)
}
}
.navigationBarTitleDisplayMode(.inline)
}
}
}
@ -118,11 +114,10 @@ struct HomeView: View {
return
}
scriptRunModel = model
if let name = notification.userInfo?["scriptName"] as? String {
selectedScript = name
}
isShowingScriptRunner = true
scriptRunModel = model
}
private func refreshMountStatusIfNeeded() {
@ -271,7 +266,6 @@ struct HomeView: View {
DispatchQueue.main.async {
scriptRunModel = model
isShowingScriptRunner = true
}
do {