fix: uncaught error on drop without active pane

Author: ElecTreeFrying

lib/main.js

@@ -101,7 +101,7 @@ export default {
         : enableNotif ? atom.notifications.addSuccess(`New import added!`) : 0;
   },
 
-  popNotif(relativePath, editor) {
+  insertStatement(relativePath, editor) {
 
     const _path     = editor.getPath().toString();
     const extname   = path.extname(_path);
@@ -135,53 +135,49 @@ export default {
         : this.toImportPositionTop(importText, editor, importName);
   },
 
-  warnNotif(options, fromFileType, toFileType) {
-
-    const { isSameValid, notSupportedValid, invalidFileTrue } = options;
+  notify(options, fromExtname, toExtname) {
+    const { isSameValid, notSupportedValid, invalidFile, isDirectory } = options;
     const notif = atom.notifications;
-    const append = fromFileType.toUpperCase().substring(1);
-
-    invalidFileTrue                                               ? notif.addWarning(`Unable to import ${fromFileType} to ${toFileType}.`)
-    : !invalidFileTrue && isSameValid                             ?    notif.addInfo('Same file path.')
-    : !invalidFileTrue && notSupportedValid                       ? notif.addWarning(`${append} files not supported.`)
-    : !invalidFileTrue && !isSameValid && notSupportedValid === 0 ? notif.addWarning(`Same file path. ${append} files not supported.`)
-    : !invalidFileTrue && !notSupportedValid && isSameValid === 0 ?   notif.addError('Import failed.') : 0;
+    const append = fromExtname.toUpperCase().substring(1);
+
+    invalidFile                                               ? notif.addWarning(`Unable to import ${fromExtname} to ${toExtname}.`)
+    : isDirectory && toExtname !== ''                         ?   notif.addError('File not found.')
+    : fromExtname === '' && toExtname === ''                  ?   notif.addError('Active pane not found.')
+    : !invalidFile && isSameValid                             ?    notif.addInfo('Same file path.')
+    : !invalidFile && notSupportedValid                       ? notif.addWarning(`${append} files not supported.`)
+    : !invalidFile && !isSameValid && notSupportedValid === 0 ? notif.addWarning(`Same file path. ${append} files not supported.`)
+    : !invalidFile && !notSupportedValid && isSameValid === 0 ?   notif.addError('Import failed.') : 0;
   },
 
-  calculatePath(editor) {
-
-    if (editor.getPath() === undefined) return;
+  setup(item, activePane) {
 
     const enableNotif    = !this.param.disableNotifs;
-    const selectedSpan   = atom.document.querySelector('.file.entry.list-item.selected > span');
-    if (!selectedSpan)
-      if (enableNotif) return atom.notifications.addError('File not found.');
-
-    const activePane     = atom.workspace.getActiveTextEditor();
+    const isFile         = item.target.hasOwnProperty('file');
+    const isDirectory    = item.target.hasOwnProperty('directory');
     const validFileTypes = [ '.ts', '.tsx' ];
-    const fromPath       = selectedSpan.dataset.path.toString();
+    const fromPath       = isFile ? item.target.file.path : '';
     const toPath         = activePane.getPath().toString();
     const relativePath   = relative(toPath, fromPath);
-    const fromFileType   = path.extname(fromPath);
-    const toFileType     = path.extname(toPath);
-    const from_valid     = validFileTypes.some(el => fromFileType.includes(el));
-    const to_valid       = validFileTypes.some(el => toFileType.includes(el));
+    const fromExtname    = path.extname(fromPath);
+    const toExtname      = path.extname(toPath);
+    const fromIsValid    = validFileTypes.some(el => fromExtname.includes(el));
+    const toIsValid      = validFileTypes.some(el => toExtname.includes(el));
     const isSamePath     = (fromPath === toPath);
-    const isBothValid    = (from_valid && to_valid);
-    const isSameType     = (fromFileType === toFileType);
+    const isBothValid    = (fromIsValid && toIsValid);
+    const isSameType     = (fromExtname === toExtname);
 
     if (isSamePath && isBothValid && isSameType && enableNotif)
-      this.warnNotif({ invalidFileTrue: false, isSameValid: true, notSupportedValid: 0 }, fromFileType, toFileType);
+      this.notify({ invalidFile: false, isSameValid: true, notSupportedValid: 0, isDirectory }, fromExtname, toExtname);
     else if (!isSamePath && !isBothValid && isSameType && enableNotif)
-      this.warnNotif({ invalidFileTrue: false, isSameValid: 0, notSupportedValid: true }, fromFileType, toFileType);
+      this.notify({ invalidFile: false, isSameValid: 0, notSupportedValid: true, isDirectory }, fromExtname, toExtname);
     else if (isSamePath && !isBothValid && isSameType && enableNotif)
-      this.warnNotif({ invalidFileTrue: false, isSameValid: false, notSupportedValid: 0 }, fromFileType, toFileType);
+      this.notify({ invalidFile: false, isSameValid: false, notSupportedValid: 0, isDirectory }, fromExtname, toExtname);
     else if (!isSamePath && !isBothValid && !isSameType && enableNotif)
-      this.warnNotif({ invalidFileTrue: false, isSameValid: 0, notSupportedValid: false }, fromFileType, toFileType);
+      this.notify({ invalidFile: false, isSameValid: 0, notSupportedValid: false, isDirectory }, fromExtname, toExtname);
     else if (!isSamePath && isBothValid && !isSameType && enableNotif)
-      this.warnNotif({ invalidFileTrue: true, isSameValid: 0, notSupportedValid: 0 }, fromFileType, toFileType);
+      this.notify({ invalidFile: true, isSameValid: 0, notSupportedValid: 0, isDirectory }, fromExtname, toExtname);
     else if (!isSamePath && isBothValid && isSameType)
-      this.popNotif(relativePath, editor)
+      this.insertStatement(relativePath, activePane)
   },
 
   activate(state) {
@@ -194,17 +190,18 @@ export default {
       const editorView = atom.views.getView(editor);
       const lines = editorView.querySelector('.lines');
       const leftDock = atom.workspace.paneContainers.left.refs.wrapperElement;
-      const directories = atom.document.querySelector('[class*="tree-view-root"]');
 
-      let valid = false;;
-      lines.addEventListener("dragenter", () => (valid = true), false);
-      directories.addEventListener("dragleave", () => (valid = false), false);
+      let valid = false;
+      lines.addEventListener("dragenter", () => (valid = true),  false);
+      leftDock.addEventListener("dragenter", (e) => e.target.ondragenter = () => (valid = false), false);
 
       this.subscriptions.add(lines, "drop", (_lines) => {
         _lines.preventDefault();
 
-        leftDock.ondragend = (_leftDock) => {
-          valid ? this.calculatePath(editor) : 0;
+        leftDock.ondragend = (item) => {
+          const activePane = atom.workspace.getActiveTextEditor();
+
+          valid && activePane ? this.setup(item, activePane) : this.notify({ }, '', '');
         }
       });