@atlaskit/editor-plugin-alignment 31.0.5 → 31.1.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-alignment
 
+## 31.1.0
+
+### Minor Changes
+
+- [`34b177e64e741`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/34b177e64e741) -
+  Avoid building discarded alignment transactions and visiting every selected cell to locate the
+  final cell when checking alignment eligibility behind platform_editor_improve_inp_batch_2. Stop
+  scanning that cell after the first eligible block, and declare the experiment runtime dependency.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 31.0.5
 
 ### Patch Changes

package/dist/cjs/editor-commands/index.js

@@ -8,6 +8,8 @@ var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _commands = require("@atlaskit/editor-common/commands");
 var _withAnalytics = require("@atlaskit/editor-common/withAnalytics");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 /**
  * Iterates over the commands one after the other,
  * passes the tr through and dispatches the cumulated transaction
@@ -41,6 +43,37 @@ var isAlignable = exports.isAlignable = function isAlignable(align) {
       paragraph = _state$schema$nodes.paragraph,
       heading = _state$schema$nodes.heading,
       alignment = _state$schema.marks.alignment;
+    if (!dispatch && state.selection instanceof _cellSelection.CellSelection && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_improve_inp_batch_2')) {
+      if (!align) {
+        return false;
+      }
+
+      // toggleBlockMark returns the result of the last cell, rather than
+      // combining results. Preserve that behavior without building a transaction.
+      // CellSelection moves the head range first, leaving the rest in document
+      // order. Compare both ends to find the final cell visited by forEachCell.
+      var ranges = state.selection.ranges;
+      var firstRange = ranges[0];
+      var lastRange = ranges[ranges.length - 1];
+      var lastCellRange = firstRange.$from.pos > lastRange.$from.pos ? firstRange : lastRange;
+      var lastCell = lastCellRange.$from.parent;
+      var _hasAlignableBlock = function hasAlignableBlock(parent) {
+        for (var index = 0; index < parent.childCount; index++) {
+          var node = parent.child(index);
+          if (!node.isBlock) {
+            continue;
+          }
+          if ((node.type === paragraph || node.type === heading) && parent.type.allowsMarkType(alignment)) {
+            return true;
+          }
+          if (_hasAlignableBlock(node)) {
+            return true;
+          }
+        }
+        return false;
+      };
+      return _hasAlignableBlock(lastCell);
+    }
     return (0, _commands.toggleBlockMark)(alignment, function () {
       return !align ? undefined : align === 'start' ? false : {
         align: align

package/dist/es2019/editor-commands/index.js

@@ -2,6 +2,8 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit
 import { changeImageAlignment, changeImageAlignmentNext, toggleBlockMark, toggleBlockMarkNext } from '@atlaskit/editor-common/commands';
 import { withAnalytics } from '@atlaskit/editor-common/withAnalytics';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
+import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 /**
  * Iterates over the commands one after the other,
  * passes the tr through and dispatches the cumulated transaction
@@ -38,6 +40,39 @@ export const isAlignable = align => (state, dispatch) => {
       alignment
     }
   } = state.schema;
+  if (!dispatch && state.selection instanceof CellSelection && isExperimentEnabled('platform_editor_improve_inp_batch_2')) {
+    if (!align) {
+      return false;
+    }
+
+    // toggleBlockMark returns the result of the last cell, rather than
+    // combining results. Preserve that behavior without building a transaction.
+    // CellSelection moves the head range first, leaving the rest in document
+    // order. Compare both ends to find the final cell visited by forEachCell.
+    const {
+      ranges
+    } = state.selection;
+    const firstRange = ranges[0];
+    const lastRange = ranges[ranges.length - 1];
+    const lastCellRange = firstRange.$from.pos > lastRange.$from.pos ? firstRange : lastRange;
+    const lastCell = lastCellRange.$from.parent;
+    const hasAlignableBlock = parent => {
+      for (let index = 0; index < parent.childCount; index++) {
+        const node = parent.child(index);
+        if (!node.isBlock) {
+          continue;
+        }
+        if ((node.type === paragraph || node.type === heading) && parent.type.allowsMarkType(alignment)) {
+          return true;
+        }
+        if (hasAlignableBlock(node)) {
+          return true;
+        }
+      }
+      return false;
+    };
+    return hasAlignableBlock(lastCell);
+  }
   return toggleBlockMark(alignment, () => !align ? undefined : align === 'start' ? false : {
     align
   }, [paragraph, heading])(state, dispatch);

package/dist/esm/editor-commands/index.js

@@ -2,6 +2,8 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit
 import { changeImageAlignment, changeImageAlignmentNext, toggleBlockMark, toggleBlockMarkNext } from '@atlaskit/editor-common/commands';
 import { withAnalytics } from '@atlaskit/editor-common/withAnalytics';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
+import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 /**
  * Iterates over the commands one after the other,
  * passes the tr through and dispatches the cumulated transaction
@@ -35,6 +37,37 @@ export var isAlignable = function isAlignable(align) {
       paragraph = _state$schema$nodes.paragraph,
       heading = _state$schema$nodes.heading,
       alignment = _state$schema.marks.alignment;
+    if (!dispatch && state.selection instanceof CellSelection && isExperimentEnabled('platform_editor_improve_inp_batch_2')) {
+      if (!align) {
+        return false;
+      }
+
+      // toggleBlockMark returns the result of the last cell, rather than
+      // combining results. Preserve that behavior without building a transaction.
+      // CellSelection moves the head range first, leaving the rest in document
+      // order. Compare both ends to find the final cell visited by forEachCell.
+      var ranges = state.selection.ranges;
+      var firstRange = ranges[0];
+      var lastRange = ranges[ranges.length - 1];
+      var lastCellRange = firstRange.$from.pos > lastRange.$from.pos ? firstRange : lastRange;
+      var lastCell = lastCellRange.$from.parent;
+      var _hasAlignableBlock = function hasAlignableBlock(parent) {
+        for (var index = 0; index < parent.childCount; index++) {
+          var node = parent.child(index);
+          if (!node.isBlock) {
+            continue;
+          }
+          if ((node.type === paragraph || node.type === heading) && parent.type.allowsMarkType(alignment)) {
+            return true;
+          }
+          if (_hasAlignableBlock(node)) {
+            return true;
+          }
+        }
+        return false;
+      };
+      return _hasAlignableBlock(lastCell);
+    }
     return toggleBlockMark(alignment, function () {
       return !align ? undefined : align === 'start' ? false : {
         align: align

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-alignment",
-	"version": "31.0.5",
+	"version": "31.1.0",
 	"description": "Alignment plugin for @atlaskit/editor-core",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -32,13 +32,14 @@
 		"@atlaskit/editor-tables": "^3.2.0",
 		"@atlaskit/editor-toolbar": "^2.8.0",
 		"@atlaskit/icon": "^38.0.0",
+		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/tmp-editor-statsig": "^250.0.0",
 		"@atlaskit/tokens": "^20.9.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^134.3.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"