Merge pull request #170 from makinosp/develop

Develop
makinosp · Oct 20, 2024 · 76580e0 · 76580e0
2 parents 9a45afb + fb5a019
commit 76580e0
Show file tree

Hide file tree

Showing 17 changed files with 686 additions and 178 deletions.
diff --git a/harmonie/Components/IconSet.swift b/harmonie/Components/IconSet.swift
@@ -12,6 +12,9 @@ enum IconSet {
     static var circleFilled: some Iconizable {
         Icon("circle.fill")
     }
+    static var clear: some Iconizable {
+        Icon("clear")
+    }
     static var code: some Iconizable {
         Icon("curlybraces")
     }

diff --git a/harmonie/Extensions/Binding+NilCoalescing.swift b/harmonie/Extensions/Binding+NilCoalescing.swift
@@ -7,9 +7,9 @@
 
 import SwiftUICore
 
-extension Binding {
-    static func ?? <T>(optional: Self, defaultValue: T) -> Binding<T> where T: Sendable, Value == T? {
-        .init(
+extension Binding where Value: Sendable {
+    static func ?? <T>(optional: Self, defaultValue: T) -> Binding<T> where Value == T? {
+        Binding<T>(
             get: { optional.wrappedValue ?? defaultValue },
             set: { optional.wrappedValue = $0 }
         )

diff --git a/harmonie/Extensions/Binding+containsBinding.swift b/harmonie/Extensions/Binding+containsBinding.swift
@@ -0,0 +1,23 @@
+//
+//  Binding+containsBinding.swift
+//  Harmonie
+//
+//  Created by makinosp on 2024/10/20.
+//
+
+import SwiftUICore
+
+extension Binding where Value: SetAlgebra & Sendable, Value.Element: Sendable {
+    func containsBinding(for value: Value.Element) -> Binding<Bool> {
+        Binding<Bool>(
+            get: { wrappedValue.contains(value) },
+            set: { newValue in
+                if newValue {
+                    wrappedValue.insert(value)
+                } else {
+                    wrappedValue.remove(value)
+                }
+            }
+        )
+    }
+}