@atlaskit/editor-core 185.12.1 → 185.13.0

package/dist/esm/plugins/expand/commands.js

@@ -2,12 +2,12 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 import { TextSelection } from 'prosemirror-state';
-import { safeInsert } from 'prosemirror-utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
 import { addAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE, PLATFORMS, MODE } from '../analytics';
 import { GapCursorSelection, Side } from '../selection/gap-cursor-selection';
 import { findExpand } from './utils';
 import { createCommand } from './pm-plugins/plugin-factory';
+import { createWrapSelectionTransaction } from '../block-type/commands/block-type';
 export var setExpandRef = function setExpandRef(ref) {
   return createCommand({
     type: 'SET_EXPAND_REF',
@@ -105,6 +105,10 @@ export var createExpandNode = function createExpandNode(state) {
 };
 export var insertExpand = function insertExpand(state, dispatch) {
   var expandNode = createExpandNode(state);
+  var tr = createWrapSelectionTransaction({
+    state: state,
+    type: state.schema.nodes.expand
+  });
   var payload = {
     action: ACTION.INSERTED,
     actionSubject: ACTION_SUBJECT.DOCUMENT,
@@ -115,7 +119,7 @@ export var insertExpand = function insertExpand(state, dispatch) {
     eventType: EVENT_TYPE.TRACK
   };
   if (dispatch && expandNode) {
-    dispatch(addAnalytics(state, safeInsert(expandNode)(state.tr).scrollIntoView(), payload));
+    dispatch(addAnalytics(state, tr, payload));
   }
   return true;
 };

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

@@ -8,6 +8,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, IN
 import { getToolbarConfig } from './toolbar';
 import { createExpandNode } from './commands';
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
+import { createWrapSelectionTransaction } from '../block-type/commands/block-type';
 var expandPlugin = function expandPlugin() {
   var _api$dependencies, _api$dependencies$fea;
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -58,7 +59,10 @@ var expandPlugin = function expandPlugin() {
             if (!node) {
               return false;
             }
-            var tr = insert(node);
+            var tr = createWrapSelectionTransaction({
+              state: state,
+              type: state.schema.nodes.expand
+            });
             return addAnalytics(state, tr, {
               action: ACTION.INSERTED,
               actionSubject: ACTION_SUBJECT.DOCUMENT,

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

@@ -8,25 +8,10 @@ import { IconPanel, IconPanelNote, IconPanelSuccess, IconPanelWarning, IconPanel
 import { messages } from '../block-type/messages';
 import IconCustomPanel from '../quick-insert/assets/custom-panel';
 import { T50 } from '@atlaskit/theme/colors';
-var insertPanelTypeWithAnalytics = function insertPanelTypeWithAnalytics(panelAttributes, state, insert) {
-  var tr = insert(insertPanelType(panelAttributes, state));
-  if (tr) {
-    addAnalytics(state, tr, {
-      action: ACTION.INSERTED,
-      actionSubject: ACTION_SUBJECT.DOCUMENT,
-      actionSubjectId: ACTION_SUBJECT_ID.PANEL,
-      attributes: {
-        inputMethod: INPUT_METHOD.QUICK_INSERT,
-        panelType: panelAttributes.panelType
-      },
-      eventType: EVENT_TYPE.TRACK
-    });
-  }
-  return tr;
-};
-var insertPanelType = function insertPanelType(panelAttributes, state) {
-  return state.schema.nodes.panel.createChecked(panelAttributes, state.schema.nodes.paragraph.createChecked());
-};
+// Theres an existing interelationship between these files, where the imported function is being called for panel
+// Insertions via the drop down menu
+// tslint-ignore-next-line
+import { createWrapSelectionTransaction } from '../block-type/commands/block-type';
 var panelPlugin = function panelPlugin() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var api = arguments.length > 1 ? arguments[1] : undefined;
@@ -67,9 +52,12 @@ var panelPlugin = function panelPlugin() {
             return /*#__PURE__*/React.createElement(IconPanel, null);
           },
           action: function action(insert, state) {
-            return insertPanelTypeWithAnalytics({
-              panelType: PanelType.INFO
-            }, state, insert);
+            return createPanelAction({
+              state: state,
+              attributes: {
+                panelType: PanelType.INFO
+              }
+            });
           }
         }, {
           id: 'notepanel',
@@ -80,9 +68,12 @@ var panelPlugin = function panelPlugin() {
             return /*#__PURE__*/React.createElement(IconPanelNote, null);
           },
           action: function action(insert, state) {
-            return insertPanelTypeWithAnalytics({
-              panelType: PanelType.NOTE
-            }, state, insert);
+            return createPanelAction({
+              state: state,
+              attributes: {
+                panelType: PanelType.NOTE
+              }
+            });
           }
         }, {
           id: 'successpanel',
@@ -94,9 +85,12 @@ var panelPlugin = function panelPlugin() {
             return /*#__PURE__*/React.createElement(IconPanelSuccess, null);
           },
           action: function action(insert, state) {
-            return insertPanelTypeWithAnalytics({
-              panelType: PanelType.SUCCESS
-            }, state, insert);
+            return createPanelAction({
+              state: state,
+              attributes: {
+                panelType: PanelType.SUCCESS
+              }
+            });
           }
         }, {
           id: 'warningpanel',
@@ -107,9 +101,12 @@ var panelPlugin = function panelPlugin() {
             return /*#__PURE__*/React.createElement(IconPanelWarning, null);
           },
           action: function action(insert, state) {
-            return insertPanelTypeWithAnalytics({
-              panelType: PanelType.WARNING
-            }, state, insert);
+            return createPanelAction({
+              state: state,
+              attributes: {
+                panelType: PanelType.WARNING
+              }
+            });
           }
         }, {
           id: 'errorpanel',
@@ -120,9 +117,12 @@ var panelPlugin = function panelPlugin() {
             return /*#__PURE__*/React.createElement(IconPanelError, null);
           },
           action: function action(insert, state) {
-            return insertPanelTypeWithAnalytics({
-              panelType: PanelType.ERROR
-            }, state, insert);
+            return createPanelAction({
+              state: state,
+              attributes: {
+                panelType: PanelType.ERROR
+              }
+            });
           }
         }];
         if (options.allowCustomPanel && options.allowCustomPanelEdit) {
@@ -135,15 +135,18 @@ var panelPlugin = function panelPlugin() {
               return /*#__PURE__*/React.createElement(IconCustomPanel, null);
             },
             action: function action(insert, state) {
-              return insertPanelTypeWithAnalytics({
-                panelType: PanelType.CUSTOM,
-                panelIcon: ':rainbow:',
-                panelIconId: '1f308',
-                panelIconText: '🌈',
-                // TODO: https://product-fabric.atlassian.net/browse/DSP-7268
-                // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
-                panelColor: T50
-              }, state, insert);
+              return createPanelAction({
+                state: state,
+                attributes: {
+                  panelType: PanelType.CUSTOM,
+                  panelIcon: ':rainbow:',
+                  panelIconId: '1f308',
+                  panelIconText: '🌈',
+                  // TODO: https://product-fabric.atlassian.net/browse/DSP-7268
+                  // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
+                  panelColor: T50
+                }
+              });
             }
           });
         }
@@ -155,4 +158,39 @@ var panelPlugin = function panelPlugin() {
     }
   };
 };
+
+/**
+ * Creates panel action and wrap selection transaction with analytics for the panel insertion.
+ *
+ * @example
+ * const tr = createPanelAction({
+ *   state: editorState,
+ *   attributes: { panelType: 'info' },
+ * });
+ * if (tr) {
+ *   applyTransaction(tr);
+ * }
+ */
+function createPanelAction(_ref3) {
+  var state = _ref3.state,
+    attributes = _ref3.attributes;
+  var tr = createWrapSelectionTransaction({
+    state: state,
+    type: state.schema.nodes.panel,
+    nodeAttributes: attributes
+  });
+  if (tr) {
+    addAnalytics(state, tr, {
+      action: ACTION.INSERTED,
+      actionSubject: ACTION_SUBJECT.DOCUMENT,
+      actionSubjectId: ACTION_SUBJECT_ID.PANEL,
+      attributes: {
+        inputMethod: INPUT_METHOD.QUICK_INSERT,
+        panelType: attributes.panelType
+      },
+      eventType: EVENT_TYPE.TRACK
+    });
+  }
+  return tr;
+}
 export default panelPlugin;

package/dist/esm/plugins/quick-insert/commands.js

@@ -31,6 +31,8 @@ export var insertItem = function insertItem(item) {
       return insertSelectedItem(maybeNode, opts)(state, state.tr, state.selection.head);
     };
     var tr = item.action(insert, state);
+
+    /** @note There is no transaction when called without a search currently (different insert) */
     if (tr && dispatch) {
       dispatch(tr);
     }

package/dist/esm/ui/ElementBrowser/InsertMenu.js

@@ -40,6 +40,10 @@ var InsertMenu = function InsertMenu(_ref) {
           name: item.value.name
         }) || item.elemBefore;
       },
+      /**
+       * @note This transformed items action is only used when a quick insert item has been
+       * called from the quick insert menu and a search has not been performed.
+       */
       action: function action() {
         return onInsert({
           item: item
@@ -62,6 +66,12 @@ var InsertMenu = function InsertMenu(_ref) {
   var getItems = useCallback(function (quickInsertState) {
     return function (query, category) {
       var result;
+      /**
+       * @warning The results if there is a query are not the same as the results if there is no query.
+       * For example: If you have a typed panel and then select the panel item then it will call a different action
+       * than is specified on the editor plugins quick insert
+       * @see above transform function for more details.
+       */
       if (query) {
         result = searchQuickInsertItems(quickInsertState, {})(query, category);
       } else {

package/dist/esm/version-wrapper.js

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

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "185.12.1",
+	"version": "185.13.0",
 	"sideEffects": false
 }

package/dist/types/plugins/block-type/commands/block-type.d.ts

@@ -1,3 +1,7 @@
+/// <reference path="../../../../../../../../typings/prosemirror.d.ts" />
+/// <reference path="../../../../../../../../typings/prosemirror-state.d.ts" />
+import { EditorState } from 'prosemirror-state';
+import { NodeType } from 'prosemirror-model';
 import { Command } from '../../../types';
 import { HeadingLevelsAndNormalText } from '../types';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
@@ -19,4 +23,25 @@ export declare function insertBlockType(name: string): Command;
  * @returns - command that inserts block type
  */
 export declare const insertBlockTypesWithAnalytics: (name: string, inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined) => import("@atlaskit/editor-common/types").Command;
+/**
+ * This function creates a new transaction that wraps the current selection
+ * in the specified node type if it results in a valid transaction.
+ * If not valid, it performs a safe insert operation.
+ *
+ * Example of when wrapping might not be valid is when attempting to wrap
+ * content that is already inside a panel with another panel
+ */
+export declare function createWrapSelectionTransaction({ state, type, nodeAttributes, }: {
+    state: EditorState;
+    type: NodeType;
+    nodeAttributes?: Record<string, any>;
+}): import("prosemirror-state").Transaction;
+/**
+ * This function creates a new transaction that inserts a code block,
+ * if there is text selected it will wrap the current selection if not it will
+ * append the codeblock to the end of the document.
+ */
+export declare function createInsertCodeBlockTransaction({ state, }: {
+    state: EditorState;
+}): import("prosemirror-state").Transaction;
 export declare const cleanUpAtTheStartOfDocument: Command;

package/dist/types-ts4.5/plugins/block-type/commands/block-type.d.ts

@@ -1,3 +1,7 @@
+/// <reference path="../../../../../../../../typings/prosemirror.d.ts" />
+/// <reference path="../../../../../../../../typings/prosemirror-state.d.ts" />
+import { EditorState } from 'prosemirror-state';
+import { NodeType } from 'prosemirror-model';
 import { Command } from '../../../types';
 import { HeadingLevelsAndNormalText } from '../types';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
@@ -19,4 +23,25 @@ export declare function insertBlockType(name: string): Command;
  * @returns - command that inserts block type
  */
 export declare const insertBlockTypesWithAnalytics: (name: string, inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined) => import("@atlaskit/editor-common/types").Command;
+/**
+ * This function creates a new transaction that wraps the current selection
+ * in the specified node type if it results in a valid transaction.
+ * If not valid, it performs a safe insert operation.
+ *
+ * Example of when wrapping might not be valid is when attempting to wrap
+ * content that is already inside a panel with another panel
+ */
+export declare function createWrapSelectionTransaction({ state, type, nodeAttributes, }: {
+    state: EditorState;
+    type: NodeType;
+    nodeAttributes?: Record<string, any>;
+}): import("prosemirror-state").Transaction;
+/**
+ * This function creates a new transaction that inserts a code block,
+ * if there is text selected it will wrap the current selection if not it will
+ * append the codeblock to the end of the document.
+ */
+export declare function createInsertCodeBlockTransaction({ state, }: {
+    state: EditorState;
+}): import("prosemirror-state").Transaction;
 export declare const cleanUpAtTheStartOfDocument: Command;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "185.12.1",
+  "version": "185.13.0",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -77,7 +77,7 @@
     "@atlaskit/icon-object": "^6.3.0",
     "@atlaskit/link-analytics": "^8.2.0",
     "@atlaskit/link-datasource": "^0.28.0",
-    "@atlaskit/link-picker": "^1.26.0",
+    "@atlaskit/link-picker": "^1.27.0",
     "@atlaskit/locale": "^2.5.0",
     "@atlaskit/logo": "^13.14.0",
     "@atlaskit/media-card": "^76.1.0",
@@ -148,7 +148,7 @@
     "@af/editor-libra": "*",
     "@af/integration-testing": "*",
     "@atlaskit/code": "^14.6.0",
-    "@atlaskit/collab-provider": "9.6.1",
+    "@atlaskit/collab-provider": "9.6.2",
     "@atlaskit/dropdown-menu": "^11.10.0",
     "@atlaskit/editor-extension-dropbox": "^0.4.0",
     "@atlaskit/editor-plugin-table": "^2.0.0",