@atlaskit/editor-plugin-code-block 4.2.8 → 4.4.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @atlaskit/editor-plugin-code-block
 
+## 4.4.0
+
+### Minor Changes
+
+- [#141575](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/141575)
+  [`4639ea2b9bab0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4639ea2b9bab0) -
+  Adds support for overriding language names in the code block language list.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 4.3.0
+
+### Minor Changes
+
+- [#139139](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/139139)
+  [`7f6b665d778dd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7f6b665d778dd) -
+  [https://product-fabric.atlassian.net/browse/ED-27499](ED-27499) - the new
+  `@atlassian/confluence-presets` package with Confluence `full-page` preset is created
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 4.2.8
 
 ### Patch Changes

package/dist/cjs/codeBlockPlugin.js

@@ -126,7 +126,7 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
           }
         }];
       },
-      floatingToolbar: (0, _toolbar.getToolbarConfig)(options === null || options === void 0 ? void 0 : options.allowCopyToClipboard, api)
+      floatingToolbar: (0, _toolbar.getToolbarConfig)(options === null || options === void 0 ? void 0 : options.allowCopyToClipboard, api, options === null || options === void 0 ? void 0 : options.overrideLanguageName)
     }
   };
 };

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.languageListFilter = exports.getToolbarConfig = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _codeBlock = require("@atlaskit/editor-common/code-block");
 var _messages = _interopRequireWildcard(require("@atlaskit/editor-common/messages"));
 var _utils = require("@atlaskit/editor-prosemirror/utils");
@@ -21,10 +22,12 @@ var _languageList = require("./language-list");
 var _pluginKey = require("./plugin-key");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-var languageList = (0, _languageList.createLanguageList)(_languageList.DEFAULT_LANGUAGES);
