@atlaskit/editor-plugin-code-block 5.0.13 → 6.0.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-code-block
 
+## 6.0.0
+
+### Patch Changes
+
+- [`e882e86092666`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e882e86092666) -
+  [ux] Register expand, layout and code block itmes in block menu. Update panel item.
+- Updated dependencies
+
+## 5.0.14
+
+### Patch Changes
+
+- [`a2cd8c46a3e94`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a2cd8c46a3e94) -
+  EDITOR-1442 Bump adf-schema
+- Updated dependencies
+
 ## 5.0.13
 
 ### Patch Changes

package/dist/cjs/codeBlockPlugin.js

@@ -9,9 +9,11 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _blockMenu = require("@atlaskit/editor-common/block-menu");
 var _messages = require("@atlaskit/editor-common/messages");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _editorCommands = require("./editor-commands");
 var _codeBlockAutoFullStopTransformPlugin = require("./pm-plugins/codeBlockAutoFullStopTransformPlugin");
 var _codeBlockCopySelectionPlugin = require("./pm-plugins/codeBlockCopySelectionPlugin");
@@ -21,11 +23,25 @@ var _keymaps = _interopRequireDefault(require("./pm-plugins/keymaps"));
 var _main = require("./pm-plugins/main");
 var _refreshBrowserSelection = _interopRequireDefault(require("./pm-plugins/refresh-browser-selection"));
 var _toolbar = require("./pm-plugins/toolbar");
+var _CodeBlockMenuItem = require("./ui/CodeBlockMenuItem");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var codeBlockPlugin = function codeBlockPlugin(_ref) {
   var options = _ref.config,
     api = _ref.api;
+  if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
+    var _api$blockMenu;
+    api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 || _api$blockMenu.actions.registerBlockMenuComponents([{
+      type: 'block-menu-item',
+      key: _blockMenu.FORMAT_CODE_BLOCK_MENU_ITEM.key,
+      parent: {
+        type: 'block-menu-section',
+        key: _blockMenu.FORMAT_MENU_ITEM.key,
+        rank: _blockMenu.FORMAT_NESTED_MENU_RANK[_blockMenu.FORMAT_CODE_BLOCK_MENU_ITEM.key]
+      },
+      component: (0, _CodeBlockMenuItem.createCodeBlockMenuItem)(api)
+    }]);
+  }
   return {
     name: 'codeBlock',
     nodes: function nodes() {

package/dist/cjs/ui/CodeBlockMenuItem.js

@@ -0,0 +1,51 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createCodeBlockMenuItem = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _reactIntlNext = require("react-intl-next");
+var _messages = require("@atlaskit/editor-common/messages");
+var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _angleBrackets = _interopRequireDefault(require("@atlaskit/icon/core/angle-brackets"));
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+var nodeName = 'codeBlock';
+var CodeBlockMenuItem = function CodeBlockMenuItem(_ref) {
+  var api = _ref.api;
+  var _useIntl = (0, _reactIntlNext.useIntl)(),
+    formatMessage = _useIntl.formatMessage;
+  var selection = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'selection.selection');
+  var isCodeBlockSelected = (0, _react.useMemo)(function () {
+    if (!selection) {
+      return false;
+    }
+    if (selection instanceof _state.NodeSelection) {
+      // Note: we are checking for any type of panel, not just of type infopanel
+      return selection.node.type.name === nodeName;
+    }
+    return false;
+  }, [selection]);
+  var handleClick = function handleClick() {
+    var _api$blockMenu;
+    api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.commands.formatNode(nodeName));
+  };
+  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
+    onClick: handleClick,
+    isSelected: isCodeBlockSelected,
+    elemBefore: /*#__PURE__*/_react.default.createElement(_angleBrackets.default, {
+      label: ""
+    })
+  }, formatMessage(_messages.blockMenuMessages.codeBlock));
+};
+var createCodeBlockMenuItem = exports.createCodeBlockMenuItem = function createCodeBlockMenuItem(api) {
+  return function () {
+    return /*#__PURE__*/_react.default.createElement(CodeBlockMenuItem, {
+      api: api
+    });
+  };
+};

