@atlaskit/editor-core 185.10.0 → 185.10.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 185.10.3
4
+
5
+ ### Patch Changes
6
+
7
+ - [`6c6c3491dfa`](https://bitbucket.org/atlassian/atlassian-frontend/commits/6c6c3491dfa) - Move collab provider subscription into plugin#view methods to avoid race conditions with re-configuring editor state
8
+
3
9
  ## 185.10.0
4
10
 
5
11
  ### Minor Changes
@@ -94,14 +94,7 @@ var collabEditPlugin = function collabEditPlugin(options, api) {
94
94
  plugin: function plugin(_ref3) {
95
95
  var dispatch = _ref3.dispatch,
96
96
  providerFactory = _ref3.providerFactory;
97
- providerFactory && providerFactory.subscribe('collabEditProvider', function (_name, providerPromise) {
98
- if (providerPromise) {
99
- providerPromise.then(function (provider) {
100
- return providerResolver(provider);
101
- });
102
- }
103
- });
104
- return (0, _plugin.createPlugin)(dispatch, providerFactory, executeProviderCode, options, featureFlags);
97
+ return (0, _plugin.createPlugin)(dispatch, providerFactory, providerResolver, executeProviderCode, options, featureFlags);
105
98
  }
106
99
  }]);
107
100
  },
@@ -22,7 +22,7 @@ var _pluginState = require("./plugin-state");
22
22
  var _pluginKey = require("./plugin-key");
23
23
  var _analytics = require("./analytics");
24
24
  var _analytics2 = require("@atlaskit/editor-common/analytics");
25
- var createPlugin = function createPlugin(dispatch, providerFactory, collabProviderCallback, options, featureFlags) {
25
+ var createPlugin = function createPlugin(dispatch, providerFactory, providerResolver, collabProviderCallback, options, featureFlags) {
26
26
  var fireAnalyticsCallback = (0, _analytics2.fireAnalyticsEvent)(options === null || options === void 0 ? void 0 : options.createAnalyticsEvent);
27
27
  return new _safePlugin.SafePlugin({
28
28
  key: _pluginKey.pluginKey,
@@ -75,6 +75,13 @@ var createPlugin = function createPlugin(dispatch, providerFactory, collabProvid
75
75
  providerFactory: providerFactory,
76
76
  featureFlags: featureFlags
77
77
  }), addErrorAnalytics);
78
+ providerFactory && providerFactory.subscribe('collabEditProvider', function (_name, providerPromise) {
79
+ if (providerPromise) {
80
+ providerPromise.then(function (provider) {
81
+ return providerResolver(provider);
82
+ });
83
+ }
84
+ });
78
85
  return {
79
86
  destroy: function destroy() {
80
87
  providerFactory.unsubscribeAll('collabEditProvider');
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.version = exports.nextMajorVersion = exports.name = void 0;
7
7
  var name = "@atlaskit/editor-core";
8
8
  exports.name = name;
9
- var version = "185.10.0";
9
+ var version = "185.10.3";
10
10
  exports.version = version;
11
11
  var nextMajorVersion = function nextMajorVersion() {
12
12
  return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-core",
3
- "version": "185.10.0",
3
+ "version": "185.10.3",
4
4
  "sideEffects": false
5
5
  }
@@ -50,12 +50,7 @@ const collabEditPlugin = (options, api) => {
50
50
  dispatch,
51
51
  providerFactory
52
52
  }) => {
53
- providerFactory && providerFactory.subscribe('collabEditProvider', (_name, providerPromise) => {
54
- if (providerPromise) {
55
- providerPromise.then(provider => providerResolver(provider));
56
- }
57
- });
58
- return createPlugin(dispatch, providerFactory, executeProviderCode, options, featureFlags);
53
+ return createPlugin(dispatch, providerFactory, providerResolver, executeProviderCode, options, featureFlags);
59
54
  }
60
55
  }];
61
56
  },
@@ -5,7 +5,7 @@ import { pluginKey } from './plugin-key';
5
5
  import { addSynchronyErrorAnalytics } from './analytics';
