@atlaskit/editor-plugin-block-menu 3.1.5 → 3.2.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 3.2.0
+
+### Minor Changes
+
+- [`b610a8281f843`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b610a8281f843) -
+  Fix double format options highlight for selection with blockQuotes
+
+### Patch Changes
+
+- Updated dependencies
+
+## 3.1.6
+
+### Patch Changes
+
+- [`f1e12e7cf00ba`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f1e12e7cf00ba) -
+  ED-29083: Fixed copying code block only copy texts
+- Updated dependencies
+
 ## 3.1.5
 
 ### Patch Changes

package/dist/cjs/blockMenuPlugin.js

@@ -40,6 +40,20 @@ var blockMenuPlugin = exports.blockMenuPlugin = function blockMenuPlugin(_ref) {
         return (0, _formatNode2.formatNode)(targetType);
       }
     },
+    getSharedState: function getSharedState(editorState) {
+      var _api$blockControls;
+      if (!editorState) {
+        return {
+          currentSelectedNodeName: undefined
+        };
+      }
+
+      // Get the menuTriggerBy from blockControls plugin if available
+      var currentSelectedNodeName = api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.sharedState.currentState()) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.menuTriggerBy;
+      return {
+        currentSelectedNodeName: currentSelectedNodeName
+      };
+    },
     contentComponent: function contentComponent(_ref2) {
       var editorView = _ref2.editorView,
         popupsMountPoint = _ref2.popupsMountPoint,

package/dist/cjs/ui/copy-block.js

@@ -33,7 +33,7 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
       var schema = selection.$from.doc.type.schema;
       // for texts and inline nodes
       if (selection instanceof _state.TextSelection) {
-        var _fragment;
+        var _fragment, _fragment2;
         var fragment = selection === null || selection === void 0 ? void 0 : selection.content().content;
         if (!fragment) {
           return;
@@ -46,6 +46,15 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
           var layoutContent = layoutColumnNode === null || layoutColumnNode === void 0 ? void 0 : layoutColumnNode.firstChild;
           fragment = (layoutContent === null || layoutContent === void 0 ? void 0 : layoutContent.content) || _model.Fragment.empty;
         }
+
+        // if text is inside of an expand, the selection contains an expand for some reason
+        // the expandNode always and only have one child, no matter how much contents are inside the expand,
+        // and the one child is the line that is being selected, so we can use the .firstChild again
+        if ((_fragment2 = fragment) !== null && _fragment2 !== void 0 && _fragment2.firstChild && fragment.firstChild.type.name === 'expand') {
+          var expandNode = fragment.firstChild;
+          var actualNodeToCopy = expandNode.firstChild;
+          fragment = _model.Fragment.from(actualNodeToCopy) || _model.Fragment.empty;
+        }
         var domNode = toDOMFromFragment(fragment, schema);
         var div = document.createElement('div');
         div.appendChild(domNode);
@@ -66,6 +75,13 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
       // for other nodes
       if (selection instanceof _state.NodeSelection) {
         var _nodeType = selection.node.type;
+
+        // code block is a special case where it is a block node but has inlineContent to true,
+        // When nodeType.inlineContent is true, it will be treated as an inline node in the copyDomNode function,
+        // but we want to treat it as a block node when copying, hence setting it to false here
+        if (selection.node.type.name === 'codeBlock') {
+          _nodeType.inlineContent = false;
+        }
         var _domNode2 = (0, _copyButton.toDOM)(selection.node, schema);
         (0, _copyButton.copyDomNode)(_domNode2, _nodeType, selection);
       }

package/dist/es2019/blockMenuPlugin.js

@@ -34,6 +34,20 @@ export const blockMenuPlugin = ({
         return formatNode(targetType);
       }
     },
+    getSharedState(editorState) {
+      var _api$blockControls, _api$blockControls$sh;
+      if (!editorState) {
+        return {
+          currentSelectedNodeName: undefined
+        };
+      }
+
+      // Get the menuTriggerBy from blockControls plugin if available
+      const currentSelectedNodeName = api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : (_api$blockControls$sh = _api$blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.menuTriggerBy;
+      return {
+        currentSelectedNodeName
+      };
+    },
     contentComponent({
       editorView,
       popupsMountPoint,

package/dist/es2019/ui/copy-block.js

@@ -28,7 +28,7 @@ const CopyBlockMenuItem = ({
       const schema = selection.$from.doc.type.schema;
       // for texts and inline nodes
       if (selection instanceof TextSelection) {
-        var _fragment;
+        var _fragment, _fragment2;
         let fragment = selection === null || selection === void 0 ? void 0 : selection.content().content;
         if (!fragment) {
           return;
@@ -41,6 +41,15 @@ const CopyBlockMenuItem = ({
           const layoutContent = layoutColumnNode === null || layoutColumnNode === void 0 ? void 0 : layoutColumnNode.firstChild;
           fragment = (layoutContent === null || layoutContent === void 0 ? void 0 : layoutContent.content) || Fragment.empty;
         }
+
+        // if text is inside of an expand, the selection contains an expand for some reason
+        // the expandNode always and only have one child, no matter how much contents are inside the expand,
+        // and the one child is the line that is being selected, so we can use the .firstChild again
+        if ((_fragment2 = fragment) !== null && _fragment2 !== void 0 && _fragment2.firstChild && fragment.firstChild.type.name === 'expand') {
+          const expandNode = fragment.firstChild;
+          const actualNodeToCopy = expandNode.firstChild;
+          fragment = Fragment.from(actualNodeToCopy) || Fragment.empty;
+        }
         const domNode = toDOMFromFragment(fragment, schema);
         const div = document.createElement('div');
         div.appendChild(domNode);
@@ -61,6 +70,13 @@ const CopyBlockMenuItem = ({
       // for other nodes
       if (selection instanceof NodeSelection) {
         const nodeType = selection.node.type;
+
+        // code block is a special case where it is a block node but has inlineContent to true,
+        // When nodeType.inlineContent is true, it will be treated as an inline node in the copyDomNode function,
+        // but we want to treat it as a block node when copying, hence setting it to false here
+        if (selection.node.type.name === 'codeBlock') {
+          nodeType.inlineContent = false;
+        }
         const domNode = toDOM(selection.node, schema);
         copyDomNode(domNode, nodeType, selection);
       }

package/dist/esm/blockMenuPlugin.js

@@ -33,6 +33,20 @@ export var blockMenuPlugin = function blockMenuPlugin(_ref) {
         return _formatNode(targetType);
       }
     },
+    getSharedState: function getSharedState(editorState) {
+      var _api$blockControls;
+      if (!editorState) {
+        return {
+          currentSelectedNodeName: undefined
+        };
+      }
+
+      // Get the menuTriggerBy from blockControls plugin if available
+      var currentSelectedNodeName = api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.sharedState.currentState()) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.menuTriggerBy;
+      return {
+        currentSelectedNodeName: currentSelectedNodeName
+      };
+    },
     contentComponent: function contentComponent(_ref2) {
       var editorView = _ref2.editorView,
         popupsMountPoint = _ref2.popupsMountPoint,

package/dist/esm/ui/copy-block.js

@@ -26,7 +26,7 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
       var schema = selection.$from.doc.type.schema;
       // for texts and inline nodes
       if (selection instanceof TextSelection) {
-        var _fragment;
+        var _fragment, _fragment2;
         var fragment = selection === null || selection === void 0 ? void 0 : selection.content().content;
         if (!fragment) {
           return;
@@ -39,6 +39,15 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
           var layoutContent = layoutColumnNode === null || layoutColumnNode === void 0 ? void 0 : layoutColumnNode.firstChild;
           fragment = (layoutContent === null || layoutContent === void 0 ? void 0 : layoutContent.content) || Fragment.empty;
         }
+
+        // if text is inside of an expand, the selection contains an expand for some reason
+        // the expandNode always and only have one child, no matter how much contents are inside the expand,
+        // and the one child is the line that is being selected, so we can use the .firstChild again
+        if ((_fragment2 = fragment) !== null && _fragment2 !== void 0 && _fragment2.firstChild && fragment.firstChild.type.name === 'expand') {
+          var expandNode = fragment.firstChild;
+          var actualNodeToCopy = expandNode.firstChild;
+          fragment = Fragment.from(actualNodeToCopy) || Fragment.empty;
+        }
         var domNode = toDOMFromFragment(fragment, schema);
         var div = document.createElement('div');
         div.appendChild(domNode);
@@ -59,6 +68,13 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
       // for other nodes
       if (selection instanceof NodeSelection) {
         var _nodeType = selection.node.type;
+
+        // code block is a special case where it is a block node but has inlineContent to true,
+        // When nodeType.inlineContent is true, it will be treated as an inline node in the copyDomNode function,
+        // but we want to treat it as a block node when copying, hence setting it to false here
+        if (selection.node.type.name === 'codeBlock') {
+          _nodeType.inlineContent = false;
+        }
         var _domNode2 = toDOM(selection.node, schema);
         copyDomNode(_domNode2, _nodeType, selection);
       }

package/dist/types/blockMenuPluginType.d.ts

@@ -19,6 +19,7 @@ export type BlockMenuPlugin = NextEditorPlugin<'blockMenu', {
         OptionalPlugin<DecorationsPlugin>
     ];
     pluginConfiguration?: BlockMenuPluginOptions;
+    sharedState: BlockMenuSharedState;
 }>;
 export type BlockMenuPluginOptions = {
     /**
@@ -31,6 +32,13 @@ export type BlockMenuPluginOptions = {
      */
     getLinkPath?: () => string | null;
 };
+export type BlockMenuSharedState = {
+    /**
+     * The name of the currently selected node type that triggered the block menu
+     * This exposes the menuTriggerBy value from blockControls plugin
+     */
+    currentSelectedNodeName: string | undefined;
+} | undefined;
 type WithRank<T> = T & {
     rank: number;
 };

package/dist/types/index.d.ts

@@ -1,2 +1,2 @@
 export { blockMenuPlugin } from './blockMenuPlugin';
-export type { BlockMenuPlugin, RegisterBlockMenuComponent, Parent, BlockMenuPluginOptions, } from './blockMenuPluginType';
+export type { BlockMenuPlugin, RegisterBlockMenuComponent, Parent, BlockMenuPluginOptions, BlockMenuSharedState, } from './blockMenuPluginType';

package/dist/types-ts4.5/blockMenuPluginType.d.ts

@@ -19,6 +19,7 @@ export type BlockMenuPlugin = NextEditorPlugin<'blockMenu', {
         OptionalPlugin<DecorationsPlugin>
     ];
     pluginConfiguration?: BlockMenuPluginOptions;
+    sharedState: BlockMenuSharedState;
 }>;
 export type BlockMenuPluginOptions = {
     /**
@@ -31,6 +32,13 @@ export type BlockMenuPluginOptions = {
      */
     getLinkPath?: () => string | null;
 };
+export type BlockMenuSharedState = {
+    /**
+     * The name of the currently selected node type that triggered the block menu
+     * This exposes the menuTriggerBy value from blockControls plugin
+     */
+    currentSelectedNodeName: string | undefined;
+} | undefined;
 type WithRank<T> = T & {
     rank: number;
 };

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

@@ -1,2 +1,2 @@
 export { blockMenuPlugin } from './blockMenuPlugin';
-export type { BlockMenuPlugin, RegisterBlockMenuComponent, Parent, BlockMenuPluginOptions, } from './blockMenuPluginType';
+export type { BlockMenuPlugin, RegisterBlockMenuComponent, Parent, BlockMenuPluginOptions, BlockMenuSharedState, } from './blockMenuPluginType';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "3.1.5",
+	"version": "3.2.0",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -42,12 +42,12 @@
 		"@atlaskit/icon-lab": "^5.7.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^14.14.0",
-		"@atlaskit/tmp-editor-statsig": "^12.22.0",
+		"@atlaskit/tmp-editor-statsig": "^12.25.0",
 		"@atlaskit/tokens": "^6.3.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^109.7.0",
+		"@atlaskit/editor-common": "^109.10.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},