@atlaskit/editor-core 189.1.7 → 189.1.11

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-core
 
+## 189.1.11
+
+### Patch Changes
+
+- [#42477](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42477) [`8f5175dc714`](https://bitbucket.org/atlassian/atlassian-frontend/commits/8f5175dc714) - Decouple layout plugin from editor-core
+
+## 189.1.10
+
+### Patch Changes
+
+- [#42152](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42152) [`0097171c562`](https://bitbucket.org/atlassian/atlassian-frontend/commits/0097171c562) - ED-19766-collab: Adding collab support for paste options toolbar for confluence
+
 ## 189.1.7
 
 ### Patch Changes

package/dist/cjs/plugins/index.js

@@ -128,7 +128,7 @@ Object.defineProperty(exports, "jiraIssuePlugin", {
 Object.defineProperty(exports, "layoutPlugin", {
   enumerable: true,
   get: function get() {
-    return _layout.default;
+    return _layout.layoutPlugin;
   }
 });
 Object.defineProperty(exports, "macroPlugin", {
@@ -203,7 +203,7 @@ var _collabEdit = _interopRequireDefault(require("./collab-edit"));
 var _extension = _interopRequireDefault(require("./extension"));
 var _insertBlock = _interopRequireDefault(require("./insert-block"));
 var _jiraIssue = _interopRequireDefault(require("./jira-issue"));
-var _layout = _interopRequireDefault(require("./layout"));
+var _layout = require("./layout");
 var _toolbarListsIndentation = _interopRequireDefault(require("./toolbar-lists-indentation"));
 var _macro = _interopRequireDefault(require("./macro"));
 var _maxContentSize = _interopRequireDefault(require("./max-content-size"));

package/dist/cjs/plugins/insert-block/index.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
-var _layout = require("../layout");
 var _macro = require("../macro");
 var _WithPluginState = _interopRequireDefault(require("../../ui/WithPluginState"));
 var _ToolbarInsertBlock = _interopRequireDefault(require("./ui/ToolbarInsertBlock"));
@@ -76,14 +75,12 @@ var insertBlockPlugin = function insertBlockPlugin(_ref) {
         return /*#__PURE__*/_react.default.createElement(_WithPluginState.default, {
           plugins: {
             macroState: _pluginKey2.pluginKey,
-            placeholderTextState: _pluginKey.pluginKey,
-            layoutState: _layout.pluginKey
+            placeholderTextState: _pluginKey.pluginKey
           },
           render: function render(_ref3) {
             var _ref3$macroState = _ref3.macroState,
               macroState = _ref3$macroState === void 0 ? {} : _ref3$macroState,
-              placeholderTextState = _ref3.placeholderTextState,
-              layoutState = _ref3.layoutState;
+              placeholderTextState = _ref3.placeholderTextState;
             return /*#__PURE__*/_react.default.createElement(ToolbarInsertBlockWithInjectionApi, {
               pluginInjectionApi: api,
               editorView: editorView,
@@ -100,7 +97,6 @@ var insertBlockPlugin = function insertBlockPlugin(_ref) {
               featureFlags: featureFlags,
               macroState: macroState,
               placeholderTextState: placeholderTextState,
-              layoutState: layoutState,
               providers: providers,
               options: options
             });
@@ -132,7 +128,6 @@ function ToolbarInsertBlockWithInjectionApi(_ref4) {
     options = _ref4.options,
     macroState = _ref4.macroState,
     placeholderTextState = _ref4.placeholderTextState,
-    layoutState = _ref4.layoutState,
     featureFlags = _ref4.featureFlags;
   var buttons = toolbarSizeToButtons(toolbarSize);
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['hyperlink', 'date', 'imageUpload', 'mention', 'emoji', 'blockType', 'media', 'typeAhead']),
@@ -158,7 +153,7 @@ function ToolbarInsertBlockWithInjectionApi(_ref4) {
     decisionSupported: !!editorView.state.schema.nodes.decisionItem,
     dateEnabled: !!dateState,
     placeholderTextEnabled: placeholderTextState && placeholderTextState.allowInserting,
-    layoutSectionEnabled: !!layoutState,
+    layoutSectionEnabled: Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.layout),
     expandEnabled: !!options.allowExpand,
     mediaUploadsEnabled: (_ref5 = mediaState && mediaState.allowsUploads) !== null && _ref5 !== void 0 ? _ref5 : undefined,
     onShowMediaPicker: (_ref6 = mediaState && mediaState.showMediaPicker) !== null && _ref6 !== void 0 ? _ref6 : undefined,

package/dist/cjs/plugins/layout/actions.js

@@ -11,7 +11,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _slice = require("../../utils/slice");
 var _utils2 = require("@atlaskit/editor-common/utils");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
@@ -43,7 +42,7 @@ var getWidthsForPreset = function getWidthsForPreset(presetLayout) {
  * inside the layoutSection node
  */
 var getPresetLayout = exports.getPresetLayout = function getPresetLayout(section) {
-  var widths = (0, _slice.mapChildren)(section, function (column) {
+  var widths = (0, _utils2.mapChildren)(section, function (column) {
     return column.attrs.width;
   }).join(',');
   switch (widths) {
@@ -180,7 +179,7 @@ function columnWidth(node, schema, widths) {
   var truncatedWidths = widths.map(function (w) {
     return Number(w.toFixed(2));
   });
-  return (0, _slice.flatmap)(node.content, function (column, idx) {
+  return (0, _utils2.flatmap)(node.content, function (column, idx) {
     if (column.type === layoutColumn) {
       return layoutColumn.create(_objectSpread(_objectSpread({}, column.attrs), {}, {
         width: truncatedWidths[idx]

package/dist/cjs/plugins/layout/index.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.layoutPlugin = void 0;
 Object.defineProperty(exports, "pluginKey", {
   enumerable: true,
   get: function get() {
@@ -18,9 +18,9 @@ var _toolbar = require("./toolbar");
 var _actions = require("./actions");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _messages = require("../insert-block/ui/ToolbarInsertBlock/messages");
+var _messages = require("@atlaskit/editor-common/messages");
 var _pluginKey = require("./pm-plugins/plugin-key");
-var layoutPlugin = function layoutPlugin(_ref) {
+var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
   var _api$analytics;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
@@ -63,8 +63,8 @@ var layoutPlugin = function layoutPlugin(_ref) {
         var formatMessage = _ref3.formatMessage;
         return [{
           id: 'layout',
-          title: formatMessage(_messages.messages.columns),
-          description: formatMessage(_messages.messages.columnsDescription),
+          title: formatMessage(_messages.toolbarInsertBlockMessages.columns),
+          description: formatMessage(_messages.toolbarInsertBlockMessages.columnsDescription),
           keywords: ['column', 'section'],
           priority: 1100,
           icon: function icon() {
@@ -88,5 +88,4 @@ var layoutPlugin = function layoutPlugin(_ref) {
       }
     }
   };
-};
-var _default = exports.default = layoutPlugin;
+};

package/dist/cjs/plugins/layout/toolbar.js

@@ -15,7 +15,7 @@ var _layoutTwoRightSidebar = _interopRequireDefault(require("@atlaskit/icon/glyp
 var _layoutThreeWithSidebars = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/layout-three-with-sidebars"));
 var _remove = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/remove"));
 var _toolbarMessages = require("./toolbar-messages");
-var _messages = _interopRequireDefault(require("../../messages"));
+var _messages = _interopRequireDefault(require("@atlaskit/editor-common/messages"));
 var _actions = require("./actions");
 var LAYOUT_TYPES = [{
   id: 'editor.layout.twoEquals',
@@ -55,7 +55,7 @@ var buildLayoutButton = function buildLayoutButton(intl, item, currentLayout, ed
     id: item.id,
     type: 'button',
     icon: item.icon,
-    testId: item.title.id,
+    testId: item.title.id ? "".concat(item.title.id) : undefined,
     title: intl.formatMessage(item.title),
     onClick: (0, _actions.setPresetLayout)(editorAnalyticsAPI)(item.type),
     selected: !!currentLayout && currentLayout === item.type,

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

@@ -6,8 +6,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -36,10 +37,14 @@ var _WithPluginState = _interopRequireDefault(require("../WithPluginState"));
 var _FormContent = _interopRequireDefault(require("./FormContent"));
 var _messages = require("./messages");
 var _FormErrorBoundary = require("./FormErrorBoundary");
+var _excluded = ["page", "labels", "types", "name", "width"];
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+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; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+var LOGGED_MACRO_KEYS = ['children', 'recently-updated', 'excerpt'];
 function ConfigForm(_ref) {
   var canSave = _ref.canSave,
     errorMessage = _ref.errorMessage,
@@ -337,15 +342,50 @@ var ConfigPanel = /*#__PURE__*/function (_React$Component) {
       var _this$props4 = this.props,
         createAnalyticsEvent = _this$props4.createAnalyticsEvent,
         extensionManifest = _this$props4.extensionManifest;
+      var currentParameters = this.state.currentParameters;
+
+      // PGXT-4393 We need to collect configuration analytics for the macros in LOGGED_MACRO_KEYS.
+      // This function takes the parameters and filters out anything which might have UGC.
+      var getMacroParameters = function getMacroParameters() {
+        var page = currentParameters.page,
+          labels = currentParameters.labels,
+          types = currentParameters.types,
+          name = currentParameters.name,
+          width = currentParameters.width,
+          safeParams = (0, _objectWithoutProperties2.default)(currentParameters, _excluded);
+        var ugcFreeParams = _objectSpread({}, safeParams);
+        // Parse types field as an array of valid content types and include in the result
+        if (types) {
+          var contentTypes = ['page', 'blogpost', 'comment', 'attachment'];
+          var parsedTypes = types.split(',').map(function (type) {
+            return type.trim();
+          }).filter(function (type) {
+            return contentTypes.includes(type);
+          });
+          ugcFreeParams = _objectSpread({
+            types: parsedTypes
+          }, ugcFreeParams);
+        }
+        // Since width is a raw string input, parse then return
+        if (width) {
+          var parsedWidth = parseFloat(width);
+          ugcFreeParams = _objectSpread({
+            width: parsedWidth
+          }, ugcFreeParams);
+        }
+        return ugcFreeParams;
+      };
       (0, _analytics.fireAnalyticsEvent)(createAnalyticsEvent)({
         payload: {
           action: _analytics.ACTION.CLOSED,
           actionSubject: _analytics.ACTION_SUBJECT.CONFIG_PANEL,
           eventType: _analytics.EVENT_TYPE.UI,
-          attributes: {
+          attributes: _objectSpread({
             extensionKey: extensionManifest === null || extensionManifest === void 0 ? void 0 : extensionManifest.key,
             extensionType: extensionManifest === null || extensionManifest === void 0 ? void 0 : extensionManifest.type
-          }
+          }, extensionManifest !== null && extensionManifest !== void 0 && extensionManifest.key && LOGGED_MACRO_KEYS.includes(extensionManifest.key) ? {
+            parameters: getMacroParameters()
+          } : {})
         }
       });
     }

package/dist/cjs/ui/ContentStyles/index.js

@@ -18,13 +18,13 @@ var _styles3 = require("@atlaskit/editor-plugin-block-type/styles");
 var _styles4 = require("@atlaskit/editor-plugin-paste-options-toolbar/styles");
 var _styles5 = require("../../plugins/code-block/styles");
 var _media = require("./media");
-var _styles6 = require("../../plugins/layout/styles");
-var _styles7 = require("../../plugins/panel/styles");
-var _styles8 = require("../../plugins/placeholder-text/styles");
-var _styles9 = require("../../plugins/extension/ui/styles");
-var _styles10 = require("../../plugins/expand/ui/styles");
-var _styles11 = require("../../plugins/find-replace/styles");
-var _styles12 = require("../../plugins/tasks-and-decisions/styles");
+var _layout = require("./layout");
+var _styles6 = require("../../plugins/panel/styles");
+var _styles7 = require("../../plugins/placeholder-text/styles");
+var _styles8 = require("../../plugins/extension/ui/styles");
+var _styles9 = require("../../plugins/expand/ui/styles");
+var _styles10 = require("../../plugins/find-replace/styles");
+var _styles11 = require("../../plugins/tasks-and-decisions/styles");
 var _status = require("./status");
 var _date = require("./date");
 var _getInlineNodeViewProducer = require("../../nodeviews/getInlineNodeViewProducer.styles");
@@ -47,7 +47,7 @@ var placeholderStyles = exports.placeholderStyles = (0, _react2.css)(_templateOb
 var contentStyles = function contentStyles(props) {
   return (0, _react2.css)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    outline: none;\n    font-size: ", "px;\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n  }\n\n  .ProseMirror[contenteditable='false'] .taskItemView-content-wrap {\n    pointer-events: none;\n    opacity: 0.7;\n  }\n\n  .ProseMirror-hideselection *::selection {\n    background: transparent;\n  }\n\n  .ProseMirror-hideselection *::-moz-selection {\n    background: transparent;\n  }\n\n  .ProseMirror-selectednode {\n    outline: none;\n  }\n\n  .ProseMirror-selectednode:empty {\n    outline: 2px solid ", ";\n  }\n\n  ", "\n  ", "\n  ", "\n\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", ";\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n\n  .panelView-content-wrap {\n    box-sizing: border-box;\n  }\n\n  .mediaGroupView-content-wrap ul {\n    padding: 0;\n  }\n\n  /** Needed to override any cleared floats, e.g. image wrapping */\n\n  div.fabric-editor-block-mark[class^='fabric-editor-align'] {\n    clear: none !important;\n  }\n\n  .fabric-editor-align-end {\n    text-align: right;\n  }\n\n  .fabric-editor-align-start {\n    text-align: left;\n  }\n\n  .fabric-editor-align-center {\n    text-align: center;\n  }\n\n  .pm-table-header-content-wrap :not(.fabric-editor-alignment),\n  .pm-table-header-content-wrap\n    :not(p, .fabric-editor-block-mark)\n    + div.fabric-editor-block-mark,\n  .pm-table-cell-content-wrap\n    :not(p, .fabric-editor-block-mark)\n    + div.fabric-editor-block-mark {\n    p:first-of-type {\n      margin-top: 0;\n    }\n  }\n\n  .hyperlink-floating-toolbar,\n  .", " {\n    padding: 0;\n  }\n\n  /* Link icon in the Atlaskit package\n     is bigger than the others\n  */\n  .hyperlink-open-link {\n    svg {\n      max-width: 18px;\n    }\n    &[href] {\n      padding: 0 4px;\n    }\n  }\n"])), (0, _editorSharedStyles.editorFontSize)({
     theme: props.theme
-  }), _styles.whitespaceSharedStyles, _styles.paragraphSharedStyles, _styles.listsSharedStyles, _styles.indentationSharedStyles, _styles.shadowSharedStyle, _getInlineNodeViewProducer.InlineNodeViewSharedStyles, "var(--ds-border-focused, #8cf)", _styles8.placeholderTextStyles, placeholderStyles, (0, _styles5.codeBlockStyles)(props), (0, _styles3.blocktypeStyles)(props), (0, _styles.codeMarkSharedStyles)(props), _styles.textColorStyles, listsStyles, ruleStyles(props), _media.mediaStyles, (0, _styles6.layoutStyles)(props), _styles2.telepointerStyle, _selection.gapCursorStyles, (0, _commonStyles.tableStyles)(props), (0, _styles7.panelStyles)(props), mentionsStyles, emojiStyles, _styles.tasksAndDecisionsStyles, _styles.gridStyles, linkStyles, _styles.blockMarksSharedStyles, _styles.dateSharedStyle, _styles9.extensionStyles, (0, _styles10.expandStyles)(props), _styles11.findReplaceStyles, _styles4.textHighlightStyle, _styles12.taskDecisionStyles, _status.statusStyles, (0, _styles.annotationSharedStyles)(props), _styles.smartCardStyles, _styles.smartCardSharedStyles, _date.dateStyles, _styles.embedCardStyles, _styles.unsupportedStyles, _styles.resizerStyles, _styles.MediaSharedClassNames.FLOATING_TOOLBAR_COMPONENT);
+  }), _styles.whitespaceSharedStyles, _styles.paragraphSharedStyles, _styles.listsSharedStyles, _styles.indentationSharedStyles, _styles.shadowSharedStyle, _getInlineNodeViewProducer.InlineNodeViewSharedStyles, "var(--ds-border-focused, #8cf)", _styles7.placeholderTextStyles, placeholderStyles, (0, _styles5.codeBlockStyles)(props), (0, _styles3.blocktypeStyles)(props), (0, _styles.codeMarkSharedStyles)(props), _styles.textColorStyles, listsStyles, ruleStyles(props), _media.mediaStyles, (0, _layout.layoutStyles)(props), _styles2.telepointerStyle, _selection.gapCursorStyles, (0, _commonStyles.tableStyles)(props), (0, _styles6.panelStyles)(props), mentionsStyles, emojiStyles, _styles.tasksAndDecisionsStyles, _styles.gridStyles, linkStyles, _styles.blockMarksSharedStyles, _styles.dateSharedStyle, _styles8.extensionStyles, (0, _styles9.expandStyles)(props), _styles10.findReplaceStyles, _styles4.textHighlightStyle, _styles11.taskDecisionStyles, _status.statusStyles, (0, _styles.annotationSharedStyles)(props), _styles.smartCardStyles, _styles.smartCardSharedStyles, _date.dateStyles, _styles.embedCardStyles, _styles.unsupportedStyles, _styles.resizerStyles, _styles.MediaSharedClassNames.FLOATING_TOOLBAR_COMPONENT);
 };
 var createEditorContentStyle = exports.createEditorContentStyle = function createEditorContentStyle(styles) {
   return /*#__PURE__*/_react.default.forwardRef(function (props, ref) {

package/dist/cjs/{plugins/layout/styles.js → ui/ContentStyles/layout.js}

@@ -27,6 +27,7 @@ var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _types = require("@atlaskit/editor-plugin-table/types");
 var _consts = require("@atlaskit/editor-plugin-table/ui/consts");
 var _templateObject; // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
+// eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
 var layoutStyles = exports.layoutStyles = function layoutStyles(props) {
   return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    ", " [data-layout-section] {\n      // TODO: Migrate away from gridSize\n      // Recommendation: Replace directly with 7px\n      margin: ", "px -", "px 0;\n      transition: border-color 0.3s ", ";\n      cursor: pointer;\n\n      /* Inner cursor located 26px from left */\n      [data-layout-column] {\n        flex: 1;\n        min-width: 0;\n        border: ", "px solid\n          ", ";\n        border-radius: 4px;\n        padding: ", "px;\n        box-sizing: border-box;\n\n        > div {\n          > :not(style):first-child,\n          > style:first-child + * {\n            margin-top: 0;\n          }\n\n          > .ProseMirror-gapcursor:first-child + *,\n          > style:first-child + .ProseMirror-gapcursor + * {\n            margin-top: 0;\n          }\n\n          > .ProseMirror-gapcursor:first-child + span + *,\n          > style:first-child + .ProseMirror-gapcursor:first-child + span + * {\n            margin-top: 0;\n          }\n\n          > .embedCardView-content-wrap:first-of-type .rich-media-item {\n            margin-top: 0;\n          }\n\n          > .mediaSingleView-content-wrap:first-of-type .rich-media-item {\n            margin-top: 0;\n          }\n\n          > .ProseMirror-gapcursor.-right:first-child\n            + .mediaSingleView-content-wrap\n            .rich-media-item,\n          > style:first-child\n            + .ProseMirror-gapcursor.-right\n            + .mediaSingleView-content-wrap\n            .rich-media-item,\n          > .ProseMirror-gapcursor.-right:first-of-type\n            + .embedCardView-content-wrap\n            .rich-media-item {\n            margin-top: 0;\n          }\n\n          > .ProseMirror-gapcursor:first-child\n            + span\n            + .mediaSingleView-content-wrap\n            .rich-media-item,\n          > style:first-child\n            + .ProseMirror-gapcursor\n            + span\n            + .mediaSingleView-content-wrap\n            .rich-media-item {\n            margin-top: 0;\n          }\n\n          /* Prevent first DecisionWrapper's margin-top: 8px from shifting decisions down\n             and shrinking layout's node selectable area (leniency margin) */\n          > [data-node-type='decisionList'] {\n            li:first-of-type [data-decision-wrapper] {\n              margin-top: 0;\n            }\n          }\n        }\n\n        /* Make the 'content' fill the entire height of the layout column to allow click\n           handler of layout section nodeview to target only data-layout-column */\n        [data-layout-content] {\n          height: 100%;\n          cursor: text;\n        }\n      }\n\n      [data-layout-column] + [data-layout-column] {\n        margin-left: ", "px;\n      }\n\n      @media screen and (max-width: ", "px) {\n        [data-layout-column] + [data-layout-column] {\n          margin-left: 0;\n        }\n      }\n\n      // TODO: Remove the border styles below once design tokens have been enabled and fallbacks are no longer triggered.\n      // This is because the default state already uses the same token and, as such, the hover style won't change anything.\n      // https://product-fabric.atlassian.net/browse/DSP-4441\n      /* Shows the border when cursor is inside a layout */\n      &.selected [data-layout-column],\n      &:hover [data-layout-column] {\n        border: ", "px solid\n          ", ";\n      }\n\n      &.selected.danger > [data-layout-column] {\n        background-color: ", ";\n        border-color: ", ";\n      }\n\n      &.", ":not(.danger) {\n        [data-layout-column] {\n          ", "\n        }\n      }\n    }\n  }\n\n  .fabric-editor--full-width-mode .ProseMirror {\n    [data-layout-section] {\n      .", " {\n        margin: 0 ", "px;\n      }\n    }\n  }\n"])), _styles.columnLayoutSharedStyle, (0, _constants.gridSize)() - 1, _editorSharedStyles.akLayoutGutterOffset, _editorSharedStyles.akEditorSwoopCubicBezier, _editorSharedStyles.akEditorSelectedBorderSize, (0, _components.themed)({
     light: "var(--ds-border, ".concat(_colors.N40A, ")"),

package/dist/cjs/version-wrapper.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "189.1.7";
+var version = exports.version = "189.1.11";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/plugins/index.js

@@ -4,7 +4,7 @@ export { default as collabEditPlugin } from './collab-edit';
 export { default as extensionPlugin } from './extension';
 export { default as insertBlockPlugin } from './insert-block';
 export { default as jiraIssuePlugin } from './jira-issue';
-export { default as layoutPlugin } from './layout';
+export { layoutPlugin } from './layout';
 export { default as toolbarListsIndentationPlugin } from './toolbar-lists-indentation';
 export { default as macroPlugin } from './macro';
 export { default as maxContentSizePlugin } from './max-content-size';

package/dist/es2019/plugins/insert-block/index.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
-import { pluginKey as layoutStateKey } from '../layout';
 import { insertMacroFromMacroBrowser } from '../macro';
 import WithPluginState from '../../ui/WithPluginState';
 import ToolbarInsertBlock from './ui/ToolbarInsertBlock';
@@ -68,13 +67,11 @@ const insertBlockPlugin = ({
         return /*#__PURE__*/React.createElement(WithPluginState, {
           plugins: {
             macroState: macroStateKey,
-            placeholderTextState: placeholderTextStateKey,
-            layoutState: layoutStateKey
+            placeholderTextState: placeholderTextStateKey
           },
           render: ({
             macroState = {},
-            placeholderTextState,
-            layoutState
+            placeholderTextState
           }) => {
             return /*#__PURE__*/React.createElement(ToolbarInsertBlockWithInjectionApi, {
               pluginInjectionApi: api,
@@ -92,7 +89,6 @@ const insertBlockPlugin = ({
               featureFlags: featureFlags,
               macroState: macroState,
               placeholderTextState: placeholderTextState,
-              layoutState: layoutState,
               providers: providers,
               options: options
             });
@@ -123,7 +119,6 @@ function ToolbarInsertBlockWithInjectionApi({
   options,
   macroState,
   placeholderTextState,
-  layoutState,
   featureFlags
 }) {
   var _ref, _ref2, _pluginInjectionApi$i, _pluginInjectionApi$c, _pluginInjectionApi$p, _pluginInjectionApi$b;
@@ -152,7 +147,7 @@ function ToolbarInsertBlockWithInjectionApi({
     decisionSupported: !!editorView.state.schema.nodes.decisionItem,
     dateEnabled: !!dateState,
     placeholderTextEnabled: placeholderTextState && placeholderTextState.allowInserting,
-    layoutSectionEnabled: !!layoutState,
+    layoutSectionEnabled: Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.layout),
     expandEnabled: !!options.allowExpand,
     mediaUploadsEnabled: (_ref = mediaState && mediaState.allowsUploads) !== null && _ref !== void 0 ? _ref : undefined,
     onShowMediaPicker: (_ref2 = mediaState && mediaState.showMediaPicker) !== null && _ref2 !== void 0 ? _ref2 : undefined,

package/dist/es2019/plugins/layout/actions.js

@@ -1,8 +1,7 @@
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection, NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { flatmap, mapChildren } from '../../utils/slice';
-import { getStepRange, isEmptyDocument } from '@atlaskit/editor-common/utils';
+import { flatmap, mapChildren, getStepRange, isEmptyDocument } from '@atlaskit/editor-common/utils';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, LAYOUT_TYPE } from '@atlaskit/editor-common/analytics';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { pluginKey } from './pm-plugins/plugin-key';

package/dist/es2019/plugins/layout/index.js

@@ -5,10 +5,10 @@ import { buildToolbar } from './toolbar';
 import { createDefaultLayoutSection, insertLayoutColumnsWithAnalytics } from './actions';
 import { IconLayout } from '@atlaskit/editor-common/quick-insert';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { pluginKey } from './pm-plugins/plugin-key';
 export { pluginKey };
-const layoutPlugin = ({
+export const layoutPlugin = ({
   config: options = {},
   api
 }) => {
@@ -72,5 +72,4 @@ const layoutPlugin = ({
       }]
     }
   };
-};
-export default layoutPlugin;
+};

package/dist/es2019/plugins/layout/toolbar.js

@@ -7,7 +7,7 @@ import LayoutTwoRightSidebarIcon from '@atlaskit/icon/glyph/editor/layout-two-ri
 import LayoutThreeWithSidebarsIcon from '@atlaskit/icon/glyph/editor/layout-three-with-sidebars';
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import { toolbarMessages } from './toolbar-messages';
-import commonMessages from '../../messages';
+import commonMessages from '@atlaskit/editor-common/messages';
 import { setPresetLayout, deleteActiveLayoutNode, getPresetLayout } from './actions';
 const LAYOUT_TYPES = [{
   id: 'editor.layout.twoEquals',
@@ -46,7 +46,7 @@ const buildLayoutButton = (intl, item, currentLayout, editorAnalyticsAPI) => ({
   id: item.id,
   type: 'button',
   icon: item.icon,
-  testId: item.title.id,
+  testId: item.title.id ? `${item.title.id}` : undefined,
   title: intl.formatMessage(item.title),
   onClick: setPresetLayout(editorAnalyticsAPI)(item.type),
   selected: !!currentLayout && currentLayout === item.type,

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

@@ -21,6 +21,7 @@ import WithPluginState from '../WithPluginState';
 import FormContent from './FormContent';
 import { messages } from './messages';
 import { FormErrorBoundary } from './FormErrorBoundary';
+const LOGGED_MACRO_KEYS = ['children', 'recently-updated', 'excerpt'];
 function ConfigForm({
   canSave,
   errorMessage,
@@ -278,6 +279,43 @@ class ConfigPanel extends React.Component {
       createAnalyticsEvent,
       extensionManifest
     } = this.props;
+    const {
+      currentParameters
+    } = this.state;
+
+    // PGXT-4393 We need to collect configuration analytics for the macros in LOGGED_MACRO_KEYS.
+    // This function takes the parameters and filters out anything which might have UGC.
+    const getMacroParameters = () => {
+      const {
+        page,
+        labels,
+        types,
+        name,
+        width,
+        ...safeParams
+      } = currentParameters;
+      let ugcFreeParams = {
+        ...safeParams
+      };
+      // Parse types field as an array of valid content types and include in the result
+      if (types) {
+        const contentTypes = ['page', 'blogpost', 'comment', 'attachment'];
+        const parsedTypes = types.split(',').map(type => type.trim()).filter(type => contentTypes.includes(type));
+        ugcFreeParams = {
+          types: parsedTypes,
+          ...ugcFreeParams
+        };
+      }
+      // Since width is a raw string input, parse then return
+      if (width) {
+        const parsedWidth = parseFloat(width);
+        ugcFreeParams = {
+          width: parsedWidth,
+          ...ugcFreeParams
+        };
+      }
+      return ugcFreeParams;
+    };
     fireAnalyticsEvent(createAnalyticsEvent)({
       payload: {
         action: ACTION.CLOSED,
@@ -285,7 +323,10 @@ class ConfigPanel extends React.Component {
         eventType: EVENT_TYPE.UI,
         attributes: {
           extensionKey: extensionManifest === null || extensionManifest === void 0 ? void 0 : extensionManifest.key,
-          extensionType: extensionManifest === null || extensionManifest === void 0 ? void 0 : extensionManifest.type
+          extensionType: extensionManifest === null || extensionManifest === void 0 ? void 0 : extensionManifest.type,
+          ...(extensionManifest !== null && extensionManifest !== void 0 && extensionManifest.key && LOGGED_MACRO_KEYS.includes(extensionManifest.key) ? {
+            parameters: getMacroParameters()
+          } : {})
         }
       }
     });

package/dist/es2019/ui/ContentStyles/index.js

@@ -10,7 +10,7 @@ import { blocktypeStyles } from '@atlaskit/editor-plugin-block-type/styles';
 import { textHighlightStyle } from '@atlaskit/editor-plugin-paste-options-toolbar/styles';
 import { codeBlockStyles } from '../../plugins/code-block/styles';
 import { mediaStyles } from './media';
-import { layoutStyles } from '../../plugins/layout/styles';
+import { layoutStyles } from './layout';
 import { panelStyles } from '../../plugins/panel/styles';
 import { placeholderTextStyles } from '../../plugins/placeholder-text/styles';
 import { extensionStyles } from '../../plugins/extension/ui/styles';

package/dist/es2019/{plugins/layout/styles.js → ui/ContentStyles/layout.js}

@@ -3,6 +3,7 @@ import { css } from '@emotion/react';
 // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
 import { gridSize } from '@atlaskit/theme/constants';
 import { N40A, N50A, DN70, DN80 } from '@atlaskit/theme/colors';
+// eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
 import { themed } from '@atlaskit/theme/components';
 import { columnLayoutSharedStyle, LAYOUT_SECTION_MARGIN, LAYOUT_COLUMN_PADDING } from '@atlaskit/editor-common/styles';
 import { gridMediumMaxWidth, akEditorDeleteBackground, akEditorDeleteBorder, akEditorSelectedBorderSize, akLayoutGutterOffset, akEditorSwoopCubicBezier, SelectionStyle, getSelectionStyles, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "189.1.7";
+export const version = "189.1.11";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/plugins/index.js

@@ -4,7 +4,7 @@ export { default as collabEditPlugin } from './collab-edit';
 export { default as extensionPlugin } from './extension';
 export { default as insertBlockPlugin } from './insert-block';
 export { default as jiraIssuePlugin } from './jira-issue';
-export { default as layoutPlugin } from './layout';
+export { layoutPlugin } from './layout';
 export { default as toolbarListsIndentationPlugin } from './toolbar-lists-indentation';
 export { default as macroPlugin } from './macro';
 export { default as maxContentSizePlugin } from './max-content-size';

package/dist/esm/plugins/insert-block/index.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
-import { pluginKey as layoutStateKey } from '../layout';
 import { insertMacroFromMacroBrowser } from '../macro';
 import WithPluginState from '../../ui/WithPluginState';
 import ToolbarInsertBlock from './ui/ToolbarInsertBlock';
@@ -69,14 +68,12 @@ var insertBlockPlugin = function insertBlockPlugin(_ref) {
         return /*#__PURE__*/React.createElement(WithPluginState, {
           plugins: {
             macroState: macroStateKey,
-            placeholderTextState: placeholderTextStateKey,
-            layoutState: layoutStateKey
+            placeholderTextState: placeholderTextStateKey
           },
           render: function render(_ref3) {
             var _ref3$macroState = _ref3.macroState,
               macroState = _ref3$macroState === void 0 ? {} : _ref3$macroState,
-              placeholderTextState = _ref3.placeholderTextState,
-              layoutState = _ref3.layoutState;
+              placeholderTextState = _ref3.placeholderTextState;
             return /*#__PURE__*/React.createElement(ToolbarInsertBlockWithInjectionApi, {
               pluginInjectionApi: api,
               editorView: editorView,
@@ -93,7 +90,6 @@ var insertBlockPlugin = function insertBlockPlugin(_ref) {
               featureFlags: featureFlags,
               macroState: macroState,
               placeholderTextState: placeholderTextState,
-              layoutState: layoutState,
               providers: providers,
               options: options
             });
@@ -125,7 +121,6 @@ function ToolbarInsertBlockWithInjectionApi(_ref4) {
     options = _ref4.options,
     macroState = _ref4.macroState,
     placeholderTextState = _ref4.placeholderTextState,
-    layoutState = _ref4.layoutState,
     featureFlags = _ref4.featureFlags;
   var buttons = toolbarSizeToButtons(toolbarSize);
   var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['hyperlink', 'date', 'imageUpload', 'mention', 'emoji', 'blockType', 'media', 'typeAhead']),
@@ -151,7 +146,7 @@ function ToolbarInsertBlockWithInjectionApi(_ref4) {
     decisionSupported: !!editorView.state.schema.nodes.decisionItem,
     dateEnabled: !!dateState,
     placeholderTextEnabled: placeholderTextState && placeholderTextState.allowInserting,
-    layoutSectionEnabled: !!layoutState,
+    layoutSectionEnabled: Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.layout),
     expandEnabled: !!options.allowExpand,
     mediaUploadsEnabled: (_ref5 = mediaState && mediaState.allowsUploads) !== null && _ref5 !== void 0 ? _ref5 : undefined,
     onShowMediaPicker: (_ref6 = mediaState && mediaState.showMediaPicker) !== null && _ref6 !== void 0 ? _ref6 : undefined,

package/dist/esm/plugins/layout/actions.js

@@ -4,8 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection, NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { flatmap, mapChildren } from '../../utils/slice';
-import { getStepRange, isEmptyDocument } from '@atlaskit/editor-common/utils';
+import { flatmap, mapChildren, getStepRange, isEmptyDocument } from '@atlaskit/editor-common/utils';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, LAYOUT_TYPE } from '@atlaskit/editor-common/analytics';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { pluginKey } from './pm-plugins/plugin-key';

package/dist/esm/plugins/layout/index.js

@@ -5,10 +5,10 @@ import { buildToolbar } from './toolbar';
 import { createDefaultLayoutSection, insertLayoutColumnsWithAnalytics } from './actions';
 import { IconLayout } from '@atlaskit/editor-common/quick-insert';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { pluginKey } from './pm-plugins/plugin-key';
 export { pluginKey };
-var layoutPlugin = function layoutPlugin(_ref) {
+export var layoutPlugin = function layoutPlugin(_ref) {
   var _api$analytics;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
@@ -76,5 +76,4 @@ var layoutPlugin = function layoutPlugin(_ref) {
       }
     }
   };
-};
-export default layoutPlugin;
+};

package/dist/esm/plugins/layout/toolbar.js

@@ -8,7 +8,7 @@ import LayoutTwoRightSidebarIcon from '@atlaskit/icon/glyph/editor/layout-two-ri
 import LayoutThreeWithSidebarsIcon from '@atlaskit/icon/glyph/editor/layout-three-with-sidebars';
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import { toolbarMessages } from './toolbar-messages';
-import commonMessages from '../../messages';
+import commonMessages from '@atlaskit/editor-common/messages';
 import { setPresetLayout, deleteActiveLayoutNode, getPresetLayout } from './actions';
 var LAYOUT_TYPES = [{
   id: 'editor.layout.twoEquals',
@@ -48,7 +48,7 @@ var buildLayoutButton = function buildLayoutButton(intl, item, currentLayout, ed
     id: item.id,
     type: 'button',
     icon: item.icon,
-    testId: item.title.id,
+    testId: item.title.id ? "".concat(item.title.id) : undefined,
     title: intl.formatMessage(item.title),
     onClick: setPresetLayout(editorAnalyticsAPI)(item.type),
     selected: !!currentLayout && currentLayout === item.type,

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

@@ -1,4 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
@@ -7,6 +8,9 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+var _excluded = ["page", "labels", "types", "name", "width"];
+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 _regeneratorRuntime from "@babel/runtime/regenerator";
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
@@ -31,6 +35,7 @@ import WithPluginState from '../WithPluginState';
 import FormContent from './FormContent';
 import { messages } from './messages';
 import { FormErrorBoundary } from './FormErrorBoundary';
+var LOGGED_MACRO_KEYS = ['children', 'recently-updated', 'excerpt'];
 function ConfigForm(_ref) {
   var canSave = _ref.canSave,
     errorMessage = _ref.errorMessage,
@@ -328,15 +333,50 @@ var ConfigPanel = /*#__PURE__*/function (_React$Component) {
       var _this$props4 = this.props,
         createAnalyticsEvent = _this$props4.createAnalyticsEvent,
         extensionManifest = _this$props4.extensionManifest;
+      var currentParameters = this.state.currentParameters;
+
+      // PGXT-4393 We need to collect configuration analytics for the macros in LOGGED_MACRO_KEYS.
+      // This function takes the parameters and filters out anything which might have UGC.
+      var getMacroParameters = function getMacroParameters() {
+        var page = currentParameters.page,
+          labels = currentParameters.labels,
+          types = currentParameters.types,
+          name = currentParameters.name,
+          width = currentParameters.width,
+          safeParams = _objectWithoutProperties(currentParameters, _excluded);
+        var ugcFreeParams = _objectSpread({}, safeParams);
+        // Parse types field as an array of valid content types and include in the result
+        if (types) {
+          var contentTypes = ['page', 'blogpost', 'comment', 'attachment'];
+          var parsedTypes = types.split(',').map(function (type) {
+            return type.trim();
+          }).filter(function (type) {
+            return contentTypes.includes(type);
+          });
+          ugcFreeParams = _objectSpread({
+            types: parsedTypes
+          }, ugcFreeParams);
+        }
+        // Since width is a raw string input, parse then return
+        if (width) {
+          var parsedWidth = parseFloat(width);
+          ugcFreeParams = _objectSpread({
+            width: parsedWidth
+          }, ugcFreeParams);
+        }
+        return ugcFreeParams;
+      };
       fireAnalyticsEvent(createAnalyticsEvent)({
         payload: {
           action: ACTION.CLOSED,
           actionSubject: ACTION_SUBJECT.CONFIG_PANEL,
           eventType: EVENT_TYPE.UI,
-          attributes: {
+          attributes: _objectSpread({
             extensionKey: extensionManifest === null || extensionManifest === void 0 ? void 0 : extensionManifest.key,
             extensionType: extensionManifest === null || extensionManifest === void 0 ? void 0 : extensionManifest.type
-          }
+          }, extensionManifest !== null && extensionManifest !== void 0 && extensionManifest.key && LOGGED_MACRO_KEYS.includes(extensionManifest.key) ? {
+            parameters: getMacroParameters()
+          } : {})
         }
       });
     }

package/dist/esm/ui/ContentStyles/index.js

@@ -12,7 +12,7 @@ import { blocktypeStyles } from '@atlaskit/editor-plugin-block-type/styles';
 import { textHighlightStyle } from '@atlaskit/editor-plugin-paste-options-toolbar/styles';
 import { codeBlockStyles } from '../../plugins/code-block/styles';
 import { mediaStyles } from './media';
-import { layoutStyles } from '../../plugins/layout/styles';
+import { layoutStyles } from './layout';
 import { panelStyles } from '../../plugins/panel/styles';
 import { placeholderTextStyles } from '../../plugins/placeholder-text/styles';
 import { extensionStyles } from '../../plugins/extension/ui/styles';

package/dist/esm/{plugins/layout/styles.js → ui/ContentStyles/layout.js}

@@ -5,6 +5,7 @@ import { css } from '@emotion/react';
 // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
 import { gridSize } from '@atlaskit/theme/constants';
 import { N40A, N50A, DN70, DN80 } from '@atlaskit/theme/colors';
+// eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
 import { themed } from '@atlaskit/theme/components';
 import { columnLayoutSharedStyle, LAYOUT_SECTION_MARGIN, LAYOUT_COLUMN_PADDING } from '@atlaskit/editor-common/styles';
 import { gridMediumMaxWidth, akEditorDeleteBackground, akEditorDeleteBorder, akEditorSelectedBorderSize, akLayoutGutterOffset, akEditorSwoopCubicBezier, SelectionStyle, getSelectionStyles, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "189.1.7";
+export var version = "189.1.11";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

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

@@ -4,7 +4,7 @@ export { default as collabEditPlugin } from './collab-edit';
 export { default as extensionPlugin } from './extension';
 export { default as insertBlockPlugin } from './insert-block';
 export { default as jiraIssuePlugin } from './jira-issue';
-export { default as layoutPlugin } from './layout';
+export { layoutPlugin } from './layout';
 export { default as toolbarListsIndentationPlugin } from './toolbar-lists-indentation';
 export { default as macroPlugin } from './macro';
 export { default as maxContentSizePlugin } from './max-content-size';

package/dist/types/plugins/layout/actions.d.ts

@@ -1,9 +1,8 @@
 import type { Node } from '@atlaskit/editor-prosemirror/model';
-import type { Command } from '../../types/command';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Change, PresetLayout } from './types';
-import type { TOOLBAR_MENU_TYPE } from '@atlaskit/editor-common/types';
+import type { TOOLBAR_MENU_TYPE, Command } from '@atlaskit/editor-common/types';
 export declare const ONE_COL_LAYOUTS: PresetLayout[];
 export declare const TWO_COL_LAYOUTS: PresetLayout[];
 export declare const THREE_COL_LAYOUTS: PresetLayout[];

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

@@ -12,5 +12,4 @@ export type LayoutPlugin = NextEditorPlugin<'layout', {
         insertLayoutColumns: ReturnType<typeof insertLayoutColumnsWithAnalytics>;
     };
 }>;
-declare const layoutPlugin: LayoutPlugin;
-export default layoutPlugin;
+export declare const layoutPlugin: LayoutPlugin;

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

@@ -1,8 +1,7 @@
 import React from 'react';
-import { WithAnalyticsEventsProps } from '@atlaskit/analytics-next';
-import type { ExtensionManifest } from '@atlaskit/editor-common/extensions';
-import { FieldDefinition, Parameters, OnSaveCallback } from '@atlaskit/editor-common/extensions';
-import { FeatureFlags } from '@atlaskit/editor-common/types';
+import type { WithAnalyticsEventsProps } from '@atlaskit/analytics-next';
+import type { ExtensionManifest, FieldDefinition, Parameters, OnSaveCallback } from '@atlaskit/editor-common/extensions';
+import type { FeatureFlags } from '@atlaskit/editor-common/types';
 type Props = {
     extensionManifest?: ExtensionManifest;
     fields?: FieldDefinition[];

package/dist/types/{plugins/layout/styles.d.ts → ui/ContentStyles/layout.d.ts}

@@ -1,4 +1,4 @@
-import { ThemeProps } from '@atlaskit/theme/types';
+import type { ThemeProps } from '@atlaskit/theme/types';
 import { LAYOUT_SECTION_MARGIN, LAYOUT_COLUMN_PADDING } from '@atlaskit/editor-common/styles';
 export { LAYOUT_COLUMN_PADDING, LAYOUT_SECTION_MARGIN };
 export declare const layoutStyles: (props: ThemeProps) => import("@emotion/react").SerializedStyles;

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

@@ -4,7 +4,7 @@ export { default as collabEditPlugin } from './collab-edit';
 export { default as extensionPlugin } from './extension';
 export { default as insertBlockPlugin } from './insert-block';
 export { default as jiraIssuePlugin } from './jira-issue';
-export { default as layoutPlugin } from './layout';
+export { layoutPlugin } from './layout';
 export { default as toolbarListsIndentationPlugin } from './toolbar-lists-indentation';
 export { default as macroPlugin } from './macro';
 export { default as maxContentSizePlugin } from './max-content-size';

package/dist/types-ts4.5/plugins/layout/actions.d.ts

@@ -1,9 +1,8 @@
 import type { Node } from '@atlaskit/editor-prosemirror/model';
-import type { Command } from '../../types/command';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Change, PresetLayout } from './types';
-import type { TOOLBAR_MENU_TYPE } from '@atlaskit/editor-common/types';
+import type { TOOLBAR_MENU_TYPE, Command } from '@atlaskit/editor-common/types';
 export declare const ONE_COL_LAYOUTS: PresetLayout[];
 export declare const TWO_COL_LAYOUTS: PresetLayout[];
 export declare const THREE_COL_LAYOUTS: PresetLayout[];

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

@@ -15,5 +15,4 @@ export type LayoutPlugin = NextEditorPlugin<'layout', {
         insertLayoutColumns: ReturnType<typeof insertLayoutColumnsWithAnalytics>;
     };
 }>;
-declare const layoutPlugin: LayoutPlugin;
-export default layoutPlugin;
+export declare const layoutPlugin: LayoutPlugin;

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

@@ -1,8 +1,7 @@
 import React from 'react';
-import { WithAnalyticsEventsProps } from '@atlaskit/analytics-next';
-import type { ExtensionManifest } from '@atlaskit/editor-common/extensions';
-import { FieldDefinition, Parameters, OnSaveCallback } from '@atlaskit/editor-common/extensions';
-import { FeatureFlags } from '@atlaskit/editor-common/types';
+import type { WithAnalyticsEventsProps } from '@atlaskit/analytics-next';
+import type { ExtensionManifest, FieldDefinition, Parameters, OnSaveCallback } from '@atlaskit/editor-common/extensions';
+import type { FeatureFlags } from '@atlaskit/editor-common/types';
 type Props = {
     extensionManifest?: ExtensionManifest;
     fields?: FieldDefinition[];

package/dist/types-ts4.5/{plugins/layout/styles.d.ts → ui/ContentStyles/layout.d.ts}

@@ -1,4 +1,4 @@
-import { ThemeProps } from '@atlaskit/theme/types';
+import type { ThemeProps } from '@atlaskit/theme/types';
 import { LAYOUT_SECTION_MARGIN, LAYOUT_COLUMN_PADDING } from '@atlaskit/editor-common/styles';
 export { LAYOUT_COLUMN_PADDING, LAYOUT_SECTION_MARGIN };
 export declare const layoutStyles: (props: ThemeProps) => import("@emotion/react").SerializedStyles;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "189.1.7",
+  "version": "189.1.11",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/dist/cjs/plugins/layout/utils.js

@@ -1,30 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "removeLayoutFromFirstChild", {
-  enumerable: true,
-  get: function get() {
-    return _transforms.removeLayoutFromFirstChild;
-  }
-});
-Object.defineProperty(exports, "removeLayoutFromLastChild", {
-  enumerable: true,
-  get: function get() {
-    return _transforms.removeLayoutFromLastChild;
-  }
-});
-Object.defineProperty(exports, "transformSliceToRemoveOpenLayoutNodes", {
-  enumerable: true,
-  get: function get() {
-    return _transforms.transformSliceToRemoveOpenLayoutNodes;
-  }
-});
-Object.defineProperty(exports, "unwrapContentFromLayout", {
-  enumerable: true,
-  get: function get() {
-    return _transforms.unwrapContentFromLayout;
-  }
-});
-var _transforms = require("@atlaskit/editor-common/transforms");

package/dist/es2019/plugins/layout/utils.js

@@ -1 +0,0 @@
-export { unwrapContentFromLayout, removeLayoutFromFirstChild, removeLayoutFromLastChild, transformSliceToRemoveOpenLayoutNodes } from '@atlaskit/editor-common/transforms';

package/dist/esm/plugins/layout/utils.js

@@ -1 +0,0 @@
-export { unwrapContentFromLayout, removeLayoutFromFirstChild, removeLayoutFromLastChild, transformSliceToRemoveOpenLayoutNodes } from '@atlaskit/editor-common/transforms';

package/dist/types/plugins/layout/utils.d.ts

@@ -1 +0,0 @@
-export { unwrapContentFromLayout, removeLayoutFromFirstChild, removeLayoutFromLastChild, transformSliceToRemoveOpenLayoutNodes, } from '@atlaskit/editor-common/transforms';

package/dist/types-ts4.5/plugins/layout/utils.d.ts

@@ -1 +0,0 @@
-export { unwrapContentFromLayout, removeLayoutFromFirstChild, removeLayoutFromLastChild, transformSliceToRemoveOpenLayoutNodes, } from '@atlaskit/editor-common/transforms';