@atlaskit/editor-core 190.1.30 → 190.2.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-core
 
+## 190.2.0
+
+### Minor Changes
+
+- [#64320](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/64320) [`1f21567ce911`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1f21567ce911) - Deprecate the jira issue plugin and allowJiraIssue prop in Editor.
+
+  These will be removed in a future version.
+
+  This also removes `confluenceJiraIssue` node from editor as it is no longer required.
+
+  Updated the confluence transformer to no longer support `confluenceJiraIssue`. This is behind a feature flag and will be removed in a future version.
+
+### Patch Changes
+
+- [#64775](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/64775) [`a88b0fdcc0c4`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a88b0fdcc0c4) - Fix contentComponents (with before and after) crashing on non-full-page appearances.
+
 ## 190.1.30
 
 ### Patch Changes

package/dist/cjs/presets/universal.js

@@ -257,7 +257,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
     }
     return builder;
   }).maybeAdd(_plugins.jiraIssuePlugin, function (plugin, builder) {
-    if (props.allowJiraIssue) {
+    if (!(0, _platformFeatureFlags.getBooleanFF)('platform.editor.deprecate-jira-issue-plugin') && props.allowJiraIssue) {
       return builder.add(plugin);
     }
     return builder;

package/dist/cjs/ui/Appearance/Chromeless.js

@@ -75,7 +75,7 @@ var Editor = exports.default = /*#__PURE__*/function (_React$Component) {
       }, (0, _react2.jsx)(ContentArea, {
         className: "ak-editor-content-area",
         featureFlags: featureFlags
-      }, customContentComponents, (0, _react2.jsx)(_PluginSlot.default, {
+      }, customContentComponents && 'before' in customContentComponents ? customContentComponents.before : customContentComponents, (0, _react2.jsx)(_PluginSlot.default, {
         editorView: editorView,
         editorActions: editorActions,
         eventDispatcher: eventDispatcher,
@@ -90,7 +90,7 @@ var Editor = exports.default = /*#__PURE__*/function (_React$Component) {
         dispatchAnalyticsEvent: dispatchAnalyticsEvent,
         wrapperElement: _this.containerElement,
         pluginHooks: pluginHooks
-      }), editorDOMElement)));
+      }), editorDOMElement, customContentComponents && 'after' in customContentComponents ? customContentComponents.after : null)));
     });
     return _this;
   }

package/dist/cjs/ui/Appearance/Comment/Comment.js

@@ -155,7 +155,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
             'less-margin': width < _editorSharedStyles.akEditorMobileBreakoutPoint
           }),
           featureFlags: featureFlags
-        }, customContentComponents, (0, _react2.jsx)(_PluginSlot.default, {
+        }, customContentComponents && 'before' in customContentComponents ? customContentComponents.before : customContentComponents, (0, _react2.jsx)(_PluginSlot.default, {
           editorView: editorView,
           editorActions: editorActions,
           eventDispatcher: eventDispatcher,
@@ -170,7 +170,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
           disabled: !!disabled,
           wrapperElement: _this.wrapperElementRef.current,
           pluginHooks: pluginHooks
-        }), editorDOMElement);
+        }), editorDOMElement, customContentComponents && 'after' in customContentComponents ? customContentComponents.after : null);
       }))), showSecondaryToolbar && (0, _react2.jsx)("div", {
         css: secondaryToolbarStyle,
         "data-testid": "ak-editor-secondary-toolbar"

package/dist/cjs/version-wrapper.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "190.1.30";
+var version = exports.version = "190.2.0";

package/dist/es2019/presets/universal.js

@@ -250,7 +250,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     }
     return builder;
   }).maybeAdd(jiraIssuePlugin, (plugin, builder) => {
-    if (props.allowJiraIssue) {
+    if (!getBooleanFF('platform.editor.deprecate-jira-issue-plugin') && props.allowJiraIssue) {
       return builder.add(plugin);
     }
     return builder;

package/dist/es2019/ui/Appearance/Chromeless.js

@@ -72,7 +72,7 @@ export default class Editor extends React.Component {
       }, jsx(ContentArea, {
         className: "ak-editor-content-area",
         featureFlags: featureFlags
-      }, customContentComponents, jsx(PluginSlot, {
+      }, customContentComponents && 'before' in customContentComponents ? customContentComponents.before : customContentComponents, jsx(PluginSlot, {
         editorView: editorView,
         editorActions: editorActions,
         eventDispatcher: eventDispatcher,
@@ -87,7 +87,7 @@ export default class Editor extends React.Component {
         dispatchAnalyticsEvent: dispatchAnalyticsEvent,
         wrapperElement: this.containerElement,
         pluginHooks: pluginHooks
-      }), editorDOMElement)));
+      }), editorDOMElement, customContentComponents && 'after' in customContentComponents ? customContentComponents.after : null)));
     });
   }
   render() {

package/dist/es2019/ui/Appearance/Comment/Comment.js

@@ -183,7 +183,7 @@ class Editor extends React.Component {
             'less-margin': width < akEditorMobileBreakoutPoint
           }),
           featureFlags: featureFlags
