Added the abilty to handle Row URL's

vincode-io · vincode-io · commit df729f547267 · 2024-05-29T11:21:01.000-05:00
diff --git a/VinOutlineKit/Sources/VinOutlineKit/EntityID.swift b/VinOutlineKit/Sources/VinOutlineKit/EntityID.swift
@@ -203,6 +203,15 @@ public enum EntityID: CustomStringConvertible, Hashable, Equatable, Codable {
 		}
 	}
 	
+	public var isRow: Bool {
+		switch self {
+		case .row(_, _, _):
+			return true
+		default:
+			return false
+		}
+	}
+	
 	private enum CodingKeys: String, CodingKey {
 		case type
 		case searchText
diff --git a/Zavala/Documents/DocumentsViewController.swift b/Zavala/Documents/DocumentsViewController.swift
@@ -14,7 +14,7 @@ import VinOutlineKit
 import VinUtility
 
 protocol DocumentsDelegate: AnyObject  {
-	func documentSelectionDidChange(_: DocumentsViewController, documentContainers: [DocumentContainer], documents: [Document], isNew: Bool, isNavigationBranch: Bool, animated: Bool)
+	func documentSelectionDidChange(_: DocumentsViewController, documentContainers: [DocumentContainer], documents: [Document], selectRow: EntityID?, isNew: Bool, isNavigationBranch: Bool, animated: Bool)
 	func showGetInfo(_: DocumentsViewController, outline: Outline)
 	func exportPDFDocs(_: DocumentsViewController, outlines: [Outline])
 	func exportPDFLists(_: DocumentsViewController, outlines: [Outline])
@@ -170,16 +170,28 @@ class DocumentsViewController: UICollectionViewController, MainControllerIdentif
 		}
 	}
 
-	func selectDocument(_ document: Document?, isNew: Bool = false, isNavigationBranch: Bool = true, animated: Bool) {
+	func selectDocument(_ document: Document?, selectRow: EntityID? = nil, isNew: Bool = false, isNavigationBranch: Bool = true, animated: Bool) {
 		guard let documentContainers else { return }
 
 		collectionView.deselectAll()
 
 		if let document, let index = documents.firstIndex(of: document) {
 			collectionView.selectItem(at: IndexPath(row: index, section: 0), animated: true, scrollPosition: .centeredVertically)
-			delegate?.documentSelectionDidChange(self, documentContainers: documentContainers, documents: [document], isNew: isNew, isNavigationBranch: isNavigationBranch, animated: animated)
+			delegate?.documentSelectionDidChange(self, 
+												 documentContainers: documentContainers,
+												 documents: [document],
+												 selectRow: selectRow,
+												 isNew: isNew,
+												 isNavigationBranch: isNavigationBranch,
+												 animated: animated)
 		} else {
-			delegate?.documentSelectionDidChange(self, documentContainers: documentContainers, documents: [], isNew: isNew, isNavigationBranch: isNavigationBranch, animated: animated)
+			delegate?.documentSelectionDidChange(self, 
+												 documentContainers: documentContainers,
+												 documents: [],
+												 selectRow: selectRow, 
+												 isNew: isNew,
+												 isNavigationBranch: isNavigationBranch,
+												 animated: animated)
 		}
 	}
 	
@@ -190,7 +202,13 @@ class DocumentsViewController: UICollectionViewController, MainControllerIdentif
 			collectionView.selectItem(at: IndexPath(row: i, section: 0), animated: false, scrollPosition: [])
 		}
 		
