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

package/dist/esm/pm-plugins/utils.js

@@ -1,5 +1,6 @@
 import { anyMarkActive } from '@atlaskit/editor-common/mark';
 import { createRule, createWrappingJoinRule } from '@atlaskit/editor-common/utils';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { WRAPPER_BLOCK_TYPES, FORMATTING_NODE_TYPES, FORMATTING_MARK_TYPES } from './block-types';
 export var isNodeAWrappingBlockNode = function isNodeAWrappingBlockNode(node) {
@@ -73,12 +74,19 @@ function getSelectedWrapperNodes(state) {
  * Function will check if changing block types: Paragraph, Heading is enabled.
  */
 export function areBlockTypesDisabled(state) {
+  var allowFontSize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var nodesTypes = getSelectedWrapperNodes(state);
   var _state$schema$nodes2 = state.schema.nodes,
     panel = _state$schema$nodes2.panel,
     blockquote = _state$schema$nodes2.blockquote,
     bulletList = _state$schema$nodes2.bulletList,
-    orderedList = _state$schema$nodes2.orderedList;
+    orderedList = _state$schema$nodes2.orderedList,
+    listItem = _state$schema$nodes2.listItem;
+
+  // When the small font size experiment is enabled, allow block type changes inside lists
+  // so that users can toggle between Normal text and Small text within list contexts.
+  // Note: taskList/taskItem are not excluded here until blockTaskItem conversion is implemented (WI 4).
+  var excludedTypes = allowFontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? [panel, bulletList, orderedList, listItem] : [panel];
   if (editorExperiment('platform_editor_blockquote_in_text_formatting_menu', true)) {
     var hasQuote = false;
     var hasNestedListInQuote = false;
@@ -99,17 +107,44 @@ export function areBlockTypesDisabled(state) {
       return !hasNestedListInQuote;
     });
     return nodesTypes.filter(function (type) {
-      return type !== panel;
+      return !excludedTypes.includes(type);
     }).length > 0 && (!hasQuote || hasNestedListInQuote);
   }
   return nodesTypes.filter(function (type) {
-    return type !== panel;
+    return !excludedTypes.includes(type);
   }).length > 0;
 }
-var blockStylingIsPresent = function blockStylingIsPresent(state) {
+
+/**
+ * Checks if the current selection is inside a list node (bulletList, orderedList, or taskList).
+ * Used to determine which text styles should be enabled when the small font size experiment is active.
+ */
+export function isSelectionInsideListNode(state) {
+  if (!state.selection) {
+    return false;
+  }
   var _state$selection3 = state.selection,
-    from = _state$selection3.from,
-    to = _state$selection3.to;
+    $from = _state$selection3.$from,
+    $to = _state$selection3.$to;
+  var _state$schema$nodes3 = state.schema.nodes,
+    bulletList = _state$schema$nodes3.bulletList,
+    orderedList = _state$schema$nodes3.orderedList,
+    taskList = _state$schema$nodes3.taskList;
+  var listNodeTypes = [bulletList, orderedList, taskList];
+  var insideList = false;
+  state.doc.nodesBetween($from.pos, $to.pos, function (node) {
+    if (node.isBlock && listNodeTypes.indexOf(node.type) >= 0) {
+      insideList = true;
+      return false;
+    }
+    return true;
+  });
+  return insideList;
+}
+var blockStylingIsPresent = function blockStylingIsPresent(state) {
+  var _state$selection4 = state.selection,
+    from = _state$selection4.from,
+    to = _state$selection4.to;
   var isBlockStyling = false;
   state.doc.nodesBetween(from, to, function (node) {
     if (FORMATTING_NODE_TYPES.indexOf(node.type.name) !== -1) {
@@ -123,9 +158,9 @@ var blockStylingIsPresent = function blockStylingIsPresent(state) {
 var marksArePresent = function marksArePresent(state) {
   var activeMarkTypes = FORMATTING_MARK_TYPES.filter(function (mark) {
     if (!!state.schema.marks[mark]) {
-      var _state$selection4 = state.selection,
-        $from = _state$selection4.$from,
-        empty = _state$selection4.empty;
+      var _state$selection5 = state.selection,
+        $from = _state$selection5.$from,
+        empty = _state$selection5.empty;
       var marks = state.schema.marks;
       if (empty) {
         return !!marks[mark].isInSet(state.storedMarks || $from.marks());
@@ -143,4 +178,40 @@ export var hasBlockQuoteInOptions = function hasBlockQuoteInOptions(dropdownOpti
   return !!dropdownOptions.find(function (blockType) {
     return blockType.name === 'blockquote';
   });
-};
+};
+
+/**
+ * Returns a { from, to } range that extends the selection boundaries outward
+ * to include the entirety of any list nodes at either end. If the selection
+ * start is inside a list, `from` is pulled back to the list's start; if the
+ * selection end is inside a list, `to` is pushed forward to the list's end.
+ * Non-list content in the middle is included as-is.
+ */
+export function getSelectionRangeExpandedToLists(tr) {
+  var selection = tr.selection;
+  var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
+    bulletList = _tr$doc$type$schema$n.bulletList,
+    orderedList = _tr$doc$type$schema$n.orderedList,
+    taskList = _tr$doc$type$schema$n.taskList;
+  var listNodeTypes = [bulletList, orderedList, taskList];
+  var from = selection.from;
+  var to = selection.to;
+  for (var depth = selection.$from.depth; depth > 0; depth--) {
+    var node = selection.$from.node(depth);
+    if (listNodeTypes.indexOf(node.type) >= 0) {
+      from = selection.$from.before(depth);
+      break;
+    }
+  }
+  for (var _depth = selection.$to.depth; _depth > 0; _depth--) {
+    var _node = selection.$to.node(_depth);
+    if (listNodeTypes.indexOf(_node.type) >= 0) {
+      to = selection.$to.after(_depth);
+      break;
+    }
+  }
+  return {
+    from: from,
+    to: to
+  };
+}

package/dist/types/pm-plugins/main.d.ts

@@ -12,4 +12,4 @@ export type BlockTypeState = {
     formattingIsPresent?: boolean;
 };
 export declare const pluginKey: PluginKey<BlockTypeState>;
-export declare const createPlugin: (editorAPI: ExtractInjectionAPI<BlockTypePlugin> | undefined, dispatch: (eventName: string | PluginKey, data: any) => void, lastNodeMustBeParagraph?: boolean, includeBlockQuoteAsTextstyleOption?: boolean) => SafePlugin<BlockTypeState>;
+export declare const createPlugin: (editorAPI: ExtractInjectionAPI<BlockTypePlugin> | undefined, dispatch: (eventName: string | PluginKey, data: any) => void, lastNodeMustBeParagraph?: boolean, includeBlockQuoteAsTextstyleOption?: boolean, allowFontSize?: boolean) => SafePlugin<BlockTypeState>;

package/dist/types/pm-plugins/utils.d.ts

@@ -1,6 +1,6 @@
 import type { InputRuleWrapper } from '@atlaskit/editor-common/types';
 import type { NodeType, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { BlockType } from './types';
 export declare const isNodeAWrappingBlockNode: (node?: PMNode | null) => boolean;
 export declare const createJoinNodesRule: (match: RegExp, nodeType: NodeType) => InputRuleWrapper;
@@ -13,7 +13,23 @@ export declare const createWrappingTextBlockRule: ({ match, nodeType, getAttrs,
 /**
  * Function will check if changing block types: Paragraph, Heading is enabled.
  */
-export declare function areBlockTypesDisabled(state: EditorState): boolean;
+export declare function areBlockTypesDisabled(state: EditorState, allowFontSize?: boolean): boolean;
+/**
+ * Checks if the current selection is inside a list node (bulletList, orderedList, or taskList).
+ * Used to determine which text styles should be enabled when the small font size experiment is active.
+ */
+export declare function isSelectionInsideListNode(state: EditorState): boolean;
 export declare const checkFormattingIsPresent: (state: EditorState) => boolean;
 export declare const hasBlockQuoteInOptions: (dropdownOptions: BlockType[]) => boolean;
+/**
+ * Returns a { from, to } range that extends the selection boundaries outward
+ * to include the entirety of any list nodes at either end. If the selection
+ * start is inside a list, `from` is pulled back to the list's start; if the
+ * selection end is inside a list, `to` is pushed forward to the list's end.
+ * Non-list content in the middle is included as-is.
+ */
+export declare function getSelectionRangeExpandedToLists(tr: Transaction): {
+    from: number;
+    to: number;
+};
 export {};

package/dist/types-ts4.5/pm-plugins/main.d.ts

@@ -12,4 +12,4 @@ export type BlockTypeState = {
     formattingIsPresent?: boolean;
 };
 export declare const pluginKey: PluginKey<BlockTypeState>;
-export declare const createPlugin: (editorAPI: ExtractInjectionAPI<BlockTypePlugin> | undefined, dispatch: (eventName: string | PluginKey, data: any) => void, lastNodeMustBeParagraph?: boolean, includeBlockQuoteAsTextstyleOption?: boolean) => SafePlugin<BlockTypeState>;
+export declare const createPlugin: (editorAPI: ExtractInjectionAPI<BlockTypePlugin> | undefined, dispatch: (eventName: string | PluginKey, data: any) => void, lastNodeMustBeParagraph?: boolean, includeBlockQuoteAsTextstyleOption?: boolean, allowFontSize?: boolean) => SafePlugin<BlockTypeState>;

package/dist/types-ts4.5/pm-plugins/utils.d.ts

@@ -1,6 +1,6 @@
 import type { InputRuleWrapper } from '@atlaskit/editor-common/types';
 import type { NodeType, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { BlockType } from './types';
 export declare const isNodeAWrappingBlockNode: (node?: PMNode | null) => boolean;
 export declare const createJoinNodesRule: (match: RegExp, nodeType: NodeType) => InputRuleWrapper;
@@ -13,7 +13,23 @@ export declare const createWrappingTextBlockRule: ({ match, nodeType, getAttrs,
 /**
  * Function will check if changing block types: Paragraph, Heading is enabled.
  */
-export declare function areBlockTypesDisabled(state: EditorState): boolean;
+export declare function areBlockTypesDisabled(state: EditorState, allowFontSize?: boolean): boolean;
+/**
+ * Checks if the current selection is inside a list node (bulletList, orderedList, or taskList).
+ * Used to determine which text styles should be enabled when the small font size experiment is active.
+ */
+export declare function isSelectionInsideListNode(state: EditorState): boolean;
 export declare const checkFormattingIsPresent: (state: EditorState) => boolean;
 export declare const hasBlockQuoteInOptions: (dropdownOptions: BlockType[]) => boolean;
+/**
+ * Returns a { from, to } range that extends the selection boundaries outward
+ * to include the entirety of any list nodes at either end. If the selection
+ * start is inside a list, `from` is pulled back to the list's start; if the
+ * selection end is inside a list, `to` is pushed forward to the list's end.
+ * Non-list content in the middle is included as-is.
+ */
+export declare function getSelectionRangeExpandedToLists(tr: Transaction): {
+    from: number;
+    to: number;
+};
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-type",
-	"version": "12.1.2",
+	"version": "12.1.3",
 	"description": "BlockType plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -50,7 +50,7 @@
 		"@atlaskit/prosemirror-history": "^0.2.0",
 		"@atlaskit/prosemirror-input-rules": "^3.6.0",
 		"@atlaskit/theme": "^22.0.0",
-		"@atlaskit/tmp-editor-statsig": "^40.3.0",
+		"@atlaskit/tmp-editor-statsig": "^40.6.0",
 		"@atlaskit/tokens": "^11.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",