package/dist/es2019/codeBlockPlugin.js

@@ -1,9 +1,11 @@
 import React from 'react';
 import { codeBlock, codeBlockWithLocalId } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { FORMAT_MENU_ITEM, FORMAT_CODE_BLOCK_MENU_ITEM, FORMAT_NESTED_MENU_RANK } from '@atlaskit/editor-common/block-menu';
 import { blockTypeMessages } from '@atlaskit/editor-common/messages';
 import { IconCode } from '@atlaskit/editor-common/quick-insert';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { createInsertCodeBlockTransaction, insertCodeBlockWithAnalytics } from './editor-commands';
 import { codeBlockAutoFullStopTransformPlugin } from './pm-plugins/codeBlockAutoFullStopTransformPlugin';
 import { codeBlockCopySelectionPlugin, copySelectionPluginKey } from './pm-plugins/codeBlockCopySelectionPlugin';
@@ -13,10 +15,24 @@ import keymap from './pm-plugins/keymaps';
 import { createPlugin } from './pm-plugins/main';
 import refreshBrowserSelectionOnChange from './pm-plugins/refresh-browser-selection';
 import { getToolbarConfig } from './pm-plugins/toolbar';
+import { createCodeBlockMenuItem } from './ui/CodeBlockMenuItem';
 const codeBlockPlugin = ({
   config: options,
   api
 }) => {
+  if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+    var _api$blockMenu;
+    api === null || api === void 0 ? void 0 : (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.actions.registerBlockMenuComponents([{
+      type: 'block-menu-item',
+      key: FORMAT_CODE_BLOCK_MENU_ITEM.key,
+      parent: {
+        type: 'block-menu-section',
+        key: FORMAT_MENU_ITEM.key,
+        rank: FORMAT_NESTED_MENU_RANK[FORMAT_CODE_BLOCK_MENU_ITEM.key]
+      },
+      component: createCodeBlockMenuItem(api)
+    }]);
+  }
   return {
     name: 'codeBlock',
     nodes() {

package/dist/es2019/ui/CodeBlockMenuItem.js

@@ -0,0 +1,42 @@
+import React, { useMemo } from 'react';
+import { useIntl } from 'react-intl-next';
+import { blockMenuMessages } from '@atlaskit/editor-common/messages';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
+import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import AngleBracketsIcon from '@atlaskit/icon/core/angle-brackets';
+const nodeName = 'codeBlock';
+const CodeBlockMenuItem = ({
+  api
+}) => {
+  const {
+    formatMessage
+  } = useIntl();
+  const selection = useSharedPluginStateSelector(api, 'selection.selection');
+  const isCodeBlockSelected = useMemo(() => {
+    if (!selection) {
+      return false;
+    }
+    if (selection instanceof NodeSelection) {
+      // Note: we are checking for any type of panel, not just of type infopanel
+      return selection.node.type.name === nodeName;
+    }
+    return false;
+  }, [selection]);
+  const handleClick = () => {
+    var _api$blockMenu;
+    api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.commands.formatNode(nodeName));
+  };
+  return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+    onClick: handleClick,
+    isSelected: isCodeBlockSelected,
+    elemBefore: /*#__PURE__*/React.createElement(AngleBracketsIcon, {
+      label: ""
+    })
+  }, formatMessage(blockMenuMessages.codeBlock));
+};
+export const createCodeBlockMenuItem = api => {
+  return () => /*#__PURE__*/React.createElement(CodeBlockMenuItem, {
+    api: api
+  });
+};

package/dist/esm/codeBlockPlugin.js

