@atlaskit/editor-plugin-status 0.2.0 → 0.2.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-status
 
+## 0.2.1
+
+### Patch Changes
+
+- [#42564](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42564) [`7139d6b0a64`](https://bitbucket.org/atlassian/atlassian-frontend/commits/7139d6b0a64) - ED-20512 Fixed issue with adding status node inside a codeblock
+
 ## 0.2.0
 
 ### Minor Changes

package/dist/cjs/actions.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateStatusWithAnalytics = exports.updateStatus = exports.setStatusPickerAt = exports.setFocusOnStatusInput = exports.removeStatus = exports.createStatus = exports.commitStatusPicker = exports.DEFAULT_STATUS = void 0;
+exports.verifyAndInsertStatus = exports.updateStatusWithAnalytics = exports.updateStatus = exports.setStatusPickerAt = exports.setFocusOnStatusInput = exports.removeStatus = exports.createStatus = exports.commitStatusPicker = exports.DEFAULT_STATUS = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -19,22 +19,26 @@ var DEFAULT_STATUS = exports.DEFAULT_STATUS = {
   text: '',
   color: 'neutral'
 };
-var createStatus = exports.createStatus = function createStatus() {
-  var showStatusPickerAtOffset = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-  return function (insert, state) {
-    var statusNode = state.schema.nodes.status.createChecked(_objectSpread(_objectSpread({}, DEFAULT_STATUS), {}, {
-      localId: _adfSchema.uuid.generate()
-    }));
-    var space = state.schema.text(' ');
-    var tr = insert(_model.Fragment.from([statusNode, space]), {
-      selectInlineNode: true
-    });
-    var showStatusPickerAt = tr.selection.from + showStatusPickerAtOffset;
-    return tr.setSelection(_state.NodeSelection.create(tr.doc, showStatusPickerAt)).setMeta(_pluginKey.pluginKey, {
-      showStatusPickerAt: showStatusPickerAt,
-      isNew: true
-    });
-  };
+var verifyAndInsertStatus = exports.verifyAndInsertStatus = function verifyAndInsertStatus(statusNode, state) {
+  var fragment = _model.Fragment.fromArray([statusNode, state.schema.text(' ')]);
+  var tr = state.tr;
+  var insertable = (0, _utils.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));
+  } else {
+    tr.insert(tr.selection.from, fragment).setSelection(_state.NodeSelection.create(tr.doc, tr.selection.from - fragment.size));
+  }
+  return tr.setMeta(_pluginKey.pluginKey, {
+    showStatusPickerAt: tr.selection.from,
+    isNew: true
+  }).scrollIntoView();
+};
+var createStatus = exports.createStatus = function createStatus(state) {
+  var statusNode = state.schema.nodes.status.createChecked(_objectSpread(_objectSpread({}, DEFAULT_STATUS), {}, {
+    localId: _adfSchema.uuid.generate()
+  }));
+  return verifyAndInsertStatus(statusNode, state);
 };
 var updateStatus = exports.updateStatus = function updateStatus(status) {
   return function (state, dispatch) {
@@ -50,18 +54,7 @@ var updateStatus = exports.updateStatus = function updateStatus(status) {
     if (!showStatusPickerAt) {
       // Same behaviour as quick insert (used in createStatus)
       var statusNode = schema.nodes.status.createChecked(statusProps);
-      var fragment = _model.Fragment.fromArray([statusNode, state.schema.text(' ')]);
-      var insertable = (0, _utils.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));
-      } else {
-        tr.insert(tr.selection.from, fragment).setSelection(_state.NodeSelection.create(tr.doc, tr.selection.from - fragment.size));
-      }
-      tr.setMeta(_pluginKey.pluginKey, {
-        showStatusPickerAt: tr.selection.from,
-        isNew: true
-      }).scrollIntoView();
+      tr = verifyAndInsertStatus(statusNode, state);
       if (dispatch) {
         dispatch(tr);
       }

package/dist/cjs/plugin.js

@@ -119,7 +119,7 @@ var decorateWithPluginOptions = function decorateWithPluginOptions(plugin, optio
         },
         action: function action(insert, state) {
           var _api$analytics2;
-          var tr = (0, _actions.createStatus)()(insert, state);
+          var tr = (0, _actions.createStatus)(state);
           api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
             action: _analytics.ACTION.INSERTED,
             actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,

package/dist/es2019/actions.js

@@ -9,20 +9,27 @@ export const DEFAULT_STATUS = {
   text: '',
   color: 'neutral'
 };
-export const createStatus = (showStatusPickerAtOffset = 0) => (insert, state) => {
+export const verifyAndInsertStatus = (statusNode, state) => {
+  const fragment = Fragment.fromArray([statusNode, state.schema.text(' ')]);
+  const tr = state.tr;
+  const insertable = canInsert(tr.selection.$from, fragment);
+  if (!insertable) {
+    const parentSelection = NodeSelection.create(tr.doc, tr.selection.from - tr.selection.$anchor.parentOffset - 1);
+    tr.insert(parentSelection.to, fragment).setSelection(NodeSelection.create(tr.doc, parentSelection.to + 1));
+  } else {
+    tr.insert(tr.selection.from, fragment).setSelection(NodeSelection.create(tr.doc, tr.selection.from - fragment.size));
+  }
+  return tr.setMeta(pluginKey, {
+    showStatusPickerAt: tr.selection.from,
+    isNew: true
+  }).scrollIntoView();
+};
+export const createStatus = state => {
   const statusNode = state.schema.nodes.status.createChecked({
     ...DEFAULT_STATUS,
     localId: uuid.generate()
   });
-  const space = state.schema.text(' ');
-  const tr = insert(Fragment.from([statusNode, space]), {
-    selectInlineNode: true
-  });
-  const showStatusPickerAt = tr.selection.from + showStatusPickerAtOffset;
-  return tr.setSelection(NodeSelection.create(tr.doc, showStatusPickerAt)).setMeta(pluginKey, {
-    showStatusPickerAt,
-    isNew: true
-  });
+  return verifyAndInsertStatus(statusNode, state);
 };
 export const updateStatus = status => (state, dispatch) => {
   const {
@@ -43,18 +50,7 @@ export const updateStatus = status => (state, dispatch) => {
   if (!showStatusPickerAt) {
     // Same behaviour as quick insert (used in createStatus)
     const statusNode = schema.nodes.status.createChecked(statusProps);
-    const fragment = Fragment.fromArray([statusNode, state.schema.text(' ')]);
-    const insertable = canInsert(tr.selection.$from, fragment);
-    if (!insertable) {
-      const parentSelection = NodeSelection.create(tr.doc, tr.selection.from - tr.selection.$anchor.parentOffset - 1);
-      tr.insert(parentSelection.to, fragment).setSelection(NodeSelection.create(tr.doc, parentSelection.to + 1));
-    } else {
-      tr.insert(tr.selection.from, fragment).setSelection(NodeSelection.create(tr.doc, tr.selection.from - fragment.size));
-    }
-    tr.setMeta(pluginKey, {
-      showStatusPickerAt: tr.selection.from,
-      isNew: true
-    }).scrollIntoView();
+    tr = verifyAndInsertStatus(statusNode, state);
     if (dispatch) {
       dispatch(tr);
     }

package/dist/es2019/plugin.js

@@ -113,7 +113,7 @@ const decorateWithPluginOptions = (plugin, options, api) => {
       icon: () => /*#__PURE__*/React.createElement(IconStatus, null),
       action(insert, state) {
         var _api$analytics2;
-        const tr = createStatus()(insert, state);
+        const tr = createStatus(state);
         api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions.attachAnalyticsEvent({
           action: ACTION.INSERTED,
           actionSubject: ACTION_SUBJECT.DOCUMENT,

package/dist/esm/actions.js

@@ -12,22 +12,26 @@ export var DEFAULT_STATUS = {
   text: '',
   color: 'neutral'
 };
-export var createStatus = function createStatus() {
-  var showStatusPickerAtOffset = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-  return function (insert, state) {
-    var statusNode = state.schema.nodes.status.createChecked(_objectSpread(_objectSpread({}, DEFAULT_STATUS), {}, {
-      localId: uuid.generate()
-    }));
-    var space = state.schema.text(' ');
-    var tr = insert(Fragment.from([statusNode, space]), {
-      selectInlineNode: true
-    });
-    var showStatusPickerAt = tr.selection.from + showStatusPickerAtOffset;
-    return tr.setSelection(NodeSelection.create(tr.doc, showStatusPickerAt)).setMeta(pluginKey, {
-      showStatusPickerAt: showStatusPickerAt,
-      isNew: true
-    });
-  };
+export var verifyAndInsertStatus = function verifyAndInsertStatus(statusNode, state) {
+  var fragment = Fragment.fromArray([statusNode, state.schema.text(' ')]);
+  var tr = state.tr;
+  var insertable = canInsert(tr.selection.$from, fragment);
+  if (!insertable) {
+    var parentSelection = NodeSelection.create(tr.doc, tr.selection.from - tr.selection.$anchor.parentOffset - 1);
+    tr.insert(parentSelection.to, fragment).setSelection(NodeSelection.create(tr.doc, parentSelection.to + 1));
+  } else {
+    tr.insert(tr.selection.from, fragment).setSelection(NodeSelection.create(tr.doc, tr.selection.from - fragment.size));
+  }
+  return tr.setMeta(pluginKey, {
+    showStatusPickerAt: tr.selection.from,
+    isNew: true
+  }).scrollIntoView();
+};
+export var createStatus = function createStatus(state) {
+  var statusNode = state.schema.nodes.status.createChecked(_objectSpread(_objectSpread({}, DEFAULT_STATUS), {}, {
+    localId: uuid.generate()
+  }));
+  return verifyAndInsertStatus(statusNode, state);
 };
 export var updateStatus = function updateStatus(status) {
   return function (state, dispatch) {
@@ -43,18 +47,7 @@ export var updateStatus = function updateStatus(status) {
     if (!showStatusPickerAt) {
       // Same behaviour as quick insert (used in createStatus)
       var statusNode = schema.nodes.status.createChecked(statusProps);
-      var fragment = Fragment.fromArray([statusNode, state.schema.text(' ')]);
-      var insertable = canInsert(tr.selection.$from, fragment);
-      if (!insertable) {
-        var parentSelection = NodeSelection.create(tr.doc, tr.selection.from - tr.selection.$anchor.parentOffset - 1);
-        tr.insert(parentSelection.to, fragment).setSelection(NodeSelection.create(tr.doc, parentSelection.to + 1));
-      } else {
-        tr.insert(tr.selection.from, fragment).setSelection(NodeSelection.create(tr.doc, tr.selection.from - fragment.size));
-      }
-      tr.setMeta(pluginKey, {
-        showStatusPickerAt: tr.selection.from,
-        isNew: true
-      }).scrollIntoView();
+      tr = verifyAndInsertStatus(statusNode, state);
       if (dispatch) {
         dispatch(tr);
       }

package/dist/esm/plugin.js

@@ -112,7 +112,7 @@ var decorateWithPluginOptions = function decorateWithPluginOptions(plugin, optio
         },
         action: function action(insert, state) {
           var _api$analytics2;
-          var tr = createStatus()(insert, state);
+          var tr = createStatus(state);
           api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
             action: ACTION.INSERTED,
             actionSubject: ACTION_SUBJECT.DOCUMENT,

package/dist/types/actions.d.ts

@@ -1,12 +1,12 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Command, CommandDispatch, EditorCommand, TOOLBAR_MENU_TYPE } from '@atlaskit/editor-common/types';
+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 createStatus: (showStatusPickerAtOffset?: number) => (insert: (node: Node | Object | string, opts: {
-    selectInlineNode: boolean;
-}) => Transaction, state: EditorState) => Transaction;
+export declare const verifyAndInsertStatus: (statusNode: Node, state: EditorState) => Transaction;
+export declare const createStatus: (state: EditorState) => Transaction;
 export declare const updateStatus: (status?: StatusType) => Command;
 export type UpdateStatus = (inputMethod: TOOLBAR_MENU_TYPE, status?: StatusType) => Command;
 export declare const updateStatusWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputMethod: TOOLBAR_MENU_TYPE, status?: StatusType) => Command;

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

@@ -1,12 +1,12 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Command, CommandDispatch, EditorCommand, TOOLBAR_MENU_TYPE } from '@atlaskit/editor-common/types';
+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 createStatus: (showStatusPickerAtOffset?: number) => (insert: (node: Node | Object | string, opts: {
-    selectInlineNode: boolean;
-}) => Transaction, state: EditorState) => Transaction;
+export declare const verifyAndInsertStatus: (statusNode: Node, state: EditorState) => Transaction;
+export declare const createStatus: (state: EditorState) => Transaction;
 export declare const updateStatus: (status?: StatusType) => Command;
 export type UpdateStatus = (inputMethod: TOOLBAR_MENU_TYPE, status?: StatusType) => Command;
 export declare const updateStatusWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputMethod: TOOLBAR_MENU_TYPE, status?: StatusType) => Command;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-status",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Status plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@atlaskit/adf-schema": "^32.0.0",
     "@atlaskit/analytics-next": "^9.1.0",
-    "@atlaskit/editor-common": "^76.17.0",
+    "@atlaskit/editor-common": "^76.18.0",
     "@atlaskit/editor-plugin-analytics": "^0.3.0",
     "@atlaskit/editor-prosemirror": "1.1.0",
     "@atlaskit/editor-shared-styles": "^2.8.0",