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: each row in the list is one element, with no box around it

Yashwanth Kamireddib88e2741ff40
diff --git a/src/screens/NotesView.tsx b/src/screens/NotesView.tsx
index 8f742d6..13f55fe 100644
--- a/src/screens/NotesView.tsx
+++ b/src/screens/NotesView.tsx
@@ -116,29 +116,30 @@ const NoteRows = memo(function NoteRows({
<Fragment key={section.key}>
<div className="notes-section" aria-hidden="true">{section.heading}</div>
<div role="group" aria-label={section.heading}>
+ {/* Each note is one element, the row itself: wrapped in a box of its own, every row
+ was two boxes deep, and the separator had to reach across from one to the next. */}
{section.notes.map((note) => (
- <div role="presentation" className="note-item" key={note.guid}>
- <button
- className="note-row"
- role="option"
- data-guid={note.guid}
- aria-selected={openGuid === note.guid}
- onClick={(e) => onPick(note, e)}
- >
- <span className="note-row-title">
- {note.locked && (
- <LockKeyhole className="note-row-lock" size={12} strokeWidth={2.4} aria-label="Locked" />
- )}
- <span className="note-row-name">{wordsOnly(note.title) || "New Note"}</span>
- </span>
- <span className="note-row-meta">
- <span className="note-row-when">{listDate(note.modifiedAt)}</span>
- <span className="note-row-snippet">
- {note.locked ? "Locked" : wordsOnly(note.snippet ?? "").slice(0, 80) || "No additional text"}
- </span>
+ <button
+ key={note.guid}
+ className="note-row"
+ role="option"
+ data-guid={note.guid}
+ aria-selected={openGuid === note.guid}
+ onClick={(e) => onPick(note, e)}
+ >
+ <span className="note-row-title">
+ {note.locked && (
+ <LockKeyhole className="note-row-lock" size={12} strokeWidth={2.4} aria-label="Locked" />
+ )}
+ <span className="note-row-name">{wordsOnly(note.title) || "New Note"}</span>
+ </span>
+ <span className="note-row-meta">
+ <span className="note-row-when">{listDate(note.modifiedAt)}</span>
+ <span className="note-row-snippet">
+ {note.locked ? "Locked" : wordsOnly(note.snippet ?? "").slice(0, 80) || "No additional text"}
</span>
- </button>
- </div>
+ </span>
+ </button>
))}
</div>
</Fragment>
diff --git a/src/styles/notes.css b/src/styles/notes.css
index af33a7c..9b03288 100644
--- a/src/styles/notes.css
+++ b/src/styles/notes.css
@@ -72,8 +72,9 @@
text-align: left;
cursor: default;
}
-/* Rows are separated by a hairline that stops short of the selected row, as in Notes. */
-.note-item + .note-item > .note-row:not([aria-selected="true"]) {
+/* Rows are separated by a hairline that stops short of the selected row, above it and
+ below it, as in Notes. */
+.note-row + .note-row:not([aria-selected="true"], [aria-selected="true"] + .note-row) {
box-shadow: inset 0 1px 0 var(--separator);
border-radius: 0 0 8px 8px;
}