From fc9f650a082d2490b1d735edea888906085a7697 Mon Sep 17 00:00:00 2001
From: Javier Cicchelli <javier@rock-n-code.com>
Date: Wed, 14 Dec 2022 23:57:20 +0100
Subject: [PATCH] Removed the ItemIdClosure definition from the Browse module
 as it is not needed anymore.

---
 .../Browse/Logic/Defines/Typealiases.swift    |  9 -----
 .../Browse/UI/Components/DocumentItem.swift   | 37 ++++++++++---------
 .../Browse/UI/Components/FolderItem.swift     | 25 +++++++------
 3 files changed, 32 insertions(+), 39 deletions(-)
 delete mode 100644 Modules/Sources/Browse/Logic/Defines/Typealiases.swift

diff --git a/Modules/Sources/Browse/Logic/Defines/Typealiases.swift b/Modules/Sources/Browse/Logic/Defines/Typealiases.swift
deleted file mode 100644
index c7f48d8..0000000
--- a/Modules/Sources/Browse/Logic/Defines/Typealiases.swift
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-//  Typealiases.swift
-//  Browse
-//
-//  Created by Javier Cicchelli on 14/12/2022.
-//  Copyright © 2022 Röck+Cöde. All rights reserved.
-//
-
-typealias ItemIdClosure = (String) -> Void
diff --git a/Modules/Sources/Browse/UI/Components/DocumentItem.swift b/Modules/Sources/Browse/UI/Components/DocumentItem.swift
index 7d30db0..7a6ae70 100644
--- a/Modules/Sources/Browse/UI/Components/DocumentItem.swift
+++ b/Modules/Sources/Browse/UI/Components/DocumentItem.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2022 Röck+Cöde. All rights reserved.
 //
 
+import DataModels
 import SwiftUI
 
 struct DocumentItem: View {
@@ -13,15 +14,15 @@ struct DocumentItem: View {
     // MARK: Properties
     
     let item: FileSystemItem
-    let select: ItemIdClosure
-    let download: ItemIdClosure
-    let delete: ItemIdClosure
+    let select: ActionClosure
+    let download: ActionClosure
+    let delete: ActionClosure
     
     // MARK: Body
     
     var body: some View {
         Button {
-            select(item.id)
+            select()
         } label: {
             HStack(spacing: 16) {
                 Image.document
@@ -50,7 +51,7 @@ struct DocumentItem: View {
             allowsFullSwipe: true
         ) {
             Button {
-                delete(item.id)
+                delete()
             } label: {
                 Label {
                     Text(
@@ -64,7 +65,7 @@ struct DocumentItem: View {
             .tint(.red)
             
             Button {
-                download(item.id)
+                download()
             } label: {
                 Label {
                     Text(
@@ -103,12 +104,12 @@ struct DocumentItem_Previews: PreviewProvider {
             contentType: "some content type",
             size: .random(in: 1 ... 100),
             lastModifiedAt: .now
-        )) { _ in
-            // select closure with item id.
-        } download: { _ in
-            // download closure with item id.
-        } delete: { _ in
-            // delete closure with item id.
+        )) {
+            // select closure.
+        } download: {
+            // download closure.
+        } delete: {
+            // delete closure.
         }
         .previewDisplayName("Document item")
         
@@ -118,12 +119,12 @@ struct DocumentItem_Previews: PreviewProvider {
             contentType: "some content type",
             size: .random(in: 1 ... 100),
             lastModifiedAt: .now
-        )) { _ in
-            // select closure with item id.
-        } download: { _ in
-            // download closure with item id.
-        } delete: { _ in
-            // delete closure with item id.
+        )) {
+            // select closure.
+        } download: {
+            // download closure.
+        } delete: {
+            // delete closure.
         }
         .previewDisplayName("Document item with long name")
     }
diff --git a/Modules/Sources/Browse/UI/Components/FolderItem.swift b/Modules/Sources/Browse/UI/Components/FolderItem.swift
index bce7697..40733f4 100644
--- a/Modules/Sources/Browse/UI/Components/FolderItem.swift
+++ b/Modules/Sources/Browse/UI/Components/FolderItem.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2022 Röck+Cöde. All rights reserved.
 //
 
+import DataModels
 import SwiftUI
 
 struct FolderItem: View {
@@ -13,14 +14,14 @@ struct FolderItem: View {
     // MARK: Properties
     
     let item: FileSystemItem
-    let select: ItemIdClosure
-    let delete: ItemIdClosure
+    let select: ActionClosure
+    let delete: ActionClosure
 
     // MARK: Body
 
     var body: some View {
         Button {
-            select(item.id)
+            select()
         } label: {
             HStack(spacing: 16) {
                 Image.folder
@@ -42,7 +43,7 @@ struct FolderItem: View {
             allowsFullSwipe: true
         ) {
             Button {
-                delete(item.id)
+                delete()
             } label: {
                 Label {
                     Text(
@@ -73,20 +74,20 @@ struct BrowseItem_Previews: PreviewProvider {
         FolderItem(item: Folder(
             id: "1234567890",
             name: "Some folder name goes in here..."
-        )) { _ in
-            // select closure with item id.
-        } delete: { _ in
-            // delete closure with item id.
+        )) {
+            // select closure.
+        } delete: {
+            // delete closure.
         }
         .previewDisplayName("Folder item")
         
         FolderItem(item: Folder(
             id: "1234567890",
             name: "Some very, extremely long folder name goes in here..."
-        )) { _ in
-            // select closure with item id.
-        } delete: { _ in
-            // delete closure with item id.
+        )) {
+            // select closure.
+        } delete: {
+            // delete closure.
         }
         .previewDisplayName("Folder item with long name")
     }