@atlaskit/prosemirror-input-rules 3.2.0 → 3.2.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/prosemirror-input-rules
 
+## 3.2.1
+
+### Patch Changes
+
+- [#132619](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/132619)
+  [`492710c431738`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/492710c431738) -
+  [ux] [EO2024-22] Fix typeahead interaction when node or table selection
+
 ## 3.2.0
 
 ### Minor Changes

package/dist/cjs/utils.js

@@ -41,7 +41,8 @@ var createPlugin = exports.createPlugin = function createPlugin(pluginName, rule
       to = _ref.to;
     var unsupportedMarks = isBlockNodeRule ? ['code', 'link', 'typeAheadQuery'] : ['code'];
     var $from = state.selection.$from;
-    if ($from.parent.type.spec.code || !(state.selection instanceof _state.TextSelection) && !(0, _editorCommon.isGapCursorSelection)(state.selection) || hasUnsupportedMarks(state, from, to, unsupportedMarks) || isBlockNodeRule && isCursorInsideUnsupportedMarks(state, unsupportedMarks)) {
+    var isInline = state.selection instanceof _state.NodeSelection && state.selection.node.type.isInline;
+    if ($from.parent.type.spec.code || !(state.selection instanceof _state.TextSelection) && !(0, _editorCommon.isGapCursorSelection)(state.selection) && !isInline || hasUnsupportedMarks(state, from, to, unsupportedMarks) || isBlockNodeRule && isCursorInsideUnsupportedMarks(state, unsupportedMarks)) {
       return false;
     }
     return true;

package/dist/es2019/utils.js

@@ -1,5 +1,5 @@
 import { closeHistory } from '@atlaskit/editor-prosemirror/history';
-import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { isGapCursorSelection } from './editor-common';
 import { createInputRulePlugin } from './plugin';
 const hasUnsupportedMarks = (state, start, end, marksNameUnsupported) => {
@@ -35,7 +35,8 @@ export const createPlugin = (pluginName, rules, options = {}) => {
   }) => {
     const unsupportedMarks = isBlockNodeRule ? ['code', 'link', 'typeAheadQuery'] : ['code'];
     const $from = state.selection.$from;
-    if ($from.parent.type.spec.code || !(state.selection instanceof TextSelection) && !isGapCursorSelection(state.selection) || hasUnsupportedMarks(state, from, to, unsupportedMarks) || isBlockNodeRule && isCursorInsideUnsupportedMarks(state, unsupportedMarks)) {
+    const isInline = state.selection instanceof NodeSelection && state.selection.node.type.isInline;
+    if ($from.parent.type.spec.code || !(state.selection instanceof TextSelection) && !isGapCursorSelection(state.selection) && !isInline || hasUnsupportedMarks(state, from, to, unsupportedMarks) || isBlockNodeRule && isCursorInsideUnsupportedMarks(state, unsupportedMarks)) {
       return false;
     }
     return true;

package/dist/esm/utils.js

@@ -1,5 +1,5 @@
 import { closeHistory } from '@atlaskit/editor-prosemirror/history';
-import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { isGapCursorSelection } from './editor-common';
 import { createInputRulePlugin } from './plugin';
 var hasUnsupportedMarks = function hasUnsupportedMarks(state, start, end, marksNameUnsupported) {
@@ -35,7 +35,8 @@ export var createPlugin = function createPlugin(pluginName, rules) {
       to = _ref.to;
     var unsupportedMarks = isBlockNodeRule ? ['code', 'link', 'typeAheadQuery'] : ['code'];
     var $from = state.selection.$from;
-    if ($from.parent.type.spec.code || !(state.selection instanceof TextSelection) && !isGapCursorSelection(state.selection) || hasUnsupportedMarks(state, from, to, unsupportedMarks) || isBlockNodeRule && isCursorInsideUnsupportedMarks(state, unsupportedMarks)) {
+    var isInline = state.selection instanceof NodeSelection && state.selection.node.type.isInline;
+    if ($from.parent.type.spec.code || !(state.selection instanceof TextSelection) && !isGapCursorSelection(state.selection) && !isInline || hasUnsupportedMarks(state, from, to, unsupportedMarks) || isBlockNodeRule && isCursorInsideUnsupportedMarks(state, unsupportedMarks)) {
       return false;
     }
     return true;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/prosemirror-input-rules",
-	"version": "3.2.0",
+	"version": "3.2.1",
 	"description": "A package that contains helpers to create autoformatting rules for ProseMirror",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -32,7 +32,7 @@
 		"@babel/runtime": "^7.0.0"
 	},
 	"devDependencies": {
-		"@atlaskit/editor-common": "^86.8.0"
+		"@atlaskit/editor-common": "^88.0.0"
 	},
 	"techstack": {
 		"@atlassian/frontend": {

package/src/utils.ts

@@ -1,7 +1,7 @@
 import { closeHistory } from '@atlaskit/editor-prosemirror/history';
 import type { Mark as PMMark } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, SafePluginSpec } from '@atlaskit/editor-prosemirror/state';
-import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 
 import { isGapCursorSelection } from './editor-common';
 import { createInputRulePlugin } from './plugin';
@@ -51,10 +51,13 @@ export const createPlugin = (
 		const unsupportedMarks = isBlockNodeRule ? ['code', 'link', 'typeAheadQuery'] : ['code'];
 
 		const $from = state.selection.$from;
+		const isInline = state.selection instanceof NodeSelection && state.selection.node.type.isInline;
 
 		if (
 			$from.parent.type.spec.code ||
-			(!(state.selection instanceof TextSelection) && !isGapCursorSelection(state.selection)) ||
+			(!(state.selection instanceof TextSelection) &&
+				!isGapCursorSelection(state.selection) &&
+				!isInline) ||
 			hasUnsupportedMarks(state, from, to, unsupportedMarks) ||
 			(isBlockNodeRule && isCursorInsideUnsupportedMarks(state, unsupportedMarks))
 		) {