@cocreate/selection 1.15.2 → 1.16.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/selection",
-  "version": "1.15.2",
+  "version": "1.16.0",
   "description": "A simple selection component in vanilla javascript. Easily configured using HTML5 data-attributes and/or JavaScript API.",
   "keywords": [
     "selection",
@@ -36,13 +36,13 @@
   },
   "main": "./src/index.js",
   "dependencies": {
-    "@cocreate/utils": "^1.44.0"
+    "@cocreate/utils": "^1.44.3"
   },
   "devDependencies": {
-    "@cocreate/webpack": "^1.6.0"
+    "@cocreate/webpack": "^1.6.2"
   },
   "allowScripts": {
     "@cocreate/utils@1.42.2": true,
     "@cocreate/webpack@1.4.3": true
   }
-}
+}

package/src/index.js

@@ -1,8 +1,11 @@
 import { cssPath, domParser } from '@cocreate/utils';
 
-String.prototype.customSplice = function (index, absIndex, string) {
-    return this.slice(0, index) + string + this.slice(index + Math.abs(absIndex));
-};
+/**
+ * Safely splices a string into another string without polluting the global String prototype.
+ */
+export function customSplice(sourceStr, index, absIndex, stringToAdd) {
+    return sourceStr.slice(0, index) + stringToAdd + sourceStr.slice(index + Math.abs(absIndex));
+}
 
 export function getSelection(element) {
     try {
@@ -34,7 +37,6 @@ export function getSelection(element) {
                 domTextEditor = domTextEditor.closest('[contenteditable]');
             }
 
-
             let start = getNodePosition(range.startContainer, domTextEditor, range.startOffset)
             let end = start
             if (range.startContainer !== range.endContainer) {
@@ -79,10 +81,11 @@ export function getSelection(element) {
         }
     } catch (error) {
         console.error("Error fetching selection from element:", error);
+        // Safe fallback to prevent cascading undefined errors
+        return { start: 0, end: 0, value: "", range: null };
     }
 }
 
-
 function getNodePosition(container, domTextEditor, position) {
     try {
         let string = domTextEditor.htmlString
@@ -108,13 +111,15 @@ function getNodePosition(container, domTextEditor, position) {
 
     } catch (error) {
         console.error("Error getting node position:", error);
+        // Fallback to preserve execution
+        return position || 0;
     }
-
 }
 
 export function processSelection(element, value = "", prev_start, prev_end, start, end, range) {
     let prevStart = prev_start;
     let prevEnd = prev_end;
+    
     if (prev_start >= start) {
         if (value == "") {
             prev_start -= end - start;
@@ -124,11 +129,13 @@ export function processSelection(element, value = "", prev_start, prev_end, star
             prev_start += value.length;
             prev_end += value.length;
         }
-    } {
-        if (value == "" && prev_end >= start) {
-            prev_end = (prev_end >= end) ? prev_end - (end - start) : start;
-        }
+    } 
+    
+    // Fixed dangling block: Now a proper sequential conditional
+    if (value == "" && prev_end >= start) {
+        prev_end = (prev_end >= end) ? prev_end - (end - start) : start;
     }
+    
     if (range) {
         if (prevStart > prev_start) {
             let length = prevStart - prev_start;
@@ -140,6 +147,7 @@ export function processSelection(element, value = "", prev_start, prev_end, star
                 if (range.startOffset == 0 || range.startOffset >= length)
                     range.startOffset += length;
         }
+        
         if (prevEnd > prev_end) {
             let length = prevEnd - prev_end;
             if (Math.sign(length) === 1 && range.endOffset >= length)
@@ -165,20 +173,8 @@ export function setSelection(element, start, end, range) {
         let Document = element.ownerDocument;
 
         let startContainer, endContainer
-        // if (range.startContainer.htmlString)
         startContainer = getContainer(range.startContainer, range.textStart - range.startOffset);
-        // else
-        //     startContainer = getContainer(range.startContainer, range.startOffset);
-
-        // if (range.endContainer.htmlString)
         endContainer = getContainer(range.endContainer, range.textEnd - range.endOffset);
-        // else
-        //     endContainer = getContainer(range.endContainer, range.endOffset);
-
-        // let startContainer = getContainer(range.startContainer, range.elementStart);
-        // let endContainer = getContainer(range.endContainer, range.elementEnd);
-        // let startContainer = getContainer(range.startContainer, range.startOffset);
-        // let endContainer = getContainer(range.endContainer, range.endOffset);
 
         if (!startContainer || !endContainer)
             return;
@@ -220,11 +216,13 @@ export function getElementPosition(str, start, end) {
     let angleEnd = startString.lastIndexOf(">");
     let endStringAngleEnd = endString.indexOf(">");
     let element, path, position, nodeStart, nodeEnd, startNode, type;
+    
     if (angleEnd > angleStart) {
         let length = 0;
         if (start != end)
             length = end - start;
-        let string = str.customSplice(start, length, '<findelement></findelement>');
+        // Refactored to use the standalone customSplice function
+        let string = customSplice(str, start, length, '<findelement></findelement>');
         let newDom = domParser(string);
         let findEl = newDom.querySelector('findelement');
         if (findEl) {
@@ -269,7 +267,8 @@ export function getElementPosition(str, start, end) {
         }
 
         if (nodeEnd > 0) {
-            let string = str.customSplice(nodeEnd - 1, 0, ' findelement');
+            // Refactored to use the standalone customSplice function
+            let string = customSplice(str, nodeEnd - 1, 0, ' findelement');
             let newDom = domParser(string);
             element = newDom.querySelector('[findelement]');
             if (!element && newDom.tagName == 'HTML')
@@ -278,7 +277,8 @@ export function getElementPosition(str, start, end) {
                 element = element.parentElement;
             element.removeAttribute('findelement');
         } else {
-            let string = str.customSplice(angleStart, 0, '<findelement></findelement>');
+            // Refactored to use the standalone customSplice function
+            let string = customSplice(str, angleStart, 0, '<findelement></findelement>');
             let newDom = domParser(string);
             element = newDom.querySelector('findelement');
             if (element) {
@@ -346,8 +346,8 @@ export function getStringPosition({ string, target, position, attribute, propert
         }
         else
             element = dom.querySelector(selector);
+            
         if (!element) {
-            // console.log('element could not be found using selector:', selector);
             return;
         }
         let start = 0, end = 0;
@@ -368,6 +368,7 @@ export function getStringPosition({ string, target, position, attribute, propert
                 let attrValue = element.getAttribute(attribute);
                 let attrStart = elString.indexOf(` ${attribute}=`);
                 start = start + attrStart;
+                
                 if (attribute == 'style') {
                     if (remove)
                         element.style.removeProperty(property);
@@ -408,12 +409,15 @@ export function getStringPosition({ string, target, position, attribute, propert
     }
     catch (e) {
         console.log(e);
+        // Return safe fallback instead of throwing implicit undefined
+        return { start: 0, end: 0, newValue: value };
     }
 }
 
 function getElFromString(dom, string, element, position, isAttribute) {
     let findEl = document.createElement('findelement');
     let start, angle, documentTypeAngles;
+    
     if (position == 'afterbegin') {
         element.insertAdjacentElement('afterbegin', findEl);
         angle = '>';
@@ -445,7 +449,6 @@ function getElFromString(dom, string, element, position, isAttribute) {
     findEl.remove();
 
     let domString = dom.innerHTML.substring(0, start);
-    // let domString = dom.outerHTML.substring(0, start);
 
     if (dom.tagName == "HTML") {
         domString = dom.outerHTML.substring(0, start);
@@ -453,10 +456,10 @@ function getElFromString(dom, string, element, position, isAttribute) {
         let documentType = string.substring(0, htmlIndex);
         documentTypeAngles = documentType.split(angle).length - 1;
     }
+    
     let angles = domString.split(angle);
     let angleLength = angles.length - 1;
-    // if (position == 'afterend')
-    //     angleLength += 1;
+
     if (documentTypeAngles)
         angleLength += documentTypeAngles;
     let elStart = getPosition(string, angle, angleLength);
@@ -482,7 +485,6 @@ function getPosition(string, subString, index) {
     let startstring = angleArray.join(subString);
     let start = startstring.length;
     return start;
-    // return string.split(subString, index).join(subString).length;
 }
 
 export default { getSelection, setSelection, hasSelection, processSelection, getStringPosition, getElementPosition };