handle proximity

Author: hanwg

src/pdfdatatable/SelectCsvElement.jsx

@@ -107,6 +107,10 @@ export default function SelectCsvElement({ setActiveStep, files, setCsvLines })
             isOutOfProximity = true;
         }
 
+        for (const csvLine of csvLines) {
+            console.log(csvLine.join("|"));
+
+        }
         saveCsv(csvLines);
     }
 
@@ -175,7 +179,7 @@ export default function SelectCsvElement({ setActiveStep, files, setCsvLines })
 
             if (xIntersect(headers, headerIndex, line[columnIndex])) {
                 // concatenate the text
-                csvLine[headerIndex] = csvLine[headerIndex] ? csvLine[headerIndex] : ""  + line[columnIndex].textContent;
+                csvLine[headerIndex] = csvLine[headerIndex] ? csvLine[headerIndex] + line[columnIndex].textContent : ""  + line[columnIndex].textContent;
                 line[columnIndex].setAttribute("column", headerIndex);
                 columnIndex++;
             } else {
@@ -184,6 +188,10 @@ export default function SelectCsvElement({ setActiveStep, files, setCsvLines })
             }
         }
 
+        if (csvLine.length < 1) {
+            return false;
+        }
+
         // fill empty columns
         for (let i = 0; i < headers.length; i++) {
             if (!csvLine[i]) {

src/utils.js

@@ -10,19 +10,23 @@ export function loadCsv() {
 
 export function xIntersect(headers, headerIndex, element) {
 
+    const rect2 = element.getBoundingClientRect();
+    const rect2Start = rect2.x;
+    const rect2End = rect2.x + rect2.width;
+
     const rect1 = headers[headerIndex].getBoundingClientRect();
     const rect1Start = rect1.x;
     let rect1End = 0;
     if (headerIndex === headers.length - 1) {
         rect1End = rect1.x + rect1.width;
     } else {
-        const next = headers[headerIndex + 1].getBoundingClientRect();
-        rect1End = next.x - 1;
-    }
+        const rect3 = headers[headerIndex + 1].getBoundingClientRect();
+        if (rect2End >= rect3.x) {
+            return false;
+        }
 
-    const rect2 = element.getBoundingClientRect();
-    const rect2Start = rect2.x;
-    const rect2End = rect2.x + rect2.width;
+        rect1End = rect3.x - 1;
+    }
 
     //          [rect1]
     // [rect2]