@vaadin/rich-text-editor 23.0.0-alpha1 → 23.0.0-alpha2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/rich-text-editor",
-  "version": "23.0.0-alpha1",
+  "version": "23.0.0-alpha2",
   "publishConfig": {
     "access": "public"
   },
@@ -37,14 +37,14 @@
   ],
   "dependencies": {
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/button": "23.0.0-alpha1",
-    "@vaadin/component-base": "23.0.0-alpha1",
-    "@vaadin/confirm-dialog": "23.0.0-alpha1",
-    "@vaadin/text-field": "23.0.0-alpha1",
+    "@vaadin/button": "23.0.0-alpha2",
+    "@vaadin/component-base": "23.0.0-alpha2",
+    "@vaadin/confirm-dialog": "23.0.0-alpha2",
+    "@vaadin/text-field": "23.0.0-alpha2",
     "@vaadin/vaadin-license-checker": "^2.1.0",
-    "@vaadin/vaadin-lumo-styles": "23.0.0-alpha1",
-    "@vaadin/vaadin-material-styles": "23.0.0-alpha1",
-    "@vaadin/vaadin-themable-mixin": "23.0.0-alpha1"
+    "@vaadin/vaadin-lumo-styles": "23.0.0-alpha2",
+    "@vaadin/vaadin-material-styles": "23.0.0-alpha2",
+    "@vaadin/vaadin-themable-mixin": "23.0.0-alpha2"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
@@ -54,5 +54,5 @@
     "gulp-iconfont": "^11.0.0",
     "sinon": "^9.2.1"
   },
-  "gitHead": "fbcb07328fdf88260e3b461088d207426b21c710"
+  "gitHead": "070f586dead02ca41b66717820c647f48bf1665f"
 }

package/src/vaadin-rich-text-editor-styles.js

@@ -7,11 +7,8 @@ import { css } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 import { contentStyles } from './vaadin-rich-text-editor-content-styles.js';
 import { toolbarStyles } from './vaadin-rich-text-editor-toolbar-styles.js';
 
-const richTextEditorStyles = css`
-  ${contentStyles}
-  ${toolbarStyles}
-
-:host([readonly]) [part='toolbar'] {
+export const statesStyles = css`
+  :host([readonly]) [part='toolbar'] {
     display: none;
   }
 
@@ -28,4 +25,4 @@ const richTextEditorStyles = css`
   }
 `;
 
-export { richTextEditorStyles };
+export const richTextEditorStyles = [contentStyles, toolbarStyles, statesStyles];

package/src/vaadin-rich-text-editor-toolbar-styles.js

@@ -6,9 +6,7 @@
 import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 import { iconsStyles } from './vaadin-rich-text-editor-icons.js';
 
-export const toolbarStyles = css`
-  ${iconsStyles}
-
+export const buttonsStyles = css`
   [part='toolbar'] {
     display: flex;
     flex-wrap: wrap;
@@ -132,5 +130,7 @@ export const toolbarStyles = css`
   }
 `;
 
+export const toolbarStyles = [iconsStyles, buttonsStyles];
+
 // Register a module with ID for backwards compatibility.
 registerStyles('', toolbarStyles, { moduleId: 'vaadin-rich-text-editor-toolbar-styles' });

package/src/vaadin-rich-text-editor.js

@@ -9,7 +9,6 @@ import '@vaadin/text-field/src/vaadin-text-field.js';
 import '@vaadin/vaadin-license-checker/vaadin-license-checker.js';
 import '../vendor/vaadin-quill.js';
 import './vaadin-rich-text-editor-toolbar-styles.js';
-import { resetMouseCanceller } from '@polymer/polymer/lib/utils/gestures.js';
 import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
 import { timeOut } from '@vaadin/component-base/src/async.js';
 import { isFirefox } from '@vaadin/component-base/src/browser-utils.js';
@@ -714,7 +713,9 @@ class RichTextEditor extends ElementMixin(ThemableMixin(PolymerElement)) {
       document.body.appendChild(this.__fakeTarget);
       // let the focus step out of shadow root!
       this.__fakeTarget.focus();
-      return new Promise((resolve) => setTimeout(resolve));
+      return new Promise((resolve) => {
+        setTimeout(resolve);
+      });
     };
 
     const focusBack = (offsetNode, offset) => {
@@ -992,18 +993,9 @@ class RichTextEditor extends ElementMixin(ThemableMixin(PolymerElement)) {
   _onImageTouchEnd(e) {
     // Cancel the event to avoid the following click event
     e.preventDefault();
-    // FIXME(platosha): workaround for Polymer Gestures mouseCanceller
-    // cancelling the following synthetic click. See also:
-    // https://github.com/Polymer/polymer/issues/5289
-    this.__resetMouseCanceller();
     this._onImageClick();
   }
 
-  /** @private */
-  __resetMouseCanceller() {
-    resetMouseCanceller();
-  }
-
   /** @private */
   _onImageClick() {
     this.$.fileInput.value = '';