@atlaskit/editor-common 78.23.4 → 78.23.5

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-common
 
+## 78.23.5
+
+### Patch Changes
+
+- [#87218](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/87218) [`697e394e4300`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/697e394e4300) - NO-ISSUE Refactor linkifyContent and findLinkMatches
+- Updated dependencies
+
 ## 78.23.4
 
 ### Patch Changes

package/dist/cjs/monitoring/error.js

@@ -16,7 +16,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "78.23.4";
+var packageVersion = "78.23.5";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/cjs/ui/DropList/index.js

@@ -22,7 +22,7 @@ var _templateObject, _templateObject2, _templateObject3;
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /** @jsx jsx */
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "78.23.4";
+var packageVersion = "78.23.5";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/cjs/utils/hyperlink.js

@@ -10,6 +10,8 @@ exports.getLinkDomain = getLinkDomain;
 exports.isFromCurrentDomain = isFromCurrentDomain;
 exports.isLinkInMatches = void 0;
 exports.linkifyContent = linkifyContent;
+exports.linkifyContentNew = linkifyContentNew;
+exports.linkifyContentOld = linkifyContentOld;
 exports.normalizeUrl = normalizeUrl;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -86,11 +88,17 @@ function normalizeUrl(url) {
   }
   return (0, _adfSchema.normalizeUrl)(url);
 }
+function linkifyContent(schema) {
+  if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.prevent-suspicious-linkification')) {
+    return linkifyContentNew(schema);
+  }
+  return linkifyContentOld(schema);
+}
 
 /**
  * Linkify content in a slice (eg. after a rich text paste)
  */
