Initial NavigationView implementation

NativeDemo/TokamakDemo.xcodeproj/project.pbxproj

@@ -434,6 +434,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -488,6 +489,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.jedfox.Tokamak-Native";
@@ -556,9 +558,9 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				PRODUCT_NAME = "TokamakDemo Native";
 				SDKROOT = macosx;
+				SUPPORTED_PLATFORMS = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 			};
@@ -580,9 +582,9 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				PRODUCT_NAME = "TokamakDemo Native";
 				SDKROOT = macosx;
+				SUPPORTED_PLATFORMS = macosx;
 				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
@@ -596,6 +598,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -610,6 +613,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;

NativeDemo/UIAppDelegate.swift

@@ -23,13 +23,14 @@ public class NSApplication: UIApplication {}
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
-  let window = UIWindow()
+  var window: UIWindow?
   func application(
     _: UIApplication,
     didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]? = nil
   ) -> Bool {
-    window.rootViewController = UIHostingController(rootView: TokamakDemoView())
-    window.makeKeyAndVisible()
+    window = UIWindow()
+    window?.rootViewController = UIHostingController(rootView: TokamakDemoView())
+    window?.makeKeyAndVisible()
     return true
   }
 }

Sources/TokamakCore/Modifiers/Navigation.swift

@@ -0,0 +1,25 @@
+// Copyright 2020 Tokamak contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+extension View {
+  // FIXME: Implement
+  public func navigationBarTitle<S>(_ title: S) -> some View where S: StringProtocol {
+    self
+  }
+
+  // FIXME: Implement
+  public func navigationTitle<S>(_ title: S) -> some View where S: StringProtocol {
+    self
+  }
+}

Sources/TokamakCore/Views/Buttons/Button.swift

@@ -65,11 +65,13 @@ extension Button: ParentView {
 }
 
 /// This is a helper class that works around absence of "package private" access control in Swift
