Merge pull request #7 from antonmedv/master

Reintegrate 4.2.0 from Upstream

Author: StevenEWright

codejar.ts

@@ -52,16 +52,11 @@ export function CodeJar(editor: HTMLElement, highlight: (e: HTMLElement, pos?: P
   const window = options.window
   const document = window.document
 
-  let listeners: [string, any][] = []
-  let history: HistoryRecord[] = []
+  const listeners: [string, any][] = []
+  const history: HistoryRecord[] = []
   let at = -1
   let focus = false
-  const cb = {
-    update(code: string): void | undefined {
-    },
-    paste(data: { text: string }): void {
-    },
-  }
+  let onUpdate: (code: string) => void | undefined = () => void 0
   let prev: string // code content prior keydown event
 
   editor.setAttribute('contenteditable', 'plaintext-only')
@@ -71,9 +66,11 @@ export function CodeJar(editor: HTMLElement, highlight: (e: HTMLElement, pos?: P
   editor.style.overflowY = 'auto'
   editor.style.whiteSpace = 'pre-wrap'
 
-  let isLegacy = false // true if plaintext-only is not supported
+  const doHighlight = (editor: HTMLElement, pos?: Position) => {
+    highlight(editor, pos)
+  }
 
-  highlight(editor)
+  let isLegacy = false // true if plaintext-only is not supported
   if (editor.contentEditable !== 'plaintext-only') isLegacy = true
   if (isLegacy) {
     editor.setAttribute('contenteditable', 'true')
@@ -83,7 +80,7 @@ export function CodeJar(editor: HTMLElement, highlight: (e: HTMLElement, pos?: P
 
   const debounceHighlight = debounce(() => {
     const pos = save()
-    highlight(editor, pos)
+    doHighlight(editor, pos)
     restore(pos)
   }, 30)
 
@@ -122,7 +119,6 @@ export function CodeJar(editor: HTMLElement, highlight: (e: HTMLElement, pos?: P
         recording = true
       }
     }
-
     if (isLegacy && !isCopy(event)) restore(save())
   })
 
@@ -132,7 +128,7 @@ export function CodeJar(editor: HTMLElement, highlight: (e: HTMLElement, pos?: P
 
     if (prev !== toString()) debounceHighlight()
     debounceRecordHistory(event)
-    cb.update(toString())
+    onUpdate(toString())
   })
 
   on('focus', _event => {
@@ -147,14 +143,14 @@ export function CodeJar(editor: HTMLElement, highlight: (e: HTMLElement, pos?: P
     recordHistory()
     handlePaste(event)
     recordHistory()
-    cb.update(toString())
+    onUpdate(toString())
   })
 
   on('cut', event => {
     recordHistory()
     handleCut(event)
     recordHistory()
-    cb.update(toString())
+    onUpdate(toString())
   })
 
   function save(): Position {
@@ -218,9 +214,7 @@ export function CodeJar(editor: HTMLElement, highlight: (e: HTMLElement, pos?: P
       }
     })
 
-    // collapse empty text nodes
-    editor.normalize()
-
+    editor.normalize() // collapse empty text nodes
     return pos
   }
 
@@ -287,6 +281,7 @@ export function CodeJar(editor: HTMLElement, highlight: (e: HTMLElement, pos?: P
     }
 
     s.setBaseAndExtent(startNode, startOffset, endNode, endOffset)
+    editor.normalize() // collapse empty text nodes
   }
 
   function uneditable(node: Node): Element | undefined {
@@ -542,18 +537,16 @@ export function CodeJar(editor: HTMLElement, highlight: (e: HTMLElement, pos?: P
   }
 
   function handlePaste(event: ClipboardEvent) {
+    if (event.defaultPrevented) return
     preventDefault(event)
     const originalEvent = (event as any).originalEvent ?? event
-    const data = {
-      text: originalEvent.clipboardData.getData('text/plain').replace(/\r\n?/g, '\n'),
-    }
-    cb.paste(data)
+    const text = originalEvent.clipboardData.getData('text/plain').replace(/\r\n?/g, '\n')
     const pos = save()
-    insert(data.text)
-    highlight(editor)
+    insert(text)
+    doHighlight(editor)
     restore({
-      start: Math.min(pos.start, pos.end) + data.text.length,
-      end: Math.min(pos.start, pos.end) + data.text.length,
+      start: Math.min(pos.start, pos.end) + text.length,
+      end: Math.min(pos.start, pos.end) + text.length,
       dir: '<-',
     })
   }
@@ -564,7 +557,7 @@ export function CodeJar(editor: HTMLElement, highlight: (e: HTMLElement, pos?: P
     const originalEvent = (event as any).originalEvent ?? event
     originalEvent.clipboardData.setData('text/plain', selection.toString())
     document.execCommand('delete')
-    highlight(editor)
+    doHighlight(editor)
     restore({
       start: Math.min(pos.start, pos.end),
       end: Math.min(pos.start, pos.end),
@@ -663,14 +656,11 @@ export function CodeJar(editor: HTMLElement, highlight: (e: HTMLElement, pos?: P
     },
     updateCode(code: string) {
       editor.textContent = code
-      highlight(editor)
-      cb.update(code)
+      doHighlight(editor)
+      onUpdate(code)
     },
     onUpdate(callback: (code: string) => void) {
-      cb.update = callback
-    },
-    onPaste(callback: (data: { text: string }) => void) {
-      cb.paste = callback
+      onUpdate = callback
     },
     toString,
     save,

package.json

@@ -1,7 +1,7 @@
 {
   "name": "codejar",
   "description": "An embeddable code editor for the browser",
-  "version": "4.1.2",
+  "version": "4.2.0",
   "type": "module",
   "main": "./dist/codejar.js",
   "types": "./dist/codejar.d.ts",