@atlaskit/editor-core 207.21.2 → 207.21.3

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-core
 
+## 207.21.3
+
+### Patch Changes
+
+- [#172260](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/172260)
+  [`ab178138e93db`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ab178138e93db) -
+  revert list layout shift fix
+- Updated dependencies
+
 ## 207.21.2
 
 ### Patch Changes

package/dist/cjs/create-editor/ReactEditorView.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ReactEditorView = ReactEditorView;
 exports.default = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
@@ -27,6 +28,7 @@ var _document = require("@atlaskit/editor-common/utils/document");
 var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _interactionMetrics = require("@atlaskit/react-ufo/interaction-metrics");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _useProviders = require("../composable-editor/hooks/useProviders");
@@ -45,6 +47,9 @@ var _handleEditorFocus = require("./ReactEditorView/handleEditorFocus");
 var _useDispatchTransaction = require("./ReactEditorView/useDispatchTransaction");
 var _useFireFullWidthEvent = require("./ReactEditorView/useFireFullWidthEvent");
 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); }
+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 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; }
 var EDIT_AREA_ID = 'ak-editor-textarea';
@@ -498,7 +503,77 @@ function ReactEditorView(props) {
       }
     }
   }, [editorView, shouldFocus, __livePage, mitigateScrollJump]);
