@atlaskit/editor-plugin-block-type 12.1.0 → 12.1.2

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-block-type
 
+## 12.1.2
+
+### Patch Changes
+
+- [`8b781b3b3f9ca`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8b781b3b3f9ca) -
+  Add setSmallText and setSmallTextWithAnalytics commands, modify setNormalText to remove fontSize
+  mark, add FORMAT_SMALL_TEXT analytics enum.
+
+  Add support to the renderer to render 'small text'.
+
+  Add 'fontSize' to stage0 default schema.
+
+- Updated dependencies
+
+## 12.1.1
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 12.1.0
 
 ### Minor Changes

package/dist/cjs/pm-plugins/commands/block-type.js

@@ -13,11 +13,15 @@ exports.setHeading = setHeading;
 exports.setHeadingWithAnalytics = void 0;
 exports.setNormalText = setNormalText;
 exports.setNormalTextWithAnalytics = setNormalTextWithAnalytics;
+exports.setSmallText = setSmallText;
+exports.setSmallTextWithAnalytics = setSmallTextWithAnalytics;
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _commands = require("@atlaskit/editor-common/commands");
 var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
 var _utils = require("@atlaskit/editor-common/utils");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _editorTables = require("@atlaskit/editor-tables");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _blockTypes = require("../block-types");
 var _clearFormatting = require("./clear-formatting");
 var _wrapSelectionIn = require("./wrapSelectionIn");
@@ -33,6 +37,11 @@ function setBlockType(name) {
         tr: tr
       });
     }
+    if (name === 'smallText' && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true)) {
+      return setSmallText()({
+        tr: tr
+      });
+    }
     var headingBlockType = _blockTypes.HEADINGS_BY_NAME[name];
     if (headingBlockType && nodes.heading && headingBlockType.level) {
       return setHeading(headingBlockType.level)({
@@ -76,6 +85,12 @@ function setHeading(level, fromBlockQuote) {
         });
       }
     });
+    var fontSize = schema.marks.fontSize;
+    if (fontSize && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true)) {
+      (0, _commands.toggleBlockMarkNext)(fontSize, function () {
+        return false;
+      }, [schema.nodes.heading])(tr);
+    }
     return tr;
   };
 }
@@ -88,6 +103,11 @@ function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi, fromBl
         tr: tr
       });
     }