-function linkifyContent(schema) {
+function linkifyContentOld(schema) {
   return function (slice) {
     return (0, _slice.mapSlice)(slice, function (node, parent) {
       var isAllowedInParent = !parent || parent.type !== schema.nodes.codeBlock;
@@ -101,9 +109,7 @@ function linkifyContent(schema) {
       if (isAllowedInParent && node.isText && !link.isInSet(node.marks)) {
         var linkified = [];
         var text = node.text;
-        var matches = (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.prevent-suspicious-linkification') ? findLinkMatches(text).filter(function (match) {
-          return (0, _shouldAutoLinkifyTld.shouldAutoLinkifyTld)(match.title);
-        }) : findLinkMatches(text);
+        var matches = findLinkMatchesOld(text);
         var pos = 0;
         var filepaths = findFilepaths(text);
         matches.forEach(function (match) {
@@ -127,6 +133,45 @@ function linkifyContent(schema) {
     });
   };
 }
+
+/**
+ * Linkify content in a slice (eg. after a rich text paste)
+ */
+function linkifyContentNew(schema) {
+  return function (slice) {
+    return (0, _slice.mapSlice)(slice, function (node, parent) {
+      var isAllowedInParent = !parent || parent.type !== schema.nodes.codeBlock;
+      var link = node.type.schema.marks.link;
+      if (link === undefined) {
+        throw new Error('Link not in schema - unable to linkify content');
+      }
+      if (isAllowedInParent && node.isText && !link.isInSet(node.marks)) {
+        var linkified = [];
+        var text = node.text;
+        var matches = findLinkMatches(text).filter(_shouldAutoLinkifyTld.shouldAutoLinkifyMatch);
+        var pos = 0;
+        var filepaths = findFilepaths(text);
+        matches.forEach(function (match) {
+          if (isLinkInMatches(match.index, filepaths)) {
+            return;
+          }
+          if (match.index > 0) {
+            linkified.push(node.cut(pos, match.index));
+          }
+          linkified.push(node.cut(match.index, match.lastIndex).mark(link.create({
+            href: normalizeUrl(match.url)
+          }).addToSet(node.marks)));
+          pos = match.lastIndex;
+        });
+        if (pos < text.length) {
+          linkified.push(node.cut(pos));
+        }
+        return linkified;
+      }
+      return node;
+    });
+  };
+}
 function getLinkDomain(url) {
   // Remove protocol and www., if either exists
   var withoutProtocol = url.toLowerCase().replace(/^(.*):\/\//, '');
@@ -143,7 +188,19 @@ function isFromCurrentDomain(url) {
   var linkDomain = getLinkDomain(url);
   return currentDomain === linkDomain;
 }
+
+/**
+ * Fetch linkify matches from text
+ * @param text Input text from a node
+ * @returns Array of linkify matches. Returns empty array if text is empty or no matches found;
+ */
 function findLinkMatches(text) {
+  if (text === '') {
+    return [];
+  }
+  return _adfSchema.linkify.match(text) || [];
+}
+function findLinkMatchesOld(text) {
   var matches = [];
   var linkMatches = text && _adfSchema.linkify.match(text);
   if (linkMatches && linkMatches.length > 0) {

package/dist/es2019/monitoring/error.js

@@ -1,6 +1,6 @@
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "78.23.4";
+const packageVersion = "78.23.5";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/ui/DropList/index.js

@@ -7,7 +7,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "78.23.4";
+const packageVersion = "78.23.5";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

package/dist/es2019/utils/hyperlink.js

@@ -4,7 +4,7 @@
 import { isSafeUrl, linkify, normalizeUrl as normaliseLinkHref } from '@atlaskit/adf-schema';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '../analytics/types';
-import { shouldAutoLinkifyTld } from './should-auto-linkify-tld';
+import { shouldAutoLinkifyMatch } from './should-auto-linkify-tld';
 import { mapSlice } from './slice';
 
 // Regular expression for a windows filepath in the format <DRIVE LETTER>:\<folder name>\
@@ -59,11 +59,17 @@ export function normalizeUrl(url) {
   }
   return normaliseLinkHref(url);
 }
+export function linkifyContent(schema) {
+  if (getBooleanFF('platform.linking-platform.prevent-suspicious-linkification')) {
+    return linkifyContentNew(schema);
+  }
+  return linkifyContentOld(schema);
+}
 
 /**
  * Linkify content in a slice (eg. after a rich text paste)
  */
-export function linkifyContent(schema) {
+export function linkifyContentOld(schema) {
   return slice => mapSlice(slice, (node, parent) => {
     const isAllowedInParent = !parent || parent.type !== schema.nodes.codeBlock;
     const link = node.type.schema.marks.link;
@@ -73,7 +79,7 @@ export function linkifyContent(schema) {
     if (isAllowedInParent && node.isText && !link.isInSet(node.marks)) {
       const linkified = [];
       const text = node.text;
-      const matches = getBooleanFF('platform.linking-platform.prevent-suspicious-linkification') ? findLinkMatches(text).filter(match => shouldAutoLinkifyTld(match.title)) : findLinkMatches(text);
+      const matches = findLinkMatchesOld(text);
       let pos = 0;
       const filepaths = findFilepaths(text);
       matches.forEach(match => {
@@ -96,6 +102,43 @@ export function linkifyContent(schema) {
     return node;
   });
 }
+
+/**
+ * Linkify content in a slice (eg. after a rich text paste)
+ */
+export function linkifyContentNew(schema) {
+  return slice => mapSlice(slice, (node, parent) => {
+    const isAllowedInParent = !parent || parent.type !== schema.nodes.codeBlock;
+    const link = node.type.schema.marks.link;
+    if (link === undefined) {
+      throw new Error('Link not in schema - unable to linkify content');
+    }
+    if (isAllowedInParent && node.isText && !link.isInSet(node.marks)) {
+      const linkified = [];
+      const text = node.text;
+      const matches = findLinkMatches(text).filter(shouldAutoLinkifyMatch);
+      let pos = 0;
+      const filepaths = findFilepaths(text);
+      matches.forEach(match => {
+        if (isLinkInMatches(match.index, filepaths)) {
+          return;
+        }
+        if (match.index > 0) {
+          linkified.push(node.cut(pos, match.index));
+        }
+        linkified.push(node.cut(match.index, match.lastIndex).mark(link.create({
+          href: normalizeUrl(match.url)
+        }).addToSet(node.marks)));
+        pos = match.lastIndex;
+      });
+      if (pos < text.length) {
+        linkified.push(node.cut(pos));
+      }
+      return linkified;
+    }
+    return node;
+  });
+}
 export function getLinkDomain(url) {
   // Remove protocol and www., if either exists
   const withoutProtocol = url.toLowerCase().replace(/^(.*):\/\//, '');
@@ -112,7 +155,19 @@ export function isFromCurrentDomain(url) {
   const linkDomain = getLinkDomain(url);
   return currentDomain === linkDomain;
 }
+
+/**
+ * Fetch linkify matches from text
+ * @param text Input text from a node
+ * @returns Array of linkify matches. Returns empty array if text is empty or no matches found;
+ */
 function findLinkMatches(text) {
+  if (text === '') {
+    return [];
+  }
+  return linkify.match(text) || [];
+}
+function findLinkMatchesOld(text) {
   const matches = [];
   let linkMatches = text && linkify.match(text);
   if (linkMatches && linkMatches.length > 0) {

package/dist/esm/monitoring/error.js

@@ -6,7 +6,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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) { _defineProperty(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; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "78.23.4";
+var packageVersion = "78.23.5";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/esm/ui/DropList/index.js

@@ -17,7 +17,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "78.23.4";
+var packageVersion = "78.23.5";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/esm/utils/hyperlink.js

@@ -6,7 +6,7 @@ import _createClass from "@babel/runtime/helpers/createClass";
 import { isSafeUrl, linkify, normalizeUrl as normaliseLinkHref } from '@atlaskit/adf-schema';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '../analytics/types';
-import { shouldAutoLinkifyTld } from './should-auto-linkify-tld';
+import { shouldAutoLinkifyMatch } from './should-auto-linkify-tld';
 import { mapSlice } from './slice';
 
 // Regular expression for a windows filepath in the format <DRIVE LETTER>:\<folder name>\
@@ -75,11 +75,17 @@ export function normalizeUrl(url) {
   }
   return normaliseLinkHref(url);
 }
+export function linkifyContent(schema) {
+  if (getBooleanFF('platform.linking-platform.prevent-suspicious-linkification')) {
+    return linkifyContentNew(schema);
+  }
+  return linkifyContentOld(schema);
+}
 
 /**
  * Linkify content in a slice (eg. after a rich text paste)
  */
-export function linkifyContent(schema) {
+export function linkifyContentOld(schema) {
   return function (slice) {
     return mapSlice(slice, function (node, parent) {
       var isAllowedInParent = !parent || parent.type !== schema.nodes.codeBlock;
@@ -90,9 +96,7 @@ export function linkifyContent(schema) {
       if (isAllowedInParent && node.isText && !link.isInSet(node.marks)) {
         var linkified = [];
         var text = node.text;
-        var matches = getBooleanFF('platform.linking-platform.prevent-suspicious-linkification') ? findLinkMatches(text).filter(function (match) {
-          return shouldAutoLinkifyTld(match.title);
-        }) : findLinkMatches(text);
+        var matches = findLinkMatchesOld(text);
         var pos = 0;
         var filepaths = findFilepaths(text);
         matches.forEach(function (match) {
@@ -116,6 +120,45 @@ export function linkifyContent(schema) {
     });
   };
 }
+
+/**
+ * Linkify content in a slice (eg. after a rich text paste)
+ */
+export function linkifyContentNew(schema) {
+  return function (slice) {
+    return mapSlice(slice, function (node, parent) {
+      var isAllowedInParent = !parent || parent.type !== schema.nodes.codeBlock;
+      var link = node.type.schema.marks.link;
+      if (link === undefined) {
+        throw new Error('Link not in schema - unable to linkify content');
+      }
+      if (isAllowedInParent && node.isText && !link.isInSet(node.marks)) {
+        var linkified = [];
+        var text = node.text;
+        var matches = findLinkMatches(text).filter(shouldAutoLinkifyMatch);
+        var pos = 0;
+        var filepaths = findFilepaths(text);
+        matches.forEach(function (match) {
+          if (isLinkInMatches(match.index, filepaths)) {
+            return;
+          }
+          if (match.index > 0) {
+            linkified.push(node.cut(pos, match.index));
+          }
+          linkified.push(node.cut(match.index, match.lastIndex).mark(link.create({
+            href: normalizeUrl(match.url)
+          }).addToSet(node.marks)));
+          pos = match.lastIndex;
+        });
+        if (pos < text.length) {
+          linkified.push(node.cut(pos));
+        }
+        return linkified;
+      }
+      return node;
+    });
+  };
+}
 export function getLinkDomain(url) {
   // Remove protocol and www., if either exists
   var withoutProtocol = url.toLowerCase().replace(/^(.*):\/\//, '');
@@ -132,7 +175,19 @@ export function isFromCurrentDomain(url) {
   var linkDomain = getLinkDomain(url);
   return currentDomain === linkDomain;
 }
+
+/**
+ * Fetch linkify matches from text
+ * @param text Input text from a node
+ * @returns Array of linkify matches. Returns empty array if text is empty or no matches found;
+ */
 function findLinkMatches(text) {
+  if (text === '') {
+    return [];
+  }
+  return linkify.match(text) || [];
+}
+function findLinkMatchesOld(text) {
   var matches = [];
   var linkMatches = text && linkify.match(text);
   if (linkMatches && linkMatches.length > 0) {

package/dist/types/utils/hyperlink.d.ts

@@ -15,10 +15,15 @@ export declare class LinkMatcher {
  * Adds protocol to url if needed.
  */
 export declare function normalizeUrl(url?: string | null): string;
+export declare function linkifyContent(schema: Schema): (slice: Slice) => Slice;
 /**
  * Linkify content in a slice (eg. after a rich text paste)
  */
-export declare function linkifyContent(schema: Schema): (slice: Slice) => Slice;
+export declare function linkifyContentOld(schema: Schema): (slice: Slice) => Slice;
+/**
+ * Linkify content in a slice (eg. after a rich text paste)
+ */
+export declare function linkifyContentNew(schema: Schema): (slice: Slice) => Slice;
 export declare function getLinkDomain(url: string): string;
 export declare function isFromCurrentDomain(url: string): boolean;
 interface filepathMatch {

package/dist/types-ts4.5/utils/hyperlink.d.ts

@@ -15,10 +15,15 @@ export declare class LinkMatcher {
  * Adds protocol to url if needed.
  */
 export declare function normalizeUrl(url?: string | null): string;
+export declare function linkifyContent(schema: Schema): (slice: Slice) => Slice;
 /**
  * Linkify content in a slice (eg. after a rich text paste)
  */
-export declare function linkifyContent(schema: Schema): (slice: Slice) => Slice;
+export declare function linkifyContentOld(schema: Schema): (slice: Slice) => Slice;
+/**
+ * Linkify content in a slice (eg. after a rich text paste)
+ */
+export declare function linkifyContentNew(schema: Schema): (slice: Slice) => Slice;
 export declare function getLinkDomain(url: string): string;
 export declare function isFromCurrentDomain(url: string): boolean;
 interface filepathMatch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-common",
-  "version": "78.23.4",
+  "version": "78.23.5",
   "description": "A package that contains common classes and components for editor and renderer",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -121,7 +121,7 @@
     "@atlaskit/media-common": "^11.1.0",
     "@atlaskit/media-file-preview": "^0.5.0",
     "@atlaskit/media-picker": "^66.4.0",
-    "@atlaskit/media-ui": "^25.4.0",
+    "@atlaskit/media-ui": "^25.5.0",
     "@atlaskit/media-viewer": "48.4.3",
     "@atlaskit/mention": "^23.0.0",
     "@atlaskit/menu": "^2.1.0",
@@ -129,7 +129,7 @@
     "@atlaskit/primitives": "^5.5.0",
     "@atlaskit/profilecard": "^19.11.0",
     "@atlaskit/section-message": "^6.4.0",
-    "@atlaskit/smart-card": "^26.51.0",
+    "@atlaskit/smart-card": "^26.52.0",
     "@atlaskit/smart-user-picker": "^6.9.0",
     "@atlaskit/spinner": "^16.0.0",
     "@atlaskit/task-decision": "^17.9.0",