Add Primary/Secondary/Tertiary/QuaternaryContentStyle

Sources/TokamakCore/Shapes/ShapeStyles/ContentStyles.swift

@@ -0,0 +1,104 @@
+// Copyright 2020-2021 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 Carson Katri on 7/7/21.
+//
+
+@frozen public struct PrimaryContentStyle {
+  @inlinable
+  public init() {}
+}
+
+extension PrimaryContentStyle: ShapeStyle {
+  public func _apply(to shape: inout _ShapeStyle_Shape) {
+    if !shape.inRecursiveStyle,
+       let foregroundStyle = shape.environment._foregroundStyle
+    {
+      if foregroundStyle.styles[0] is Self {
+        shape.inRecursiveStyle = true
+      }
+      foregroundStyle.styles[0]._apply(to: &shape)
+    } else {
+      shape.result = .color(shape.environment.foregroundColor ?? .primary)
+    }
+  }
+
+  public static func _apply(to shape: inout _ShapeStyle_ShapeType) {}
+}
+
+@frozen public struct SecondaryContentStyle {
+  @inlinable
+  public init() {}
+}
+
+extension SecondaryContentStyle: ShapeStyle {
+  public func _apply(to shape: inout _ShapeStyle_Shape) {
+    if !shape.inRecursiveStyle,
+       let foregroundStyle = shape.environment._foregroundStyle
+    {
+      if foregroundStyle.styles[1] is Self {
+        shape.inRecursiveStyle = true
+      }
+      foregroundStyle.styles[1]._apply(to: &shape)
+    } else {
+      shape.result = .color((shape.environment.foregroundColor ?? .primary).opacity(0.5))
+    }
+  }
+
+  public static func _apply(to shape: inout _ShapeStyle_ShapeType) {}
+}
+
+@frozen public struct TertiaryContentStyle {
+  @inlinable
+  public init() {}
+}
+
+extension TertiaryContentStyle: ShapeStyle {
+  public func _apply(to shape: inout _ShapeStyle_Shape) {
+    if !shape.inRecursiveStyle,
+       let foregroundStyle = shape.environment._foregroundStyle
+    {
+      if foregroundStyle.styles[2] is Self {
+        shape.inRecursiveStyle = true
+      }
+      foregroundStyle.styles[2]._apply(to: &shape)
+    } else {
+      shape.result = .color((shape.environment.foregroundColor ?? .primary).opacity(0.3))
+    }
+  }
+
+  public static func _apply(to shape: inout _ShapeStyle_ShapeType) {}
+}
+
+@frozen public struct QuaternaryContentStyle {
+  @inlinable
+  public init() {}
+}
+
+extension QuaternaryContentStyle: ShapeStyle {
+  public func _apply(to shape: inout _ShapeStyle_Shape) {
+    if !shape.inRecursiveStyle,
+       let foregroundStyle = shape.environment._foregroundStyle
+    {
+      if foregroundStyle.styles[2] is Self {
+        shape.inRecursiveStyle = true
+      }
+      foregroundStyle.styles[2]._apply(to: &shape)
+    } else {
+      shape.result = .color((shape.environment.foregroundColor ?? .primary).opacity(0.2))
+    }
+  }
+
+  public static func _apply(to shape: inout _ShapeStyle_ShapeType) {}
+}

Sources/TokamakCore/Shapes/ShapeStyles/ShapeStyle.swift

@@ -195,7 +195,25 @@ public extension View {
   }
 
   public typealias Body = Never
+
   public func modifyEnvironment(_ values: inout EnvironmentValues) {
+    var styles = self.styles
+    // Passthrough inert styles.
+    if styles[0] is PrimaryContentStyle {
+      styles[0] = values._foregroundStyle?.styles[0] ?? styles[0]
+    }
+    if styles[1] is SecondaryContentStyle {
+      styles[1] = values._foregroundStyle?.styles[1] ?? styles[1]
+    }
+    if styles[2] is TertiaryContentStyle {
+      styles[2] = values._foregroundStyle?.styles[2] ?? styles[2]
+    }
+    if styles[0] is QuaternaryContentStyle,
+       styles[1] is QuaternaryContentStyle,
+       styles[2] is QuaternaryContentStyle
+    {
+      styles[2] = values._foregroundStyle?.styles[2] ?? styles[2]
+    }
     values._foregroundStyle = .init(styles: styles, environment: values)
   }
 }

Sources/TokamakDOM/Core.swift

@@ -83,6 +83,13 @@ public typealias Rectangle = TokamakCore.Rectangle
 public typealias RoundedRectangle = TokamakCore.RoundedRectangle
 public typealias ContainerRelativeShape = TokamakCore.ContainerRelativeShape
 
+// MARK: Shape Styles
+
+public typealias PrimaryContentStyle = TokamakCore.PrimaryContentStyle
+public typealias SecondaryContentStyle = TokamakCore.SecondaryContentStyle
+public typealias TertiaryContentStyle = TokamakCore.TertiaryContentStyle
+public typealias QuaternaryContentStyle = TokamakCore.QuaternaryContentStyle
+
 // MARK: Primitive values
 
 public typealias Color = TokamakCore.Color

Sources/TokamakDemo/ShapeStyleDemo.swift

@@ -38,6 +38,18 @@ struct ShapeStyleDemo: View {
       }
       .foregroundStyle(Color.blue)
     }
+    HStack {
+      VStack {
+        Text("Primary")
+          .foregroundStyle(PrimaryContentStyle())
+        Text("Secondary")
+          .foregroundStyle(SecondaryContentStyle())
+        Text("Tertiary")
+          .foregroundStyle(TertiaryContentStyle())
+        Text("Quaternary")
+          .foregroundStyle(QuaternaryContentStyle())
+      }
+    }
     #endif
   }
 }

Sources/TokamakStaticHTML/Core.swift

@@ -45,6 +45,13 @@ public typealias RoundedRectangle = TokamakCore.RoundedRectangle
 
 public typealias ContainerRelativeShape = TokamakCore.ContainerRelativeShape
 
+// MARK: Shape Styles
+
+public typealias PrimaryContentStyle = TokamakCore.PrimaryContentStyle
+public typealias SecondaryContentStyle = TokamakCore.SecondaryContentStyle
+public typealias TertiaryContentStyle = TokamakCore.TertiaryContentStyle
+public typealias QuaternaryContentStyle = TokamakCore.QuaternaryContentStyle
+
 // MARK: Primitive values
 
 public typealias Color = TokamakCore.Color

Tests/TokamakStaticHTMLTests/RenderingTests.swift

@@ -199,6 +199,28 @@ final class RenderingTests: XCTestCase {
       timeout: defaultSnapshotTimeout
     )
   }
+
+  func testContentStyles() {
+    assertSnapshot(
+      matching: HStack {
+        Rectangle()
+          .frame(width: 50, height: 50)
+          .foregroundStyle(PrimaryContentStyle())
+        Rectangle()
+          .frame(width: 50, height: 50)
+          .foregroundStyle(SecondaryContentStyle())
+        Rectangle()
+          .frame(width: 50, height: 50)
+          .foregroundStyle(TertiaryContentStyle())
+        Rectangle()
+          .frame(width: 50, height: 50)
+          .foregroundStyle(QuaternaryContentStyle())
+      }
+      .foregroundColor(.blue),
+      as: .image(size: .init(width: 275, height: 100)),
+      timeout: defaultSnapshotTimeout
+    )
+  }
 }
 
 #endif