@atlaskit/editor-plugin-floating-toolbar 5.1.11 → 5.2.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-floating-toolbar
 
+## 5.2.0
+
+### Minor Changes
+
+- [`e73faa5a52300`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e73faa5a52300) -
+  [ux] ED-28735 Fix selection toolbar opening and closing state
+
+### Patch Changes
+
+- Updated dependencies
+
+## 5.1.12
+
+### Patch Changes
+
+- [`31fc6b9e10762`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/31fc6b9e10762) -
+  [ux] ED-28592 ED-28592:Add copy block menu item to block menu
+- Updated dependencies
+
 ## 5.1.11
 
 ### Patch Changes

package/dist/cjs/floatingToolbarPlugin.js

@@ -23,6 +23,7 @@ var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _ui = require("@atlaskit/editor-common/ui");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("./pm-plugins/commands");
 var _forceFocus = _interopRequireWildcard(require("./pm-plugins/force-focus"));
@@ -241,6 +242,16 @@ function ContentComponent(_ref5) {
 
   var config = configWithNodeInfo.config,
     node = configWithNodeInfo.node;
+
+  // When the new inline editor-toolbar is enabled, suppress floating toolbar for text selections.
+  if ((0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc', 'isEnabled', true)) {
+    var selection = editorView.state.selection;
+    var isCellSelection = '$anchorCell' in selection && !selection.empty;
+    var isTextSelected = selection instanceof _state.TextSelection && !selection.empty;
+    if (isTextSelected || isCellSelection) {
+      return null;
+    }
+  }
   var items = config.items;
   var groupLabel = config.groupLabel;
   var title = config.title,

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

@@ -8,6 +8,7 @@ var _browser = require("@atlaskit/editor-common/browser");
 var _clipboard = require("@atlaskit/editor-common/clipboard");
 var _copyButton = require("@atlaskit/editor-common/copy-button");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var copyNode = exports.copyNode = function copyNode(nodeType, editorAnalyticsApi, inputMethod) {
   return function (_ref) {
     var tr = _ref.tr;
@@ -25,32 +26,36 @@ var copyNode = exports.copyNode = function copyNode(nodeType, editorAnalyticsApi
     var schema = tr.doc.type.schema;
     var copyToClipboardTr = tr;
     var domNode = (0, _copyButton.toDOM)(contentNodeWithPos.node, schema);
-    if (domNode) {
-      var div = document.createElement('div');
-      div.appendChild(domNode);
+    if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
+      (0, _copyButton.copyDomNode)(domNode, contentNodeWithPos.node.type, tr.selection);
+    } else {
+      if (domNode) {
+        var div = document.createElement('div');
+        div.appendChild(domNode);
 
-      // if copying inline content
-      if (contentNodeWithPos.node.type.inlineContent) {
-        // The "1 1" refers to the start and end depth of the slice
-        // since we're copying the text inside a paragraph, it will always be 1 1
-        // https://github.com/ProseMirror/prosemirror-view/blob/master/src/clipboard.ts#L32
-        // Ignored via go/ees005
-        // eslint-disable-next-line @atlaskit/editor/no-as-casting
-        div.firstChild.setAttribute('data-pm-slice', '1 1 []');
-      } else {
-        // The "0 0" refers to the start and end depth of the slice
-        // since we're copying the block node only, it will always be 0 0
-        // https://github.com/ProseMirror/prosemirror-view/blob/master/src/clipboard.ts#L32
-        // Ignored via go/ees005
-        // eslint-disable-next-line @atlaskit/editor/no-as-casting
-        div.firstChild.setAttribute('data-pm-slice', '0 0 []');
-      }
-      // ED-17083 safari seems have bugs for extension copy because exntension do not have a child text(innerText) and it will not recognized as html in clipboard, this could be merge into one if this extension fixed children issue or safari fix the copy bug
-      // MEX-2528 safari has a bug related to the mediaSingle node with border or link. The image tag within the clipboard is not recognized as HTML when using the ClipboardItem API. To address this, we have to switch to ClipboardPolyfill
-      if (_browser.browser.safari && tr.selection instanceof _state.NodeSelection && (tr.selection.node.type === schema.nodes.extension || tr.selection.node.type === schema.nodes.mediaSingle)) {
-        (0, _clipboard.copyHTMLToClipboardPolyfill)(div);
-      } else {
-        (0, _clipboard.copyHTMLToClipboard)(div);
+        // if copying inline content
+        if (contentNodeWithPos.node.type.inlineContent) {
+          // The "1 1" refers to the start and end depth of the slice
+          // since we're copying the text inside a paragraph, it will always be 1 1
+          // https://github.com/ProseMirror/prosemirror-view/blob/master/src/clipboard.ts#L32
+          // Ignored via go/ees005
+          // eslint-disable-next-line @atlaskit/editor/no-as-casting
+          div.firstChild.setAttribute('data-pm-slice', '1 1 []');
+        } else {
+          // The "0 0" refers to the start and end depth of the slice
+          // since we're copying the block node only, it will always be 0 0
+          // https://github.com/ProseMirror/prosemirror-view/blob/master/src/clipboard.ts#L32
+          // Ignored via go/ees005
+          // eslint-disable-next-line @atlaskit/editor/no-as-casting
+          div.firstChild.setAttribute('data-pm-slice', '0 0 []');
+        }
+        // ED-17083 safari seems have bugs for extension copy because exntension do not have a child text(innerText) and it will not recognized as html in clipboard, this could be merge into one if this extension fixed children issue or safari fix the copy bug
+        // MEX-2528 safari has a bug related to the mediaSingle node with border or link. The image tag within the clipboard is not recognized as HTML when using the ClipboardItem API. To address this, we have to switch to ClipboardPolyfill
+        if (_browser.browser.safari && tr.selection instanceof _state.NodeSelection && (tr.selection.node.type === schema.nodes.extension || tr.selection.node.type === schema.nodes.mediaSingle)) {
+          (0, _clipboard.copyHTMLToClipboardPolyfill)(div);
+        } else {
+          (0, _clipboard.copyHTMLToClipboard)(div);
+        }
       }
     }
     if (editorAnalyticsApi) {

package/dist/es2019/floatingToolbarPlugin.js

@@ -10,8 +10,9 @@ import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { Popup } from '@atlaskit/editor-common/ui';
-import { AllSelection, PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { AllSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { copyNode } from './pm-plugins/commands';
 import forceFocusPlugin, { forceFocusSelector } from './pm-plugins/force-focus';
@@ -233,6 +234,16 @@ export function ContentComponent({
     config,
     node
   } = configWithNodeInfo;
+
+  // When the new inline editor-toolbar is enabled, suppress floating toolbar for text selections.
+  if (expValEquals('platform_editor_toolbar_aifc', 'isEnabled', true)) {
+    const selection = editorView.state.selection;
+    const isCellSelection = '$anchorCell' in selection && !selection.empty;
+    const isTextSelected = selection instanceof TextSelection && !selection.empty;
+    if (isTextSelected || isCellSelection) {
+      return null;
+    }
+  }
   let {
     items
   } = config;

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

@@ -1,7 +1,8 @@
 import { browser } from '@atlaskit/editor-common/browser';
 import { copyHTMLToClipboard, copyHTMLToClipboardPolyfill, getNodeCopiedAnalyticsPayload } from '@atlaskit/editor-common/clipboard';
-import { getSelectedNodeOrNodeParentByNodeType, toDOM } from '@atlaskit/editor-common/copy-button';
+import { copyDomNode, getSelectedNodeOrNodeParentByNodeType, toDOM } from '@atlaskit/editor-common/copy-button';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 export const copyNode = (nodeType, editorAnalyticsApi, inputMethod) => ({
   tr
 }) => {
@@ -19,32 +20,36 @@ export const copyNode = (nodeType, editorAnalyticsApi, inputMethod) => ({
   const schema = tr.doc.type.schema;
   const copyToClipboardTr = tr;
   const domNode = toDOM(contentNodeWithPos.node, schema);
-  if (domNode) {
-    const div = document.createElement('div');
-    div.appendChild(domNode);
+  if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+    copyDomNode(domNode, contentNodeWithPos.node.type, tr.selection);
+  } else {
+    if (domNode) {
+      const div = document.createElement('div');
+      div.appendChild(domNode);
 
-    // if copying inline content
-    if (contentNodeWithPos.node.type.inlineContent) {
-      // The "1 1" refers to the start and end depth of the slice
-      // since we're copying the text inside a paragraph, it will always be 1 1
-      // https://github.com/ProseMirror/prosemirror-view/blob/master/src/clipboard.ts#L32
-      // Ignored via go/ees005
-      // eslint-disable-next-line @atlaskit/editor/no-as-casting
-      div.firstChild.setAttribute('data-pm-slice', '1 1 []');
-    } else {
-      // The "0 0" refers to the start and end depth of the slice
-      // since we're copying the block node only, it will always be 0 0
-      // https://github.com/ProseMirror/prosemirror-view/blob/master/src/clipboard.ts#L32
-      // Ignored via go/ees005
-      // eslint-disable-next-line @atlaskit/editor/no-as-casting
-      div.firstChild.setAttribute('data-pm-slice', '0 0 []');
-    }
-    // ED-17083 safari seems have bugs for extension copy because exntension do not have a child text(innerText) and it will not recognized as html in clipboard, this could be merge into one if this extension fixed children issue or safari fix the copy bug
-    // MEX-2528 safari has a bug related to the mediaSingle node with border or link. The image tag within the clipboard is not recognized as HTML when using the ClipboardItem API. To address this, we have to switch to ClipboardPolyfill
-    if (browser.safari && tr.selection instanceof NodeSelection && (tr.selection.node.type === schema.nodes.extension || tr.selection.node.type === schema.nodes.mediaSingle)) {
-      copyHTMLToClipboardPolyfill(div);
-    } else {
-      copyHTMLToClipboard(div);
+      // if copying inline content
+      if (contentNodeWithPos.node.type.inlineContent) {
+        // The "1 1" refers to the start and end depth of the slice
+        // since we're copying the text inside a paragraph, it will always be 1 1
+        // https://github.com/ProseMirror/prosemirror-view/blob/master/src/clipboard.ts#L32
+        // Ignored via go/ees005
+        // eslint-disable-next-line @atlaskit/editor/no-as-casting
+        div.firstChild.setAttribute('data-pm-slice', '1 1 []');
+      } else {
+        // The "0 0" refers to the start and end depth of the slice
+        // since we're copying the block node only, it will always be 0 0
+        // https://github.com/ProseMirror/prosemirror-view/blob/master/src/clipboard.ts#L32
+        // Ignored via go/ees005
+        // eslint-disable-next-line @atlaskit/editor/no-as-casting
+        div.firstChild.setAttribute('data-pm-slice', '0 0 []');
+      }
+      // ED-17083 safari seems have bugs for extension copy because exntension do not have a child text(innerText) and it will not recognized as html in clipboard, this could be merge into one if this extension fixed children issue or safari fix the copy bug
+      // MEX-2528 safari has a bug related to the mediaSingle node with border or link. The image tag within the clipboard is not recognized as HTML when using the ClipboardItem API. To address this, we have to switch to ClipboardPolyfill
+      if (browser.safari && tr.selection instanceof NodeSelection && (tr.selection.node.type === schema.nodes.extension || tr.selection.node.type === schema.nodes.mediaSingle)) {
+        copyHTMLToClipboardPolyfill(div);
+      } else {
+        copyHTMLToClipboard(div);
+      }
     }
   }
   if (editorAnalyticsApi) {

package/dist/esm/floatingToolbarPlugin.js

@@ -14,8 +14,9 @@ import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { Popup } from '@atlaskit/editor-common/ui';
-import { AllSelection, PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { AllSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { copyNode as _copyNode } from './pm-plugins/commands';
 import forceFocusPlugin, { forceFocusSelector } from './pm-plugins/force-focus';
@@ -232,6 +233,16 @@ export function ContentComponent(_ref5) {
 
   var config = configWithNodeInfo.config,
     node = configWithNodeInfo.node;
+
+  // When the new inline editor-toolbar is enabled, suppress floating toolbar for text selections.
+  if (expValEquals('platform_editor_toolbar_aifc', 'isEnabled', true)) {
+    var selection = editorView.state.selection;
+    var isCellSelection = '$anchorCell' in selection && !selection.empty;
+    var isTextSelected = selection instanceof TextSelection && !selection.empty;
+    if (isTextSelected || isCellSelection) {
+      return null;
+    }
+  }
   var items = config.items;
   var groupLabel = config.groupLabel;
   var title = config.title,

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

@@ -1,7 +1,8 @@
 import { browser } from '@atlaskit/editor-common/browser';
 import { copyHTMLToClipboard, copyHTMLToClipboardPolyfill, getNodeCopiedAnalyticsPayload } from '@atlaskit/editor-common/clipboard';
-import { getSelectedNodeOrNodeParentByNodeType, toDOM } from '@atlaskit/editor-common/copy-button';
+import { copyDomNode, getSelectedNodeOrNodeParentByNodeType, toDOM } from '@atlaskit/editor-common/copy-button';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 export var copyNode = function copyNode(nodeType, editorAnalyticsApi, inputMethod) {
   return function (_ref) {
     var tr = _ref.tr;
@@ -19,32 +20,36 @@ export var copyNode = function copyNode(nodeType, editorAnalyticsApi, inputMetho
     var schema = tr.doc.type.schema;
     var copyToClipboardTr = tr;
     var domNode = toDOM(contentNodeWithPos.node, schema);
-    if (domNode) {
-      var div = document.createElement('div');
-      div.appendChild(domNode);
+    if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+      copyDomNode(domNode, contentNodeWithPos.node.type, tr.selection);
+    } else {
+      if (domNode) {
+        var div = document.createElement('div');
+        div.appendChild(domNode);
 
-      // if copying inline content
-      if (contentNodeWithPos.node.type.inlineContent) {
-        // The "1 1" refers to the start and end depth of the slice
-        // since we're copying the text inside a paragraph, it will always be 1 1
-        // https://github.com/ProseMirror/prosemirror-view/blob/master/src/clipboard.ts#L32
-        // Ignored via go/ees005
-        // eslint-disable-next-line @atlaskit/editor/no-as-casting
-        div.firstChild.setAttribute('data-pm-slice', '1 1 []');
-      } else {
-        // The "0 0" refers to the start and end depth of the slice
-        // since we're copying the block node only, it will always be 0 0
-        // https://github.com/ProseMirror/prosemirror-view/blob/master/src/clipboard.ts#L32
-        // Ignored via go/ees005
-        // eslint-disable-next-line @atlaskit/editor/no-as-casting
-        div.firstChild.setAttribute('data-pm-slice', '0 0 []');
-      }
-      // ED-17083 safari seems have bugs for extension copy because exntension do not have a child text(innerText) and it will not recognized as html in clipboard, this could be merge into one if this extension fixed children issue or safari fix the copy bug
-      // MEX-2528 safari has a bug related to the mediaSingle node with border or link. The image tag within the clipboard is not recognized as HTML when using the ClipboardItem API. To address this, we have to switch to ClipboardPolyfill
-      if (browser.safari && tr.selection instanceof NodeSelection && (tr.selection.node.type === schema.nodes.extension || tr.selection.node.type === schema.nodes.mediaSingle)) {
-        copyHTMLToClipboardPolyfill(div);
-      } else {
-        copyHTMLToClipboard(div);
+        // if copying inline content
+        if (contentNodeWithPos.node.type.inlineContent) {
+          // The "1 1" refers to the start and end depth of the slice
+          // since we're copying the text inside a paragraph, it will always be 1 1
+          // https://github.com/ProseMirror/prosemirror-view/blob/master/src/clipboard.ts#L32
+          // Ignored via go/ees005
+          // eslint-disable-next-line @atlaskit/editor/no-as-casting
+          div.firstChild.setAttribute('data-pm-slice', '1 1 []');
+        } else {
+          // The "0 0" refers to the start and end depth of the slice
+          // since we're copying the block node only, it will always be 0 0
+          // https://github.com/ProseMirror/prosemirror-view/blob/master/src/clipboard.ts#L32
+          // Ignored via go/ees005
+          // eslint-disable-next-line @atlaskit/editor/no-as-casting
+          div.firstChild.setAttribute('data-pm-slice', '0 0 []');
+        }
+        // ED-17083 safari seems have bugs for extension copy because exntension do not have a child text(innerText) and it will not recognized as html in clipboard, this could be merge into one if this extension fixed children issue or safari fix the copy bug
+        // MEX-2528 safari has a bug related to the mediaSingle node with border or link. The image tag within the clipboard is not recognized as HTML when using the ClipboardItem API. To address this, we have to switch to ClipboardPolyfill
+        if (browser.safari && tr.selection instanceof NodeSelection && (tr.selection.node.type === schema.nodes.extension || tr.selection.node.type === schema.nodes.mediaSingle)) {
+          copyHTMLToClipboardPolyfill(div);
+        } else {
+          copyHTMLToClipboard(div);
+        }
       }
     }
     if (editorAnalyticsApi) {

package/dist/types/pm-plugins/commands.d.ts

@@ -1,6 +1,6 @@
 import { type INPUT_METHOD, type EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { NodeType } from '@atlaskit/editor-prosemirror/model';
-import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+import { type Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare const copyNode: (nodeType: NodeType | Array<NodeType>, editorAnalyticsApi?: EditorAnalyticsAPI | undefined, inputMethod?: INPUT_METHOD) => ({ tr }: {
     tr: Transaction;
 }) => Transaction;

package/dist/types-ts4.5/pm-plugins/commands.d.ts

@@ -1,6 +1,6 @@
 import { type INPUT_METHOD, type EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { NodeType } from '@atlaskit/editor-prosemirror/model';
-import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+import { type Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare const copyNode: (nodeType: NodeType | Array<NodeType>, editorAnalyticsApi?: EditorAnalyticsAPI | undefined, inputMethod?: INPUT_METHOD) => ({ tr }: {
     tr: Transaction;
 }) => Transaction;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-floating-toolbar",
-	"version": "5.1.11",
+	"version": "5.2.0",
 	"description": "Floating toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,21 +34,21 @@
 		"@atlaskit/editor-plugin-decorations": "^3.0.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^3.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^5.0.0",
-		"@atlaskit/editor-plugin-emoji": "^4.2.0",
+		"@atlaskit/editor-plugin-emoji": "^4.3.0",
 		"@atlaskit/editor-plugin-extension": "^6.1.0",
 		"@atlaskit/editor-plugin-interaction": "^5.0.0",
 		"@atlaskit/editor-plugin-table": "^12.2.0",
 		"@atlaskit/editor-plugin-user-intent": "^1.1.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/emoji": "^69.4.0",
-		"@atlaskit/icon": "^27.12.0",
+		"@atlaskit/emoji": "^69.5.0",
+		"@atlaskit/icon": "^28.0.0",
 		"@atlaskit/menu": "^8.3.0",
 		"@atlaskit/modal-dialog": "^14.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^14.11.0",
 		"@atlaskit/select": "^21.2.0",
 		"@atlaskit/theme": "^19.0.0",
-		"@atlaskit/tmp-editor-statsig": "^11.0.0",
+		"@atlaskit/tmp-editor-statsig": "^11.5.0",
 		"@atlaskit/tokens": "^6.0.0",
 		"@atlaskit/tooltip": "^20.4.0",
 		"@babel/runtime": "^7.0.0",
@@ -60,7 +60,7 @@
 		"react-loadable": "^5.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.25.0",
+		"@atlaskit/editor-common": "^107.28.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},