Release v2.2.7

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file, starting fr
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.2.7] - 2024-02-21
+
+### Fixed
+
+-   Fix handling of Japanese IME input.
+-   Fix willPaste event not cancelable.
+
 ## [2.2.6] - 2024-02-01
 
 ### Fixed

dist/squire-raw.js

@@ -1904,7 +1904,7 @@
 
   // source/keyboard/KeyHandlers.ts
   var _onKey = function(event) {
-    if (event.defaultPrevented) {
+    if (event.defaultPrevented || event.isComposing) {
       return;
     }
     let key = event.key;
@@ -1930,9 +1930,7 @@
     const range = this.getSelection();
     if (this._keyHandlers[key]) {
       this._keyHandlers[key](this, event, range);
-    } else if (!range.collapsed && // !event.isComposing stops us from blatting Kana-Kanji conversion in
+    } else if (!range.collapsed && !event.ctrlKey && !event.metaKey && key.length === 1) {
-    // Safari
-    !event.isComposing && !event.ctrlKey && !event.metaKey && key.length === 1) {
       this.saveUndoState(range);
       deleteContentsOfRange(range, this._root);
       this._ensureBottomLine();
@@ -2866,6 +2864,7 @@
         let doInsert = true;
         if (isPaste) {
           const event = new CustomEvent("willPaste", {
+            cancelable: true,
             detail: {
               fragment: frag
             }
@@ -2966,6 +2965,7 @@
         let doInsert = true;
         if (isPaste) {
           const event = new CustomEvent("willPaste", {
+            cancelable: true,
             detail: {
               text: plainText
             }

dist/squire-raw.mjs

@@ -1901,7 +1901,7 @@ var Space = (self, event, range) => {
 
 // source/keyboard/KeyHandlers.ts
 var _onKey = function(event) {
-  if (event.defaultPrevented) {
+  if (event.defaultPrevented || event.isComposing) {
     return;
   }
   let key = event.key;
@@ -1927,9 +1927,7 @@ var _onKey = function(event) {
   const range = this.getSelection();
   if (this._keyHandlers[key]) {
     this._keyHandlers[key](this, event, range);
-  } else if (!range.collapsed && // !event.isComposing stops us from blatting Kana-Kanji conversion in
+  } else if (!range.collapsed && !event.ctrlKey && !event.metaKey && key.length === 1) {
-  // Safari
-  !event.isComposing && !event.ctrlKey && !event.metaKey && key.length === 1) {
     this.saveUndoState(range);
     deleteContentsOfRange(range, this._root);
     this._ensureBottomLine();
@@ -2863,6 +2861,7 @@ var Squire = class {
       let doInsert = true;
       if (isPaste) {
         const event = new CustomEvent("willPaste", {
+          cancelable: true,
           detail: {
             fragment: frag
           }
@@ -2963,6 +2962,7 @@ var Squire = class {
       let doInsert = true;
       if (isPaste) {
         const event = new CustomEvent("willPaste", {
+          cancelable: true,
           detail: {
             text: plainText
           }

dist/types/keyboard/KeyHandlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"KeyHandlers.d.ts","sourceRoot":"","sources":["../../../source/keyboard/KeyHandlers.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAWxC,QAAA,MAAM,MAAM,SAAmB,MAAM,SAAS,aAAa,KAAG,IAkD7D,CAAC;AAIF,KAAK,UAAU,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;AAE7E,QAAA,MAAM,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAoC3C,CAAC;AAyGF,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC"}
+{"version":3,"file":"KeyHandlers.d.ts","sourceRoot":"","sources":["../../../source/keyboard/KeyHandlers.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAWxC,QAAA,MAAM,MAAM,SAAmB,MAAM,SAAS,aAAa,KAAG,IAiD7D,CAAC;AAIF,KAAK,UAAU,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;AAE7E,QAAA,MAAM,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAoC3C,CAAC;AAyGF,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC"}

package.json

@@ -1,6 +1,6 @@
 {
     "name": "squire-rte",
-    "version": "2.2.6",
+    "version": "2.2.7",
     "description": "Squire is an HTML5 rich text editor, which provides powerful cross-browser normalisation, whilst being supremely lightweight and flexible.",
     "main": "dist/squire.mjs",
     "types": "dist/types/Squire.d.ts",