Edit without saving location mvp.

Client/Frontend/Browser/Toolbars/BottomToolbar/Menu/AddEditBookmarkTableViewController.swift

@@ -17,6 +17,29 @@ class AddEditBookmarkTableViewController: UITableViewController {
         case newFolder(title: String)
         case editBookmark(_ bookmark: Bookmark)
         case editFolder(_ folder: Bookmark)
+
+        var initialLocation: Location {
+            switch self {
+            case .newBookmark(_, _), .newFolder(_):
+                return .rootLevel
+            case .editBookmark(let bookmark):
+                return folderOrRoot(bookmarkOrFolder: bookmark)
+            case .editFolder(let folder):
+                return folderOrRoot(bookmarkOrFolder: folder)
+            }
+        }
+
+        var folder: Bookmark? {
+            switch self {
+            case .editFolder(let folder): return folder
+            default: return nil
+            }
+        }
+
+        private func folderOrRoot(bookmarkOrFolder: Bookmark) -> Location {
+            guard let parent = bookmarkOrFolder.parentFolder else { return .rootLevel }
+            return .folder(folder: parent)
+        }
     }
 
     enum Location {
@@ -77,9 +100,9 @@ class AddEditBookmarkTableViewController: UITableViewController {
         case .newFolder(let title):
             return FolderDetailsViewTableViewCell(title: title)
         case .editBookmark(let bookmark):
-            return BookmarkDetailsView(title: bookmark.displayTitle ?? "", url: bookmark.url ?? "")
+            return BookmarkDetailsView(title: bookmark.displayTitle, url: bookmark.url)
         case .editFolder(let folder):
-            return FolderDetailsViewTableViewCell(title: folder.displayTitle ?? "")
+            return FolderDetailsViewTableViewCell(title: folder.displayTitle)
         }
     }()
 
@@ -90,9 +113,9 @@ class AddEditBookmarkTableViewController: UITableViewController {
     init(mode: AddEditBookmarkTableViewController.Mode) {
         self.mode = mode
 
-        frc = Bookmark.foldersFrc()
-        location = .rootLevel
+        location = mode.initialLocation
         presentationMode = .currentSelection
+        frc = Bookmark.foldersFrc(excludedFolder: mode.folder)
 
         super.init(style: .grouped)
     }
@@ -169,7 +192,7 @@ class AddEditBookmarkTableViewController: UITableViewController {
         guard let title = bookmarkDetailsView.titleTextField.text else { return earlyReturn() }
 
         switch mode {
-        case .newBookmark(_, _), .editBookmark(_):
+        case .newBookmark(_, _):
             guard let urlString = bookmarkDetailsView.urlTextField?.text,
                 let url = URL(string: urlString) else {
                     return earlyReturn()
@@ -183,7 +206,7 @@ class AddEditBookmarkTableViewController: UITableViewController {
             case .folder(let folder):
                 Bookmark.add(url: url, title: title, parentFolder: folder)
             }
-        case .newFolder(_), .editFolder(_):
+        case .newFolder(_):
             switch location {
             case .rootLevel:
                 Bookmark.addFolder(title: title)
@@ -194,6 +217,14 @@ class AddEditBookmarkTableViewController: UITableViewController {
             }
 
             delegate?.didSelectFolder()
+        case .editBookmark(let bookmark):
+            guard let urlString = bookmarkDetailsView.urlTextField?.text else {
+                    return earlyReturn()
+            }
+
+            bookmark.update(customTitle: title, url: urlString)
+        case .editFolder(let folder):
+            folder.update(customTitle: title, url: nil)
         }
 
         if let nc = navigationController, nc.childViewControllers.count > 1 {

Client/Frontend/Browser/Toolbars/BottomToolbar/Menu/BookmarkDetailsView.swift

@@ -63,7 +63,7 @@ class BookmarkDetailsView: UIView, BookmarkFormFieldsProtocol {
 
     weak var delegate: BookmarkDetailsViewDelegate?
 
-    convenience init(title: String, url: String) {
+    convenience init(title: String?, url: String?) {
         self.init(frame: .zero)
 
         guard let urlTextField = urlTextField else { fatalError() }
@@ -81,8 +81,8 @@ class BookmarkDetailsView: UIView, BookmarkFormFieldsProtocol {
 
         faviconImageView.setContentHuggingPriority(.defaultHigh, for: .horizontal)
 
-        titleTextField.text = title
-        urlTextField.text = url
+        titleTextField.text = title ?? "New bookmark"
+        urlTextField.text = url ?? "New folder"
 
         mainStackView.snp.makeConstraints {
             $0.edges.equalTo(self)

Client/Frontend/Browser/Toolbars/BottomToolbar/Menu/BookmarksViewController.swift

@@ -378,7 +378,12 @@ class BookmarksViewController: SiteTableViewController, ToolbarUrlActionsProtoco
       self.isEditingIndividualBookmark = false
     }
     self.isEditingIndividualBookmark = true
-    self.navigationController?.pushViewController(nextController, animated: true)
+
+    let mode: AddEditBookmarkTableViewController.Mode =
+        item.isFolder ? .editFolder(item) : .editBookmark(item)
+
+    let vc = AddEditBookmarkTableViewController(mode: mode)
+    self.navigationController?.pushViewController(vc, animated: true)
   }
 
 }

Client/Frontend/Browser/Toolbars/BottomToolbar/Menu/FolderDetailsView.swift

@@ -34,14 +34,14 @@ class FolderDetailsViewTableViewCell: UIView, BookmarkFormFieldsProtocol {
 
     weak var delegate: BookmarkDetailsViewDelegate?
 
-    convenience init(title: String) {
+    convenience init(title: String?) {
         self.init(frame: .zero)
 
         mainStackView.addArrangedSubview(spacerLine)
         mainStackView.addArrangedSubview(titleTextField)
         mainStackView.addArrangedSubview(spacerLine)
 
-        titleTextField.text = title
+        titleTextField.text = title ?? "New folder"
 
         mainStackView.snp.makeConstraints {
             $0.edges.equalTo(self)

Data/models/Bookmark.swift

@@ -105,7 +105,7 @@ public final class Bookmark: NSManagedObject, WebsitePresentable, Syncable, CRUD
                                           sectionNameKeyPath: nil, cacheName: nil)
     }
 
-    public class func foldersFrc() -> NSFetchedResultsController<Bookmark> {
+    public class func foldersFrc(excludedFolder: Bookmark? = nil) -> NSFetchedResultsController<Bookmark> {
         let context = DataController.viewContext
         let fetchRequest = NSFetchRequest<Bookmark>()
 
@@ -115,7 +115,16 @@ public final class Bookmark: NSManagedObject, WebsitePresentable, Syncable, CRUD
         let createdSort = NSSortDescriptor(key: "created", ascending: false)
         fetchRequest.sortDescriptors = [createdSort]
 
-        fetchRequest.predicate = NSPredicate(format: "isFolder == true")
+        var predicate: NSPredicate?
+        if let excludedFolder = excludedFolder {
+            predicate = NSPredicate(format: "isFolder == true AND SELF != %@", excludedFolder)
+        } else {
+            predicate = NSPredicate(format: "isFolder == true")
+        }
+
+        fetchRequest.predicate = predicate
+
+        //"parentFolder == %@"
         
         return NSFetchedResultsController(fetchRequest: fetchRequest, managedObjectContext: context,
                                           sectionNameKeyPath: nil, cacheName: nil)