@atlaskit/editor-plugin-hyperlink 4.2.4 → 4.2.6

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-hyperlink
 
+## 4.2.6
+
+### Patch Changes
+
+- Updated dependencies
+
+## 4.2.5
+
+### Patch Changes
+
+- [#125391](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/125391)
+  [`ead20443d03e8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ead20443d03e8) -
+  [ux] When Editor Controls enabled, we show Text Formatting toolbar on range selection inside of a
+  hyperlink.
+- Updated dependencies
+
 ## 4.2.4
 
 ### Patch Changes

package/dist/cjs/ui/toolbar/Toolbar.js

@@ -18,6 +18,7 @@ var _link2 = require("@atlaskit/editor-common/link");
 var _messages = require("@atlaskit/editor-common/messages");
 var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-common/utils");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _linkBroken = _interopRequireDefault(require("@atlaskit/icon/core/link-broken"));
 var _linkExternal = _interopRequireDefault(require("@atlaskit/icon/core/link-external"));
 var _unlink = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/unlink"));
@@ -108,6 +109,12 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(opti
     if (options.disableFloatingToolbar) {
       return;
     }
+
+    // If range selection, we don't show hyperlink floating toolbar.
+    // Text Formattting toolbar is shown instaed.
+    if (state.selection instanceof _state.TextSelection && state.selection.to !== state.selection.from && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
+      return;
+    }
     var formatMessage = intl.formatMessage;
     var linkState = _main.stateKey.getState(state);
     var editorCardActions = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c2 = pluginInjectionApi.card) === null || _pluginInjectionApi$c2 === void 0 ? void 0 : _pluginInjectionApi$c2.actions;

package/dist/es2019/ui/toolbar/Toolbar.js

@@ -7,6 +7,7 @@ import { HyperlinkAddToolbar } from '@atlaskit/editor-common/link';
 import { linkMessages, linkToolbarMessages as linkToolbarCommonMessages } from '@atlaskit/editor-common/messages';
 import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
 import { normalizeUrl } from '@atlaskit/editor-common/utils';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import LinkBrokenIcon from '@atlaskit/icon/core/link-broken';
 import LinkExternalIcon from '@atlaskit/icon/core/link-external';
 import UnlinkIcon from '@atlaskit/icon/glyph/editor/unlink';
@@ -92,6 +93,12 @@ export const getToolbarConfig = (options, pluginInjectionApi) => (state, intl, p
   if (options.disableFloatingToolbar) {
     return;
   }
+
+  // If range selection, we don't show hyperlink floating toolbar.
+  // Text Formattting toolbar is shown instaed.
+  if (state.selection instanceof TextSelection && state.selection.to !== state.selection.from && editorExperiment('platform_editor_controls', 'variant1')) {
+    return;
+  }
   const {
     formatMessage
   } = intl;

package/dist/esm/ui/toolbar/Toolbar.js

@@ -11,6 +11,7 @@ import { HyperlinkAddToolbar } from '@atlaskit/editor-common/link';
 import { linkMessages, linkToolbarMessages as linkToolbarCommonMessages } from '@atlaskit/editor-common/messages';
 import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
 import { normalizeUrl } from '@atlaskit/editor-common/utils';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import LinkBrokenIcon from '@atlaskit/icon/core/link-broken';
 import LinkExternalIcon from '@atlaskit/icon/core/link-external';
 import UnlinkIcon from '@atlaskit/icon/glyph/editor/unlink';
@@ -98,6 +99,12 @@ export var getToolbarConfig = function getToolbarConfig(options, pluginInjection
     if (options.disableFloatingToolbar) {
       return;
     }
+
+    // If range selection, we don't show hyperlink floating toolbar.
+    // Text Formattting toolbar is shown instaed.
+    if (state.selection instanceof TextSelection && state.selection.to !== state.selection.from && editorExperiment('platform_editor_controls', 'variant1')) {
+      return;
+    }
     var formatMessage = intl.formatMessage;
     var linkState = stateKey.getState(state);
     var editorCardActions = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c2 = pluginInjectionApi.card) === null || _pluginInjectionApi$c2 === void 0 ? void 0 : _pluginInjectionApi$c2.actions;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-hyperlink",
-	"version": "4.2.4",
+	"version": "4.2.6",
 	"description": "Hyperlink plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -35,7 +35,7 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
 		"@atlaskit/analytics-next": "^11.0.0",
-		"@atlaskit/editor-common": "^102.2.0",
+		"@atlaskit/editor-common": "^102.4.0",
 		"@atlaskit/editor-plugin-analytics": "^2.1.0",
 		"@atlaskit/editor-plugin-card": "^5.2.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
@@ -43,10 +43,10 @@
 		"@atlaskit/editor-plugin-primary-toolbar": "^3.0.0",
 		"@atlaskit/editor-plugin-selection-toolbar": "^2.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/icon": "^24.1.0",
+		"@atlaskit/icon": "^25.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-input-rules": "^3.3.0",
-		"@atlaskit/tmp-editor-statsig": "^3.4.0",
+		"@atlaskit/tmp-editor-statsig": "^3.6.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"uuid": "^3.1.0"