-public struct _ButtonProxy {
-  public let subject: Button<Text>
+public struct _ButtonProxy<Label> where Label: View {
+  let subject: Button<Label>
 
-  public init(_ subject: Button<Text>) { self.subject = subject }
+  public init(_ subject: Button<Label>) { self.subject = subject }
+  public var action: () -> () { subject.action }
+}
 
+extension _ButtonProxy where Label == Text {
   public var label: _TextProxy { _TextProxy(subject.label) }
-  public var action: () -> () { subject.action }
 }

Sources/TokamakCore/Views/NavigationLink.swift

@@ -0,0 +1,79 @@
+// Copyright 2020 Tokamak contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//  Created by Jed Fox on 06/30/2020.
+//
+
+public struct NavigationLink<Label, Destination>: View where Label: View, Destination: View {
+  let destination: Destination
+  let label: Label
+
+  @Environment(_navigationDestinationKey) var navigationContext
+
+  public init(destination: Destination, @ViewBuilder label: () -> Label) {
+    self.destination = destination
+    self.label = label()
+  }
+
+  /// Creates an instance that presents `destination` when active.
+  // public init(destination: Destination, isActive: Binding<Bool>, @ViewBuilder label: () -> Label)
+
+  /// Creates an instance that presents `destination` when `selection` is set
+  /// to `tag`.
+  //   public init<V>(
+  //    destination: Destination,
+  //    tag: V, selection: Binding<V?>,
+  //    @ViewBuilder label: () -> Label
+  //   ) where V : Hashable
+
+  public var body: Never {
+    neverBody("NavigationLink")
+  }
+}
+
+extension NavigationLink where Label == Text {
+  /// Creates an instance that presents `destination`, with a `Text` label
+  /// generated from a title string.
+  public init<S>(_ title: S, destination: Destination) where S: StringProtocol {
+    self.destination = destination
+    label = Text(title)
+  }
+
+  /// Creates an instance that presents `destination` when active, with a
+  /// `Text` label generated from a title string.
+  //   public init<S>(
+  //    _ title: S, destination: Destination,
+  //    isActive: Binding<Bool>
+  //   ) where S : StringProtocol
+
+  /// Creates an instance that presents `destination` when `selection` is set
+  /// to `tag`, with a `Text` label generated from a title string.
+  //  public init<S, V>(
+  //    _ title: S, destination: Destination,
+  //    tag: V, selection: Binding<V?>
+  //  ) where S : StringProtocol, V : Hashable
+}
+
+/// This is a helper class that works around absence of "package private" access control in Swift
+public struct _NavigationLinkProxy<Label, Destination> where Label: View, Destination: View {
+  public let subject: NavigationLink<Label, Destination>
+
+  public init(_ subject: NavigationLink<Label, Destination>) { self.subject = subject }
+
+  public var label: Label { subject.label }
+
+  public func activate() {
+    subject.navigationContext!.wrappedValue = AnyView(subject.destination)
+  }
+}

Sources/TokamakCore/Views/NavigationView.swift

@@ -0,0 +1,62 @@
+// Copyright 2020 Tokamak contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//  Created by Jed Fox on 06/30/2020.
+//
+
+public struct NavigationView<Content>: View where Content: View {
+  let content: Content
+
+  @State var destination = AnyView(EmptyView())
+
+  public init(@ViewBuilder content: () -> Content) {
+    self.content = content()
+  }
+
+  public var body: Never {
+    neverBody("NavigationView")
+  }
+}
+
+/// This is a helper class that works around absence of "package private" access control in Swift
+public struct _NavigationViewProxy<Content: View> {
+  public let subject: NavigationView<Content>
+
+  public init(_ subject: NavigationView<Content>) { self.subject = subject }
+
+  public var content: Content { subject.content }
+  public var body: some View {
+    HStack {
+      content
+      subject.destination
+    }.environment(\.navigationDestination, subject.$destination)
+  }
+}
+
+struct NavigationDestinationKey: EnvironmentKey {
+  public static let defaultValue: Binding<AnyView>? = nil
+}
+
+extension EnvironmentValues {
+  var navigationDestination: Binding<AnyView>? {
+    get {
+      self[NavigationDestinationKey.self]
+    }
+    set {
+      self[NavigationDestinationKey.self] = newValue
+    }
+  }
+}
+
+public let _navigationDestinationKey = \EnvironmentValues.navigationDestination

Sources/TokamakDOM/Core.swift

@@ -83,6 +83,8 @@ public typealias HStack = TokamakCore.HStack
 public typealias LazyHGrid = TokamakCore.LazyHGrid
 public typealias LazyVGrid = TokamakCore.LazyVGrid
 public typealias List = TokamakCore.List
+public typealias NavigationLink = TokamakCore.NavigationLink
+public typealias NavigationView = TokamakCore.NavigationView
 public typealias OutlineGroup = TokamakCore.OutlineGroup
 public typealias Picker = TokamakCore.Picker
 public typealias ScrollView = TokamakCore.ScrollView
@@ -112,6 +114,8 @@ public typealias SceneStorage = TokamakCore.SceneStorage
 
 // MARK: Misc
 
+public typealias ViewBuilder = TokamakCore.ViewBuilder
+
 // FIXME: I would put this inside TokamakCore, but for
 // some reason it doesn't get exported with the typealias
 extension Text {

Sources/TokamakDOM/Shapes/Path.swift

@@ -14,7 +14,6 @@
 //
 //  Created by Carson Katri on 6/29/20.
 //
-
 import TokamakCore
 
 extension Path: ViewDeferredToRenderer {

Sources/TokamakDOM/Views/NavigationLink.swift

@@ -0,0 +1,30 @@
+// Copyright 2020 Tokamak contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import TokamakCore
+
+extension NavigationLink: ViewDeferredToRenderer {
+  public var deferredBody: AnyView {
+    let proxy = _NavigationLinkProxy(self)
+    return AnyView(
+      HTML("a", [
+        "href": "javascript:void%200",
+      ], listeners: [
+        // FIXME: Focus destination or something so assistive
+        // technology knows where to look when clicking the link.
+        "click": { _ in proxy.activate() },
+      ]) { proxy.label }
+    )
+  }
+}

Sources/TokamakDOM/Views/NavigationView.swift

@@ -0,0 +1,29 @@
+// Copyright 2020 Tokamak contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import JavaScriptKit
+import TokamakCore
+
+extension NavigationView: ViewDeferredToRenderer {
+  public var deferredBody: AnyView {
+    AnyView(HTML("div", [
+      "style": """
+      display: flex; flex-direction: row; align-items: stretch;
+      width: 100%; height: 100%;
+      """,
+    ]) {
+      _NavigationViewProxy(self).body
+    })
+  }
+}

Sources/TokamakDemo/ColorDemo.swift

@@ -59,28 +59,30 @@ public struct ColorDemo: View {
   @State private var v2: String = "0.5"
 
   public var body: some View {
-    VStack {
-      Button("Input \(colorForm.rawValue.uppercased())") {
-        colorForm = colorForm == .rgb ? .hsb : .rgb
-      }
-      TextField(colorForm == .rgb ? "Red" : "Hue", text: $v0)
-      TextField(colorForm == .rgb ? "Green" : "Saturation", text: $v1)
-      TextField(colorForm == .rgb ? "Blue" : "Brightness", text: $v2)
-      Text("\(v0) \(v1) \(v2)")
-        .bold()
-        .padding()
-        .background(color)
-      Text("Accent Color: \(Color.accentColor.description)")
-        .bold()
-        .padding()
-        .background(Color.accentColor)
-      ForEach(colors, id: \.self) {
-        Text($0.description)
-          .font(.caption)
+    ScrollView {
+      VStack {
+        Button("Input \(colorForm.rawValue.uppercased())") {
+          colorForm = colorForm == .rgb ? .hsb : .rgb
+        }
+        TextField(colorForm == .rgb ? "Red" : "Hue", text: $v0)
+        TextField(colorForm == .rgb ? "Green" : "Saturation", text: $v1)
+        TextField(colorForm == .rgb ? "Blue" : "Brightness", text: $v2)
+        Text("\(v0) \(v1) \(v2)")
           .bold()
           .padding()
-          .background($0)
-      }
+          .background(color)
+        Text("Accent Color: \(Color.accentColor.description)")
+          .bold()
+          .padding()
+          .background(Color.accentColor)
+        ForEach(colors, id: \.self) {
+          Text($0.description)
+            .font(.caption)
+            .bold()
+            .padding()
+            .background($0)
+        }
+      }.padding(.horizontal)
     }
   }
 }