Merge branch 'develop'

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wix-rich-content-common",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "author": {
     "name": "Jonathan Bachman",
     "email": "jonathanb@wix.com"

packages/common/src/Components/LinkButton.jsx

@@ -24,7 +24,7 @@ export default class LinkButton extends Component {
         styles.inlineToolbarButton_wrapper,
         {
           [buttonStyles.inlineToolbarButton_wrapper]: !!buttonStyles.inlineToolbarButton_wrapper,
-          [buttonStyles.inlineToolbarButton_wrapper]: !!buttonStyles.inlineToolbarButton_wrapper,
+          [buttonStyles.pluginToolbarButton_wrapper]: !!buttonStyles.pluginToolbarButton_wrapper,
         }
       ),
       icon: classNames(styles.inlineToolbarButton_icon,

packages/common/src/Components/LinkPanel.jsx

@@ -96,9 +96,16 @@ class LinkPanel extends Component {
     }
   };
 
-  handleKeyPress = e => {
-    if (e.charCode === 13) {
-      this.validateUrl();
+  handleKeyDown = e => {
+    const { onEnter, onEscape } = this.props;
+    if (e.key === 'Enter') { // TODO: only the 2nd 'Enter' key closes the panel because of setState() call in the validateUrl
+      if (onEnter) {
+        onEnter(e);
+      } else {
+        this.validateUrl();
+      }
+    } else if (e.key === 'Escape') {
+      onEscape && onEscape(e);
     }
   };
 
@@ -118,7 +125,7 @@ class LinkPanel extends Component {
       <div className={styles.linkPanel_Content} {...ariaProps} role="form">
         <div className={styles.linkPanel_Input}>
           <input
-            onKeyPress={this.handleKeyPress}
+            onKeyDown={this.handleKeyDown}
             tabIndex="0" type="url" ref={ref => (this.input = ref)} className={textInputClassName} placeholder={this.inputPlaceholder}
             data-hook="linkPanelInput" onChange={this.handleIntermediateUrlChange} onBlur={this.validateUrl} value={this.state.intermediateUrl}
           />
@@ -163,5 +170,7 @@ LinkPanel.propTypes = {
   onTargetBlankChange: PropTypes.func,
   onNofollowChange: PropTypes.func,
   onValidateUrl: PropTypes.func,
+  onEnter: PropTypes.func,
+  onEscape: PropTypes.func,
 };
 export default LinkPanel;

packages/common/src/Components/LinkPanelContainer.jsx

@@ -64,6 +64,7 @@ class LinkPanelContainer extends Component {
       <FocusManager className={linkPanelContainerClassName} data-hook="linkPanelContainer" role="form" {...ariaProps}>
         <div className={styles.linkPanel_content}>
           <LinkPanel
+            onEnter={e => this.onDoneClick(e)} onEscape={e => this.onCancelClick(e)}
             ref={this.setLinkPanel} theme={theme} url={url} targetBlank={targetBlank} anchorTarget={anchorTarget}
             relValue={relValue} nofollow={nofollow} t={t} ariaProps={{ 'aria-label': 'Link management' }}
           />

packages/editor/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "wix-rich-content-editor",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "author": {
     "name": "Jonathan Bachman",
     "email": "jonathanb@wix.com"
@@ -58,7 +58,7 @@
     "react-i18next": "^7.6.1",
     "react-measure": "^2.0.2",
     "redraft": "^0.9.0",
-    "wix-rich-content-common": "^1.1.2",
+    "wix-rich-content-common": "^1.1.3",
     "wnpm-ci": "latest"
   },
   "peerDependencies": {

packages/plugin-divider/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wix-rich-content-plugin-divider",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "author": {
     "name": "Jonathan Bachman",
     "email": "jonathanb@wix.com"
@@ -62,7 +62,7 @@
     "react-dom": "15.5.4"
   },
   "dependencies": {
-    "wix-rich-content-common": "^1.1.2"
+    "wix-rich-content-common": "^1.1.3"
   },
   "unpkg": true,
   "publishConfig": {

packages/plugin-emoji/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wix-rich-content-plugin-emoji",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "author": {
     "name": "Jonathan Bachman",
     "email": "jonathanb@wix.com"
@@ -62,7 +62,7 @@
   "dependencies": {
     "draft-js-emoji-plugin": "^2.0.2",
     "react-icons": "^2.2.7",
-    "wix-rich-content-common": "^1.1.2"
+    "wix-rich-content-common": "^1.1.3"
   },
   "unpkg": true,
   "publishConfig": {

packages/plugin-gallery/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wix-rich-content-plugin-gallery",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "author": {
     "name": "Jonathan Bachman",
     "email": "jonathanb@wix.com"
@@ -65,7 +65,7 @@
     "image-client-api": "^1.195.0",
     "pro-gallery-renderer": "^1.0.177",
     "react-sortable-hoc": "^0.6.8",
-    "wix-rich-content-common": "^1.1.2"
+    "wix-rich-content-common": "^1.1.3"
   },
   "unpkg": true,
   "publishConfig": {

packages/plugin-hashtag/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wix-rich-content-plugin-hashtag",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "author": {
     "name": "Jonathan Bachman",
     "email": "jonathanb@wix.com"
@@ -54,7 +54,7 @@
     "react-dom": "15.5.4"
   },
   "dependencies": {
-    "wix-rich-content-common": "^1.1.2"
+    "wix-rich-content-common": "^1.1.3"
   },
   "unpkg": true,
   "publishConfig": {

packages/plugin-html/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wix-rich-content-plugin-html",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "author": {
     "name": "Jonathan Bachman",
     "email": "jonathanb@wix.com"
@@ -61,7 +61,7 @@
   },
   "dependencies": {
     "react-i18next": "^7.6.1",
-    "wix-rich-content-common": "^1.1.2"
+    "wix-rich-content-common": "^1.1.3"
   },
   "unpkg": true,
   "publishConfig": {

packages/plugin-image/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wix-rich-content-plugin-image",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "author": {
     "name": "Jonathan Bachman",
     "email": "jonathanb@wix.com"
@@ -60,7 +60,7 @@
     "react-dom": "15.5.4"
   },
   "dependencies": {
-    "wix-rich-content-common": "^1.1.2"
+    "wix-rich-content-common": "^1.1.3"
   },
   "unpkg": true,
   "publishConfig": {

packages/plugin-link/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wix-rich-content-plugin-link",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "author": {
     "name": "Jonathan Bachman",
     "email": "jonathanb@wix.com"
@@ -54,7 +54,7 @@
   },
   "dependencies": {
     "draft-js-linkify-plugin": "^2.0.1",
-    "wix-rich-content-common": "^1.1.2"
+    "wix-rich-content-common": "^1.1.3"
   },
   "unpkg": true,
   "publishConfig": {

packages/plugin-mentions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wix-rich-content-plugin-mentions",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "author": {
     "name": "Vytenis Butkevicius",
     "email": "vytenisb@wix.com"
@@ -57,7 +57,7 @@
   "dependencies": {
     "decorate-component-with-props": "^1.1.0",
     "draft-js-mention-plugin": "^3.0.4",
-    "wix-rich-content-common": "^1.1.2"
+    "wix-rich-content-common": "^1.1.3"
   },
   "unpkg": true,
   "publishConfig": {

packages/plugin-video/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wix-rich-content-plugin-video",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "author": {
     "name": "Jonathan Bachman",
     "email": "jonathanb@wix.com"
@@ -61,7 +61,7 @@
   },
   "dependencies": {
     "react-player": "^1.5.0",
-    "wix-rich-content-common": "^1.1.2"
+    "wix-rich-content-common": "^1.1.3"
   },
   "unpkg": true,
   "publishConfig": {

packages/viewer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wix-rich-content-viewer",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "author": {
     "name": "Jonathan Bachman",
     "email": "jonathanb@wix.com"
@@ -39,7 +39,7 @@
     "classnames": "^2.2.6",
     "lodash": "^4.17.10",
     "redraft": "^0.9.0",
-    "wix-rich-content-common": "^1.1.2",
+    "wix-rich-content-common": "^1.1.3",
     "wnpm-ci": "latest"
   },
   "peerDependencies": {

packages/viewer/src/index.js

@@ -1,2 +1 @@
 export { default as RichContentViewer } from './RichContentViewer';
-export { LinkStrategy } from './decorators/linkDecorator';