@atlaskit/editor-plugin-hyperlink 4.2.3 → 4.2.4

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-hyperlink
 
+## 4.2.4
+
+### Patch Changes
+
+- [#121182](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/121182)
+  [`224d725203e16`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/224d725203e16) -
+  [ux] EDF-2445 - Link added via cmd-k above a inline comment will be decorated by the inline
+  comment under FG platform_editor_update_insert_link_mark_end_pos
+
 ## 4.2.3
 
 ### Patch Changes

package/dist/cjs/editor-commands/commands.js

@@ -23,6 +23,7 @@ var _link = require("@atlaskit/editor-common/link");
 var _preset = require("@atlaskit/editor-common/preset");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _main = require("../pm-plugins/main");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -112,10 +113,20 @@ function insertLink(from, to, incomingHref, incomingTitle, displayText, source,
       var _text = displayText || incomingTitle || incomingHref;
       if (!displayText || displayText !== currentText) {
         tr.insertText(_text, from, to);
-        if (!(0, _link.isTextAtPos)(from)(state)) {
-          markEnd = from + _text.length + 1;
+        if ((0, _platformFeatureFlags.fg)('platform_editor_update_insert_link_mark_end_pos')) {
+          // new block created to wrap the link
+          if (tr.mapping.map(from) === from + _text.length + 2) {
+            // +1 is for the block's opening tag
+            markEnd = from + _text.length + 1;
+          } else {
+            markEnd = from + _text.length;
+          }
         } else {
-          markEnd = from + _text.length;
+          if (!(0, _link.isTextAtPos)(from)(state)) {
+            markEnd = from + _text.length + 1;
+          } else {
+            markEnd = from + _text.length;
+          }
         }
       }
       tr.addMark(from, markEnd, link.create({

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

@@ -136,7 +136,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(opti
             var link = linkMark[0] && linkMark[0].attrs.href;
             var isValidUrl = (0, _adfSchema.isSafeUrl)(link);
             var labelOpenLink = formatMessage(isValidUrl ? _messages.linkMessages.openLink : _messages.linkToolbarMessages.unableToOpenLink);
-            // TODO: ED-14403 investigate why these are not translating?
+            // TODO: ED-14403 - investigate why these are not translating?
             var labelUnlink = formatMessage(_messages.linkToolbarMessages.unlink);
             var editLink = formatMessage(_messages.linkToolbarMessages.editLink);
             var metadata = {

package/dist/es2019/editor-commands/commands.js

@@ -5,6 +5,7 @@ import { isTextAtPos, LinkAction } from '@atlaskit/editor-common/link';
 import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
 import { getLinkCreationAnalyticsEvent, normalizeUrl } from '@atlaskit/editor-common/utils';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { stateKey } from '../pm-plugins/main';
 function setLinkHrefEditorCommand(href, pos, editorAnalyticsApi, to, isTabPressed) {
   return ({
@@ -96,10 +97,20 @@ export function insertLink(from, to, incomingHref, incomingTitle, displayText, s
       const text = displayText || incomingTitle || incomingHref;
       if (!displayText || displayText !== currentText) {
         tr.insertText(text, from, to);
-        if (!isTextAtPos(from)(state)) {
-          markEnd = from + text.length + 1;
+        if (fg('platform_editor_update_insert_link_mark_end_pos')) {
+          // new block created to wrap the link
+          if (tr.mapping.map(from) === from + text.length + 2) {
+            // +1 is for the block's opening tag
+            markEnd = from + text.length + 1;
+          } else {
+            markEnd = from + text.length;
+          }
         } else {
-          markEnd = from + text.length;
+          if (!isTextAtPos(from)(state)) {
+            markEnd = from + text.length + 1;
+          } else {
+            markEnd = from + text.length;
+          }
         }
       }
       tr.addMark(from, markEnd, link.create({

package/dist/es2019/ui/PrimaryToolbarComponent.js

@@ -15,7 +15,7 @@ import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import LinkIcon from '@atlaskit/icon/core/link';
 const PrimaryToolbarComponentWithIntl = ({
   api,
-  // TODO - Analytics
+  // TODO: ED-26959 - Analytics
   // editorAnalyticsAPI,
   intl
 }) => {

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

@@ -122,7 +122,7 @@ export const getToolbarConfig = (options, pluginInjectionApi) => (state, intl, p
           const link = linkMark[0] && linkMark[0].attrs.href;
           const isValidUrl = isSafeUrl(link);
           const labelOpenLink = formatMessage(isValidUrl ? linkMessages.openLink : linkToolbarCommonMessages.unableToOpenLink);
-          // TODO: ED-14403 investigate why these are not translating?
+          // TODO: ED-14403 - investigate why these are not translating?
           const labelUnlink = formatMessage(linkToolbarCommonMessages.unlink);
           const editLink = formatMessage(linkToolbarCommonMessages.editLink);
           const metadata = {

package/dist/esm/editor-commands/commands.js

@@ -8,6 +8,7 @@ import { isTextAtPos, LinkAction } from '@atlaskit/editor-common/link';
 import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
 import { getLinkCreationAnalyticsEvent, normalizeUrl } from '@atlaskit/editor-common/utils';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { stateKey } from '../pm-plugins/main';
 function setLinkHrefEditorCommand(href, pos, editorAnalyticsApi, to, isTabPressed) {
   return function (_ref) {
@@ -95,10 +96,20 @@ export function insertLink(from, to, incomingHref, incomingTitle, displayText, s
       var _text = displayText || incomingTitle || incomingHref;
       if (!displayText || displayText !== currentText) {
         tr.insertText(_text, from, to);
-        if (!isTextAtPos(from)(state)) {
-          markEnd = from + _text.length + 1;
+        if (fg('platform_editor_update_insert_link_mark_end_pos')) {
+          // new block created to wrap the link
+          if (tr.mapping.map(from) === from + _text.length + 2) {
+            // +1 is for the block's opening tag
+            markEnd = from + _text.length + 1;
+          } else {
+            markEnd = from + _text.length;
+          }
         } else {
-          markEnd = from + _text.length;
+          if (!isTextAtPos(from)(state)) {
+            markEnd = from + _text.length + 1;
+          } else {
+            markEnd = from + _text.length;
+          }
         }
       }
       tr.addMark(from, markEnd, link.create({

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

@@ -126,7 +126,7 @@ export var getToolbarConfig = function getToolbarConfig(options, pluginInjection
             var link = linkMark[0] && linkMark[0].attrs.href;
             var isValidUrl = isSafeUrl(link);
             var labelOpenLink = formatMessage(isValidUrl ? linkMessages.openLink : linkToolbarCommonMessages.unableToOpenLink);
-            // TODO: ED-14403 investigate why these are not translating?
+            // TODO: ED-14403 - investigate why these are not translating?
             var labelUnlink = formatMessage(linkToolbarCommonMessages.unlink);
             var editLink = formatMessage(linkToolbarCommonMessages.editLink);
             var metadata = {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-hyperlink",
-	"version": "4.2.3",
+	"version": "4.2.4",
 	"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.0.0",
+		"@atlaskit/editor-common": "^102.2.0",
 		"@atlaskit/editor-plugin-analytics": "^2.1.0",
 		"@atlaskit/editor-plugin-card": "^5.2.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
@@ -102,6 +102,9 @@
 		}
 	},
 	"platform-feature-flags": {
+		"platform_editor_update_insert_link_mark_end_pos": {
+			"type": "boolean"
+		},
 		"linking_platform_smart_links_in_live_pages": {
 			"type": "boolean"
 		}