+    if (name === 'smallText' && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true)) {
+      return setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi)({
+        tr: tr
+      });
+    }
     var headingBlockType = _blockTypes.HEADINGS_BY_NAME[name];
     if (headingBlockType && nodes.heading && headingBlockType.level) {
       return setHeadingWithAnalytics(headingBlockType.level, inputMethod, editorAnalyticsApi, fromBlockQuote)({
@@ -97,15 +117,59 @@ function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi, fromBl
     return null;
   };
 }
-function setNormalText(fromBlockQuote) {
+function setSmallText() {
   return function (_ref5) {
     var tr = _ref5.tr;
-    var selection = tr.selection,
-      schema = tr.doc.type.schema;
+    var _tr$doc$type$schema = tr.doc.type.schema,
+      fontSize = _tr$doc$type$schema.marks.fontSize,
+      paragraph = _tr$doc$type$schema.nodes.paragraph;
+    if (!fontSize) {
+      return null;
+    }
+    var selection = tr.selection;
     var ranges = selection instanceof _editorTables.CellSelection ? selection.ranges : [selection];
     ranges.forEach(function (_ref6) {
       var $from = _ref6.$from,
         $to = _ref6.$to;
+      tr.setBlockType($from.pos, $to.pos, paragraph);
+    });
+    (0, _commands.toggleBlockMarkNext)(fontSize, function () {
+      return {
+        fontSize: 'small'
+      };
+    }, [paragraph])(tr);
+    return tr;
+  };
+}
+function setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi) {
+  return withCurrentHeadingLevel(function (previousHeadingLevel) {
+    return function (_ref7) {
+      var tr = _ref7.tr;
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
+        action: _analytics.ACTION.FORMATTED,
+        actionSubject: _analytics.ACTION_SUBJECT.TEXT,
+        eventType: _analytics.EVENT_TYPE.TRACK,
+        actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_SMALL_TEXT,
+        attributes: {
+          inputMethod: inputMethod,
+          previousBlockType: previousHeadingLevel !== undefined ? String(previousHeadingLevel) : undefined
+        }
+      })(tr);
+      return setSmallText()({
+        tr: tr
+      });
+    };
+  });
+}
+function setNormalText(fromBlockQuote) {
+  return function (_ref8) {
+    var tr = _ref8.tr;
+    var selection = tr.selection,
+      schema = tr.doc.type.schema;
+    var ranges = selection instanceof _editorTables.CellSelection ? selection.ranges : [selection];
+    ranges.forEach(function (_ref9) {
+      var $from = _ref9.$from,
+        $to = _ref9.$to;
       if (fromBlockQuote) {
         var range = $from.blockRange($to);
         if (!range) {
@@ -124,12 +188,20 @@ function setNormalText(fromBlockQuote) {
         tr.setBlockType($from.pos, $to.pos, schema.nodes.paragraph);
       }
     });
+
+    // Remove fontSize mark if present in schema
+    var fontSize = schema.marks.fontSize;
+    if (fontSize && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true)) {
+      (0, _commands.toggleBlockMarkNext)(fontSize, function () {
+        return false;
+      }, [schema.nodes.paragraph])(tr);
+    }
     return tr;
   };
 }
 function clearFormatting(inputMethod, editorAnalyticsApi) {
-  return function (_ref7) {
-    var tr = _ref7.tr;
+  return function (_ref0) {
+    var tr = _ref0.tr;
     var formattingCleared = [];
     var schema = tr.doc.type.schema;
     _clearFormatting.FORMATTING_MARK_TYPES.forEach(function (mark) {
@@ -186,8 +258,8 @@ function clearFormatting(inputMethod, editorAnalyticsApi) {
   };
 }
 function withCurrentHeadingLevel(fn) {
-  return function (_ref8) {
-    var tr = _ref8.tr;
+  return function (_ref1) {
+    var tr = _ref1.tr;
     // Find all headings and paragraphs of text
     var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
       heading = _tr$doc$type$schema$n.heading,
@@ -224,8 +296,8 @@ function withCurrentHeadingLevel(fn) {
 }
 function setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi, fromBlockQuote) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
-    return function (_ref9) {
-      var tr = _ref9.tr;
+    return function (_ref10) {
+      var tr = _ref10.tr;
       editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
         action: _analytics.ACTION.FORMATTED,
         actionSubject: _analytics.ACTION_SUBJECT.TEXT,
@@ -245,8 +317,8 @@ function setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi, fromBlockQu
 }
 var setHeadingWithAnalytics = exports.setHeadingWithAnalytics = function setHeadingWithAnalytics(newHeadingLevel, inputMethod, editorAnalyticsApi, fromBlockQuote) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
-    return function (_ref0) {
-      var tr = _ref0.tr;
+    return function (_ref11) {
+      var tr = _ref11.tr;
       editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
         action: _analytics.ACTION.FORMATTED,
         actionSubject: _analytics.ACTION_SUBJECT.TEXT,
@@ -294,9 +366,9 @@ var insertBlockQuoteWithAnalytics = exports.insertBlockQuoteWithAnalytics = func
   })(insertBlockQuote());
 };
 function insertBlockQuoteWithAnalyticsCommand(inputMethod, editorAnalyticsApi) {
-  return withCurrentHeadingLevel(function (previousHeadingLevel) {
-    return function (_ref1) {
-      var tr = _ref1.tr;
+  return withCurrentHeadingLevel(function () {
+    return function (_ref12) {
+      var tr = _ref12.tr;
       var nodes = tr.doc.type.schema.nodes;
       editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
         action: _analytics.ACTION.FORMATTED,
@@ -314,8 +386,8 @@ function insertBlockQuoteWithAnalyticsCommand(inputMethod, editorAnalyticsApi) {
   });
 }
 var cleanUpAtTheStartOfDocument = exports.cleanUpAtTheStartOfDocument = function cleanUpAtTheStartOfDocument(state, dispatch) {
-  var _ref10 = state.selection,
-    $cursor = _ref10.$cursor;
+  var _ref13 = state.selection,
+    $cursor = _ref13.$cursor;
   if ($cursor && !$cursor.nodeBefore && !$cursor.nodeAfter && $cursor.pos === 1) {
     var tr = state.tr,
       schema = state.schema;

package/dist/cjs/pm-plugins/ui/ToolbarBlockType/HeadingButton.compiled.css

@@ -1,6 +1,7 @@
 ._11c810sd{font:var(--ds-font-heading-large,normal 653 24px/28px "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
 ._11c812ln{font:var(--ds-font-heading-xlarge,normal 653 28px/2pc "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
 ._11c812rg{font:var(--_1h4o6ch)}
+._11c8130a{font:var(--_1b6nbh6)}
 ._11c81af2{font:var(--ds-font-heading-medium,normal 653 20px/24px "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
 ._11c81e3o{font:var(--ds-font-heading-small,normal 653 1pc/20px "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
 ._11c81fq3{font:var(--_1d0ko3v)}

package/dist/cjs/pm-plugins/ui/ToolbarBlockType/HeadingButton.js

@@ -20,6 +20,7 @@ var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 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 smallTextStyle = null;
 var normalStyle = null;
 var heading1Style = null;
 var heading2Style = null;
@@ -73,6 +74,13 @@ var HeadingText = function HeadingText(_ref) {
           "--_1c98jvx": (0, _runtime.ix)((0, _ugcTokens.editorUGCToken)('editor.font.heading.h6'))
         }
       }, children);
+    case 'smallText':
+      return /*#__PURE__*/React.createElement("div", {
+        className: (0, _runtime.ax)(["_11c8130a"]),
+        style: {
+          "--_1b6nbh6": (0, _runtime.ix)((0, _ugcTokens.editorUGCToken)('editor.font.body.small'))
+        }
+      }, children);
     case 'normal':
     default:
       return /*#__PURE__*/React.createElement("div", {

package/dist/es2019/pm-plugins/commands/block-type.js

@@ -1,8 +1,10 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { toggleBlockMarkNext } from '@atlaskit/editor-common/commands';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { filterChildrenBetween, wrapSelectionIn } from '@atlaskit/editor-common/utils';
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
 import { CellSelection } from '@atlaskit/editor-tables';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { HEADINGS_BY_NAME, NORMAL_TEXT } from '../block-types';
 import { FORMATTING_NODE_TYPES, FORMATTING_MARK_TYPES, cellSelectionNodesBetween, formatTypes, clearNodeFormattingOnSelection } from './clear-formatting';
 import { wrapSelectionInBlockType } from './wrapSelectionIn';
@@ -18,6 +20,11 @@ export function setBlockType(name) {
         tr
       });
     }
+    if (name === 'smallText' && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+      return setSmallText()({
+        tr
+      });
+    }
     const headingBlockType = HEADINGS_BY_NAME[name];
     if (headingBlockType && nodes.heading && headingBlockType.level) {
       return setHeading(headingBlockType.level)({
@@ -69,6 +76,12 @@ export function setHeading(level, fromBlockQuote) {
         });
       }
     });
+    const {
+      fontSize
+    } = schema.marks;
+    if (fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+      toggleBlockMarkNext(fontSize, () => false, [schema.nodes.heading])(tr);
+    }
     return tr;
   };
 }
@@ -84,6 +97,11 @@ export function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi,
         tr
       });
     }
+    if (name === 'smallText' && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+      return setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi)({
+        tr
+      });
+    }
     const headingBlockType = HEADINGS_BY_NAME[name];
     if (headingBlockType && nodes.heading && headingBlockType.level) {
       return setHeadingWithAnalytics(headingBlockType.level, inputMethod, editorAnalyticsApi, fromBlockQuote)({
@@ -93,6 +111,56 @@ export function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi,
     return null;
   };
 }
+export function setSmallText() {
+  return function ({
+    tr
+  }) {
+    const {
+      marks: {
+        fontSize
+      },
+      nodes: {
+        paragraph
+      }
+    } = tr.doc.type.schema;
+    if (!fontSize) {
+      return null;
+    }
+    const {
+      selection
+    } = tr;
+    const ranges = selection instanceof CellSelection ? selection.ranges : [selection];
+    ranges.forEach(({
+      $from,
+      $to
+    }) => {
+      tr.setBlockType($from.pos, $to.pos, paragraph);
+    });
+    toggleBlockMarkNext(fontSize, () => ({
+      fontSize: 'small'
+    }), [paragraph])(tr);
+    return tr;
+  };
+}
+export function setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi) {
+  return withCurrentHeadingLevel(previousHeadingLevel => ({
+    tr
+  }) => {
+    editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
+      action: ACTION.FORMATTED,
+      actionSubject: ACTION_SUBJECT.TEXT,
+      eventType: EVENT_TYPE.TRACK,
+      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_SMALL_TEXT,
+      attributes: {
+        inputMethod,
+        previousBlockType: previousHeadingLevel !== undefined ? String(previousHeadingLevel) : undefined
+      }
+    })(tr);
+    return setSmallText()({
+      tr
+    });
+  });
+}
 export function setNormalText(fromBlockQuote) {
   return function ({
     tr
@@ -128,6 +196,14 @@ export function setNormalText(fromBlockQuote) {
         tr.setBlockType($from.pos, $to.pos, schema.nodes.paragraph);
       }
     });
+
+    // Remove fontSize mark if present in schema
+    const {
+      fontSize
+    } = schema.marks;
+    if (fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+      toggleBlockMarkNext(fontSize, () => false, [schema.nodes.paragraph])(tr);
+    }
     return tr;
   };
 }
@@ -294,7 +370,7 @@ export const insertBlockQuoteWithAnalytics = (inputMethod, editorAnalyticsApi) =
   })(insertBlockQuote());
 };
 export function insertBlockQuoteWithAnalyticsCommand(inputMethod, editorAnalyticsApi) {
-  return withCurrentHeadingLevel(previousHeadingLevel => ({
+  return withCurrentHeadingLevel(() => ({
     tr
   }) => {
     const {

package/dist/es2019/pm-plugins/ui/ToolbarBlockType/HeadingButton.compiled.css

@@ -1,6 +1,7 @@
 ._11c810sd{font:var(--ds-font-heading-large,normal 653 24px/28px "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
 ._11c812ln{font:var(--ds-font-heading-xlarge,normal 653 28px/2pc "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
 ._11c812rg{font:var(--_1h4o6ch)}
+._11c8130a{font:var(--_1b6nbh6)}
 ._11c81af2{font:var(--ds-font-heading-medium,normal 653 20px/24px "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
 ._11c81e3o{font:var(--ds-font-heading-small,normal 653 1pc/20px "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
 ._11c81fq3{font:var(--_1d0ko3v)}

package/dist/es2019/pm-plugins/ui/ToolbarBlockType/HeadingButton.js

@@ -12,6 +12,7 @@ import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared
 import { ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
 import { Box } from '@atlaskit/primitives/compiled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+const smallTextStyle = null;
 const normalStyle = null;
 const heading1Style = null;
 const heading2Style = null;
@@ -66,6 +67,13 @@ const HeadingText = ({
           "--_1c98jvx": ix(editorUGCToken('editor.font.heading.h6'))
         }
       }, children);
+    case 'smallText':
+      return /*#__PURE__*/React.createElement("div", {
+        className: ax(["_11c8130a"]),
+        style: {
+          "--_1b6nbh6": ix(editorUGCToken('editor.font.body.small'))
+        }
+      }, children);
     case 'normal':
     default:
       return /*#__PURE__*/React.createElement("div", {

package/dist/esm/pm-plugins/commands/block-type.js

@@ -2,10 +2,12 @@ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol
 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; }
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { toggleBlockMarkNext } from '@atlaskit/editor-common/commands';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { filterChildrenBetween, wrapSelectionIn } from '@atlaskit/editor-common/utils';
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
 import { CellSelection } from '@atlaskit/editor-tables';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { HEADINGS_BY_NAME, NORMAL_TEXT } from '../block-types';
 import { FORMATTING_NODE_TYPES, FORMATTING_MARK_TYPES, cellSelectionNodesBetween, formatTypes, clearNodeFormattingOnSelection } from './clear-formatting';
 import { wrapSelectionInBlockType } from './wrapSelectionIn';
@@ -18,6 +20,11 @@ export function setBlockType(name) {
         tr: tr
       });
     }
+    if (name === 'smallText' && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+      return setSmallText()({
+        tr: tr
+      });
+    }
     var headingBlockType = HEADINGS_BY_NAME[name];
     if (headingBlockType && nodes.heading && headingBlockType.level) {
       return setHeading(headingBlockType.level)({
@@ -61,6 +68,12 @@ export function setHeading(level, fromBlockQuote) {
         });
       }
     });
+    var fontSize = schema.marks.fontSize;
+    if (fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+      toggleBlockMarkNext(fontSize, function () {
+        return false;
+      }, [schema.nodes.heading])(tr);
+    }
     return tr;
   };
 }
@@ -73,6 +86,11 @@ export function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi,
         tr: tr
       });
     }
+    if (name === 'smallText' && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+      return setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi)({
+        tr: tr
+      });
+    }
     var headingBlockType = HEADINGS_BY_NAME[name];
     if (headingBlockType && nodes.heading && headingBlockType.level) {
       return setHeadingWithAnalytics(headingBlockType.level, inputMethod, editorAnalyticsApi, fromBlockQuote)({
@@ -82,15 +100,59 @@ export function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi,
     return null;
   };
 }
-export function setNormalText(fromBlockQuote) {
+export function setSmallText() {
   return function (_ref5) {
     var tr = _ref5.tr;
-    var selection = tr.selection,
-      schema = tr.doc.type.schema;
+    var _tr$doc$type$schema = tr.doc.type.schema,
+      fontSize = _tr$doc$type$schema.marks.fontSize,
+      paragraph = _tr$doc$type$schema.nodes.paragraph;
+    if (!fontSize) {
+      return null;
+    }
+    var selection = tr.selection;
     var ranges = selection instanceof CellSelection ? selection.ranges : [selection];
     ranges.forEach(function (_ref6) {
       var $from = _ref6.$from,
         $to = _ref6.$to;
+      tr.setBlockType($from.pos, $to.pos, paragraph);
+    });
+    toggleBlockMarkNext(fontSize, function () {
+      return {
+        fontSize: 'small'
+      };
+    }, [paragraph])(tr);
+    return tr;
+  };
+}
+export function setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi) {
+  return withCurrentHeadingLevel(function (previousHeadingLevel) {
+    return function (_ref7) {
+      var tr = _ref7.tr;
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
+        action: ACTION.FORMATTED,
+        actionSubject: ACTION_SUBJECT.TEXT,
+        eventType: EVENT_TYPE.TRACK,
+        actionSubjectId: ACTION_SUBJECT_ID.FORMAT_SMALL_TEXT,
+        attributes: {
+          inputMethod: inputMethod,
+          previousBlockType: previousHeadingLevel !== undefined ? String(previousHeadingLevel) : undefined
+        }
+      })(tr);
+      return setSmallText()({
+        tr: tr
+      });
+    };
+  });
+}
+export function setNormalText(fromBlockQuote) {
+  return function (_ref8) {
+    var tr = _ref8.tr;
+    var selection = tr.selection,
+      schema = tr.doc.type.schema;
+    var ranges = selection instanceof CellSelection ? selection.ranges : [selection];
+    ranges.forEach(function (_ref9) {
+      var $from = _ref9.$from,
+        $to = _ref9.$to;
       if (fromBlockQuote) {
         var range = $from.blockRange($to);
         if (!range) {
@@ -109,12 +171,20 @@ export function setNormalText(fromBlockQuote) {
         tr.setBlockType($from.pos, $to.pos, schema.nodes.paragraph);
       }
     });
+
+    // Remove fontSize mark if present in schema
+    var fontSize = schema.marks.fontSize;
+    if (fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+      toggleBlockMarkNext(fontSize, function () {
+        return false;
+      }, [schema.nodes.paragraph])(tr);
+    }
     return tr;
   };
 }
 export function clearFormatting(inputMethod, editorAnalyticsApi) {
-  return function (_ref7) {
-    var tr = _ref7.tr;
+  return function (_ref0) {
+    var tr = _ref0.tr;
     var formattingCleared = [];
     var schema = tr.doc.type.schema;
     FORMATTING_MARK_TYPES.forEach(function (mark) {
@@ -171,8 +241,8 @@ export function clearFormatting(inputMethod, editorAnalyticsApi) {
   };
 }
 function withCurrentHeadingLevel(fn) {
-  return function (_ref8) {
-    var tr = _ref8.tr;
+  return function (_ref1) {
+    var tr = _ref1.tr;
     // Find all headings and paragraphs of text
     var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
       heading = _tr$doc$type$schema$n.heading,
@@ -209,8 +279,8 @@ function withCurrentHeadingLevel(fn) {
 }
 export function setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi, fromBlockQuote) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
-    return function (_ref9) {
-      var tr = _ref9.tr;
+    return function (_ref10) {
+      var tr = _ref10.tr;
       editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
         action: ACTION.FORMATTED,
         actionSubject: ACTION_SUBJECT.TEXT,
@@ -230,8 +300,8 @@ export function setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi, from
 }
 export var setHeadingWithAnalytics = function setHeadingWithAnalytics(newHeadingLevel, inputMethod, editorAnalyticsApi, fromBlockQuote) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
-    return function (_ref0) {
-      var tr = _ref0.tr;
+    return function (_ref11) {
+      var tr = _ref11.tr;
       editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
         action: ACTION.FORMATTED,
         actionSubject: ACTION_SUBJECT.TEXT,
@@ -279,9 +349,9 @@ export var insertBlockQuoteWithAnalytics = function insertBlockQuoteWithAnalytic
   })(insertBlockQuote());
 };
 export function insertBlockQuoteWithAnalyticsCommand(inputMethod, editorAnalyticsApi) {
-  return withCurrentHeadingLevel(function (previousHeadingLevel) {
-    return function (_ref1) {
-      var tr = _ref1.tr;
+  return withCurrentHeadingLevel(function () {
+    return function (_ref12) {
+      var tr = _ref12.tr;
       var nodes = tr.doc.type.schema.nodes;
       editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
         action: ACTION.FORMATTED,
@@ -299,8 +369,8 @@ export function insertBlockQuoteWithAnalyticsCommand(inputMethod, editorAnalytic
   });
 }
 export var cleanUpAtTheStartOfDocument = function cleanUpAtTheStartOfDocument(state, dispatch) {
-  var _ref10 = state.selection,
-    $cursor = _ref10.$cursor;
+  var _ref13 = state.selection,
+    $cursor = _ref13.$cursor;
   if ($cursor && !$cursor.nodeBefore && !$cursor.nodeAfter && $cursor.pos === 1) {
     var tr = state.tr,
       schema = state.schema;

package/dist/esm/pm-plugins/ui/ToolbarBlockType/HeadingButton.compiled.css

@@ -1,6 +1,7 @@
 ._11c810sd{font:var(--ds-font-heading-large,normal 653 24px/28px "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
 ._11c812ln{font:var(--ds-font-heading-xlarge,normal 653 28px/2pc "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
 ._11c812rg{font:var(--_1h4o6ch)}
+._11c8130a{font:var(--_1b6nbh6)}
 ._11c81af2{font:var(--ds-font-heading-medium,normal 653 20px/24px "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
 ._11c81e3o{font:var(--ds-font-heading-small,normal 653 1pc/20px "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
 ._11c81fq3{font:var(--_1d0ko3v)}

package/dist/esm/pm-plugins/ui/ToolbarBlockType/HeadingButton.js

@@ -12,6 +12,7 @@ import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared
 import { ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
 import { Box } from '@atlaskit/primitives/compiled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+var smallTextStyle = null;
 var normalStyle = null;
 var heading1Style = null;
 var heading2Style = null;
@@ -65,6 +66,13 @@ var HeadingText = function HeadingText(_ref) {
           "--_1c98jvx": ix(editorUGCToken('editor.font.heading.h6'))
         }
       }, children);
+    case 'smallText':
+      return /*#__PURE__*/React.createElement("div", {
+        className: ax(["_11c8130a"]),
+        style: {
+          "--_1b6nbh6": ix(editorUGCToken('editor.font.body.small'))
+        }
+      }, children);
     case 'normal':
     default:
       return /*#__PURE__*/React.createElement("div", {

package/dist/types/pm-plugins/commands/block-type.d.ts

@@ -6,6 +6,8 @@ export type ClearFormattingInputMethod = INPUT_METHOD.TOOLBAR | INPUT_METHOD.SHO
 export declare function setBlockType(name: TextBlockTypes): EditorCommand;
 export declare function setHeading(level: HeadingLevelsAndNormalText, fromBlockQuote?: boolean): EditorCommand;
 export declare function setBlockTypeWithAnalytics(name: TextBlockTypes, inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined, fromBlockQuote?: boolean): EditorCommand;
+export declare function setSmallText(): EditorCommand;
+export declare function setSmallTextWithAnalytics(inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined): EditorCommand;
 export declare function setNormalText(fromBlockQuote?: boolean): EditorCommand;
 export declare function clearFormatting(inputMethod: ClearFormattingInputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined): EditorCommand;
 export declare function setNormalTextWithAnalytics(inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined, fromBlockQuote?: boolean): EditorCommand;

package/dist/types-ts4.5/pm-plugins/commands/block-type.d.ts

@@ -6,6 +6,8 @@ export type ClearFormattingInputMethod = INPUT_METHOD.TOOLBAR | INPUT_METHOD.SHO
 export declare function setBlockType(name: TextBlockTypes): EditorCommand;
 export declare function setHeading(level: HeadingLevelsAndNormalText, fromBlockQuote?: boolean): EditorCommand;
 export declare function setBlockTypeWithAnalytics(name: TextBlockTypes, inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined, fromBlockQuote?: boolean): EditorCommand;
+export declare function setSmallText(): EditorCommand;
+export declare function setSmallTextWithAnalytics(inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined): EditorCommand;
 export declare function setNormalText(fromBlockQuote?: boolean): EditorCommand;
 export declare function clearFormatting(inputMethod: ClearFormattingInputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined): EditorCommand;
 export declare function setNormalTextWithAnalytics(inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined, fromBlockQuote?: boolean): EditorCommand;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-type",
-	"version": "12.1.0",
+	"version": "12.1.2",
 	"description": "BlockType plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -29,7 +29,7 @@
 	],
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^52.3.0",
+		"@atlaskit/adf-schema": "^52.4.0",
 		"@atlaskit/css": "^0.19.0",
 		"@atlaskit/editor-plugin-analytics": "^8.0.0",
 		"@atlaskit/editor-plugin-block-menu": "^7.0.0",
@@ -43,21 +43,21 @@
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/editor-toolbar": "^0.20.0",
 		"@atlaskit/editor-toolbar-model": "^0.4.0",
-		"@atlaskit/icon": "^32.1.0",
-		"@atlaskit/icon-lab": "^5.18.0",
+		"@atlaskit/icon": "^33.0.0",
+		"@atlaskit/icon-lab": "^6.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^18.0.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
 		"@atlaskit/prosemirror-input-rules": "^3.6.0",
 		"@atlaskit/theme": "^22.0.0",
-		"@atlaskit/tmp-editor-statsig": "^40.0.0",
+		"@atlaskit/tmp-editor-statsig": "^40.3.0",
 		"@atlaskit/tokens": "^11.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",
 		"@emotion/react": "^11.7.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^112.4.0",
+		"@atlaskit/editor-common": "^112.5.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"