zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-02-28 09:04:21 +08:00
Code Issues Projects Releases Packages Wiki Activity

quick search impl finished

Browse source
This commit is contained in:
zadam 2021-02-01 23:51:04 +01:00
parent d406df48a8
commit 3a94b04ef4
7 changed files with 57 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
db/migrations/0180__rename_quickSearch_shortcut.sql Normal file
View file

@ -0,0 +1,2 @@
UPDATE options SET name = 'keyboardShortcutsQuickSearch' WHERE name = 'keyboardShortcutsSearchNotes';
UPDATE entity_changes SET entityId = 'keyboardShortcutsQuickSearch' WHERE entityId = 'keyboardShortcutsSearchNotes' AND entityName = 'options';

2
src/public/app/services/date_notes.js
View file

@ -48,7 +48,7 @@ async function createSearchNote(opts = {}) {
const attrsToUpdate = [
opts.ancestorNoteId ? { type: 'relation', name: 'ancestor', value: opts.ancestorNoteId } : undefined,
{ type: 'label', name: 'searchString', value: opts.searchStringe }
{ type: 'label', name: 'searchString', value: opts.searchString }
].filter(attr => !!attr);
if (attrsToUpdate.length > 0) {

2
src/public/app/services/frontend_script_api.js
View file

@ -89,7 +89,7 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, $contain
this.addButtonToToolbar = opts => {
const buttonId = "toolbar-button-" + opts.title.replace(/\s/g, "-");
const button = $('<button>')
const button = $('<button class="noborder">')
.addClass("btn btn-sm")
.on('click', opts.action);

57
src/public/app/widgets/quick_search.js
View file

@ -1,8 +1,10 @@
import BasicWidget from "./basic_widget.js";
import server from "../services/server.js";
import linkService from "../services/link.js";
import dateNotesService from "../services/date_notes.js";
import treeCache from "../services/tree_cache.js";
import utils from "../services/utils.js";
import appContext from "../services/app_context.js";
const TPL = `
<div class="quick-search input-group input-group-sm" style="width: 250px;">
@ -18,7 +20,7 @@ const TPL = `
overflow-y: auto;
overflow-x: hidden;
text-overflow: ellipsis;
box-shadow: 10px 10px 93px -25px black;
box-shadow: -30px 50px 93px -50px black;
}
</style>
@ -27,18 +29,12 @@ const TPL = `
<button class="btn btn-outline-secondary search-button" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="bx bx-search"></span>
</button>
<div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" href="#">Action</a>
<a class="dropdown-item" href="#">Another action</a>
<a class="dropdown-item" href="#">Something else here</a>
<div role="separator" class="dropdown-divider"></div>
<a class="dropdown-item" href="#">Separated link</a>
</div>
<div class="dropdown-menu dropdown-menu-right"></div>
</div>
</div>
</div>`;
const MAX_DISPLAYED_NOTES = 20;
const MAX_DISPLAYED_NOTES = 15;
export default class QuickSearchWidget extends BasicWidget {
doRender() {
@ -48,8 +44,9 @@ export default class QuickSearchWidget extends BasicWidget {
this.$searchString = this.$widget.find('.search-string');
this.$dropdownMenu = this.$widget.find('.dropdown-menu');
this.$dropdownToggle = this.$widget.find('.search-button');
this.$dropdownToggle.dropdown();
this.$widget.find('.input-group-append').on('show.bs.dropdown', () => this.search());
this.$widget.find('.input-group-append').on('shown.bs.dropdown', () => this.search());
utils.bindElShortcut(this.$searchString, 'return', () => {
this.$dropdownToggle.dropdown('show');
@ -57,21 +54,30 @@ export default class QuickSearchWidget extends BasicWidget {
this.$searchString.focus();
});
utils.bindElShortcut(this.$searchString, 'down', () => {
this.$dropdownMenu.find('.dropdown-item:first').focus();
});
return this.$widget;
}
async search() {
const searchString = this.$searchString.val().trim();
if (!searchString) {
this.$dropdownToggle.dropdown("hide");
return;
}
this.$dropdownMenu.empty();
this.$dropdownMenu.append('<span class="dropdown-item disabled"><span class="bx bx-loader bx-spin"></span> Searching ...</span>');
const resultNoteIds = await server.get('quick-search/' + encodeURIComponent(this.$searchString.val()));
const resultNoteIds = await server.get('quick-search/' + encodeURIComponent(searchString));
const displayedNoteIds = resultNoteIds.slice(0, Math.min(MAX_DISPLAYED_NOTES, resultNoteIds.length));
this.$dropdownMenu.empty();
this.$dropdownMenu.append('<div class="dropdown-item"><button class="btn btn-sm">Show in full search</button></div>');
if (displayedNoteIds.length === 0) {
this.$dropdownMenu.append('<span class="dropdown-item disabled">No results found</span>');
}
@ -79,6 +85,14 @@ export default class QuickSearchWidget extends BasicWidget {
for (const note of await treeCache.getNotes(displayedNoteIds)) {
const $link = await linkService.createNoteLink(note.noteId, {showNotePath: true});
$link.addClass('dropdown-item');
$link.attr("tabIndex", "0");
$link.on('click', () => this.$dropdownToggle.dropdown("hide"));
utils.bindElShortcut($link, 'return', () => {
$link.find('a').trigger({
type: 'click',
which: 1 // left click
});
});
this.$dropdownMenu.append($link);
}
@ -87,6 +101,23 @@ export default class QuickSearchWidget extends BasicWidget {
this.$dropdownMenu.append(`<span class="dropdown-item disabled">... and ${resultNoteIds.length - MAX_DISPLAYED_NOTES} more results.</span>`);
}
const $showInFullButton = $('<a class="dropdown-item" tabindex="0">')
.append($('<button class="btn btn-sm">Show in full search</button>'));
this.$dropdownMenu.append($showInFullButton);
utils.bindElShortcut($showInFullButton, 'return', async () => {
const searchNote = await dateNotesService.createSearchNote({searchString: this.$searchString.val()});
await appContext.tabManager.getActiveTabContext().setNote(searchNote.noteId);
});
utils.bindElShortcut(this.$dropdownMenu.find('.dropdown-item:first'), 'up', () => this.$searchString.focus());
this.$dropdownToggle.dropdown('update');
}
quickSearchEvent() {
this.$searchString.focus();
}
}

14
src/public/app/widgets/standard_top_widget.js
View file

@ -14,7 +14,7 @@ const TPL = `
height: 35px;
}
.standard-top-widget button:not(.search-button) {
.standard-top-widget button.noborder {
padding: 1px 5px 1px 5px;
font-size: 90%;
margin-bottom: 2px;
@ -35,35 +35,35 @@ const TPL = `
</style>
<div style="flex-grow: 100; display: flex;">
<button class="btn btn-sm" data-trigger-command="createNoteIntoInbox">
<button class="btn btn-sm noborder" data-trigger-command="createNoteIntoInbox">
<span class="bx bx-file-blank"></span>
New note
</button>
<button class="btn btn-sm" data-trigger-command="searchNotes">
<button class="btn btn-sm noborder" data-trigger-command="searchNotes">
<span class="bx bx-search"></span>
Search
</button>
<button class="btn btn-sm" data-trigger-command="jumpToNote">
<button class="btn btn-sm noborder" data-trigger-command="jumpToNote">
<span class="bx bx-send"></span>
Jump to note
</button>
<button class="btn btn-sm" data-trigger-command="showRecentChanges">
<button class="btn btn-sm noborder" data-trigger-command="showRecentChanges">
<span class="bx bx-history"></span>
Recent changes
</button>
<button class="btn btn-sm enter-protected-session-button"
<button class="btn btn-sm enter-protected-session-button noborder"
title="Enter protected session to be able to find and view protected notes">
<span class="bx bx-log-in"></span>
Enter protected session
</button>
<button class="btn btn-sm leave-protected-session-button"
<button class="btn btn-sm leave-protected-session-button noborder"
title="Leave protected session so that protected notes are not accessible any more."
style="display: none;">
<span class="bx bx-log-out"></span>

2
src/services/app_info.js
View file

@ -4,7 +4,7 @@ const build = require('./build');
const packageJson = require('../../package');
const {TRILIUM_DATA_DIR} = require('./data_dir');
const APP_DB_VERSION = 179;
const APP_DB_VERSION = 180;
const SYNC_VERSION = 19;
const CLIPPER_PROTOCOL_VERSION = "1.0";

2
src/services/keyboard_actions.js
View file

@ -35,7 +35,7 @@ const DEFAULT_KEYBOARD_ACTIONS = [
scope: "window"
},
{
actionName: "searchNotes",
actionName: "quickSearch",
defaultShortcuts: ["CommandOrControl+S"],
scope: "window"
},