@atlaskit/editor-common 112.12.0 → 112.13.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-common
 
+## 112.13.0
+
+### Minor Changes
+
+- [`b749ce678d575`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b749ce678d575) -
+  Preserve small text formatting across list and task list edits
+
+### Patch Changes
+
+- Updated dependencies
+
+## 112.12.1
+
+### Patch Changes
+
+- [`13ec7df78a017`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/13ec7df78a017) -
+  Editor-5664: Fix scroll position for block links
+- Updated dependencies
+
 ## 112.12.0
 
 ### Minor Changes

package/dist/cjs/block-menu/scroll-to-block-utils.js

@@ -8,14 +8,13 @@ exports.expandElement = exports.expandAllParentsThenScroll = exports.SCROLL_TO_B
 exports.findNodeWithExpandParents = findNodeWithExpandParents;
 exports.isExpandCollapsed = exports.getLocalIdSelector = exports.findParentExpands = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-/**
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; } /**
  * Shared utilities for scrolling to block elements with expand node support.
  * Used by both Confluence's useScrollOnUrlChange and platform renderer's useScrollToBlock.
  */
-
 /**
  * Timing constants for expand animation and DOM update delays.
  * These values are tuned for the expand component's behavior and React's update cycle.
@@ -195,10 +194,17 @@ var expandElement = exports.expandElement = function expandElement(expandContain
  */
 var _expandAllParentsThenScroll = exports.expandAllParentsThenScroll = function expandAllParentsThenScroll(element) {
   var attempt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  var scrollFn = arguments.length > 2 ? arguments[2] : undefined;
   var MAX_EXPAND_DEPTH = SCROLL_TO_BLOCK_TIMING.MAX_EXPAND_DEPTH,
     MAX_ATTEMPTS = SCROLL_TO_BLOCK_TIMING.MAX_ATTEMPTS,
     DOM_UPDATE_DELAY = SCROLL_TO_BLOCK_TIMING.DOM_UPDATE_DELAY,
     RETRY_DELAY = SCROLL_TO_BLOCK_TIMING.RETRY_DELAY;
+  var doScroll = scrollFn !== null && scrollFn !== void 0 ? scrollFn : function (el) {
+    return el.scrollIntoView({
+      behavior: 'smooth',
+      block: 'center'
+    });
+  };
 
   // Store timeout ID and nested cleanup function so they can be cancelled.
   var timeoutId = null;
@@ -220,10 +226,7 @@ var _expandAllParentsThenScroll = exports.expandAllParentsThenScroll = function
   if (attempt >= MAX_ATTEMPTS || !element.isConnected) {
     // Max attempts reached or element disconnected, scroll anyway.
     if (element.isConnected) {
-      element.scrollIntoView({
-        behavior: 'smooth',
-        block: 'center'
-      });
+      doScroll(element);
     }
     return cleanup;
   }
@@ -237,10 +240,7 @@ var _expandAllParentsThenScroll = exports.expandAllParentsThenScroll = function
     });
     if (collapsedExpands.length === 0) {
       // All expands are open (or there are no expands), scroll to element.
-      element.scrollIntoView({
-        behavior: 'smooth',
-        block: 'center'
-      });
+      doScroll(element);
       return cleanup;
     }
 
@@ -260,14 +260,11 @@ var _expandAllParentsThenScroll = exports.expandAllParentsThenScroll = function
             }
 
             // Recurse to handle any nested collapsed expands or retry if still collapsed.
-            nestedCleanup = _expandAllParentsThenScroll(element, attempt + 1);
+            nestedCleanup = _expandAllParentsThenScroll(element, attempt + 1, scrollFn);
           } catch (_unused) {
             // Fallback to simple scroll on error.
             if (element.isConnected) {
-              element.scrollIntoView({
-                behavior: 'smooth',
-                block: 'center'
-              });
+              doScroll(element);
             }
           }
         }, DOM_UPDATE_DELAY);
@@ -275,7 +272,7 @@ var _expandAllParentsThenScroll = exports.expandAllParentsThenScroll = function
         // Failed to expand, retry with longer delay.
         timeoutId = setTimeout(function () {
           if (element.isConnected) {
-            nestedCleanup = _expandAllParentsThenScroll(element, attempt + 1);
+            nestedCleanup = _expandAllParentsThenScroll(element, attempt + 1, scrollFn);
           }
         }, RETRY_DELAY);
       }
