Skip to content

Adding option for persistent model as sorting #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Adding option for persistent model as sorting #55

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73fbac5
Adding option for persistent model as sorting
supersimple33 Sep 10, 2025
735f102
Add swiftdata import
supersimple33 Sep 10, 2025
85bfb65
Checking whether swift data is @available
supersimple33 Sep 10, 2025
12a73c0
Bad ns object
supersimple33 Sep 10, 2025
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
63 changes: 63 additions & 0 deletions Sources/TablerSort.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
//

import SwiftUI
import SwiftData

public struct TablerSort<Element>
where Element: Identifiable
Expand Down Expand Up @@ -153,6 +154,68 @@ public extension View {
func tablerSort<E: NSObject>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, UInt?>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
func tablerSort<E: NSObject>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, UUID>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
func tablerSort<E: NSObject>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, UUID?>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }

/// Swift-data support
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, Date>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, Date?>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, Double>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, Double?>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, Float>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, Float?>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, Int>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, Int16>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, Int16?>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, Int32>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, Int32?>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, Int64>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, Int64?>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, Int8>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, Int8?>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, Int?>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, String>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, String?>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, UInt>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, UInt16>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, UInt16?>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, UInt32>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, UInt32?>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, UInt64>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, UInt64?>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, UInt8>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, UInt8?>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, UInt?>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, UUID>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }
@available(iOS 17.0, macCatalyst 17.0, macOS 14.0, tvOS 17.0, visionOS 1.0, watchOS 10.0, *)
func tablerSort<E: PersistentModel>(_ c: Binding<TablerContext<E>>, _ k: KeyPath<E, UUID?>) -> SortDescriptor<E> { SortDescriptor<E>(k, order: xlat(updateSort(c, k))) }

private func xlat<Element>(_ direction: TablerSort<Element>.Direction) -> SortOrder {
direction == .forward ? SortOrder.forward : SortOrder.reverse
Expand Down