Skip to content
Draft
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
6 changes: 6 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"swift.path": "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin",
"swift.swiftEnvironmentVariables": {
"DEVELOPER_DIR": "/Applications/Xcode.app/Contents/Developer"
}
}
1 change: 1 addition & 0 deletions Example/ShaftExample/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.build
159 changes: 159 additions & 0 deletions Example/ShaftExample/Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 31 additions & 0 deletions Example/ShaftExample/Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// swift-tools-version: 6.1

import PackageDescription

let package = Package(
name: "ShaftExample",
platforms: [
.macOS(.v15),
.iOS(.v18),
],
products: [
.executable(name: "ShaftExample", targets: ["ShaftExample"]),
],
dependencies: [
.package(path: "../../"), // OpenSwiftUI
],
targets: [
.executableTarget(
name: "ShaftExample",
dependencies: [
.product(name: "OpenSwiftUI", package: "OpenSwiftUI"),
.product(name: "OpenSwiftUIShaftBackend", package: "OpenSwiftUI"),
],
swiftSettings: [
.interoperabilityMode(.Cxx),
]
),
],
cxxLanguageStandard: .cxx17,
)

30 changes: 30 additions & 0 deletions Example/ShaftExample/Sources/ShaftExample/main.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
//
// main.swift
// ShaftExample
//
// Example application demonstrating OpenSwiftUI rendering via Shaft
//

import Foundation
import OpenSwiftUI
import OpenSwiftUIShaftBackend

// Define a simple OpenSwiftUI view
struct ContentView: View {
var body: some View {
VStack {
Color.red
.frame(width: 100, height: 60)
Spacer()
Color.blue
.frame(width: 100, height: 60)
.rotationEffect(.degrees(45))
Spacer()
Color.green
.frame(width: 100, height: 60)
}
}
}