@@ -4,9 +4,11 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React from 'react';
 import { codeBlock, codeBlockWithLocalId } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { FORMAT_MENU_ITEM, FORMAT_CODE_BLOCK_MENU_ITEM, FORMAT_NESTED_MENU_RANK } from '@atlaskit/editor-common/block-menu';
 import { blockTypeMessages } from '@atlaskit/editor-common/messages';
 import { IconCode } from '@atlaskit/editor-common/quick-insert';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { createInsertCodeBlockTransaction, insertCodeBlockWithAnalytics } from './editor-commands';
 import { codeBlockAutoFullStopTransformPlugin } from './pm-plugins/codeBlockAutoFullStopTransformPlugin';
 import { codeBlockCopySelectionPlugin, copySelectionPluginKey } from './pm-plugins/codeBlockCopySelectionPlugin';
@@ -16,9 +18,23 @@ import keymap from './pm-plugins/keymaps';
 import { createPlugin } from './pm-plugins/main';
 import refreshBrowserSelectionOnChange from './pm-plugins/refresh-browser-selection';
 import { getToolbarConfig } from './pm-plugins/toolbar';
+import { createCodeBlockMenuItem } from './ui/CodeBlockMenuItem';
 var codeBlockPlugin = function codeBlockPlugin(_ref) {
   var options = _ref.config,
     api = _ref.api;
+  if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+    var _api$blockMenu;
+    api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 || _api$blockMenu.actions.registerBlockMenuComponents([{
+      type: 'block-menu-item',
+      key: FORMAT_CODE_BLOCK_MENU_ITEM.key,
+      parent: {
+        type: 'block-menu-section',
+        key: FORMAT_MENU_ITEM.key,
+        rank: FORMAT_NESTED_MENU_RANK[FORMAT_CODE_BLOCK_MENU_ITEM.key]
+      },
+      component: createCodeBlockMenuItem(api)
+    }]);
+  }
   return {
     name: 'codeBlock',
     nodes: function nodes() {

package/dist/esm/ui/CodeBlockMenuItem.js

@@ -0,0 +1,42 @@
+import React, { useMemo } from 'react';
+import { useIntl } from 'react-intl-next';
+import { blockMenuMessages } from '@atlaskit/editor-common/messages';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
+import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import AngleBracketsIcon from '@atlaskit/icon/core/angle-brackets';
+var nodeName = 'codeBlock';
+var CodeBlockMenuItem = function CodeBlockMenuItem(_ref) {
+  var api = _ref.api;
+  var _useIntl = useIntl(),
+    formatMessage = _useIntl.formatMessage;
+  var selection = useSharedPluginStateSelector(api, 'selection.selection');
+  var isCodeBlockSelected = useMemo(function () {
+    if (!selection) {
+      return false;
+    }
+    if (selection instanceof NodeSelection) {
+      // Note: we are checking for any type of panel, not just of type infopanel
+      return selection.node.type.name === nodeName;
+    }
+    return false;
+  }, [selection]);
+  var handleClick = function handleClick() {
+    var _api$blockMenu;
+    api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.commands.formatNode(nodeName));
+  };
+  return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+    onClick: handleClick,
+    isSelected: isCodeBlockSelected,
+    elemBefore: /*#__PURE__*/React.createElement(AngleBracketsIcon, {
+      label: ""
+    })
+  }, formatMessage(blockMenuMessages.codeBlock));
+};
+export var createCodeBlockMenuItem = function createCodeBlockMenuItem(api) {
+  return function () {
+    return /*#__PURE__*/React.createElement(CodeBlockMenuItem, {
+      api: api
+    });
+  };
+};

package/dist/types/codeBlockPluginType.d.ts