@@ -283,17 +280,14 @@ var _expandAllParentsThenScroll = exports.expandAllParentsThenScroll = function
       // Retry on error.
       timeoutId = setTimeout(function () {
         if (element.isConnected) {
-          nestedCleanup = _expandAllParentsThenScroll(element, attempt + 1);
+          nestedCleanup = _expandAllParentsThenScroll(element, attempt + 1, scrollFn);
         }
       }, RETRY_DELAY);
     }
   } catch (_unused3) {
     // Fallback to simple scroll on error.
     if (element.isConnected) {
-      element.scrollIntoView({
-        behavior: 'smooth',
-        block: 'center'
-      });
+      doScroll(element);
     }
   }
   return cleanup;
@@ -318,6 +312,9 @@ var getLocalIdSelector = exports.getLocalIdSelector = function getLocalIdSelecto
   // Special case for tables which use data-table-local-id
   element = container.querySelector("[data-table-local-id=\"".concat(localId, "\"]"));
   if (element) {
+    if ((0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_4')) {
+      return element.parentElement; // return table wrapper instead of table div, so the height calculation is correct
+    }
     return element;
   }
 

package/dist/cjs/lists/block-mark.js

@@ -0,0 +1,73 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.reconcileBlockMarkInRange = exports.reconcileBlockMarkForParagraphAtPos = exports.reconcileBlockMarkForContainerAtPos = exports.getFirstParagraphBlockMarkAttrs = exports.getBlockMarkAttrs = void 0;
+var _commands = require("../commands");
+var getDefaultBlockNodeTypes = function getDefaultBlockNodeTypes(tr) {
+  var paragraph = tr.doc.type.schema.nodes.paragraph;
+  return paragraph ? [paragraph] : [];
+};
+var getBlockMarkAttrs = exports.getBlockMarkAttrs = function getBlockMarkAttrs(node, markType) {
+  if (!node || !markType) {
+    return false;
+  }
+  var blockMark = node.marks.find(function (mark) {
+    return mark.type === markType;
+  });
+  return blockMark ? blockMark.attrs : false;
+};
+var getFirstParagraphBlockMarkAttrs = exports.getFirstParagraphBlockMarkAttrs = function getFirstParagraphBlockMarkAttrs(node, markType) {
+  if (!node || !markType) {
+    return false;
+  }
+  var paragraph = node.type.schema.nodes.paragraph;
+  if (!paragraph) {
+    return false;
+  }
+  var _findFirstParagraphBlockMarkAttrs = function findFirstParagraphBlockMarkAttrs(currentNode) {
+    if (currentNode.type === paragraph) {
+      return getBlockMarkAttrs(currentNode, markType);
+    }
+    for (var index = 0; index < currentNode.childCount; index++) {
+      var childResult = _findFirstParagraphBlockMarkAttrs(currentNode.child(index));
+      if (childResult !== false) {
+        return childResult;
+      }
+    }
+    return false;
+  };
+  return _findFirstParagraphBlockMarkAttrs(node);
+};
+var reconcileBlockMarkInRange = exports.reconcileBlockMarkInRange = function reconcileBlockMarkInRange(tr, from, to, markType, markAttrs) {
+  var blockNodeTypes = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : getDefaultBlockNodeTypes(tr);
+  if (!markType || blockNodeTypes.length === 0) {
+    return false;
+  }
+  return (0, _commands.createToggleBlockMarkOnRangeNext)(markType, function () {
+    return markAttrs;
+  }, blockNodeTypes)(from, to, tr);
+};
+var reconcileBlockMarkForContainerAtPos = exports.reconcileBlockMarkForContainerAtPos = function reconcileBlockMarkForContainerAtPos(tr, containerPos, markType, markAttrs) {
+  var blockNodeTypes = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : getDefaultBlockNodeTypes(tr);
+  var containerNode = tr.doc.nodeAt(containerPos);
+  if (!containerNode) {
+    return false;
+  }
+  return reconcileBlockMarkInRange(tr, containerPos, containerPos + containerNode.nodeSize, markType, markAttrs, blockNodeTypes);
+};
+var reconcileBlockMarkForParagraphAtPos = exports.reconcileBlockMarkForParagraphAtPos = function reconcileBlockMarkForParagraphAtPos(tr, pos, markType, markAttrs) {
+  var paragraph = tr.doc.type.schema.nodes.paragraph;
+  if (!paragraph) {
+    return false;
+  }
+  var resolvedPos = tr.doc.resolve(Math.max(0, Math.min(pos, tr.doc.content.size)));
+  for (var depth = resolvedPos.depth; depth > 0; depth--) {
+    var node = resolvedPos.node(depth);
+    if (node.type === paragraph) {
+      return reconcileBlockMarkInRange(tr, resolvedPos.before(depth), resolvedPos.before(depth) + node.nodeSize, markType, markAttrs, [paragraph]);
+    }
+  }
+  return false;
+};

package/dist/cjs/lists/index.js

@@ -33,12 +33,24 @@ Object.defineProperty(exports, "flattenList", {
     return _flattenList.flattenList;
   }
 });
