@atlaskit/editor-plugin-paste-options-toolbar 0.2.3 → 0.3.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-paste-options-toolbar
 
+## 0.3.0
+
+### Minor Changes
+
+- [#42718](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42718) [`954af7ba44b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/954af7ba44b) - Changing hasLinkMark function to use pasted slice instead of state.doc while searching for link in pasted text.
+
 ## 0.2.3
 
 ### Patch Changes

package/dist/cjs/toolbar.js

@@ -32,7 +32,7 @@ var isToolbarVisible = exports.isToolbarVisible = function isToolbarVisible(stat
     return false;
   }
   var grandParentNodeType = (_$from$node = $from.node($from.depth - 1)) === null || _$from$node === void 0 ? void 0 : _$from$node.type;
-  if (grandParentNodeType && grandParentNodeType.name === state.schema.nodes.doc.name && !(0, _util.isPastedFromFabricEditor)(lastContentPasted.pasteSource) && !(0, _util.hasLinkMark)(state, lastContentPasted.pasteStartPos, lastContentPasted.pasteEndPos) && !(0, _util.hasMediaNode)(lastContentPasted.pastedSlice)) {
+  if (grandParentNodeType && grandParentNodeType.name === state.schema.nodes.doc.name && !(0, _util.isPastedFromFabricEditor)(lastContentPasted.pasteSource) && !(0, _util.hasLinkMark)(lastContentPasted.pastedSlice) && !(0, _util.hasMediaNode)(lastContentPasted.pastedSlice)) {
     return true;
   }
   return false;

package/dist/cjs/util/index.js

@@ -40,6 +40,18 @@ var hasRuleNode = exports.hasRuleNode = function hasRuleNode(slice, schema) {
   });
   return hasRuleNode;
 };
-var hasLinkMark = exports.hasLinkMark = function hasLinkMark(state, pasteStartPos, pasteEndPos) {
-  return state.doc.rangeHasMark(pasteStartPos, pasteEndPos, state.schema.marks.link);
+var hasLinkMark = exports.hasLinkMark = function hasLinkMark(slice) {
+  var hasLinkMark = false;
+  slice.content.descendants(function (node) {
+    var _node$marks;
+    var marks = (_node$marks = node.marks) === null || _node$marks === void 0 ? void 0 : _node$marks.map(function (mark) {
+      return mark.type.name;
+    });
+    hasLinkMark = marks === null || marks === void 0 ? void 0 : marks.includes('link');
+    if (hasLinkMark) {
+      //break out of loop
+      return false;
+    }
+  });
+  return hasLinkMark;
 };

package/dist/es2019/toolbar.js

@@ -25,7 +25,7 @@ export const isToolbarVisible = (state, lastContentPasted) => {
     return false;
   }
   const grandParentNodeType = (_$from$node = $from.node($from.depth - 1)) === null || _$from$node === void 0 ? void 0 : _$from$node.type;
-  if (grandParentNodeType && grandParentNodeType.name === state.schema.nodes.doc.name && !isPastedFromFabricEditor(lastContentPasted.pasteSource) && !hasLinkMark(state, lastContentPasted.pasteStartPos, lastContentPasted.pasteEndPos) && !hasMediaNode(lastContentPasted.pastedSlice)) {
+  if (grandParentNodeType && grandParentNodeType.name === state.schema.nodes.doc.name && !isPastedFromFabricEditor(lastContentPasted.pasteSource) && !hasLinkMark(lastContentPasted.pastedSlice) && !hasMediaNode(lastContentPasted.pastedSlice)) {
     return true;
   }
   return false;

package/dist/es2019/util/index.js

@@ -32,6 +32,16 @@ export const hasRuleNode = (slice, schema) => {
   });
   return hasRuleNode;
 };
