@atlaskit/editor-plugin-extension 32.0.4 → 32.0.5

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-extension
 
+## 32.0.5
+
+### Patch Changes
+
+- [`b3d3cec87b96b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b3d3cec87b96b) -
+  Remove the `platform_forge_inline_bodied_macro` feature gate and keep its enabled behavior. The
+  separate inline-bodied layout switch continues to control layout support.
+- Updated dependencies
+
 ## 32.0.4
 
 ### Patch Changes

package/dist/cjs/pm-plugins/extension-api.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getEditInLegacyMacroBrowser = exports.createExtensionAPI = void 0;
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _validator = require("@atlaskit/adf-utils/validator");
 var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _autojoin = require("@atlaskit/editor-common/utils/autojoin");
@@ -15,7 +15,6 @@ var _JSONTransformer = require("@atlaskit/editor-json-transformer/JSONTransforme
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _commands = require("../editor-commands/commands");
 var _actions = require("./macro/actions");
@@ -169,9 +168,6 @@ var createExtensionAPI = exports.createExtensionAPI = function createExtensionAP
       dispatch(tr);
     },
     insertAtSelection: function insertAtSelection(adf) {
-      if (!(0, _fg.fg)('platform_forge_inline_bodied_macro')) {
-        return;
-      }
       try {
         validate(adf);
       } catch (_unused) {
@@ -231,9 +227,8 @@ var createExtensionAPI = exports.createExtensionAPI = function createExtensionAP
         state = _options$editorView3.state;
       var tr = state.tr,
         schema = state.schema;
-      var changedValues = mutationCallback(_objectSpread(_objectSpread({}, (0, _fg.fg)('platform_forge_inline_bodied_macro') ? {
-        type: node.type.name
-      } : {}), {}, {
+      var changedValues = mutationCallback({
+        type: node.type.name,
         content: (0, _nodes.nodeToJSON)(node).content,
         attrs: node.attrs,
         marks: node.marks.map(function (pmMark) {
@@ -242,7 +237,7 @@ var createExtensionAPI = exports.createExtensionAPI = function createExtensionAP
             attrs: pmMark.attrs
           };
         })
-      }));
+      });
       var ensureValidMark = function ensureValidMark(mark) {
         if ((0, _typeof2.default)(mark) !== 'object' || Array.isArray(mark)) {
           throw new Error("update(): Invalid mark given.");
@@ -269,7 +264,7 @@ var createExtensionAPI = exports.createExtensionAPI = function createExtensionAP
       }) : node.marks;
       var newContent = changedValues.hasOwnProperty('content') ? _model.Fragment.fromJSON(schema, changedValues.content) : node.content;
       var newType = node.type;
-      if (changedValues.hasOwnProperty('type') && changedValues.type !== node.type.name && (0, _fg.fg)('platform_forge_inline_bodied_macro')) {
+      if (changedValues.hasOwnProperty('type') && changedValues.type !== node.type.name) {
         newType = changedValues.type ? schema.nodes[changedValues.type] : undefined;
       }
       if (!newType) {

package/dist/es2019/pm-plugins/extension-api.js

@@ -6,7 +6,6 @@ import { JSONTransformer } from '@atlaskit/editor-json-transformer/JSONTransform
 import { Fragment, Mark } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { setTextSelection } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { setEditingContextToContextPanel } from '../editor-commands/commands';
 import { insertMacroFromMacroBrowser } from './macro/actions';
@@ -171,9 +170,6 @@ export const createExtensionAPI = options => {
       dispatch(tr);
     },
     insertAtSelection: adf => {
-      if (!fg('platform_forge_inline_bodied_macro')) {
-        return;
-      }
       try {
         validate(adf);
       } catch {
@@ -246,9 +242,7 @@ export const createExtensionAPI = options => {
         schema
       } = state;
       const changedValues = mutationCallback({
-        ...(fg('platform_forge_inline_bodied_macro') ? {
-          type: node.type.name
-        } : {}),
+        type: node.type.name,
         content: nodeToJSON(node).content,
         attrs: node.attrs,
         marks: node.marks.map(pmMark => ({
@@ -282,7 +276,7 @@ export const createExtensionAPI = options => {
       }) => mark.create(attrs)) : node.marks;
       const newContent = changedValues.hasOwnProperty('content') ? Fragment.fromJSON(schema, changedValues.content) : node.content;
       let newType = node.type;
-      if (changedValues.hasOwnProperty('type') && changedValues.type !== node.type.name && fg('platform_forge_inline_bodied_macro')) {
+      if (changedValues.hasOwnProperty('type') && changedValues.type !== node.type.name) {
         newType = changedValues.type ? schema.nodes[changedValues.type] : undefined;
       }
       if (!newType) {

package/dist/esm/pm-plugins/extension-api.js

@@ -1,5 +1,5 @@
-import _typeof from "@babel/runtime/helpers/typeof";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _typeof from "@babel/runtime/helpers/typeof";
 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 { validator } from '@atlaskit/adf-utils/validator';
@@ -10,7 +10,6 @@ import { JSONTransformer } from '@atlaskit/editor-json-transformer/JSONTransform
 import { Fragment, Mark } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { setTextSelection } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { setEditingContextToContextPanel } from '../editor-commands/commands';
 import { insertMacroFromMacroBrowser } from './macro/actions';
@@ -162,9 +161,6 @@ export var createExtensionAPI = function createExtensionAPI(options) {
       dispatch(tr);
     },
     insertAtSelection: function insertAtSelection(adf) {
-      if (!fg('platform_forge_inline_bodied_macro')) {
-        return;
-      }
       try {
         validate(adf);
       } catch (_unused) {
@@ -224,9 +220,8 @@ export var createExtensionAPI = function createExtensionAPI(options) {
         state = _options$editorView3.state;
       var tr = state.tr,
         schema = state.schema;
-      var changedValues = mutationCallback(_objectSpread(_objectSpread({}, fg('platform_forge_inline_bodied_macro') ? {
-        type: node.type.name
-      } : {}), {}, {
+      var changedValues = mutationCallback({
+        type: node.type.name,
         content: nodeToJSON(node).content,
         attrs: node.attrs,
         marks: node.marks.map(function (pmMark) {
@@ -235,7 +230,7 @@ export var createExtensionAPI = function createExtensionAPI(options) {
             attrs: pmMark.attrs
           };
         })
-      }));
+      });
       var ensureValidMark = function ensureValidMark(mark) {
         if (_typeof(mark) !== 'object' || Array.isArray(mark)) {
           throw new Error("update(): Invalid mark given.");
@@ -262,7 +257,7 @@ export var createExtensionAPI = function createExtensionAPI(options) {
       }) : node.marks;
       var newContent = changedValues.hasOwnProperty('content') ? Fragment.fromJSON(schema, changedValues.content) : node.content;
       var newType = node.type;
-      if (changedValues.hasOwnProperty('type') && changedValues.type !== node.type.name && fg('platform_forge_inline_bodied_macro')) {
+      if (changedValues.hasOwnProperty('type') && changedValues.type !== node.type.name) {
         newType = changedValues.type ? schema.nodes[changedValues.type] : undefined;
       }
       if (!newType) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-extension",
-	"version": "32.0.4",
+	"version": "32.0.5",
 	"description": "editor-plugin-extension plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -51,7 +51,7 @@
 		"@atlaskit/editor-shared-styles": "^4.6.0",
 		"@atlaskit/editor-tables": "^3.2.0",
 		"@atlaskit/empty-state": "^12.2.0",
-		"@atlaskit/form": "^18.2.0",
+		"@atlaskit/form": "^18.3.0",
 		"@atlaskit/heading": "^8.0.0",
 		"@atlaskit/icon": "^38.0.0",
 		"@atlaskit/link": "^5.1.0",
@@ -64,14 +64,14 @@
 		"@atlaskit/react-select": "^4.12.0",
 		"@atlaskit/section-message": "^10.2.0",
 		"@atlaskit/select": "^23.1.0",
-		"@atlaskit/smart-user-picker": "^12.5.0",
+		"@atlaskit/smart-user-picker": "^12.7.0",
 		"@atlaskit/spinner": "^20.4.0",
 		"@atlaskit/tabs": "^21.3.0",
 		"@atlaskit/textarea": "^10.2.0",
 		"@atlaskit/textfield": "^10.2.0",
-		"@atlaskit/tmp-editor-statsig": "^246.0.0",
+		"@atlaskit/tmp-editor-statsig": "^246.1.0",
 		"@atlaskit/toggle": "^17.3.0",
-		"@atlaskit/tokens": "^20.7.0",
+		"@atlaskit/tokens": "^20.8.0",
 		"@atlaskit/tooltip": "^24.4.0",
 		"@atlaskit/user-picker": "^14.3.0",
 		"@babel/runtime": "^7.0.0",
@@ -85,7 +85,7 @@
 		"uuid": "^11.1.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^133.6.0",
+		"@atlaskit/editor-common": "^133.7.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},
@@ -100,9 +100,6 @@
 		"cc_maui_annotations_on_extensions": {
 			"type": "boolean"
 		},
-		"platform_forge_inline_bodied_macro": {
-			"type": "boolean"
-		},
 		"platform_editor_ai_object_sidebar_injection": {
 			"type": "boolean"
 		},