@atlaskit/editor-common 74.53.0 → 74.53.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-common
 
+## 74.53.1
+
+### Patch Changes
+
+- [`eab48233583`](https://bitbucket.org/atlassian/atlassian-frontend/commits/eab48233583) - Calculate parent content width properly when inserting a nested media single node
+
 ## 74.53.0
 
 ### Minor Changes

package/dist/cjs/media-single/utils.js

@@ -7,7 +7,7 @@ exports.calcMinWidth = exports.calcMediaSinglePixelWidth = exports.calcMediaSing
 exports.calculateOffsetLeft = calculateOffsetLeft;
 exports.getMediaSingleInitialWidth = exports.getMaxWidthForNestedNodeNext = exports.getMaxWidthForNestedNode = void 0;
 exports.getMediaSinglePixelWidth = getMediaSinglePixelWidth;
-exports.roundToNearest = exports.getParentWidthForNestedMediaSingleNode = void 0;
+exports.roundToNearest = exports.getParentWidthForNestedMediaSingleNodeForInsertion = exports.getParentWidthForNestedMediaSingleNode = void 0;
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _richMediaUtils = require("../utils/rich-media-utils");
 var _constants = require("./constants");
@@ -174,20 +174,28 @@ var getMaxWidthForNestedNode = function getMaxWidthForNestedNode(view, pos) {
   }
   return null;
 };
+exports.getMaxWidthForNestedNode = getMaxWidthForNestedNode;
+var calcParentPadding = function calcParentPadding(view, resolvedPos) {
+  // since table has constant padding, use hardcoded constant instead of query the dom
+  var tablePadding = 8;
+  var _view$state$schema$no = view.state.schema.nodes,
+    tableCell = _view$state$schema$no.tableCell,
+    tableHeader = _view$state$schema$no.tableHeader;
+  return [tableCell, tableHeader].includes(resolvedPos.parent.type) ? tablePadding * 2 : 0;
+};
 
 /**
  * Get parent width for a nested media single node for new experience
  * @param view Editor view
  * @param pos node position
  */
-exports.getMaxWidthForNestedNode = getMaxWidthForNestedNode;
-var getMaxWidthForNestedNodeNext = function getMaxWidthForNestedNodeNext(view, pos) {
+var getMaxWidthForNestedNodeNext = function getMaxWidthForNestedNodeNext(view, pos, forInsertion) {
   if (typeof pos !== 'number') {
     return null;
   }
   var $pos = view.state.doc.resolve(pos);
   if ($pos && $pos.parent.type.name !== 'doc') {
-    return getParentWidthForNestedMediaSingleNode($pos, view);
+    return forInsertion ? getParentWidthForNestedMediaSingleNodeForInsertion($pos, view) : getParentWidthForNestedMediaSingleNode($pos, view);
   }
   return null;
 };
@@ -195,19 +203,22 @@ exports.getMaxWidthForNestedNodeNext = getMaxWidthForNestedNodeNext;
 var getParentWidthForNestedMediaSingleNode = function getParentWidthForNestedMediaSingleNode(resolvedPos, view) {
   var domNode = view.nodeDOM(resolvedPos.pos);
   if (resolvedPos.nodeAfter && _richMediaUtils.floatingLayouts.includes(resolvedPos.nodeAfter.attrs.layout) && domNode && domNode.parentElement) {
-    var _view$state$schema$no = view.state.schema.nodes,
-      tableCell = _view$state$schema$no.tableCell,
-      tableHeader = _view$state$schema$no.tableHeader;
-    if ([tableCell, tableHeader].includes(resolvedPos.parent.type)) {
-      // since table has constant padding, use hardcoded constant instead of query the dom
-      var tablePadding = 8;
-      return domNode.parentElement.offsetWidth - tablePadding * 2;
-    }
-    return domNode.parentElement.offsetWidth;
+    var parentPadding = calcParentPadding(view, resolvedPos);
+    return domNode.parentElement.offsetWidth - parentPadding;
   }
   if (domNode instanceof HTMLElement) {
     return domNode.offsetWidth;
   }
   return null;
 };
-exports.getParentWidthForNestedMediaSingleNode = getParentWidthForNestedMediaSingleNode;
+exports.getParentWidthForNestedMediaSingleNode = getParentWidthForNestedMediaSingleNode;
+var getParentWidthForNestedMediaSingleNodeForInsertion = function getParentWidthForNestedMediaSingleNodeForInsertion(resolvedPos, view) {
+  var parentPos = resolvedPos.before(resolvedPos.depth);
+  var parentDomNode = view.nodeDOM(parentPos);
+  var parentPadding = calcParentPadding(view, resolvedPos);
+  if (parentDomNode instanceof HTMLElement) {
+    return parentDomNode.offsetWidth - parentPadding;
+  }
+  return null;
+};
+exports.getParentWidthForNestedMediaSingleNodeForInsertion = getParentWidthForNestedMediaSingleNodeForInsertion;

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 = "74.53.0";
+var packageVersion = "74.53.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/ui/DropList/index.js

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

package/dist/es2019/media-single/utils.js

@@ -151,38 +151,48 @@ export const getMaxWidthForNestedNode = (view, pos) => {
   }
   return null;
 };
