From 2cb7d5c178faea785cf002fb7c3aa304f22abd84 Mon Sep 17 00:00:00 2001 From: Diego Antonelli Date: Wed, 3 Jul 2019 16:20:23 +0200 Subject: [PATCH 1/3] Fixing events on iOS --- src/components/RichText.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/components/RichText.ts b/src/components/RichText.ts index ecaadf8..2ee8e9d 100644 --- a/src/components/RichText.ts +++ b/src/components/RichText.ts @@ -178,9 +178,17 @@ export class RichText extends Component { if (toolbar) { // required to disable editor blur events when the toolbar is clicked toolbar.addEventListener("mousedown", event => event.preventDefault()); + toolbar.addEventListener("touchend", event => event.preventDefault()); } if (editor && props.tabAction === "indent") { editor.addEventListener("keydown", event => event.stopPropagation()); + editor.addEventListener("touchend", event => event.stopPropagation()); + } else if (editor) { + editor.addEventListener("touchend", _ => { + if (this.quill && !this.quill.hasFocus()) { + this.quill.focus(); + } + }); } } } From 8d8d87c5f725a4630eb6e3603872c1a97c9a17f8 Mon Sep 17 00:00:00 2001 From: Diego Antonelli Date: Thu, 4 Jul 2019 08:26:01 +0200 Subject: [PATCH 2/3] Bumping version --- package-lock.json | 31 ++++++++++++++++++++++++------- package.json | 2 +- src/components/RichText.ts | 1 - 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1c066a1..5443a0d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "rich-text", - "version": "1.3.3", + "version": "1.3.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -43,6 +43,21 @@ "integrity": "sha512-N/WEkyAdJjIb2yKcXzTTqtOUsc6PkMDYMyePOH0gE/c9p6VG9Rr/Qy0eGsZlmIM2m9WhZm7t+Sflj/FeS2vhkQ==", "dev": true }, + "@types/domhandler": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@types/domhandler/-/domhandler-2.4.1.tgz", + "integrity": "sha512-cfBw6q6tT5sa1gSPFSRKzF/xxYrrmeiut7E0TxNBObiLSBTuFEHibcfEe3waQPEDbqBsq+ql/TOniw65EyDFMA==", + "dev": true + }, + "@types/domutils": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/@types/domutils/-/domutils-1.7.2.tgz", + "integrity": "sha512-Nnwy1Ztwq42SSNSZSh9EXBJGrOZPR+PQ2sRT4VZy8hnsFXfCil7YlKO2hd2360HyrtFz2qwnKQ13ENrgXNxJbw==", + "dev": true, + "requires": { + "@types/domhandler": "*" + } + }, "@types/enzyme": { "version": "3.9.0", "resolved": "https://registry.npmjs.org/@types/enzyme/-/enzyme-3.9.0.tgz", @@ -54,11 +69,13 @@ } }, "@types/htmlparser2": { - "version": "3.7.31", - "resolved": "https://registry.npmjs.org/@types/htmlparser2/-/htmlparser2-3.7.31.tgz", - "integrity": "sha512-6Kjy02k+KfJJE2uUiCytS31SXCYnTjKA+G0ydb83DTlMFzorBlezrV2XiKazRO5HSOEvVW3cpzDFPoP9n/9rSA==", + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/@types/htmlparser2/-/htmlparser2-3.10.0.tgz", + "integrity": "sha512-keXxWwpNOTvRTWTS4cdLHPp3p6gSzitTCmLNgPJinEvS95QzjkhbEMSaQO4XkEp4ctXJu8P0j4xqEVOPsLj3vg==", "dev": true, "requires": { + "@types/domhandler": "*", + "@types/domutils": "*", "@types/node": "*" } }, @@ -117,9 +134,9 @@ } }, "@types/sanitize-html": { - "version": "1.18.2", - "resolved": "https://registry.npmjs.org/@types/sanitize-html/-/sanitize-html-1.18.2.tgz", - "integrity": "sha512-WSE/HsqOHfHd1c0vPOOWOWNippsscBU72r5tpWT/+pFL3zBiCPJCp0NO7sQT8V0gU0xjSKpMAve3iMEJrRhUWQ==", + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/@types/sanitize-html/-/sanitize-html-1.20.0.tgz", + "integrity": "sha512-didHnmdOqYconeLOaHbYK9Y0jEULat5UbblgPUmwTJCEU7gA9AW1m9Zsi4h5gMFP56zAWRuAnH42D/h1zwZr+Q==", "dev": true, "requires": { "@types/htmlparser2": "*" diff --git a/package.json b/package.json index f3381a8..61cc3e7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "rich-text", "widgetName": "RichText", - "version": "1.3.3", + "version": "1.3.4", "description": "Rich inline or toolbar text editing", "scripts": { "start": "webpack-dev-server --hot --open", diff --git a/src/components/RichText.ts b/src/components/RichText.ts index 2ee8e9d..9481dda 100644 --- a/src/components/RichText.ts +++ b/src/components/RichText.ts @@ -178,7 +178,6 @@ export class RichText extends Component { if (toolbar) { // required to disable editor blur events when the toolbar is clicked toolbar.addEventListener("mousedown", event => event.preventDefault()); - toolbar.addEventListener("touchend", event => event.preventDefault()); } if (editor && props.tabAction === "indent") { editor.addEventListener("keydown", event => event.stopPropagation()); From e64d906577b1022bd8b6ae4721701407b412e095 Mon Sep 17 00:00:00 2001 From: Diego Antonelli Date: Fri, 5 Jul 2019 16:45:42 +0200 Subject: [PATCH 3/3] Updating package version --- src/package.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.xml b/src/package.xml index 7b14201..a6b6614 100644 --- a/src/package.xml +++ b/src/package.xml @@ -1,6 +1,6 @@ - +