@atlaskit/editor-common 89.2.1 → 89.3.1

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @atlaskit/editor-common
 
+## 89.3.1
+
+### Patch Changes
+
+- [#142108](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/142108)
+  [`a1776d86877fe`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a1776d86877fe) -
+  ED-24864 ED-24931 Add logic to handle dragging expands inside and outside of eachother, converting
+  them to and from nested expands when required. Also add experiment gating for nested-dnd.
+
+## 89.3.0
+
+### Minor Changes
+
+- [#139456](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/139456)
+  [`a788f5ceac7a2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a788f5ceac7a2) -
+  [ux] Add optional forth optional parameter to EditorCardProvider.resolve method called
+  `isEmbedFriendlyLocation` which when given `false` value will prevent auto-conversion (on link
+  paste) to an embed based on FE speciafied regexp rules. If value is not given it will act as true
+  and remain old behaviour
+
+### Patch Changes
+
+- [#139456](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/139456)
+  [`eb325a760c365`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/eb325a760c365) -
+  [ux] [ED-24443] This change allows users to backspace inside empty expands with empty nested
+  expands, without deleting both expands.
+- Updated dependencies
+
 ## 89.2.1
 
 ### Patch Changes

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

package/dist/cjs/transforms/expand.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.transformSliceToRemoveOpenNestedExpand = exports.transformSliceToRemoveOpenExpand = exports.transformSliceNestedExpandToExpand = exports.findExpand = void 0;
+exports.transformSliceToRemoveOpenNestedExpand = exports.transformSliceToRemoveOpenExpand = exports.transformSliceNestedExpandToExpand = exports.transformSliceExpandToNestedExpand = exports.findExpand = void 0;
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _slice = require("../utils/slice");
@@ -43,4 +43,27 @@ var transformSliceNestedExpandToExpand = exports.transformSliceNestedExpandToExp
     }
   });
   return new _model.Slice(_model.Fragment.fromArray(children), slice.openStart, slice.openEnd);
+};
+var transformSliceExpandToNestedExpand = exports.transformSliceExpandToNestedExpand = function transformSliceExpandToNestedExpand(slice) {
+  var children = [];
+  try {
+    (0, _slice.mapChildren)(slice.content, function (currentNode) {
+      var _currentNode$type$sch = currentNode.type.schema.nodes,
+        expand = _currentNode$type$sch.expand,
+        nestedExpand = _currentNode$type$sch.nestedExpand;
+      if (currentNode.type === expand) {
+        var nestedExpandNode = nestedExpand.createChecked(currentNode.attrs, currentNode.content, currentNode.marks);
+        if (nestedExpandNode) {
+          children.push(nestedExpandNode);
+        }
+      } else {
+        children.push(currentNode);
+      }
+    });
+  } catch (e) {
+    // Will throw error if unable to convert expand to nested expand.
+    // Example: expand containing a table being converted to nested expand containing table.
+    return null;
+  }
+  return new _model.Slice(_model.Fragment.fromArray(children), slice.openStart, slice.openEnd);
 };

package/dist/cjs/transforms/index.js

@@ -33,6 +33,12 @@ Object.defineProperty(exports, "transformSingleLineCodeBlockToCodeMark", {
     return _codeBlock.transformSingleLineCodeBlockToCodeMark;
   }
 });
+Object.defineProperty(exports, "transformSliceExpandToNestedExpand", {
+  enumerable: true,
+  get: function get() {
+    return _expand.transformSliceExpandToNestedExpand;
+  }
+});
 Object.defineProperty(exports, "transformSliceNestedExpandToExpand", {
   enumerable: true,
   get: function get() {

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

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

package/dist/cjs/utils/index.js

@@ -1331,6 +1331,7 @@ var isEmptyNode = exports.isEmptyNode = function isEmptyNode(schema) {
   var _schema$nodes = schema.nodes,
     doc = _schema$nodes.doc,
     paragraph = _schema$nodes.paragraph,
+    expand = _schema$nodes.expand,
     codeBlock = _schema$nodes.codeBlock,
     blockquote = _schema$nodes.blockquote,
     panel = _schema$nodes.panel,
@@ -1357,6 +1358,7 @@ var isEmptyNode = exports.isEmptyNode = function isEmptyNode(schema) {
       case taskItem:
       case decisionItem:
         return node.content.size === 0;
+      case expand:
       case blockquote:
       case panel:
       case listItem:

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 = "89.2.1";
+const packageVersion = "89.3.1";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/transforms/expand.js

@@ -39,4 +39,28 @@ export const transformSliceNestedExpandToExpand = (slice, schema) => {
     }
   });
   return new Slice(Fragment.fromArray(children), slice.openStart, slice.openEnd);
+};
+export const transformSliceExpandToNestedExpand = slice => {
+  const children = [];
+  try {
+    mapChildren(slice.content, currentNode => {
+      const {
+        expand,
+        nestedExpand
+      } = currentNode.type.schema.nodes;
+      if (currentNode.type === expand) {
+        const nestedExpandNode = nestedExpand.createChecked(currentNode.attrs, currentNode.content, currentNode.marks);
+        if (nestedExpandNode) {
+          children.push(nestedExpandNode);
+        }
+      } else {
+        children.push(currentNode);
+      }
+    });
+  } catch (e) {
+    // Will throw error if unable to convert expand to nested expand.
+    // Example: expand containing a table being converted to nested expand containing table.
+    return null;
+  }
+  return new Slice(Fragment.fromArray(children), slice.openStart, slice.openEnd);
 };

package/dist/es2019/transforms/index.js

@@ -1,5 +1,5 @@
 export { unwrapContentFromLayout, removeLayoutFromFirstChild, removeLayoutFromLastChild, transformSliceToRemoveOpenLayoutNodes } from './layout';
-export { findExpand, transformSliceToRemoveOpenExpand, transformSliceToRemoveOpenNestedExpand, transformSliceNestedExpandToExpand } from './expand';
+export { findExpand, transformSliceToRemoveOpenExpand, transformSliceToRemoveOpenNestedExpand, transformSliceNestedExpandToExpand, transformSliceExpandToNestedExpand } from './expand';
 export { transformSliceToRemoveOpenBodiedExtension, transformSliceToRemoveOpenMultiBodiedExtension } from './extension';
 export { transformSliceToJoinAdjacentCodeBlocks, transformSingleLineCodeBlockToCodeMark, findCodeBlock } from './code-block';
 export { transformSliceToDecisionList } from './decision-list';

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

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

package/dist/es2019/utils/index.js

@@ -255,6 +255,7 @@ export const isEmptyNode = schema => {
   const {
     doc,
     paragraph,
+    expand,
     codeBlock,
     blockquote,
     panel,
@@ -282,6 +283,7 @@ export const isEmptyNode = schema => {
       case taskItem:
       case decisionItem:
         return node.content.size === 0;
+      case expand:
       case blockquote:
       case panel:
       case listItem:

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

package/dist/esm/transforms/expand.js

@@ -37,4 +37,27 @@ export var transformSliceNestedExpandToExpand = function transformSliceNestedExp
     }
   });
   return new Slice(Fragment.fromArray(children), slice.openStart, slice.openEnd);
+};
+export var transformSliceExpandToNestedExpand = function transformSliceExpandToNestedExpand(slice) {
+  var children = [];
+  try {
+    mapChildren(slice.content, function (currentNode) {
+      var _currentNode$type$sch = currentNode.type.schema.nodes,
+        expand = _currentNode$type$sch.expand,
+        nestedExpand = _currentNode$type$sch.nestedExpand;
+      if (currentNode.type === expand) {
+        var nestedExpandNode = nestedExpand.createChecked(currentNode.attrs, currentNode.content, currentNode.marks);
+        if (nestedExpandNode) {
+          children.push(nestedExpandNode);
+        }
+      } else {
+        children.push(currentNode);
+      }
+    });
+  } catch (e) {
+    // Will throw error if unable to convert expand to nested expand.
+    // Example: expand containing a table being converted to nested expand containing table.
+    return null;
+  }
+  return new Slice(Fragment.fromArray(children), slice.openStart, slice.openEnd);
 };

package/dist/esm/transforms/index.js

@@ -1,5 +1,5 @@
 export { unwrapContentFromLayout, removeLayoutFromFirstChild, removeLayoutFromLastChild, transformSliceToRemoveOpenLayoutNodes } from './layout';
-export { findExpand, transformSliceToRemoveOpenExpand, transformSliceToRemoveOpenNestedExpand, transformSliceNestedExpandToExpand } from './expand';
+export { findExpand, transformSliceToRemoveOpenExpand, transformSliceToRemoveOpenNestedExpand, transformSliceNestedExpandToExpand, transformSliceExpandToNestedExpand } from './expand';
 export { transformSliceToRemoveOpenBodiedExtension, transformSliceToRemoveOpenMultiBodiedExtension } from './extension';
 export { transformSliceToJoinAdjacentCodeBlocks, transformSingleLineCodeBlockToCodeMark, findCodeBlock } from './code-block';
 export { transformSliceToDecisionList } from './decision-list';

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

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

package/dist/esm/utils/index.js

@@ -260,6 +260,7 @@ export var isEmptyNode = function isEmptyNode(schema) {
   var _schema$nodes = schema.nodes,
     doc = _schema$nodes.doc,
     paragraph = _schema$nodes.paragraph,
+    expand = _schema$nodes.expand,
     codeBlock = _schema$nodes.codeBlock,
     blockquote = _schema$nodes.blockquote,
     panel = _schema$nodes.panel,
@@ -286,6 +287,7 @@ export var isEmptyNode = function isEmptyNode(schema) {
       case taskItem:
       case decisionItem:
         return node.content.size === 0;
+      case expand:
       case blockquote:
       case panel:
       case listItem:

package/dist/types/provider-factory/card-provider.d.ts

@@ -2,6 +2,6 @@ import type { CardAdf, DatasourceAdf } from '@atlaskit/smart-card';
 export type CardAppearance = 'inline' | 'block' | 'embed';
 export type { CardAdf, DatasourceAdf };
 export interface CardProvider {
-    resolve(url: string, appearance: CardAppearance, shouldForceAppearance?: boolean): Promise<CardAdf | DatasourceAdf>;
+    resolve(url: string, appearance: CardAppearance, shouldForceAppearance?: boolean, isEmbedFriendlyLocation?: boolean): Promise<CardAdf | DatasourceAdf>;
     findPattern(url: string): Promise<boolean>;
 }

package/dist/types/transforms/expand.d.ts

@@ -6,3 +6,4 @@ export declare const findExpand: (state: EditorState, selection?: Selection | nu
 export declare const transformSliceToRemoveOpenExpand: (slice: Slice, schema: Schema) => Slice;
 export declare const transformSliceToRemoveOpenNestedExpand: (slice: Slice, schema: Schema) => Slice;
 export declare const transformSliceNestedExpandToExpand: (slice: Slice, schema: Schema) => Slice;
+export declare const transformSliceExpandToNestedExpand: (slice: Slice) => Slice | null;

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

@@ -1,5 +1,5 @@
 export { unwrapContentFromLayout, removeLayoutFromFirstChild, removeLayoutFromLastChild, transformSliceToRemoveOpenLayoutNodes, } from './layout';
-export { findExpand, transformSliceToRemoveOpenExpand, transformSliceToRemoveOpenNestedExpand, transformSliceNestedExpandToExpand, } from './expand';
+export { findExpand, transformSliceToRemoveOpenExpand, transformSliceToRemoveOpenNestedExpand, transformSliceNestedExpandToExpand, transformSliceExpandToNestedExpand, } from './expand';
 export { transformSliceToRemoveOpenBodiedExtension, transformSliceToRemoveOpenMultiBodiedExtension, } from './extension';
 export { transformSliceToJoinAdjacentCodeBlocks, transformSingleLineCodeBlockToCodeMark, findCodeBlock, } from './code-block';
 export { transformSliceToDecisionList } from './decision-list';

package/dist/types-ts4.5/provider-factory/card-provider.d.ts

@@ -2,6 +2,6 @@ import type { CardAdf, DatasourceAdf } from '@atlaskit/smart-card';
 export type CardAppearance = 'inline' | 'block' | 'embed';
 export type { CardAdf, DatasourceAdf };
 export interface CardProvider {
-    resolve(url: string, appearance: CardAppearance, shouldForceAppearance?: boolean): Promise<CardAdf | DatasourceAdf>;
+    resolve(url: string, appearance: CardAppearance, shouldForceAppearance?: boolean, isEmbedFriendlyLocation?: boolean): Promise<CardAdf | DatasourceAdf>;
     findPattern(url: string): Promise<boolean>;
 }

package/dist/types-ts4.5/transforms/expand.d.ts

@@ -6,3 +6,4 @@ export declare const findExpand: (state: EditorState, selection?: Selection | nu
 export declare const transformSliceToRemoveOpenExpand: (slice: Slice, schema: Schema) => Slice;
 export declare const transformSliceToRemoveOpenNestedExpand: (slice: Slice, schema: Schema) => Slice;
 export declare const transformSliceNestedExpandToExpand: (slice: Slice, schema: Schema) => Slice;
+export declare const transformSliceExpandToNestedExpand: (slice: Slice) => Slice | null;

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

@@ -1,5 +1,5 @@
 export { unwrapContentFromLayout, removeLayoutFromFirstChild, removeLayoutFromLastChild, transformSliceToRemoveOpenLayoutNodes, } from './layout';
-export { findExpand, transformSliceToRemoveOpenExpand, transformSliceToRemoveOpenNestedExpand, transformSliceNestedExpandToExpand, } from './expand';
+export { findExpand, transformSliceToRemoveOpenExpand, transformSliceToRemoveOpenNestedExpand, transformSliceNestedExpandToExpand, transformSliceExpandToNestedExpand, } from './expand';
 export { transformSliceToRemoveOpenBodiedExtension, transformSliceToRemoveOpenMultiBodiedExtension, } from './extension';
 export { transformSliceToJoinAdjacentCodeBlocks, transformSingleLineCodeBlockToCodeMark, findCodeBlock, } from './code-block';
 export { transformSliceToDecisionList } from './decision-list';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "89.2.1",
+	"version": "89.3.1",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -135,8 +135,8 @@
 		"@atlaskit/media-common": "^11.4.0",
 		"@atlaskit/media-file-preview": "^0.9.0",
 		"@atlaskit/media-picker": "^66.6.0",
-		"@atlaskit/media-ui": "^25.12.0",
-		"@atlaskit/media-viewer": "48.9.0",
+		"@atlaskit/media-ui": "^25.14.0",
+		"@atlaskit/media-viewer": "48.10.0",
 		"@atlaskit/mention": "^23.2.0",
 		"@atlaskit/menu": "^2.12.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",