Merge pull request #2 from ryanpcmcquen/try_other_elements

ryanpcmcquen · Dec 24, 2020 · 5c04642 · 5c04642
2 parents 82b545e + 41c842d
commit 5c04642
Show file tree

Hide file tree

Showing 11 changed files with 63 additions and 61 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -9,37 +9,37 @@ var _wiki_link_plugin = _interopRequireDefault(require("./wiki_link_plugin"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 module.exports = {
-  originalAnchorComponent: null,
+  originalSpanComponent: null,
+
+  setWikiLinkComponent() {
+    const OriginalSpan = _inkdrop.markdownRenderer.remarkReactComponents.span;
+    const WikiLink = (0, _wiki_link.default)(OriginalSpan);
+    _inkdrop.markdownRenderer.remarkReactComponents.span = WikiLink;
+    this.originalSpanComponent = OriginalSpan;
+  },
+
+  unsetWikiLinkComponent() {
+    _inkdrop.markdownRenderer.remarkReactComponents.span = this.originalSpanComponent;
+  },
 
   activate() {
     if (_inkdrop.markdownRenderer) {
       _inkdrop.markdownRenderer.remarkPlugins.push(_wiki_link_plugin.default);
 
-      if (!inkdrop || !inkdrop.isMobile) {
+      if (!inkdrop.isMobile) {
         this.setWikiLinkComponent();
       }
     }
   },
 
   deactivate() {
     if (_inkdrop.markdownRenderer) {
-      _inkdrop.markdownRenderer.remarkPlugins = _inkdrop.markdownRenderer.remarkPlugins.filter(plugin => plugin !== WikiLink);
+      _inkdrop.markdownRenderer.remarkPlugins = _inkdrop.markdownRenderer.remarkPlugins.filter(plugin => plugin !== _wiki_link_plugin.default);
 
-      if (!inkdrop || !inkdrop.isMobile) {
+      if (!inkdrop.isMobile) {
         this.unsetWikiLinkComponent();
       }
     }
-  },
-
-  setWikiLinkComponent() {
-    const OriginalAnchor = _inkdrop.markdownRenderer.remarkReactComponents.a;
-    const WikiLink = (0, _wiki_link.default)(OriginalAnchor);
-    _inkdrop.markdownRenderer.remarkReactComponents.a = WikiLink;
-    this.originalAnchorComponent = OriginalAnchor;
-  },
-
-  unsetWikiLinkComponent() {
-    _inkdrop.markdownRenderer.remarkReactComponents.a = this.originalAnchorComponent;
   }
 
 };
diff --git a/lib/index.js.map b/lib/index.js.map
diff --git a/lib/wiki_link.js b/lib/wiki_link.js
@@ -20,9 +20,9 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-const db = (_inkdrop = inkdrop) === null || _inkdrop === void 0 ? void 0 : (_inkdrop$main = _inkdrop.main) === null || _inkdrop$main === void 0 ? void 0 : (_inkdrop$main$dataSto = _inkdrop$main.dataStore) === null || _inkdrop$main$dataSto === void 0 ? void 0 : _inkdrop$main$dataSto.getLocalDB();
+const db = inkdrop && ((_inkdrop = inkdrop) === null || _inkdrop === void 0 ? void 0 : (_inkdrop$main = _inkdrop.main) === null || _inkdrop$main === void 0 ? void 0 : (_inkdrop$main$dataSto = _inkdrop$main.dataStore) === null || _inkdrop$main$dataSto === void 0 ? void 0 : _inkdrop$main$dataSto.getLocalDB());
 
-const createRemarkWikiLink = OriginalAnchor => {
+const createRemarkWikiLink = OriginalSpan => {
   var _class, _temp;
 
   return _temp = _class = class WikiLink extends React.Component {
@@ -32,12 +32,11 @@ const createRemarkWikiLink = OriginalAnchor => {
       if (link) {
         try {
           const attributes = {
-            className: "wiki_link",
+            // href: `inkdrop://note/${link}`,
             onClick: event => {
-              event.preventDefault();
-              event.stopPropagation();
-
               if (db) {
+                event.preventDefault();
+                event.stopPropagation();
                 db.utils.search(`title:${link}`).then(note => {
                   let noteToOpenId;
 
@@ -62,21 +61,21 @@ const createRemarkWikiLink = OriginalAnchor => {
                     noteId: noteToOpenId
                   });
                 });
+                return false;
               }
-
-              return false;
             },
             renderError: error => {
               return /*#__PURE__*/React.createElement("span", {
                 className: "ui error message mde-error-message"
               }, error.message);
-            }
+            },
+            ...this.props
           };
 
-          if (OriginalAnchor) {
-            return /*#__PURE__*/React.createElement(OriginalAnchor, attributes, link);
+          if (OriginalSpan) {
+            return /*#__PURE__*/React.createElement(OriginalSpan, this.props, this.props.children);
           } else {
-            return /*#__PURE__*/React.createElement("a", attributes, link);
+            return /*#__PURE__*/React.createElement("span", attributes, link);
           }
         } catch (e) {
           return /*#__PURE__*/React.createElement("span", null, e.message);