From 12e26397e6e9c1cf3f9a7a9ba13b63f554f659cb Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Thu, 2 Feb 2023 21:25:22 +0800
Subject: [PATCH] Sort items in the notebook by position

---
 .../App/Views/Highlights/HighlightsListViewModel.swift     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apple/OmnivoreKit/Sources/App/Views/Highlights/HighlightsListViewModel.swift b/apple/OmnivoreKit/Sources/App/Views/Highlights/HighlightsListViewModel.swift
index 86a7a53dc..29580ffb2 100644
--- a/apple/OmnivoreKit/Sources/App/Views/Highlights/HighlightsListViewModel.swift
+++ b/apple/OmnivoreKit/Sources/App/Views/Highlights/HighlightsListViewModel.swift
@@ -74,8 +74,11 @@ struct HighlightListItemParams: Identifiable {
   private func loadHighlights(item: LinkedItem) {
     let unsortedHighlights = item.highlights.asArray(of: Highlight.self)
 
-    let highlights = unsortedHighlights.sorted {
-      ($0.createdAt ?? Date()) < ($1.createdAt ?? Date())
+    let highlights = unsortedHighlights.sorted { left, right in
+      if left.positionPercent > 0, right.positionPercent > 0 {
+        return left.positionPercent < right.positionPercent
+      }
+      return (left.createdAt ?? Date()) < (right.createdAt ?? Date())
     }
 
     highlightItems = highlights.map {