+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 getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig() {
   var allowCopyToClipboard = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
   var api = arguments.length > 1 ? arguments[1] : undefined;
+  var overrideLanguageName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : undefined;
   return function (state, _ref) {
     var _api$decorations$acti, _api$decorations, _api$analytics, _codeBlockState$pos, _node$attrs;
     var formatMessage = _ref.formatMessage;
@@ -43,6 +46,11 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig() {
     }
     var isWrapped = (0, _codeBlock.isCodeBlockWordWrapEnabled)(node);
     var language = node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.language;
+    var languageList = (0, _languageList.createLanguageList)(overrideLanguageName ? _languageList.DEFAULT_LANGUAGES.map(function (language) {
+      return _objectSpread(_objectSpread({}, language), {}, {
+        name: overrideLanguageName(language.name)
+      });
+    }) : _languageList.DEFAULT_LANGUAGES);
     var options = languageList.map(function (lang) {
       return {
         label: lang.name,

package/dist/es2019/codeBlockPlugin.js

@@ -108,7 +108,7 @@ const codeBlockPlugin = ({
           return tr;
         }
       }],
-      floatingToolbar: getToolbarConfig(options === null || options === void 0 ? void 0 : options.allowCopyToClipboard, api)
+      floatingToolbar: getToolbarConfig(options === null || options === void 0 ? void 0 : options.allowCopyToClipboard, api, options === null || options === void 0 ? void 0 : options.overrideLanguageName)
     }
   };
 };

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

@@ -11,8 +11,7 @@ import { WrapIcon } from '../ui/icons/WrapIcon';
 import { provideVisualFeedbackForCopyButton, removeVisualFeedbackForCopyButton } from './codeBlockCopySelectionPlugin';
 import { createLanguageList, DEFAULT_LANGUAGES, getLanguageIdentifier } from './language-list';
 import { pluginKey } from './plugin-key';
-const languageList = createLanguageList(DEFAULT_LANGUAGES);
-export const getToolbarConfig = (allowCopyToClipboard = false, api) => (state, {
+export const getToolbarConfig = (allowCopyToClipboard = false, api, overrideLanguageName = undefined) => (state, {
   formatMessage
 }) => {
   var _api$decorations$acti, _api$decorations, _api$analytics, _codeBlockState$pos, _node$attrs;
@@ -32,6 +31,10 @@ export const getToolbarConfig = (allowCopyToClipboard = false, api) => (state, {
   }
   const isWrapped = isCodeBlockWordWrapEnabled(node);
   const language = node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.language;
+  const languageList = createLanguageList(overrideLanguageName ? DEFAULT_LANGUAGES.map(language => ({
+    ...language,
+    name: overrideLanguageName(language.name)
+  })) : DEFAULT_LANGUAGES);
   const options = languageList.map(lang => ({
     label: lang.name,
     value: getLanguageIdentifier(lang),

package/dist/esm/codeBlockPlugin.js

@@ -119,7 +119,7 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
           }
         }];
       },
-      floatingToolbar: getToolbarConfig(options === null || options === void 0 ? void 0 : options.allowCopyToClipboard, api)
+      floatingToolbar: getToolbarConfig(options === null || options === void 0 ? void 0 : options.allowCopyToClipboard, api, options === null || options === void 0 ? void 0 : options.overrideLanguageName)
     }
   };
 };

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

@@ -1,3 +1,6 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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) { _defineProperty(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; }
 import { isCodeBlockWordWrapEnabled } from '@atlaskit/editor-common/code-block';
 import commonMessages, { codeBlockButtonMessages } from '@atlaskit/editor-common/messages';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
@@ -11,10 +14,10 @@ import { WrapIcon } from '../ui/icons/WrapIcon';
 import { provideVisualFeedbackForCopyButton, removeVisualFeedbackForCopyButton } from './codeBlockCopySelectionPlugin';
 import { createLanguageList, DEFAULT_LANGUAGES, getLanguageIdentifier } from './language-list';
 import { pluginKey } from './plugin-key';
-var languageList = createLanguageList(DEFAULT_LANGUAGES);
 export var getToolbarConfig = function getToolbarConfig() {
   var allowCopyToClipboard = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
   var api = arguments.length > 1 ? arguments[1] : undefined;
+  var overrideLanguageName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : undefined;
   return function (state, _ref) {
     var _api$decorations$acti, _api$decorations, _api$analytics, _codeBlockState$pos, _node$attrs;
     var formatMessage = _ref.formatMessage;
@@ -33,6 +36,11 @@ export var getToolbarConfig = function getToolbarConfig() {
     }
     var isWrapped = isCodeBlockWordWrapEnabled(node);
     var language = node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.language;
+    var languageList = createLanguageList(overrideLanguageName ? DEFAULT_LANGUAGES.map(function (language) {
+      return _objectSpread(_objectSpread({}, language), {}, {
+        name: overrideLanguageName(language.name)
+      });
+    }) : DEFAULT_LANGUAGES);
     var options = languageList.map(function (lang) {
       return {
         label: lang.name,

package/dist/types/index.d.ts

@@ -1,3 +1,3 @@
 export { default as codeBlockPlugin } from './codeBlockPlugin';
 export type { CodeBlockPlugin } from './codeBlockPluginType';
-export type { CodeBlockOptions } from './types';
+export type { CodeBlockOptions, CodeBlockPluginOptions } from './types';

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

@@ -10,7 +10,7 @@ export declare const createPlugin: ({ useLongPressSelection, getIntl, allowCompo
     getIntl: () => IntlShape;
     allowCompositionInputOverride?: boolean | undefined;
     api?: import("@atlaskit/editor-common/types").EditorInjectionAPI<"codeBlock", {
-        pluginConfiguration: import("../types").CodeBlockOptions | undefined;
+        pluginConfiguration: import("../types").CodeBlockPluginOptions | undefined;
         dependencies: [import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"decorations", {
             sharedState: import("@atlaskit/editor-plugin-decorations").DecorationState;
             actions: {

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

@@ -1,6 +1,7 @@
 import type { ExtractInjectionAPI, FloatingToolbarHandler, SelectOption } from '@atlaskit/editor-common/types';
 import type { CodeBlockPlugin } from '../index';
-export declare const getToolbarConfig: (allowCopyToClipboard: boolean | undefined, api: ExtractInjectionAPI<CodeBlockPlugin> | undefined) => FloatingToolbarHandler;
+import { Language } from './language-list';
+export declare const getToolbarConfig: (allowCopyToClipboard: boolean | undefined, api: ExtractInjectionAPI<CodeBlockPlugin> | undefined, overrideLanguageName?: ((name: Language['name']) => string) | undefined) => FloatingToolbarHandler;
 /**
  * Filters language list based on both name and alias properties.
  */

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

@@ -1,8 +1,15 @@
 import type { LongPressSelectionPluginOptions } from '@atlaskit/editor-common/types';
-export interface CodeBlockOptions extends LongPressSelectionPluginOptions {
+export interface CodeBlockPluginOptions extends LongPressSelectionPluginOptions {
     allowCopyToClipboard?: boolean;
     allowCompositionInputOverride?: boolean;
+    overrideLanguageName?: (name: string) => string;
 }
+/**
+ * @private
+ * @deprecated Use {@link CodeBlockPluginOptions} instead.
+ * @see https://product-fabric.atlassian.net/browse/ED-27496
+ */
+export type CodeBlockOptions = CodeBlockPluginOptions;
 export type CodeBlockLineAttributes = {
     lineStart: number;
     lineNumber: number;

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

@@ -1,3 +1,3 @@
 export { default as codeBlockPlugin } from './codeBlockPlugin';
 export type { CodeBlockPlugin } from './codeBlockPluginType';
-export type { CodeBlockOptions } from './types';
+export type { CodeBlockOptions, CodeBlockPluginOptions } from './types';

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

@@ -10,7 +10,7 @@ export declare const createPlugin: ({ useLongPressSelection, getIntl, allowCompo
     getIntl: () => IntlShape;
     allowCompositionInputOverride?: boolean | undefined;
     api?: import("@atlaskit/editor-common/types").EditorInjectionAPI<"codeBlock", {
-        pluginConfiguration: import("../types").CodeBlockOptions | undefined;
+        pluginConfiguration: import("../types").CodeBlockPluginOptions | undefined;
         dependencies: [
             import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"decorations", {
                 sharedState: import("@atlaskit/editor-plugin-decorations").DecorationState;

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

@@ -1,6 +1,7 @@
 import type { ExtractInjectionAPI, FloatingToolbarHandler, SelectOption } from '@atlaskit/editor-common/types';
 import type { CodeBlockPlugin } from '../index';
-export declare const getToolbarConfig: (allowCopyToClipboard: boolean | undefined, api: ExtractInjectionAPI<CodeBlockPlugin> | undefined) => FloatingToolbarHandler;
+import { Language } from './language-list';
+export declare const getToolbarConfig: (allowCopyToClipboard: boolean | undefined, api: ExtractInjectionAPI<CodeBlockPlugin> | undefined, overrideLanguageName?: ((name: Language['name']) => string) | undefined) => FloatingToolbarHandler;
 /**
  * Filters language list based on both name and alias properties.
  */

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

@@ -1,8 +1,15 @@
 import type { LongPressSelectionPluginOptions } from '@atlaskit/editor-common/types';
-export interface CodeBlockOptions extends LongPressSelectionPluginOptions {
+export interface CodeBlockPluginOptions extends LongPressSelectionPluginOptions {
     allowCopyToClipboard?: boolean;
     allowCompositionInputOverride?: boolean;
+    overrideLanguageName?: (name: string) => string;
 }
+/**
+ * @private
+ * @deprecated Use {@link CodeBlockPluginOptions} instead.
+ * @see https://product-fabric.atlassian.net/browse/ED-27496
+ */
+export type CodeBlockOptions = CodeBlockPluginOptions;
 export type CodeBlockLineAttributes = {
     lineStart: number;
     lineNumber: number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-code-block",
-	"version": "4.2.8",
+	"version": "4.4.0",
 	"description": "Code block plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,16 +33,16 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
 		"@atlaskit/code": "^17.0.0",
-		"@atlaskit/editor-common": "^103.0.0",
+		"@atlaskit/editor-common": "^103.6.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-composition": "^1.3.0",
 		"@atlaskit/editor-plugin-decorations": "^2.0.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/icon": "^25.5.0",
+		"@atlaskit/icon": "^25.6.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-input-rules": "^3.3.0",
-		"@atlaskit/tmp-editor-statsig": "^4.6.0",
+		"@atlaskit/tmp-editor-statsig": "^4.8.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {