@atlaskit/editor-common 88.0.0 → 88.1.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @atlaskit/editor-common
 
+## 88.1.0
+
+### Minor Changes
+
+- [`193f8c85e1a39`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/193f8c85e1a39) -
+  [ux] [ED-24635]
+
+  - Disable Turn into dropdown options when wrapping is not supported
+  - Update expand icon so that it can show disabled status
+  - Update Turn into icon to show active status when dropdown is open
+
+- [#132259](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/132259)
+  [`f5e633e11af26`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f5e633e11af26) -
+  Expose options for the core plugin so that you can opt out of scrolling within the editor after
+  using the "focus" action.
+- [#132800](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/132800)
+  [`7868d12fa96a1`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/7868d12fa96a1) -
+  EDM-9074 Remove platform.linking-platform.prevent-suspicious-linkification feature flag
+
+### Patch Changes
+
+- [#133191](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/133191)
+  [`78a1927084934`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/78a1927084934) -
+  [ux] Remove icon migration feature gate and migrate new icons on primary toolbar
+
 ## 88.0.0
 
 ### Major Changes

package/dist/cjs/insert/index.js

@@ -4,7 +4,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.shouldSplitSelectedNodeOnNodeInsertion = exports.safeInsert = exports.normaliseNestedLayout = exports.insertSelectedItem = exports.LookDirection = void 0;
+exports.LookDirection = void 0;
+exports.contentAllowedInCodeBlock = contentAllowedInCodeBlock;
+exports.shouldSplitSelectedNodeOnNodeInsertion = exports.safeInsert = exports.normaliseNestedLayout = exports.insertSelectedItem = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
@@ -270,4 +272,23 @@ var shouldSplitSelectedNodeOnNodeInsertion = exports.shouldSplitSelectedNodeOnNo
     return true;
   }
   return false;
-};
+};
+
+/**
+ * Check if the current selection contains any nodes that are not permitted
+ * as codeBlock child nodes. Note that this allows paragraphs and inline nodes
+ * as we extract their text content.
+ */
+function contentAllowedInCodeBlock(state) {
+  var _state$selection = state.selection,
+    $from = _state$selection.$from,
+    $to = _state$selection.$to;
+  var isAllowedChild = true;
+  state.doc.nodesBetween($from.pos, $to.pos, function (node) {
+    if (!isAllowedChild) {
+      return false;
+    }
+    return isAllowedChild = node.type === state.schema.nodes.listItem || node.type === state.schema.nodes.bulletList || node.type === state.schema.nodes.orderedList || node.type === state.schema.nodes.paragraph || node.isInline || node.type === state.schema.nodes.panel || node.isText;
+  });
+  return isAllowedChild;
+}

package/dist/cjs/monitoring/error.js

@@ -17,7 +17,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 = "88.0.0";
+var packageVersion = "88.1.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/cjs/paste/md-plugins/linkify-md-plugin.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _linkifyIt = _interopRequireDefault(require("linkify-it"));
 var _adfSchema = require("@atlaskit/adf-schema");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _utils = require("../../utils");
 // File has been copied to packages/editor/editor-plugin-ai/src/provider/markdown-transformer/md/linkify-md-plugin.ts
 // If changes are made to this file, please make the same update in the linked file.
@@ -67,11 +66,9 @@ var linkify = function linkify(state) {
         if (!links.length) {
           links = linkify.match(text) || [];
         }
-        if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.prevent-suspicious-linkification')) {
-          links = links.filter(function (link) {
-            return (0, _utils.shouldAutoLinkifyMatch)(link);
-          });
-        }
+        links = links.filter(function (link) {
+          return (0, _utils.shouldAutoLinkifyMatch)(link);
+        });
 
         // Now split string to nodes
         var nodes = [];

package/dist/cjs/preset/core-plugin/index.js

@@ -25,13 +25,16 @@ var corePlugin = exports.corePlugin = function corePlugin(_ref) {
         return (0, _editorCommands.editorCommandToPMCommand)(command)(state, dispatch);
       },
       // Code copied from `EditorActions.focus()`
-      focus: function focus() {
+      focus: function focus(options) {
+        var _options$scrollIntoVi;
         var editorView = config === null || config === void 0 ? void 0 : config.getEditorView();
         if (!editorView || editorView.hasFocus()) {
           return false;
         }
         editorView.focus();
-        editorView.dispatch(editorView.state.tr.scrollIntoView());
+        if ((_options$scrollIntoVi = options === null || options === void 0 ? void 0 : options.scrollIntoView) !== null && _options$scrollIntoVi !== void 0 ? _options$scrollIntoVi : true) {
+          editorView.dispatch(editorView.state.tr.scrollIntoView());
+        }
         return true;
       },
       // Code copied from `EditorActions.blur()`

package/dist/cjs/styles/shared/expand.js

@@ -14,7 +14,8 @@ var expandIconWrapperStyle = exports.expandIconWrapperStyle = (0, _react.css)({
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 var expandIconContainerStyle = exports.expandIconContainerStyle = (0, _react.css)({
-  padding: "var(--ds-space-050, 4px)".concat(" ", "var(--ds-space-050, 4px)", " 0 0")
+  display: 'flex',
+  alignItems: 'center'
 });
 var prefix = 'ak-editor-expand';
 var expandClassNames = exports.expandClassNames = {

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

@@ -23,7 +23,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "88.0.0";
+var packageVersion = "88.1.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/cjs/utils/create-wrap-selection-transaction.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createWrapSelectionTransaction = createWrapSelectionTransaction;
+exports.getWrappingOptions = getWrappingOptions;
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorCoreUtils = require("./editor-core-utils");

package/dist/cjs/utils/hyperlink.js

@@ -10,13 +10,10 @@ 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"));
 var _adfSchema = require("@atlaskit/adf-schema");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _types = require("../analytics/types");
 var _shouldAutoLinkifyTld = require("./should-auto-linkify-tld");
 var _slice = require("./slice");
@@ -88,56 +85,11 @@ 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 linkifyContentOld(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 = findLinkMatchesOld(text);
-        var pos = 0;
-        var filepaths = findFilepaths(text);
-        matches.forEach(function (match) {
-          if (isLinkInMatches(match.start, filepaths)) {
-            return;
-          }
-          if (match.start > 0) {
-            linkified.push(node.cut(pos, match.start));
-          }
-          linkified.push(node.cut(match.start, match.end).mark(link.create({
-            href: normalizeUrl(match.href)
-          }).addToSet(node.marks)));
-          pos = match.end;
-        });
-        if (pos < text.length) {
-          linkified.push(node.cut(pos));
-        }
-        return linkified;
-      }
-      return node;
-    });
-  };
-}
 
 /**
  * Linkify content in a slice (eg. after a rich text paste)
  */
-function linkifyContentNew(schema) {
+function linkifyContent(schema) {
   return function (slice) {
     return (0, _slice.mapSlice)(slice, function (node, parent) {
       var isAllowedInParent = !parent || parent.type !== schema.nodes.codeBlock;
@@ -200,21 +152,6 @@ function findLinkMatches(text) {
   }
   return _adfSchema.linkify.match(text) || [];
 }
-function findLinkMatchesOld(text) {
-  var matches = [];
-  var linkMatches = text && _adfSchema.linkify.match(text);
-  if (linkMatches && linkMatches.length > 0) {
-    linkMatches.forEach(function (match) {
-      matches.push({
-        start: match.index,
-        end: match.lastIndex,
-        title: match.raw,
-        href: match.url
-      });
-    });
-  }
-  return matches;
-}
 var findFilepaths = exports.findFilepaths = function findFilepaths(text) {
   var offset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   // Creation of a copy of the RegExp is necessary as lastIndex is stored on it when we run .exec()

package/dist/cjs/utils/index.js

@@ -564,6 +564,12 @@ Object.defineProperty(exports, "getUnsupportedContentLevelData", {
     return _analytics.getUnsupportedContentLevelData;
   }
 });
+Object.defineProperty(exports, "getWrappingOptions", {
+  enumerable: true,
+  get: function get() {
+    return _createWrapSelectionTransaction.getWrappingOptions;
+  }
+});
 Object.defineProperty(exports, "gridTypeForLayout", {
   enumerable: true,
   get: function get() {

package/dist/es2019/insert/index.js

@@ -265,4 +265,24 @@ export const shouldSplitSelectedNodeOnNodeInsertion = ({
     return true;
   }
   return false;
-};
+};
+
+/**
+ * Check if the current selection contains any nodes that are not permitted
+ * as codeBlock child nodes. Note that this allows paragraphs and inline nodes
+ * as we extract their text content.
+ */
+export function contentAllowedInCodeBlock(state) {
+  const {
+    $from,
+    $to
+  } = state.selection;
+  let isAllowedChild = true;
+  state.doc.nodesBetween($from.pos, $to.pos, node => {
+    if (!isAllowedChild) {
+      return false;
+    }
+    return isAllowedChild = node.type === state.schema.nodes.listItem || node.type === state.schema.nodes.bulletList || node.type === state.schema.nodes.orderedList || node.type === state.schema.nodes.paragraph || node.isInline || node.type === state.schema.nodes.panel || node.isText;
+  });
+  return isAllowedChild;
+}

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 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 = "88.0.0";
+const packageVersion = "88.1.0";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/paste/md-plugins/linkify-md-plugin.js

@@ -5,7 +5,6 @@
 
 import LinkifyIt from 'linkify-it';
 import { linkifyMatch } from '@atlaskit/adf-schema';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { findFilepaths, isLinkInMatches, shouldAutoLinkifyMatch } from '../../utils';
 
 // modified version of the original markdown-it Linkify plugin
@@ -61,9 +60,7 @@ const linkify = state => {
         if (!links.length) {
           links = linkify.match(text) || [];
         }
-        if (getBooleanFF('platform.linking-platform.prevent-suspicious-linkification')) {
-          links = links.filter(link => shouldAutoLinkifyMatch(link));
-        }
+        links = links.filter(link => shouldAutoLinkifyMatch(link));
 
         // Now split string to nodes
         const nodes = [];

package/dist/es2019/preset/core-plugin/index.js

@@ -23,13 +23,16 @@ export const corePlugin = ({
         return editorCommandToPMCommand(command)(state, dispatch);
       },
       // Code copied from `EditorActions.focus()`
-      focus: () => {
+      focus: options => {
+        var _options$scrollIntoVi;
         const editorView = config === null || config === void 0 ? void 0 : config.getEditorView();
         if (!editorView || editorView.hasFocus()) {
           return false;
         }
         editorView.focus();
-        editorView.dispatch(editorView.state.tr.scrollIntoView());
+        if ((_options$scrollIntoVi = options === null || options === void 0 ? void 0 : options.scrollIntoView) !== null && _options$scrollIntoVi !== void 0 ? _options$scrollIntoVi : true) {
+          editorView.dispatch(editorView.state.tr.scrollIntoView());
+        }
         return true;
       },
       // Code copied from `EditorActions.blur()`

package/dist/es2019/styles/shared/expand.js

@@ -7,7 +7,8 @@ export const expandIconWrapperStyle = css({
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export const expandIconContainerStyle = css({
-  padding: `${"var(--ds-space-050, 4px)"} ${"var(--ds-space-050, 4px)"} 0 0`
+  display: 'flex',
+  alignItems: 'center'
 });
 const prefix = 'ak-editor-expand';
 export const expandClassNames = {

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

@@ -12,7 +12,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 = "88.0.0";
+const packageVersion = "88.1.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

package/dist/es2019/utils/create-wrap-selection-transaction.js

@@ -40,7 +40,7 @@ export function createWrapSelectionTransaction({
   }
   return tr;
 }
-function getWrappingOptions(state, type, nodeAttributes) {
+export function getWrappingOptions(state, type, nodeAttributes) {
   const {
     $from,
     $to

package/dist/es2019/utils/hyperlink.js

@@ -2,7 +2,6 @@
 // If changes are made to this file, please make the same update in the linked file.
 
 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 { shouldAutoLinkifyMatch } from './should-auto-linkify-tld';
 import { mapSlice } from './slice';
@@ -59,54 +58,11 @@ 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 linkifyContentOld(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 = findLinkMatchesOld(text);
-      let pos = 0;
-      const filepaths = findFilepaths(text);
-      matches.forEach(match => {
-        if (isLinkInMatches(match.start, filepaths)) {
-          return;
-        }
-        if (match.start > 0) {
-          linkified.push(node.cut(pos, match.start));
-        }
-        linkified.push(node.cut(match.start, match.end).mark(link.create({
-          href: normalizeUrl(match.href)
-        }).addToSet(node.marks)));
-        pos = match.end;
-      });
-      if (pos < text.length) {
-        linkified.push(node.cut(pos));
-      }
-      return linkified;
-    }
-    return node;
-  });
-}
-
-/**
- * Linkify content in a slice (eg. after a rich text paste)
- */
-export function linkifyContentNew(schema) {
+export function linkifyContent(schema) {
   return slice => mapSlice(slice, (node, parent) => {
     const isAllowedInParent = !parent || parent.type !== schema.nodes.codeBlock;
     const link = node.type.schema.marks.link;
@@ -167,21 +123,6 @@ function findLinkMatches(text) {
   }
   return linkify.match(text) || [];
 }
-function findLinkMatchesOld(text) {
-  const matches = [];
-  let linkMatches = text && linkify.match(text);
-  if (linkMatches && linkMatches.length > 0) {
-    linkMatches.forEach(match => {
-      matches.push({
-        start: match.index,
-        end: match.lastIndex,
-        title: match.raw,
-        href: match.url
-      });
-    });
-  }
-  return matches;
-}
 export const findFilepaths = (text, offset = 0) => {
   // Creation of a copy of the RegExp is necessary as lastIndex is stored on it when we run .exec()
   const localRegExp = new RegExp(FILEPATH_REGEXP);

package/dist/es2019/utils/index.js

@@ -216,7 +216,7 @@ export function isInEmptyLine(state) {
   return isEmptyParagraph(node) && hasDocAsParent($anchor);
 }
 export { dedupe } from './dedupe';
-export { createWrapSelectionTransaction } from './create-wrap-selection-transaction';
+export { createWrapSelectionTransaction, getWrappingOptions } from './create-wrap-selection-transaction';
 export { transformNodeIntoListItem } from './insert-node-into-ordered-list';
 export { wrapSelectionIn } from './wrap-selection-in';
 export { toJSON, nodeToJSON } from './nodes';

package/dist/esm/insert/index.js

@@ -263,4 +263,23 @@ export var shouldSplitSelectedNodeOnNodeInsertion = function shouldSplitSelected
     return true;
   }
   return false;
-};
+};
+
+/**
+ * Check if the current selection contains any nodes that are not permitted
+ * as codeBlock child nodes. Note that this allows paragraphs and inline nodes
+ * as we extract their text content.
+ */
+export function contentAllowedInCodeBlock(state) {
+  var _state$selection = state.selection,
+    $from = _state$selection.$from,
+    $to = _state$selection.$to;
+  var isAllowedChild = true;
+  state.doc.nodesBetween($from.pos, $to.pos, function (node) {
+    if (!isAllowedChild) {
+      return false;
+    }
+    return isAllowedChild = node.type === state.schema.nodes.listItem || node.type === state.schema.nodes.bulletList || node.type === state.schema.nodes.orderedList || node.type === state.schema.nodes.paragraph || node.isInline || node.type === state.schema.nodes.panel || node.isText;
+  });
+  return isAllowedChild;
+}

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 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 = "88.0.0";
+var packageVersion = "88.1.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/esm/paste/md-plugins/linkify-md-plugin.js

@@ -5,7 +5,6 @@
 
 import LinkifyIt from 'linkify-it';
 import { linkifyMatch } from '@atlaskit/adf-schema';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { findFilepaths, isLinkInMatches, shouldAutoLinkifyMatch } from '../../utils';
 
 // modified version of the original markdown-it Linkify plugin
@@ -61,11 +60,9 @@ var linkify = function linkify(state) {
         if (!links.length) {
           links = linkify.match(text) || [];
         }
-        if (getBooleanFF('platform.linking-platform.prevent-suspicious-linkification')) {
-          links = links.filter(function (link) {
-            return shouldAutoLinkifyMatch(link);
-          });
-        }
+        links = links.filter(function (link) {
+          return shouldAutoLinkifyMatch(link);
+        });
 
         // Now split string to nodes
         var nodes = [];

package/dist/esm/preset/core-plugin/index.js

@@ -20,13 +20,16 @@ export var corePlugin = function corePlugin(_ref) {
         return editorCommandToPMCommand(command)(state, dispatch);
       },
       // Code copied from `EditorActions.focus()`
-      focus: function focus() {
+      focus: function focus(options) {
+        var _options$scrollIntoVi;
         var editorView = config === null || config === void 0 ? void 0 : config.getEditorView();
         if (!editorView || editorView.hasFocus()) {
           return false;
         }
         editorView.focus();
-        editorView.dispatch(editorView.state.tr.scrollIntoView());
+        if ((_options$scrollIntoVi = options === null || options === void 0 ? void 0 : options.scrollIntoView) !== null && _options$scrollIntoVi !== void 0 ? _options$scrollIntoVi : true) {
+          editorView.dispatch(editorView.state.tr.scrollIntoView());
+        }
         return true;
       },
       // Code copied from `EditorActions.blur()`

package/dist/esm/styles/shared/expand.js

@@ -7,7 +7,8 @@ export var expandIconWrapperStyle = css({
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export var expandIconContainerStyle = css({
-  padding: "var(--ds-space-050, 4px)".concat(" ", "var(--ds-space-050, 4px)", " 0 0")
+  display: 'flex',
+  alignItems: 'center'
 });
 var prefix = 'ak-editor-expand';
 export var expandClassNames = {

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

@@ -20,7 +20,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 = "88.0.0";
+var packageVersion = "88.1.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/esm/utils/create-wrap-selection-transaction.js

@@ -35,7 +35,7 @@ export function createWrapSelectionTransaction(_ref) {
   }
   return tr;
 }
-function getWrappingOptions(state, type, nodeAttributes) {
+export function getWrappingOptions(state, type, nodeAttributes) {
   var _state$selection = state.selection,
     $from = _state$selection.$from,
     $to = _state$selection.$to;

package/dist/esm/utils/hyperlink.js

@@ -4,7 +4,6 @@ import _createClass from "@babel/runtime/helpers/createClass";
 // If changes are made to this file, please make the same update in the linked file.
 
 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 { shouldAutoLinkifyMatch } from './should-auto-linkify-tld';
 import { mapSlice } from './slice';
@@ -75,56 +74,11 @@ 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 linkifyContentOld(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 = findLinkMatchesOld(text);
-        var pos = 0;
-        var filepaths = findFilepaths(text);
-        matches.forEach(function (match) {
-          if (isLinkInMatches(match.start, filepaths)) {
-            return;
-          }
-          if (match.start > 0) {
-            linkified.push(node.cut(pos, match.start));
-          }
-          linkified.push(node.cut(match.start, match.end).mark(link.create({
-            href: normalizeUrl(match.href)
-          }).addToSet(node.marks)));
-          pos = match.end;
-        });
-        if (pos < text.length) {
-          linkified.push(node.cut(pos));
-        }
-        return linkified;
-      }
-      return node;
-    });
-  };
-}
 
 /**
  * Linkify content in a slice (eg. after a rich text paste)
  */
-export function linkifyContentNew(schema) {
+export function linkifyContent(schema) {
   return function (slice) {
     return mapSlice(slice, function (node, parent) {
       var isAllowedInParent = !parent || parent.type !== schema.nodes.codeBlock;
@@ -187,21 +141,6 @@ function findLinkMatches(text) {
   }
   return linkify.match(text) || [];
 }
-function findLinkMatchesOld(text) {
-  var matches = [];
-  var linkMatches = text && linkify.match(text);
-  if (linkMatches && linkMatches.length > 0) {
-    linkMatches.forEach(function (match) {
-      matches.push({
-        start: match.index,
-        end: match.lastIndex,
-        title: match.raw,
-        href: match.url
-      });
-    });
-  }
-  return matches;
-}
 export var findFilepaths = function findFilepaths(text) {
   var offset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   // Creation of a copy of the RegExp is necessary as lastIndex is stored on it when we run .exec()

package/dist/esm/utils/index.js

@@ -219,7 +219,7 @@ export function isInEmptyLine(state) {
   return isEmptyParagraph(node) && hasDocAsParent($anchor);
 }
 export { dedupe } from './dedupe';
-export { createWrapSelectionTransaction } from './create-wrap-selection-transaction';
+export { createWrapSelectionTransaction, getWrappingOptions } from './create-wrap-selection-transaction';
 export { transformNodeIntoListItem } from './insert-node-into-ordered-list';
 export { wrapSelectionIn } from './wrap-selection-in';
 export { toJSON, nodeToJSON } from './nodes';

package/dist/types/insert/index.d.ts

@@ -24,3 +24,9 @@ export declare const shouldSplitSelectedNodeOnNodeInsertion: ({ parentNodeType,
     grandParentNodeType: NodeType;
     content: Node;
 }) => boolean;
+/**
+ * Check if the current selection contains any nodes that are not permitted
+ * as codeBlock child nodes. Note that this allows paragraphs and inline nodes
+ * as we extract their text content.
+ */
+export declare function contentAllowedInCodeBlock(state: EditorState): boolean;

package/dist/types/types/next-editor-plugin.d.ts

@@ -33,9 +33,13 @@ export type CorePlugin = NextEditorPlugin<'core', {
          * Calls the focus method of the `EditorView` and scrolls the
          * current selection into view.
          *
+         * @param options
+         * @param options.scrollIntoView (boolean) if the view should also scroll when focusing. True by default
          * @returns (boolean) if the focus was successful
          */
-        focus: () => boolean;
+        focus: (options?: {
+            scrollIntoView: boolean;
+        }) => boolean;
         /**
          * Blurs the editor.
          *

package/dist/types/utils/create-wrap-selection-transaction.d.ts

@@ -13,3 +13,7 @@ export declare function createWrapSelectionTransaction({ state, type, nodeAttrib
     type: NodeType;
     nodeAttributes?: Record<string, any>;
 }): import("prosemirror-state").Transaction;
+export declare function getWrappingOptions(state: EditorState, type: NodeType, nodeAttributes?: Record<string, any>): {
+    range: any;
+    wrapping: any;
+};

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

@@ -15,15 +15,10 @@ 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 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 linkifyContent(schema: Schema): (slice: Slice) => Slice;
 export declare function getLinkDomain(url: string): string;
 export declare function isFromCurrentDomain(url: string): boolean;
 interface filepathMatch {

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

@@ -85,7 +85,7 @@ export declare const isEmptyNode: (schema: Schema) => (node: PMNode) => boolean;
 export declare function isNodeEmpty(node?: PMNode): boolean;
 export declare function isInEmptyLine(state: EditorState): boolean;
 export { dedupe } from './dedupe';
-export { createWrapSelectionTransaction } from './create-wrap-selection-transaction';
+export { createWrapSelectionTransaction, getWrappingOptions, } from './create-wrap-selection-transaction';
 export { transformNodeIntoListItem } from './insert-node-into-ordered-list';
 export { wrapSelectionIn } from './wrap-selection-in';
 export { toJSON, nodeToJSON } from './nodes';

package/dist/types-ts4.5/insert/index.d.ts

@@ -24,3 +24,9 @@ export declare const shouldSplitSelectedNodeOnNodeInsertion: ({ parentNodeType,
     grandParentNodeType: NodeType;
     content: Node;
 }) => boolean;
+/**
+ * Check if the current selection contains any nodes that are not permitted
+ * as codeBlock child nodes. Note that this allows paragraphs and inline nodes
+ * as we extract their text content.
+ */
+export declare function contentAllowedInCodeBlock(state: EditorState): boolean;

package/dist/types-ts4.5/types/next-editor-plugin.d.ts

@@ -33,9 +33,13 @@ export type CorePlugin = NextEditorPlugin<'core', {
          * Calls the focus method of the `EditorView` and scrolls the
          * current selection into view.
          *
+         * @param options
+         * @param options.scrollIntoView (boolean) if the view should also scroll when focusing. True by default
          * @returns (boolean) if the focus was successful
          */
-        focus: () => boolean;
+        focus: (options?: {
+            scrollIntoView: boolean;
+        }) => boolean;
         /**
          * Blurs the editor.
          *

package/dist/types-ts4.5/utils/create-wrap-selection-transaction.d.ts

@@ -13,3 +13,7 @@ export declare function createWrapSelectionTransaction({ state, type, nodeAttrib
     type: NodeType;
     nodeAttributes?: Record<string, any>;
 }): import("prosemirror-state").Transaction;
+export declare function getWrappingOptions(state: EditorState, type: NodeType, nodeAttributes?: Record<string, any>): {
+    range: any;
+    wrapping: any;
+};

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

@@ -15,15 +15,10 @@ 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 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 linkifyContent(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/index.d.ts

@@ -85,7 +85,7 @@ export declare const isEmptyNode: (schema: Schema) => (node: PMNode) => boolean;
 export declare function isNodeEmpty(node?: PMNode): boolean;
 export declare function isInEmptyLine(state: EditorState): boolean;
 export { dedupe } from './dedupe';
-export { createWrapSelectionTransaction } from './create-wrap-selection-transaction';
+export { createWrapSelectionTransaction, getWrappingOptions, } from './create-wrap-selection-transaction';
 export { transformNodeIntoListItem } from './insert-node-into-ordered-list';
 export { wrapSelectionIn } from './wrap-selection-in';
 export { toJSON, nodeToJSON } from './nodes';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "88.0.0",
+	"version": "88.1.0",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -218,9 +218,6 @@
 		"platform.editor.media.extended-resize-experience": {
 			"type": "boolean"
 		},
-		"platform.linking-platform.prevent-suspicious-linkification": {
-			"type": "boolean"
-		},
 		"platform.editor.media.inline-image.base-support": {
 			"type": "boolean"
 		},