Add gestures initial functionality

NativeDemo/NSAppDelegate.swift

@@ -18,7 +18,7 @@
 import Cocoa
 import SwiftUI
 
-@NSApplicationMain
+@main
 class AppDelegate: NSObject, NSApplicationDelegate {
   var window: NSWindow!
 

NativeDemo/UIAppDelegate.swift

@@ -21,7 +21,7 @@ import UIKit
 // so we only need one Info.plist
 public class NSApplication: UIApplication {}
 
-@UIApplicationMain
+@main
 class AppDelegate: UIResponder, UIApplicationDelegate {
   var window: UIWindow?
   func application(

Package.swift

@@ -1,12 +1,12 @@
-// swift-tools-version:5.6
+// swift-tools-version:5.7
 
 import PackageDescription
 
 let package = Package(
   name: "Tokamak",
   platforms: [
-    .macOS(.v11),
-    .iOS(.v13),
+    .macOS(.v13),
+    .iOS(.v16),
   ],
   products: [
     // Products define the executables and libraries produced by a package,

Sources/TokamakCore/Animation/Animatable.swift

@@ -86,7 +86,7 @@ public struct AnimatablePair<First, Second>: VectorArithmetic
   }
 
   @inlinable
-  internal subscript() -> (First, Second) {
+  subscript() -> (First, Second) {
     get { (first, second) }
     set { (first, second) = newValue }
   }

Sources/TokamakCore/App/Scenes/Scene.swift

@@ -28,7 +28,8 @@ public protocol Scene {
   /// You can `visit(_:)` either another `Scene` or a `View` with a `SceneVisitor`
   func _visitChildren<V: SceneVisitor>(_ visitor: V)
 
-  /// Create `SceneOutputs`, including any modifications to the environment, preferences, or a custom
+  /// Create `SceneOutputs`, including any modifications to the environment, preferences, or a
+  /// custom
   /// `LayoutComputer` from the `SceneInputs`.
   ///
   /// > At the moment, `SceneInputs`/`SceneOutputs` are identical to `ViewInputs`/`ViewOutputs`.

Sources/TokamakCore/CoordinateSpace/CoordinateSpace.swift

@@ -0,0 +1,48 @@
+// 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 Szymon on 18/8/2023.
+//
+
+import Foundation
+
+public enum CoordinateSpace {
+  case global
+  case local
+  case named(AnyHashable)
+}
+
+extension CoordinateSpace: Equatable, Hashable {
+  // Equatable and Hashable conformance
+}
+
+public extension CoordinateSpace {
+  var isGlobal: Bool {
+    switch self {
+    case .global:
+      return true
+    default:
+      return false
+    }
+  }
+
+  var isLocal: Bool {
+    switch self {
+    case .local:
+      return true
+    default:
+      return false
+    }
+  }
+}

Sources/TokamakCore/CoordinateSpace/CoordinateSpaceEnviroment.swift

@@ -0,0 +1,48 @@
+// 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 Szymon on 19/8/2023.
+//
+
+import Foundation
+
+private struct CoordinateSpaceEnvironmentKey: EnvironmentKey {
+  static let defaultValue: CoordinateSpaceContext = .init()
+}
+
+extension EnvironmentValues {
+  var _coordinateSpace: CoordinateSpaceContext {
+    get { self[CoordinateSpaceEnvironmentKey.self] }
+    set { self[CoordinateSpaceEnvironmentKey.self] = newValue }
+  }
+}
+
+class CoordinateSpaceContext {
+  /// Stores currently active CoordinateSpace against it's origin point in global coordinates
+  var activeCoordinateSpace: [CoordinateSpace: CGPoint] = [:]
+}
+
+extension CoordinateSpace {
+  static func convertGlobalSpaceCoordinates(
+    rect: CGRect,
+    toNamedOrigin namedOrigin: CGPoint
+  ) -> CGRect {
+    let translatedOrigin = convert(rect.origin, toNamedOrigin: namedOrigin)
+    return CGRect(origin: translatedOrigin, size: rect.size)
+  }
+
+  static func convert(_ point: CGPoint, toNamedOrigin namedOrigin: CGPoint) -> CGPoint {
+    CGPoint(x: point.x - namedOrigin.x, y: point.y - namedOrigin.y)
+  }
+}

Sources/TokamakCore/Environment/EnvironmentObject.swift

@@ -23,7 +23,7 @@ public struct EnvironmentObject<ObjectType>: DynamicProperty
 {
   @dynamicMemberLookup
   public struct Wrapper {
-    internal let root: ObjectType
+    let root: ObjectType
     public subscript<Subject>(
       dynamicMember keyPath: ReferenceWritableKeyPath<ObjectType, Subject>
     ) -> Binding<Subject> {

Sources/TokamakCore/Fiber/Fiber+CustomDebugStringConvertible.swift

@@ -34,8 +34,10 @@ extension FiberReconciler.Fiber: CustomDebugStringConvertible {
       proposal: .unspecified
     )
     return """
-    \(spaces)\(String(describing: typeInfo?.type ?? Any.self)
-      .split(separator: "<")[0])\(element != nil ? "(\(element!))" : "") {\(element != nil ?
+    \(spaces)\(
+      String(describing: typeInfo?.type ?? Any.self)
+        .split(separator: "<")[0]
+    )\(element != nil ? "(\(element!))" : "") {\(element != nil ?
       "\n\(spaces)geometry: \(geometry)" :
       "")
     \(child?.flush(level: level + 2) ?? "")

Sources/TokamakCore/Fiber/FiberReconciler+TreeReducer.swift

@@ -58,7 +58,7 @@ extension FiberReconciler {
     }
 
     static func reduce<S>(into partialResult: inout Result, nextScene: S) where S: Scene {
-      Self.reduce(
+      reduce(
         into: &partialResult,
         nextValue: nextScene,
         createFiber: { scene, element, parent, elementParent, preferenceParent, _, _, reconciler in
@@ -80,7 +80,7 @@ extension FiberReconciler {
     }
 
     static func reduce<V>(into partialResult: inout Result, nextView: V) where V: View {
-      Self.reduce(
+      reduce(
         into: &partialResult,
         nextValue: nextView,
         createFiber: {

Sources/TokamakCore/Fiber/FiberRenderer.swift

@@ -64,7 +64,8 @@ public protocol FiberRenderer {
 
   /// Run `action` on the next run loop.
   ///
-  /// Called by the `FiberReconciler` to perform reconciliation after all changed Fibers are collected.
+  /// Called by the `FiberReconciler` to perform reconciliation after all changed Fibers are
+  /// collected.
   ///
   /// For example, take the following sample `View`:
   ///

Sources/TokamakCore/Fiber/Layout/StackLayout.swift

@@ -75,7 +75,7 @@ public extension StackLayout {
   /// A `vertical` axis will return `height`.
   /// A `horizontal` axis will return `width`.
   static var mainAxis: WritableKeyPath<CGSize, CGFloat> {
-    switch Self.orientation {
+    switch orientation {
     case .vertical: return \.height
     case .horizontal: return \.width
     }
@@ -86,7 +86,7 @@ public extension StackLayout {
   /// A `vertical` axis will return `width`.
   /// A `horizontal` axis will return `height`.
   static var crossAxis: WritableKeyPath<CGSize, CGFloat> {
-    switch Self.orientation {
+    switch orientation {
     case .vertical: return \.width
     case .horizontal: return \.height
     }

Sources/TokamakCore/Fiber/Scene/SceneVisitor.swift

@@ -35,7 +35,7 @@ protocol SceneReducer: ViewReducer {
 
 extension SceneReducer {
   static func reduce<S: Scene>(into partialResult: inout Result, nextScene: S) {
-    partialResult = Self.reduce(partialResult: partialResult, nextScene: nextScene)
+    partialResult = reduce(partialResult: partialResult, nextScene: nextScene)
   }
 
   static func reduce<S: Scene>(partialResult: Result, nextScene: S) -> Result {

Sources/TokamakCore/Fiber/ViewArguments.swift

@@ -23,7 +23,8 @@ public struct ViewInputs<V> {
 
   /// Mutate the underlying content with the given inputs.
   ///
-  /// Used to inject values such as environment values, traits, and preferences into the `View` type.
+  /// Used to inject values such as environment values, traits, and preferences into the `View`
+  /// type.
   public let updateContent: ((inout V) -> ()) -> ()
 
   @_spi(TokamakCore)

Sources/TokamakCore/Fiber/ViewVisitor.swift

@@ -37,7 +37,7 @@ protocol ViewReducer {
 
 extension ViewReducer {
   static func reduce<V: View>(into partialResult: inout Result, nextView: V) {
-    partialResult = Self.reduce(partialResult: partialResult, nextView: nextView)
+    partialResult = reduce(partialResult: partialResult, nextView: nextView)
   }
 
   static func reduce<V: View>(partialResult: Result, nextView: V) -> Result {

Sources/TokamakCore/Gestures/Composing/ExclusiveGesture.swift

@@ -0,0 +1,39 @@
+// 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 Szymon on 16/7/2023.
+//
+
+@frozen
+/// The ExclusiveGesture gives precedence to its first gesture.
+public struct ExclusiveGesture<First, Second> where First: Gesture, Second: Gesture {
+  /// The value of an exclusive gesture that indicates which of two gestures succeeded.
+  public typealias Value = ExclusiveGesture.ExclusiveValue
+
+  public struct ExclusiveValue {
+    public var first: First.Value
+    public var second: First.Value
+  }
+
+  /// The first of two gestures.
+  public var first: First
+  /// The second of two gestures.
+  public var second: Second
+
+  /// Creates a gesture from two gestures where only one of them succeeds.
+  init(first: First, second: Second) {
+    self.first = first
+    self.second = second
+  }
+}

Sources/TokamakCore/Gestures/Composing/SequenceGesture.swift

@@ -0,0 +1,39 @@
+// 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 Szymon on 16/7/2023.
+//
+
+@frozen
+public struct SequenceGesture<First, Second> where First: Gesture, Second: Gesture {
+  /// The value of a sequence gesture that helps to detect whether the first gesture succeeded, so
+  /// the second gesture can start.
+  public typealias Value = SequenceGesture.SequenceValue
+
+  public struct SequenceValue {
+    public var first: First.Value
+    public var second: First.Value
+  }
+
+  /// The first gesture in a sequence of two gestures.
+  public var first: First
+  /// The second gesture in a sequence of two gestures.
+  public var second: Second
+
+  /// Creates a sequence gesture with two gestures.
+  init(first: First, second: Second) {
+    self.first = first
+    self.second = second
+  }
+}

Sources/TokamakCore/Gestures/Composing/SimultaneousGesture.swift

@@ -0,0 +1,38 @@
+// 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 Szymon on 16/7/2023.
+//
+
+@frozen
+public struct SimultaneousGesture<First, Second> where First: Gesture, Second: Gesture {
+  public typealias Value = SimultaneousGesture.SimultaneousValue
+
+  public struct SimultaneousValue {
+    public let first: First.Value?
+    public let second: First.Value?
+  }
+
+  /// The first of two gestures that can happen simultaneously.
+  public let first: First
+  /// The second of two gestures that can happen simultaneously.
+  public let second: Second
+
+  /// Creates a gesture with two gestures that can receive updates or succeed independently of each
+  /// other.
+  init(first: First, second: Second) {
+    self.first = first
+    self.second = second
+  }
+}