@atlaskit/editor-common 76.33.2 → 76.34.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-common
 
+## 76.34.0
+
+### Minor Changes
+
+- [#64836](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/64836) [`f3e1604287a9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f3e1604287a9) - ED-20879 add ssr support for mediaInline
+
+### Patch Changes
+
+- [#64335](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/64335) [`efc8826c907f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/efc8826c907f) - [ux] [ED-16509] Restart numbered list inserting nodes via QUICK INSERT, nodes including : panels, expands, decisions, tables, layout, quotes, actions, dividers, headings. Changes are being guarded behind feature flag platform.editor.ordered-list-inserting-nodes_bh0vo
+- [#63266](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/63266) [`630f6c9fc80c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/630f6c9fc80c) - ED-21576: Added new Example for MBE - Interactive Fake Tabs
+- Updated dependencies
+
 ## 76.33.2
 
 ### Patch Changes

package/dist/cjs/media-inline/media-inline-image-card.js

@@ -26,7 +26,8 @@ var MediaInlineImageCardInternal = exports.MediaInlineImageCardInternal = functi
     isLazy = _ref.isLazy,
     width = _ref.width,
     height = _ref.height,
-    border = _ref.border;
+    border = _ref.border,
+    ssr = _ref.ssr;
   var _useState = (0, _react.useState)(),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     fileState = _useState2[0],
@@ -40,21 +41,23 @@ var MediaInlineImageCardInternal = exports.MediaInlineImageCardInternal = functi
     }),
     formatMessage = _ref2.formatMessage;
   (0, _react.useEffect)(function () {
-    var subscription = mediaClient.file.getFileState(identifier.id, {
-      collectionName: identifier.collectionName
-    }).subscribe({
-      next: function next(fileState) {
-        setFileState(fileState);
-        setSubscribeError(undefined);
-      },
-      error: function error(e) {
-        setSubscribeError(e);
-      }
-    });
-    return function () {
-      subscription.unsubscribe();
-    };
-  }, [identifier.collectionName, identifier.id, mediaClient.file]);
+    if (mediaClient) {
+      var subscription = mediaClient.file.getFileState(identifier.id, {
+        collectionName: identifier.collectionName
+      }).subscribe({
+        next: function next(fileState) {
+          setFileState(fileState);
+          setSubscribeError(undefined);
+        },
+        error: function error(e) {
+          setSubscribeError(e);
+        }
+      });
+      return function () {
+        subscription.unsubscribe();
+      };
+    }
+  }, [identifier, mediaClient]);
   var content = function content(dimensions) {
     if (subscribeError) {
       var isUploading = (fileState === null || fileState === void 0 ? void 0 : fileState.status) === 'uploading';
@@ -79,18 +82,20 @@ var MediaInlineImageCardInternal = exports.MediaInlineImageCardInternal = functi
         message: formatMessage(_mediaInlineCard.messages.unableToLoadContent)
       });
     }
