@atlaskit/editor-plugin-block-type 34.0.3 → 34.0.5

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-block-type
 
+## 34.0.5
+
+### Patch Changes
+
+- Updated dependencies
+
+## 34.0.4
+
+### Patch Changes
+
+- [`b2cba09ce9ad0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b2cba09ce9ad0) -
+  Add a shared cell-local mark-presence helper and use it for clear-formatting and block-type
+  formatting-presence checks behind `platform_editor_improve_inp`. Reuse resolved cell-selection
+  ranges and stop scanning at the first matching mark.
+
+  Share schema mark-name resolution through `getSupportedMarkTypes`, caching results per schema and
+  mark-name array to avoid repeated allocation during selection changes.
+
+- Updated dependencies
+
 ## 34.0.3
 
 ### Patch Changes

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

@@ -12,10 +12,14 @@ exports.isNodeAWrappingBlockNode = exports.hasBlockQuoteInOptions = void 0;
 exports.isSelectionInsideBlockquote = isSelectionInsideBlockquote;
 exports.isSelectionInsideListNode = isSelectionInsideListNode;
 var _mark = require("@atlaskit/editor-common/mark");
+var _cellSelectionHasAnyMark = require("@atlaskit/editor-common/mark/cell-selection-has-any-mark");
+var _getSupportedMarkTypes = require("@atlaskit/editor-common/mark/get-supported-mark-types");
 var _transforms = require("@atlaskit/editor-common/transforms");
 var _utils = require("@atlaskit/editor-common/utils");
 var _inputRules = require("@atlaskit/editor-common/utils/input-rules");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _blockTypes = require("./block-types");
 var isNodeAWrappingBlockNode = exports.isNodeAWrappingBlockNode = function isNodeAWrappingBlockNode(node) {
   if (!node) {
@@ -216,6 +220,9 @@ var blockStylingIsPresent = function blockStylingIsPresent(state) {
   return isBlockStyling;
 };
 var marksArePresent = function marksArePresent(state) {
+  if (state.selection instanceof _cellSelection.CellSelection && !state.selection.empty && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_improve_inp')) {
+    return (0, _cellSelectionHasAnyMark.cellSelectionHasAnyMark)(state.selection, (0, _getSupportedMarkTypes.getSupportedMarkTypes)(state.schema, _blockTypes.FORMATTING_MARK_TYPES));
+  }
   var activeMarkTypes = _blockTypes.FORMATTING_MARK_TYPES.filter(function (mark) {
     if (!!state.schema.marks[mark]) {
       var _state$selection6 = state.selection,

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

@@ -1,8 +1,12 @@
 import { anyMarkActive } from '@atlaskit/editor-common/mark';
+import { cellSelectionHasAnyMark } from '@atlaskit/editor-common/mark/cell-selection-has-any-mark';
+import { getSupportedMarkTypes } from '@atlaskit/editor-common/mark/get-supported-mark-types';
 import { createBlockTaskItem } from '@atlaskit/editor-common/transforms';
 import { createRule } from '@atlaskit/editor-common/utils';
 import { createWrappingJoinRule } from '@atlaskit/editor-common/utils/input-rules';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { WRAPPER_BLOCK_TYPES, FORMATTING_NODE_TYPES, FORMATTING_MARK_TYPES } from './block-types';
 export const isNodeAWrappingBlockNode = node => {
   if (!node) {
@@ -203,6 +207,9 @@ const blockStylingIsPresent = state => {
   return isBlockStyling;
 };
 const marksArePresent = state => {
+  if (state.selection instanceof CellSelection && !state.selection.empty && isExperimentEnabled('platform_editor_improve_inp')) {
+    return cellSelectionHasAnyMark(state.selection, getSupportedMarkTypes(state.schema, FORMATTING_MARK_TYPES));
+  }
   const activeMarkTypes = FORMATTING_MARK_TYPES.filter(mark => {
     if (!!state.schema.marks[mark]) {
       const {

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

@@ -1,8 +1,12 @@
 import { anyMarkActive } from '@atlaskit/editor-common/mark';
+import { cellSelectionHasAnyMark } from '@atlaskit/editor-common/mark/cell-selection-has-any-mark';
+import { getSupportedMarkTypes } from '@atlaskit/editor-common/mark/get-supported-mark-types';
 import { createBlockTaskItem } from '@atlaskit/editor-common/transforms';
 import { createRule } from '@atlaskit/editor-common/utils';
 import { createWrappingJoinRule } from '@atlaskit/editor-common/utils/input-rules';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { WRAPPER_BLOCK_TYPES, FORMATTING_NODE_TYPES, FORMATTING_MARK_TYPES } from './block-types';
 export var isNodeAWrappingBlockNode = function isNodeAWrappingBlockNode(node) {
   if (!node) {
@@ -203,6 +207,9 @@ var blockStylingIsPresent = function blockStylingIsPresent(state) {
   return isBlockStyling;
 };
 var marksArePresent = function marksArePresent(state) {
+  if (state.selection instanceof CellSelection && !state.selection.empty && isExperimentEnabled('platform_editor_improve_inp')) {
+    return cellSelectionHasAnyMark(state.selection, getSupportedMarkTypes(state.schema, FORMATTING_MARK_TYPES));
+  }
   var activeMarkTypes = FORMATTING_MARK_TYPES.filter(function (mark) {
     if (!!state.schema.marks[mark]) {
       var _state$selection6 = state.selection,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-type",
-	"version": "34.0.3",
+	"version": "34.0.5",
 	"description": "BlockType plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,7 +32,7 @@
 		"@atlaskit/editor-plugin-selection-toolbar": "^31.0.0",
 		"@atlaskit/editor-plugin-toolbar": "^27.0.0",
 		"@atlaskit/editor-prosemirror": "^9.0.0",
-		"@atlaskit/editor-shared-styles": "^4.6.0",
+		"@atlaskit/editor-shared-styles": "^5.0.0",
 		"@atlaskit/editor-tables": "^3.2.0",
 		"@atlaskit/editor-toolbar": "^2.8.0",
 		"@atlaskit/editor-toolbar-model": "^1.2.0",
@@ -43,14 +43,14 @@
 		"@atlaskit/primitives": "^22.6.0",
 		"@atlaskit/prosemirror-history": "^1.3.0",
 		"@atlaskit/prosemirror-input-rules": "^4.1.0",
-		"@atlaskit/tmp-editor-statsig": "^249.0.0",
-		"@atlaskit/tokens": "^20.8.0",
+		"@atlaskit/tmp-editor-statsig": "^250.0.0",
+		"@atlaskit/tokens": "^20.9.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
 		"@emotion/react": "^11.7.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^134.2.0",
+		"@atlaskit/editor-common": "^134.4.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"