+  var scrollElement = _react.default.useRef();
+  var possibleListeners = _react.default.useRef([]);
+  _react.default.useEffect(function () {
+    return function () {
+      if ((0, _platformFeatureFlags.fg)('cc_editor_abort_ufo_load_on_editor_scroll')) {
+        if (scrollElement.current) {
+          // eslint-disable-next-line react-hooks/exhaustive-deps
+          var _iterator = _createForOfIteratorHelper(possibleListeners.current),
+            _step;
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var _scrollElement$curren;
+              var possibleListener = _step.value;
+              // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+              (_scrollElement$curren = scrollElement.current) === null || _scrollElement$curren === void 0 || _scrollElement$curren.removeEventListener.apply(_scrollElement$curren, (0, _toConsumableArray2.default)(possibleListener));
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+        }
+        scrollElement.current = null;
+      }
+    };
+  }, []);
   var handleEditorViewRef = (0, _react.useCallback)(function (node) {
+    if ((0, _platformFeatureFlags.fg)('cc_editor_abort_ufo_load_on_editor_scroll')) {
+      if (node) {
+        scrollElement.current = document.querySelector('[data-editor-scroll-container]');
+        var cleanupListeners = function cleanupListeners() {
+          // eslint-disable-next-line react-hooks/exhaustive-deps
+          var _iterator2 = _createForOfIteratorHelper(possibleListeners.current),
+            _step2;
+          try {
+            for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+              var _scrollElement$curren2;
+              var possibleListener = _step2.value;
+              // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+              (_scrollElement$curren2 = scrollElement.current) === null || _scrollElement$curren2 === void 0 || _scrollElement$curren2.removeEventListener.apply(_scrollElement$curren2, (0, _toConsumableArray2.default)(possibleListener));
+            }
+          } catch (err) {
+            _iterator2.e(err);
+          } finally {
+            _iterator2.f();
+          }
+        };
+        if (scrollElement.current) {
+          var wheelAbortHandler = function wheelAbortHandler() {
+            var activeInteraction = (0, _interactionMetrics.getActiveInteraction)();
+            if (activeInteraction && ['edit-page', 'live-edit'].includes(activeInteraction.ufoName)) {
+              (0, _interactionMetrics.abortAll)('new_interaction', "wheel-on-editor-element");
+            }
+            cleanupListeners();
+          };
+          // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+          scrollElement.current.addEventListener('wheel', wheelAbortHandler);
+          possibleListeners.current.push(['wheel', wheelAbortHandler]);
+          var scrollAbortHandler = function scrollAbortHandler() {
+            var activeInteraction = (0, _interactionMetrics.getActiveInteraction)();
+            if (activeInteraction && ['edit-page', 'live-edit'].includes(activeInteraction.ufoName)) {
+              (0, _interactionMetrics.abortAll)('new_interaction', "scroll-on-editor-element");
+            }
+            cleanupListeners();
+          };
+          // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+          scrollElement.current.addEventListener('scroll', scrollAbortHandler);
+          possibleListeners.current.push(['scroll', scrollAbortHandler]);
+        }
+      }
+    }
     if (!viewRef.current && node) {
       // make sure this doesn't expose the experiment
       if ((0, _experiments.editorExperiment)('platform_editor_nodevisibility', true, {
@@ -509,8 +584,8 @@ function ReactEditorView(props) {
       var view = createEditorView(node);
       if ((0, _platformFeatureFlags.fg)('platform_editor_reduce_scroll_jump_on_editor_start')) {
         if (mitigateScrollJump) {
-          var scrollElement = document.querySelector('[data-editor-scroll-container]');
-          scrollElement === null || scrollElement === void 0 || scrollElement.scrollTo({
+          var _scrollElement = document.querySelector('[data-editor-scroll-container]');
+          _scrollElement === null || _scrollElement === void 0 || _scrollElement.scrollTo({
             top: originalScrollToRestore.current,
             behavior: 'instant'
           });

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

@@ -170,13 +170,6 @@ var legacyContentStyles = function legacyContentStyles(props) {
     exposure: false
   }) && !(0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') && _tasksAndDecisions.vanillaTaskDecisionIconWithoutVisualRefresh, _status.statusStyles, (0, _experiments.editorExperiment)('platform_editor_vanilla_dom', true) ? (0, _status.vanillaStatusStyles)() : null, (0, _styles.annotationSharedStyles)(), (0, _styles.smartCardStyles)(), (0, _platformFeatureFlags.fg)('platform-linking-visual-refresh-v1') ? (0, _styles.getSmartCardSharedStyles)() : _styles.smartCardSharedStyles, (0, _experiments.editorExperiment)('platform_editor_vanilla_dom', true) ? _date.dateVanillaStyles : null, _date.dateStyles, (0, _styles.embedCardStyles)(), _styles.unsupportedStyles, _styles.resizerStyles, (0, _styles.pragmaticResizerStyles)(), (0, _styles.pragmaticStylesLayoutFirstNodeResizeHandleFix)(), (0, _styles.pragmaticResizerStylesForTooltip)(), (0, _aiPanels.aiPanelStyles)(props.colorMode), firstBlockNodeStylesNew, _styles.MediaSharedClassNames.FLOATING_TOOLBAR_COMPONENT, !(0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') ? (0, _react2.css)(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t.hyperlink-open-link {\n\t\t\t\t\tmin-width: 24px;\n\t\t\t\t\tsvg {\n\t\t\t\t\t\tmax-width: 18px;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t"]))) : null);
 };
-var listLayoutShiftFix = (0, _react2.css)({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  '.ProseMirror ul, .ProseMirror ol': {
-    // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
-    marginTop: '10px'
-  }
-});
 var createEditorContentStyle = exports.createEditorContentStyle = function createEditorContentStyle(styles) {
   return /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     var className = props.className,
@@ -209,7 +202,7 @@ var createEditorContentStyle = exports.createEditorContentStyle = function creat
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
       className: className,
       ref: ref,
-      css: [memoizedStyle, styles, (0, _platformFeatureFlags.fg)('platform_editor_ssr_fix_lists') && listLayoutShiftFix],
+      css: [memoizedStyle, styles],
       "data-testid": "editor-content-container"
     }, children);
   });

package/dist/cjs/ui/EditorContentContainer/EditorContentContainer.js

@@ -306,9 +306,7 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     isFullPage && _fullPageEditorStyles.fullPageEditorStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    isFullPage && _scrollbarStyles.scrollbarStyles,
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    (0, _platformFeatureFlags.fg)('platform_editor_ssr_fix_lists') && _list.listLayoutShiftFix, (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') ?
+    isFullPage && _scrollbarStyles.scrollbarStyles, (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') ?
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _codeBlockStyles.firstCodeBlockWithNoMargin :
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

package/dist/cjs/ui/EditorContentContainer/styles/list.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.listsStylesSafariFix = exports.listsStyles = exports.listLayoutShiftFix = void 0;
+exports.listsStylesSafariFix = exports.listsStyles = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("@emotion/react");
 // eslint-disable-line @atlaskit/ui-styling-standard/use-compiled
@@ -147,13 +147,4 @@ var listsStylesSafariFix = exports.listsStylesSafariFix = (0, _react.css)((0, _d
 }), ".ProseMirror:not(.".concat(BLOCK_CARD_CONTAINER, ") > li > p:first-child, .ProseMirror:not(.").concat(BLOCK_CARD_CONTAINER, ") > li > .code-block:first-child, .ProseMirror:not(.").concat(BLOCK_CARD_CONTAINER, ") > li > .ProseMirror-gapcursor:first-child + .code-block"), {
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
   marginTop: "-".concat(akEditorLineHeight, "em !important")
-}));
-
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
-var listLayoutShiftFix = exports.listLayoutShiftFix = (0, _react.css)({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  '.ProseMirror ul, .ProseMirror ol': {
-    // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
-    marginTop: '10px'
-  }
-});
+}));

package/dist/cjs/version-wrapper.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "207.21.1";
+var version = exports.version = "207.21.2";

package/dist/es2019/create-editor/ReactEditorView.js

@@ -16,6 +16,7 @@ import { isEmptyDocument } from '@atlaskit/editor-common/utils/document';
 import { EditorState, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { abortAll, getActiveInteraction } from '@atlaskit/react-ufo/interaction-metrics';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { useProviders } from '../composable-editor/hooks/useProviders';
@@ -469,7 +470,59 @@ export function ReactEditorView(props) {
       }
     }
   }, [editorView, shouldFocus, __livePage, mitigateScrollJump]);
+  const scrollElement = React.useRef();
+  const possibleListeners = React.useRef([]);
+  React.useEffect(() => {
+    return () => {
+      if (fg('cc_editor_abort_ufo_load_on_editor_scroll')) {
+        if (scrollElement.current) {
+          // eslint-disable-next-line react-hooks/exhaustive-deps
+          for (const possibleListener of possibleListeners.current) {
+            var _scrollElement$curren;
+            // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+            (_scrollElement$curren = scrollElement.current) === null || _scrollElement$curren === void 0 ? void 0 : _scrollElement$curren.removeEventListener(...possibleListener);
+          }
+        }
+        scrollElement.current = null;
+      }
+    };
+  }, []);
   const handleEditorViewRef = useCallback(node => {
+    if (fg('cc_editor_abort_ufo_load_on_editor_scroll')) {
+      if (node) {
+        scrollElement.current = document.querySelector('[data-editor-scroll-container]');
+        const cleanupListeners = () => {
+          // eslint-disable-next-line react-hooks/exhaustive-deps
+          for (const possibleListener of possibleListeners.current) {
+            var _scrollElement$curren2;
+            // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+            (_scrollElement$curren2 = scrollElement.current) === null || _scrollElement$curren2 === void 0 ? void 0 : _scrollElement$curren2.removeEventListener(...possibleListener);
+          }
+        };
+        if (scrollElement.current) {
+          const wheelAbortHandler = () => {
+            const activeInteraction = getActiveInteraction();
+            if (activeInteraction && ['edit-page', 'live-edit'].includes(activeInteraction.ufoName)) {
+              abortAll('new_interaction', `wheel-on-editor-element`);
+            }
+            cleanupListeners();
+          };
+          // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+          scrollElement.current.addEventListener('wheel', wheelAbortHandler);
+          possibleListeners.current.push(['wheel', wheelAbortHandler]);
+          const scrollAbortHandler = () => {
+            const activeInteraction = getActiveInteraction();
+            if (activeInteraction && ['edit-page', 'live-edit'].includes(activeInteraction.ufoName)) {
+              abortAll('new_interaction', `scroll-on-editor-element`);
+            }
+            cleanupListeners();
+          };
+          // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+          scrollElement.current.addEventListener('scroll', scrollAbortHandler);
+          possibleListeners.current.push(['scroll', scrollAbortHandler]);
+        }
+      }
+    }
     if (!viewRef.current && node) {
       // make sure this doesn't expose the experiment
       if (editorExperiment('platform_editor_nodevisibility', true, {

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

@@ -515,13 +515,6 @@ const legacyContentStyles = props => css`
 				}
 			` : null}
 `;
-const listLayoutShiftFix = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  '.ProseMirror ul, .ProseMirror ol': {
-    // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
-    marginTop: '10px'
-  }
-});
 export const createEditorContentStyle = styles => {
   return /*#__PURE__*/React.forwardRef((props, ref) => {
     const {
@@ -555,7 +548,7 @@ export const createEditorContentStyle = styles => {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
       className: className,
       ref: ref,
-      css: [memoizedStyle, styles, fg('platform_editor_ssr_fix_lists') && listLayoutShiftFix],
+      css: [memoizedStyle, styles],
       "data-testid": "editor-content-container"
     }, children);
   });

package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js

@@ -39,7 +39,7 @@ import { indentationStyles } from './styles/indentationStyles';
 import { InlineNodeViewSharedStyles } from './styles/inlineNodeViewSharedStyles';
 import { layoutBaseStyles, layoutBaseStylesAdvanced, layoutBaseStylesFixesUnderNestedDnDFG, layoutColumnMartinTopFixesNew, layoutColumnMartinTopFixesOld, layoutColumnResponsiveStyles, layoutColumnStylesAdvanced, layoutColumnStylesNotAdvanced, layoutResponsiveBaseStyles, layoutResponsiveStylesForView, layoutSectionStylesAdvanced, layoutSectionStylesNotAdvanced, layoutSelectedStylesAdvanced, layoutSelectedStylesForViewAdvanced, layoutSelectedStylesForViewNotAdvanced, layoutSelectedStylesNotAdvanced, layoutStylesForView } from './styles/layout';
 import { hyperLinkFloatingToolbarStyles, linkLegacyIconStylesFix, linkStyles, linkStylesOld } from './styles/link';
-import { listLayoutShiftFix, listsStyles, listsStylesSafariFix } from './styles/list';
+import { listsStyles, listsStylesSafariFix } from './styles/list';
 import { mediaAlignmentStyles, mediaGroupStyles, mediaStyles } from './styles/mediaStyles';
 import { mentionsStyles, vanillaMentionsSelectionStyles, vanillaMentionsStyles } from './styles/mentions';
 import { panelStyles, panelStylesMixin, panelStylesMixin_fg_platform_editor_add_border_for_nested_panel, panelStylesMixin_fg_platform_editor_nested_dnd_styles_changes, panelViewStyles } from './styles/panelStyles';
@@ -301,9 +301,7 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     isFullPage && fullPageEditorStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    isFullPage && scrollbarStyles,
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    fg('platform_editor_ssr_fix_lists') && listLayoutShiftFix, fg('platform_editor_nested_dnd_styles_changes') ?
+    isFullPage && scrollbarStyles, fg('platform_editor_nested_dnd_styles_changes') ?
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     firstCodeBlockWithNoMargin :
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

package/dist/es2019/ui/EditorContentContainer/styles/list.js

@@ -143,13 +143,4 @@ export const listsStylesSafariFix = css({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
     marginTop: `-${akEditorLineHeight}em !important`
   }
-});
-
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
-export const listLayoutShiftFix = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  '.ProseMirror ul, .ProseMirror ol': {
-    // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
-    marginTop: '10px'
-  }
 });

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "207.21.1";
+export const version = "207.21.2";

package/dist/esm/create-editor/ReactEditorView.js

@@ -1,5 +1,9 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+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 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 React, { useCallback, useLayoutEffect, useMemo, useRef, useState } from 'react';
@@ -20,6 +24,7 @@ import { isEmptyDocument } from '@atlaskit/editor-common/utils/document';
 import { EditorState, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { abortAll, getActiveInteraction } from '@atlaskit/react-ufo/interaction-metrics';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { useProviders } from '../composable-editor/hooks/useProviders';
@@ -488,7 +493,77 @@ export function ReactEditorView(props) {
       }
     }
   }, [editorView, shouldFocus, __livePage, mitigateScrollJump]);
+  var scrollElement = React.useRef();
+  var possibleListeners = React.useRef([]);
+  React.useEffect(function () {
+    return function () {
+      if (fg('cc_editor_abort_ufo_load_on_editor_scroll')) {
+        if (scrollElement.current) {
+          // eslint-disable-next-line react-hooks/exhaustive-deps
+          var _iterator = _createForOfIteratorHelper(possibleListeners.current),
+            _step;
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var _scrollElement$curren;
+              var possibleListener = _step.value;
+              // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+              (_scrollElement$curren = scrollElement.current) === null || _scrollElement$curren === void 0 || _scrollElement$curren.removeEventListener.apply(_scrollElement$curren, _toConsumableArray(possibleListener));
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+        }
+        scrollElement.current = null;
+      }
+    };
+  }, []);
   var handleEditorViewRef = useCallback(function (node) {
+    if (fg('cc_editor_abort_ufo_load_on_editor_scroll')) {
+      if (node) {
+        scrollElement.current = document.querySelector('[data-editor-scroll-container]');
+        var cleanupListeners = function cleanupListeners() {
+          // eslint-disable-next-line react-hooks/exhaustive-deps
+          var _iterator2 = _createForOfIteratorHelper(possibleListeners.current),
+            _step2;
+          try {
+            for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+              var _scrollElement$curren2;
+              var possibleListener = _step2.value;
+              // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+              (_scrollElement$curren2 = scrollElement.current) === null || _scrollElement$curren2 === void 0 || _scrollElement$curren2.removeEventListener.apply(_scrollElement$curren2, _toConsumableArray(possibleListener));
+            }
+          } catch (err) {
+            _iterator2.e(err);
+          } finally {
+            _iterator2.f();
+          }
+        };
+        if (scrollElement.current) {
+          var wheelAbortHandler = function wheelAbortHandler() {
+            var activeInteraction = getActiveInteraction();
+            if (activeInteraction && ['edit-page', 'live-edit'].includes(activeInteraction.ufoName)) {
+              abortAll('new_interaction', "wheel-on-editor-element");
+            }
+            cleanupListeners();
+          };
+          // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+          scrollElement.current.addEventListener('wheel', wheelAbortHandler);
+          possibleListeners.current.push(['wheel', wheelAbortHandler]);
+          var scrollAbortHandler = function scrollAbortHandler() {
+            var activeInteraction = getActiveInteraction();
+            if (activeInteraction && ['edit-page', 'live-edit'].includes(activeInteraction.ufoName)) {
+              abortAll('new_interaction', "scroll-on-editor-element");
+            }
+            cleanupListeners();
+          };
+          // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+          scrollElement.current.addEventListener('scroll', scrollAbortHandler);
+          possibleListeners.current.push(['scroll', scrollAbortHandler]);
+        }
+      }
+    }
     if (!viewRef.current && node) {
       // make sure this doesn't expose the experiment
       if (editorExperiment('platform_editor_nodevisibility', true, {
@@ -499,8 +574,8 @@ export function ReactEditorView(props) {
       var view = createEditorView(node);
       if (fg('platform_editor_reduce_scroll_jump_on_editor_start')) {
         if (mitigateScrollJump) {
-          var scrollElement = document.querySelector('[data-editor-scroll-container]');
-          scrollElement === null || scrollElement === void 0 || scrollElement.scrollTo({
+          var _scrollElement = document.querySelector('[data-editor-scroll-container]');
+          _scrollElement === null || _scrollElement === void 0 || _scrollElement.scrollTo({
             top: originalScrollToRestore.current,
             behavior: 'instant'
           });

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

@@ -163,13 +163,6 @@ var legacyContentStyles = function legacyContentStyles(props) {
     exposure: false
   }) && !fg('platform-visual-refresh-icons') && vanillaDecisionIconWithoutVisualRefresh, statusStyles, editorExperiment('platform_editor_vanilla_dom', true) ? vanillaStatusStyles() : null, annotationSharedStyles(), smartCardStyles(), fg('platform-linking-visual-refresh-v1') ? getSmartCardSharedStyles() : smartCardSharedStyles, editorExperiment('platform_editor_vanilla_dom', true) ? dateVanillaStyles : null, dateStyles, embedCardStyles(), unsupportedStyles, resizerStyles, pragmaticResizerStyles(), pragmaticStylesLayoutFirstNodeResizeHandleFix(), pragmaticResizerStylesForTooltip(), aiPanelStyles(props.colorMode), firstBlockNodeStylesNew, MediaSharedClassNames.FLOATING_TOOLBAR_COMPONENT, !fg('platform-visual-refresh-icons') ? css(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n\t\t\t\t.hyperlink-open-link {\n\t\t\t\t\tmin-width: 24px;\n\t\t\t\t\tsvg {\n\t\t\t\t\t\tmax-width: 18px;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t"]))) : null);
 };
-var listLayoutShiftFix = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  '.ProseMirror ul, .ProseMirror ol': {
-    // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
-    marginTop: '10px'
-  }
-});
 export var createEditorContentStyle = function createEditorContentStyle(styles) {
   return /*#__PURE__*/React.forwardRef(function (props, ref) {
     var className = props.className,
@@ -202,7 +195,7 @@ export var createEditorContentStyle = function createEditorContentStyle(styles)
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
       className: className,
       ref: ref,
-      css: [memoizedStyle, styles, fg('platform_editor_ssr_fix_lists') && listLayoutShiftFix],
+      css: [memoizedStyle, styles],
       "data-testid": "editor-content-container"
     }, children);
   });

package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js

@@ -39,7 +39,7 @@ import { indentationStyles } from './styles/indentationStyles';
 import { InlineNodeViewSharedStyles } from './styles/inlineNodeViewSharedStyles';
 import { layoutBaseStyles, layoutBaseStylesAdvanced, layoutBaseStylesFixesUnderNestedDnDFG, layoutColumnMartinTopFixesNew, layoutColumnMartinTopFixesOld, layoutColumnResponsiveStyles, layoutColumnStylesAdvanced, layoutColumnStylesNotAdvanced, layoutResponsiveBaseStyles, layoutResponsiveStylesForView, layoutSectionStylesAdvanced, layoutSectionStylesNotAdvanced, layoutSelectedStylesAdvanced, layoutSelectedStylesForViewAdvanced, layoutSelectedStylesForViewNotAdvanced, layoutSelectedStylesNotAdvanced, layoutStylesForView } from './styles/layout';
 import { hyperLinkFloatingToolbarStyles, linkLegacyIconStylesFix, linkStyles, linkStylesOld } from './styles/link';
-import { listLayoutShiftFix, listsStyles, listsStylesSafariFix } from './styles/list';
+import { listsStyles, listsStylesSafariFix } from './styles/list';
 import { mediaAlignmentStyles, mediaGroupStyles, mediaStyles } from './styles/mediaStyles';
 import { mentionsStyles, vanillaMentionsSelectionStyles, vanillaMentionsStyles } from './styles/mentions';
 import { panelStyles, panelStylesMixin, panelStylesMixin_fg_platform_editor_add_border_for_nested_panel, panelStylesMixin_fg_platform_editor_nested_dnd_styles_changes, panelViewStyles } from './styles/panelStyles';
@@ -298,9 +298,7 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     isFullPage && fullPageEditorStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    isFullPage && scrollbarStyles,
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    fg('platform_editor_ssr_fix_lists') && listLayoutShiftFix, fg('platform_editor_nested_dnd_styles_changes') ?
+    isFullPage && scrollbarStyles, fg('platform_editor_nested_dnd_styles_changes') ?
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     firstCodeBlockWithNoMargin :
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

package/dist/esm/ui/EditorContentContainer/styles/list.js

@@ -139,13 +139,4 @@ export var listsStylesSafariFix = css(_defineProperty(_defineProperty({}, ".Pros
 }), ".ProseMirror:not(.".concat(BLOCK_CARD_CONTAINER, ") > li > p:first-child, .ProseMirror:not(.").concat(BLOCK_CARD_CONTAINER, ") > li > .code-block:first-child, .ProseMirror:not(.").concat(BLOCK_CARD_CONTAINER, ") > li > .ProseMirror-gapcursor:first-child + .code-block"), {
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
   marginTop: "-".concat(akEditorLineHeight, "em !important")
-}));
-
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
-export var listLayoutShiftFix = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  '.ProseMirror ul, .ProseMirror ol': {
-    // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
-    marginTop: '10px'
-  }
-});
+}));

package/dist/esm/version-wrapper.js

@@ -1,2 +1,2 @@
 export var name = "@atlaskit/editor-core";
-export var version = "207.21.1";
+export var version = "207.21.2";

package/dist/types/ui/EditorContentContainer/styles/list.d.ts

@@ -1,3 +1,2 @@
 export declare const listsStyles: import("@emotion/react").SerializedStyles;
 export declare const listsStylesSafariFix: import("@emotion/react").SerializedStyles;
-export declare const listLayoutShiftFix: import("@emotion/react").SerializedStyles;

package/dist/types-ts4.5/ui/EditorContentContainer/styles/list.d.ts

@@ -1,3 +1,2 @@
 export declare const listsStyles: import("@emotion/react").SerializedStyles;
 export declare const listsStylesSafariFix: import("@emotion/react").SerializedStyles;
-export declare const listLayoutShiftFix: import("@emotion/react").SerializedStyles;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "207.21.2",
+	"version": "207.21.3",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -105,7 +105,7 @@
 		"@atlaskit/primitives": "^14.8.0",
 		"@atlaskit/renderer": "^118.7.0",
 		"@atlaskit/section-message": "^8.2.0",
-		"@atlaskit/smart-card": "^38.9.0",
+		"@atlaskit/smart-card": "^38.10.0",
 		"@atlaskit/synchrony-test-helpers": "workspace:^",
 		"@atlaskit/toggle": "^15.0.0",
 		"@atlaskit/util-data-test": "^18.0.0",
@@ -152,6 +152,9 @@
 		"cc_complexit_fe_improve_node_validation": {
 			"type": "boolean"
 		},
+		"cc_editor_abort_ufo_load_on_editor_scroll": {
+			"type": "boolean"
+		},
 		"platform_editor_reduce_scroll_jump_on_editor_start": {
 			"type": "boolean"
 		},
@@ -411,10 +414,6 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
-		"platform_editor_non_macros_list_indent_fix": {
-			"type": "boolean",
-			"referenceOnly": true
-		},
 		"platform_editor_remove_drag_handle_fix": {
 			"type": "boolean",
 			"referenceOnly": true
@@ -641,9 +640,6 @@
 		"platform_editor_interaction_api_refactor": {
 			"type": "boolean"
 		},
-		"platform_editor_ssr_fix_lists": {
-			"type": "boolean"
-		},
 		"dst-a11y__replace-anchor-with-link__editor": {
 			"type": "boolean"
 		},