@atlaskit/editor-core 188.9.0 → 188.9.5

package/dist/es2019/plugins/tasks-and-decisions/pm-plugins/main.js

@@ -1,14 +1,21 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { uuid } from '@atlaskit/adf-schema';
-import { nodesBetweenChanged, SetAttrsStep } from '../../../utils';
-import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
+import { getStepRange } from '@atlaskit/editor-common/utils';
+import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
+import { createSelectionClickHandler, GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { decisionItemNodeView } from '../nodeviews/decisionItem';
 import { taskItemNodeViewFactory } from '../nodeviews/taskItem';
 import { stateKey } from './plugin-key';
 import { getTaskItemDataToFocus, getTaskItemDataAtPos, focusCheckboxAndUpdateSelection, removeCheckboxFocus } from './helpers';
-import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { ACTIONS } from './types';
+function nodesBetweenChanged(tr, f, startPos) {
+  const stepRange = getStepRange(tr);
+  if (!stepRange) {
+    return;
+  }
+  tr.doc.nodesBetween(stepRange.from, stepRange.to, f, startPos);
+}
 const setContextIdentifierProvider = provider => (state, dispatch) => {
   if (dispatch) {
     dispatch(state.tr.setMeta(stateKey, {
@@ -18,12 +25,12 @@ const setContextIdentifierProvider = provider => (state, dispatch) => {
   }
   return true;
 };
-export function createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispatch, useLongPressSelection = false) {
+export function createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispatch, api, useLongPressSelection = false) {
   return new SafePlugin({
     props: {
       nodeViews: {
-        taskItem: taskItemNodeViewFactory(portalProviderAPI, eventDispatcher, providerFactory),
-        decisionItem: decisionItemNodeView(portalProviderAPI, eventDispatcher)
+        taskItem: taskItemNodeViewFactory(portalProviderAPI, eventDispatcher, providerFactory, api),
+        decisionItem: decisionItemNodeView(portalProviderAPI, eventDispatcher, api)
       },
       handleTextInput(view, from, to, text) {
         // When a decision item is selected and the user starts typing, the entire node

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "188.9.0";
+export const version = "188.9.5";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/labs/next/presets/default.js

@@ -10,7 +10,7 @@ import { unsupportedContentPlugin } from '@atlaskit/editor-plugin-unsupported-co
 import { basePlugin } from '@atlaskit/editor-plugin-base';
 import { focusPlugin } from '@atlaskit/editor-plugin-focus';
 import { editorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
-import typeAheadPlugin from '../../../plugins/type-ahead';
+import { typeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead';
 import submitEditorPlugin from '../../../plugins/submit-editor';
 import fakeTextCursorPlugin from '../../../plugins/fake-text-cursor';
 import { featureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';

package/dist/esm/plugins/index.js

@@ -18,7 +18,6 @@ export { default as placeholderTextPlugin } from './placeholder-text';
 export { default as submitEditorPlugin } from './submit-editor';
 export { default as tasksAndDecisionsPlugin } from './tasks-and-decisions';
 export { default as textColorPlugin } from './text-color';
-export { default as typeAheadPlugin } from './type-ahead';
 export { default as breakoutPlugin } from './breakout';
 export { default as alignmentPlugin } from './alignment';
 export { default as dataConsumerMarkPlugin } from './data-consumer';

package/dist/esm/plugins/insert-block/index.js

@@ -1,11 +1,9 @@
 import React from 'react';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
-import { isTypeAheadAllowed } from '../type-ahead/utils';
 import { pluginKey as layoutStateKey } from '../layout';
 import { insertMacroFromMacroBrowser } from '../macro';
 import WithPluginState from '../../ui/WithPluginState';
 import ToolbarInsertBlock from './ui/ToolbarInsertBlock';
-import { pluginKey as typeAheadPluginKey } from '../type-ahead/pm-plugins/key';
 import { BLOCK_QUOTE, CODE_BLOCK, PANEL } from '@atlaskit/editor-plugin-block-type/consts';
 import { INPUT_METHOD } from '../analytics';
 import { pluginKey as placeholderTextStateKey } from '../placeholder-text/plugin-key';
@@ -70,7 +68,6 @@ var insertBlockPlugin = function insertBlockPlugin(_ref) {
         // `ToolbarInsertBlockWithInjectionApi` and remove `WithPluginState`
         return /*#__PURE__*/React.createElement(WithPluginState, {
           plugins: {
-            typeAheadState: typeAheadPluginKey,
             macroState: macroStateKey,
             placeholderTextState: placeholderTextStateKey,
             layoutState: layoutStateKey
@@ -131,20 +128,21 @@ function ToolbarInsertBlockWithInjectionApi(_ref4) {
     layoutState = _ref4.layoutState,
     featureFlags = _ref4.featureFlags;
   var buttons = toolbarSizeToButtons(toolbarSize);
-  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['hyperlink', 'date', 'imageUpload', 'mention', 'emoji', 'blockType', 'media']),
+  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['hyperlink', 'date', 'imageUpload', 'mention', 'emoji', 'blockType', 'media', 'typeAhead']),
     dateState = _useSharedPluginState.dateState,
     hyperlinkState = _useSharedPluginState.hyperlinkState,
     imageUploadState = _useSharedPluginState.imageUploadState,
     mentionState = _useSharedPluginState.mentionState,
     emojiState = _useSharedPluginState.emojiState,
     blockTypeState = _useSharedPluginState.blockTypeState,
-    mediaState = _useSharedPluginState.mediaState;
+    mediaState = _useSharedPluginState.mediaState,
+    typeAheadState = _useSharedPluginState.typeAheadState;
   return /*#__PURE__*/React.createElement(ToolbarInsertBlock, {
     pluginInjectionApi: pluginInjectionApi,
     buttons: buttons,
     isReducedSpacing: isToolbarReducedSpacing,
     isDisabled: disabled,
-    isTypeAheadAllowed: isTypeAheadAllowed(editorView.state),
+    isTypeAheadAllowed: Boolean(typeAheadState === null || typeAheadState === void 0 ? void 0 : typeAheadState.isAllowed),
     editorView: editorView,
     tableSupported: !!editorView.state.schema.nodes.table,
     actionSupported: !!editorView.state.schema.nodes.taskItem,

package/dist/esm/plugins/tasks-and-decisions/index.js

@@ -3,7 +3,7 @@ var _templateObject;
 /** @jsx jsx */
 import { css, jsx } from '@emotion/react';
 import { decisionItem, decisionList, taskItem, taskList } from '@atlaskit/adf-schema';
-import { INPUT_METHOD } from '../analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { messages as insertBlockMessages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { IconAction, IconDecision } from '@atlaskit/editor-common/quick-insert';
 import { insertTaskDecisionAction, getListTypes } from './commands';
@@ -32,7 +32,8 @@ var tasksAndDecisionsPlugin = function tasksAndDecisionsPlugin(_ref2) {
     _ref2$config2 = _ref2$config === void 0 ? {} : _ref2$config,
     allowNestedTasks = _ref2$config2.allowNestedTasks,
     consumeTabs = _ref2$config2.consumeTabs,
-    useLongPressSelection = _ref2$config2.useLongPressSelection;
+    useLongPressSelection = _ref2$config2.useLongPressSelection,
+    api = _ref2.api;
   return {
     name: 'taskDecision',
     nodes: function nodes() {
@@ -58,7 +59,7 @@ var tasksAndDecisionsPlugin = function tasksAndDecisionsPlugin(_ref2) {
             providerFactory = _ref3.providerFactory,
             eventDispatcher = _ref3.eventDispatcher,
             dispatch = _ref3.dispatch;
-          return createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispatch, useLongPressSelection);
+          return createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispatch, api, useLongPressSelection);
         }
       }, {
         name: 'tasksAndDecisionsInputRule',

package/dist/esm/plugins/tasks-and-decisions/nodeviews/decisionItem.js

@@ -8,8 +8,19 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 import React from 'react';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import DecisionItem from '../ui/Decision';
-import { isTypeAheadOpen } from '../../type-ahead/utils';
+var DecisionItemWrapper = function DecisionItemWrapper(_ref) {
+  var api = _ref.api,
+    forwardRef = _ref.forwardRef,
+    isContentNodeEmpty = _ref.isContentNodeEmpty;
+  var _useSharedPluginState = useSharedPluginState(api, ['typeAhead']),
+    typeAheadState = _useSharedPluginState.typeAheadState;
+  return /*#__PURE__*/React.createElement(DecisionItem, {
+    contentRef: forwardRef,
+    showPlaceholder: isContentNodeEmpty && !(typeAheadState !== null && typeAheadState !== void 0 && typeAheadState.isOpen)
+  });
+};
 var Decision = /*#__PURE__*/function (_ReactNodeView) {
   _inherits(Decision, _ReactNodeView);
   var _super = _createSuper(Decision);
@@ -22,6 +33,13 @@ var Decision = /*#__PURE__*/function (_ReactNodeView) {
     value: function isContentEmpty(node) {
       return node.content.childCount === 0;
     }
+  }, {
+    key: "initWithAPI",
+    value: function initWithAPI(api) {
+      this.init();
+      this.api = api;
+      return this;
+    }
   }, {
     key: "createDomRef",
     value: function createDomRef() {
@@ -43,9 +61,11 @@ var Decision = /*#__PURE__*/function (_ReactNodeView) {
   }, {
     key: "render",
     value: function render(_props, forwardRef) {
-      return /*#__PURE__*/React.createElement(DecisionItem, {
-        contentRef: forwardRef,
-        showPlaceholder: this.isContentEmpty(this.node) && !isTypeAheadOpen(this.view.state)
+      var isContentNodeEmpty = this.isContentEmpty(this.node);
+      return /*#__PURE__*/React.createElement(DecisionItemWrapper, {
+        forwardRef: forwardRef,
+        isContentNodeEmpty: isContentNodeEmpty,
+        api: this.api
       });
     }
   }, {
@@ -71,9 +91,9 @@ var Decision = /*#__PURE__*/function (_ReactNodeView) {
   }]);
   return Decision;
 }(ReactNodeView);
-export var decisionItemNodeView = function decisionItemNodeView(portalProviderAPI, eventDispatcher) {
+export var decisionItemNodeView = function decisionItemNodeView(portalProviderAPI, eventDispatcher, api) {
   return function (node, view, getPos) {
     var hasIntlContext = true;
-    return new Decision(node, view, getPos, portalProviderAPI, eventDispatcher, {}, undefined, undefined, undefined, hasIntlContext).init();
+    return new Decision(node, view, getPos, portalProviderAPI, eventDispatcher, {}, undefined, undefined, undefined, hasIntlContext).initWithAPI(api);
   };
 };

package/dist/esm/plugins/tasks-and-decisions/nodeviews/taskItem.js

@@ -13,11 +13,35 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import React from 'react';
 import { AnalyticsListener } from '@atlaskit/analytics-next';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
-import WithPluginState from '../../../ui/WithPluginState';
+import { WithPluginState } from '@atlaskit/editor-common/with-plugin-state';
 import { stateKey as taskPluginKey } from '../pm-plugins/plugin-key';
 import TaskItem from '../ui/Task';
-import { isTypeAheadOpen } from '../../type-ahead/utils';
+
+//import { isTypeAheadOpen } from '../../type-ahead/utils';
+
+var TaskItemWrapper = function TaskItemWrapper(_ref) {
+  var localId = _ref.localId,
+    forwardRef = _ref.forwardRef,
+    isDone = _ref.isDone,
+    onChange = _ref.onChange,
+    isFocused = _ref.isFocused,
+    isContentNodeEmpty = _ref.isContentNodeEmpty,
+    providerFactory = _ref.providerFactory,
+    api = _ref.api;
+  var _useSharedPluginState = useSharedPluginState(api, ['typeAhead']),
+    typeAheadState = _useSharedPluginState.typeAheadState;
+  return /*#__PURE__*/React.createElement(TaskItem, {
+    taskId: localId,
+    contentRef: forwardRef,
+    isDone: isDone,
+    onChange: onChange,
+    isFocused: isFocused,
+    showPlaceholder: isContentNodeEmpty && !(typeAheadState !== null && typeAheadState !== void 0 && typeAheadState.isOpen),
+    providers: providerFactory
+  });
+};
 var Task = /*#__PURE__*/function (_ReactNodeView) {
   _inherits(Task, _ReactNodeView);
   var _super = _createSuper(Task);
@@ -88,6 +112,13 @@ var Task = /*#__PURE__*/function (_ReactNodeView) {
     return _this;
   }
   _createClass(Task, [{
+    key: "initWithAPI",
+    value: function initWithAPI(api) {
+      this.init();
+      this.api = api;
+      return this;
+    }
+  }, {
     key: "isContentEmpty",
     value: function isContentEmpty(node) {
       return node.content.childCount === 0;
@@ -117,6 +148,7 @@ var Task = /*#__PURE__*/function (_ReactNodeView) {
       var _this$node$attrs = this.node.attrs,
         localId = _this$node$attrs.localId,
         state = _this$node$attrs.state;
+      var isContentNodeEmpty = this.isContentEmpty(this.node);
       return /*#__PURE__*/React.createElement(AnalyticsListener, {
         channel: "fabric-elements",
         onEvent: this.addListAnalyticsData
@@ -124,16 +156,17 @@ var Task = /*#__PURE__*/function (_ReactNodeView) {
         plugins: {
           taskDecisionPlugin: taskPluginKey
         },
-        render: function render(_ref) {
-          var taskDecisionPlugin = _ref.taskDecisionPlugin;
-          return /*#__PURE__*/React.createElement(TaskItem, {
-            taskId: localId,
-            contentRef: forwardRef,
+        render: function render(_ref2) {
+          var taskDecisionPlugin = _ref2.taskDecisionPlugin;
+          return /*#__PURE__*/React.createElement(TaskItemWrapper, {
+            localId: localId,
+            forwardRef: forwardRef,
             isDone: state === 'DONE',
             onChange: _this2.handleOnChange,
-            isFocused: (taskDecisionPlugin === null || taskDecisionPlugin === void 0 ? void 0 : taskDecisionPlugin.focusedTaskItemLocalId) === localId,
-            showPlaceholder: _this2.isContentEmpty(_this2.node) && !isTypeAheadOpen(_this2.view.state),
-            providers: props.providerFactory
+            isFocused: Boolean((taskDecisionPlugin === null || taskDecisionPlugin === void 0 ? void 0 : taskDecisionPlugin.focusedTaskItemLocalId) === localId),
+            isContentNodeEmpty: isContentNodeEmpty,
+            providerFactory: props.providerFactory,
+            api: _this2.api
           });
         }
       }));
@@ -162,11 +195,11 @@ var Task = /*#__PURE__*/function (_ReactNodeView) {
   }]);
   return Task;
 }(ReactNodeView);
-export function taskItemNodeViewFactory(portalProviderAPI, eventDispatcher, providerFactory) {
+export function taskItemNodeViewFactory(portalProviderAPI, eventDispatcher, providerFactory, api) {
   return function (node, view, getPos) {
     var hasIntlContext = true;
     return new Task(node, view, getPos, portalProviderAPI, eventDispatcher, {
       providerFactory: providerFactory
-    }, undefined, undefined, undefined, hasIntlContext).init();
+    }, undefined, undefined, undefined, hasIntlContext).initWithAPI(api);
   };
 }

package/dist/esm/plugins/tasks-and-decisions/pm-plugins/main.js

@@ -6,14 +6,21 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { uuid } from '@atlaskit/adf-schema';
-import { nodesBetweenChanged, SetAttrsStep } from '../../../utils';
-import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
+import { getStepRange } from '@atlaskit/editor-common/utils';
+import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
+import { createSelectionClickHandler, GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { decisionItemNodeView } from '../nodeviews/decisionItem';
 import { taskItemNodeViewFactory } from '../nodeviews/taskItem';
 import { stateKey } from './plugin-key';
 import { getTaskItemDataToFocus, getTaskItemDataAtPos, focusCheckboxAndUpdateSelection, removeCheckboxFocus } from './helpers';
-import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { ACTIONS } from './types';
+function nodesBetweenChanged(tr, f, startPos) {
+  var stepRange = getStepRange(tr);
+  if (!stepRange) {
+    return;
+  }
+  tr.doc.nodesBetween(stepRange.from, stepRange.to, f, startPos);
+}
 var setContextIdentifierProvider = function setContextIdentifierProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {
@@ -25,13 +32,13 @@ var setContextIdentifierProvider = function setContextIdentifierProvider(provide
     return true;
   };
 };
-export function createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispatch) {
-  var useLongPressSelection = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+export function createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispatch, api) {
+  var useLongPressSelection = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
   return new SafePlugin({
     props: {
       nodeViews: {
-        taskItem: taskItemNodeViewFactory(portalProviderAPI, eventDispatcher, providerFactory),
-        decisionItem: decisionItemNodeView(portalProviderAPI, eventDispatcher)
+        taskItem: taskItemNodeViewFactory(portalProviderAPI, eventDispatcher, providerFactory, api),
+        decisionItem: decisionItemNodeView(portalProviderAPI, eventDispatcher, api)
       },
       handleTextInput: function handleTextInput(view, from, to, text) {
         // When a decision item is selected and the user starts typing, the entire node

package/dist/esm/version-wrapper.js

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