@atlaskit/editor-plugin-extension 5.3.0 → 5.3.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-extension
 
+## 5.3.1
+
+### Patch Changes
+
+- [#147400](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/147400)
+  [`800ff50276ed7`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/800ff50276ed7) -
+  Clean up experiment platform_editor_nested_non_bodied_macros
+- Updated dependencies
+
 ## 5.3.0
 
 ### Minor Changes

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

@@ -37,9 +37,6 @@ var isNestedNBM = function isNestedNBM(state, selectedExtNode) {
     blockquote = _state$schema$nodes.blockquote,
     listItem = _state$schema$nodes.listItem,
     selection = state.selection;
-  if (!(0, _experiments.editorExperiment)('platform_editor_nested_non_bodied_macros', 'test')) {
-    return false;
-  }
   if (!selectedExtNode) {
     return false;
   }

package/dist/cjs/pm-plugins/unique-id.js

@@ -7,9 +7,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.createPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _adfSchema = require("@atlaskit/adf-schema");
+var _steps = require("@atlaskit/adf-schema/steps");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 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 pluginKey = new _state.PluginKey('extensionUniqueIdPlugin');
@@ -31,7 +33,14 @@ var createPlugin = exports.createPlugin = function createPlugin() {
           return;
         }
         var isAddingExtension = transaction.steps.some(function (step) {
-          return (0, _utils.stepAddsOneOf)(step, extensionTypes);
+          var _step$attrs;
+          return (0, _utils.stepAddsOneOf)(step, extensionTypes) ||
+          // There are instances where the localId will be reset to null on publish due to extension
+          // not existing in the Storage format (eg. Legacy Content Extensions) or not having a localId
+          // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+          (0, _platformFeatureFlags.fg)('platform_editor_update_extension_local_id_on_reset') && step instanceof _steps.SetAttrsStep &&
+          // @ts-expect-error Bad ProseMirror step types
+          ((_step$attrs = step.attrs) === null || _step$attrs === void 0 ? void 0 : _step$attrs.localId) === null;
         });
         if (isAddingExtension) {
           // Can't simply look at changed nodes, as we could be adding an extension

package/dist/cjs/ui/ConfigPanel/NestedForms/RemovableField.js

@@ -54,7 +54,7 @@ var RemovableField = function RemovableField(_ref) {
     ,
     className: className
   }, children, canRemoveField &&
-  // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
+  // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions, @atlassian/a11y/interactive-element-not-keyboard-focusable
   (0, _react2.jsx)("div", {
     css: removeButtonWrapperStyles,
     "data-testid": "remove-field-".concat(name),

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

@@ -32,9 +32,6 @@ const isNestedNBM = (state, selectedExtNode) => {
     },
     selection
   } = state;
-  if (!editorExperiment('platform_editor_nested_non_bodied_macros', 'test')) {
-    return false;
-  }
   if (!selectedExtNode) {
     return false;
   }

package/dist/es2019/pm-plugins/unique-id.js

@@ -1,7 +1,9 @@
 import { uuid } from '@atlaskit/adf-schema';
+import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { stepAddsOneOf } from '@atlaskit/editor-common/utils';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 const pluginKey = new PluginKey('extensionUniqueIdPlugin');
 const createPlugin = () => new SafePlugin({
   appendTransaction: (transactions, _oldState, newState) => {
@@ -20,7 +22,16 @@ const createPlugin = () => new SafePlugin({
       if (!transaction.docChanged) {
         return;
       }
-      const isAddingExtension = transaction.steps.some(step => stepAddsOneOf(step, extensionTypes));
+      const isAddingExtension = transaction.steps.some(step => {
+        var _step$attrs;
+        return stepAddsOneOf(step, extensionTypes) ||
+        // There are instances where the localId will be reset to null on publish due to extension
+        // not existing in the Storage format (eg. Legacy Content Extensions) or not having a localId
+        // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+        fg('platform_editor_update_extension_local_id_on_reset') && step instanceof SetAttrsStep &&
+        // @ts-expect-error Bad ProseMirror step types
+        ((_step$attrs = step.attrs) === null || _step$attrs === void 0 ? void 0 : _step$attrs.localId) === null;
+      });
       if (isAddingExtension) {
         // Can't simply look at changed nodes, as we could be adding an extension
         newState.doc.descendants((node, pos) => {

package/dist/es2019/ui/ConfigPanel/NestedForms/RemovableField.js

@@ -45,7 +45,7 @@ const RemovableField = ({
     ,
     className: className
   }, children, canRemoveField &&
-  // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
+  // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions, @atlassian/a11y/interactive-element-not-keyboard-focusable
   jsx("div", {
     css: removeButtonWrapperStyles,
     "data-testid": `remove-field-${name}`,

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

@@ -31,9 +31,6 @@ var isNestedNBM = function isNestedNBM(state, selectedExtNode) {
     blockquote = _state$schema$nodes.blockquote,
     listItem = _state$schema$nodes.listItem,
     selection = state.selection;
-  if (!editorExperiment('platform_editor_nested_non_bodied_macros', 'test')) {
-    return false;
-  }
   if (!selectedExtNode) {
     return false;
   }

package/dist/esm/pm-plugins/unique-id.js

@@ -2,9 +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 { uuid } from '@atlaskit/adf-schema';
+import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { stepAddsOneOf } from '@atlaskit/editor-common/utils';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 var pluginKey = new PluginKey('extensionUniqueIdPlugin');
 var createPlugin = function createPlugin() {
   return new SafePlugin({
@@ -24,7 +26,14 @@ var createPlugin = function createPlugin() {
           return;
         }
         var isAddingExtension = transaction.steps.some(function (step) {
-          return stepAddsOneOf(step, extensionTypes);
+          var _step$attrs;
+          return stepAddsOneOf(step, extensionTypes) ||
+          // There are instances where the localId will be reset to null on publish due to extension
+          // not existing in the Storage format (eg. Legacy Content Extensions) or not having a localId
+          // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+          fg('platform_editor_update_extension_local_id_on_reset') && step instanceof SetAttrsStep &&
+          // @ts-expect-error Bad ProseMirror step types
+          ((_step$attrs = step.attrs) === null || _step$attrs === void 0 ? void 0 : _step$attrs.localId) === null;
         });
         if (isAddingExtension) {
           // Can't simply look at changed nodes, as we could be adding an extension

package/dist/esm/ui/ConfigPanel/NestedForms/RemovableField.js

@@ -46,7 +46,7 @@ var RemovableField = function RemovableField(_ref) {
     ,
     className: className
   }, children, canRemoveField &&
-  // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
+  // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions, @atlassian/a11y/interactive-element-not-keyboard-focusable
   jsx("div", {
     css: removeButtonWrapperStyles,
     "data-testid": "remove-field-".concat(name),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-extension",
-	"version": "5.3.0",
+	"version": "5.3.1",
 	"description": "editor-plugin-extension plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,7 +32,7 @@
 		"@atlaskit/button": "^23.0.0",
 		"@atlaskit/checkbox": "^17.1.0",
 		"@atlaskit/datetime-picker": "^17.0.0",
-		"@atlaskit/editor-common": "^103.16.0",
+		"@atlaskit/editor-common": "^103.19.0",
 		"@atlaskit/editor-json-transformer": "^8.24.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
@@ -59,7 +59,7 @@
 		"@atlaskit/textarea": "^8.0.0",
 		"@atlaskit/textfield": "^8.0.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.14.0",
+		"@atlaskit/tmp-editor-statsig": "^4.15.0",
 		"@atlaskit/toggle": "^15.0.0",
 		"@atlaskit/tokens": "^4.8.0",
 		"@atlaskit/tooltip": "^20.0.0",
@@ -122,6 +122,9 @@
 		"platform_editor_extension_deprecation_status": {
 			"type": "boolean"
 		},
+		"platform_editor_update_extension_local_id_on_reset": {
+			"type": "boolean"
+		},
 		"platform_editor_controls_patch_2": {
 			"type": "boolean"
 		}