@atlaskit/editor-plugin-collab-edit 3.2.2 → 3.2.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.
Files changed (8) hide show
  1. package/CHANGELOG.md +10 -0
  2. package/dist/cjs/pm-plugins/events/send-transaction.js +1 -2
  3. package/dist/cjs/pm-plugins/mergeUnconfirmed.js +1 -1
  4. package/dist/es2019/pm-plugins/events/send-transaction.js +1 -2
  5. package/dist/es2019/pm-plugins/mergeUnconfirmed.js +1 -1
  6. package/dist/esm/pm-plugins/events/send-transaction.js +1 -2
  7. package/dist/esm/pm-plugins/mergeUnconfirmed.js +1 -1
  8. package/package.json +3 -3
package/CHANGELOG.md CHANGED
@@ -1,5 +1,15 @@
1
1
  # @atlaskit/editor-plugin-collab-edit
2
2
 
3
+ ## 3.2.3
4
+
5
+ ### Patch Changes
6
+
7
+ - [#124648](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/124648)
8
+ [`6c906438659f9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6c906438659f9) -
9
+ Maintain the isOffline metadata on step origins for steps that were created while offline,
10
+ specifically for the case when we are not merging these steps.
11
+ - Updated dependencies
12
+
3
13
  ## 3.2.2
4
14
 
5
15
  ### Patch Changes
package/dist/cjs/pm-plugins/events/send-transaction.js CHANGED
@@ -22,8 +22,7 @@ var sendTransaction = exports.sendTransaction = function sendTransaction(_ref) {
22
22
  return;
23
23
  }
24
24
  var shouldSendStepForSynchronyCollabProvider = !originalTransaction.getMeta('isRemote') &&
25
- // TODO: ED-8995
26
- // We need to do this check to reduce the number of race conditions when working with tables.
25
+ // TODO: ED-8995 - We need to do this check to reduce the number of race conditions when working with tables.
27
26
  // This metadata is coming from the scaleTable command in table-resizing plugin
28
27
  !originalTransaction.getMeta('scaleTable') && docChangedTransaction;
29
28
  if (useNativePlugin || shouldSendStepForSynchronyCollabProvider) {
package/dist/cjs/pm-plugins/mergeUnconfirmed.js CHANGED
@@ -50,7 +50,7 @@ function mergeUnconfirmedSteps(steps, api) {
50
50
  return acc;
51
51
  }
52
52
  }
53
- return acc.concat(new LockableRebaseable(rebaseable.step, rebaseable.inverted, rebaseable.origin instanceof _state.Transaction ? rebaseable.origin.setMeta('isOffline', isOffline) : rebaseable.origin));
53
+ return acc.concat(new LockableRebaseable(rebaseable.step, rebaseable.inverted, rebaseable.origin instanceof _state.Transaction ? rebaseable.origin.setMeta('isOffline', rebaseable.origin.getMeta('isOffline') === true || isOffline) : rebaseable.origin));
54
54
  }, []);
55
55
  return mergedSteps;
56
56
  }
package/dist/es2019/pm-plugins/events/send-transaction.js CHANGED
@@ -14,8 +14,7 @@ export const sendTransaction = ({
14
14
  return;
15
15
  }
16
16
  const shouldSendStepForSynchronyCollabProvider = !originalTransaction.getMeta('isRemote') &&
17
- // TODO: ED-8995
18
- // We need to do this check to reduce the number of race conditions when working with tables.
17
+ // TODO: ED-8995 - We need to do this check to reduce the number of race conditions when working with tables.
19
18
  // This metadata is coming from the scaleTable command in table-resizing plugin
20
19
  !originalTransaction.getMeta('scaleTable') && docChangedTransaction;
21
20
  if (useNativePlugin || shouldSendStepForSynchronyCollabProvider) {
package/dist/es2019/pm-plugins/mergeUnconfirmed.js CHANGED
@@ -42,7 +42,7 @@ export function mergeUnconfirmedSteps(steps, api) {
42
42
  return acc;
43
43
  }
44
44
  }
45
- return acc.concat(new LockableRebaseable(rebaseable.step, rebaseable.inverted, rebaseable.origin instanceof Transaction ? rebaseable.origin.setMeta('isOffline', isOffline) : rebaseable.origin));
45
+ return acc.concat(new LockableRebaseable(rebaseable.step, rebaseable.inverted, rebaseable.origin instanceof Transaction ? rebaseable.origin.setMeta('isOffline', rebaseable.origin.getMeta('isOffline') === true || isOffline) : rebaseable.origin));
46
46
  }, []);
47
47
  return mergedSteps;
48
48
  }
package/dist/esm/pm-plugins/events/send-transaction.js CHANGED
@@ -16,8 +16,7 @@ export var sendTransaction = function sendTransaction(_ref) {
16
16
  return;
17
17
  }
18
18
  var shouldSendStepForSynchronyCollabProvider = !originalTransaction.getMeta('isRemote') &&
19
- // TODO: ED-8995
20
- // We need to do this check to reduce the number of race conditions when working with tables.
19
+ // TODO: ED-8995 - We need to do this check to reduce the number of race conditions when working with tables.
21
20
  // This metadata is coming from the scaleTable command in table-resizing plugin
22
21
  !originalTransaction.getMeta('scaleTable') && docChangedTransaction;
23
22
  if (useNativePlugin || shouldSendStepForSynchronyCollabProvider) {
package/dist/esm/pm-plugins/mergeUnconfirmed.js CHANGED
@@ -43,7 +43,7 @@ export function mergeUnconfirmedSteps(steps, api) {
43
43
  return acc;
44
44
  }
45
45
  }
46
- return acc.concat(new LockableRebaseable(rebaseable.step, rebaseable.inverted, rebaseable.origin instanceof Transaction ? rebaseable.origin.setMeta('isOffline', isOffline) : rebaseable.origin));
46
+ return acc.concat(new LockableRebaseable(rebaseable.step, rebaseable.inverted, rebaseable.origin instanceof Transaction ? rebaseable.origin.setMeta('isOffline', rebaseable.origin.getMeta('isOffline') === true || isOffline) : rebaseable.origin));
47
47
  }, []);
48
48
  return mergedSteps;
49
49
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-collab-edit",
3
- "version": "3.2.2",
3
+ "version": "3.2.3",
4
4
  "description": "Collab Edit plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -33,9 +33,9 @@
33
33
  "dependencies": {
34
34
  "@atlaskit/adf-schema": "^47.6.0",
35
35
  "@atlaskit/custom-steps": "^0.11.0",
36
- "@atlaskit/editor-common": "^102.0.0",
36
+ "@atlaskit/editor-common": "^102.10.0",
37
37
  "@atlaskit/editor-json-transformer": "^8.24.0",
38
- "@atlaskit/editor-plugin-analytics": "^2.1.0",
38
+ "@atlaskit/editor-plugin-analytics": "^2.2.0",
39
39
  "@atlaskit/editor-plugin-connectivity": "^2.0.0",
40
40
  "@atlaskit/editor-plugin-editor-viewmode": "^3.0.0",
41
41
  "@atlaskit/editor-plugin-feature-flags": "^1.3.0",