+const calcParentPadding = (view, resolvedPos) => {
+  // since table has constant padding, use hardcoded constant instead of query the dom
+  const tablePadding = 8;
+  const {
+    tableCell,
+    tableHeader
+  } = view.state.schema.nodes;
+  return [tableCell, tableHeader].includes(resolvedPos.parent.type) ? tablePadding * 2 : 0;
+};
 
 /**
  * Get parent width for a nested media single node for new experience
  * @param view Editor view
  * @param pos node position
  */
-export const getMaxWidthForNestedNodeNext = (view, pos) => {
+export const getMaxWidthForNestedNodeNext = (view, pos, forInsertion) => {
   if (typeof pos !== 'number') {
     return null;
   }
   const $pos = view.state.doc.resolve(pos);
   if ($pos && $pos.parent.type.name !== 'doc') {
-    return getParentWidthForNestedMediaSingleNode($pos, view);
+    return forInsertion ? getParentWidthForNestedMediaSingleNodeForInsertion($pos, view) : getParentWidthForNestedMediaSingleNode($pos, view);
   }
   return null;
 };
 export const getParentWidthForNestedMediaSingleNode = (resolvedPos, view) => {
   const domNode = view.nodeDOM(resolvedPos.pos);
   if (resolvedPos.nodeAfter && floatingLayouts.includes(resolvedPos.nodeAfter.attrs.layout) && domNode && domNode.parentElement) {
-    const {
-      tableCell,
-      tableHeader
-    } = view.state.schema.nodes;
-    if ([tableCell, tableHeader].includes(resolvedPos.parent.type)) {
-      // since table has constant padding, use hardcoded constant instead of query the dom
-      const tablePadding = 8;
-      return domNode.parentElement.offsetWidth - tablePadding * 2;
-    }
-    return domNode.parentElement.offsetWidth;
+    const parentPadding = calcParentPadding(view, resolvedPos);
+    return domNode.parentElement.offsetWidth - parentPadding;
   }
   if (domNode instanceof HTMLElement) {
     return domNode.offsetWidth;
   }
   return null;
+};
+export const getParentWidthForNestedMediaSingleNodeForInsertion = (resolvedPos, view) => {
+  const parentPos = resolvedPos.before(resolvedPos.depth);
+  const parentDomNode = view.nodeDOM(parentPos);
+  const parentPadding = calcParentPadding(view, resolvedPos);
+  if (parentDomNode instanceof HTMLElement) {
+    return parentDomNode.offsetWidth - parentPadding;
+  }
+  return null;
 };

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 = "74.53.0";
+const packageVersion = "74.53.1";
 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

@@ -8,7 +8,7 @@ import { themed } from '@atlaskit/theme/components';
 import { borderRadius } from '@atlaskit/theme/constants';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "74.53.0";
+const packageVersion = "74.53.1";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

package/dist/esm/media-single/utils.js

@@ -160,37 +160,47 @@ export var getMaxWidthForNestedNode = function getMaxWidthForNestedNode(view, po
   }
   return null;
 };
+var calcParentPadding = function calcParentPadding(view, resolvedPos) {
+  // since table has constant padding, use hardcoded constant instead of query the dom
+  var tablePadding = 8;
+  var _view$state$schema$no = view.state.schema.nodes,
+    tableCell = _view$state$schema$no.tableCell,
+    tableHeader = _view$state$schema$no.tableHeader;
+  return [tableCell, tableHeader].includes(resolvedPos.parent.type) ? tablePadding * 2 : 0;
+};
 
 /**
  * Get parent width for a nested media single node for new experience
  * @param view Editor view
  * @param pos node position
  */
