diff --git a/package-lock.json b/package-lock.json
index e0cc91b56..67ee1b50a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3057,9 +3057,9 @@
"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
},
"ejs": {
- "version": "3.1.3",
- "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.3.tgz",
- "integrity": "sha512-wmtrUGyfSC23GC/B1SMv2ogAUgbQEtDmTIhfqielrG5ExIM9TP4UoYdi90jLF1aTcsWCJNEO0UrgKzP0y3nTSg==",
+ "version": "3.1.5",
+ "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.5.tgz",
+ "integrity": "sha512-dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==",
"requires": {
"jake": "^10.6.1"
}
@@ -5268,41 +5268,10 @@
"minimatch": "^3.0.4"
},
"dependencies": {
- "ansi-styles": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
- "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "requires": {
- "color-convert": "^1.9.0"
- }
- },
"async": {
"version": "0.9.2",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
"integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0="
- },
- "chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "requires": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- }
- },
- "has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
- },
- "supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "requires": {
- "has-flag": "^3.0.0"
- }
}
}
},
diff --git a/package.json b/package.json
index ae668b3ab..c79bf5311 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
"csurf": "1.11.0",
"dayjs": "1.8.33",
"debug": "4.1.1",
- "ejs": "3.1.3",
+ "ejs": "3.1.5",
"electron-debug": "3.1.0",
"electron-dl": "3.0.2",
"electron-find": "1.0.6",
diff --git a/src/public/app/entities/note_complement.js b/src/public/app/entities/note_complement.js
index ab4049ab8..5257c9d9a 100644
--- a/src/public/app/entities/note_complement.js
+++ b/src/public/app/entities/note_complement.js
@@ -26,6 +26,8 @@ class NoteComplement {
/** @param {string} */
this.utcDateModified = row.utcDateModified;
+ // "combined" date modified give larger out of note's and note_content's dateModified
+
/** @param {string} */
this.combinedDateModified = row.combinedDateModified;
diff --git a/src/public/app/services/tab_context.js b/src/public/app/services/tab_context.js
index 920a186f3..17ade9aae 100644
--- a/src/public/app/services/tab_context.js
+++ b/src/public/app/services/tab_context.js
@@ -85,6 +85,11 @@ class TabContext extends Component {
return treeCache.notes[this.noteId];
}
+ /** @property {string[]} */
+ get notePathArray() {
+ return this.notePath ? this.notePath.split('/') : [];
+ }
+
/** @return {NoteComplement} */
async getNoteComplement() {
if (!this.noteId) {
diff --git a/src/public/app/services/tree_context_menu.js b/src/public/app/services/tree_context_menu.js
index 002956ebd..65dd8f924 100644
--- a/src/public/app/services/tree_context_menu.js
+++ b/src/public/app/services/tree_context_menu.js
@@ -16,7 +16,7 @@ class TreeContextMenu {
this.treeWidget = treeWidget;
this.node = node;
}
-
+
async show(e) {
contextMenu.show({
x: e.pageX,
@@ -111,7 +111,14 @@ class TreeContextMenu {
const notePath = treeService.getNotePath(this.node);
if (command === 'openInTab') {
- appContext.tabManager.openTabWithNote(notePath);
+
+ const start = Date.now();
+
+ await this.node.load(true);
+
+ console.log("Reload took", Date.now() - start, "ms");
+
+// appContext.tabManager.openTabWithNote(notePath);
}
else if (command === "insertNoteAfter") {
const parentNoteId = this.node.data.parentNoteId;
@@ -136,4 +143,4 @@ class TreeContextMenu {
}
}
-export default TreeContextMenu;
\ No newline at end of file
+export default TreeContextMenu;
diff --git a/src/public/app/widgets/attribute_detail.js b/src/public/app/widgets/attribute_detail.js
index 81a9dc0ab..31efef0a8 100644
--- a/src/public/app/widgets/attribute_detail.js
+++ b/src/public/app/widgets/attribute_detail.js
@@ -63,7 +63,7 @@ const TPL = `
-
+
| Name: |
|
@@ -159,15 +159,15 @@ const ATTR_TITLES = {
};
export default class AttributeDetailWidget extends TabAwareWidget {
- isEnabled() {
+ async refresh() {
// this widget is not activated in a standard way
- return false;
}
doRender() {
this.relatedNotesSpacedUpdate = new SpacedUpdate(async () => this.updateRelatedNotes(), 1000);
this.$widget = $(TPL);
+ this.contentSized();
this.$title = this.$widget.find('.attr-detail-title');
@@ -280,7 +280,7 @@ export default class AttributeDetailWidget extends TabAwareWidget {
return;
}
-
+console.log("RENDERING");
this.attrType = this.getAttrType(attribute);
const attrName =
@@ -373,6 +373,8 @@ export default class AttributeDetailWidget extends TabAwareWidget {
this.$widget.outerHeight() + y > $(window).height() - 50
? $(window).height() - y - 50
: 10000);
+
+ console.log("RENDERING DONE");
}
async updateRelatedNotes() {
diff --git a/src/public/app/widgets/attribute_list.js b/src/public/app/widgets/attribute_list.js
index ca1e453ef..bf88a2560 100644
--- a/src/public/app/widgets/attribute_list.js
+++ b/src/public/app/widgets/attribute_list.js
@@ -116,7 +116,7 @@ export default class AttributeListWidget extends TabAwareWidget {
doRender() {
this.$widget = $(TPL);
- this.contentSized();
+ this.overflowing();
this.$promotedExpander = this.$widget.find('.attr-promoted-expander');
this.$allAttrWrapper = this.$widget.find('.all-attr-wrapper');
diff --git a/src/public/app/widgets/basic_widget.js b/src/public/app/widgets/basic_widget.js
index 39e76b02b..6905526b7 100644
--- a/src/public/app/widgets/basic_widget.js
+++ b/src/public/app/widgets/basic_widget.js
@@ -30,6 +30,11 @@ class BasicWidget extends Component {
return this;
}
+ overflowing() {
+ this.css('contain', 'none');
+ return this;
+ }
+
collapsible() {
this.css('min-height', '0');
return this;
diff --git a/src/public/app/widgets/note_actions.js b/src/public/app/widgets/note_actions.js
index 08c596660..d9b6b0017 100644
--- a/src/public/app/widgets/note_actions.js
+++ b/src/public/app/widgets/note_actions.js
@@ -93,7 +93,7 @@ const TPL = `
export default class NoteActionsWidget extends TabAwareWidget {
doRender() {
this.$widget = $(TPL);
- this.contentSized();
+ this.overflowing();
this.$showSourceButton = this.$widget.find('.show-source-button');
diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js
index 347351fbb..ae2cf1da1 100644
--- a/src/public/app/widgets/note_tree.js
+++ b/src/public/app/widgets/note_tree.js
@@ -312,6 +312,8 @@ export default class NoteTreeWidget extends TabAwareWidget {
scrollParent: this.$tree,
minExpandLevel: 2, // root can't be collapsed
click: (event, data) => {
+ this.activityDetected();
+
const targetType = data.targetType;
const node = data.node;
@@ -911,6 +913,8 @@ export default class NoteTreeWidget extends TabAwareWidget {
async refresh() {
this.toggleInt(this.isEnabled());
+ this.activityDetected();
+
const oldActiveNode = this.getActiveNode();
let oldActiveNodeFocused = false;
@@ -956,7 +960,44 @@ export default class NoteTreeWidget extends TabAwareWidget {
}
}
+ activityDetected() {
+ if (this.autoCollapseTimeoutId) {
+ clearTimeout(this.autoCollapseTimeoutId);
+ }
+
+ this.autoCollapseTimeoutId = setTimeout(() => {
+ /*
+ * We're collapsing notes after period of inactivity to "cleanup" the tree - users rarely
+ * collapse the notes and the tree becomes unusuably large.
+ * Some context: https://github.com/zadam/trilium/issues/1192
+ */
+
+ const noteIdsToKeepExpanded = new Set(
+ appContext.tabManager.getTabContexts()
+ .map(tc => tc.notePathArray)
+ .flat()
+ );
+
+ let noneCollapsedYet = true;
+
+ this.tree.getRootNode().visit(node => {
+ if (node.isExpanded() && !noteIdsToKeepExpanded.has(node.data.noteId)) {
+ node.setExpanded(false);
+
+ if (noneCollapsedYet) {
+ toastService.showMessage("Auto collapsing notes after inactivity...");
+ noneCollapsedYet = false;
+ }
+
+ console.log("Auto collapsed", node.data.noteId);
+ }
+ }, false);
+ }, 600 * 1000);
+ }
+
async entitiesReloadedEvent({loadResults}) {
+ this.activityDetected();
+
if (loadResults.isEmptyForTree()) {
return;
}
diff --git a/src/public/app/widgets/note_type.js b/src/public/app/widgets/note_type.js
index 0fe435119..78347bcd5 100644
--- a/src/public/app/widgets/note_type.js
+++ b/src/public/app/widgets/note_type.js
@@ -34,7 +34,7 @@ const TPL = `
export default class NoteTypeWidget extends TabAwareWidget {
doRender() {
this.$widget = $(TPL);
- this.contentSized();
+ this.overflowing();
this.$widget.on('show.bs.dropdown', () => this.renderDropdown());
diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css
index 170352578..2b060f344 100644
--- a/src/public/stylesheets/style.css
+++ b/src/public/stylesheets/style.css
@@ -825,3 +825,7 @@ body {
.ck.ck-mentions > .ck-list__item {
max-width: 600px;
}
+
+ul.fancytree-container li {
+ contain: layout paint;
+}
diff --git a/src/views/desktop.ejs b/src/views/desktop.ejs
index 528c24f20..4422e2670 100644
--- a/src/views/desktop.ejs
+++ b/src/views/desktop.ejs
@@ -66,7 +66,7 @@
-
+