@@ -1,12 +1,14 @@
 import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { Command, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { BlockMenuPlugin } from '@atlaskit/editor-plugin-block-menu';
 import type { CompositionPlugin } from '@atlaskit/editor-plugin-composition';
 import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { InteractionPlugin } from '@atlaskit/editor-plugin-interaction';
+import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { CodeBlockPluginOptions } from './types';
 type CodeBlockDependencies = [
@@ -16,7 +18,9 @@ type CodeBlockDependencies = [
     OptionalPlugin<EditorDisabledPlugin>,
     OptionalPlugin<FeatureFlagsPlugin>,
     OptionalPlugin<InteractionPlugin>,
-    OptionalPlugin<EditorViewModePlugin>
+    OptionalPlugin<EditorViewModePlugin>,
+    OptionalPlugin<BlockMenuPlugin>,
+    OptionalPlugin<SelectionPlugin>
 ];
 export type CodeBlockPlugin = NextEditorPlugin<'codeBlock', {
     actions: {

package/dist/types/ui/CodeBlockMenuItem.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { CodeBlockPlugin } from '../codeBlockPluginType';
+export declare const createCodeBlockMenuItem: (api: ExtractInjectionAPI<CodeBlockPlugin>) => () => React.JSX.Element;

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

@@ -1,12 +1,14 @@
 import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { Command, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { BlockMenuPlugin } from '@atlaskit/editor-plugin-block-menu';
 import type { CompositionPlugin } from '@atlaskit/editor-plugin-composition';
 import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { InteractionPlugin } from '@atlaskit/editor-plugin-interaction';
+import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { CodeBlockPluginOptions } from './types';
 type CodeBlockDependencies = [
@@ -16,7 +18,9 @@ type CodeBlockDependencies = [
     OptionalPlugin<EditorDisabledPlugin>,
     OptionalPlugin<FeatureFlagsPlugin>,
     OptionalPlugin<InteractionPlugin>,
-    OptionalPlugin<EditorViewModePlugin>
+    OptionalPlugin<EditorViewModePlugin>,
+    OptionalPlugin<BlockMenuPlugin>,
+    OptionalPlugin<SelectionPlugin>
 ];
 export type CodeBlockPlugin = NextEditorPlugin<'codeBlock', {
     actions: {

package/dist/types-ts4.5/ui/CodeBlockMenuItem.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { CodeBlockPlugin } from '../codeBlockPluginType';
+export declare const createCodeBlockMenuItem: (api: ExtractInjectionAPI<CodeBlockPlugin>) => () => React.JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-code-block",
-	"version": "5.0.13",
+	"version": "6.0.0",
 	"description": "Code block plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -26,27 +26,27 @@
 	},
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
-	"af:exports": {
-		".": "./src/index.ts"
-	},
 	"dependencies": {
-		"@atlaskit/adf-schema": "^50.2.1",
+		"@atlaskit/adf-schema": "^50.2.3",
 		"@atlaskit/code": "^17.2.0",
-		"@atlaskit/editor-plugin-analytics": "^3.0.0",
-		"@atlaskit/editor-plugin-composition": "^2.0.0",
-		"@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-interaction": "^5.0.0",
+		"@atlaskit/editor-plugin-analytics": "^4.0.0",
+		"@atlaskit/editor-plugin-block-menu": "^1.0.0",
+		"@atlaskit/editor-plugin-composition": "^3.0.0",
+		"@atlaskit/editor-plugin-decorations": "^4.0.0",
+		"@atlaskit/editor-plugin-editor-disabled": "^4.0.0",
+		"@atlaskit/editor-plugin-editor-viewmode": "^6.0.0",
+		"@atlaskit/editor-plugin-interaction": "^6.0.0",
+		"@atlaskit/editor-plugin-selection": "^4.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/icon": "^28.0.0",
+		"@atlaskit/editor-toolbar": "^0.6.0",
+		"@atlaskit/icon": "^28.1.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-input-rules": "^3.4.0",
-		"@atlaskit/tmp-editor-statsig": "^11.5.0",
+		"@atlaskit/tmp-editor-statsig": "^12.0.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.28.0",
+		"@atlaskit/editor-common": "^108.0.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},