// Run the application
ShaftHostingView.run(rootView: ContentView())
2 changes: 1 addition & 1 deletion Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ let openCombineCondition = envBoolValue("OPENCOMBINE", default: !buildForDarwinP
let swiftLogCondition = envBoolValue("SWIFT_LOG", default: !buildForDarwinPlatform)
let swiftCryptoCondition = envBoolValue("SWIFT_CRYPTO", default: !buildForDarwinPlatform)
let renderGTKCondition = envBoolValue("RENDER_GTK", default: !buildForDarwinPlatform)
let shaftBackendCondition = envBoolValue("SHAFT_BACKEND")

let swiftUIRenderCondition = envBoolValue("SWIFTUI_RENDER", default: buildForDarwinPlatform)

Expand Down Expand Up @@ -678,6 +679,21 @@ let openSwiftUIBridgeTestTarget = Target.testTarget(
swiftSettings: sharedSwiftSettings
)

// MARK: - OpenSwiftUIShaftBackend Target

let openSwiftUIShaftBackendTarget = Target.target(
name: "OpenSwiftUIShaftBackend",
dependencies: [
"OpenSwiftUI",
"OpenSwiftUICore",
.product(name: "Shaft", package: "Shaft"),
.product(name: "ShaftSetup", package: "Shaft"),
],
cSettings: sharedCSettings,
cxxSettings: sharedCxxSettings,
swiftSettings: sharedSwiftSettings + [.interoperabilityMode(.Cxx)]
)

// MARK: - OpenSwiftUISymbolDualTests Target

let openSwiftUISymbolDualTestsSupportTarget = Target.target(
Expand Down Expand Up @@ -730,6 +746,9 @@ if supportMultiProducts {
.library(name: "OpenSwiftUIBridge", targets: ["OpenSwiftUIBridge"])
]
}
if shaftBackendCondition {
products.append(.library(name: "OpenSwiftUIShaftBackend", targets: ["OpenSwiftUIShaftBackend"]))
}

// MARK: - Package

Expand Down Expand Up @@ -862,6 +881,13 @@ if useLocalDeps {
package.dependencies += dependencies
}

if shaftBackendCondition {
// Use relative path for easier local development
// package.dependencies.append(.package(path: "../../ShaftUI/Shaft"))
package.dependencies.append(.package(url: "https://github.com/ShaftUI/Shaft", branch: "main"))
package.targets.append(openSwiftUIShaftBackendTarget)
}

if openCombineCondition {
package.dependencies.append(
.package(url: "https://github.com/OpenSwiftUIProject/OpenCombine.git", from: "0.15.0")
Expand All @@ -886,3 +912,5 @@ if swiftCryptoCondition {
openSwiftUICoreTarget.addSwiftCryptoSettings()
openSwiftUITarget.addSwiftCryptoSettings()
}

package.cxxLanguageStandard = .cxx17 // For building Shaft's Skia backend
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

package import Foundation

protocol ViewRendererBase: AnyObject {
package protocol ViewRendererBase: AnyObject {
var platform: DisplayList.ViewUpdater.Platform { get }
var exportedObject: AnyObject? { get }
func render(rootView: AnyObject, from list: DisplayList, time: Time, version: DisplayList.Version, maxVersion: DisplayList.Version, environment: DisplayList.ViewRenderer.Environment) -> Time
Expand Down Expand Up @@ -193,11 +193,11 @@ extension DisplayList {
_openSwiftUIBaseClassAbstractMethod()
}

var exportedObject: AnyObject? {
package var exportedObject: AnyObject? {
platform.definition.getRBLayer(drawingView: drawingView!)
}

func render(rootView: AnyObject, from list: DisplayList, time: Time, version: DisplayList.Version, maxVersion: DisplayList.Version, environment: DisplayList.ViewRenderer.Environment) -> Time {
package func render(rootView: AnyObject, from list: DisplayList, time: Time, version: DisplayList.Version, maxVersion: DisplayList.Version, environment: DisplayList.ViewRenderer.Environment) -> Time {
// _openSwiftUIUnimplementedFailure()
if printTree == nil {
printTree = ProcessEnvironment.bool(forKey: "OPENSWIFTUI_PRINT_TREE")
Expand All @@ -208,15 +208,15 @@ extension DisplayList {
return .zero
}

func renderAsync(to list: DisplayList, time: Time, targetTimestamp: Time?, version: DisplayList.Version, maxVersion: DisplayList.Version) -> Time? {
package func renderAsync(to list: DisplayList, time: Time, targetTimestamp: Time?, version: DisplayList.Version, maxVersion: DisplayList.Version) -> Time? {
_openSwiftUIUnimplementedFailure()
}

func destroy(rootView: AnyObject) {
package func destroy(rootView: AnyObject) {
_openSwiftUIUnimplementedFailure()
}

var viewCacheIsEmpty: Bool {
package var viewCacheIsEmpty: Bool {
_openSwiftUIUnimplementedFailure()
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ extension DisplayList {
_openSwiftUIUnimplementedFailure()
}

func render(rootView: AnyObject, from list: DisplayList, time: Time, version: DisplayList.Version, maxVersion: DisplayList.Version, environment: DisplayList.ViewRenderer.Environment) -> Time {
package func render(rootView: AnyObject, from list: DisplayList, time: Time, version: DisplayList.Version, maxVersion: DisplayList.Version, environment: DisplayList.ViewRenderer.Environment) -> Time {
// TODO
if printTree == nil {
printTree = ProcessEnvironment.bool(forKey: "OPENSWIFTUI_PRINT_TREE")
Expand All @@ -42,24 +42,24 @@ extension DisplayList {
return .zero
}

func renderAsync(to list: DisplayList, time: Time, targetTimestamp: Time?, version: DisplayList.Version, maxVersion: DisplayList.Version) -> Time? {
package func renderAsync(to list: DisplayList, time: Time, targetTimestamp: Time?, version: DisplayList.Version, maxVersion: DisplayList.Version) -> Time? {
nil
}

func destroy(rootView: AnyObject) {
package func destroy(rootView: AnyObject) {
}

var viewCacheIsEmpty: Bool {
package var viewCacheIsEmpty: Bool {
// TODO
false
}

var platform: Platform {
package var platform: Platform {
// TODO
_openSwiftUIUnimplementedFailure()
}

var exportedObject: AnyObject? {
package var exportedObject: AnyObject? {
// TODO
nil
}
Expand Down
Loading
Loading