Skip to content

Native iCloud apps for Windows and Linux, built in Rust. Notes, Reminders, Calendar, Contacts, Drive and Photos, offline and in sync with your iPhone.

Notes folders: New Folder, Rename, Delete Folder from a ⋯ menu or right-click, written as icloud.com writes them — deleting moves every note to Recently Deleted first

Yashwanth Kamireddi19ff823fce2f
diff --git a/.uiverify/notes-folders.mjs b/.uiverify/notes-folders.mjs
new file mode 100644
index 0000000..246cd71
--- /dev/null
+++ b/.uiverify/notes-folders.mjs
@@ -0,0 +1,39 @@
+// Notes folders, as Notes manages them: New Folder appears ready to be named, ⋯ and a
+// right-click offer Rename / New Folder / Delete Folder, and Delete asks Apple's question.
+import { engine } from "./engine.mjs";
+import { SERVICES, installStub, openScreen } from "./stub.mjs";
+const b = await engine.launch();
+const ctx = await b.newContext({ viewport: { width: 1200, height: 800 } });
+await ctx.addInitScript(installStub, { screen: "library", services: SERVICES, twoFactor: null, notesFixture: true });
+const page = await ctx.newPage();
+await page.goto("http://localhost:4173", { waitUntil: "networkidle" });
+await openScreen(page, "Notes");
+await page.waitForTimeout(300);
+let failures = 0;
+const ok = (p, m) => { console.log(`${p ? "PASS" : "FAIL"} ${m}`); if (!p) failures++; };
+const names = () => page.locator(".notes-folders .notes-folder-name").allInnerTexts();
+
+await page.getByRole("button", { name: "New Folder" }).click();
+await page.waitForTimeout(300);
+const field = page.getByRole("textbox", { name: "Rename New Folder" });
+ok((await field.count()) === 1, "New Folder appears, ready to be named");
+await field.fill("Recipes");
+await field.press("Enter");
+await page.waitForTimeout(250);
+ok((await names()).includes("Recipes"), `it takes its name ${JSON.stringify(await names())}`);
+
+await page.locator(".notes-folder-row", { hasText: "Recipes" }).click({ button: "right" });
+await page.waitForTimeout(150);
+const offered = await page.getByRole("menuitem").allInnerTexts();
+ok(JSON.stringify(offered) === JSON.stringify(["Rename Folder", "New Folder", "Delete Folder"]), `a folder's menu ${JSON.stringify(offered)}`);
+let question = "";
+page.once("dialog", (d) => { question = d.message(); d.accept(); });
+await page.getByRole("menuitem", { name: "Delete Folder" }).click();
+await page.waitForTimeout(250);
+ok(question.includes("All notes and any subfolders will be deleted."), "Delete Folder asks Apple's question");
+ok(!(await names()).includes("Recipes"), "and the folder is gone");
+const calls = await page.evaluate(() => window.__folderCalls);
+ok(calls?.[0]?.[0] === "create" && calls?.[1]?.[0] === "rename" && calls?.[1]?.[2] === "Recipes" && calls?.[2]?.[0] === "delete",
+ `each went to Apple once ${JSON.stringify(calls)}`);
+await b.close();
+process.exitCode = failures ? 1 : 0;
diff --git a/.uiverify/stub.mjs b/.uiverify/stub.mjs
index 607514f..8561adb 100644
--- a/.uiverify/stub.mjs
+++ b/.uiverify/stub.mjs
@@ -155,7 +155,21 @@ export function installStub({ screen, services, twoFactor, calendarFixture, note
case "reminder_list_create": case "reminder_list_rename": case "reminder_list_delete":
return null;
case "reminders_smart": return !remindersFixture || remindersFixture === "lists" ? [] : reminderItems.filter(r => !r.completedAt);
- case "note_folders": return !notesFixture ? [] : noteFolders;
+ case "note_folders": return !notesFixture ? [] : (window.__noteFolders ??= noteFolders.slice()).slice();
+ case "note_folder_create": {
+ const guid = `f-${(window.__noteFolders ??= noteFolders.slice()).length + 1}`;
+ window.__noteFolders.push({ guid, title: args.title, sortOrder: 0, parentGuid: args.parent ?? null });
+ (window.__folderCalls ??= []).push(["create", args.title]);
+ return guid;
+ }
+ case "note_folder_rename":
+ window.__noteFolders = (window.__noteFolders ?? noteFolders.slice()).map((f) => (f.guid === args.guid ? { ...f, title: args.title } : f));
+ (window.__folderCalls ??= []).push(["rename", args.guid, args.title]);
+ return null;
+ case "note_folder_delete":
+ window.__noteFolders = (window.__noteFolders ?? noteFolders.slice()).filter((f) => f.guid !== args.guid);
+ (window.__folderCalls ??= []).push(["delete", args.guid]);
+ return null;
case "note_save": case "note_delete": case "note_move": return null;
case "note_pin": {
const n = noteList.find((x) => x.guid === args?.guid);
diff --git a/check.sh b/check.sh
index 460c3af..29b2ba0 100755
--- a/check.sh
+++ b/check.sh
@@ -56,6 +56,7 @@ step "drive sort" node .uiverify/drive-sort.mjs
step "drive trash" node .uiverify/drive-trash.mjs
step "drive info" node .uiverify/drive-info.mjs
step "drive delete" node .uiverify/drive-delete.mjs
+step "notes folders" node .uiverify/notes-folders.mjs
# The same screens in WebKit, the engine Quince draws in. Chromium above catches most things;
# this catches what only WebKit does — pointer capture, blur on removal, its own layout.
diff --git a/crates/quince-core/src/notes.rs b/crates/quince-core/src/notes.rs
index 6c7e376..68185b9 100644
--- a/crates/quince-core/src/notes.rs
+++ b/crates/quince-core/src/notes.rs
@@ -244,6 +244,25 @@ impl Library {
Ok((all, per))
}
+ /// Forget folders Apple has deleted. A note still pointing at one is left unfiled here
+ /// rather than lost; the next pass files it wherever Apple has it.
+ pub fn remove_note_folders(&mut self, guids: &[String]) -> Result<()> {
+ let tx = self.conn.transaction()?;
+ for guid in guids {
+ tx.execute(
+ "UPDATE notes SET folder_guid = NULL WHERE folder_guid = ?1",
+ params![guid],
+ )?;
+ tx.execute(
+ "UPDATE note_folders SET parent_guid = NULL WHERE parent_guid = ?1",
+ params![guid],
+ )?;
+ tx.execute("DELETE FROM note_folders WHERE guid = ?1", params![guid])?;
+ }
+ tx.commit()?;
+ Ok(())
+ }
+
pub fn note_folders(&self) -> Result<Vec<NoteFolder>> {
let mut stmt = self.conn.prepare(
"SELECT guid, title, sort_order, parent_guid
diff --git a/crates/quince-icloud/src/notes.rs b/crates/quince-icloud/src/notes.rs
index a538b7d..966cdc8 100644
--- a/crates/quince-icloud/src/notes.rs
+++ b/crates/quince-icloud/src/notes.rs
@@ -226,6 +226,9 @@ pub fn apply_cloudkit(
} = fetched;
let mut folders: Vec<NoteFolder> = Vec::new();
+ // Folders Apple has deleted: removed outright, or — as icloud.com's own delete leaves
+ // them on the way — flagged `Deleted`, which its folder list filters out.
+ let mut gone_folders: Vec<String> = Vec::new();
let mut template: Option<String> = None;
let mut notes: Vec<Note> = Vec::new();
let mut gone: Vec<String> = Vec::new();
@@ -279,7 +282,13 @@ pub fn apply_cloudkit(
notes.extend(note_from_record(record));
}
}
- "Folder" => folders.extend(folder_from_record(record)),
+ "Folder" => {
+ if removed || field::flag(record, "Deleted") {
+ gone_folders.extend(field::record_name(record));
+ } else {
+ folders.extend(folder_from_record(record));
+ }
+ }
// Per-user state. The note it refers to is what matters, not this record's name.
"Note_UserSpecific" | "PasswordProtectedNote_UserSpecific" => {
if let Some(target) = field::reference(record, "Note") {
@@ -338,6 +347,9 @@ pub fn apply_cloudkit(
library.put_note_folders(&folders)?;
library.put_notes(&notes)?;
+ if !gone_folders.is_empty() {
+ library.remove_note_folders(&gone_folders)?;
+ }
for (guid, pinned) in &pins {
if !in_pass.contains(guid) {
library.set_note_pinned(guid, *pinned)?;
@@ -582,6 +594,143 @@ pub async fn move_cloudkit(
Ok(())
}
+/// A folder's title as icloud.com writes it: the UTF-8 bytes, base64, nothing else
+/// (`FolderEncodings` in its bundle) — not the gzip a note's title is sent in.
+fn plain_title(title: &str) -> String {
+ use base64::Engine;
+ base64::engine::general_purpose::STANDARD.encode(title.as_bytes())
+}
+
+/// Make a folder, as icloud.com's New Folder does: a `Folder` record with its title (plain
+/// UTF-8, base64 — "encrypted" in name only) and, when it sits inside another, a
+/// `ParentFolder` reference. Returns the record name, a client-made UUID as icloud.com uses.
+pub async fn create_folder_cloudkit(
+ http: &reqwest::Client,
+ ckdatabasews_root: &str,
+ params: Vec<(String, String)>,
+ title: &str,
+ parent: Option<&str>,
+) -> Result<String> {
+ let title = title.trim();
+ if title.is_empty() {
+ return Err(Error::Refused("A folder needs a name.".into()));
+ }
+ let client = ZoneClient::new(http, ckdatabasews_root, CONTAINER, params);
+ let name = uuid::Uuid::new_v4().to_string();
+ let mut fields = serde_json::json!({
+ "TitleEncrypted": { "type": "ENCRYPTED_BYTES", "value": plain_title(title) },
+ });
+ if let Some(parent) = parent {
+ fields["ParentFolder"] = client.reference_to(ZONE, parent);
+ }
+ client.create_record(ZONE, &name, "Folder", fields).await?;
+ Ok(name)
+}
+
+/// Rename a folder: its title, written over what Apple holds now. Apple's own two cannot be.
+pub async fn rename_folder_cloudkit(
+ http: &reqwest::Client,
+ ckdatabasews_root: &str,
+ params: Vec<(String, String)>,
+ guid: &str,
+ title: &str,
+) -> Result<()> {
+ let title = title.trim();
+ if guid == DEFAULT_FOLDER || guid == quince_core::notes::TRASH_FOLDER {
+ return Err(Error::Refused(
+ "Apple's own folders keep their names.".into(),
+ ));
+ }
+ if title.is_empty() {
+ return Err(Error::Refused("A folder needs a name.".into()));
+ }
+ let client = ZoneClient::new(http, ckdatabasews_root, CONTAINER, params);
+ let current = client
+ .lookup_record(ZONE, guid)
+ .await?
+ .ok_or_else(|| Error::Refused("That folder is no longer in iCloud.".into()))?;
+ let tag = current.get("recordChangeTag").and_then(Value::as_str);
+ client
+ .update_record(
+ ZONE,
+ guid,
+ "Folder",
+ tag,
+ serde_json::json!({
+ "TitleEncrypted": { "type": "ENCRYPTED_BYTES", "value": plain_title(title) },
+ "TitleModificationDate": { "type": "TIMESTAMP", "value": now_millis() },
+ }),
+ )
+ .await?;
+ Ok(())
+}
+
+/// Delete a folder as icloud.com does, except for its last step: every note in it — and in
+/// every folder inside it — goes to Recently Deleted, then each folder is flagged `Deleted`,
+/// which Apple's clients read as gone. icloud.com then destroys the folder record too; that
+/// is left undone here, since nothing reads a flagged folder and a destroyed record is past
+/// recovery. Notes are moved first, so a failure part-way loses nothing.
+pub async fn delete_folder_cloudkit(
+ http: &reqwest::Client,
+ ckdatabasews_root: &str,
+ params: Vec<(String, String)>,
+ all: &[NoteFolder],
+ notes: &[Note],
+ guid: &str,
+) -> Result<()> {
+ if guid == DEFAULT_FOLDER || guid == quince_core::notes::TRASH_FOLDER {
+ return Err(Error::Refused(
+ "Apple's own folders can't be deleted.".into(),
+ ));
+ }
+ // This folder, then every folder under it, deepest last.
+ let mut doomed = vec![guid.to_string()];
+ let mut i = 0;
+ while i < doomed.len() {
+ let parent = doomed[i].clone();
+ doomed.extend(
+ all.iter()
+ .filter(|f| f.parent_guid.as_deref() == Some(parent.as_str()))
+ .map(|f| f.guid.clone()),
+ );
+ i += 1;
+ }
+ for note in notes.iter().filter(|n| {
+ n.folder_guid
+ .as_deref()
+ .is_some_and(|f| doomed.iter().any(|d| d == f))
+ }) {
+ move_cloudkit(
+ http,
+ ckdatabasews_root,
+ params.clone(),
+ note,
+ Some(quince_core::notes::TRASH_FOLDER),
+ )
+ .await?;
+ }
+ let client = ZoneClient::new(http, ckdatabasews_root, CONTAINER, params);
+ for folder in doomed.iter().rev() {
+ let Some(current) = client.lookup_record(ZONE, folder).await? else {
+ continue;
+ };
+ let tag = current.get("recordChangeTag").and_then(Value::as_str);
+ client
+ .update_record(
+ ZONE,
+ folder,
+ "Folder",
+ tag,
+ serde_json::json!({
+ "Deleted": { "type": "INT64", "value": 1 },
+ "DeletedDate": { "type": "TIMESTAMP", "value": now_millis() },
+ }),
+ )
+ .await?;
+ }
+ Ok(())
+}
+
/// Apple's own "Notes" folder, where a note filed nowhere in particular lives.
pub const DEFAULT_FOLDER: &str = "DefaultFolder-CloudKit";
@@ -795,6 +944,91 @@ mod tests {
assert_eq!(library.note_folders().unwrap()[0].title, "Notes");
}
+ /// A folder deleted elsewhere — flagged `Deleted` on its way out, as icloud.com does it —
+ /// leaves the list, and a note still filed in it is kept, unfiled, not lost.
+ #[tokio::test]
+ async fn a_folder_flagged_deleted_leaves_the_list() {
+ let mut library = Library::in_memory().unwrap();
+ let first = serve(json!({ "zones": [{
+ "records": [
+ folder_record("F-keep", "Keep"),
+ folder_record("F-gone", "Old"),
+ note_record("Note/n1", "Kept note", Some("body"), "F-gone"),
+ ],
+ "syncToken": "t1", "moreComing": false }] }))
+ .await;
+ sync_cloudkit(
+ &reqwest::Client::new(),
+ &first.uri(),
+ vec![],
+ &mut library,
+ None,
+ )
+ .await
+ .unwrap();
+ assert_eq!(library.note_folders().unwrap().len(), 2);
+
+ let mut flagged = folder_record("F-gone", "Old");
+ flagged["fields"]["Deleted"] = json!({ "type": "INT64", "value": 1 });
+ let second = serve(json!({ "zones": [{
+ "records": [flagged], "syncToken": "t2", "moreComing": false }] }))
+ .await;
+ sync_cloudkit(
+ &reqwest::Client::new(),
+ &second.uri(),
+ vec![],
+ &mut library,
+ Some("t1"),
+ )
+ .await
+ .unwrap();
+ let titles: Vec<String> = library
+ .note_folders()
+ .unwrap()
+ .into_iter()
+ .map(|f| f.title)
+ .collect();
+ assert_eq!(titles, ["Keep"]);
+ assert_eq!(
+ library.notes_in(None).unwrap().len(),
+ 1,
+ "the note survives"
+ );
+ }
+
+ /// New Folder writes icloud.com's shape: a title, and a parent reference when nested.
+ #[tokio::test]
+ async fn a_new_folder_is_a_titled_record_inside_its_parent() {
+ let server = MockServer::start().await;
+ Mock::given(method("POST"))
+ .and(path_regex(r".*/records/modify$"))
+ .respond_with(
+ ResponseTemplate::new(200)
+ .set_body_json(json!({ "records": [{ "recordName": "x" }] })),
+ )
+ .mount(&server)
+ .await;
+ create_folder_cloudkit(
+ &reqwest::Client::new(),
+ &server.uri(),
+ vec![],
+ " Recipes ",
+ Some("F-parent"),
+ )
+ .await
+ .unwrap();
+ let requests = server.received_requests().await.unwrap();
+ let record = serde_json::from_slice::<Value>(&requests[0].body).unwrap()["operations"][0]
+ ["record"]
+ .clone();
+ assert_eq!(record["recordType"], "Folder");
+ assert_eq!(record["fields"]["TitleEncrypted"]["value"], bare("Recipes"));
+ assert_eq!(
+ record["fields"]["ParentFolder"]["value"]["recordName"],
+ "F-parent"
+ );
+ }
+
/// Deletion lives on the per-user record, not the note. Missing that leaves deleted
/// notes on screen forever.
#[tokio::test]
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 5935906..828c22e 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -1070,6 +1070,71 @@ async fn note_pin(
resync_notes(&http, &root, params, &data).await
}
+/// A new Notes folder, inside another when `parent` is given.
+#[tauri::command]
+async fn note_folder_create(
+ title: String,
+ parent: Option<String>,
+ auth: State<'_, Auth>,
+ data: State<'_, Data>,
+) -> UiResult<String> {
+ let (http, root, params) = cloudkit_context(&auth).await?;
+ let guid = quince_icloud::notes::create_folder_cloudkit(
+ &http,
+ &root,
+ params.clone(),
+ &title,
+ parent.as_deref(),
+ )
+ .await
+ .map_err(|e| e.to_string())?;
+ resync_notes(&http, &root, params, &data).await?;
+ Ok(guid)
+}
+
+#[tauri::command]
+async fn note_folder_rename(
+ guid: String,
+ title: String,
+ auth: State<'_, Auth>,
+ data: State<'_, Data>,
+) -> UiResult<()> {
+ let (http, root, params) = cloudkit_context(&auth).await?;
+ quince_icloud::notes::rename_folder_cloudkit(&http, &root, params.clone(), &guid, &title)
+ .await
+ .map_err(|e| e.to_string())?;
+ resync_notes(&http, &root, params, &data).await
+}
+
+/// Delete a folder: its notes, and those of every folder inside it, to Recently Deleted.
+#[tauri::command]
+async fn note_folder_delete(
+ guid: String,
+ auth: State<'_, Auth>,
+ data: State<'_, Data>,
+) -> UiResult<()> {
+ let (http, root, params) = cloudkit_context(&auth).await?;
+ // Read what is needed, then let go of the library before any network call.
+ let (folders, notes) = {
+ let library = data.0.lock().await;
+ (
+ library.note_folders().map_err(|e| e.to_string())?,
+ library.notes_in(None).map_err(|e| e.to_string())?,
+ )
+ };
+ quince_icloud::notes::delete_folder_cloudkit(
+ &http,
+ &root,
+ params.clone(),
+ &folders,
+ &notes,
+ &guid,
+ )
+ .await
+ .map_err(|e| e.to_string())?;
+ resync_notes(&http, &root, params, &data).await
+}
+
#[tauri::command]
async fn note_folders(data: State<'_, Data>) -> UiResult<Vec<NoteFolder>> {
let library = data.0.lock().await;
@@ -2095,6 +2160,9 @@ fn main() {
reminder_list_rename,
reminder_list_delete,
note_folders,
+ note_folder_create,
+ note_folder_rename,
+ note_folder_delete,
note_body,
note_save,
note_create,
diff --git a/src/components/RowMenu.tsx b/src/components/RowMenu.tsx
new file mode 100644
index 0000000..d5343d6
--- /dev/null
+++ b/src/components/RowMenu.tsx
@@ -0,0 +1,77 @@
+import { useEffect, useLayoutEffect, useRef, useState } from "react";
+
+export type MenuEntry = { label: string; run: () => void; danger?: boolean } | null;
+
+/**
+ * A menu as macOS draws one: under the ⋯ that opened it or at the pointer for a right-click,
+ * kept on screen, arrows to move, Return to choose, Escape or a click elsewhere to leave.
+ */
+export function RowMenu({ at, entries, onClose }: {
+ at: { x: number; y: number; alignRight: boolean };
+ entries: MenuEntry[];
+ onClose: () => void;
+}) {
+ const box = useRef<HTMLDivElement | null>(null);
+ const [pos, setPos] = useState({ left: at.x, top: at.y });
+ const items = entries.filter((e): e is NonNullable<MenuEntry> => e !== null);
+ const [active, setActive] = useState(0);
+ useLayoutEffect(() => {
+ const el = box.current;
+ if (!el) return;
+ const { width, height } = el.getBoundingClientRect();
+ let left = at.alignRight ? at.x - width : at.x;
+ let top = at.y;
+ left = Math.max(8, Math.min(left, window.innerWidth - width - 8));
+ if (top + height > window.innerHeight - 8) top = Math.max(8, at.y - height - (at.alignRight ? 36 : 0));
+ setPos({ left, top });
+ el.focus();
+ }, [at]);
+ useEffect(() => {
+ const down = (e: MouseEvent) => { if (!box.current?.contains(e.target as Node)) onClose(); };
+ const away = () => onClose();
+ document.addEventListener("mousedown", down);
+ window.addEventListener("blur", away);
+ window.addEventListener("resize", away);
+ return () => {
+ document.removeEventListener("mousedown", down);
+ window.removeEventListener("blur", away);
+ window.removeEventListener("resize", away);
+ };
+ }, [onClose]);
+ const pick = (i: number) => { onClose(); items[i]?.run(); };
+ let n = -1;
+ return (
+ <div
+ ref={box}
+ className="row-menu"
+ role="menu"
+ tabIndex={-1}
+ style={{ left: pos.left, top: pos.top }}
+ onKeyDown={(e) => {
+ if (e.key === "Escape") { e.preventDefault(); onClose(); }
+ else if (e.key === "ArrowDown") { e.preventDefault(); setActive((a) => (a + 1) % items.length); }
+ else if (e.key === "ArrowUp") { e.preventDefault(); setActive((a) => (a - 1 + items.length) % items.length); }
+ else if (e.key === "Enter" || e.key === " ") { e.preventDefault(); pick(active); }
+ }}
+ >
+ {entries.map((entry, i) => {
+ if (!entry) return <div key={`sep${i}`} className="row-menu-sep" role="separator" />;
+ n += 1;
+ const index = n;
+ return (
+ <button
+ key={entry.label}
+ role="menuitem"
+ tabIndex={-1}
+ className={`row-menu-item${entry.danger ? " is-danger" : ""}${index === active ? " is-active" : ""}`}
+ onMouseEnter={() => setActive(index)}
+ onClick={() => pick(index)}
+ >
+ {entry.label}
+ </button>
+ );
+ })}
+ </div>
+ );
+}
+
diff --git a/src/lib/ipc.ts b/src/lib/ipc.ts
index ca786c7..5698aa1 100644
--- a/src/lib/ipc.ts
+++ b/src/lib/ipc.ts
@@ -114,6 +114,10 @@ export const api = {
invoke<void>("reminder_delete", { guid, listGuid }),
noteFolders: () => invoke<NoteFolder[]>("note_folders"),
+ noteFolderCreate: (title: string, parent: string | null) =>
+ invoke<string>("note_folder_create", { title, parent }),
+ noteFolderRename: (guid: string, title: string) => invoke<void>("note_folder_rename", { guid, title }),
+ noteFolderDelete: (guid: string) => invoke<void>("note_folder_delete", { guid }),
notesIn: (folderGuid: string | null) => invoke<Note[]>("notes_in", { folderGuid }),
/** [notes outside Recently Deleted, [folder guid, count]…]. */
noteCounts: () => invoke<[number, [string, number][]]>("note_counts"),
diff --git a/src/screens/DriveView.tsx b/src/screens/DriveView.tsx
index 9cb6e4e..b5040c0 100644
--- a/src/screens/DriveView.tsx
+++ b/src/screens/DriveView.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useLayoutEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
import { Notice } from "../components/Notice";
import { open as openFileDialog } from "@tauri-apps/plugin-dialog";
import { getCurrentWebview } from "@tauri-apps/api/webview";
@@ -17,6 +17,7 @@ import { ActionGlyph, FileGlyph } from "../components/FileGlyph";
import { UploadTray } from "../components/UploadTray";
import { listen } from "@tauri-apps/api/event";
import { Picker } from "../components/Picker";
+import { RowMenu } from "../components/RowMenu";
/** iCloud Drive's own four orders, as its "by Name" menu offers them. */
const SORTS = [
@@ -210,81 +211,6 @@ function InfoSheet({ item, where, onClose }: { item: DriveItem; where: string; o
);
}
-type MenuEntry = { label: string; run: () => void; danger?: boolean } | null;
-
-/**
- * A menu as macOS draws one: under the ⋯ that opened it or at the pointer for a right-click,
- * kept on screen, arrows to move, Return to choose, Escape or a click elsewhere to leave.
- */
-function RowMenu({ at, entries, onClose }: {
- at: { x: number; y: number; alignRight: boolean };
- entries: MenuEntry[];
- onClose: () => void;
-}) {
- const box = useRef<HTMLDivElement | null>(null);
- const [pos, setPos] = useState({ left: at.x, top: at.y });
- const items = entries.filter((e): e is NonNullable<MenuEntry> => e !== null);
- const [active, setActive] = useState(0);
- useLayoutEffect(() => {
- const el = box.current;
- if (!el) return;
- const { width, height } = el.getBoundingClientRect();
- let left = at.alignRight ? at.x - width : at.x;
- let top = at.y;
- left = Math.max(8, Math.min(left, window.innerWidth - width - 8));
- if (top + height > window.innerHeight - 8) top = Math.max(8, at.y - height - (at.alignRight ? 36 : 0));
- setPos({ left, top });
- el.focus();
- }, [at]);
- useEffect(() => {
- const down = (e: MouseEvent) => { if (!box.current?.contains(e.target as Node)) onClose(); };
- const away = () => onClose();
- document.addEventListener("mousedown", down);
- window.addEventListener("blur", away);
- window.addEventListener("resize", away);
- return () => {
- document.removeEventListener("mousedown", down);
- window.removeEventListener("blur", away);
- window.removeEventListener("resize", away);
- };
- }, [onClose]);
- const pick = (i: number) => { onClose(); items[i]?.run(); };
- let n = -1;
- return (
- <div
- ref={box}
- className="row-menu"
- role="menu"
- tabIndex={-1}
- style={{ left: pos.left, top: pos.top }}
- onKeyDown={(e) => {
- if (e.key === "Escape") { e.preventDefault(); onClose(); }
- else if (e.key === "ArrowDown") { e.preventDefault(); setActive((a) => (a + 1) % items.length); }
- else if (e.key === "ArrowUp") { e.preventDefault(); setActive((a) => (a - 1 + items.length) % items.length); }
- else if (e.key === "Enter" || e.key === " ") { e.preventDefault(); pick(active); }
- }}
- >
- {entries.map((entry, i) => {
- if (!entry) return <div key={`sep${i}`} className="row-menu-sep" role="separator" />;
- n += 1;
- const index = n;
- return (
- <button
- key={entry.label}
- role="menuitem"
- tabIndex={-1}
- className={`row-menu-item${entry.danger ? " is-danger" : ""}${index === active ? " is-active" : ""}`}
- onMouseEnter={() => setActive(index)}
- onClick={() => pick(index)}
- >
- {entry.label}
- </button>
- );
- })}
- </div>
- );
-}
-
type Crumb = { id: string; name: string };
export function DriveView() {
diff --git a/src/screens/NotesView.tsx b/src/screens/NotesView.tsx
index c442d1b..8b0c1dd 100644
--- a/src/screens/NotesView.tsx
+++ b/src/screens/NotesView.tsx
@@ -1,10 +1,11 @@
import { Fragment, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
import { Notice } from "../components/Notice";
import { flushSync } from "react-dom";
-import { ChevronLeft, Folder, FolderOpen, Pin, PinOff, SquarePen, Trash2 } from "lucide-react";
+import { ChevronLeft, Folder, FolderOpen, FolderPlus, Pin, PinOff, SquarePen, Trash2 } from "lucide-react";
import { LongTextarea } from "../components/LongTextarea";
import { editorDate, groupNotes, joinTitle, listDate, splitTitle } from "./notes/model";
import { api, messageOf, nestFolders, type Note, type NoteFolder } from "../lib/ipc";
+import { RowMenu } from "../components/RowMenu";
import { useSync } from "../lib/sync";
import { Picker } from "../components/Picker";
@@ -12,9 +13,13 @@ const ALL = "__all__";
/** Apple's Recently Deleted, by the record name that is the same in every language. */
const TRASH_FOLDER = "TrashFolder-CloudKit";
+/** Apple's own "Notes" folder: it can be neither renamed nor deleted. */
+const DEFAULT_FOLDER = "DefaultFolder-CloudKit";
export function NotesView() {
const [folders, setFolders] = useState<NoteFolder[]>([]);
+ const [folderMenu, setFolderMenu] = useState<{ folder: NoteFolder; x: number; y: number; alignRight: boolean } | null>(null);
+ const [renamingFolder, setRenamingFolder] = useState<string | null>(null);
const [folder, setFolder] = useState<string>(ALL);
const [notes, setNotes] = useState<Note[]>([]);
const [openGuid, setOpenGuid] = useState<string | null>(null);
@@ -340,6 +345,49 @@ export function NotesView() {
* asked about first, in Apple's words.
*/
const inTrash = open?.folderGuid === TRASH_FOLDER;
+ /**
+ * Folders, as Notes manages them. Each shows its change at once — a new "New Folder" ready
+ * to be named, a new name, a folder gone — and a refusal re-reads and says why.
+ */
+ const newFolder = async (parent: string | null) => {
+ const standIn = `pending-folder-${Date.now()}`;
+ setFolders((fs) => [...fs, { guid: standIn, title: "New Folder", sortOrder: 0, parentGuid: parent } as NoteFolder]);
+ try {
+ const guid = await api.noteFolderCreate("New Folder", parent);
+ await read();
+ setRenamingFolder(guid);
+ } catch (e) {
+ setFolders((fs) => fs.filter((f) => f.guid !== standIn));
+ setError(messageOf(e));
+ }
+ };
+ const renameFolder = async (f: NoteFolder, title: string) => {
+ setRenamingFolder(null);
+ const name = title.trim();
+ if (!name || name === f.title) return;
+ setFolders((fs) => fs.map((x) => (x.guid === f.guid ? { ...x, title: name } : x)));
+ try {
+ await api.noteFolderRename(f.guid, name);
+ await read();
+ } catch (e) {
+ setError(messageOf(e));
+ read().catch(() => {});
+ }
+ };
+ const deleteFolder = async (f: NoteFolder) => {
+ // Apple's own words for it.
+ if (!window.confirm(`Are you sure you want to delete \u201c${f.title}\u201d?\n\nAll notes and any subfolders will be deleted.`)) return;
+ setFolders((fs) => fs.filter((x) => x.guid !== f.guid && x.parentGuid !== f.guid));
+ if (folder === f.guid) setFolder(ALL);
+ try {
+ await api.noteFolderDelete(f.guid);
+ await read();
+ } catch (e) {
+ setError(messageOf(e));
+ read().catch(() => {});
+ }
+ };
+
const remove = useCallback(async () => {
if (!open) return;
if (
@@ -355,7 +403,7 @@ export function NotesView() {
/** Out of Recently Deleted and back into Notes — Apple's "Notes" folder where there is one. */
const recover = useCallback(async () => {
if (!open) return;
- const back = folders.some((f) => f.guid === "DefaultFolder-CloudKit") ? "DefaultFolder-CloudKit" : null;
+ const back = folders.some((f) => f.guid === DEFAULT_FOLDER) ? DEFAULT_FOLDER : null;
const guid = open.guid;
await write(() => api.noteMove(guid, back), (rows) => rows.filter((n) => n.guid !== guid));
}, [open, write, folders]);
@@ -453,19 +501,63 @@ export function NotesView() {
</button>
{nestFolders(folders)
.filter(({ folder: f }) => f.guid !== TRASH_FOLDER)
- .map(({ folder: f, depth }) => (
- <button
- key={f.guid}
- className="notes-folder"
- aria-current={folder === f.guid}
- onClick={() => setFolder(f.guid)}
- style={depth > 0 ? { paddingLeft: `${8 + depth * 16}px` } : undefined}
- >
- <Folder className="notes-folder-glyph" size={16} strokeWidth={2} aria-hidden="true" />
- <span className="notes-folder-name">{f.title}</span>
- <span className="notes-folder-count">{counts.per.get(f.guid) || ""}</span>
- </button>
- ))}
+ .map(({ folder: f, depth }) => {
+ const own = f.guid !== DEFAULT_FOLDER;
+ if (renamingFolder === f.guid) {
+ return (
+ <input
+ key={f.guid}
+ className="notes-folder notes-folder-rename"
+ defaultValue={f.title}
+ aria-label={`Rename ${f.title}`}
+ autoFocus
+ onFocus={(e) => e.currentTarget.select()}
+ onBlur={(e) => void renameFolder(f, e.currentTarget.value)}
+ onKeyDown={(e) => {
+ if (e.key === "Enter") e.currentTarget.blur();
+ if (e.key === "Escape") { e.currentTarget.value = f.title; e.currentTarget.blur(); }
+ }}
+ style={depth > 0 ? { paddingLeft: `${8 + depth * 16}px` } : undefined}
+ />
+ );
+ }
+ const openMenu = (x: number, y: number, alignRight: boolean) =>
+ setFolderMenu({ folder: f, x, y, alignRight });
+ return (
+ <div
+ key={f.guid}
+ className={`notes-folder-row${folderMenu?.folder.guid === f.guid ? " is-menu" : ""}`}
+ onContextMenu={(e) => {
+ e.preventDefault();
+ openMenu(e.clientX, e.clientY, false);
+ }}
+ >
+ <button
+ className="notes-folder"
+ aria-current={folder === f.guid}
+ onClick={() => setFolder(f.guid)}
+ style={depth > 0 ? { paddingLeft: `${8 + depth * 16}px` } : undefined}
+ >
+ <Folder className="notes-folder-glyph" size={16} strokeWidth={2} aria-hidden="true" />
+ <span className="notes-folder-name">{f.title}</span>
+ <span className="notes-folder-count">{counts.per.get(f.guid) || ""}</span>
+ </button>
+ {own && (
+ <button
+ className="notes-folder-more"
+ aria-label={`Actions for ${f.title}`}
+ aria-haspopup="menu"
+ onClick={(e) => {
+ const r = e.currentTarget.getBoundingClientRect();
+ openMenu(r.right, r.bottom + 4, true);
+ }}
+ >
+ <span aria-hidden="true">•••</span>
+ </button>
+ )}
+ </div>
+ );
+ })}
{folders.some((f) => f.guid === TRASH_FOLDER) && (
<button
className="notes-folder"
@@ -477,6 +569,22 @@ export function NotesView() {
<span className="notes-folder-count">{counts.per.get(TRASH_FOLDER) || ""}</span>
</button>
)}
+ <button className="notes-new-folder" onClick={() => void newFolder(null)}>
+ <FolderPlus size={15} strokeWidth={2} aria-hidden="true" />
+ New Folder
+ </button>
+ {folderMenu && (
+ <RowMenu
+ at={folderMenu}
+ onClose={() => setFolderMenu(null)}
+ entries={[
+ { label: "Rename Folder", run: () => setRenamingFolder(folderMenu.folder.guid) },
+ { label: "New Folder", run: () => void newFolder(folderMenu.folder.guid) },
+ null,
+ { label: "Delete Folder", danger: true, run: () => void deleteFolder(folderMenu.folder) },
+ ]}
+ />
+ )}
</aside>
<section className="notes-list" aria-label="Notes">
@@ -585,7 +693,7 @@ export function NotesView() {
options={[
// "No folder" only for an account without Apple's default "Notes" folder;
// with one, it was a second "Notes" that meant something else.
- ...(folders.some((f) => f.guid === "DefaultFolder-CloudKit")
+ ...(folders.some((f) => f.guid === DEFAULT_FOLDER)
? []
: [{ value: ALL, label: "Notes" }]),
...folders
diff --git a/src/styles/notes.css b/src/styles/notes.css
index 237d93e..9963171 100644
--- a/src/styles/notes.css
+++ b/src/styles/notes.css
@@ -246,3 +246,21 @@ textarea.note-title::placeholder { color: var(--text-3); }
.note-when { text-align: right; }
.note-editor { padding-right: 0; }
}
+/* A folder row: the folder, and its ⋯ on hover, as Notes on icloud.com draws it. */
+.notes-folder-row { position: relative; display: flex; align-items: center; }
+.notes-folder-row > .notes-folder { flex: 1; min-width: 0; }
+.notes-folder-more {
+ position: absolute; right: 6px; display: grid; place-items: center; width: 22px; height: 22px;
+ padding: 0; border: 0; border-radius: 50%; background: color-mix(in srgb, var(--text) 12%, transparent);
+ box-shadow: none; color: var(--text); font-size: 8px; letter-spacing: 1px; opacity: 0; cursor: pointer;
+ transition: opacity 120ms ease;
+}
+.notes-folder-row:hover .notes-folder-more, .notes-folder-row.is-menu .notes-folder-more,
+.notes-folder-more:focus-visible { opacity: 1; }
+.notes-folder-row:hover .notes-folder-count, .notes-folder-row.is-menu .notes-folder-count { visibility: hidden; }
+.notes-folder-rename { width: 100%; box-sizing: border-box; border: 1px solid var(--gold); background: var(--bg); color: var(--text); font: inherit; outline: none; }
+.notes-new-folder {
+ display: flex; align-items: center; gap: 6px; margin-top: auto; padding: 8px; border: 0;
+ background: none; box-shadow: none; color: var(--gold); font: inherit; font-size: var(--t-13); cursor: pointer;
+}
+.notes-new-folder:hover { text-decoration: underline; }