joplin-plugin-explorer 1.1.2 → 1.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "joplin-plugin-explorer",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "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

@@ -254,12 +254,77 @@ joplin.plugins.register({
     await joplin.views.panels.setHtml(panel, '<div id="notes-in-list-root"><p style="padding:12px;">' + t.loading + '</p></div>');
     await joplin.views.panels.show(panel, true);
 
+    // Native dialogs
+    var inputDialog = await joplin.views.dialogs.create('explorerInputDialog');
+    var confirmDialog = await joplin.views.dialogs.create('explorerConfirmDialog');
+    var infoDialog = await joplin.views.dialogs.create('explorerInfoDialog');
+
+    async function showNativeConfirm(message) {
+      await joplin.views.dialogs.setHtml(confirmDialog,
+        '<div style="padding:10px;min-width:280px;">'
+        + '<div style="font-size:13px;">' + escapeHtml(message) + '</div>'
+        + '</div>'
+      );
+      await joplin.views.dialogs.setButtons(confirmDialog, [
+        { id: 'ok', title: 'OK' },
+        { id: 'cancel', title: t.cancel || 'Cancel' },
+      ]);
+      var result = await joplin.views.dialogs.open(confirmDialog);
+      return result.id === 'ok';
+    }
+
+    async function showNativeInfo(title, body) {
+      await joplin.views.dialogs.setHtml(infoDialog,
+        '<div style="padding:10px;min-width:320px;">'
+        + '<div style="font-size:14px;font-weight:bold;margin-bottom:10px;">' + escapeHtml(title) + '</div>'
+        + '<div style="font-size:12px;line-height:1.8;white-space:pre-wrap;">' + escapeHtml(body) + '</div>'
+        + '</div>'
+      );
+      await joplin.views.dialogs.setButtons(infoDialog, [
+        { id: 'ok', title: 'OK' },
+      ]);
+      await joplin.views.dialogs.open(infoDialog);
+    }
+
+    async function showNativeInput(label, defaultValue) {
+      await joplin.views.dialogs.setHtml(inputDialog,
+        '<div style="padding:10px;min-width:300px;">'
+        + '<div style="margin-bottom:8px;font-size:13px;">' + escapeHtml(label) + '</div>'
+        + '<form name="inputForm">'
+        + '<input name="value" type="text" value="' + escapeHtml(defaultValue || '') + '" '
+        + 'style="width:100%;box-sizing:border-box;padding:6px 8px;font-size:13px;" />'
+        + '</form>'
+        + '</div>'
+      );
+      await joplin.views.dialogs.setButtons(inputDialog, [
+        { id: 'ok', title: 'OK' },
+        { id: 'cancel', title: t.cancel || 'Cancel' },
+      ]);
+      var result = await joplin.views.dialogs.open(inputDialog);
+      if (result.id === 'ok' && result.formData && result.formData.inputForm) {
+        return result.formData.inputForm.value || null;
+      }
+      return null;
+    }
+
     var selectedNoteId = '';
     var collapsedFolders = {};
     var currentSort = 'updated_desc';
     var allFoldersCache = [];
     var isFirstLoad = true;
 
+    function expandToFolder(folderId) {
+      var parentId = folderId;
+      while (parentId) {
+        delete collapsedFolders[parentId];
+        var found = null;
+        for (var i = 0; i < allFoldersCache.length; i++) {
+          if (allFoldersCache[i].id === parentId) { found = allFoldersCache[i]; break; }
+        }
+        parentId = found ? found.parent_id : null;
+      }
+    }
+
     function sortNotes(notes, sortMode) {
       var sorted = notes.slice();
       switch (sortMode) {
@@ -367,9 +432,13 @@ joplin.plugins.register({
         await refreshPanel();
       } else if (msg.name === 'newNote') {
         await joplin.commands.execute('newNote');
+        var nn = await joplin.workspace.selectedNote();
+        if (nn) { selectedNoteId = nn.id; expandToFolder(nn.parent_id); }
         await refreshPanel();
       } else if (msg.name === 'newTodo') {
         await joplin.commands.execute('newTodo');
+        var nt = await joplin.workspace.selectedNote();
+        if (nt) { selectedNoteId = nt.id; expandToFolder(nt.parent_id); }
         await refreshPanel();
       } else if (msg.name === 'search') {
         var query = msg.query;
@@ -454,20 +523,32 @@ joplin.plugins.register({
                 var newNote = await joplin.data.post(['notes'], null, { title: t.newNote, parent_id: id });
                 await joplin.commands.execute('openNote', newNote.id);
                 selectedNoteId = newNote.id;
+                expandToFolder(id);
                 break;
               case 'newTodo':
                 var newTodo = await joplin.data.post(['notes'], null, { title: t.newTodo, parent_id: id, is_todo: 1 });
                 await joplin.commands.execute('openNote', newTodo.id);
                 selectedNoteId = newTodo.id;
+                expandToFolder(id);
                 break;
               case 'newSubNotebook':
-                await joplin.data.post(['folders'], null, { title: t.newNotebook, parent_id: id });
+                var subName = await showNativeInput(t.newNotebook, '');
+                if (subName && subName.trim()) {
+                  await joplin.data.post(['folders'], null, { title: subName.trim(), parent_id: id });
+                }
                 break;
               case 'deleteFolder':
-                await joplin.data.delete(['folders', id]);
+                var folderInfo = await joplin.data.get(['folders', id], { fields: ['title'] });
+                if (await showNativeConfirm(t.confirmDeleteFolder + '\n\n' + folderInfo.title)) {
+                  await joplin.data.delete(['folders', id]);
+                }
                 break;
               case 'renameFolder':
-                if (msg.newTitle) await joplin.data.put(['folders', id], null, { title: msg.newTitle });
+                var folderData = await joplin.data.get(['folders', id], { fields: ['title'] });
+                var newFolderName = await showNativeInput(t.promptRename, folderData.title);
+                if (newFolderName && newFolderName.trim()) {
+                  await joplin.data.put(['folders', id], null, { title: newFolderName.trim() });
+                }
                 break;
               case 'exportFolder':
                 try { await joplin.commands.execute('exportFolders', [id]); } catch(e) {}
@@ -515,7 +596,11 @@ joplin.plugins.register({
                 }
                 break;
               case 'renameNote':
-                if (msg.newTitle) await joplin.data.put(['notes', id], null, { title: msg.newTitle });
+                var noteData = await joplin.data.get(['notes', id], { fields: ['title'] });
+                var newNoteName = await showNativeInput(t.promptRename, noteData.title);
+                if (newNoteName && newNoteName.trim()) {
+                  await joplin.data.put(['notes', id], null, { title: newNoteName.trim() });
+                }
                 break;
               case 'moveNote':
                 if (msg.targetFolderName) {
@@ -531,21 +616,26 @@ joplin.plugins.register({
                 }
                 break;
               case 'noteInfo':
-                var info = await joplin.data.get(['notes', id], { fields: ['id', 'title', 'created_time', 'updated_time', 'is_todo', 'parent_id'] });
-                var parentTitle = '';
+                var info = await joplin.data.get(['notes', id], { fields: ['id', 'title', 'created_time', 'updated_time', 'is_todo', 'parent_id', 'body'] });
+                var pTitle = '';
                 for (var i = 0; i < allFoldersCache.length; i++) {
-                  if (allFoldersCache[i].id === info.parent_id) { parentTitle = allFoldersCache[i].title; break; }
+                  if (allFoldersCache[i].id === info.parent_id) { pTitle = allFoldersCache[i].title; break; }
                 }
-                var infoText = 'ID: ' + info.id
-                  + '\nTitle: ' + info.title
-                  + '\nNotebook: ' + parentTitle
-                  + '\nCreated: ' + new Date(info.created_time).toLocaleString()
-                  + '\nUpdated: ' + new Date(info.updated_time).toLocaleString()
-                  + '\nType: ' + (info.is_todo ? 'To-do' : 'Note');
-                // Send info back to webview to display
-                return { name: 'showInfo', text: infoText };
+                var bodyLen = (info.body || '').length;
+                var infoBody = 'ID: ' + info.id
+                  + '\n' + (t.ctxRenameNote || 'Title') + ': ' + info.title
+                  + '\n' + (t.newNotebook || 'Notebook') + ': ' + pTitle
+                  + '\n' + (t.sortUpdatedDesc ? t.sortUpdatedDesc.replace(/[↓↑\u2193\u2191]\s*/, '') : 'Created') + ': ' + new Date(info.created_time).toLocaleString()
+                  + '\n' + (t.sortUpdatedAsc ? t.sortUpdatedAsc.replace(/[↓↑\u2193\u2191]\s*/, '') : 'Updated') + ': ' + new Date(info.updated_time).toLocaleString()
+                  + '\nType: ' + (info.is_todo ? 'To-do' : 'Note')
+                  + '\n' + 'Size: ' + bodyLen + ' chars';
+                await showNativeInfo(info.title, infoBody);
+                break;
               case 'deleteNote':
-                await joplin.data.delete(['notes', id]);
+                var noteForDel = await joplin.data.get(['notes', id], { fields: ['title'] });
+                if (await showNativeConfirm(t.confirmDeleteNote + '\n\n' + noteForDel.title)) {
+                  await joplin.data.delete(['notes', id]);
+                }
                 break;
             }
           }

package/publish/manifest.json

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

package/publish/webview/panel.css

@@ -408,9 +408,9 @@ html, body {
 }
 
 .inline-input-ok {
-  background: var(--joplin-color2, #4a9cf5) !important;
+  background: #1a73e8 !important;
   color: #fff !important;
-  border-color: var(--joplin-color2, #4a9cf5) !important;
+  border-color: #1a73e8 !important;
 }
 
 .inline-input-buttons button:hover {

package/publish/webview/panel.js

@@ -150,7 +150,6 @@ document.addEventListener('contextmenu', function(e) {
     menuHtml += '<div class="ctx-item" data-action="toggleTodo" data-id="' + id + '" data-type="note">' + T('ctxToggleTodo') + '</div>';
     menuHtml += '<div class="ctx-sep"></div>';
     menuHtml += '<div class="ctx-item" data-action="renameNote" data-id="' + id + '" data-type="note" data-title="' + title.replace(/"/g, '&quot;') + '">' + T('ctxRenameNote') + '</div>';
-    menuHtml += '<div class="ctx-item" data-action="moveNote" data-id="' + id + '" data-type="note">' + T('ctxMoveNote') + '</div>';
     menuHtml += '<div class="ctx-item" data-action="noteInfo" data-id="' + id + '" data-type="note">' + T('ctxNoteInfo') + '</div>';
     menuHtml += '<div class="ctx-sep"></div>';
     menuHtml += '<div class="ctx-item ctx-danger" data-action="deleteNote" data-id="' + id + '" data-type="note">' + T('ctxDeleteNote') + '</div>';
@@ -174,30 +173,8 @@ document.addEventListener('click', function(e) {
   var id = ctxItem.dataset.id;
   var itemType = ctxItem.dataset.type;
 
-  if (action === 'renameFolder' || action === 'renameNote') {
-    var currentTitle = ctxItem.dataset.title || '';
-    showInlineInput(T('promptRename'), currentTitle, function(newTitle) {
-      if (newTitle !== null && newTitle.trim() !== '') {
-        postMsg({ name: 'contextMenu', action: action, id: id, itemType: itemType, newTitle: newTitle.trim() });
-      }
-    });
-  } else if (action === 'deleteFolder') {
-    if (confirm(T('confirmDeleteFolder'))) {
-      postMsg({ name: 'contextMenu', action: action, id: id, itemType: itemType });
-    }
-  } else if (action === 'deleteNote') {
-    if (confirm(T('confirmDeleteNote'))) {
-      postMsg({ name: 'contextMenu', action: action, id: id, itemType: itemType });
-    }
-  } else if (action === 'moveNote') {
-    showInlineInput(T('promptMoveNote'), '', function(folderName) {
-      if (folderName !== null && folderName.trim() !== '') {
-        postMsg({ name: 'contextMenu', action: action, id: id, itemType: itemType, targetFolderName: folderName.trim() });
-      }
-    });
-  } else {
-    postMsg({ name: 'contextMenu', action: action, id: id, itemType: itemType });
-  }
+  // All dialogs handled by backend using native Joplin dialogs
+  postMsg({ name: 'contextMenu', action: action, id: id, itemType: itemType });
 
   var menu = document.getElementById('ctx-menu');
   if (menu) menu.remove();