@atlaskit/editor-plugin-status 2.1.1 → 2.1.3

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-status
 
+## 2.1.3
+
+### Patch Changes
+
+- [#122612](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/122612)
+  [`01a85ce0a88ec`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/01a85ce0a88ec) -
+  [ux] ED-23705 Add logic to handle annotations on inline nodes when they are inserted or pasted.
+  Covers the following inline nodes: emoji, status, mention, date, inlineCard
+
+## 2.1.2
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.1.1
 
 ### Patch Changes

package/dist/cjs/actions.js

@@ -9,9 +9,11 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
+var _utils = require("@atlaskit/editor-common/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _pluginKey = require("./pm-plugins/plugin-key");
 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; }
@@ -19,9 +21,9 @@ var DEFAULT_STATUS = exports.DEFAULT_STATUS = {
   text: '',
   color: 'neutral'
 };
-var verifyAndInsertStatus = exports.verifyAndInsertStatus = function verifyAndInsertStatus(statusNode, tr) {
-  var fragment = _model.Fragment.fromArray([statusNode, tr.doc.type.schema.text(' ')]);
-  var insertable = (0, _utils.canInsert)(tr.selection.$from, fragment);
+var verifyAndInsertStatus = exports.verifyAndInsertStatus = function verifyAndInsertStatus(statusNode, tr, annotationMarks) {
+  var fragment = _model.Fragment.fromArray([statusNode, tr.doc.type.schema.text(' ', (0, _platformFeatureFlags.fg)('editor_inline_comments_paste_insert_nodes') ? annotationMarks : undefined)]);
+  var insertable = (0, _utils2.canInsert)(tr.selection.$from, fragment);
   if (!insertable) {
     var parentSelection = _state.NodeSelection.create(tr.doc, tr.selection.from - tr.selection.$anchor.parentOffset - 1);
     tr.insert(parentSelection.to, fragment).setSelection(_state.NodeSelection.create(tr.doc, parentSelection.to + 1));
@@ -34,10 +36,11 @@ var verifyAndInsertStatus = exports.verifyAndInsertStatus = function verifyAndIn
   }).scrollIntoView();
 };
 var createStatus = exports.createStatus = function createStatus(tr) {
+  var annotationMarksForPos = (0, _platformFeatureFlags.fg)('editor_inline_comments_paste_insert_nodes') ? (0, _utils.getAnnotationMarksForPos)(tr.selection.$head) : undefined;
   var statusNode = tr.doc.type.schema.nodes.status.createChecked(_objectSpread(_objectSpread({}, DEFAULT_STATUS), {}, {
     localId: _adfSchema.uuid.generate()
-  }));
-  return verifyAndInsertStatus(statusNode, tr);
+  }), null, (0, _platformFeatureFlags.fg)('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
+  return verifyAndInsertStatus(statusNode, tr, (0, _platformFeatureFlags.fg)('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
 };
 var insertStatus = exports.insertStatus = function insertStatus(editorAnalyticsAPI) {
   return function () {

package/dist/cjs/nodeviews/status.js

@@ -10,7 +10,10 @@ var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _messages = require("@atlaskit/editor-common/messages");
 var _element = require("@atlaskit/status/element");
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 

package/dist/cjs/ui/statusPicker.js

@@ -24,7 +24,10 @@ var _constants = require("@atlaskit/theme/constants");
 var _actions = require("../actions");
 var _analytics = require("../analytics");
 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() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /** @jsx jsx */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var PopupWithListeners = (0, _uiReact.withReactEditorViewOuterListeners)(_ui.Popup);
 var InputMethod = exports.InputMethod = /*#__PURE__*/function (InputMethod) {
   InputMethod["blur"] = "blur";

package/dist/es2019/actions.js

@@ -1,16 +1,18 @@
 import { uuid } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
+import { getAnnotationMarksForPos } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
 import { canInsert } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { pluginKey } from './pm-plugins/plugin-key';
 export const DEFAULT_STATUS = {
   text: '',
   color: 'neutral'
 };
-export const verifyAndInsertStatus = (statusNode, tr) => {
-  const fragment = Fragment.fromArray([statusNode, tr.doc.type.schema.text(' ')]);
+export const verifyAndInsertStatus = (statusNode, tr, annotationMarks) => {
+  const fragment = Fragment.fromArray([statusNode, tr.doc.type.schema.text(' ', fg('editor_inline_comments_paste_insert_nodes') ? annotationMarks : undefined)]);
   const insertable = canInsert(tr.selection.$from, fragment);
   if (!insertable) {
     const parentSelection = NodeSelection.create(tr.doc, tr.selection.from - tr.selection.$anchor.parentOffset - 1);
@@ -24,11 +26,12 @@ export const verifyAndInsertStatus = (statusNode, tr) => {
   }).scrollIntoView();
 };
 export const createStatus = tr => {
+  const annotationMarksForPos = fg('editor_inline_comments_paste_insert_nodes') ? getAnnotationMarksForPos(tr.selection.$head) : undefined;
   const statusNode = tr.doc.type.schema.nodes.status.createChecked({
     ...DEFAULT_STATUS,
     localId: uuid.generate()
-  });
-  return verifyAndInsertStatus(statusNode, tr);
+  }, null, fg('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
+  return verifyAndInsertStatus(statusNode, tr, fg('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
 };
 export const insertStatus = editorAnalyticsAPI => (inputMethod = INPUT_METHOD.TOOLBAR) => ({
   tr

package/dist/es2019/nodeviews/status.js

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import React from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

package/dist/es2019/ui/statusPicker.js

@@ -1,5 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 
 import React from 'react';
 

package/dist/esm/actions.js

@@ -4,16 +4,18 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { uuid } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
+import { getAnnotationMarksForPos } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
 import { canInsert } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { pluginKey } from './pm-plugins/plugin-key';
 export var DEFAULT_STATUS = {
   text: '',
   color: 'neutral'
 };
-export var verifyAndInsertStatus = function verifyAndInsertStatus(statusNode, tr) {
-  var fragment = Fragment.fromArray([statusNode, tr.doc.type.schema.text(' ')]);
+export var verifyAndInsertStatus = function verifyAndInsertStatus(statusNode, tr, annotationMarks) {
+  var fragment = Fragment.fromArray([statusNode, tr.doc.type.schema.text(' ', fg('editor_inline_comments_paste_insert_nodes') ? annotationMarks : undefined)]);
   var insertable = canInsert(tr.selection.$from, fragment);
   if (!insertable) {
     var parentSelection = NodeSelection.create(tr.doc, tr.selection.from - tr.selection.$anchor.parentOffset - 1);
@@ -27,10 +29,11 @@ export var verifyAndInsertStatus = function verifyAndInsertStatus(statusNode, tr
   }).scrollIntoView();
 };
 export var createStatus = function createStatus(tr) {
+  var annotationMarksForPos = fg('editor_inline_comments_paste_insert_nodes') ? getAnnotationMarksForPos(tr.selection.$head) : undefined;
   var statusNode = tr.doc.type.schema.nodes.status.createChecked(_objectSpread(_objectSpread({}, DEFAULT_STATUS), {}, {
     localId: uuid.generate()
-  }));
-  return verifyAndInsertStatus(statusNode, tr);
+  }), null, fg('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
+  return verifyAndInsertStatus(statusNode, tr, fg('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
 };
 export var insertStatus = function insertStatus(editorAnalyticsAPI) {
   return function () {

package/dist/esm/nodeviews/status.js

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import React from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

package/dist/esm/ui/statusPicker.js

@@ -7,7 +7,10 @@ import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 
 import React from 'react';
 

package/dist/types/actions.d.ts

@@ -1,12 +1,13 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { Command, CommandDispatch, EditorCommand, TOOLBAR_MENU_TYPE } from '@atlaskit/editor-common/types';
+import { type Mark } from '@atlaskit/editor-prosemirror/model';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { ClosingPayload, StatusType } from './types';
 export declare const DEFAULT_STATUS: StatusType;
-export declare const verifyAndInsertStatus: (statusNode: Node, tr: Transaction) => Transaction;
+export declare const verifyAndInsertStatus: (statusNode: Node, tr: Transaction, annotationMarks?: Mark[] | undefined) => Transaction;
 export declare const createStatus: (tr: Transaction) => Transaction;
 export declare const insertStatus: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputMethod?: INPUT_METHOD.INSERT_MENU | INPUT_METHOD.QUICK_INSERT | INPUT_METHOD.TOOLBAR) => EditorCommand;
 export declare const updateStatus: (status?: StatusType) => Command;

package/dist/types/nodeviews/status.d.ts

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import React from 'react';
 import { jsx } from '@emotion/react';
 import type { IntlShape } from 'react-intl-next';

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

@@ -1,12 +1,13 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { Command, CommandDispatch, EditorCommand, TOOLBAR_MENU_TYPE } from '@atlaskit/editor-common/types';
+import { type Mark } from '@atlaskit/editor-prosemirror/model';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { ClosingPayload, StatusType } from './types';
 export declare const DEFAULT_STATUS: StatusType;
-export declare const verifyAndInsertStatus: (statusNode: Node, tr: Transaction) => Transaction;
+export declare const verifyAndInsertStatus: (statusNode: Node, tr: Transaction, annotationMarks?: Mark[] | undefined) => Transaction;
 export declare const createStatus: (tr: Transaction) => Transaction;
 export declare const insertStatus: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputMethod?: INPUT_METHOD.INSERT_MENU | INPUT_METHOD.QUICK_INSERT | INPUT_METHOD.TOOLBAR) => EditorCommand;
 export declare const updateStatus: (status?: StatusType) => Command;

package/dist/types-ts4.5/nodeviews/status.d.ts

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import React from 'react';
 import { jsx } from '@emotion/react';
 import type { IntlShape } from 'react-intl-next';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-status",
-	"version": "2.1.1",
+	"version": "2.1.3",
 	"description": "Status plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -35,13 +35,14 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^39.0.3",
 		"@atlaskit/analytics-next": "^9.3.0",
-		"@atlaskit/editor-common": "^85.0.0",
+		"@atlaskit/editor-common": "^86.4.0",
 		"@atlaskit/editor-plugin-analytics": "^1.4.0",
 		"@atlaskit/editor-prosemirror": "4.0.1",
 		"@atlaskit/editor-shared-styles": "^2.13.0",
+		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/status": "^1.4.0",
 		"@atlaskit/theme": "^12.11.0",
-		"@atlaskit/tokens": "^1.54.0",
+		"@atlaskit/tokens": "^1.56.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
 	},
@@ -90,5 +91,10 @@
 				"import-no-extraneous-disable-for-examples-and-docs"
 			]
 		}
+	},
+	"platform-feature-flags": {
+		"editor_inline_comments_paste_insert_nodes": {
+			"type": "boolean"
+		}
 	}
 }