@atlaskit/editor-plugin-code-block 5.0.9 → 5.0.10

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-code-block
 
+## 5.0.10
+
+### Patch Changes
+
+- [`25ec3e3638f52`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/25ec3e3638f52) -
+  Cleanup advanced code block experiment
+- Updated dependencies
+
 ## 5.0.9
 
 ### Patch Changes

package/dist/cjs/codeBlockPlugin.js

@@ -11,6 +11,7 @@ var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("@atlaskit/editor-common/messages");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _editorCommands = require("./editor-commands");
 var _codeBlockAutoFullStopTransformPlugin = require("./pm-plugins/codeBlockAutoFullStopTransformPlugin");
 var _codeBlockCopySelectionPlugin = require("./pm-plugins/codeBlockCopySelectionPlugin");
@@ -30,7 +31,7 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
     nodes: function nodes() {
       return [{
         name: 'codeBlock',
-        node: _adfSchema.codeBlock
+        node: (0, _platformFeatureFlags.fg)('platform_editor_adf_with_localid') ? _adfSchema.codeBlockWithLocalId : _adfSchema.codeBlock
       }];
     },
     getSharedState: function getSharedState(state) {

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

@@ -9,7 +9,6 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _codeBlock = require("@atlaskit/editor-common/code-block");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _classNames = require("../ui/class-names");
 var _utils = require("./utils");
 /* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
@@ -170,7 +169,7 @@ var updateDecorationSetWithWordWrappedDecorator = exports.updateDecorationSetWit
     // likely changed the breakout width with the toggle ON - we add an empty decoration to force
     // prosemirror to recognise the change so we can update in our node view. This gets filtered
     // out on the next toggle.
-    if (currentWrappedBlockDecorationSet.length === 0 && (0, _experiments.editorExperiment)('platform_editor_advanced_code_blocks', true)) {
+    if (currentWrappedBlockDecorationSet.length === 0 && pos + innerNode.nodeSize <= tr.doc.content.size) {
       var wrappedBlock = _view.Decoration.node(pos, pos + innerNode.nodeSize, {}, {
         type: DECORATION_WRAPPED_BLOCK_NODE_TYPE
       } // Allows for quick filtering of decorations while using `find`

package/dist/es2019/codeBlockPlugin.js

@@ -1,8 +1,9 @@
 import React from 'react';
-import { codeBlock } from '@atlaskit/adf-schema';
+import { codeBlock, codeBlockWithLocalId } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { blockTypeMessages } from '@atlaskit/editor-common/messages';
 import { IconCode } from '@atlaskit/editor-common/quick-insert';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { createInsertCodeBlockTransaction, insertCodeBlockWithAnalytics } from './editor-commands';
 import { codeBlockAutoFullStopTransformPlugin } from './pm-plugins/codeBlockAutoFullStopTransformPlugin';
 import { codeBlockCopySelectionPlugin, copySelectionPluginKey } from './pm-plugins/codeBlockCopySelectionPlugin';
@@ -21,7 +22,7 @@ const codeBlockPlugin = ({
     nodes() {
       return [{
         name: 'codeBlock',
-        node: codeBlock
+        node: fg('platform_editor_adf_with_localid') ? codeBlockWithLocalId : codeBlock
       }];
     },
     getSharedState(state) {

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

@@ -3,7 +3,6 @@
 import { isCodeBlockWordWrapEnabled } from '@atlaskit/editor-common/code-block';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { codeBlockClassNames } from '../ui/class-names';
 import { getAllCodeBlockNodesInDoc } from './utils';
 export const DECORATION_WIDGET_TYPE = 'decorationWidgetType';
@@ -162,7 +161,7 @@ export const updateDecorationSetWithWordWrappedDecorator = (decorationSet, tr, n
     // likely changed the breakout width with the toggle ON - we add an empty decoration to force
     // prosemirror to recognise the change so we can update in our node view. This gets filtered
     // out on the next toggle.
-    if (currentWrappedBlockDecorationSet.length === 0 && editorExperiment('platform_editor_advanced_code_blocks', true)) {
+    if (currentWrappedBlockDecorationSet.length === 0 && pos + innerNode.nodeSize <= tr.doc.content.size) {
       const wrappedBlock = Decoration.node(pos, pos + innerNode.nodeSize, {}, {
         type: DECORATION_WRAPPED_BLOCK_NODE_TYPE
       } // Allows for quick filtering of decorations while using `find`

package/dist/esm/codeBlockPlugin.js

@@ -2,10 +2,11 @@ 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 React from 'react';
-import { codeBlock } from '@atlaskit/adf-schema';
+import { codeBlock, codeBlockWithLocalId } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { blockTypeMessages } from '@atlaskit/editor-common/messages';
 import { IconCode } from '@atlaskit/editor-common/quick-insert';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { createInsertCodeBlockTransaction, insertCodeBlockWithAnalytics } from './editor-commands';
 import { codeBlockAutoFullStopTransformPlugin } from './pm-plugins/codeBlockAutoFullStopTransformPlugin';
 import { codeBlockCopySelectionPlugin, copySelectionPluginKey } from './pm-plugins/codeBlockCopySelectionPlugin';
@@ -23,7 +24,7 @@ var codeBlockPlugin = function codeBlockPlugin(_ref) {
     nodes: function nodes() {
       return [{
         name: 'codeBlock',
-        node: codeBlock
+        node: fg('platform_editor_adf_with_localid') ? codeBlockWithLocalId : codeBlock
       }];
     },
     getSharedState: function getSharedState(state) {

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

@@ -4,7 +4,6 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { isCodeBlockWordWrapEnabled } from '@atlaskit/editor-common/code-block';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { codeBlockClassNames } from '../ui/class-names';
 import { getAllCodeBlockNodesInDoc } from './utils';
 export var DECORATION_WIDGET_TYPE = 'decorationWidgetType';
@@ -163,7 +162,7 @@ export var updateDecorationSetWithWordWrappedDecorator = function updateDecorati
     // likely changed the breakout width with the toggle ON - we add an empty decoration to force
     // prosemirror to recognise the change so we can update in our node view. This gets filtered
     // out on the next toggle.
-    if (currentWrappedBlockDecorationSet.length === 0 && editorExperiment('platform_editor_advanced_code_blocks', true)) {
+    if (currentWrappedBlockDecorationSet.length === 0 && pos + innerNode.nodeSize <= tr.doc.content.size) {
       var wrappedBlock = Decoration.node(pos, pos + innerNode.nodeSize, {}, {
         type: DECORATION_WRAPPED_BLOCK_NODE_TYPE
       } // Allows for quick filtering of decorations while using `find`

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-code-block",
-	"version": "5.0.9",
+	"version": "5.0.10",
 	"description": "Code block plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -42,7 +42,7 @@
 		"@atlaskit/icon": "^27.12.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-input-rules": "^3.4.0",
-		"@atlaskit/tmp-editor-statsig": "^10.0.0",
+		"@atlaskit/tmp-editor-statsig": "^11.0.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
@@ -100,6 +100,9 @@
 		},
 		"editor_a11y_remove_unwrap_button": {
 			"type": "boolean"
+		},
+		"platform_editor_adf_with_localid": {
+			"type": "boolean"
 		}
 	}
 }