Skip to content

Build your personal knowledge base with Trilium Notes

feat(tree): group the collections in a Collection submenu of the insert menus

Elian Doran4de08a62c58a
diff --git a/apps/client/src/services/note_types.spec.ts b/apps/client/src/services/note_types.spec.ts
index 8b135f0379..3f2dc71f00 100644
--- a/apps/client/src/services/note_types.spec.ts
+++ b/apps/client/src/services/note_types.spec.ts
@@ -404,6 +404,38 @@ describe("new template badges", () => {
restore();
}
});
+
+ it("puts the collections in a submenu of the menu, and under a header of the list", async () => {
+ withTemplates([], [ "tpl-coll" ]);
+ const restore = withTemplatesRoot([
+ fakeTemplate("tpl-plain", [ "template" ], "Plain"),
+ fakeTemplate("tpl-coll", [ "template", "collection" ], "Coll")
+ ]);
+ try {
+ const data = await noteTypesService.loadNoteTypeData();
+ const menu: any[] = noteTypesService.buildNoteTypeItems(data, "insertNoteAfter" as never);
+
+ const submenu = menu.find((i) => i.title === "note_types.book");
+ expect(submenu).toBeDefined();
+ expect(submenu.kind).toBeUndefined();
+ expect(submenu.command).toBeUndefined();
+ expect(submenu.items.map((i: any) => i.templateNoteId)).toEqual([ "tpl-coll" ]);
+ expect(submenu.items[0].command).toBe("insertNoteAfter");
+ expect(submenu.items[0].badges).toHaveLength(1);
+ // The collections are only in the submenu, and the menu has no header left for them.
+ expect(menu.some((i) => i.templateNoteId === "tpl-coll")).toBe(false);
+ expect(menu.some((i) => i.kind === "header")).toBe(false);
+ expect(menu.some((i) => i.templateNoteId === "tpl-plain")).toBe(true);
+
+ // The note type chooser renders a flat list, so it keeps the header.
+ const list: any[] = await noteTypesService.getNoteTypeItems();
+ expect(list.some((i) => i.kind === "header" && i.title === "note_types.collections")).toBe(true);
+ expect(list.some((i) => i.templateNoteId === "tpl-coll")).toBe(true);
+ expect(list.some((i) => i.items)).toBe(false);
+ } finally {
+ restore();
+ }
+ });
});
describe("isCurrentNoteType", () => {
diff --git a/apps/client/src/services/note_types.ts b/apps/client/src/services/note_types.ts
index 58ffc33adc..bd648eca15 100644
--- a/apps/client/src/services/note_types.ts
+++ b/apps/client/src/services/note_types.ts
@@ -216,24 +216,32 @@ async function loadNoteTypeData(): Promise<NoteTypeData> {
return { builtInTemplateNotes, userTemplateNotes, newTemplates: new Set(newTemplateNoteIds) };
}
-function buildNoteTypeItems(data: NoteTypeData, command?: TreeCommandNames) {
+/**
+ * The note type items. In a `"menu"` the collections form a submenu; a `"list"`, such as the note
+ * type chooser draws, cannot open one, so there they follow a header instead.
+ */
+function buildNoteTypeItems(data: NoteTypeData, command?: TreeCommandNames, layout: "menu" | "list" = "menu") {
const { builtInTemplateNotes, userTemplateNotes, newTemplates } = data;
+ const collections = getBuiltInTemplates(command, builtInTemplateNotes, true, newTemplates);
const items: MenuItem<TreeCommandNames>[] = [
...getBlankNoteTypes(command),
- ...getBuiltInTemplates(null, command, builtInTemplateNotes, false, newTemplates),
- ...getBuiltInTemplates(
- t("note_types.collections"), command, builtInTemplateNotes, true, newTemplates
- ),
- ...getUserTemplates(command, userTemplateNotes, newTemplates)
+ ...withLeading(SEPARATOR, getBuiltInTemplates(command, builtInTemplateNotes, false, newTemplates))
];
+ if (layout === "list") {
+ items.push(...withLeading({ title: t("note_types.collections"), kind: "header" }, collections));
+ } else if (collections.length > 0) {
+ items.push(SEPARATOR, { title: t("note_types.book"), uiIcon: "bx bx-book", items: collections });
+ }
+
+ items.push(...getUserTemplates(command, userTemplateNotes, newTemplates));
return items;
}
-/** Builds a single note type menu. Use {@link loadNoteTypeData} directly to build several. */
+/** Builds the note type list of the note type chooser. Use {@link loadNoteTypeData} directly to build several. */
async function getNoteTypeItems(command?: TreeCommandNames) {
- return buildNoteTypeItems(await loadNoteTypeData(), command);
+ return buildNoteTypeItems(await loadNoteTypeData(), command, "list");
}
function getBlankNoteTypes(command?: TreeCommandNames): MenuItem<TreeCommandNames>[] {
@@ -302,20 +310,8 @@ async function getBuiltInTemplateNotes() {
return await templatesRoot.getChildNotes();
}
-function getBuiltInTemplates(title: string | null, command: TreeCommandNames | undefined, childNotes: FNote[], filterCollections: boolean, newTemplates: Set<string>) {
- if (childNotes.length === 0) {
- return [];
- }
-
+function getBuiltInTemplates(command: TreeCommandNames | undefined, childNotes: FNote[], filterCollections: boolean, newTemplates: Set<string>) {
const items: MenuItem<TreeCommandNames>[] = [];
- if (title) {
- items.push({
- title,
- kind: "header"
- });
- } else {
- items.push(SEPARATOR);
- }
for (const templateNote of childNotes) {
if (templateNote.hasLabel("collection") !== filterCollections ||
@@ -347,6 +343,11 @@ function getBuiltInTemplates(title: string | null, command: TreeCommandNames | u
return items;
}
+/** `items` led by `lead`, or nothing when there are no items to lead. */
+function withLeading(lead: MenuItem<TreeCommandNames>, items: MenuItem<TreeCommandNames>[]) {
+ return items.length > 0 ? [ lead, ...items ] : [];
+}
+
export default {
loadNoteTypeData,
buildNoteTypeItems,
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree/Note tree contextual menu.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree/Note tree contextual menu.html
index 549f23768c..d7fe8f2900 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree/Note tree contextual menu.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree/Note tree contextual menu.html
@@ -44,6 +44,8 @@
<li><strong>Insert note after</strong>
<ul>
<li>Allows easy creation of a note with a specified <a href="#root/_help_KSZ04uQ2D1St">note type</a>.</li>
+ <li><a class="reference-link" href="#root/_help_GTwFsgaA0lCt">Collections</a> are
+ grouped in the <em>Collection</em> submenu.</li>
<li><a class="reference-link" href="#root/_help_KC1HB96bqqHX">Templates</a>&nbsp;will
also be present (if any) at the end of the list.</li>
<li>The note will be added on the same level of hierarchy as the note selected.</li>
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections.html
index 9e688e36b2..29f99e328a 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections.html
@@ -89,9 +89,9 @@
<p>Classic collections make use of pagination to support a large number of
notes. The size of a page can be customized via <code>pageSize</code>.</p>
<h2>Creating a new collection</h2>
-<p>To create a new collections, right click in the&nbsp;<a class="reference-link"
- href="#root/_help_oPVyFC7WL2Lp">Note Tree</a>&nbsp;and look for the <em>Collections</em> entry
- and select the desired type.</p>
+<p>To create a new collection, right-click a note in the&nbsp;<a class="reference-link"
+ href="#root/_help_oPVyFC7WL2Lp">Note Tree</a> and select <em>Insert child note</em> → <em>Collection</em> →
+ the desired type.</p>
<p>By default, collections come with a default configuration and sometimes
even sample notes. To create a collection completely from scratch:</p>
<ol>
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Calendar.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Calendar.html
index 1349f80a01..08d54b02c1 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Calendar.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Calendar.html
@@ -21,8 +21,7 @@
ones.</p>
<h2>Creating a calendar</h2>
<p>Right click on an existing note in the&nbsp;<a class="reference-link"
- href="#root/_help_oPVyFC7WL2Lp">Note Tree</a>&nbsp;and select <em>Insert child note</em> and
- look for <em>Calendar</em>.</p>
+ href="#root/_help_oPVyFC7WL2Lp">Note Tree</a>&nbsp;and select <em>Insert child note</em> → <em>Collection</em> → <em>Calendar</em>.</p>
<h2>Creating a new event/note</h2>
<p>To create a new event:</p>
<ul>
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Geo Map.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Geo Map.html
index 7734cf3e23..b8897b0d4f 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Geo Map.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Geo Map.html
@@ -57,7 +57,7 @@
</ul>
<h2>Creating a new geo map</h2>
<p>Right click on an existing note in the&nbsp;<a class="reference-link"
- href="#root/_help_oPVyFC7WL2Lp">Note Tree</a>&nbsp;and select <em>Insert child note</em> → <em>Geo Map</em>.</p>
+ href="#root/_help_oPVyFC7WL2Lp">Note Tree</a>&nbsp;and select <em>Insert child note</em> → <em>Collection</em> → <em>Geo Map</em>.</p>
<p>By default the map will be empty and will show the entire world.</p>
<h2>Repositioning the map</h2>
<ul>
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Grid View.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Grid View.html
index aca126cffa..e19052b21f 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Grid View.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Grid View.html
@@ -28,7 +28,6 @@
it easy to navigate to children notes.</p>
<h3>Creating a new table</h3>
<p>Right click on an existing note in the&nbsp;<a class="reference-link"
- href="#root/_help_oPVyFC7WL2Lp">Note Tree</a>&nbsp;and select <em>Insert child note</em> and
- look for <em>Grid View</em>.</p>
+ href="#root/_help_oPVyFC7WL2Lp">Note Tree</a>&nbsp;and select <em>Insert child note</em> → <em>Collection</em> → <em>Grid View</em>.</p>
<h2>Configuration</h2>
<p>Unlike most other view types, the grid view is not actually configurable.</p>
\ No newline at end of file
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Kanban Board.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Kanban Board.html
index af22560043..ebb8807275 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Kanban Board.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Kanban Board.html
@@ -1,7 +1,7 @@
<p>The Board view lets you arrange subnotes as cards on a <a href="https://en.wikipedia.org/wiki/Kanban_board">Kanban board</a>.</p>
<h2>Creating a Kanban board</h2>
<p>Right-click an existing note in the&nbsp;<a class="reference-link" href="#root/_help_oPVyFC7WL2Lp">Note Tree</a>,
- select <strong>Insert child note</strong>, and look for <strong>Kanban Board</strong>.</p>
+ select <em>Insert child note</em> → <em>Collection</em> → <em>Kanban Board</em>.</p>
<h2>How it works</h2>
<p>When you first create a collection of the <em>Board</em> type, a few subnotes
are created, each with a <code>#status</code> label set. The board then groups
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/List View.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/List View.html
index 45d0a56719..efb1ff4b7d 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/List View.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/List View.html
@@ -12,8 +12,7 @@
as a single continuous document.</p>
<h3>Creating a new table</h3>
<p>Right click on an existing note in the&nbsp;<a class="reference-link"
- href="#root/_help_oPVyFC7WL2Lp">Note Tree</a>&nbsp;and select <em>Insert child note</em> and
- look for <em>List View</em>.</p>
+ href="#root/_help_oPVyFC7WL2Lp">Note Tree</a>&nbsp;and select <em>Insert child note</em> → <em>Collection</em> → <em>List View</em>.</p>
<h2>Interaction</h2>
<ul>
<li>Each note can be expanded or collapsed by clicking on the arrow to the
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Presentation.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Presentation.html
index a0db7eb0a3..12f87d14b5 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Presentation.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Presentation.html
@@ -6,8 +6,7 @@
within Trilium.</p>
<h3>Creating a new presentation</h3>
<p>Right click on an existing note in the&nbsp;<a class="reference-link"
- href="#root/_help_oPVyFC7WL2Lp">Note Tree</a>&nbsp;and select <em>Insert child note</em> and
- look for <em>Presentation</em>.</p>
+ href="#root/_help_oPVyFC7WL2Lp">Note Tree</a>&nbsp;and select <em>Insert child note</em> → <em>Collection</em> → <em>Presentation</em>.</p>
<h2>How it works</h2>
<ul>
<li>Each slide is a child note of the collection.</li>
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Table.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Table.html
index eba0da48e0..719c5e94ed 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Table.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Table.html
@@ -39,8 +39,7 @@
<h2>Interaction</h2>
<h3>Creating a new table</h3>
<p>Right click on an existing note in the&nbsp;<a class="reference-link"
- href="#root/_help_oPVyFC7WL2Lp">Note Tree</a>&nbsp;and select <em>Insert child note</em> and
- look for <em>Table</em>.</p>
+ href="#root/_help_oPVyFC7WL2Lp">Note Tree</a>&nbsp;and select <em>Insert child note</em> → <em>Collection</em> → <em>Table</em>.</p>
<h3>Adding columns</h3>
<p>Each column is a <a href="#root/_help_OFXdgB2nNk1F">promoted or unpromoted attribute</a> that
is defined on the Collection note.</p>
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/FAQ.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/FAQ.html
index bc10be8383..030236e1c1 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/FAQ.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/FAQ.html
@@ -28,11 +28,11 @@
href="#root/_help_0ESUbbAxVnoK">Note List</a>).</p>
<p>If you want the note to look like a folder, with no content of its own
and only its children shown, make it a collection instead: right-click
- in the tree, select <em>Collections</em>, then choose <a class="reference-link"
- href="#root/_help_8QqnMzx393bx">Grid View</a> or <a class="reference-link"
- href="#root/_help_mULW0Q3VojwY">List View</a>. See <a class="reference-link"
- href="#root/_help_GTwFsgaA0lCt">Collections</a> for the other views, such
- as tables, boards and calendars.</p>
+ in the tree, select <em>Insert child note</em> → <em>Collection</em>, then
+ choose <a class="reference-link" href="#root/_help_8QqnMzx393bx">Grid View</a> or <a
+ class="reference-link" href="#root/_help_mULW0Q3VojwY">List View</a>. See <a
+ class="reference-link" href="#root/_help_GTwFsgaA0lCt">Collections</a> for
+ the other views, such as tables, boards and calendars.</p>
<h2>macOS support</h2>
<p>Originally, Trilium Notes considered the macOS build unsupported. TriliumNext
commits to make the experience on macOS as good as possible.</p>
diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree/Note tree contextual menu.md b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree/Note tree contextual menu.md
index 4a7cef7d88..193b62384e 100644
--- a/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree/Note tree contextual menu.md
+++ b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree/Note tree contextual menu.md
@@ -24,6 +24,7 @@ The contextual menu can operate:
* Will focus the note tree on this note. See <a class="reference-link" href="../../Navigation/Note%20Hoisting.md">Note Hoisting</a> for more information.
* **Insert note after**
* Allows easy creation of a note with a specified [note type](../../../Note%20Types.md).
+ * <a class="reference-link" href="../../../Collections.md">Collections</a> are grouped in the _Collection_ submenu.
* <a class="reference-link" href="../../../Advanced%20Usage/Templates.md">Templates</a> will also be present (if any) at the end of the list.
* The note will be added on the same level of hierarchy as the note selected.
* **Insert child note**
diff --git a/docs/User Guide/User Guide/Collections.md b/docs/User Guide/User Guide/Collections.md
index 7ba12bef98..75d56743c7 100644
--- a/docs/User Guide/User Guide/Collections.md
+++ b/docs/User Guide/User Guide/Collections.md
@@ -22,7 +22,7 @@ Classic collections make use of pagination to support a large number of notes. T
## Creating a new collection
-To create a new collections, right click in the <a class="reference-link" href="Basic%20Concepts%20and%20Features/UI%20Elements/Note%20Tree.md">Note Tree</a> and look for the _Collections_ entry and select the desired type.
+To create a new collection, right-click a note in the <a class="reference-link" href="Basic%20Concepts%20and%20Features/UI%20Elements/Note%20Tree.md">Note Tree</a> and select _Insert child note_ → _Collection_ → the desired type.
By default, collections come with a default configuration and sometimes even sample notes. To create a collection completely from scratch:
diff --git a/docs/User Guide/User Guide/Collections/Calendar.md b/docs/User Guide/User Guide/Collections/Calendar.md
index 981c8c198e..9ebc2dec21 100644
--- a/docs/User Guide/User Guide/Collections/Calendar.md
+++ b/docs/User Guide/User Guide/Collections/Calendar.md
@@ -15,7 +15,7 @@ Unlike other Collection view types, the Calendar view also allows some kind of i
## Creating a calendar
-Right click on an existing note in the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Note%20Tree.md">Note Tree</a> and select _Insert child note_ and look for _Calendar_.
+Right click on an existing note in the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Note%20Tree.md">Note Tree</a> and select _Insert child note_ → _Collection_ → _Calendar_.
## Creating a new event/note
diff --git a/docs/User Guide/User Guide/Collections/Geo Map.md b/docs/User Guide/User Guide/Collections/Geo Map.md
index a781f472f1..9e1ff0da16 100644
--- a/docs/User Guide/User Guide/Collections/Geo Map.md
+++ b/docs/User Guide/User Guide/Collections/Geo Map.md
@@ -36,7 +36,7 @@ The button that shows your location is offered only when Trilium is reached over
## Creating a new geo map
-Right click on an existing note in the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Note%20Tree.md">Note Tree</a> and select _Insert child note_ → _Geo Map_.
+Right click on an existing note in the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Note%20Tree.md">Note Tree</a> and select _Insert child note_ → _Collection_ → _Geo Map_.
By default the map will be empty and will show the entire world.
diff --git a/docs/User Guide/User Guide/Collections/Grid View.md b/docs/User Guide/User Guide/Collections/Grid View.md
index 4b98b50454..f702a9482a 100644
--- a/docs/User Guide/User Guide/Collections/Grid View.md
+++ b/docs/User Guide/User Guide/Collections/Grid View.md
@@ -20,7 +20,7 @@ The grid view is also used by default in the <a class="reference-link" href="..
### Creating a new table
-Right click on an existing note in the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Note%20Tree.md">Note Tree</a> and select _Insert child note_ and look for _Grid View_.
+Right click on an existing note in the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Note%20Tree.md">Note Tree</a> and select _Insert child note_ → _Collection_ → _Grid View_.
## Configuration
diff --git a/docs/User Guide/User Guide/Collections/Kanban Board.md b/docs/User Guide/User Guide/Collections/Kanban Board.md
index 15dcd959a2..b21f0faf9d 100644
--- a/docs/User Guide/User Guide/Collections/Kanban Board.md
+++ b/docs/User Guide/User Guide/Collections/Kanban Board.md
@@ -3,7 +3,7 @@ The Board view lets you arrange subnotes as cards on a [Kanban board](https://en
## Creating a Kanban board
-Right-click an existing note in the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Note%20Tree.md">Note Tree</a>, select **Insert child note**, and look for **Kanban Board**.
+Right-click an existing note in the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Note%20Tree.md">Note Tree</a>, select _Insert child note_ → _Collection_ → _Kanban Board_.
## How it works
diff --git a/docs/User Guide/User Guide/Collections/List View.md b/docs/User Guide/User Guide/Collections/List View.md
index 900fc92c19..ec22a92204 100644
--- a/docs/User Guide/User Guide/Collections/List View.md
+++ b/docs/User Guide/User Guide/Collections/List View.md
@@ -7,7 +7,7 @@ In the example above, the "Node.js" note on the left panel contains several chil
### Creating a new table
-Right click on an existing note in the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Note%20Tree.md">Note Tree</a> and select _Insert child note_ and look for _List View_.
+Right click on an existing note in the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Note%20Tree.md">Note Tree</a> and select _Insert child note_ → _Collection_ → _List View_.
## Interaction
diff --git a/docs/User Guide/User Guide/Collections/Presentation.md b/docs/User Guide/User Guide/Collections/Presentation.md
index 97891a7826..baa6f5d7f1 100644
--- a/docs/User Guide/User Guide/Collections/Presentation.md
+++ b/docs/User Guide/User Guide/Collections/Presentation.md
@@ -5,7 +5,7 @@ The Presentation view allows the creation of slideshows directly from within Tri
### Creating a new presentation
-Right click on an existing note in the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Note%20Tree.md">Note Tree</a> and select _Insert child note_ and look for _Presentation_.
+Right click on an existing note in the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Note%20Tree.md">Note Tree</a> and select _Insert child note_ → _Collection_ → _Presentation_.
## How it works
diff --git a/docs/User Guide/User Guide/Collections/Table.md b/docs/User Guide/User Guide/Collections/Table.md
index 27b5a6e4fc..c05e0cf4a3 100644
--- a/docs/User Guide/User Guide/Collections/Table.md
+++ b/docs/User Guide/User Guide/Collections/Table.md
@@ -26,7 +26,7 @@ There are also a few predefined columns:
### Creating a new table
-Right click on an existing note in the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Note%20Tree.md">Note Tree</a> and select _Insert child note_ and look for _Table_.
+Right click on an existing note in the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Note%20Tree.md">Note Tree</a> and select _Insert child note_ → _Collection_ → _Table_.
### Adding columns
diff --git a/docs/User Guide/User Guide/FAQ.md b/docs/User Guide/User Guide/FAQ.md
index eebd97007c..0673b6a4fd 100644
--- a/docs/User Guide/User Guide/FAQ.md
+++ b/docs/User Guide/User Guide/FAQ.md
@@ -20,7 +20,7 @@ To organize notes into a folder:
The children of a note are listed at the end of its content (see <a class="reference-link" href="Basic%20Concepts%20and%20Features/Notes/Note%20List.md">Note List</a>).
-If you want the note to look like a folder, with no content of its own and only its children shown, make it a collection instead: right-click in the tree, select _Collections_, then choose <a class="reference-link" href="Collections/Grid%20View.md">Grid View</a> or <a class="reference-link" href="Collections/List%20View.md">List View</a>. See <a class="reference-link" href="Collections.md">Collections</a> for the other views, such as tables, boards and calendars.
+If you want the note to look like a folder, with no content of its own and only its children shown, make it a collection instead: right-click in the tree, select _Insert child note_ → _Collection_, then choose <a class="reference-link" href="Collections/Grid%20View.md">Grid View</a> or <a class="reference-link" href="Collections/List%20View.md">List View</a>. See <a class="reference-link" href="Collections.md">Collections</a> for the other views, such as tables, boards and calendars.
## macOS support