+    var mediaClientConfig = (ssr === null || ssr === void 0 ? void 0 : ssr.config) || (mediaClient === null || mediaClient === void 0 ? void 0 : mediaClient.mediaClientConfig);
     if (!fileState) {
       return (0, _react2.jsx)(_loadingView.InlineImageCardLoadingView, null);
     }
     return (0, _react2.jsx)(_mediaCard.Card, {
-      mediaClientConfig: mediaClient.mediaClientConfig,
+      mediaClientConfig: mediaClientConfig,
       isLazy: isLazy,
       identifier: identifier,
       dimensions: dimensions,
       selectable: true,
       disableOverlay: true,
       selected: isSelected,
-      alt: alt
+      alt: alt,
+      ssr: ssr === null || ssr === void 0 ? void 0 : ssr.mode
     });
   };
   var aspectRatio = (0, _react.useMemo)(function () {
@@ -99,7 +104,7 @@ var MediaInlineImageCardInternal = exports.MediaInlineImageCardInternal = functi
 
   /**
    * scaledDimensions is used to define the correct media size fetched from media service
-   * inline images will only ever be rendererd at a maximum height of H1 and so scaled dimensions
+   * inline images will only ever be rendered at a maximum height of H1 and so scaled dimensions
    * will only ever return a width and height where the height has a maximum height of H1
    */
   var scaledDimension = (0, _react.useMemo)(function () {

package/dist/cjs/monitoring/error.js

@@ -16,7 +16,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 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 = "76.33.2";
+var packageVersion = "76.34.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/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() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } /** @jsx jsx */
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "76.33.2";
+var packageVersion = "76.34.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/cjs/utils/index.js

@@ -1028,6 +1028,12 @@ Object.defineProperty(exports, "todayTimestampInUTC", {
     return _date.todayTimestampInUTC;
   }
 });
+Object.defineProperty(exports, "transformNodeIntoListItem", {
+  enumerable: true,
+  get: function get() {
+    return _insertNodeIntoOrderedList.transformNodeIntoListItem;
+  }
+});
 Object.defineProperty(exports, "unwrap", {
   enumerable: true,
   get: function get() {
@@ -1146,6 +1152,7 @@ var _countNodes = require("./count-nodes");
 var _inputRules = require("./input-rules");
 var _dedupe = require("./dedupe");
 var _createWrapSelectionTransaction = require("./create-wrap-selection-transaction");
+var _insertNodeIntoOrderedList = require("./insert-node-into-ordered-list");
 var _wrapSelectionIn = require("./wrap-selection-in");
 var _calculateToolbarPosition = require("./calculate-toolbar-position");
 var _nodesByLocalIds = require("./nodes-by-localIds");

package/dist/cjs/utils/insert-node-into-ordered-list.js

@@ -0,0 +1,91 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.transformNodeIntoListItem = transformNodeIntoListItem;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _list = require("./list");
+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; }
+function transformNodeIntoListItem(tr, node) {
+  var _tr$doc$nodeAt, _findParentNodeOfType;
+  var _tr$selection = tr.selection,
+    $to = _tr$selection.$to,
+    $from = _tr$selection.$from,
+    to = _tr$selection.to,
+    from = _tr$selection.from;
+  var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
+    orderedList = _tr$doc$type$schema$n.orderedList,
+    bulletList = _tr$doc$type$schema$n.bulletList,
+    listItem = _tr$doc$type$schema$n.listItem;
+  var startLinePosition = $from.start();
+  var parentStartPosition = $from.depth === 0 ? 0 : $from.before();
+
+  // Setting the start position
+  var startMapped = startLinePosition === from ? parentStartPosition : from;
+
+  // Selected nodes
+  var selectionParentListItemNode = (0, _utils.findParentNodeOfType)(listItem)(tr.selection);
+  var selectionParentListNodeWithPos = (0, _utils.findParentNodeOfType)([bulletList, orderedList])(tr.selection);
+  var selectionParentListNode = selectionParentListNodeWithPos === null || selectionParentListNodeWithPos === void 0 ? void 0 : selectionParentListNodeWithPos.node;
+  if (!selectionParentListNodeWithPos) {
+    return tr;
+  }
+
+  // Offsets
+  var listWrappingOffset = $to.depth - selectionParentListNodeWithPos.depth + 1; // difference in depth between to position and list node
+  var listItemWrappingOffset = $to.depth - selectionParentListNodeWithPos.depth; // difference in depth between to position and list item node
+
+  // Anything to do with nested lists should safeInsert and not be handled here
+  var grandParentListNode = (0, _utils.findParentNodeOfTypeClosestToPos)(tr.doc.resolve(selectionParentListNodeWithPos.pos), [bulletList, orderedList]);
+  var selectionIsInNestedList = !!grandParentListNode;
+  var selectedListItemHasNestedList = false;
+  selectionParentListItemNode === null || selectionParentListItemNode === void 0 || selectionParentListItemNode.node.content.forEach(function (child) {
+    if ((0, _list.isListNode)(child)) {
+      selectedListItemHasNestedList = true;
+    }
+  });
+  if (selectedListItemHasNestedList || selectionIsInNestedList) {
+    return (0, _utils.safeInsert)(node)(tr).scrollIntoView();
+  }
+
+  // Check if node after the insert position is listItem
+  var isNodeAfterInsertPositionIsListItem = ((_tr$doc$nodeAt = tr.doc.nodeAt(to + listItemWrappingOffset)) === null || _tr$doc$nodeAt === void 0 ? void 0 : _tr$doc$nodeAt.type) === listItem;
+  var replaceTo;
+  if (isNodeAfterInsertPositionIsListItem) {
+    replaceTo = to + listItemWrappingOffset;
+  } else if (!isNodeAfterInsertPositionIsListItem) {
+    replaceTo = to;
+  } else {
+    replaceTo = to + listWrappingOffset;
+  }
+
+  // handle the insertion of the slice
+  tr.replaceWith(startMapped, replaceTo, node).scrollIntoView();
+
+  // Get the next list items position (used later to find the split out ordered list)
+  var indexOfNextListItem = $to.indexAfter($to.depth - listItemWrappingOffset);
+  var positionOfNextListItem = tr.doc.resolve(selectionParentListNodeWithPos.pos + 1).posAtIndex(indexOfNextListItem);
+
+  // Find the ordered list node after the pasted content so we can set it's order
+  var mappedPositionOfNextListItem = tr.mapping.map(positionOfNextListItem);
+  if (mappedPositionOfNextListItem > tr.doc.nodeSize) {
+    return tr;
+  }
+  var nodeAfterPastedContentResolvedPos = (0, _utils.findParentNodeOfTypeClosestToPos)(tr.doc.resolve(mappedPositionOfNextListItem), [orderedList]);
+
+  // Work out the new split out lists 'order' (the number it starts from)
+  var originalParentOrderedListNodeOrder = selectionParentListNode === null || selectionParentListNode === void 0 ? void 0 : selectionParentListNode.attrs.order;
+  var numOfListItemsInOriginalList = (_findParentNodeOfType = (0, _utils.findParentNodeOfTypeClosestToPos)(tr.doc.resolve(from - 1), [orderedList])) === null || _findParentNodeOfType === void 0 ? void 0 : _findParentNodeOfType.node.childCount;
+
+  // Set the new split out lists order attribute
+  if (typeof originalParentOrderedListNodeOrder === 'number' && numOfListItemsInOriginalList && nodeAfterPastedContentResolvedPos) {
+    tr.setNodeMarkup(nodeAfterPastedContentResolvedPos.pos, orderedList, _objectSpread(_objectSpread({}, nodeAfterPastedContentResolvedPos.node.attrs), {}, {
+      order: originalParentOrderedListNodeOrder + numOfListItemsInOriginalList
+    }));
+  }
+  return tr;
+}

package/dist/es2019/media-inline/media-inline-image-card.js

@@ -18,7 +18,8 @@ export const MediaInlineImageCardInternal = ({
   isLazy,
   width,
   height,
-  border
+  border,
+  ssr
 }) => {
   const [fileState, setFileState] = useState();
   const [subscribeError, setSubscribeError] = useState();
@@ -28,21 +29,23 @@ export const MediaInlineImageCardInternal = ({
     locale: 'en'
   });
   useEffect(() => {
-    const subscription = mediaClient.file.getFileState(identifier.id, {
-      collectionName: identifier.collectionName
-    }).subscribe({
-      next: fileState => {
-        setFileState(fileState);
-        setSubscribeError(undefined);
-      },
-      error: e => {
-        setSubscribeError(e);
-      }
-    });
-    return () => {
-      subscription.unsubscribe();
-    };
-  }, [identifier.collectionName, identifier.id, mediaClient.file]);
+    if (mediaClient) {
+      const subscription = mediaClient.file.getFileState(identifier.id, {
+        collectionName: identifier.collectionName
+      }).subscribe({
+        next: fileState => {
+          setFileState(fileState);
+          setSubscribeError(undefined);
+        },
+        error: e => {
+          setSubscribeError(e);
+        }
+      });
+      return () => {
+        subscription.unsubscribe();
+      };
+    }
+  }, [identifier, mediaClient]);
   const content = dimensions => {
     if (subscribeError) {
       const isUploading = (fileState === null || fileState === void 0 ? void 0 : fileState.status) === 'uploading';
@@ -67,25 +70,27 @@ export const MediaInlineImageCardInternal = ({
         message: formatMessage(messages.unableToLoadContent)
       });
     }
+    const mediaClientConfig = (ssr === null || ssr === void 0 ? void 0 : ssr.config) || (mediaClient === null || mediaClient === void 0 ? void 0 : mediaClient.mediaClientConfig);
     if (!fileState) {
       return jsx(InlineImageCardLoadingView, null);
     }
     return jsx(Card, {
-      mediaClientConfig: mediaClient.mediaClientConfig,
+      mediaClientConfig: mediaClientConfig,
       isLazy: isLazy,
       identifier: identifier,
       dimensions: dimensions,
       selectable: true,
       disableOverlay: true,
       selected: isSelected,
-      alt: alt
+      alt: alt,
+      ssr: ssr === null || ssr === void 0 ? void 0 : ssr.mode
     });
   };
   const aspectRatio = useMemo(() => width && height ? width / height : undefined, [width, height]);
 
   /**
    * scaledDimensions is used to define the correct media size fetched from media service
-   * inline images will only ever be rendererd at a maximum height of H1 and so scaled dimensions
+   * inline images will only ever be rendered at a maximum height of H1 and so scaled dimensions
    * will only ever return a width and height where the height has a maximum height of H1
    */
   const scaledDimension = useMemo(() => {

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

package/dist/es2019/utils/index.js

@@ -213,6 +213,7 @@ export function isInEmptyLine(state) {
 }
 export { dedupe } from './dedupe';
 export { createWrapSelectionTransaction } from './create-wrap-selection-transaction';
+export { transformNodeIntoListItem } from './insert-node-into-ordered-list';
 export { wrapSelectionIn } from './wrap-selection-in';
 export { toJSON, nodeToJSON } from './nodes';
 export { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead } from './calculate-toolbar-position';

package/dist/es2019/utils/insert-node-into-ordered-list.js

@@ -0,0 +1,84 @@
+import { findParentNodeOfType, findParentNodeOfTypeClosestToPos, safeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { isListNode } from './list';
+export function transformNodeIntoListItem(tr, node) {
+  var _tr$doc$nodeAt, _findParentNodeOfType;
+  const {
+    $to,
+    $from,
+    to,
+    from
+  } = tr.selection;
+  const {
+    orderedList,
+    bulletList,
+    listItem
+  } = tr.doc.type.schema.nodes;
+  const startLinePosition = $from.start();
+  const parentStartPosition = $from.depth === 0 ? 0 : $from.before();
+
+  // Setting the start position
+  const startMapped = startLinePosition === from ? parentStartPosition : from;
+
+  // Selected nodes
+  const selectionParentListItemNode = findParentNodeOfType(listItem)(tr.selection);
+  const selectionParentListNodeWithPos = findParentNodeOfType([bulletList, orderedList])(tr.selection);
+  const selectionParentListNode = selectionParentListNodeWithPos === null || selectionParentListNodeWithPos === void 0 ? void 0 : selectionParentListNodeWithPos.node;
+  if (!selectionParentListNodeWithPos) {
+    return tr;
+  }
+
+  // Offsets
+  const listWrappingOffset = $to.depth - selectionParentListNodeWithPos.depth + 1; // difference in depth between to position and list node
+  const listItemWrappingOffset = $to.depth - selectionParentListNodeWithPos.depth; // difference in depth between to position and list item node
+
+  // Anything to do with nested lists should safeInsert and not be handled here
+  const grandParentListNode = findParentNodeOfTypeClosestToPos(tr.doc.resolve(selectionParentListNodeWithPos.pos), [bulletList, orderedList]);
+  const selectionIsInNestedList = !!grandParentListNode;
+  let selectedListItemHasNestedList = false;
+  selectionParentListItemNode === null || selectionParentListItemNode === void 0 ? void 0 : selectionParentListItemNode.node.content.forEach(child => {
+    if (isListNode(child)) {
+      selectedListItemHasNestedList = true;
+    }
+  });
+  if (selectedListItemHasNestedList || selectionIsInNestedList) {
+    return safeInsert(node)(tr).scrollIntoView();
+  }
+
+  // Check if node after the insert position is listItem
+  const isNodeAfterInsertPositionIsListItem = ((_tr$doc$nodeAt = tr.doc.nodeAt(to + listItemWrappingOffset)) === null || _tr$doc$nodeAt === void 0 ? void 0 : _tr$doc$nodeAt.type) === listItem;
+  let replaceTo;
+  if (isNodeAfterInsertPositionIsListItem) {
+    replaceTo = to + listItemWrappingOffset;
+  } else if (!isNodeAfterInsertPositionIsListItem) {
+    replaceTo = to;
+  } else {
+    replaceTo = to + listWrappingOffset;
+  }
+
+  // handle the insertion of the slice
+  tr.replaceWith(startMapped, replaceTo, node).scrollIntoView();
+
+  // Get the next list items position (used later to find the split out ordered list)
+  const indexOfNextListItem = $to.indexAfter($to.depth - listItemWrappingOffset);
+  const positionOfNextListItem = tr.doc.resolve(selectionParentListNodeWithPos.pos + 1).posAtIndex(indexOfNextListItem);
+
+  // Find the ordered list node after the pasted content so we can set it's order
+  const mappedPositionOfNextListItem = tr.mapping.map(positionOfNextListItem);
+  if (mappedPositionOfNextListItem > tr.doc.nodeSize) {
+    return tr;
+  }
+  const nodeAfterPastedContentResolvedPos = findParentNodeOfTypeClosestToPos(tr.doc.resolve(mappedPositionOfNextListItem), [orderedList]);
+
+  // Work out the new split out lists 'order' (the number it starts from)
+  const originalParentOrderedListNodeOrder = selectionParentListNode === null || selectionParentListNode === void 0 ? void 0 : selectionParentListNode.attrs.order;
+  const numOfListItemsInOriginalList = (_findParentNodeOfType = findParentNodeOfTypeClosestToPos(tr.doc.resolve(from - 1), [orderedList])) === null || _findParentNodeOfType === void 0 ? void 0 : _findParentNodeOfType.node.childCount;
+
+  // Set the new split out lists order attribute
+  if (typeof originalParentOrderedListNodeOrder === 'number' && numOfListItemsInOriginalList && nodeAfterPastedContentResolvedPos) {
+    tr.setNodeMarkup(nodeAfterPastedContentResolvedPos.pos, orderedList, {
+      ...nodeAfterPastedContentResolvedPos.node.attrs,
+      order: originalParentOrderedListNodeOrder + numOfListItemsInOriginalList
+    });
+  }
+  return tr;
+}

package/dist/esm/media-inline/media-inline-image-card.js

@@ -19,7 +19,8 @@ export var MediaInlineImageCardInternal = function MediaInlineImageCardInternal(
     isLazy = _ref.isLazy,
     width = _ref.width,
     height = _ref.height,
-    border = _ref.border;
+    border = _ref.border,
+    ssr = _ref.ssr;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     fileState = _useState2[0],
@@ -33,21 +34,23 @@ export var MediaInlineImageCardInternal = function MediaInlineImageCardInternal(
     }),
     formatMessage = _ref2.formatMessage;
   useEffect(function () {
-    var subscription = mediaClient.file.getFileState(identifier.id, {
-      collectionName: identifier.collectionName
-    }).subscribe({
-      next: function next(fileState) {
-        setFileState(fileState);
-        setSubscribeError(undefined);
-      },
-      error: function error(e) {
-        setSubscribeError(e);
-      }
-    });
-    return function () {
-      subscription.unsubscribe();
-    };
-  }, [identifier.collectionName, identifier.id, mediaClient.file]);
+    if (mediaClient) {
+      var subscription = mediaClient.file.getFileState(identifier.id, {
+        collectionName: identifier.collectionName
+      }).subscribe({
+        next: function next(fileState) {
+          setFileState(fileState);
+          setSubscribeError(undefined);
+        },
+        error: function error(e) {
+          setSubscribeError(e);
+        }
+      });
+      return function () {
+        subscription.unsubscribe();
+      };
+    }
+  }, [identifier, mediaClient]);
   var content = function content(dimensions) {
     if (subscribeError) {
       var isUploading = (fileState === null || fileState === void 0 ? void 0 : fileState.status) === 'uploading';
@@ -72,18 +75,20 @@ export var MediaInlineImageCardInternal = function MediaInlineImageCardInternal(
         message: formatMessage(messages.unableToLoadContent)
       });
     }
+    var mediaClientConfig = (ssr === null || ssr === void 0 ? void 0 : ssr.config) || (mediaClient === null || mediaClient === void 0 ? void 0 : mediaClient.mediaClientConfig);
     if (!fileState) {
       return jsx(InlineImageCardLoadingView, null);
     }
     return jsx(Card, {
-      mediaClientConfig: mediaClient.mediaClientConfig,
+      mediaClientConfig: mediaClientConfig,
       isLazy: isLazy,
       identifier: identifier,
       dimensions: dimensions,
       selectable: true,
       disableOverlay: true,
       selected: isSelected,
-      alt: alt
+      alt: alt,
+      ssr: ssr === null || ssr === void 0 ? void 0 : ssr.mode
     });
   };
   var aspectRatio = useMemo(function () {
@@ -92,7 +97,7 @@ export var MediaInlineImageCardInternal = function MediaInlineImageCardInternal(
 
   /**
    * scaledDimensions is used to define the correct media size fetched from media service
-   * inline images will only ever be rendererd at a maximum height of H1 and so scaled dimensions
+   * inline images will only ever be rendered at a maximum height of H1 and so scaled dimensions
    * will only ever return a width and height where the height has a maximum height of H1
    */
   var scaledDimension = useMemo(function () {

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 = "76.33.2";
+var packageVersion = "76.34.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/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 = "76.33.2";
+var packageVersion = "76.34.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/esm/utils/index.js

@@ -216,6 +216,7 @@ export function isInEmptyLine(state) {
 }
 export { dedupe } from './dedupe';
 export { createWrapSelectionTransaction } from './create-wrap-selection-transaction';
+export { transformNodeIntoListItem } from './insert-node-into-ordered-list';
 export { wrapSelectionIn } from './wrap-selection-in';
 export { toJSON, nodeToJSON } from './nodes';
 export { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead } from './calculate-toolbar-position';

package/dist/esm/utils/insert-node-into-ordered-list.js

@@ -0,0 +1,84 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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) { _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; }
+import { findParentNodeOfType, findParentNodeOfTypeClosestToPos, safeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { isListNode } from './list';
+export function transformNodeIntoListItem(tr, node) {
+  var _tr$doc$nodeAt, _findParentNodeOfType;
+  var _tr$selection = tr.selection,
+    $to = _tr$selection.$to,
+    $from = _tr$selection.$from,
+    to = _tr$selection.to,
+    from = _tr$selection.from;
+  var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
+    orderedList = _tr$doc$type$schema$n.orderedList,
+    bulletList = _tr$doc$type$schema$n.bulletList,
+    listItem = _tr$doc$type$schema$n.listItem;
+  var startLinePosition = $from.start();
+  var parentStartPosition = $from.depth === 0 ? 0 : $from.before();
+
+  // Setting the start position
+  var startMapped = startLinePosition === from ? parentStartPosition : from;
+
+  // Selected nodes
+  var selectionParentListItemNode = findParentNodeOfType(listItem)(tr.selection);
+  var selectionParentListNodeWithPos = findParentNodeOfType([bulletList, orderedList])(tr.selection);
+  var selectionParentListNode = selectionParentListNodeWithPos === null || selectionParentListNodeWithPos === void 0 ? void 0 : selectionParentListNodeWithPos.node;
+  if (!selectionParentListNodeWithPos) {
+    return tr;
+  }
+
+  // Offsets
+  var listWrappingOffset = $to.depth - selectionParentListNodeWithPos.depth + 1; // difference in depth between to position and list node
+  var listItemWrappingOffset = $to.depth - selectionParentListNodeWithPos.depth; // difference in depth between to position and list item node
+
+  // Anything to do with nested lists should safeInsert and not be handled here
+  var grandParentListNode = findParentNodeOfTypeClosestToPos(tr.doc.resolve(selectionParentListNodeWithPos.pos), [bulletList, orderedList]);
+  var selectionIsInNestedList = !!grandParentListNode;
+  var selectedListItemHasNestedList = false;
+  selectionParentListItemNode === null || selectionParentListItemNode === void 0 || selectionParentListItemNode.node.content.forEach(function (child) {
+    if (isListNode(child)) {
+      selectedListItemHasNestedList = true;
+    }
+  });
+  if (selectedListItemHasNestedList || selectionIsInNestedList) {
+    return safeInsert(node)(tr).scrollIntoView();
+  }
+
+  // Check if node after the insert position is listItem
+  var isNodeAfterInsertPositionIsListItem = ((_tr$doc$nodeAt = tr.doc.nodeAt(to + listItemWrappingOffset)) === null || _tr$doc$nodeAt === void 0 ? void 0 : _tr$doc$nodeAt.type) === listItem;
+  var replaceTo;
+  if (isNodeAfterInsertPositionIsListItem) {
+    replaceTo = to + listItemWrappingOffset;
+  } else if (!isNodeAfterInsertPositionIsListItem) {
+    replaceTo = to;
+  } else {
+    replaceTo = to + listWrappingOffset;
+  }
+
+  // handle the insertion of the slice
+  tr.replaceWith(startMapped, replaceTo, node).scrollIntoView();
+
+  // Get the next list items position (used later to find the split out ordered list)
+  var indexOfNextListItem = $to.indexAfter($to.depth - listItemWrappingOffset);
+  var positionOfNextListItem = tr.doc.resolve(selectionParentListNodeWithPos.pos + 1).posAtIndex(indexOfNextListItem);
+
+  // Find the ordered list node after the pasted content so we can set it's order
+  var mappedPositionOfNextListItem = tr.mapping.map(positionOfNextListItem);
+  if (mappedPositionOfNextListItem > tr.doc.nodeSize) {
+    return tr;
+  }
+  var nodeAfterPastedContentResolvedPos = findParentNodeOfTypeClosestToPos(tr.doc.resolve(mappedPositionOfNextListItem), [orderedList]);
+
+  // Work out the new split out lists 'order' (the number it starts from)
+  var originalParentOrderedListNodeOrder = selectionParentListNode === null || selectionParentListNode === void 0 ? void 0 : selectionParentListNode.attrs.order;
+  var numOfListItemsInOriginalList = (_findParentNodeOfType = findParentNodeOfTypeClosestToPos(tr.doc.resolve(from - 1), [orderedList])) === null || _findParentNodeOfType === void 0 ? void 0 : _findParentNodeOfType.node.childCount;
+
+  // Set the new split out lists order attribute
+  if (typeof originalParentOrderedListNodeOrder === 'number' && numOfListItemsInOriginalList && nodeAfterPastedContentResolvedPos) {
+    tr.setNodeMarkup(nodeAfterPastedContentResolvedPos.pos, orderedList, _objectSpread(_objectSpread({}, nodeAfterPastedContentResolvedPos.node.attrs), {}, {
+      order: originalParentOrderedListNodeOrder + numOfListItemsInOriginalList
+    }));
+  }
+  return tr;
+}

package/dist/types/extensions/types/extension-handler.d.ts

@@ -9,6 +9,8 @@ export interface ExtensionParams<T extends Parameters> {
     content?: object | string;
     localId?: string;
     fragmentLocalId?: string;
+    maxFrames?: number;
+    layout?: string;
 }
 export type ExtensionHandler<T extends Parameters = Parameters> = (ext: ExtensionParams<T>, doc: object, actions?: MultiBodiedExtensionActions) => JSX.Element | null;
 export type OnSaveCallback<T extends Parameters = Parameters> = (params: T) => void;

package/dist/types/media-inline/media-inline-image-card.d.ts

@@ -2,16 +2,17 @@
 import type { FC } from 'react';
 import type { WrappedComponentProps } from 'react-intl-next';
 import type { FileIdentifier, MediaClient } from '@atlaskit/media-client';
-import type { MediaInlineAttrs } from './types';
+import type { MediaInlineAttrs, MediaSSR } from './types';
 export interface MediaInlineImageCardProps {
     identifier: FileIdentifier;
-    mediaClient: MediaClient;
+    mediaClient?: MediaClient;
     isSelected?: boolean;
     isLazy?: boolean;
     border?: {
         borderSize?: number;
         borderColor?: string;
     };
+    ssr?: MediaSSR;
 }
 export declare const MediaInlineImageCardInternal: FC<MediaInlineImageCardProps & WrappedComponentProps & MediaInlineAttrs>;
 export declare const MediaInlineImageCard: FC<MediaInlineImageCardProps & MediaInlineAttrs>;

package/dist/types/media-inline/types.d.ts

@@ -1,8 +1,12 @@
+import type { SSR } from '@atlaskit/media-common';
+import type { MediaClientConfig } from '@atlaskit/media-core';
 export type MediaInlineAttrs = {
     type?: string;
     alt?: string;
     width?: number;
     height?: number;
-    borderSize?: number;
-    borderColor?: string;
+};
+export type MediaSSR = {
+    mode: SSR;
+    config: MediaClientConfig;
 };

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

@@ -82,6 +82,7 @@ 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 { transformNodeIntoListItem } from './insert-node-into-ordered-list';
 export { wrapSelectionIn } from './wrap-selection-in';
 export { toJSON, nodeToJSON } from './nodes';
 export { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead, } from './calculate-toolbar-position';

package/dist/types/utils/insert-node-into-ordered-list.d.ts

@@ -0,0 +1,3 @@
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+export declare function transformNodeIntoListItem(tr: Transaction, node: PMNode): Transaction;

package/dist/types-ts4.5/extensions/types/extension-handler.d.ts

@@ -9,6 +9,8 @@ export interface ExtensionParams<T extends Parameters> {
     content?: object | string;
     localId?: string;
     fragmentLocalId?: string;
+    maxFrames?: number;
+    layout?: string;
 }
 export type ExtensionHandler<T extends Parameters = Parameters> = (ext: ExtensionParams<T>, doc: object, actions?: MultiBodiedExtensionActions) => JSX.Element | null;
 export type OnSaveCallback<T extends Parameters = Parameters> = (params: T) => void;

package/dist/types-ts4.5/media-inline/media-inline-image-card.d.ts

@@ -2,16 +2,17 @@
 import type { FC } from 'react';
 import type { WrappedComponentProps } from 'react-intl-next';
 import type { FileIdentifier, MediaClient } from '@atlaskit/media-client';
-import type { MediaInlineAttrs } from './types';
+import type { MediaInlineAttrs, MediaSSR } from './types';
 export interface MediaInlineImageCardProps {
     identifier: FileIdentifier;
-    mediaClient: MediaClient;
+    mediaClient?: MediaClient;
     isSelected?: boolean;
     isLazy?: boolean;
     border?: {
         borderSize?: number;
         borderColor?: string;
     };
+    ssr?: MediaSSR;
 }
 export declare const MediaInlineImageCardInternal: FC<MediaInlineImageCardProps & WrappedComponentProps & MediaInlineAttrs>;
 export declare const MediaInlineImageCard: FC<MediaInlineImageCardProps & MediaInlineAttrs>;

package/dist/types-ts4.5/media-inline/types.d.ts

@@ -1,8 +1,12 @@
+import type { SSR } from '@atlaskit/media-common';
+import type { MediaClientConfig } from '@atlaskit/media-core';
 export type MediaInlineAttrs = {
     type?: string;
     alt?: string;
     width?: number;
     height?: number;
-    borderSize?: number;
-    borderColor?: string;
+};
+export type MediaSSR = {
+    mode: SSR;
+    config: MediaClientConfig;
 };

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

@@ -82,6 +82,7 @@ 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 { transformNodeIntoListItem } from './insert-node-into-ordered-list';
 export { wrapSelectionIn } from './wrap-selection-in';
 export { toJSON, nodeToJSON } from './nodes';
 export { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead, } from './calculate-toolbar-position';

package/dist/types-ts4.5/utils/insert-node-into-ordered-list.d.ts

@@ -0,0 +1,3 @@
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+export declare function transformNodeIntoListItem(tr: Transaction, node: PMNode): Transaction;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-common",
-  "version": "76.33.2",
+  "version": "76.34.0",
   "description": "A package that contains common classes and components for editor and renderer",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -96,7 +96,7 @@
     "@atlaskit/analytics-namespaced-context": "^6.7.0",
     "@atlaskit/analytics-next": "^9.1.0",
     "@atlaskit/analytics-next-stable-react-context": "1.0.1",
-    "@atlaskit/button": "^17.1.0",
+    "@atlaskit/button": "^17.2.0",
     "@atlaskit/code": "^15.1.0",
     "@atlaskit/codemod-utils": "^4.2.0",
     "@atlaskit/custom-steps": "^0.0.10",