@atlaskit/editor-core 190.1.28 → 190.2.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @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
+
+- [#64152](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/64152) [`4bc51e1731ba`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4bc51e1731ba) - [ux] Added a table selector button to the full page toolbar and button styles
+- [#64193](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/64193) [`5b5fa24e7856`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5b5fa24e7856) - [ux] Fixed floating toolbar position for multiBodiedExtension
+- Updated dependencies
+
 ## 190.1.28
 
 ### Patch Changes

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

@@ -163,6 +163,31 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(_ref
           return extensionState.element.parentElement || undefined;
         },
         nodeType: nodeType,
+        onPositionCalculated: function onPositionCalculated(editorView, nextPos) {
+          var _editorView$state = editorView.state,
+            schema = _editorView$state.schema,
+            selection = _editorView$state.selection;
+          var mbeNode = (0, _utils2.getSelectedExtension)(state, true);
+          var mbeFrame = (0, _utils.findParentNodeOfType)(schema.nodes.extensionFrame)(selection);
+          if (!mbeNode || !mbeFrame) {
+            return nextPos;
+          }
+          var mbeDomElement = editorView.nodeDOM(mbeNode.pos);
+          var mbeFrameElement = editorView.nodeDOM(mbeFrame.pos);
+          var mbeNodeRect = mbeDomElement === null || mbeDomElement === void 0 ? void 0 : mbeDomElement.getBoundingClientRect();
+          var mbeFrameRect = mbeFrameElement.getBoundingClientRect();
+
+          /**
+           * MbeNodeRect height will include mbeFrameRect height and the navigation toolbar of the MBE
+           * excluding nav toolbar height from the floaing extention toolbar position calculated.
+           * adding 15px extra for the spacing between MBE node and floating toolbar.
+           *
+           */
+          return {
+            top: mbeNodeRect.top + mbeFrameRect.height + 15,
+            left: nextPos.left
+          };
+        },
         items: [].concat((0, _toConsumableArray2.default)(editButtonArray), (0, _toConsumableArray2.default)(breakoutButtonArray), [{
           type: 'separator',
           hidden: editButtonArray.length === 0 && breakoutButtonArray.length === 0

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;
@@ -366,6 +366,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
     allowExpand: isExpandInsertionEnabled(props),
     insertMenuItems: props.insertMenuItems,
     horizontalRuleEnabled: props.allowRule,
+    tableSelectorSupported: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.insert-block.table-selector-button') && isFullPage,
     nativeStatusSupported: !statusMenuDisabled,
     showElementBrowserLink: props.elementBrowser && props.elementBrowser.showModal || false,
     replacePlusMenuWithElementBrowser: props.elementBrowser && props.elementBrowser.replacePlusMenu || false

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.28";
+var version = exports.version = "190.2.0";

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

@@ -12,6 +12,7 @@ import { getSelectedExtension } from './utils';
 import { updateExtensionLayout, removeExtension, removeDescendantNodes } from './commands';
 import { pluginKey as macroPluginKey } from './pm-plugins/macro/plugin-key';
 import { isReferencedSource, getChildrenInfo, getNodeName } from '@atlaskit/editor-common/utils';
+import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 export const messages = defineMessages({
   edit: {
     id: 'fabric.editor.edit',
@@ -157,6 +158,34 @@ export const getToolbarConfig = ({
       title: 'Extension floating controls',
       getDomRef: () => extensionState.element.parentElement || undefined,
       nodeType,
+      onPositionCalculated: (editorView, nextPos) => {
+        const {
+          state: {
+            schema,
+            selection
+          }
+        } = editorView;
+        const mbeNode = getSelectedExtension(state, true);
+        const mbeFrame = findParentNodeOfType(schema.nodes.extensionFrame)(selection);
+        if (!mbeNode || !mbeFrame) {
+          return nextPos;
+        }
+        const mbeDomElement = editorView.nodeDOM(mbeNode.pos);
+        const mbeFrameElement = editorView.nodeDOM(mbeFrame.pos);
+        const mbeNodeRect = mbeDomElement === null || mbeDomElement === void 0 ? void 0 : mbeDomElement.getBoundingClientRect();
+        const mbeFrameRect = mbeFrameElement.getBoundingClientRect();
+
+        /**
+         * MbeNodeRect height will include mbeFrameRect height and the navigation toolbar of the MBE
+         * excluding nav toolbar height from the floaing extention toolbar position calculated.
+         * adding 15px extra for the spacing between MBE node and floating toolbar.
+         *
+         */
+        return {
+          top: mbeNodeRect.top + mbeFrameRect.height + 15,
+          left: nextPos.left
+        };
+      },
       items: [...editButtonArray, ...breakoutButtonArray, {
         type: 'separator',
         hidden: editButtonArray.length === 0 && breakoutButtonArray.length === 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;
@@ -363,6 +363,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     allowExpand: isExpandInsertionEnabled(props),
     insertMenuItems: props.insertMenuItems,
     horizontalRuleEnabled: props.allowRule,
+    tableSelectorSupported: getBooleanFF('platform.editor.insert-block.table-selector-button') && isFullPage,
     nativeStatusSupported: !statusMenuDisabled,
     showElementBrowserLink: props.elementBrowser && props.elementBrowser.showModal || false,
     replacePlusMenuWithElementBrowser: props.elementBrowser && props.elementBrowser.replacePlusMenu || false

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.28";
+export const version = "190.2.0";

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

@@ -13,6 +13,7 @@ import { getSelectedExtension } from './utils';
 import { updateExtensionLayout, removeExtension, removeDescendantNodes } from './commands';
 import { pluginKey as macroPluginKey } from './pm-plugins/macro/plugin-key';
 import { isReferencedSource, getChildrenInfo as _getChildrenInfo, getNodeName } from '@atlaskit/editor-common/utils';
+import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 export var messages = defineMessages({
   edit: {
     id: 'fabric.editor.edit',
@@ -156,6 +157,31 @@ export var getToolbarConfig = function getToolbarConfig(_ref) {
           return extensionState.element.parentElement || undefined;
         },
         nodeType: nodeType,
+        onPositionCalculated: function onPositionCalculated(editorView, nextPos) {
+          var _editorView$state = editorView.state,
+            schema = _editorView$state.schema,
+            selection = _editorView$state.selection;
+          var mbeNode = getSelectedExtension(state, true);
+          var mbeFrame = findParentNodeOfType(schema.nodes.extensionFrame)(selection);
+          if (!mbeNode || !mbeFrame) {
+            return nextPos;
+          }
+          var mbeDomElement = editorView.nodeDOM(mbeNode.pos);
+          var mbeFrameElement = editorView.nodeDOM(mbeFrame.pos);
+          var mbeNodeRect = mbeDomElement === null || mbeDomElement === void 0 ? void 0 : mbeDomElement.getBoundingClientRect();
+          var mbeFrameRect = mbeFrameElement.getBoundingClientRect();
+
+          /**
+           * MbeNodeRect height will include mbeFrameRect height and the navigation toolbar of the MBE
+           * excluding nav toolbar height from the floaing extention toolbar position calculated.
+           * adding 15px extra for the spacing between MBE node and floating toolbar.
+           *
+           */
+          return {
+            top: mbeNodeRect.top + mbeFrameRect.height + 15,
+            left: nextPos.left
+          };
+        },
         items: [].concat(_toConsumableArray(editButtonArray), _toConsumableArray(breakoutButtonArray), [{
           type: 'separator',
           hidden: editButtonArray.length === 0 && breakoutButtonArray.length === 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;
@@ -358,6 +358,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     allowExpand: isExpandInsertionEnabled(props),
     insertMenuItems: props.insertMenuItems,
     horizontalRuleEnabled: props.allowRule,
+    tableSelectorSupported: getBooleanFF('platform.editor.insert-block.table-selector-button') && isFullPage,
     nativeStatusSupported: !statusMenuDisabled,
     showElementBrowserLink: props.elementBrowser && props.elementBrowser.showModal || false,
     replacePlusMenuWithElementBrowser: props.elementBrowser && props.elementBrowser.replacePlusMenu || false

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.28";
+export var version = "190.2.0";

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

@@ -7,3 +7,9 @@ export declare const getSelectedDomElement: (schema: Schema, domAtPos: DomAtPos,
 export declare const getDataConsumerMark: (newNode: PMNode) => Mark | undefined;
 export declare const getNodeTypesReferenced: (ids: string[], state: EditorState) => string[];
 export declare const findNodePosWithLocalId: (state: EditorState, localId: string) => NodeWithPos | undefined;
+export interface Position {
+    top?: number;
+    right?: number;
+    bottom?: number;
+    left?: number;
+}

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/plugins/extension/utils.d.ts

@@ -7,3 +7,9 @@ export declare const getSelectedDomElement: (schema: Schema, domAtPos: DomAtPos,
 export declare const getDataConsumerMark: (newNode: PMNode) => Mark | undefined;
 export declare const getNodeTypesReferenced: (ids: string[], state: EditorState) => string[];
 export declare const findNodePosWithLocalId: (state: EditorState, localId: string) => NodeWithPos | undefined;
+export interface Position {
+    top?: number;
+    right?: number;
+    bottom?: number;
+    left?: number;
+}

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.28",
+  "version": "190.2.0",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -52,7 +52,7 @@
     "@atlaskit/checkbox": "^13.0.0",
     "@atlaskit/date": "^0.10.0",
     "@atlaskit/datetime-picker": "^13.0.3",
-    "@atlaskit/editor-common": "^76.31.0",
+    "@atlaskit/editor-common": "^76.33.0",
     "@atlaskit/editor-json-transformer": "^8.10.0",
     "@atlaskit/editor-plugin-alignment": "^0.1.0",
     "@atlaskit/editor-plugin-analytics": "^0.4.0",
@@ -63,7 +63,7 @@
     "@atlaskit/editor-plugin-border": "^0.1.0",
     "@atlaskit/editor-plugin-breakout": "^0.1.0",
     "@atlaskit/editor-plugin-caption": "^0.2.0",
-    "@atlaskit/editor-plugin-card": "^0.14.0",
+    "@atlaskit/editor-plugin-card": "^0.15.0",
     "@atlaskit/editor-plugin-clear-marks-on-empty-doc": "^0.1.0",
     "@atlaskit/editor-plugin-clipboard": "^0.1.0",
     "@atlaskit/editor-plugin-code-bidi-warning": "^0.1.0",
@@ -143,7 +143,7 @@
     "@atlaskit/textfield": "^6.0.0",
     "@atlaskit/theme": "^12.6.0",
     "@atlaskit/toggle": "^13.0.0",
-    "@atlaskit/tokens": "^1.32.0",
+    "@atlaskit/tokens": "^1.33.0",
     "@atlaskit/tooltip": "^18.1.0",
     "@atlaskit/ufo": "^0.2.0",
     "@atlaskit/width-detector": "^4.1.0",
@@ -310,6 +310,9 @@
       "type": "boolean",
       "referenceOnly": "true"
     },
+    "platform.editor.insert-block.table-selector-button": {
+      "type": "boolean"
+    },
     "platform.editor.enable-selection-toolbar_ucdwd": {
       "type": "boolean"
     },
@@ -372,6 +375,9 @@
     "platform.editor.table.in-danger-hover-merged-cells-fix": {
       "type": "boolean",
       "referenceOnly": "true"
+    },
+    "platform.editor.deprecate-jira-issue-plugin": {
+      "type": "boolean"
     }
   }
 }