-export var getMaxWidthForNestedNodeNext = function getMaxWidthForNestedNodeNext(view, pos) {
+export var getMaxWidthForNestedNodeNext = function getMaxWidthForNestedNodeNext(view, pos, forInsertion) {
   if (typeof pos !== 'number') {
     return null;
   }
   var $pos = view.state.doc.resolve(pos);
   if ($pos && $pos.parent.type.name !== 'doc') {
-    return getParentWidthForNestedMediaSingleNode($pos, view);
+    return forInsertion ? getParentWidthForNestedMediaSingleNodeForInsertion($pos, view) : getParentWidthForNestedMediaSingleNode($pos, view);
   }
   return null;
 };
 export var getParentWidthForNestedMediaSingleNode = function getParentWidthForNestedMediaSingleNode(resolvedPos, view) {
   var domNode = view.nodeDOM(resolvedPos.pos);
   if (resolvedPos.nodeAfter && floatingLayouts.includes(resolvedPos.nodeAfter.attrs.layout) && domNode && domNode.parentElement) {
-    var _view$state$schema$no = view.state.schema.nodes,
-      tableCell = _view$state$schema$no.tableCell,
-      tableHeader = _view$state$schema$no.tableHeader;
-    if ([tableCell, tableHeader].includes(resolvedPos.parent.type)) {
-      // since table has constant padding, use hardcoded constant instead of query the dom
-      var tablePadding = 8;
-      return domNode.parentElement.offsetWidth - tablePadding * 2;
-    }
-    return domNode.parentElement.offsetWidth;
+    var parentPadding = calcParentPadding(view, resolvedPos);
+    return domNode.parentElement.offsetWidth - parentPadding;
   }
   if (domNode instanceof HTMLElement) {
     return domNode.offsetWidth;
   }
   return null;
+};
+export var getParentWidthForNestedMediaSingleNodeForInsertion = function getParentWidthForNestedMediaSingleNodeForInsertion(resolvedPos, view) {
+  var parentPos = resolvedPos.before(resolvedPos.depth);
+  var parentDomNode = view.nodeDOM(parentPos);
+  var parentPadding = calcParentPadding(view, resolvedPos);
+  if (parentDomNode instanceof HTMLElement) {
+    return parentDomNode.offsetWidth - parentPadding;
+  }
+  return null;
 };

package/dist/esm/monitoring/error.js

@@ -6,7 +6,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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 = "74.53.0";
+var packageVersion = "74.53.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/ui/DropList/index.js

@@ -18,7 +18,7 @@ import { themed } from '@atlaskit/theme/components';
 import { borderRadius } from '@atlaskit/theme/constants';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "74.53.0";
+var packageVersion = "74.53.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/types/media-single/utils.d.ts

@@ -73,5 +73,6 @@ export declare const getMaxWidthForNestedNode: (view: EditorView, pos: number |
  * @param view Editor view
  * @param pos node position
  */
-export declare const getMaxWidthForNestedNodeNext: (view: EditorView, pos: number | undefined) => number | null;
+export declare const getMaxWidthForNestedNodeNext: (view: EditorView, pos: number | undefined, forInsertion?: boolean) => number | null;
 export declare const getParentWidthForNestedMediaSingleNode: (resolvedPos: ResolvedPos, view: EditorView) => number | null;
+export declare const getParentWidthForNestedMediaSingleNodeForInsertion: (resolvedPos: ResolvedPos, view: EditorView) => number | null;

package/dist/types-ts4.5/media-single/utils.d.ts

@@ -73,5 +73,6 @@ export declare const getMaxWidthForNestedNode: (view: EditorView, pos: number |
  * @param view Editor view
  * @param pos node position
  */
-export declare const getMaxWidthForNestedNodeNext: (view: EditorView, pos: number | undefined) => number | null;
+export declare const getMaxWidthForNestedNodeNext: (view: EditorView, pos: number | undefined, forInsertion?: boolean) => number | null;
 export declare const getParentWidthForNestedMediaSingleNode: (resolvedPos: ResolvedPos, view: EditorView) => number | null;
+export declare const getParentWidthForNestedMediaSingleNodeForInsertion: (resolvedPos: ResolvedPos, view: EditorView) => number | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-common",
-  "version": "74.53.0",
+  "version": "74.53.1",
   "description": "A package that contains common classes and components for editor and renderer",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"