@atlaskit/editor-plugin-paste-options-toolbar 0.3.1 → 0.3.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-paste-options-toolbar
 
+## 0.3.2
+
+### Patch Changes
+
+- [#43282](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43282) [`ea6aae16859`](https://bitbucket.org/atlassian/atlassian-frontend/commits/ea6aae16859) - Fixed extra paragraph added on pasting codeblock and modified relevant testcases
+
 ## 0.3.1
 
 ### Patch Changes

package/dist/cjs/toolbar.js

@@ -14,7 +14,7 @@ var _types = require("./types");
 var _pasteIcon = _interopRequireDefault(require("./ui/paste-icon"));
 var _util = require("./util");
 var isToolbarVisible = exports.isToolbarVisible = function isToolbarVisible(state, lastContentPasted) {
-  var _$from$node;
+  var _$from$parent, _$from$node;
   /**
    * Conditions for not showing the toolbar:
    * 1. Feature flag is disabled
@@ -23,6 +23,7 @@ var isToolbarVisible = exports.isToolbarVisible = function isToolbarVisible(stat
    * 4. Pasting link, media or text containing media(note: markdown link and images are allowed)
    * 5. Content is pasted in a nested node(i.e. inside a table, panel etc.).
    *    (grandParent node should be root doc for showing up the toolbar)
+   * 6. Cursor is inside the codeblock.
    */
   if (!(0, _platformFeatureFlags.getBooleanFF)('platform.editor.paste-options-toolbar')) {
     return false;
@@ -31,8 +32,9 @@ var isToolbarVisible = exports.isToolbarVisible = function isToolbarVisible(stat
   if ((0, _util.hasRuleNode)(lastContentPasted.pastedSlice, state.schema)) {
     return false;
   }
+  var parentNodeType = (_$from$parent = $from.parent) === null || _$from$parent === void 0 ? void 0 : _$from$parent.type;
   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)(lastContentPasted.pastedSlice) && !(0, _util.hasMediaNode)(lastContentPasted.pastedSlice)) {
+  if (grandParentNodeType && grandParentNodeType.name === state.schema.nodes.doc.name && parentNodeType.name !== state.schema.nodes.codeBlock.name && !(0, _util.isPastedFromFabricEditor)(lastContentPasted.pasteSource) && !(0, _util.hasLinkMark)(lastContentPasted.pastedSlice) && !(0, _util.hasMediaNode)(lastContentPasted.pastedSlice)) {
     return true;
   }
   return false;

package/dist/es2019/toolbar.js

@@ -7,7 +7,7 @@ import { pasteOptionsPluginKey, ToolbarDropdownOption } from './types';
 import EditorPasteIcon from './ui/paste-icon';
 import { hasLinkMark, hasMediaNode, hasRuleNode, isPastedFromFabricEditor } from './util';
 export const isToolbarVisible = (state, lastContentPasted) => {
-  var _$from$node;
+  var _$from$parent, _$from$node;
   /**
    * Conditions for not showing the toolbar:
    * 1. Feature flag is disabled
@@ -16,6 +16,7 @@ export const isToolbarVisible = (state, lastContentPasted) => {
    * 4. Pasting link, media or text containing media(note: markdown link and images are allowed)
    * 5. Content is pasted in a nested node(i.e. inside a table, panel etc.).
    *    (grandParent node should be root doc for showing up the toolbar)
+   * 6. Cursor is inside the codeblock.
    */
   if (!getBooleanFF('platform.editor.paste-options-toolbar')) {
     return false;
@@ -24,8 +25,9 @@ export const isToolbarVisible = (state, lastContentPasted) => {
   if (hasRuleNode(lastContentPasted.pastedSlice, state.schema)) {
     return false;
   }
+  const parentNodeType = (_$from$parent = $from.parent) === null || _$from$parent === void 0 ? void 0 : _$from$parent.type;
   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(lastContentPasted.pastedSlice) && !hasMediaNode(lastContentPasted.pastedSlice)) {
+  if (grandParentNodeType && grandParentNodeType.name === state.schema.nodes.doc.name && parentNodeType.name !== state.schema.nodes.codeBlock.name && !isPastedFromFabricEditor(lastContentPasted.pasteSource) && !hasLinkMark(lastContentPasted.pastedSlice) && !hasMediaNode(lastContentPasted.pastedSlice)) {
     return true;
   }
   return false;

package/dist/esm/toolbar.js

@@ -7,7 +7,7 @@ import { pasteOptionsPluginKey, ToolbarDropdownOption } from './types';
 import EditorPasteIcon from './ui/paste-icon';
 import { hasLinkMark, hasMediaNode, hasRuleNode, isPastedFromFabricEditor } from './util';
 export var isToolbarVisible = function isToolbarVisible(state, lastContentPasted) {
-  var _$from$node;
+  var _$from$parent, _$from$node;
   /**
    * Conditions for not showing the toolbar:
    * 1. Feature flag is disabled
@@ -16,6 +16,7 @@ export var isToolbarVisible = function isToolbarVisible(state, lastContentPasted
    * 4. Pasting link, media or text containing media(note: markdown link and images are allowed)
    * 5. Content is pasted in a nested node(i.e. inside a table, panel etc.).
    *    (grandParent node should be root doc for showing up the toolbar)
+   * 6. Cursor is inside the codeblock.
    */
   if (!getBooleanFF('platform.editor.paste-options-toolbar')) {
     return false;
@@ -24,8 +25,9 @@ export var isToolbarVisible = function isToolbarVisible(state, lastContentPasted
   if (hasRuleNode(lastContentPasted.pastedSlice, state.schema)) {
     return false;
   }
+  var parentNodeType = (_$from$parent = $from.parent) === null || _$from$parent === void 0 ? void 0 : _$from$parent.type;
   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(lastContentPasted.pastedSlice) && !hasMediaNode(lastContentPasted.pastedSlice)) {
+  if (grandParentNodeType && grandParentNodeType.name === state.schema.nodes.doc.name && parentNodeType.name !== state.schema.nodes.codeBlock.name && !isPastedFromFabricEditor(lastContentPasted.pasteSource) && !hasLinkMark(lastContentPasted.pastedSlice) && !hasMediaNode(lastContentPasted.pastedSlice)) {
     return true;
   }
   return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-paste-options-toolbar",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "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.22.0",
+    "@atlaskit/editor-common": "^76.23.0",
     "@atlaskit/editor-markdown-transformer": "^5.2.5",
     "@atlaskit/editor-plugin-analytics": "^0.3.0",
     "@atlaskit/editor-plugin-paste": "^0.1.0",
@@ -44,7 +44,7 @@
     "@atlaskit/editor-shared-styles": "^2.8.0",
     "@atlaskit/icon": "^22.0.0",
     "@atlaskit/platform-feature-flags": "^0.2.4",
-    "@atlaskit/tokens": "^1.25.0",
+    "@atlaskit/tokens": "^1.29.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",
     "react-intl-next": "npm:react-intl@^5.18.1"