-        }, customContentComponents, jsx(PluginSlot, {
+        }, customContentComponents && 'before' in customContentComponents ? customContentComponents.before : customContentComponents, jsx(PluginSlot, {
           editorView: editorView,
           editorActions: editorActions,
           eventDispatcher: eventDispatcher,
@@ -198,7 +198,7 @@ class Editor extends React.Component {
           disabled: !!disabled,
           wrapperElement: this.wrapperElementRef.current,
           pluginHooks: pluginHooks
-        }), editorDOMElement);
+        }), editorDOMElement, customContentComponents && 'after' in customContentComponents ? customContentComponents.after : null);
       }))), showSecondaryToolbar && jsx("div", {
         css: secondaryToolbarStyle,
         "data-testid": "ak-editor-secondary-toolbar"

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "190.1.30";
+export const version = "190.2.0";

package/dist/esm/presets/universal.js

@@ -249,7 +249,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     }
     return builder;
   }).maybeAdd(jiraIssuePlugin, function (plugin, builder) {
-    if (props.allowJiraIssue) {
+    if (!getBooleanFF('platform.editor.deprecate-jira-issue-plugin') && props.allowJiraIssue) {
       return builder.add(plugin);
     }
     return builder;

package/dist/esm/ui/Appearance/Chromeless.js

@@ -65,7 +65,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
       }, jsx(ContentArea, {
         className: "ak-editor-content-area",
         featureFlags: featureFlags
-      }, customContentComponents, jsx(PluginSlot, {
+      }, customContentComponents && 'before' in customContentComponents ? customContentComponents.before : customContentComponents, jsx(PluginSlot, {
         editorView: editorView,
         editorActions: editorActions,
         eventDispatcher: eventDispatcher,
@@ -80,7 +80,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
         dispatchAnalyticsEvent: dispatchAnalyticsEvent,
         wrapperElement: _this.containerElement,
         pluginHooks: pluginHooks
-      }), editorDOMElement)));
+      }), editorDOMElement, customContentComponents && 'after' in customContentComponents ? customContentComponents.after : null)));
     });
     return _this;
   }

package/dist/esm/ui/Appearance/Comment/Comment.js

@@ -145,7 +145,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
             'less-margin': width < akEditorMobileBreakoutPoint
           }),
           featureFlags: featureFlags
-        }, customContentComponents, jsx(PluginSlot, {
+        }, customContentComponents && 'before' in customContentComponents ? customContentComponents.before : customContentComponents, jsx(PluginSlot, {
           editorView: editorView,
           editorActions: editorActions,
           eventDispatcher: eventDispatcher,
@@ -160,7 +160,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
           disabled: !!disabled,
           wrapperElement: _this.wrapperElementRef.current,
           pluginHooks: pluginHooks
-        }), editorDOMElement);
+        }), editorDOMElement, customContentComponents && 'after' in customContentComponents ? customContentComponents.after : null);
       }))), showSecondaryToolbar && jsx("div", {
         css: secondaryToolbarStyle,
         "data-testid": "ak-editor-secondary-toolbar"

package/dist/esm/version-wrapper.js

@@ -1,2 +1,2 @@
 export var name = "@atlaskit/editor-core";
-export var version = "190.1.30";
+export var version = "190.2.0";

package/dist/types/types/editor-props.d.ts

@@ -187,6 +187,12 @@ export interface EditorPluginFeatureProps {
     allowBreakout?: boolean;
     allowRule?: boolean;
     allowHelpDialog?: boolean;
+    /**
+     * @deprecated
+     * This was a temporary setting for Confluence until we shipped smart cards. **Please do not use.*
+     * We have now shipped and no-longer require.
+     * This will be deprecated very soon.
+     */
     allowJiraIssue?: boolean;
     allowPanel?: boolean | PanelPluginConfig;
     allowExtension?: boolean | ExtensionConfig;

package/dist/types-ts4.5/types/editor-props.d.ts

@@ -187,6 +187,12 @@ export interface EditorPluginFeatureProps {
     allowBreakout?: boolean;
     allowRule?: boolean;
     allowHelpDialog?: boolean;
+    /**
+     * @deprecated
+     * This was a temporary setting for Confluence until we shipped smart cards. **Please do not use.*
+     * We have now shipped and no-longer require.
+     * This will be deprecated very soon.
+     */
     allowJiraIssue?: boolean;
     allowPanel?: boolean | PanelPluginConfig;
     allowExtension?: boolean | ExtensionConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "190.1.30",
+  "version": "190.2.0",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -375,6 +375,9 @@
     "platform.editor.table.in-danger-hover-merged-cells-fix": {
       "type": "boolean",
       "referenceOnly": "true"
+    },
+    "platform.editor.deprecate-jira-issue-plugin": {
+      "type": "boolean"
     }
   }
 }