From 2387bbd17fcab34dfbc271223f0526663719d5ba Mon Sep 17 00:00:00 2001 From: SiriusXT <1160925501@qq.com> Date: Wed, 30 Oct 2024 22:30:40 +0800 Subject: [PATCH 1/5] Automatically trigger autocomplete on focus. --- src/public/app/widgets/type_widgets/empty.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/public/app/widgets/type_widgets/empty.js b/src/public/app/widgets/type_widgets/empty.js index fba2a1f7f..0a7119b80 100644 --- a/src/public/app/widgets/type_widgets/empty.js +++ b/src/public/app/widgets/type_widgets/empty.js @@ -84,6 +84,13 @@ export default class EmptyTypeWidget extends TypeWidget { ); } + // Automatically trigger autocomplete on focus. + this.$autoComplete.on('focus', () => { + // simulate pressing down arrow to trigger autocomplete + this.$autoComplete.trigger($.Event('keydown', { which: 40 })); // arrow down + this.$autoComplete.trigger($.Event('keydown', { which: 38 })); // arrow up + }); + this.$autoComplete .trigger('focus') .trigger('select'); From dbca50d9b0d74650c94481b86ff2c514e08d6fe7 Mon Sep 17 00:00:00 2001 From: SiriusXT <1160925501@qq.com> Date: Fri, 1 Nov 2024 14:45:49 +0800 Subject: [PATCH 2/5] Make note-detail-empty always display autocompletion. --- src/public/app/widgets/type_widgets/empty.js | 22 ++++++++------------ 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/public/app/widgets/type_widgets/empty.js b/src/public/app/widgets/type_widgets/empty.js index 0a7119b80..45da73e6e 100644 --- a/src/public/app/widgets/type_widgets/empty.js +++ b/src/public/app/widgets/type_widgets/empty.js @@ -18,10 +18,9 @@ const TPL = ` width: 130px; text-align: center; margin: 10px; - padding; 10px; border: 1px transparent solid; } - + .workspace-notes .workspace-note:hover { cursor: pointer; border: 1px solid var(--main-border-color); @@ -33,14 +32,14 @@ const TPL = ` } +
-
+
- -
+
`; export default class EmptyTypeWidget extends TypeWidget { @@ -51,10 +50,12 @@ export default class EmptyTypeWidget extends TypeWidget { this.$widget = $(TPL); this.$autoComplete = this.$widget.find(".note-autocomplete"); + this.$results = this.$widget.find(".note-detail-empty-results"); noteAutocompleteService.initNoteAutocomplete(this.$autoComplete, { hideGoToSelectedNoteButton: true, - allowCreatingNotes: true + allowCreatingNotes: true, + container: this.$results }) .on('autocomplete:noteselected', function(event, suggestion, dataset) { if (!suggestion.notePath) { @@ -84,15 +85,10 @@ export default class EmptyTypeWidget extends TypeWidget { ); } - // Automatically trigger autocomplete on focus. - this.$autoComplete.on('focus', () => { - // simulate pressing down arrow to trigger autocomplete - this.$autoComplete.trigger($.Event('keydown', { which: 40 })); // arrow down - this.$autoComplete.trigger($.Event('keydown', { which: 38 })); // arrow up - }); - this.$autoComplete .trigger('focus') .trigger('select'); + + noteAutocompleteService.showRecentNotes(this.$autoComplete); } } From cdd5a17fcede0428572b4b2f4f17666ccc12ebd4 Mon Sep 17 00:00:00 2001 From: SiriusXT <1160925501@qq.com> Date: Fri, 1 Nov 2024 15:30:31 +0800 Subject: [PATCH 3/5] Make note-detail-empty always display autocompletion. --- src/public/app/widgets/type_widgets/empty.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/public/app/widgets/type_widgets/empty.js b/src/public/app/widgets/type_widgets/empty.js index 45da73e6e..7576d09df 100644 --- a/src/public/app/widgets/type_widgets/empty.js +++ b/src/public/app/widgets/type_widgets/empty.js @@ -67,6 +67,7 @@ export default class EmptyTypeWidget extends TypeWidget { this.$workspaceNotes = this.$widget.find('.workspace-notes'); + noteAutocompleteService.showRecentNotes(this.$autoComplete); super.doRender(); } @@ -88,7 +89,5 @@ export default class EmptyTypeWidget extends TypeWidget { this.$autoComplete .trigger('focus') .trigger('select'); - - noteAutocompleteService.showRecentNotes(this.$autoComplete); } } From aa7d7b3afd3f3f5873a28eb28f2154d6efc7e41c Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Fri, 1 Nov 2024 20:20:53 +0200 Subject: [PATCH 4/5] client: Add borders to empty tab search list --- src/public/app/widgets/type_widgets/empty.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/public/app/widgets/type_widgets/empty.js b/src/public/app/widgets/type_widgets/empty.js index 7576d09df..8d04ab5b9 100644 --- a/src/public/app/widgets/type_widgets/empty.js +++ b/src/public/app/widgets/type_widgets/empty.js @@ -25,6 +25,21 @@ const TPL = ` cursor: pointer; border: 1px solid var(--main-border-color); } + + .note-detail-empty-results { + max-height: 50vh; + overflow: scroll; + border: var(--bs-border-width) solid var(--bs-border-color); + border-top: 0; + } + + .empty-tab-search .note-autocomplete-input { + border-bottom-left-radius: 0; + } + + .empty-tab-search .input-clearer-button { + border-bottom-right-radius: 0; + } .workspace-icon { text-align: center; @@ -33,7 +48,7 @@ const TPL = `
-
+
From bbaed45f6be2eee7fbcf650735f97c445fab34f8 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Fri, 1 Nov 2024 20:23:46 +0200 Subject: [PATCH 5/5] client: Fix scrolling in empty tab search list after constraining height --- src/public/app/widgets/type_widgets/empty.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/public/app/widgets/type_widgets/empty.js b/src/public/app/widgets/type_widgets/empty.js index 8d04ab5b9..38418d398 100644 --- a/src/public/app/widgets/type_widgets/empty.js +++ b/src/public/app/widgets/type_widgets/empty.js @@ -26,7 +26,7 @@ const TPL = ` border: 1px solid var(--main-border-color); } - .note-detail-empty-results { + .note-detail-empty-results .aa-dropdown-menu { max-height: 50vh; overflow: scroll; border: var(--bs-border-width) solid var(--bs-border-color);