joplin-plugin-explorer 1.0.2 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "joplin-plugin-explorer",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "description": "A unified sidebar that displays notebooks and notes together in a single tree view",
   "author": "lim0513",
   "homepage": "https://github.com/lim0513/joplin-explorer",

package/publish/index.js

@@ -5,7 +5,9 @@ var i18nData = {
   'zh_CN': {
     newNotebook: '新建笔记本', newNote: '新建笔记', newTodo: '新建待办',
     sort: '排序', collapseAll: '全部折叠', expandAll: '全部展开',
-    search: '搜索...', sync: '同步', syncing: '同步中...', syncDone: '\u2714 同步完成', loading: '加载中...',
+    search: '搜索笔记内容...', searchResultCount: '找到 {count} 条结果',
+    searchNoResult: '没有找到匹配的笔记', searching: '搜索中...',
+    sync: '同步', syncing: '同步中...', syncDone: '\u2714 同步完成', loading: '加载中...',
     sortUpdatedDesc: '\u2193 修改时间', sortUpdatedAsc: '\u2191 修改时间',
     sortTitleAsc: '\u2191 标题', sortTitleDesc: '\u2193 标题',
     // Folder context menu
@@ -27,7 +29,9 @@ var i18nData = {
   'zh_TW': {
     newNotebook: '新建筆記本', newNote: '新建筆記', newTodo: '新建待辦',
     sort: '排序', collapseAll: '全部摺疊', expandAll: '全部展開',
-    search: '搜尋...', sync: '同步', syncing: '同步中...', syncDone: '\u2714 同步完成', loading: '載入中...',
+    search: '搜尋筆記內容...', searchResultCount: '找到 {count} 條結果',
+    searchNoResult: '沒有找到匹配的筆記', searching: '搜尋中...',
+    sync: '同步', syncing: '同步中...', syncDone: '\u2714 同步完成', loading: '載入中...',
     sortUpdatedDesc: '\u2193 修改時間', sortUpdatedAsc: '\u2191 修改時間',
     sortTitleAsc: '\u2191 標題', sortTitleDesc: '\u2193 標題',
     ctxNewNoteHere: '在此新建筆記', ctxNewTodoHere: '在此新建待辦',
@@ -45,7 +49,9 @@ var i18nData = {
   'en_US': {
     newNotebook: 'New Notebook', newNote: 'New Note', newTodo: 'New To-do',
     sort: 'Sort', collapseAll: 'Collapse All', expandAll: 'Expand All',
-    search: 'Search...', sync: 'Synchronise', syncing: 'Syncing...', syncDone: '\u2714 Sync Done', loading: 'Loading...',
+    search: 'Search note contents...', searchResultCount: '{count} results found',
+    searchNoResult: 'No matching notes found', searching: 'Searching...',
+    sync: 'Synchronise', syncing: 'Syncing...', syncDone: '\u2714 Sync Done', loading: 'Loading...',
     sortUpdatedDesc: '\u2193 Updated', sortUpdatedAsc: '\u2191 Updated',
     sortTitleAsc: '\u2191 Title', sortTitleDesc: '\u2193 Title',
     ctxNewNoteHere: 'New Note Here', ctxNewTodoHere: 'New To-do Here',
@@ -60,6 +66,26 @@ var i18nData = {
     confirmDeleteNote: 'Delete this note?',
     promptRename: 'Enter new name:', promptMoveNote: 'Enter target notebook name:',
   },
+  'ja_JP': {
+    newNotebook: '\u65B0\u898F\u30CE\u30FC\u30C8\u30D6\u30C3\u30AF', newNote: '\u65B0\u898F\u30CE\u30FC\u30C8', newTodo: '\u65B0\u898F\u30BF\u30B9\u30AF',
+    sort: '\u4E26\u3079\u66FF\u3048', collapseAll: '\u3059\u3079\u3066\u6298\u308A\u305F\u305F\u3080', expandAll: '\u3059\u3079\u3066\u5C55\u958B',
+    search: '\u30CE\u30FC\u30C8\u5185\u5BB9\u3092\u691C\u7D22...', searchResultCount: '{count} \u4EF6\u306E\u7D50\u679C',
+    searchNoResult: '\u4E00\u81F4\u3059\u308B\u30CE\u30FC\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093', searching: '\u691C\u7D22\u4E2D...',
+    sync: '\u540C\u671F', syncing: '\u540C\u671F\u4E2D...', syncDone: '\u2714 \u540C\u671F\u5B8C\u4E86', loading: '\u8AAD\u307F\u8FBC\u307F\u4E2D...',
+    sortUpdatedDesc: '\u2193 \u66F4\u65B0\u65E5\u6642', sortUpdatedAsc: '\u2191 \u66F4\u65B0\u65E5\u6642',
+    sortTitleAsc: '\u2191 \u30BF\u30A4\u30C8\u30EB', sortTitleDesc: '\u2193 \u30BF\u30A4\u30C8\u30EB',
+    ctxNewNoteHere: '\u3053\u3053\u306B\u65B0\u898F\u30CE\u30FC\u30C8', ctxNewTodoHere: '\u3053\u3053\u306B\u65B0\u898F\u30BF\u30B9\u30AF',
+    ctxNewSubNotebook: '\u65B0\u898F\u30B5\u30D6\u30CE\u30FC\u30C8\u30D6\u30C3\u30AF', ctxRenameFolder: '\u540D\u524D\u3092\u5909\u66F4',
+    ctxExportFolder: '\u30CE\u30FC\u30C8\u30D6\u30C3\u30AF\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8', ctxDeleteFolder: '\u30CE\u30FC\u30C8\u30D6\u30C3\u30AF\u3092\u524A\u9664',
+    ctxOpenNote: '\u30CE\u30FC\u30C8\u3092\u958B\u304F', ctxOpenInNewWindow: '\u65B0\u3057\u3044\u30A6\u30A3\u30F3\u30C9\u30A6\u3067\u958B\u304F',
+    ctxCopyLink: 'Markdown\u30EA\u30F3\u30AF\u3092\u30B3\u30D4\u30FC', ctxDuplicateNote: '\u8907\u88FD',
+    ctxSwitchNoteType: '\u30CE\u30FC\u30C8/\u30BF\u30B9\u30AF\u5207\u308A\u66FF\u3048', ctxToggleTodo: '\u5B8C\u4E86\u72B6\u614B\u3092\u5207\u308A\u66FF\u3048',
+    ctxRenameNote: '\u540D\u524D\u3092\u5909\u66F4', ctxMoveNote: '\u30CE\u30FC\u30C8\u30D6\u30C3\u30AF\u306B\u79FB\u52D5...',
+    ctxNoteInfo: '\u30CE\u30FC\u30C8\u30D7\u30ED\u30D1\u30C6\u30A3', ctxDeleteNote: '\u30CE\u30FC\u30C8\u3092\u524A\u9664',
+    confirmDeleteFolder: '\u3053\u306E\u30CE\u30FC\u30C8\u30D6\u30C3\u30AF\u3068\u305D\u306E\u5185\u5BB9\u3092\u3059\u3079\u3066\u524A\u9664\u3057\u307E\u3059\u304B\uFF1F',
+    confirmDeleteNote: '\u3053\u306E\u30CE\u30FC\u30C8\u3092\u524A\u9664\u3057\u307E\u3059\u304B\uFF1F',
+    promptRename: '\u65B0\u3057\u3044\u540D\u524D\u3092\u5165\u529B\uFF1A', promptMoveNote: '\u79FB\u52D5\u5148\u306E\u30CE\u30FC\u30C8\u30D6\u30C3\u30AF\u540D\uFF1A',
+  },
 };
 
 function getI18n(locale) {
@@ -302,6 +328,7 @@ joplin.plugins.register({
           + '    <input id="search-input" type="text" placeholder="\uD83D\uDD0D ' + t.search + '" />'
           + '  </div>'
           + '  <div id="tree-container">' + treeHtml + '</div>'
+          + '  <div id="search-results" style="display:none;"></div>'
           + '  <div class="bottom-bar">'
           + '    <button id="btn-sync" title="' + t.sync + '">\uD83D\uDD04 ' + t.sync + '</button>'
           + '  </div>'
@@ -340,6 +367,62 @@ joplin.plugins.register({
       } else if (msg.name === 'newTodo') {
         await joplin.commands.execute('newTodo');
         await refreshPanel();
+      } else if (msg.name === 'search') {
+        var query = msg.query;
+        if (!query || !query.trim()) {
+          // Empty query: tell webview to clear search results
+          await joplin.views.panels.postMessage(panel, { name: 'searchResults', results: null, query: '', searchId: msg.searchId });
+          return;
+        }
+        try {
+          var searchResults = [];
+          var page = 1;
+          var hasMore = true;
+          while (hasMore && searchResults.length < 100) {
+            var result = await joplin.data.get(['search'], {
+              query: query,
+              fields: ['id', 'title', 'body', 'parent_id', 'is_todo', 'todo_completed'],
+              page: page, limit: 20,
+            });
+            searchResults = searchResults.concat(result.items);
+            hasMore = result.has_more;
+            page++;
+          }
+          // Build folder name lookup
+          var folderNameMap = {};
+          for (var i = 0; i < allFoldersCache.length; i++) {
+            folderNameMap[allFoldersCache[i].id] = allFoldersCache[i].title;
+          }
+          // Extract snippet around the matched keyword
+          var items = [];
+          for (var i = 0; i < searchResults.length; i++) {
+            var note = searchResults[i];
+            var snippet = '';
+            var body = note.body || '';
+            var lowerBody = body.toLowerCase();
+            var lowerQuery = query.toLowerCase();
+            var matchIdx = lowerBody.indexOf(lowerQuery);
+            if (matchIdx >= 0) {
+              var start = Math.max(0, matchIdx - 40);
+              var end = Math.min(body.length, matchIdx + lowerQuery.length + 80);
+              snippet = (start > 0 ? '...' : '') + body.substring(start, end).replace(/\n/g, ' ') + (end < body.length ? '...' : '');
+            } else {
+              // Title match - show beginning of body
+              snippet = body.substring(0, 120).replace(/\n/g, ' ') + (body.length > 120 ? '...' : '');
+            }
+            items.push({
+              id: note.id,
+              title: note.title || '(untitled)',
+              is_todo: note.is_todo,
+              todo_completed: note.todo_completed,
+              snippet: snippet,
+              folderName: folderNameMap[note.parent_id] || '',
+            });
+          }
+          await joplin.views.panels.postMessage(panel, { name: 'searchResults', results: items, query: query, searchId: msg.searchId });
+        } catch (err) {
+          console.error('Joplin Explorer: search error', err);
+        }
       } else if (msg.name === 'cycleSort') {
         var sortModes = ['updated_desc', 'updated_asc', 'title_asc', 'title_desc'];
         var idx = sortModes.indexOf(currentSort);

package/publish/manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 1,
   "id": "com.github.joplin-explorer",
   "app_min_version": "2.6.0",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "name": "Joplin Explorer",
   "description": "A unified sidebar that displays notebooks and notes together in a single tree view",
   "author": "user",

package/publish/webview/panel.css

@@ -273,3 +273,83 @@ html, body {
 .tree-item.drop-below {
   box-shadow: 0 2px 0 0 var(--joplin-color2, #4a9cf5);
 }
+
+#search-results {
+  flex: 1;
+  overflow-y: scroll;
+  padding: 4px 0;
+}
+
+#search-results::-webkit-scrollbar {
+  width: 8px;
+}
+
+#search-results::-webkit-scrollbar-track {
+  background: transparent;
+}
+
+#search-results::-webkit-scrollbar-thumb {
+  background: var(--joplin-color-faded, #888);
+  border-radius: 4px;
+}
+
+/* Search results */
+.search-status {
+  padding: 8px 12px;
+  font-size: 11px;
+  color: var(--joplin-color-faded, #888);
+  border-bottom: 1px solid var(--joplin-divider-color, #eee);
+}
+
+.search-result-item {
+  display: flex;
+  align-items: flex-start;
+  padding: 8px 10px;
+  gap: 8px;
+  min-height: auto;
+}
+
+.search-result-item .icon {
+  margin-top: 2px;
+  flex-shrink: 0;
+}
+
+.search-result-content {
+  flex: 1;
+  min-width: 0;
+  overflow: hidden;
+}
+
+.search-result-title {
+  font-weight: 600;
+  font-size: 12px;
+  line-height: 1.4;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.search-result-folder {
+  font-size: 10px;
+  color: var(--joplin-color-faded, #999);
+  margin-top: 1px;
+}
+
+.search-result-snippet {
+  font-size: 11px;
+  color: var(--joplin-color-faded, #777);
+  margin-top: 3px;
+  line-height: 1.4;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  word-break: break-all;
+}
+
+mark.search-highlight {
+  background: rgba(255, 213, 0, 0.4);
+  color: inherit;
+  padding: 0 1px;
+  border-radius: 2px;
+}

package/publish/webview/panel.js

@@ -21,7 +21,6 @@ var _observer = new MutationObserver(function() {
   if (!container) return;
 
   if (_isFirstRender) {
-    // First render: scroll to selected note
     _isFirstRender = false;
     var selected = container.querySelector('.tree-item.note.selected');
     if (selected) {
@@ -30,7 +29,6 @@ var _observer = new MutationObserver(function() {
       }, 30);
     }
   } else {
-    // Subsequent renders: restore previous scroll position
     container.scrollTop = _savedScrollTop;
   }
 });
@@ -213,6 +211,14 @@ webviewApi.onMessage(function(msg) {
         }
       }, 2000);
     }
+  } else if (m.name === 'searchResults') {
+    // Ignore stale search results
+    if (m.searchId !== undefined && m.searchId !== _searchId) return;
+    if (m.results === null) {
+      if (_searchMode) exitSearchMode();
+    } else {
+      renderSearchResults(m.results, m.query);
+    }
   } else if (m.name === 'selectNote') {
     // Update selection without full re-render
     document.querySelectorAll('.tree-item.note.selected').forEach(function(el) {
@@ -341,28 +347,105 @@ document.addEventListener('drop', function(e) {
   });
 });
 
-// Search filter
+// ======================== Content Search ========================
+var _searchTimer = null;
+var _searchMode = false;
+var _searchId = 0;
+
+function escapeRegex(str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+function highlightText(text, query) {
+  if (!query) return text;
+  // Escape HTML first
+  var escaped = text.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+  var regex = new RegExp('(' + escapeRegex(query) + ')', 'gi');
+  return escaped.replace(regex, '<mark class="search-highlight">$1</mark>');
+}
+
+function showSearchContainer(show) {
+  var tree = document.getElementById('tree-container');
+  var search = document.getElementById('search-results');
+  if (tree) tree.style.display = show ? 'none' : '';
+  if (search) search.style.display = show ? '' : 'none';
+}
+
+function renderSearchResults(results, query) {
+  var container = document.getElementById('search-results');
+  if (!container) return;
+
+  showSearchContainer(true);
+
+  if (!results || results.length === 0) {
+    container.innerHTML = '<div class="search-status">' + T('searchNoResult') + '</div>';
+    return;
+  }
+
+  var countText = T('searchResultCount').replace('{count}', results.length);
+  var html = '<div class="search-status">' + countText + '</div>';
+
+  for (var i = 0; i < results.length; i++) {
+    var item = results[i];
+    var icon = '\uD83D\uDCDD';
+    if (item.is_todo) {
+      icon = item.todo_completed ? '\u2611' : '\u2610';
+    }
+    html += '<div class="search-result-item tree-item note" data-id="' + item.id + '" data-type="note">';
+    html += '<span class="icon note-icon">' + icon + '</span>';
+    html += '<div class="search-result-content">';
+    html += '<div class="search-result-title">' + highlightText(item.title, query) + '</div>';
+    if (item.folderName) {
+      html += '<div class="search-result-folder">\uD83D\uDCC2 ' + item.folderName + '</div>';
+    }
+    if (item.snippet) {
+      html += '<div class="search-result-snippet">' + highlightText(item.snippet, query) + '</div>';
+    }
+    html += '</div></div>';
+  }
+
+  container.innerHTML = html;
+  _searchMode = true;
+}
+
+function exitSearchMode() {
+  _searchMode = false;
+  showSearchContainer(false);
+}
+
 document.addEventListener('input', function(e) {
   if (e.target.id !== 'search-input') return;
-  var query = e.target.value.toLowerCase();
+  var query = e.target.value.trim();
 
-  document.querySelectorAll('.tree-item.note').forEach(function(item) {
-    var label = item.querySelector('.label').textContent.toLowerCase();
-    item.style.display = (label.indexOf(query) >= 0 || !query) ? '' : 'none';
-  });
+  if (_searchTimer) clearTimeout(_searchTimer);
+  _searchId++;
+  var currentSearchId = _searchId;
 
-  if (query) {
-    document.querySelectorAll('.children').forEach(function(c) { c.classList.remove('collapsed'); });
-    document.querySelectorAll('.toggle').forEach(function(t) { t.innerHTML = '\u25BC'; t.classList.add('expanded'); });
+  if (!query) {
+    if (_searchMode) exitSearchMode();
+    return;
   }
 
-  document.querySelectorAll('.children').forEach(function(childrenDiv) {
-    var folder = childrenDiv.previousElementSibling;
-    if (!folder || !folder.classList.contains('folder')) return;
-    if (!query) { folder.style.display = ''; childrenDiv.style.display = ''; return; }
-    var hasVisible = childrenDiv.querySelector('.tree-item.note:not([style*="display: none"])');
-    var hasVisibleSub = childrenDiv.querySelector('.tree-item.folder:not([style*="display: none"])');
-    if (hasVisible || hasVisibleSub) { folder.style.display = ''; childrenDiv.style.display = ''; }
-    else { folder.style.display = 'none'; childrenDiv.style.display = 'none'; }
-  });
+  _searchMode = true;
+  var searchContainer = document.getElementById('search-results');
+  if (searchContainer) {
+    searchContainer.innerHTML = '<div class="search-status">' + T('searching') + '</div>';
+  }
+  showSearchContainer(true);
+
+  // Debounce: wait 400ms after typing stops
+  _searchTimer = setTimeout(function() {
+    postMsg({ name: 'search', query: query, searchId: currentSearchId });
+  }, 400);
+});
+
+// Handle Escape key to clear search
+document.addEventListener('keydown', function(e) {
+  if (e.key === 'Escape') {
+    var input = document.getElementById('search-input');
+    if (input && input.value) {
+      input.value = '';
+      if (_searchMode) exitSearchMode();
+    }
+  }
 });