@atlaskit/editor-plugin-collab-edit 27.0.6 → 28.0.0

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.
Files changed (5) hide show
  1. package/CHANGELOG.md +26 -0
  2. package/dist/cjs/pm-plugins/mergeUnconfirmed.js +1 -4
  3. package/dist/es2019/pm-plugins/mergeUnconfirmed.js +1 -4
  4. package/dist/esm/pm-plugins/mergeUnconfirmed.js +1 -4
  5. package/package.json +8 -8
package/CHANGELOG.md CHANGED
@@ -1,5 +1,31 @@
1
1
  # @atlaskit/editor-plugin-collab-edit
2
2
 
3
+ ## 28.0.0
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies
8
+
9
+ ## 27.0.9
10
+
11
+ ### Patch Changes
12
+
13
+ - Updated dependencies
14
+
15
+ ## 27.0.8
16
+
17
+ ### Patch Changes
18
+
19
+ - [`f2be4b48189f2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f2be4b48189f2) -
20
+ Clean up experiment `platform_editor_enable_single_player_step_merging`
21
+ - Updated dependencies
22
+
23
+ ## 27.0.7
24
+
25
+ ### Patch Changes
26
+
27
+ - Updated dependencies
28
+
3
29
  ## 27.0.6
4
30
 
5
31
  ### Patch Changes
package/dist/cjs/pm-plugins/mergeUnconfirmed.js CHANGED
@@ -7,7 +7,6 @@ exports.mergeUnconfirmedSteps = mergeUnconfirmedSteps;
7
7
  var _isOfflineMode = require("@atlaskit/editor-common/connectivity/isOfflineMode");
8
8
  var _state = require("@atlaskit/editor-prosemirror/state");
9
9
  var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
10
- var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
11
10
  var isLocked = function isLocked(step) {
12
11
  if (step.origin instanceof _state.Transaction) {
13
12
  return step.origin.getMeta('mergeIsLocked');
@@ -30,9 +29,7 @@ function mergeUnconfirmedSteps(steps, api) {
30
29
  var _api$connectivity;
31
30
  var lastStep = acc[acc.length - 1];
32
31
  var isOffline = (0, _isOfflineMode.isOfflineMode)(api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode);
33
- var isOnlineMergeEnabled = (0, _expValEquals.expValEquals)('platform_editor_enable_single_player_step_merging', 'isEnabled', true);
34
- var isMergingEnabled = isOffline || isOnlineMergeEnabled;
35
- if (isMergingEnabled && lastStep && !isLocked(lastStep) && !isLocked(rebaseable)) {
32
+ if (lastStep && !isLocked(lastStep) && !isLocked(rebaseable)) {
36
33
  var mergedStep = lastStep.step.merge(rebaseable.step);
37
34
  var inverted = rebaseable.inverted.merge(lastStep.inverted);
38
35
  // Always take the origin of the new step.
package/dist/es2019/pm-plugins/mergeUnconfirmed.js CHANGED
@@ -1,7 +1,6 @@
1
1
  import { isOfflineMode } from '@atlaskit/editor-common/connectivity/isOfflineMode';
2
2
  import { Transaction } from '@atlaskit/editor-prosemirror/state';
3
3
  import { Rebaseable } from '@atlaskit/prosemirror-collab';
4
- import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
5
4
  const isLocked = step => {
6
5
  if (step.origin instanceof Transaction) {
7
6
  return step.origin.getMeta('mergeIsLocked');
@@ -24,9 +23,7 @@ export function mergeUnconfirmedSteps(steps, api) {
24
23
  var _api$connectivity, _api$connectivity$sha;
25
24
  const lastStep = acc[acc.length - 1];
26
25
  const isOffline = isOfflineMode(api === null || api === void 0 ? void 0 : (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 ? void 0 : (_api$connectivity$sha = _api$connectivity.sharedState.currentState()) === null || _api$connectivity$sha === void 0 ? void 0 : _api$connectivity$sha.mode);
27
- const isOnlineMergeEnabled = expValEquals('platform_editor_enable_single_player_step_merging', 'isEnabled', true);
28
- const isMergingEnabled = isOffline || isOnlineMergeEnabled;
29
- if (isMergingEnabled && lastStep && !isLocked(lastStep) && !isLocked(rebaseable)) {
26
+ if (lastStep && !isLocked(lastStep) && !isLocked(rebaseable)) {
30
27
  const mergedStep = lastStep.step.merge(rebaseable.step);
31
28
  const inverted = rebaseable.inverted.merge(lastStep.inverted);
32
29
  // Always take the origin of the new step.
package/dist/esm/pm-plugins/mergeUnconfirmed.js CHANGED
@@ -1,7 +1,6 @@
1
1
  import { isOfflineMode } from '@atlaskit/editor-common/connectivity/isOfflineMode';
2
2
  import { Transaction } from '@atlaskit/editor-prosemirror/state';
3
3
  import { Rebaseable } from '@atlaskit/prosemirror-collab';
4
- import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
5
4
  var isLocked = function isLocked(step) {
6
5
  if (step.origin instanceof Transaction) {
7
6
  return step.origin.getMeta('mergeIsLocked');
@@ -24,9 +23,7 @@ export function mergeUnconfirmedSteps(steps, api) {
24
23
  var _api$connectivity;
25
24
  var lastStep = acc[acc.length - 1];
26
25
  var isOffline = isOfflineMode(api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode);
27
- var isOnlineMergeEnabled = expValEquals('platform_editor_enable_single_player_step_merging', 'isEnabled', true);
28
- var isMergingEnabled = isOffline || isOnlineMergeEnabled;
29
- if (isMergingEnabled && lastStep && !isLocked(lastStep) && !isLocked(rebaseable)) {
26
+ if (lastStep && !isLocked(lastStep) && !isLocked(rebaseable)) {
30
27
  var mergedStep = lastStep.step.merge(rebaseable.step);
31
28
  var inverted = rebaseable.inverted.merge(lastStep.inverted);
32
29
  // Always take the origin of the new step.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-collab-edit",
3
- "version": "27.0.6",
3
+ "version": "28.0.0",
4
4
  "description": "Collab Edit plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -22,22 +22,22 @@
22
22
  "@atlaskit/adf-schema": "^57.7.0",
23
23
  "@atlaskit/custom-steps": "^1.1.0",
24
24
  "@atlaskit/editor-json-transformer": "^10.0.0",
25
- "@atlaskit/editor-plugin-analytics": "^26.0.0",
26
- "@atlaskit/editor-plugin-connectivity": "^26.0.0",
27
- "@atlaskit/editor-plugin-editor-viewmode": "^28.0.0",
28
- "@atlaskit/editor-plugin-feature-flags": "^25.0.0",
25
+ "@atlaskit/editor-plugin-analytics": "^27.0.0",
26
+ "@atlaskit/editor-plugin-connectivity": "^27.0.0",
27
+ "@atlaskit/editor-plugin-editor-viewmode": "^29.0.0",
28
+ "@atlaskit/editor-plugin-feature-flags": "^26.0.0",
29
29
  "@atlaskit/editor-prosemirror": "^9.0.0",
30
30
  "@atlaskit/editor-shared-styles": "^4.4.0",
31
31
  "@atlaskit/platform-feature-experiments": "^0.3.0",
32
32
  "@atlaskit/platform-feature-flags": "^2.2.0",
33
33
  "@atlaskit/prosemirror-collab": "^1.1.0",
34
- "@atlaskit/tmp-editor-statsig": "^232.0.0",
35
- "@atlaskit/tokens": "^20.4.0",
34
+ "@atlaskit/tmp-editor-statsig": "^235.0.0",
35
+ "@atlaskit/tokens": "^20.5.0",
36
36
  "@babel/runtime": "^7.0.0",
37
37
  "memoize-one": "^6.0.0"
38
38
  },
39
39
  "peerDependencies": {
40
- "@atlaskit/editor-common": "^130.3.0",
40
+ "@atlaskit/editor-common": "^131.0.0",
41
41
  "react": "^18.2.0 || ^19.2.0",
42
42
  "react-dom": "^18.2.0 || ^19.2.0"
43
43
  },