6
6
  import { fireAnalyticsEvent, ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
7
7
  export { PluginState, pluginKey };
8
- export const createPlugin = (dispatch, providerFactory, collabProviderCallback, options, featureFlags) => {
8
+ export const createPlugin = (dispatch, providerFactory, providerResolver, collabProviderCallback, options, featureFlags) => {
9
9
  const fireAnalyticsCallback = fireAnalyticsEvent(options === null || options === void 0 ? void 0 : options.createAnalyticsEvent);
10
10
  return new SafePlugin({
11
11
  key: pluginKey,
@@ -58,6 +58,11 @@ export const createPlugin = (dispatch, providerFactory, collabProviderCallback,
58
58
  providerFactory,
59
59
  featureFlags
60
60
  }), addErrorAnalytics);
61
+ providerFactory && providerFactory.subscribe('collabEditProvider', (_name, providerPromise) => {
62
+ if (providerPromise) {
63
+ providerPromise.then(provider => providerResolver(provider));
64
+ }
65
+ });
61
66
  return {
62
67
  destroy() {
63
68
  providerFactory.unsubscribeAll('collabEditProvider');
@@ -1,5 +1,5 @@
1
1
  export const name = "@atlaskit/editor-core";
2
- export const version = "185.10.0";
2
+ export const version = "185.10.3";
3
3
  export const nextMajorVersion = () => {
4
4
  return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
5
5
  };
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-core",
3
- "version": "185.10.0",
3
+ "version": "185.10.3",
4
4
  "sideEffects": false
5
5
  }
@@ -82,14 +82,7 @@ var collabEditPlugin = function collabEditPlugin(options, api) {
82
82
  plugin: function plugin(_ref3) {
83
83
  var dispatch = _ref3.dispatch,
84
84
  providerFactory = _ref3.providerFactory;
85
- providerFactory && providerFactory.subscribe('collabEditProvider', function (_name, providerPromise) {
86
- if (providerPromise) {
87
- providerPromise.then(function (provider) {
88
- return providerResolver(provider);
89
- });
90
- }
91
- });
92
- return createPlugin(dispatch, providerFactory, executeProviderCode, options, featureFlags);
85
+ return createPlugin(dispatch, providerFactory, providerResolver, executeProviderCode, options, featureFlags);
93
86
  }
94
87
  }]);
95
88
  },
@@ -5,7 +5,7 @@ import { pluginKey } from './plugin-key';
5
5
  import { addSynchronyErrorAnalytics } from './analytics';
6
6
  import { fireAnalyticsEvent, ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
7
7
  export { PluginState, pluginKey };
8
- export var createPlugin = function createPlugin(dispatch, providerFactory, collabProviderCallback, options, featureFlags) {
8
+ export var createPlugin = function createPlugin(dispatch, providerFactory, providerResolver, collabProviderCallback, options, featureFlags) {
9
9
  var fireAnalyticsCallback = fireAnalyticsEvent(options === null || options === void 0 ? void 0 : options.createAnalyticsEvent);
10
10
  return new SafePlugin({
11
11
  key: pluginKey,
@@ -58,6 +58,13 @@ export var createPlugin = function createPlugin(dispatch, providerFactory, colla
58
58
  providerFactory: providerFactory,
59
59
  featureFlags: featureFlags
60
60
  }), addErrorAnalytics);
61
+ providerFactory && providerFactory.subscribe('collabEditProvider', function (_name, providerPromise) {
62
+ if (providerPromise) {
63
+ providerPromise.then(function (provider) {
64
+ return providerResolver(provider);
65
+ });
66
+ }
67
+ });
61
68
  return {
62
69
  destroy: function destroy() {
63
70
  providerFactory.unsubscribeAll('collabEditProvider');
@@ -1,5 +1,5 @@
1
1
  export var name = "@atlaskit/editor-core";
2
- export var version = "185.10.0";
2
+ export var version = "185.10.3";
3
3
  export var nextMajorVersion = function nextMajorVersion() {
4
4
  return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
5
5
  };
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-core",
3
- "version": "185.10.0",
3
+ "version": "185.10.3",
4
4
  "sideEffects": false
5
5
  }
@@ -5,5 +5,6 @@ import { PrivateCollabEditOptions, ProviderCallback } from './types';
5
5
  import { PluginState } from './plugin-state';
6
6
  import { pluginKey } from './plugin-key';
7
7
  import { FeatureFlags } from '@atlaskit/editor-common/types';
8
+ import type { CollabEditProvider } from '@atlaskit/collab-provider/types';
8
9
  export { PluginState, pluginKey };
9
- export declare const createPlugin: (dispatch: Dispatch, providerFactory: ProviderFactory, collabProviderCallback: ProviderCallback, options: PrivateCollabEditOptions, featureFlags: FeatureFlags) => SafePlugin<PluginState>;
10
+ export declare const createPlugin: (dispatch: Dispatch, providerFactory: ProviderFactory, providerResolver: (value: CollabEditProvider) => void, collabProviderCallback: ProviderCallback, options: PrivateCollabEditOptions, featureFlags: FeatureFlags) => SafePlugin<PluginState>;
@@ -5,5 +5,6 @@ import { PrivateCollabEditOptions, ProviderCallback } from './types';
5
5
  import { PluginState } from './plugin-state';
6
6
  import { pluginKey } from './plugin-key';
7
7
  import { FeatureFlags } from '@atlaskit/editor-common/types';
8
+ import type { CollabEditProvider } from '@atlaskit/collab-provider/types';
8
9
  export { PluginState, pluginKey };
9
- export declare const createPlugin: (dispatch: Dispatch, providerFactory: ProviderFactory, collabProviderCallback: ProviderCallback, options: PrivateCollabEditOptions, featureFlags: FeatureFlags) => SafePlugin<PluginState>;
10
+ export declare const createPlugin: (dispatch: Dispatch, providerFactory: ProviderFactory, providerResolver: (value: CollabEditProvider) => void, collabProviderCallback: ProviderCallback, options: PrivateCollabEditOptions, featureFlags: FeatureFlags) => SafePlugin<PluginState>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-core",
3
- "version": "185.10.0",
3
+ "version": "185.10.3",
4
4
  "description": "A package contains Atlassian editor core functionality",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"