+Object.defineProperty(exports, "getBlockMarkAttrs", {
+  enumerable: true,
+  get: function get() {
+    return _blockMark.getBlockMarkAttrs;
+  }
+});
 Object.defineProperty(exports, "getCommonListAnalyticsAttributes", {
   enumerable: true,
   get: function get() {
     return _analytics.getCommonListAnalyticsAttributes;
   }
 });
+Object.defineProperty(exports, "getFirstParagraphBlockMarkAttrs", {
+  enumerable: true,
+  get: function get() {
+    return _blockMark.getFirstParagraphBlockMarkAttrs;
+  }
+});
 Object.defineProperty(exports, "getListItemAttributes", {
   enumerable: true,
   get: function get() {
@@ -117,6 +129,24 @@ Object.defineProperty(exports, "processNestedTaskListsInSameLevel", {
     return _node.processNestedTaskListsInSameLevel;
   }
 });
+Object.defineProperty(exports, "reconcileBlockMarkForContainerAtPos", {
+  enumerable: true,
+  get: function get() {
+    return _blockMark.reconcileBlockMarkForContainerAtPos;
+  }
+});
+Object.defineProperty(exports, "reconcileBlockMarkForParagraphAtPos", {
+  enumerable: true,
+  get: function get() {
+    return _blockMark.reconcileBlockMarkForParagraphAtPos;
+  }
+});
+Object.defineProperty(exports, "reconcileBlockMarkInRange", {
+  enumerable: true,
+  get: function get() {
+    return _blockMark.reconcileBlockMarkInRange;
+  }
+});
 Object.defineProperty(exports, "restoreSelection", {
   enumerable: true,
   get: function get() {
@@ -132,5 +162,6 @@ var _restoreSelection = require("./restore-selection");
 var _buildReplacementFragment = require("./build-replacement-fragment");
 var _narrowReplacementRange = require("./narrow-replacement-range");
 var _flattenList = require("./flatten-list");
+var _blockMark = require("./block-mark");
 var _utils = require("../utils");
 var _messages = require("./messages");

package/dist/cjs/monitoring/error.js

@@ -19,7 +19,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 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 = "112.11.3";
+var packageVersion = "112.13.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

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

@@ -24,7 +24,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 = "112.11.3";
+var packageVersion = "112.13.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = (0, _react2.keyframes)({

package/dist/es2019/block-menu/scroll-to-block-utils.js

@@ -3,6 +3,8 @@
  * Used by both Confluence's useScrollOnUrlChange and platform renderer's useScrollToBlock.
  */
 
+import { fg } from '@atlaskit/platform-feature-flags';
+
 /**
  * Timing constants for expand animation and DOM update delays.
  * These values are tuned for the expand component's behavior and React's update cycle.
@@ -170,13 +172,17 @@ export const expandElement = expandContainer => {
  * @returns A cleanup function that cancels any pending timeouts. Call this when the operation
  *          should be aborted (e.g., component unmount, navigation, or new scroll request).
  */
-export const expandAllParentsThenScroll = (element, attempt = 0) => {
+export const expandAllParentsThenScroll = (element, attempt = 0, scrollFn) => {
   const {
     MAX_EXPAND_DEPTH,
     MAX_ATTEMPTS,
     DOM_UPDATE_DELAY,
     RETRY_DELAY
   } = SCROLL_TO_BLOCK_TIMING;
+  const doScroll = scrollFn !== null && scrollFn !== void 0 ? scrollFn : el => el.scrollIntoView({
+    behavior: 'smooth',
+    block: 'center'
+  });
 
   // Store timeout ID and nested cleanup function so they can be cancelled.
   let timeoutId = null;
@@ -198,10 +204,7 @@ export const expandAllParentsThenScroll = (element, attempt = 0) => {
   if (attempt >= MAX_ATTEMPTS || !element.isConnected) {
     // Max attempts reached or element disconnected, scroll anyway.
     if (element.isConnected) {
-      element.scrollIntoView({
-        behavior: 'smooth',
-        block: 'center'
-      });
+      doScroll(element);
     }
     return cleanup;
   }
@@ -213,10 +216,7 @@ export const expandAllParentsThenScroll = (element, attempt = 0) => {
     const collapsedExpands = parentExpands.filter(expandContainer => expandContainer.isConnected && isExpandCollapsed(expandContainer));
     if (collapsedExpands.length === 0) {
       // All expands are open (or there are no expands), scroll to element.
-      element.scrollIntoView({
-        behavior: 'smooth',
-        block: 'center'
-      });
+      doScroll(element);
       return cleanup;
     }
 
@@ -236,14 +236,11 @@ export const expandAllParentsThenScroll = (element, attempt = 0) => {
             }
 
             // Recurse to handle any nested collapsed expands or retry if still collapsed.
-            nestedCleanup = expandAllParentsThenScroll(element, attempt + 1);
+            nestedCleanup = expandAllParentsThenScroll(element, attempt + 1, scrollFn);
           } catch {
             // Fallback to simple scroll on error.
             if (element.isConnected) {
-              element.scrollIntoView({
-                behavior: 'smooth',
-                block: 'center'
-              });
+              doScroll(element);
             }
           }
         }, DOM_UPDATE_DELAY);
@@ -251,7 +248,7 @@ export const expandAllParentsThenScroll = (element, attempt = 0) => {
         // Failed to expand, retry with longer delay.
         timeoutId = setTimeout(() => {
           if (element.isConnected) {
-            nestedCleanup = expandAllParentsThenScroll(element, attempt + 1);
+            nestedCleanup = expandAllParentsThenScroll(element, attempt + 1, scrollFn);
           }
         }, RETRY_DELAY);
       }
@@ -259,17 +256,14 @@ export const expandAllParentsThenScroll = (element, attempt = 0) => {
       // Retry on error.
       timeoutId = setTimeout(() => {
         if (element.isConnected) {
-          nestedCleanup = expandAllParentsThenScroll(element, attempt + 1);
+          nestedCleanup = expandAllParentsThenScroll(element, attempt + 1, scrollFn);
         }
       }, RETRY_DELAY);
     }
   } catch {
     // Fallback to simple scroll on error.
     if (element.isConnected) {
-      element.scrollIntoView({
-        behavior: 'smooth',
-        block: 'center'
-      });
+      doScroll(element);
     }
   }
   return cleanup;
@@ -294,6 +288,9 @@ export const getLocalIdSelector = (localId, container) => {
   // Special case for tables which use data-table-local-id
   element = container.querySelector(`[data-table-local-id="${localId}"]`);
   if (element) {
+    if (fg('platform_editor_block_menu_v2_patch_4')) {
+      return element.parentElement; // return table wrapper instead of table div, so the height calculation is correct
+    }
     return element;
   }
 

package/dist/es2019/lists/block-mark.js

@@ -0,0 +1,67 @@
+import { createToggleBlockMarkOnRangeNext } from '../commands';
+const getDefaultBlockNodeTypes = tr => {
+  const {
+    paragraph
+  } = tr.doc.type.schema.nodes;
+  return paragraph ? [paragraph] : [];
+};
+export const getBlockMarkAttrs = (node, markType) => {
+  if (!node || !markType) {
+    return false;
+  }
+  const blockMark = node.marks.find(mark => mark.type === markType);
+  return blockMark ? blockMark.attrs : false;
+};
+export const getFirstParagraphBlockMarkAttrs = (node, markType) => {
+  if (!node || !markType) {
+    return false;
+  }
+  const {
+    paragraph
+  } = node.type.schema.nodes;
+  if (!paragraph) {
+    return false;
+  }
+  const findFirstParagraphBlockMarkAttrs = currentNode => {
+    if (currentNode.type === paragraph) {
+      return getBlockMarkAttrs(currentNode, markType);
+    }
+    for (let index = 0; index < currentNode.childCount; index++) {
+      const childResult = findFirstParagraphBlockMarkAttrs(currentNode.child(index));
+      if (childResult !== false) {
+        return childResult;
+      }
+    }
+    return false;
+  };
+  return findFirstParagraphBlockMarkAttrs(node);
+};
+export const reconcileBlockMarkInRange = (tr, from, to, markType, markAttrs, blockNodeTypes = getDefaultBlockNodeTypes(tr)) => {
+  if (!markType || blockNodeTypes.length === 0) {
+    return false;
+  }
+  return createToggleBlockMarkOnRangeNext(markType, () => markAttrs, blockNodeTypes)(from, to, tr);
+};
+export const reconcileBlockMarkForContainerAtPos = (tr, containerPos, markType, markAttrs, blockNodeTypes = getDefaultBlockNodeTypes(tr)) => {
+  const containerNode = tr.doc.nodeAt(containerPos);
+  if (!containerNode) {
+    return false;
+  }
+  return reconcileBlockMarkInRange(tr, containerPos, containerPos + containerNode.nodeSize, markType, markAttrs, blockNodeTypes);
+};
+export const reconcileBlockMarkForParagraphAtPos = (tr, pos, markType, markAttrs) => {
+  const {
+    paragraph
+  } = tr.doc.type.schema.nodes;
+  if (!paragraph) {
+    return false;
+  }
+  const resolvedPos = tr.doc.resolve(Math.max(0, Math.min(pos, tr.doc.content.size)));
+  for (let depth = resolvedPos.depth; depth > 0; depth--) {
+    const node = resolvedPos.node(depth);
+    if (node.type === paragraph) {
+      return reconcileBlockMarkInRange(tr, resolvedPos.before(depth), resolvedPos.before(depth) + node.nodeSize, markType, markAttrs, [paragraph]);
+    }
+  }
+  return false;
+};

package/dist/es2019/lists/index.js

@@ -10,5 +10,6 @@ export { restoreSelection, computeSelectionOffsets } from './restore-selection';
 export { buildReplacementFragment } from './build-replacement-fragment';
 export { narrowReplacementRange } from './narrow-replacement-range';
 export { flattenList } from './flatten-list';
+export { getBlockMarkAttrs, getFirstParagraphBlockMarkAttrs, reconcileBlockMarkForContainerAtPos, reconcileBlockMarkForParagraphAtPos, reconcileBlockMarkInRange } from './block-mark';
 export { isListNode, isListItemNode, isBulletList, isParagraphNode } from '../utils';
 export { messages } from './messages';

package/dist/es2019/monitoring/error.js

@@ -4,7 +4,7 @@ import { isFedRamp } from './environment';
 import { normaliseSentryBreadcrumbs, SERIALIZABLE_ATTRIBUTES } from './normalise-sentry-breadcrumbs';
 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 = "112.11.3";
+const packageVersion = "112.13.0";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

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

@@ -14,7 +14,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "112.11.3";
+const packageVersion = "112.13.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 const fadeIn = keyframes({

package/dist/esm/block-menu/scroll-to-block-utils.js

@@ -7,6 +7,8 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
  * Used by both Confluence's useScrollOnUrlChange and platform renderer's useScrollToBlock.
  */
 
+import { fg } from '@atlaskit/platform-feature-flags';
+
 /**
  * Timing constants for expand animation and DOM update delays.
  * These values are tuned for the expand component's behavior and React's update cycle.
@@ -186,10 +188,17 @@ export var expandElement = function expandElement(expandContainer) {
  */
 var _expandAllParentsThenScroll = function expandAllParentsThenScroll(element) {
   var attempt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  var scrollFn = arguments.length > 2 ? arguments[2] : undefined;
   var MAX_EXPAND_DEPTH = SCROLL_TO_BLOCK_TIMING.MAX_EXPAND_DEPTH,
     MAX_ATTEMPTS = SCROLL_TO_BLOCK_TIMING.MAX_ATTEMPTS,
     DOM_UPDATE_DELAY = SCROLL_TO_BLOCK_TIMING.DOM_UPDATE_DELAY,
     RETRY_DELAY = SCROLL_TO_BLOCK_TIMING.RETRY_DELAY;
+  var doScroll = scrollFn !== null && scrollFn !== void 0 ? scrollFn : function (el) {
+    return el.scrollIntoView({
+      behavior: 'smooth',
+      block: 'center'
+    });
+  };
 
   // Store timeout ID and nested cleanup function so they can be cancelled.
   var timeoutId = null;
@@ -211,10 +220,7 @@ var _expandAllParentsThenScroll = function expandAllParentsThenScroll(element) {
   if (attempt >= MAX_ATTEMPTS || !element.isConnected) {
     // Max attempts reached or element disconnected, scroll anyway.
     if (element.isConnected) {
-      element.scrollIntoView({
-        behavior: 'smooth',
-        block: 'center'
-      });
+      doScroll(element);
     }
     return cleanup;
   }
@@ -228,10 +234,7 @@ var _expandAllParentsThenScroll = function expandAllParentsThenScroll(element) {
     });
     if (collapsedExpands.length === 0) {
       // All expands are open (or there are no expands), scroll to element.
-      element.scrollIntoView({
-        behavior: 'smooth',
-        block: 'center'
-      });
+      doScroll(element);
       return cleanup;
     }
 
@@ -251,14 +254,11 @@ var _expandAllParentsThenScroll = function expandAllParentsThenScroll(element) {
             }
 
             // Recurse to handle any nested collapsed expands or retry if still collapsed.
-            nestedCleanup = _expandAllParentsThenScroll(element, attempt + 1);
+            nestedCleanup = _expandAllParentsThenScroll(element, attempt + 1, scrollFn);
           } catch (_unused) {
             // Fallback to simple scroll on error.
             if (element.isConnected) {
-              element.scrollIntoView({
-                behavior: 'smooth',
-                block: 'center'
-              });
+              doScroll(element);
             }
           }
         }, DOM_UPDATE_DELAY);
@@ -266,7 +266,7 @@ var _expandAllParentsThenScroll = function expandAllParentsThenScroll(element) {
         // Failed to expand, retry with longer delay.
         timeoutId = setTimeout(function () {
           if (element.isConnected) {
-            nestedCleanup = _expandAllParentsThenScroll(element, attempt + 1);
+            nestedCleanup = _expandAllParentsThenScroll(element, attempt + 1, scrollFn);
           }
         }, RETRY_DELAY);
       }
@@ -274,17 +274,14 @@ var _expandAllParentsThenScroll = function expandAllParentsThenScroll(element) {
       // Retry on error.
       timeoutId = setTimeout(function () {
         if (element.isConnected) {
-          nestedCleanup = _expandAllParentsThenScroll(element, attempt + 1);
+          nestedCleanup = _expandAllParentsThenScroll(element, attempt + 1, scrollFn);
         }
       }, RETRY_DELAY);
     }
   } catch (_unused3) {
     // Fallback to simple scroll on error.
     if (element.isConnected) {
-      element.scrollIntoView({
-        behavior: 'smooth',
-        block: 'center'
-      });
+      doScroll(element);
     }
   }
   return cleanup;
@@ -310,6 +307,9 @@ export var getLocalIdSelector = function getLocalIdSelector(localId, container)
   // Special case for tables which use data-table-local-id
   element = container.querySelector("[data-table-local-id=\"".concat(localId, "\"]"));
   if (element) {
+    if (fg('platform_editor_block_menu_v2_patch_4')) {
+      return element.parentElement; // return table wrapper instead of table div, so the height calculation is correct
+    }
     return element;
   }
 

package/dist/esm/lists/block-mark.js

@@ -0,0 +1,67 @@
+import { createToggleBlockMarkOnRangeNext } from '../commands';
+var getDefaultBlockNodeTypes = function getDefaultBlockNodeTypes(tr) {
+  var paragraph = tr.doc.type.schema.nodes.paragraph;
+  return paragraph ? [paragraph] : [];
+};
+export var getBlockMarkAttrs = function getBlockMarkAttrs(node, markType) {
+  if (!node || !markType) {
+    return false;
+  }
+  var blockMark = node.marks.find(function (mark) {
+    return mark.type === markType;
+  });
+  return blockMark ? blockMark.attrs : false;
+};
+export var getFirstParagraphBlockMarkAttrs = function getFirstParagraphBlockMarkAttrs(node, markType) {
+  if (!node || !markType) {
+    return false;
+  }
+  var paragraph = node.type.schema.nodes.paragraph;
+  if (!paragraph) {
+    return false;
+  }
+  var _findFirstParagraphBlockMarkAttrs = function findFirstParagraphBlockMarkAttrs(currentNode) {
+    if (currentNode.type === paragraph) {
+      return getBlockMarkAttrs(currentNode, markType);
+    }
+    for (var index = 0; index < currentNode.childCount; index++) {
+      var childResult = _findFirstParagraphBlockMarkAttrs(currentNode.child(index));
+      if (childResult !== false) {
+        return childResult;
+      }
+    }
+    return false;
+  };
+  return _findFirstParagraphBlockMarkAttrs(node);
+};
+export var reconcileBlockMarkInRange = function reconcileBlockMarkInRange(tr, from, to, markType, markAttrs) {
+  var blockNodeTypes = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : getDefaultBlockNodeTypes(tr);
+  if (!markType || blockNodeTypes.length === 0) {
+    return false;
+  }
+  return createToggleBlockMarkOnRangeNext(markType, function () {
+    return markAttrs;
+  }, blockNodeTypes)(from, to, tr);
+};
+export var reconcileBlockMarkForContainerAtPos = function reconcileBlockMarkForContainerAtPos(tr, containerPos, markType, markAttrs) {
+  var blockNodeTypes = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : getDefaultBlockNodeTypes(tr);
+  var containerNode = tr.doc.nodeAt(containerPos);
+  if (!containerNode) {
+    return false;
+  }
+  return reconcileBlockMarkInRange(tr, containerPos, containerPos + containerNode.nodeSize, markType, markAttrs, blockNodeTypes);
+};
+export var reconcileBlockMarkForParagraphAtPos = function reconcileBlockMarkForParagraphAtPos(tr, pos, markType, markAttrs) {
+  var paragraph = tr.doc.type.schema.nodes.paragraph;
+  if (!paragraph) {
+    return false;
+  }
+  var resolvedPos = tr.doc.resolve(Math.max(0, Math.min(pos, tr.doc.content.size)));
+  for (var depth = resolvedPos.depth; depth > 0; depth--) {
+    var node = resolvedPos.node(depth);
+    if (node.type === paragraph) {
+      return reconcileBlockMarkInRange(tr, resolvedPos.before(depth), resolvedPos.before(depth) + node.nodeSize, markType, markAttrs, [paragraph]);
+    }
+  }
+  return false;
+};

package/dist/esm/lists/index.js

@@ -10,5 +10,6 @@ export { restoreSelection, computeSelectionOffsets } from './restore-selection';
 export { buildReplacementFragment } from './build-replacement-fragment';
 export { narrowReplacementRange } from './narrow-replacement-range';
 export { flattenList } from './flatten-list';
+export { getBlockMarkAttrs, getFirstParagraphBlockMarkAttrs, reconcileBlockMarkForContainerAtPos, reconcileBlockMarkForParagraphAtPos, reconcileBlockMarkInRange } from './block-mark';
 export { isListNode, isListItemNode, isBulletList, isParagraphNode } from '../utils';
 export { messages } from './messages';

package/dist/esm/monitoring/error.js

@@ -10,7 +10,7 @@ import { isFedRamp } from './environment';
 import { normaliseSentryBreadcrumbs, SERIALIZABLE_ATTRIBUTES } from './normalise-sentry-breadcrumbs';
 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 = "112.11.3";
+var packageVersion = "112.13.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

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

@@ -21,7 +21,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "112.11.3";
+var packageVersion = "112.13.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = keyframes({

package/dist/types/block-menu/scroll-to-block-utils.d.ts

@@ -90,5 +90,5 @@ export declare const expandElement: (expandContainer: HTMLElement) => boolean;
  * @returns A cleanup function that cancels any pending timeouts. Call this when the operation
  *          should be aborted (e.g., component unmount, navigation, or new scroll request).
  */
-export declare const expandAllParentsThenScroll: (element: HTMLElement, attempt?: number) => (() => void);
+export declare const expandAllParentsThenScroll: (element: HTMLElement, attempt?: number, scrollFn?: (element: HTMLElement) => void) => (() => void);
 export declare const getLocalIdSelector: (localId: string, container: HTMLElement) => HTMLElement | null;

package/dist/types/lists/block-mark.d.ts

@@ -0,0 +1,9 @@
+import type { MarkType, Node as PMNode, NodeType } from '@atlaskit/editor-prosemirror/model';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+type BlockMarkAttrs = Record<string, unknown>;
+export declare const getBlockMarkAttrs: <T extends BlockMarkAttrs = BlockMarkAttrs>(node: PMNode | null | undefined, markType?: MarkType) => T | false;
+export declare const getFirstParagraphBlockMarkAttrs: <T extends BlockMarkAttrs = BlockMarkAttrs>(node: PMNode | null | undefined, markType?: MarkType) => T | false;
+export declare const reconcileBlockMarkInRange: <T extends BlockMarkAttrs = BlockMarkAttrs>(tr: Transaction, from: number, to: number, markType: MarkType | undefined, markAttrs: T | false, blockNodeTypes?: NodeType[]) => boolean;
+export declare const reconcileBlockMarkForContainerAtPos: <T extends BlockMarkAttrs = BlockMarkAttrs>(tr: Transaction, containerPos: number, markType: MarkType | undefined, markAttrs: T | false, blockNodeTypes?: NodeType[]) => boolean;
+export declare const reconcileBlockMarkForParagraphAtPos: <T extends BlockMarkAttrs = BlockMarkAttrs>(tr: Transaction, pos: number, markType: MarkType | undefined, markAttrs: T | false) => boolean;
+export {};

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

@@ -11,5 +11,6 @@ export type { NarrowedReplacement } from './narrow-replacement-range';
 export type { FlattenedItem } from './flatten-list';
 export { flattenList } from './flatten-list';
 export type { FlattenListOptions, FlattenListResult } from './flatten-list';
+export { getBlockMarkAttrs, getFirstParagraphBlockMarkAttrs, reconcileBlockMarkForContainerAtPos, reconcileBlockMarkForParagraphAtPos, reconcileBlockMarkInRange, } from './block-mark';
 export { isListNode, isListItemNode, isBulletList, isParagraphNode } from '../utils';
 export { messages } from './messages';

package/dist/types-ts4.5/block-menu/scroll-to-block-utils.d.ts

@@ -90,5 +90,5 @@ export declare const expandElement: (expandContainer: HTMLElement) => boolean;
  * @returns A cleanup function that cancels any pending timeouts. Call this when the operation
  *          should be aborted (e.g., component unmount, navigation, or new scroll request).
  */
-export declare const expandAllParentsThenScroll: (element: HTMLElement, attempt?: number) => (() => void);
+export declare const expandAllParentsThenScroll: (element: HTMLElement, attempt?: number, scrollFn?: (element: HTMLElement) => void) => (() => void);
 export declare const getLocalIdSelector: (localId: string, container: HTMLElement) => HTMLElement | null;

package/dist/types-ts4.5/lists/block-mark.d.ts

@@ -0,0 +1,9 @@
+import type { MarkType, Node as PMNode, NodeType } from '@atlaskit/editor-prosemirror/model';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+type BlockMarkAttrs = Record<string, unknown>;
+export declare const getBlockMarkAttrs: <T extends BlockMarkAttrs = BlockMarkAttrs>(node: PMNode | null | undefined, markType?: MarkType) => T | false;
+export declare const getFirstParagraphBlockMarkAttrs: <T extends BlockMarkAttrs = BlockMarkAttrs>(node: PMNode | null | undefined, markType?: MarkType) => T | false;
+export declare const reconcileBlockMarkInRange: <T extends BlockMarkAttrs = BlockMarkAttrs>(tr: Transaction, from: number, to: number, markType: MarkType | undefined, markAttrs: T | false, blockNodeTypes?: NodeType[]) => boolean;
+export declare const reconcileBlockMarkForContainerAtPos: <T extends BlockMarkAttrs = BlockMarkAttrs>(tr: Transaction, containerPos: number, markType: MarkType | undefined, markAttrs: T | false, blockNodeTypes?: NodeType[]) => boolean;
+export declare const reconcileBlockMarkForParagraphAtPos: <T extends BlockMarkAttrs = BlockMarkAttrs>(tr: Transaction, pos: number, markType: MarkType | undefined, markAttrs: T | false) => boolean;
+export {};

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

@@ -11,5 +11,6 @@ export type { NarrowedReplacement } from './narrow-replacement-range';
 export type { FlattenedItem } from './flatten-list';
 export { flattenList } from './flatten-list';
 export type { FlattenListOptions, FlattenListResult } from './flatten-list';
+export { getBlockMarkAttrs, getFirstParagraphBlockMarkAttrs, reconcileBlockMarkForContainerAtPos, reconcileBlockMarkForParagraphAtPos, reconcileBlockMarkInRange, } from './block-mark';
 export { isListNode, isListItemNode, isBulletList, isParagraphNode } from '../utils';
 export { messages } from './messages';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "112.12.0",
+	"version": "112.13.0",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -73,15 +73,15 @@
 		"@atlaskit/primitives": "^18.1.0",
 		"@atlaskit/profilecard": "^24.45.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
-		"@atlaskit/react-ufo": "^5.6.0",
+		"@atlaskit/react-ufo": "^5.7.0",
 		"@atlaskit/section-message": "^8.12.0",
 		"@atlaskit/smart-card": "^43.28.0",
 		"@atlaskit/smart-user-picker": "^9.2.0",
 		"@atlaskit/spinner": "^19.0.0",
-		"@atlaskit/status": "^3.1.0",
+		"@atlaskit/status": "^3.2.0",
 		"@atlaskit/task-decision": "^19.3.0",
 		"@atlaskit/textfield": "^8.2.0",
-		"@atlaskit/tmp-editor-statsig": "^48.1.0",
+		"@atlaskit/tmp-editor-statsig": "^49.0.0",
 		"@atlaskit/tokens": "^11.4.0",
 		"@atlaskit/tooltip": "^21.0.0",
 		"@atlaskit/width-detector": "^5.0.0",
@@ -267,6 +267,9 @@
 		"platform_editor_toolbar_aifc_placement_overridden": {
 			"type": "boolean"
 		},
+		"platform_editor_block_menu_v2_patch_4": {
+			"type": "boolean"
+		},
 		"jim-lower-ranking-in-jira-macro-search": {
 			"type": "boolean"
 		},