-		delegate?.documentSelectionDidChange(self, documentContainers: documentContainers, documents: documents, isNew: false, isNavigationBranch: false, animated: true)
+		delegate?.documentSelectionDidChange(self, 
+											 documentContainers: documentContainers,
+											 documents: documents,
+											 selectRow: nil,
+											 isNew: false,
+											 isNavigationBranch: false,
+											 animated: true)
 	}
 	
 	func deleteCurrentDocuments() {
@@ -400,12 +418,24 @@ extension DocumentsViewController {
 		guard let documentContainers else { return }
 		
 		guard let selectedIndexPaths = collectionView.indexPathsForSelectedItems else {
-			delegate?.documentSelectionDidChange(self, documentContainers: documentContainers, documents: [], isNew: false, isNavigationBranch: false, animated: true)
+			delegate?.documentSelectionDidChange(self,
+												 documentContainers: documentContainers,
+												 documents: [],
+												 selectRow: nil,
+												 isNew: false,
+												 isNavigationBranch: false,
+												 animated: true)
 			return
 		}
 		
 		let selectedDocuments = selectedIndexPaths.map { documents[$0.row] }
-		delegate?.documentSelectionDidChange(self, documentContainers: documentContainers, documents: selectedDocuments, isNew: false, isNavigationBranch: true, animated: true)
+		delegate?.documentSelectionDidChange(self,
+											 documentContainers: documentContainers,
+											 documents: selectedDocuments,
+											 selectRow: nil,
+											 isNew: false,
+											 isNavigationBranch: true,
+											 animated: true)
 	}
 	
 	override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
@@ -422,12 +452,24 @@ extension DocumentsViewController {
 		#endif
 		
 		guard let selectedIndexPaths = collectionView.indexPathsForSelectedItems else {
-			delegate?.documentSelectionDidChange(self, documentContainers: documentContainers, documents: [], isNew: false, isNavigationBranch: false, animated: true)
+			delegate?.documentSelectionDidChange(self,
+												 documentContainers: documentContainers,
+												 documents: [],
+												 selectRow: nil,
+												 isNew: false,
+												 isNavigationBranch: false,
+												 animated: true)
 			return
 		}
 		
 		let selectedDocuments = selectedIndexPaths.map { documents[$0.row] }
-		delegate?.documentSelectionDidChange(self, documentContainers: documentContainers, documents: selectedDocuments, isNew: false, isNavigationBranch: true, animated: true)
+		delegate?.documentSelectionDidChange(self,
+											 documentContainers: documentContainers,
+											 documents: selectedDocuments,
+											 selectRow: nil,
+											 isNew: false,
+											 isNavigationBranch: true,
+											 animated: true)
 	}
 	
 	private func createLayout() -> UICollectionViewLayout {
@@ -503,7 +545,13 @@ extension DocumentsViewController {
 		guard animated else {
 			self.documents = sortedDocuments
 			self.collectionView.reloadData()
-			self.delegate?.documentSelectionDidChange(self, documentContainers: documentContainers, documents: [], isNew: false, isNavigationBranch: isNavigationBranch, animated: true)
+			self.delegate?.documentSelectionDidChange(self,
+													  documentContainers: documentContainers,
+													  documents: [],
+													  selectRow: nil,
+													  isNew: false,
+													  isNavigationBranch: isNavigationBranch,
+													  animated: true)
 			return
 		}
 		
@@ -536,7 +584,13 @@ extension DocumentsViewController {
 			self.collectionView.selectItem(at: indexPath, animated: false, scrollPosition: [])
 			self.collectionView.scrollToItem(at: indexPath, at: [], animated: true)
 		} else {
-			self.delegate?.documentSelectionDidChange(self, documentContainers: documentContainers, documents: [], isNew: false, isNavigationBranch: isNavigationBranch, animated: true)
+			self.delegate?.documentSelectionDidChange(self,
+													  documentContainers: documentContainers,
+													  documents: [],
+													  selectRow: nil,
+													  isNew: false,
+													  isNavigationBranch: isNavigationBranch, 
+													  animated: true)
 		}
 	}
 	
@@ -799,7 +853,13 @@ private extension DocumentsViewController {
 		func delete() {
 			let deselect = selectedDocuments.filter({ documents.contains($0) }).isEmpty
 			if deselect, let documentContainers = self.documentContainers {
-				self.delegate?.documentSelectionDidChange(self, documentContainers: documentContainers, documents: [], isNew: false, isNavigationBranch: true, animated: true)
+				self.delegate?.documentSelectionDidChange(self,
+														  documentContainers: documentContainers,
+														  documents: [],
+														  selectRow: nil,
+														  isNew: false,
+														  isNavigationBranch: true,
+														  animated: true)
 			}
 			for document in documents {
 				document.account?.deleteDocument(document)
diff --git a/Zavala/Editor/EditorViewController.swift b/Zavala/Editor/EditorViewController.swift
@@ -875,7 +875,7 @@ class EditorViewController: UIViewController, DocumentsActivityItemsConfiguratio
 		])
 	}
 	
-	func edit(_ newOutline: Outline?, isNew: Bool, searchText: String? = nil) {
+	func edit(_ newOutline: Outline?, selectRow: EntityID? = nil, isNew: Bool, searchText: String? = nil) {
 		guard outline != newOutline else { return }
 		isOutlineNewFlag = isNew
 		
@@ -943,9 +943,15 @@ class EditorViewController: UIViewController, DocumentsActivityItemsConfiguratio
 		}
 
 		updateUI()
-		restoreScrollPosition()
-		restoreOutlineCursorPosition()
-		moveCursorToTitleOnNew()
+		
+		if let selectRow {
+			guard let index = outline.shadowTable?.first(where: { $0.entityID == selectRow })?.shadowTableIndex else { return }
+			collectionView.selectItem(at: IndexPath(row: index, section: adjustedRowsSection), animated: false, scrollPosition: [.centeredVertically])
+		} else {
+			restoreScrollPosition()
+			restoreOutlineCursorPosition()
+			moveCursorToTitleOnNew()
+		}
 	}
 	
 	func selectAllRows() {
diff --git a/Zavala/MainSplitViewController.swift b/Zavala/MainSplitViewController.swift
@@ -155,8 +155,8 @@ class MainSplitViewController: UISplitViewController, MainCoordinator {
 	}
 
 	func handle(_ userInfo: [AnyHashable: Any], isNavigationBranch: Bool) async {
-		if let searchIdentifier = userInfo[CSSearchableItemActivityIdentifier] as? String, let documentID = EntityID(description: searchIdentifier) {
-			await handleDocument(documentID, isNavigationBranch: isNavigationBranch)
+		if let searchIdentifier = userInfo[CSSearchableItemActivityIdentifier] as? String, let entityID = EntityID(description: searchIdentifier) {
+			await handleDocument(entityID, isNavigationBranch: isNavigationBranch)
 			return
 		}
 		
@@ -194,21 +194,23 @@ class MainSplitViewController: UISplitViewController, MainCoordinator {
 		handleSelectDocument(document, isNavigationBranch: isNavigationBranch)
 	}
 	
-	func handleDocument(_ documentID: EntityID, isNavigationBranch: Bool) async {
-		guard let account = AccountManager.shared.findAccount(accountID: documentID.accountID),
-			  let document = account.findDocument(documentID) else {
+	func handleDocument(_ entityID: EntityID, isNavigationBranch: Bool) async {
+		guard let account = AccountManager.shared.findAccount(accountID: entityID.accountID),
+			  let document = account.findDocument(entityID) else {
 			presentError(title: .documentNotFoundTitle, message: .documentNotFoundMessage)
 			return
 		}
 		
+		let selectRow = entityID.isRow ? entityID : nil
+		
 		if let collectionsTags = selectedTags, document.hasAnyTag(collectionsTags) {
-			self.handleSelectDocument(document, isNavigationBranch: isNavigationBranch)
+			self.handleSelectDocument(document, selectRow: selectRow, isNavigationBranch: isNavigationBranch)
 		} else if document.tagCount == 1, let tag = document.tags?.first {
 			await collectionsViewController?.selectDocumentContainers([TagDocuments(account: account, tag: tag)], isNavigationBranch: true, animated: false)
-			handleSelectDocument(document, isNavigationBranch: isNavigationBranch)
+			handleSelectDocument(document, selectRow: selectRow, isNavigationBranch: isNavigationBranch)
 		} else {
 			await collectionsViewController?.selectDocumentContainers([AllDocuments(account: account)], isNavigationBranch: true, animated: false)
-			handleSelectDocument(document, isNavigationBranch: isNavigationBranch)
+			handleSelectDocument(document, selectRow: selectRow, isNavigationBranch: isNavigationBranch)
 		}
 	}
 	
@@ -486,6 +488,7 @@ extension MainSplitViewController: DocumentsDelegate {
 	func documentSelectionDidChange(_: DocumentsViewController,
 									documentContainers: [DocumentContainer],
 									documents: [Document],
+									selectRow: EntityID?,
 									isNew: Bool,
 									isNavigationBranch: Bool,
 									animated: Bool) {
@@ -540,7 +543,7 @@ extension MainSplitViewController: DocumentsDelegate {
 				pinWasVisited(Pin(containers: documentContainers, document: document))
 			}
 		} else {
-			editorViewController?.edit(document.outline, isNew: isNew)
+			editorViewController?.edit(document.outline, selectRow: selectRow, isNew: isNew)
 			pinWasVisited(Pin(containers: documentContainers, document: document))
 		}
 	}
@@ -744,8 +747,8 @@ extension MainSplitViewController: OpenQuicklyViewControllerDelegate {
 
 private extension MainSplitViewController {
 	
-	func handleSelectDocument(_ document: Document, isNavigationBranch: Bool) {
-		self.documentsViewController?.selectDocument(document, isNavigationBranch: isNavigationBranch, animated: false)
+	func handleSelectDocument(_ document: Document, selectRow: EntityID? = nil, isNavigationBranch: Bool) {
+		self.documentsViewController?.selectDocument(document, selectRow: selectRow, isNavigationBranch: isNavigationBranch, animated: false)
 		self.lastMainControllerToAppear = .editor
 		self.validateToolbar()
 	}
diff --git a/Zavala/SceneDelegate.swift b/Zavala/SceneDelegate.swift
@@ -66,9 +66,9 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 			return
 		}
 		
-		if let url = connectionOptions.urlContexts.first?.url, let documentID = EntityID(url: url) {
+		if let url = connectionOptions.urlContexts.first?.url, let entityID = EntityID(url: url) {
 			Task {
-				await mainSplitViewController.handleDocument(documentID, isNavigationBranch: true)
+				await mainSplitViewController.handleDocument(entityID, isNavigationBranch: true)
 			}
 			return
 		}
@@ -103,9 +103,9 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 	}
 	
 	func scene(_ scene: UIScene, openURLContexts urlContexts: Set<UIOpenURLContext>) {
-		if let url = urlContexts.first?.url, let documentID = EntityID(url: url) {
+		if let url = urlContexts.first?.url, let entityID = EntityID(url: url) {
 			Task {
-				await mainSplitViewController.handleDocument(documentID, isNavigationBranch: true)
+				await mainSplitViewController.handleDocument(entityID, isNavigationBranch: true)
 			}
 			return
 		}

Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,9 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {`
`66`	`66`	`return`
`67`	`67`	`}`
`68`	`68`
`69`		`- if let url = connectionOptions.urlContexts.first?.url, let documentID = EntityID(url: url) {`
	`69`	`+ if let url = connectionOptions.urlContexts.first?.url, let entityID = EntityID(url: url) {`
`70`	`70`	`Task {`
`71`		`- await mainSplitViewController.handleDocument(documentID, isNavigationBranch: true)`
	`71`	`+ await mainSplitViewController.handleDocument(entityID, isNavigationBranch: true)`
`72`	`72`	`}`
`73`	`73`	`return`
`74`	`74`	`}`
`@@ -103,9 +103,9 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`func scene(_ scene: UIScene, openURLContexts urlContexts: Set<UIOpenURLContext>) {`
`106`		`- if let url = urlContexts.first?.url, let documentID = EntityID(url: url) {`
	`106`	`+ if let url = urlContexts.first?.url, let entityID = EntityID(url: url) {`
`107`	`107`	`Task {`
`108`		`- await mainSplitViewController.handleDocument(documentID, isNavigationBranch: true)`
	`108`	`+ await mainSplitViewController.handleDocument(entityID, isNavigationBranch: true)`
`109`	`109`	`}`
`110`	`110`	`return`
`111`	`111`	`}`