markdown-actions 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markdown-actions",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "A lightweight, zero-dependency JavaScript library for adding markdown formatting functionality to any textarea element",
   "main": "dist/markdown-actions.js",
   "module": "dist/markdown-actions.esm.js",

package/src/core/selection.js

@@ -123,26 +123,28 @@ export function preserveSelection(textarea, callback) {
  * @param {Function} operation - The operation to perform (receives textarea and returns result)
  * @param {Object} options - Options for the operation
  * @param {string} options.prefix - The prefix being added/removed (for cursor adjustment)
+ * @param {Function} options.adjustSelection - Custom selection adjustment function
  * @returns {Object} The result from the operation with adjusted cursor position
  */
 export function applyLineOperation(textarea, operation, options = {}) {
-  // Save original cursor position before any expansion
+  // Save original cursor position AND selection before any expansion
   const originalStart = textarea.selectionStart
   const originalEnd = textarea.selectionEnd
   const noInitialSelection = originalStart === originalEnd
   
-  // Expand selection to line boundaries
+  // Store the line start position to calculate offset later
+  const value = textarea.value
+  let lineStart = originalStart
+  
+  // Find start of the line containing the selection start
+  while (lineStart > 0 && value[lineStart - 1] !== '\n') {
+    lineStart--
+  }
+  
+  // Expand selection to line boundaries for the operation
   if (noInitialSelection) {
     // Expand to current line when no selection
-    const value = textarea.value
-    const start = originalStart
-    let lineStart = start
-    let lineEnd = start
-    
-    // Find start of current line
-    while (lineStart > 0 && value[lineStart - 1] !== '\n') {
-      lineStart--
-    }
+    let lineEnd = originalStart
     
     // Find end of current line
     while (lineEnd < value.length && value[lineEnd] !== '\n') {
@@ -152,27 +154,48 @@ export function applyLineOperation(textarea, operation, options = {}) {
     textarea.selectionStart = lineStart
     textarea.selectionEnd = lineEnd
   } else {
-    // For multiline selections, expand to full lines
+    // For selections, expand to full lines
     expandSelectionToLine(textarea)
   }
   
   // Apply the operation
   const result = operation(textarea)
   
-  // If there was no initial selection and we have a prefix, restore cursor position
-  if (noInitialSelection && options.prefix) {
-    // Check if we're toggling on or off
+  // Restore original selection/cursor with prefix adjustment
+  if (options.adjustSelection) {
+    // Use custom selection adjustment logic
+    const selectedText = textarea.value.slice(textarea.selectionStart, textarea.selectionEnd)
+    const isRemoving = selectedText.startsWith(options.prefix)
+    const adjusted = options.adjustSelection(isRemoving, originalStart, originalEnd, lineStart)
+    result.selectionStart = adjusted.start
+    result.selectionEnd = adjusted.end
+  } else if (options.prefix) {
+    // Use default prefix-based adjustment
     const selectedText = textarea.value.slice(textarea.selectionStart, textarea.selectionEnd)
     const isRemoving = selectedText.startsWith(options.prefix)
     
-    if (isRemoving) {
-      // When removing prefix, adjust cursor position
-      result.selectionStart = Math.max(originalStart - options.prefix.length, textarea.selectionStart)
-      result.selectionEnd = result.selectionStart
+    if (noInitialSelection) {
+      // No selection - just restore cursor position
+      if (isRemoving) {
+        // When removing prefix, adjust cursor position
+        result.selectionStart = Math.max(originalStart - options.prefix.length, lineStart)
+        result.selectionEnd = result.selectionStart
+      } else {
+        // When adding prefix, adjust cursor position
+        result.selectionStart = originalStart + options.prefix.length
+        result.selectionEnd = result.selectionStart
+      }
     } else {
-      // When adding prefix, adjust cursor position
-      result.selectionStart = originalStart + options.prefix.length
-      result.selectionEnd = result.selectionStart
+      // Had a selection - restore it with adjustment
+      if (isRemoving) {
+        // When removing prefix, shift selection back
+        result.selectionStart = Math.max(originalStart - options.prefix.length, lineStart)
+        result.selectionEnd = Math.max(originalEnd - options.prefix.length, lineStart)
+      } else {
+        // When adding prefix, shift selection forward
+        result.selectionStart = originalStart + options.prefix.length
+        result.selectionEnd = originalEnd + options.prefix.length
+      }
     }
   }
   

package/src/index.js

@@ -161,102 +161,77 @@ export function insertHeader(textarea, level = 1, toggle = false) {
   if (!textarea || textarea.disabled || textarea.readOnly) return
   if (level < 1 || level > 6) level = 1
   
-  // Save original cursor position before any expansion
-  const originalStart = textarea.selectionStart
-  const originalEnd = textarea.selectionEnd
-  const noInitialSelection = originalStart === originalEnd
-  
   const headerKey = `header${level === 1 ? '1' : level}`
   const style = mergeWithDefaults(FORMATS[headerKey] || FORMATS.header1)
   
-  // Select current line
-  const value = textarea.value
-  let lineStart = originalStart
-  let lineEnd = originalStart
-  
-  // Find line boundaries
-  while (lineStart > 0 && value[lineStart - 1] !== '\n') {
-    lineStart--
-  }
-  while (lineEnd < value.length && value[lineEnd] !== '\n') {
-    lineEnd++
-  }
-  
-  textarea.selectionStart = lineStart
-  textarea.selectionEnd = lineEnd
-  
-  const currentLine = value.slice(lineStart, lineEnd)
-  
-  // Check if we're removing or changing existing header
-  const existingHeaderMatch = currentLine.match(/^(#{1,6})\s*/)
-  const existingPrefixLength = existingHeaderMatch ? existingHeaderMatch[0].length : 0
-  const existingLevel = existingHeaderMatch ? existingHeaderMatch[1].length : 0
-  
-  // Remove any existing header formatting
-  const cleanedLine = currentLine.replace(/^#{1,6}\s*/, '')
-  
-  let newLine
-  let isRemoving = false
-  
-  // If toggle mode and current line has the same header level, remove it
-  if (toggle && existingLevel === level) {
-    newLine = cleanedLine
-    isRemoving = true
-  } else {
-    // Apply new header
-    newLine = style.prefix + cleanedLine
-  }
-  
-  let selectionStart, selectionEnd
+  // Save original positions before any operations
+  const originalStart = textarea.selectionStart
+  const originalEnd = textarea.selectionEnd
   
-  if (noInitialSelection) {
-    // Calculate where cursor should be after the operation
-    const cursorOffsetInLine = originalStart - lineStart
-    
-    if (isRemoving) {
-      // We're removing the header
-      if (cursorOffsetInLine < existingPrefixLength) {
-        // Cursor was in the header prefix, move to start of line
-        selectionStart = lineStart
+  // Use applyLineOperation for consistent behavior
+  const result = applyLineOperation(
+    textarea,
+    (ta) => {
+      const currentLine = ta.value.slice(ta.selectionStart, ta.selectionEnd)
+      
+      // Check if we're removing or changing existing header
+      const existingHeaderMatch = currentLine.match(/^(#{1,6})\s*/)
+      const existingLevel = existingHeaderMatch ? existingHeaderMatch[1].length : 0
+      
+      // Remove any existing header formatting
+      const cleanedLine = currentLine.replace(/^#{1,6}\s*/, '')
+      
+      let newLine
+      
+      // If toggle mode and current line has the same header level, remove it
+      if (toggle && existingLevel === level) {
+        newLine = cleanedLine
       } else {
-        // Cursor was in the text, move back by prefix length
-        selectionStart = originalStart - existingPrefixLength
+        // Apply new header
+        newLine = style.prefix + cleanedLine
       }
-    } else if (existingPrefixLength > 0) {
-      // We're replacing an existing header
-      if (cursorOffsetInLine < existingPrefixLength) {
-        // Cursor was in the header prefix, keep it at the same position
-        selectionStart = lineStart + Math.min(cursorOffsetInLine, style.prefix.length)
-      } else {
-        // Cursor was in the text, adjust by the difference in prefix lengths
-        const prefixDiff = style.prefix.length - existingPrefixLength
-        selectionStart = originalStart + prefixDiff
+      
+      return {
+        text: newLine,
+        selectionStart: ta.selectionStart,
+        selectionEnd: ta.selectionEnd
+      }
+    },
+    {
+      prefix: style.prefix,
+      // Custom handler for header-specific logic
+      adjustSelection: (isRemoving, selStart, selEnd, lineStart) => {
+        const currentLine = textarea.value.slice(lineStart, textarea.selectionEnd)
+        const existingHeaderMatch = currentLine.match(/^(#{1,6})\s*/)
+        const existingPrefixLength = existingHeaderMatch ? existingHeaderMatch[0].length : 0
+        const existingLevel = existingHeaderMatch ? existingHeaderMatch[1].length : 0
+        
+        // Check if we're actually removing (toggle off)
+        const actuallyRemoving = toggle && existingLevel === level
+        
+        if (actuallyRemoving) {
+          // Removing the header entirely
+          return {
+            start: Math.max(selStart - existingPrefixLength, lineStart),
+            end: Math.max(selEnd - existingPrefixLength, lineStart)
+          }
+        } else if (existingPrefixLength > 0) {
+          // Replacing existing header with new one
+          const prefixDiff = style.prefix.length - existingPrefixLength
+          return {
+            start: selStart + prefixDiff,
+            end: selEnd + prefixDiff
+          }
+        } else {
+          // Adding new header
+          return {
+            start: selStart + style.prefix.length,
+            end: selEnd + style.prefix.length
+          }
+        }
       }
-    } else {
-      // We're adding a new header
-      // Move cursor by the length of the new prefix
-      selectionStart = originalStart + style.prefix.length
-    }
-    
-    // Ensure cursor doesn't go past end of line
-    selectionStart = Math.min(selectionStart, lineStart + newLine.length)
-    selectionEnd = selectionStart
-  } else {
-    // Keep selection if there was one
-    if (isRemoving) {
-      selectionStart = lineStart
-      selectionEnd = lineStart + newLine.length
-    } else {
-      selectionStart = lineStart + style.prefix.length
-      selectionEnd = lineStart + newLine.length
     }
-  }
-  
-  const result = {
-    text: newLine,
-    selectionStart,
-    selectionEnd
-  }
+  )
   
   insertText(textarea, result)
 }