-export const hasLinkMark = (state, pasteStartPos, pasteEndPos) => {
-  return state.doc.rangeHasMark(pasteStartPos, pasteEndPos, state.schema.marks.link);
+export const hasLinkMark = slice => {
+  let hasLinkMark = false;
+  slice.content.descendants(node => {
+    var _node$marks;
+    const marks = (_node$marks = node.marks) === null || _node$marks === void 0 ? void 0 : _node$marks.map(mark => mark.type.name);
+    hasLinkMark = marks === null || marks === void 0 ? void 0 : marks.includes('link');
+    if (hasLinkMark) {
+      //break out of loop
+      return false;
+    }
+  });
+  return hasLinkMark;
 };

package/dist/esm/toolbar.js

@@ -25,7 +25,7 @@ export var isToolbarVisible = function isToolbarVisible(state, lastContentPasted
     return false;
   }
   var grandParentNodeType = (_$from$node = $from.node($from.depth - 1)) === null || _$from$node === void 0 ? void 0 : _$from$node.type;
-  if (grandParentNodeType && grandParentNodeType.name === state.schema.nodes.doc.name && !isPastedFromFabricEditor(lastContentPasted.pasteSource) && !hasLinkMark(state, lastContentPasted.pasteStartPos, lastContentPasted.pasteEndPos) && !hasMediaNode(lastContentPasted.pastedSlice)) {
+  if (grandParentNodeType && grandParentNodeType.name === state.schema.nodes.doc.name && !isPastedFromFabricEditor(lastContentPasted.pasteSource) && !hasLinkMark(lastContentPasted.pastedSlice) && !hasMediaNode(lastContentPasted.pastedSlice)) {
     return true;
   }
   return false;

package/dist/esm/util/index.js

@@ -32,6 +32,18 @@ export var hasRuleNode = function hasRuleNode(slice, schema) {
   });
   return hasRuleNode;
 };
-export var hasLinkMark = function hasLinkMark(state, pasteStartPos, pasteEndPos) {
-  return state.doc.rangeHasMark(pasteStartPos, pasteEndPos, state.schema.marks.link);
+export var hasLinkMark = function hasLinkMark(slice) {
+  var hasLinkMark = false;
+  slice.content.descendants(function (node) {
+    var _node$marks;
+    var marks = (_node$marks = node.marks) === null || _node$marks === void 0 ? void 0 : _node$marks.map(function (mark) {
+      return mark.type.name;
+    });
+    hasLinkMark = marks === null || marks === void 0 ? void 0 : marks.includes('link');
+    if (hasLinkMark) {
+      //break out of loop
+      return false;
+    }
+  });
+  return hasLinkMark;
 };

package/dist/types/util/index.d.ts

@@ -1,7 +1,6 @@
 import type { Schema, Slice } from '@atlaskit/editor-prosemirror/model';
-import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 export declare function isPastedFromFabricEditor(pastedFrom: string): boolean;
 export declare function escapeLinks(text: string): string;
 export declare const hasMediaNode: (slice: Slice | undefined) => boolean;
 export declare const hasRuleNode: (slice: Slice, schema: Schema) => boolean;
-export declare const hasLinkMark: (state: EditorState, pasteStartPos: number, pasteEndPos: number) => boolean;
+export declare const hasLinkMark: (slice: Slice) => boolean;

package/dist/types-ts4.5/util/index.d.ts

@@ -1,7 +1,6 @@
 import type { Schema, Slice } from '@atlaskit/editor-prosemirror/model';
-import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 export declare function isPastedFromFabricEditor(pastedFrom: string): boolean;
 export declare function escapeLinks(text: string): string;
 export declare const hasMediaNode: (slice: Slice | undefined) => boolean;
 export declare const hasRuleNode: (slice: Slice, schema: Schema) => boolean;
-export declare const hasLinkMark: (state: EditorState, pasteStartPos: number, pasteEndPos: number) => boolean;
+export declare const hasLinkMark: (slice: Slice) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-paste-options-toolbar",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "description": "Paste options toolbar for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -36,7 +36,7 @@
     "./styles": "./src/styles.ts"
   },
   "dependencies": {
-    "@atlaskit/editor-common": "^76.17.0",
+    "@atlaskit/editor-common": "^76.18.0",
     "@atlaskit/editor-markdown-transformer": "^5.2.5",
     "@atlaskit/editor-plugin-analytics": "^0.3.0",
     "@atlaskit/editor-plugin-paste": "^0.1.0",