@atlaskit/editor-plugin-list 10.1.6 → 10.2.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/editor-plugin-list
 
+## 10.2.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
+
 ## 10.1.6
 
 ### Patch Changes

package/dist/cjs/pm-plugins/actions/merge-lists.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.mergeNextListAtPosition = mergeNextListAtPosition;
+var _lists = require("@atlaskit/editor-common/lists");
 var _utils = require("@atlaskit/editor-common/utils");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 function mergeNextListAtPosition(_ref) {
   var tr = _ref.tr,
     listPosition = _ref.listPosition;
@@ -22,13 +24,13 @@ function mergeNextListAtPosition(_ref) {
   if (!(0, _utils.isListNode)(nodeBefore) || !(0, _utils.isListNode)(nodeAfter)) {
     return;
   }
-  if ((nodeAfter === null || nodeAfter === void 0 ? void 0 : nodeAfter.type.name) !== (nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.type.name)) {
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    var previousListPosition = pos - nodeBefore.nodeSize;
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  var previousListPosition = pos - nodeBefore.nodeSize;
+  if (nodeAfter && nodeAfter.type.name !== (nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.type.name)) {
     tr.setNodeMarkup(previousListPosition, nodeAfter.type);
   }
   tr.join(pos);
+  if (tr.doc.type.schema.marks.fontSize && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true)) {
+    var upperListFontSizeAttrs = (0, _lists.getFirstParagraphBlockMarkAttrs)(nodeBefore, tr.doc.type.schema.marks.fontSize);
+    (0, _lists.reconcileBlockMarkForContainerAtPos)(tr, previousListPosition, tr.doc.type.schema.marks.fontSize, upperListFontSizeAttrs);
+  }
 }

package/dist/cjs/pm-plugins/commands/index.js

@@ -16,6 +16,7 @@ var _commands2 = require("@atlaskit/editor-prosemirror/commands");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _conversions = require("../actions/conversions");
 var _wrapAndJoinLists = require("../actions/wrap-and-join-lists");
 var _transforms = require("../transforms");
@@ -248,10 +249,17 @@ function splitListItem(itemType) {
     var types = nextType && [null, {
       type: nextType
     }];
+    var fontSize = state.schema.marks.fontSize;
+    var isFontSizeSupported = fontSize && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true);
+    var currentFontSizeAttrs = isFontSizeSupported ? (0, _lists.getBlockMarkAttrs)($from.parent, fontSize) : false;
     if (dispatch) {
       var _$from$nodeBefore;
       if (ref instanceof _state.TextSelection) {
-        dispatch(tr.split($from.pos, 2, types !== null && types !== void 0 ? types : undefined).scrollIntoView());
+        var splitTr = tr.split($from.pos, 2, types !== null && types !== void 0 ? types : undefined);
+        if (isFontSizeSupported) {
+          (0, _lists.reconcileBlockMarkForParagraphAtPos)(splitTr, splitTr.selection.from, fontSize, currentFontSizeAttrs);
+        }
+        dispatch(splitTr.scrollIntoView());
         return true;
       }
 
@@ -262,7 +270,7 @@ function splitListItem(itemType) {
         var _state$schema$nodes2 = state.schema.nodes,
           listItem = _state$schema$nodes2.listItem,
           paragraph = _state$schema$nodes2.paragraph;
-        var newListItem = listItem.createChecked({}, paragraph.createChecked());
+        var newListItem = listItem.createChecked({}, paragraph.createChecked({}, undefined, currentFontSizeAttrs && isFontSizeSupported ? [fontSize.create(currentFontSizeAttrs)] : undefined));
         dispatch(tr.insert($from.pos, newListItem).setSelection(_state.Selection.near(tr.doc.resolve($to.pos + 1))).scrollIntoView());
         return true;
       }
@@ -298,6 +306,7 @@ var joinToPreviousListItem = function joinToPreviousListItem(state, dispatch) {
     codeBlock = _state$schema$nodes3.codeBlock,
     bulletList = _state$schema$nodes3.bulletList,
     orderedList = _state$schema$nodes3.orderedList;
+  var fontSize = state.schema.marks.fontSize;
   var isGapCursorShown = state.selection instanceof _selection.GapCursorSelection;
   var $cutPos = isGapCursorShown ? state.doc.resolve($from.pos + 1) : $from;
   var $cut = (0, _commands.findCutBefore)($cutPos);
@@ -346,6 +355,13 @@ var joinToPreviousListItem = function joinToPreviousListItem(state, dispatch) {
       if ($postCut.nodeBefore && $postCut.nodeAfter && $postCut.nodeBefore.type === $postCut.nodeAfter.type && [bulletList, orderedList].indexOf($postCut.nodeBefore.type) > -1) {
         tr = tr.join($postCut.pos);
       }
+      if (fontSize && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true)) {
+        var prevListFontSizeAttrs = (0, _lists.getFirstParagraphBlockMarkAttrs)($cut.nodeBefore, fontSize);
+        var containingList = (0, _utils2.findParentNodeOfTypeClosestToPos)(tr.doc.resolve(tr.mapping.map($cut.pos)), [bulletList, orderedList]);
+        if (containingList) {
+          (0, _lists.reconcileBlockMarkForContainerAtPos)(tr, containingList.pos, fontSize, prevListFontSizeAttrs);
+        }
+      }
       if (dispatch) {
         var _tr$doc$resolve$nodeB;
         if (!((_tr$doc$resolve$nodeB = tr.doc.resolve($lastNode.pos).nodeBefore) !== null && _tr$doc$resolve$nodeB !== void 0 && _tr$doc$resolve$nodeB.isBlock) || tr.doc.resolve($lastNode.pos).nodeBefore === null) {

package/dist/cjs/pm-plugins/commands/listBackspace.js

@@ -7,8 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.listBackspace = exports.calcJoinListScenario = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _lists = require("@atlaskit/editor-common/lists");
 var _utils = require("@atlaskit/editor-common/utils");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _selection = require("../utils/selection");
 //Cases below refer to the cases found in this document: https://product-fabric.atlassian.net/wiki/spaces/E/pages/1146954996/List+Backspace+and+Delete+Behaviour
 
@@ -41,6 +43,7 @@ var listBackspaceCase2 = function listBackspaceCase2(tr, dispatch, $prev, $head)
    */
 
   var listItemE = $head.node(-1); //Head is inside listItem E so it must have a first and last child
+  var fontSize = tr.doc.type.schema.marks.fontSize;
   if (!listItemE.firstChild) {
     return false;
   }
@@ -53,6 +56,10 @@ var listBackspaceCase2 = function listBackspaceCase2(tr, dispatch, $prev, $head)
   (0, _utils.insertContentDeleteRange)(tr, function (tr) {
     return tr.doc.resolve(textInsertPos);
   }, [[textContent, textInsertPos], [childrenGContent, childrenGInsertPos]], [[beforeListItemE, afterListItemE]]);
+  if (fontSize && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true)) {
+    var targetParagraphFontSizeAttrs = (0, _lists.getBlockMarkAttrs)($prev.parent.lastChild, fontSize);
+    (0, _lists.reconcileBlockMarkForParagraphAtPos)(tr, tr.mapping.map(textInsertPos), fontSize, targetParagraphFontSizeAttrs);
+  }
   if (dispatch) {
     dispatch(tr);
   }
@@ -99,6 +106,7 @@ var listBackspaceCase3 = function listBackspaceCase3(tr, dispatch, $prev, $head)
 
   var listE = $head.node(-2);
   var listItemF = $head.node(-1); //Head is inside listItem F so it must have a first and last child
+  var fontSize = tr.doc.type.schema.marks.fontSize;
   if (!listItemF.firstChild || !listItemF.lastChild) {
     return false;
   }
@@ -120,6 +128,10 @@ var listBackspaceCase3 = function listBackspaceCase3(tr, dispatch, $prev, $head)
   (0, _utils.insertContentDeleteRange)(tr, function (tr) {
     return tr.doc.resolve(textInsertPos);
   }, containsChildrenJ ? [[textContent, textInsertPos], [childrenHContent, childrenHInsertPos], [childrenJContent, childrenJInsertPos]] : [[textContent, textInsertPos], [childrenHContent, childrenHInsertPos]], [shouldRemoveListE ? [beforeListE, afterListE] : [beforeListItemF, afterListItemF]]);
+  if (fontSize && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true)) {
+    var targetParagraphFontSizeAttrs = (0, _lists.getBlockMarkAttrs)($prev.parent, fontSize);
+    (0, _lists.reconcileBlockMarkForParagraphAtPos)(tr, tr.mapping.map(textInsertPos), fontSize, targetParagraphFontSizeAttrs);
+  }
   if (dispatch) {
     dispatch(tr);
   }
@@ -185,6 +197,7 @@ var listBackspaceCase4 = function listBackspaceCase4(tr, dispatch, $prev, $head,
     return false;
   }
   var listItemK = $head.node(-1); //Head is inside listItem K so it must have a first and last child
+  var fontSize = tr.doc.type.schema.marks.fontSize;
   if (!listItemK.firstChild || !listItemK.lastChild) {
     return false;
   }
@@ -203,6 +216,10 @@ var listBackspaceCase4 = function listBackspaceCase4(tr, dispatch, $prev, $head,
   (0, _utils.insertContentDeleteRange)(tr, function (tr) {
     return tr.doc.resolve(textInsertPos);
   }, containsChildrenO ? [[textContent, textInsertPos], [childrenMContent, childrenMInsertPos], [childrenOContent, childrenOInsertPos]] : [[textContent, textInsertPos], [childrenMContent, childrenMInsertPos]], [[beforeListItemK, afterListItemK]]);
+  if (fontSize && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true)) {
+    var targetParagraphFontSizeAttrs = (0, _lists.getBlockMarkAttrs)($last.parent, fontSize);
+    (0, _lists.reconcileBlockMarkForParagraphAtPos)(tr, tr.mapping.map(textInsertPos), fontSize, targetParagraphFontSizeAttrs);
+  }
   if (dispatch) {
     dispatch(tr);
   }

package/dist/es2019/pm-plugins/actions/merge-lists.js

@@ -1,4 +1,6 @@
+import { getFirstParagraphBlockMarkAttrs, reconcileBlockMarkForContainerAtPos } from '@atlaskit/editor-common/lists';
 import { isListNode } from '@atlaskit/editor-common/utils';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export function mergeNextListAtPosition({
   tr,
   listPosition
@@ -19,13 +21,13 @@ export function mergeNextListAtPosition({
   if (!isListNode(nodeBefore) || !isListNode(nodeAfter)) {
     return;
   }
-  if ((nodeAfter === null || nodeAfter === void 0 ? void 0 : nodeAfter.type.name) !== (nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.type.name)) {
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const previousListPosition = pos - nodeBefore.nodeSize;
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  const previousListPosition = pos - nodeBefore.nodeSize;
+  if (nodeAfter && nodeAfter.type.name !== (nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.type.name)) {
     tr.setNodeMarkup(previousListPosition, nodeAfter.type);
   }
   tr.join(pos);
+  if (tr.doc.type.schema.marks.fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+    const upperListFontSizeAttrs = getFirstParagraphBlockMarkAttrs(nodeBefore, tr.doc.type.schema.marks.fontSize);
+    reconcileBlockMarkForContainerAtPos(tr, previousListPosition, tr.doc.type.schema.marks.fontSize, upperListFontSizeAttrs);
+  }
 }

package/dist/es2019/pm-plugins/commands/index.js

@@ -1,13 +1,14 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { findCutBefore } from '@atlaskit/editor-common/commands';
-import { getCommonListAnalyticsAttributes, moveTargetIntoList } from '@atlaskit/editor-common/lists';
+import { getBlockMarkAttrs, getCommonListAnalyticsAttributes, getFirstParagraphBlockMarkAttrs, moveTargetIntoList, reconcileBlockMarkForContainerAtPos, reconcileBlockMarkForParagraphAtPos } from '@atlaskit/editor-common/lists';
 import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
 import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { filterCommand as filter, hasVisibleContent, isEmptySelectionAtStart } from '@atlaskit/editor-common/utils';
 import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { findPositionOfNodeBefore, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { findParentNodeOfTypeClosestToPos, findPositionOfNodeBefore, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { convertListType } from '../actions/conversions';
 import { wrapInListAndJoin } from '../actions/wrap-and-join-lists';
 import { liftFollowingList, liftNodeSelectionList, liftTextSelectionList } from '../transforms';
@@ -231,10 +232,17 @@ function splitListItem(itemType) {
     const types = nextType && [null, {
       type: nextType
     }];
+    const fontSize = state.schema.marks.fontSize;
+    const isFontSizeSupported = fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true);
+    const currentFontSizeAttrs = isFontSizeSupported ? getBlockMarkAttrs($from.parent, fontSize) : false;
     if (dispatch) {
       var _$from$nodeBefore;
       if (ref instanceof TextSelection) {
-        dispatch(tr.split($from.pos, 2, types !== null && types !== void 0 ? types : undefined).scrollIntoView());
+        const splitTr = tr.split($from.pos, 2, types !== null && types !== void 0 ? types : undefined);
+        if (isFontSizeSupported) {
+          reconcileBlockMarkForParagraphAtPos(splitTr, splitTr.selection.from, fontSize, currentFontSizeAttrs);
+        }
+        dispatch(splitTr.scrollIntoView());
         return true;
       }
 
@@ -246,7 +254,7 @@ function splitListItem(itemType) {
           listItem,
           paragraph
         } = state.schema.nodes;
-        const newListItem = listItem.createChecked({}, paragraph.createChecked());
+        const newListItem = listItem.createChecked({}, paragraph.createChecked({}, undefined, currentFontSizeAttrs && isFontSizeSupported ? [fontSize.create(currentFontSizeAttrs)] : undefined));
         dispatch(tr.insert($from.pos, newListItem).setSelection(Selection.near(tr.doc.resolve($to.pos + 1))).scrollIntoView());
         return true;
       }
@@ -291,6 +299,9 @@ const joinToPreviousListItem = (state, dispatch) => {
     bulletList,
     orderedList
   } = state.schema.nodes;
+  const {
+    fontSize
+  } = state.schema.marks;
   const isGapCursorShown = state.selection instanceof GapCursorSelection;
   const $cutPos = isGapCursorShown ? state.doc.resolve($from.pos + 1) : $from;
   const $cut = findCutBefore($cutPos);
@@ -341,6 +352,13 @@ const joinToPreviousListItem = (state, dispatch) => {
       if ($postCut.nodeBefore && $postCut.nodeAfter && $postCut.nodeBefore.type === $postCut.nodeAfter.type && [bulletList, orderedList].indexOf($postCut.nodeBefore.type) > -1) {
         tr = tr.join($postCut.pos);
       }
+      if (fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+        const prevListFontSizeAttrs = getFirstParagraphBlockMarkAttrs($cut.nodeBefore, fontSize);
+        const containingList = findParentNodeOfTypeClosestToPos(tr.doc.resolve(tr.mapping.map($cut.pos)), [bulletList, orderedList]);
+        if (containingList) {
+          reconcileBlockMarkForContainerAtPos(tr, containingList.pos, fontSize, prevListFontSizeAttrs);
+        }
+      }
       if (dispatch) {
         var _tr$doc$resolve$nodeB;
         if (!((_tr$doc$resolve$nodeB = tr.doc.resolve($lastNode.pos).nodeBefore) !== null && _tr$doc$resolve$nodeB !== void 0 && _tr$doc$resolve$nodeB.isBlock) || tr.doc.resolve($lastNode.pos).nodeBefore === null) {

package/dist/es2019/pm-plugins/commands/listBackspace.js

@@ -1,6 +1,8 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, DELETE_DIRECTION, EVENT_TYPE, INPUT_METHOD, LIST_TEXT_SCENARIOS } from '@atlaskit/editor-common/analytics';
+import { getBlockMarkAttrs, reconcileBlockMarkForParagraphAtPos } from '@atlaskit/editor-common/lists';
 import { insertContentDeleteRange, isEmptySelectionAtStart, isListNode, isParagraphNode, walkPrevNode } from '@atlaskit/editor-common/utils';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isPosInsideList, isPosInsideParagraph } from '../utils/selection';
 //Cases below refer to the cases found in this document: https://product-fabric.atlassian.net/wiki/spaces/E/pages/1146954996/List+Backspace+and+Delete+Behaviour
 
@@ -33,6 +35,9 @@ const listBackspaceCase2 = (tr, dispatch, $prev, $head) => {
    */
 
   const listItemE = $head.node(-1); //Head is inside listItem E so it must have a first and last child
+  const {
+    fontSize
+  } = tr.doc.type.schema.marks;
   if (!listItemE.firstChild) {
     return false;
   }
@@ -43,6 +48,10 @@ const listBackspaceCase2 = (tr, dispatch, $prev, $head) => {
   const textContent = $head.parent.content;
   const childrenGContent = listItemE.content.cut(listItemE.firstChild.nodeSize);
   insertContentDeleteRange(tr, tr => tr.doc.resolve(textInsertPos), [[textContent, textInsertPos], [childrenGContent, childrenGInsertPos]], [[beforeListItemE, afterListItemE]]);
+  if (fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+    const targetParagraphFontSizeAttrs = getBlockMarkAttrs($prev.parent.lastChild, fontSize);
+    reconcileBlockMarkForParagraphAtPos(tr, tr.mapping.map(textInsertPos), fontSize, targetParagraphFontSizeAttrs);
+  }
   if (dispatch) {
     dispatch(tr);
   }
@@ -89,6 +98,9 @@ const listBackspaceCase3 = (tr, dispatch, $prev, $head) => {
 
   const listE = $head.node(-2);
   const listItemF = $head.node(-1); //Head is inside listItem F so it must have a first and last child
+  const {
+    fontSize
+  } = tr.doc.type.schema.marks;
   if (!listItemF.firstChild || !listItemF.lastChild) {
     return false;
   }
@@ -108,6 +120,10 @@ const listBackspaceCase3 = (tr, dispatch, $prev, $head) => {
   const childrenJContent = listItemF.lastChild.content; //Will be invalid if there are no Children J but it will be unused
 
   insertContentDeleteRange(tr, tr => tr.doc.resolve(textInsertPos), containsChildrenJ ? [[textContent, textInsertPos], [childrenHContent, childrenHInsertPos], [childrenJContent, childrenJInsertPos]] : [[textContent, textInsertPos], [childrenHContent, childrenHInsertPos]], [shouldRemoveListE ? [beforeListE, afterListE] : [beforeListItemF, afterListItemF]]);
+  if (fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+    const targetParagraphFontSizeAttrs = getBlockMarkAttrs($prev.parent, fontSize);
+    reconcileBlockMarkForParagraphAtPos(tr, tr.mapping.map(textInsertPos), fontSize, targetParagraphFontSizeAttrs);
+  }
   if (dispatch) {
     dispatch(tr);
   }
@@ -173,6 +189,9 @@ const listBackspaceCase4 = (tr, dispatch, $prev, $head, $last) => {
     return false;
   }
   const listItemK = $head.node(-1); //Head is inside listItem K so it must have a first and last child
+  const {
+    fontSize
+  } = tr.doc.type.schema.marks;
   if (!listItemK.firstChild || !listItemK.lastChild) {
     return false;
   }
@@ -189,6 +208,10 @@ const listBackspaceCase4 = (tr, dispatch, $prev, $head, $last) => {
   const childrenMContent = containsChildrenO ? listItemK.content.cut(listItemK.firstChild.nodeSize, listItemK.nodeSize - listItemK.lastChild.nodeSize - 2) : listItemK.content.cut(listItemK.firstChild.nodeSize);
   const childrenOContent = listItemK.lastChild.content;
   insertContentDeleteRange(tr, tr => tr.doc.resolve(textInsertPos), containsChildrenO ? [[textContent, textInsertPos], [childrenMContent, childrenMInsertPos], [childrenOContent, childrenOInsertPos]] : [[textContent, textInsertPos], [childrenMContent, childrenMInsertPos]], [[beforeListItemK, afterListItemK]]);
+  if (fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+    const targetParagraphFontSizeAttrs = getBlockMarkAttrs($last.parent, fontSize);
+    reconcileBlockMarkForParagraphAtPos(tr, tr.mapping.map(textInsertPos), fontSize, targetParagraphFontSizeAttrs);
+  }
   if (dispatch) {
     dispatch(tr);
   }

package/dist/esm/pm-plugins/actions/merge-lists.js

@@ -1,4 +1,6 @@
+import { getFirstParagraphBlockMarkAttrs, reconcileBlockMarkForContainerAtPos } from '@atlaskit/editor-common/lists';
 import { isListNode } from '@atlaskit/editor-common/utils';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export function mergeNextListAtPosition(_ref) {
   var tr = _ref.tr,
     listPosition = _ref.listPosition;
@@ -16,13 +18,13 @@ export function mergeNextListAtPosition(_ref) {
   if (!isListNode(nodeBefore) || !isListNode(nodeAfter)) {
     return;
   }
-  if ((nodeAfter === null || nodeAfter === void 0 ? void 0 : nodeAfter.type.name) !== (nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.type.name)) {
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    var previousListPosition = pos - nodeBefore.nodeSize;
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  var previousListPosition = pos - nodeBefore.nodeSize;
+  if (nodeAfter && nodeAfter.type.name !== (nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.type.name)) {
     tr.setNodeMarkup(previousListPosition, nodeAfter.type);
   }
   tr.join(pos);
+  if (tr.doc.type.schema.marks.fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+    var upperListFontSizeAttrs = getFirstParagraphBlockMarkAttrs(nodeBefore, tr.doc.type.schema.marks.fontSize);
+    reconcileBlockMarkForContainerAtPos(tr, previousListPosition, tr.doc.type.schema.marks.fontSize, upperListFontSizeAttrs);
+  }
 }

package/dist/esm/pm-plugins/commands/index.js

@@ -3,14 +3,15 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { findCutBefore } from '@atlaskit/editor-common/commands';
-import { getCommonListAnalyticsAttributes, moveTargetIntoList } from '@atlaskit/editor-common/lists';
+import { getBlockMarkAttrs, getCommonListAnalyticsAttributes, getFirstParagraphBlockMarkAttrs, moveTargetIntoList, reconcileBlockMarkForContainerAtPos, reconcileBlockMarkForParagraphAtPos } from '@atlaskit/editor-common/lists';
 import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
 import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { filterCommand as filter, hasVisibleContent, isEmptySelectionAtStart } from '@atlaskit/editor-common/utils';
 import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { findPositionOfNodeBefore, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { findParentNodeOfTypeClosestToPos, findPositionOfNodeBefore, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { convertListType } from '../actions/conversions';
 import { wrapInListAndJoin } from '../actions/wrap-and-join-lists';
 import { liftFollowingList, liftNodeSelectionList, liftTextSelectionList } from '../transforms';
@@ -241,10 +242,17 @@ function splitListItem(itemType) {
     var types = nextType && [null, {
       type: nextType
     }];
+    var fontSize = state.schema.marks.fontSize;
+    var isFontSizeSupported = fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true);
+    var currentFontSizeAttrs = isFontSizeSupported ? getBlockMarkAttrs($from.parent, fontSize) : false;
     if (dispatch) {
       var _$from$nodeBefore;
       if (ref instanceof TextSelection) {
-        dispatch(tr.split($from.pos, 2, types !== null && types !== void 0 ? types : undefined).scrollIntoView());
+        var splitTr = tr.split($from.pos, 2, types !== null && types !== void 0 ? types : undefined);
+        if (isFontSizeSupported) {
+          reconcileBlockMarkForParagraphAtPos(splitTr, splitTr.selection.from, fontSize, currentFontSizeAttrs);
+        }
+        dispatch(splitTr.scrollIntoView());
         return true;
       }
 
@@ -255,7 +263,7 @@ function splitListItem(itemType) {
         var _state$schema$nodes2 = state.schema.nodes,
           listItem = _state$schema$nodes2.listItem,
           paragraph = _state$schema$nodes2.paragraph;
-        var newListItem = listItem.createChecked({}, paragraph.createChecked());
+        var newListItem = listItem.createChecked({}, paragraph.createChecked({}, undefined, currentFontSizeAttrs && isFontSizeSupported ? [fontSize.create(currentFontSizeAttrs)] : undefined));
         dispatch(tr.insert($from.pos, newListItem).setSelection(Selection.near(tr.doc.resolve($to.pos + 1))).scrollIntoView());
         return true;
       }
@@ -291,6 +299,7 @@ var joinToPreviousListItem = function joinToPreviousListItem(state, dispatch) {
     codeBlock = _state$schema$nodes3.codeBlock,
     bulletList = _state$schema$nodes3.bulletList,
     orderedList = _state$schema$nodes3.orderedList;
+  var fontSize = state.schema.marks.fontSize;
   var isGapCursorShown = state.selection instanceof GapCursorSelection;
   var $cutPos = isGapCursorShown ? state.doc.resolve($from.pos + 1) : $from;
   var $cut = findCutBefore($cutPos);
@@ -339,6 +348,13 @@ var joinToPreviousListItem = function joinToPreviousListItem(state, dispatch) {
       if ($postCut.nodeBefore && $postCut.nodeAfter && $postCut.nodeBefore.type === $postCut.nodeAfter.type && [bulletList, orderedList].indexOf($postCut.nodeBefore.type) > -1) {
         tr = tr.join($postCut.pos);
       }
+      if (fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+        var prevListFontSizeAttrs = getFirstParagraphBlockMarkAttrs($cut.nodeBefore, fontSize);
+        var containingList = findParentNodeOfTypeClosestToPos(tr.doc.resolve(tr.mapping.map($cut.pos)), [bulletList, orderedList]);
+        if (containingList) {
+          reconcileBlockMarkForContainerAtPos(tr, containingList.pos, fontSize, prevListFontSizeAttrs);
+        }
+      }
       if (dispatch) {
         var _tr$doc$resolve$nodeB;
         if (!((_tr$doc$resolve$nodeB = tr.doc.resolve($lastNode.pos).nodeBefore) !== null && _tr$doc$resolve$nodeB !== void 0 && _tr$doc$resolve$nodeB.isBlock) || tr.doc.resolve($lastNode.pos).nodeBefore === null) {

package/dist/esm/pm-plugins/commands/listBackspace.js

@@ -1,7 +1,9 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, DELETE_DIRECTION, EVENT_TYPE, INPUT_METHOD, LIST_TEXT_SCENARIOS } from '@atlaskit/editor-common/analytics';
+import { getBlockMarkAttrs, reconcileBlockMarkForParagraphAtPos } from '@atlaskit/editor-common/lists';
 import { insertContentDeleteRange, isEmptySelectionAtStart, isListNode, isParagraphNode, walkPrevNode } from '@atlaskit/editor-common/utils';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isPosInsideList, isPosInsideParagraph } from '../utils/selection';
 //Cases below refer to the cases found in this document: https://product-fabric.atlassian.net/wiki/spaces/E/pages/1146954996/List+Backspace+and+Delete+Behaviour
 
@@ -34,6 +36,7 @@ var listBackspaceCase2 = function listBackspaceCase2(tr, dispatch, $prev, $head)
    */
 
   var listItemE = $head.node(-1); //Head is inside listItem E so it must have a first and last child
+  var fontSize = tr.doc.type.schema.marks.fontSize;
   if (!listItemE.firstChild) {
     return false;
   }
@@ -46,6 +49,10 @@ var listBackspaceCase2 = function listBackspaceCase2(tr, dispatch, $prev, $head)
   insertContentDeleteRange(tr, function (tr) {
     return tr.doc.resolve(textInsertPos);
   }, [[textContent, textInsertPos], [childrenGContent, childrenGInsertPos]], [[beforeListItemE, afterListItemE]]);
+  if (fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+    var targetParagraphFontSizeAttrs = getBlockMarkAttrs($prev.parent.lastChild, fontSize);
+    reconcileBlockMarkForParagraphAtPos(tr, tr.mapping.map(textInsertPos), fontSize, targetParagraphFontSizeAttrs);
+  }
   if (dispatch) {
     dispatch(tr);
   }
@@ -92,6 +99,7 @@ var listBackspaceCase3 = function listBackspaceCase3(tr, dispatch, $prev, $head)
 
   var listE = $head.node(-2);
   var listItemF = $head.node(-1); //Head is inside listItem F so it must have a first and last child
+  var fontSize = tr.doc.type.schema.marks.fontSize;
   if (!listItemF.firstChild || !listItemF.lastChild) {
     return false;
   }
@@ -113,6 +121,10 @@ var listBackspaceCase3 = function listBackspaceCase3(tr, dispatch, $prev, $head)
   insertContentDeleteRange(tr, function (tr) {
     return tr.doc.resolve(textInsertPos);
   }, containsChildrenJ ? [[textContent, textInsertPos], [childrenHContent, childrenHInsertPos], [childrenJContent, childrenJInsertPos]] : [[textContent, textInsertPos], [childrenHContent, childrenHInsertPos]], [shouldRemoveListE ? [beforeListE, afterListE] : [beforeListItemF, afterListItemF]]);
+  if (fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+    var targetParagraphFontSizeAttrs = getBlockMarkAttrs($prev.parent, fontSize);
+    reconcileBlockMarkForParagraphAtPos(tr, tr.mapping.map(textInsertPos), fontSize, targetParagraphFontSizeAttrs);
+  }
   if (dispatch) {
     dispatch(tr);
   }
@@ -178,6 +190,7 @@ var listBackspaceCase4 = function listBackspaceCase4(tr, dispatch, $prev, $head,
     return false;
   }
   var listItemK = $head.node(-1); //Head is inside listItem K so it must have a first and last child
+  var fontSize = tr.doc.type.schema.marks.fontSize;
   if (!listItemK.firstChild || !listItemK.lastChild) {
     return false;
   }
@@ -196,6 +209,10 @@ var listBackspaceCase4 = function listBackspaceCase4(tr, dispatch, $prev, $head,
   insertContentDeleteRange(tr, function (tr) {
     return tr.doc.resolve(textInsertPos);
   }, containsChildrenO ? [[textContent, textInsertPos], [childrenMContent, childrenMInsertPos], [childrenOContent, childrenOInsertPos]] : [[textContent, textInsertPos], [childrenMContent, childrenMInsertPos]], [[beforeListItemK, afterListItemK]]);
+  if (fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+    var targetParagraphFontSizeAttrs = getBlockMarkAttrs($last.parent, fontSize);
+    reconcileBlockMarkForParagraphAtPos(tr, tr.mapping.map(textInsertPos), fontSize, targetParagraphFontSizeAttrs);
+  }
   if (dispatch) {
     dispatch(tr);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-list",
-	"version": "10.1.6",
+	"version": "10.2.0",
 	"description": "List plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -38,11 +38,11 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
 		"@atlaskit/prosemirror-input-rules": "^3.6.0",
-		"@atlaskit/tmp-editor-statsig": "^48.0.0",
+		"@atlaskit/tmp-editor-statsig": "^49.0.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^112.11.0",
+		"@atlaskit/editor-common": "^112.13.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},