@atlaskit/editor-plugin-floating-toolbar 3.2.4 → 3.2.5

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-floating-toolbar
 
+## 3.2.5
+
+### Patch Changes
+
+- [#128611](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/128611)
+  [`428548761fab9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/428548761fab9) -
+  [ux] ED-27133 fix toolbar link button
+- Updated dependencies
+
 ## 3.2.4
 
 ### Patch Changes

package/dist/cjs/ui/Toolbar.js

@@ -545,8 +545,14 @@ var Toolbar = /*#__PURE__*/function (_Component) {
       event.preventDefault();
       event.stopPropagation();
     });
-    (0, _defineProperty2.default)(_this, "handleMouseDown", function (event) {
-      // Prevents selection toolbar from closing when clicking on the toolbar
+    (0, _defineProperty2.default)(_this, "captureMouseEvent", function (event) {
+      var _this$props$items2;
+      // Don't capture mouse event for custom toolbars e.g. insert hyperlink
+      if (((_this$props$items2 = _this.props.items) === null || _this$props$items2 === void 0 ? void 0 : _this$props$items2.length) === 1 && _this.props.items[0].type === 'custom') {
+        return;
+      }
+
+      // Prevents toolbar from closing when clicking on the toolbar itself and not on the buttons
       event.stopPropagation();
       event.preventDefault();
     });
@@ -666,7 +672,7 @@ var Toolbar = /*#__PURE__*/function (_Component) {
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
         ,
         className: className,
-        onMouseDown: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? this.handleMouseDown : undefined
+        onMouseDown: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? this.captureMouseEvent : undefined
       }, (0, _react2.jsx)(_ui.Announcer, {
         text: mediaAssistiveMessage ? "".concat(mediaAssistiveMessage, ", ").concat(intl.formatMessage(_floatingToolbar.messages.floatingToolbarAnnouncer)) : intl.formatMessage(_floatingToolbar.messages.floatingToolbarAnnouncer),
         delay: 250

package/dist/es2019/ui/Toolbar.js

@@ -505,8 +505,14 @@ class Toolbar extends Component {
       event.preventDefault();
       event.stopPropagation();
     });
-    _defineProperty(this, "handleMouseDown", event => {
-      // Prevents selection toolbar from closing when clicking on the toolbar
+    _defineProperty(this, "captureMouseEvent", event => {
+      var _this$props$items2;
+      // Don't capture mouse event for custom toolbars e.g. insert hyperlink
+      if (((_this$props$items2 = this.props.items) === null || _this$props$items2 === void 0 ? void 0 : _this$props$items2.length) === 1 && this.props.items[0].type === 'custom') {
+        return;
+      }
+
+      // Prevents toolbar from closing when clicking on the toolbar itself and not on the buttons
       event.stopPropagation();
       event.preventDefault();
     });
@@ -616,7 +622,7 @@ class Toolbar extends Component {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
       ,
       className: className,
-      onMouseDown: editorExperiment('platform_editor_controls', 'variant1') ? this.handleMouseDown : undefined
+      onMouseDown: editorExperiment('platform_editor_controls', 'variant1') ? this.captureMouseEvent : undefined
     }, jsx(Announcer, {
       text: mediaAssistiveMessage ? `${mediaAssistiveMessage}, ${intl.formatMessage(messages.floatingToolbarAnnouncer)}` : intl.formatMessage(messages.floatingToolbarAnnouncer),
       delay: 250

package/dist/esm/ui/Toolbar.js

@@ -538,8 +538,14 @@ var Toolbar = /*#__PURE__*/function (_Component) {
       event.preventDefault();
       event.stopPropagation();
     });
-    _defineProperty(_this, "handleMouseDown", function (event) {
-      // Prevents selection toolbar from closing when clicking on the toolbar
+    _defineProperty(_this, "captureMouseEvent", function (event) {
+      var _this$props$items2;
+      // Don't capture mouse event for custom toolbars e.g. insert hyperlink
+      if (((_this$props$items2 = _this.props.items) === null || _this$props$items2 === void 0 ? void 0 : _this$props$items2.length) === 1 && _this.props.items[0].type === 'custom') {
+        return;
+      }
+
+      // Prevents toolbar from closing when clicking on the toolbar itself and not on the buttons
       event.stopPropagation();
       event.preventDefault();
     });
@@ -659,7 +665,7 @@ var Toolbar = /*#__PURE__*/function (_Component) {
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
         ,
         className: className,
-        onMouseDown: editorExperiment('platform_editor_controls', 'variant1') ? this.handleMouseDown : undefined
+        onMouseDown: editorExperiment('platform_editor_controls', 'variant1') ? this.captureMouseEvent : undefined
       }, jsx(Announcer, {
         text: mediaAssistiveMessage ? "".concat(mediaAssistiveMessage, ", ").concat(intl.formatMessage(messages.floatingToolbarAnnouncer)) : intl.formatMessage(messages.floatingToolbarAnnouncer),
         delay: 250

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-floating-toolbar",
-	"version": "3.2.4",
+	"version": "3.2.5",
 	"description": "Floating toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",