fix: #7

SeptemberHX · Sep 13, 2022 · 3a4a282 · 3a4a282
1 parent 21bbff3
commit 3a4a282
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 42 deletions.
diff --git a/src/codemirror/commands/index.ts b/src/codemirror/commands/index.ts
@@ -27,10 +27,35 @@ module.exports = {
                     }, 100);
                     cm.on('cursorActivity', changeDebounce);
                 });
+
+                CodeMirror.defineExtension('scrollToLine', function scrollToLine(lineno) {
+                    // temporary fix: sometimes the first coordinate is incorrect,
+                    // resulting in a difference about +- 10 px,
+                    // call the scroll function twice fixes the problem.
+                    this.scrollTo(null, this.charCoords({ line: lineno, ch: 0 }, 'local').top);
+                    this.scrollTo(null, this.charCoords({ line: lineno, ch: 0 }, 'local').top);
+                });
+
+                CodeMirror.defineOption("markdownHeaderChange", [], async function(cm, val, old) {
+                    const headerChangeDebounce = debounce(async function() {
+                        var rect = cm.getWrapperElement().getBoundingClientRect();
+                        return await _context.postMessage({
+                            from: cm.lineAtHeight(rect.top, "window"),
+                            to: cm.lineAtHeight(rect.bottom, "window")
+                        });
+                    }, 10);
+                    cm.on('scroll', headerChangeDebounce);
+                    cm.on('change', function (cm, changeObjs) {
+                        if (changeObjs.origin === 'setValue') {
+                            headerChangeDebounce();
+                        }
+                    });
+                });
             },
             codeMirrorOptions: {
                 'sidebar_cm_commands': true,
-                'cursorChangeNotification': true
+                'cursorChangeNotification': true,
+                'markdownHeaderChange': true
             },
             assets: function() {
                 return [ ];

diff --git a/src/outline/codeMirrorScroller.js b/src/outline/codeMirrorScroller.js
diff --git a/src/outline/index.ts b/src/outline/index.ts
@@ -62,13 +62,7 @@ class OutlinePlugin extends SidebarPlugin {
         this.sidebars = sidebars;
         await registerSettings();
 
-        await joplin.contentScripts.register(
-            ContentScriptType.CodeMirrorPlugin,
-            'codeMirrorScroller',
-            './outline/codeMirrorScroller.js',
-        );
-
-        await joplin.contentScripts.onMessage('codeMirrorScroller', async (msg) => {
+        await joplin.contentScripts.onMessage('sidebar_cm_commands', async (msg) => {
             const note = await joplin.workspace.selectedNote();
             if (note) {
                 const headers = mdHeaders(note.body, msg.from, msg.to);