@atlaskit/editor-plugin-track-changes 3.0.1 → 3.0.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 +17 -0
  2. package/dist/cjs/pm-plugins/main.js +4 -1
  3. package/dist/cjs/ui/toolbar-components.js +31 -1
  4. package/dist/es2019/pm-plugins/main.js +2 -1
  5. package/dist/es2019/ui/toolbar-components.js +30 -2
  6. package/dist/esm/pm-plugins/main.js +4 -1
  7. package/dist/esm/ui/toolbar-components.js +32 -2
  8. package/package.json +3 -3
package/CHANGELOG.md CHANGED
@@ -1,5 +1,22 @@
1
1
  # @atlaskit/editor-plugin-track-changes
2
2
 
3
+ ## 3.0.3
4
+
5
+ ### Patch Changes
6
+
7
+ - [`12afb3988d02e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/12afb3988d02e) -
8
+ [EDITOR-1429] fixed bug where creating inline comment is considered as changes in editor
9
+ - Updated dependencies
10
+
11
+ ## 3.0.2
12
+
13
+ ### Patch Changes
14
+
15
+ - [`4a31ea74ba10f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4a31ea74ba10f) -
16
+ [ux] [ED-29057] create new ranks and groups for track changes section and render undo, redo and
17
+ diff in separate button groups behind platform_editor_toolbar_aifc_patch_2 gate
18
+ - Updated dependencies
19
+
3
20
  ## 3.0.1
4
21
 
5
22
  ### Patch Changes
package/dist/cjs/pm-plugins/main.js CHANGED
@@ -79,7 +79,10 @@ var createTrackChangesPlugin = exports.createTrackChangesPlugin = function creat
79
79
  var isDocChanged = tr.docChanged && tr.steps.some(function (step) {
80
80
  return step instanceof _transform.ReplaceStep || step instanceof _transform.ReplaceAroundStep || step instanceof _transform.AddMarkStep || step instanceof _transform.RemoveMarkStep || step instanceof _transform.AttrStep;
81
81
  });
82
- if (!isDocChanged || tr.getMeta('isRemote') || tr.getMeta('replaceDocument')) {
82
+ var isAnnotationStep = function isAnnotationStep(step) {
83
+ return step instanceof _transform.AddMarkStep && step.mark.type.name === 'annotation';
84
+ };
85
+ if (!isDocChanged || tr.getMeta('isRemote') || tr.getMeta('replaceDocument') || tr.steps.some(isAnnotationStep)) {
83
86
  // If the transaction is remote, we need to map the steps to the current document
84
87
  return _objectSpread(_objectSpread({}, state), {}, {
85
88
  steps: state.steps.map(function (s) {
package/dist/cjs/ui/toolbar-components.js CHANGED
@@ -7,9 +7,39 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.getToolbarComponents = void 0;
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
  var _toolbar = require("@atlaskit/editor-common/toolbar");
10
+ var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
10
11
  var _TrackChangesToolbarButton = require("./TrackChangesToolbarButton");
11
12
  var getToolbarComponents = exports.getToolbarComponents = function getToolbarComponents(api) {
12
- return [{
13
+ return (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true) ? [{
14
+ type: _toolbar.TRACK_CHANGES_SECTION.type,
15
+ key: _toolbar.TRACK_CHANGES_SECTION.key,
16
+ parents: [{
17
+ type: 'toolbar',
18
+ key: _toolbar.TOOLBARS.PRIMARY_TOOLBAR,
19
+ rank: _toolbar.TOOLBAR_RANK[_toolbar.TRACK_CHANGES_SECTION.key]
20
+ }]
21
+ }, {
22
+ type: _toolbar.TRACK_CHANGES_GROUP.type,
23
+ key: _toolbar.TRACK_CHANGES_GROUP.key,
24
+ parents: [{
25
+ type: _toolbar.TRACK_CHANGES_SECTION.type,
26
+ key: _toolbar.TRACK_CHANGES_SECTION.key,
27
+ rank: _toolbar.TRACK_CHANGES_SECTION_RANK_NEW[_toolbar.TRACK_CHANGES_GROUP.key]
28
+ }]
29
+ }, {
30
+ type: _toolbar.TRACK_CHANGES_BUTTON.type,
31
+ key: _toolbar.TRACK_CHANGES_BUTTON.key,
32
+ parents: [{
33
+ type: _toolbar.TRACK_CHANGES_GROUP.type,
34
+ key: _toolbar.TRACK_CHANGES_GROUP.key,
35
+ rank: _toolbar.TRACK_CHANGES_GROUP_RANK_NEW[_toolbar.TRACK_CHANGES_BUTTON.key]
36
+ }],
37
+ component: function component() {
38
+ return /*#__PURE__*/_react.default.createElement(_TrackChangesToolbarButton.TrackChangesToolbarButton, {
39
+ api: api
40
+ });
41
+ }
42
+ }] : [{
13
43
  type: _toolbar.TRACK_CHANGES_SECTION.type,
14
44
  key: _toolbar.TRACK_CHANGES_SECTION.key,
15
45
  parents: [{
package/dist/es2019/pm-plugins/main.js CHANGED
@@ -54,7 +54,8 @@ export const createTrackChangesPlugin = api => {
54
54
  };
55
55
  }
56
56
  const isDocChanged = tr.docChanged && tr.steps.some(step => step instanceof ReplaceStep || step instanceof ReplaceAroundStep || step instanceof AddMarkStep || step instanceof RemoveMarkStep || step instanceof AttrStep);
57
- if (!isDocChanged || tr.getMeta('isRemote') || tr.getMeta('replaceDocument')) {
57
+ const isAnnotationStep = step => step instanceof AddMarkStep && step.mark.type.name === 'annotation';
58
+ if (!isDocChanged || tr.getMeta('isRemote') || tr.getMeta('replaceDocument') || tr.steps.some(isAnnotationStep)) {
58
59
  // If the transaction is remote, we need to map the steps to the current document
59
60
  return {
60
61
  ...state,
package/dist/es2019/ui/toolbar-components.js CHANGED
@@ -1,8 +1,36 @@
1
1
  import React from 'react';
2
- import { TOOLBAR_RANK, TOOLBARS, TRACK_CHANGES_BUTTON, TRACK_CHANGES_GROUP, TRACK_CHANGES_GROUP_RANK, TRACK_CHANGES_SECTION, TRACK_CHANGES_SECTION_RANK } from '@atlaskit/editor-common/toolbar';
2
+ import { TOOLBAR_RANK, TOOLBARS, TRACK_CHANGES_BUTTON, TRACK_CHANGES_GROUP, TRACK_CHANGES_GROUP_RANK, TRACK_CHANGES_SECTION_RANK_NEW, TRACK_CHANGES_SECTION, TRACK_CHANGES_SECTION_RANK, TRACK_CHANGES_GROUP_RANK_NEW } from '@atlaskit/editor-common/toolbar';
3
+ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
3
4
  import { TrackChangesToolbarButton } from './TrackChangesToolbarButton';
4
5
  export const getToolbarComponents = api => {
5
- return [{
6
+ return expValEquals('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true) ? [{
7
+ type: TRACK_CHANGES_SECTION.type,
8
+ key: TRACK_CHANGES_SECTION.key,
9
+ parents: [{
10
+ type: 'toolbar',
11
+ key: TOOLBARS.PRIMARY_TOOLBAR,
12
+ rank: TOOLBAR_RANK[TRACK_CHANGES_SECTION.key]
13
+ }]
14
+ }, {
15
+ type: TRACK_CHANGES_GROUP.type,
16
+ key: TRACK_CHANGES_GROUP.key,
17
+ parents: [{
18
+ type: TRACK_CHANGES_SECTION.type,
19
+ key: TRACK_CHANGES_SECTION.key,
20
+ rank: TRACK_CHANGES_SECTION_RANK_NEW[TRACK_CHANGES_GROUP.key]
21
+ }]
22
+ }, {
23
+ type: TRACK_CHANGES_BUTTON.type,
24
+ key: TRACK_CHANGES_BUTTON.key,
25
+ parents: [{
26
+ type: TRACK_CHANGES_GROUP.type,
27
+ key: TRACK_CHANGES_GROUP.key,
28
+ rank: TRACK_CHANGES_GROUP_RANK_NEW[TRACK_CHANGES_BUTTON.key]
29
+ }],
30
+ component: () => /*#__PURE__*/React.createElement(TrackChangesToolbarButton, {
31
+ api: api
32
+ })
33
+ }] : [{
6
34
  type: TRACK_CHANGES_SECTION.type,
7
35
  key: TRACK_CHANGES_SECTION.key,
8
36
  parents: [{
package/dist/esm/pm-plugins/main.js CHANGED
@@ -72,7 +72,10 @@ export var createTrackChangesPlugin = function createTrackChangesPlugin(api) {
72
72
  var isDocChanged = tr.docChanged && tr.steps.some(function (step) {
73
73
  return step instanceof ReplaceStep || step instanceof ReplaceAroundStep || step instanceof AddMarkStep || step instanceof RemoveMarkStep || step instanceof AttrStep;
74
74
  });
75
- if (!isDocChanged || tr.getMeta('isRemote') || tr.getMeta('replaceDocument')) {
75
+ var isAnnotationStep = function isAnnotationStep(step) {
76
+ return step instanceof AddMarkStep && step.mark.type.name === 'annotation';
77
+ };
78
+ if (!isDocChanged || tr.getMeta('isRemote') || tr.getMeta('replaceDocument') || tr.steps.some(isAnnotationStep)) {
76
79
  // If the transaction is remote, we need to map the steps to the current document
77
80
  return _objectSpread(_objectSpread({}, state), {}, {
78
81
  steps: state.steps.map(function (s) {
package/dist/esm/ui/toolbar-components.js CHANGED
@@ -1,8 +1,38 @@
1
1
  import React from 'react';
2
- import { TOOLBAR_RANK, TOOLBARS, TRACK_CHANGES_BUTTON, TRACK_CHANGES_GROUP, TRACK_CHANGES_GROUP_RANK, TRACK_CHANGES_SECTION, TRACK_CHANGES_SECTION_RANK } from '@atlaskit/editor-common/toolbar';
2
+ import { TOOLBAR_RANK, TOOLBARS, TRACK_CHANGES_BUTTON, TRACK_CHANGES_GROUP, TRACK_CHANGES_GROUP_RANK, TRACK_CHANGES_SECTION_RANK_NEW, TRACK_CHANGES_SECTION, TRACK_CHANGES_SECTION_RANK, TRACK_CHANGES_GROUP_RANK_NEW } from '@atlaskit/editor-common/toolbar';
3
+ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
3
4
  import { TrackChangesToolbarButton } from './TrackChangesToolbarButton';
4
5
  export var getToolbarComponents = function getToolbarComponents(api) {
5
- return [{
6
+ return expValEquals('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true) ? [{
7
+ type: TRACK_CHANGES_SECTION.type,
8
+ key: TRACK_CHANGES_SECTION.key,
9
+ parents: [{
10
+ type: 'toolbar',
11
+ key: TOOLBARS.PRIMARY_TOOLBAR,
12
+ rank: TOOLBAR_RANK[TRACK_CHANGES_SECTION.key]
13
+ }]
14
+ }, {
15
+ type: TRACK_CHANGES_GROUP.type,
16
+ key: TRACK_CHANGES_GROUP.key,
17
+ parents: [{
18
+ type: TRACK_CHANGES_SECTION.type,
19
+ key: TRACK_CHANGES_SECTION.key,
20
+ rank: TRACK_CHANGES_SECTION_RANK_NEW[TRACK_CHANGES_GROUP.key]
21
+ }]
22
+ }, {
23
+ type: TRACK_CHANGES_BUTTON.type,
24
+ key: TRACK_CHANGES_BUTTON.key,
25
+ parents: [{
26
+ type: TRACK_CHANGES_GROUP.type,
27
+ key: TRACK_CHANGES_GROUP.key,
28
+ rank: TRACK_CHANGES_GROUP_RANK_NEW[TRACK_CHANGES_BUTTON.key]
29
+ }],
30
+ component: function component() {
31
+ return /*#__PURE__*/React.createElement(TrackChangesToolbarButton, {
32
+ api: api
33
+ });
34
+ }
35
+ }] : [{
6
36
  type: TRACK_CHANGES_SECTION.type,
7
37
  key: TRACK_CHANGES_SECTION.key,
8
38
  parents: [{
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-track-changes",
3
- "version": "3.0.1",
3
+ "version": "3.0.3",
4
4
  "description": "ShowDiff plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -31,13 +31,13 @@
31
31
  "@atlaskit/button": "^23.4.0",
32
32
  "@atlaskit/editor-plugin-history": "4.0.0",
33
33
  "@atlaskit/editor-plugin-primary-toolbar": "^5.0.0",
34
- "@atlaskit/editor-plugin-show-diff": "1.0.0",
34
+ "@atlaskit/editor-plugin-show-diff": "1.0.1",
35
35
  "@atlaskit/editor-plugin-toolbar": "^1.0.0",
36
36
  "@atlaskit/editor-prosemirror": "7.0.0",
37
37
  "@atlaskit/editor-toolbar": "^0.6.0",
38
38
  "@atlaskit/editor-toolbar-model": "^0.2.0",
39
39
  "@atlaskit/icon-lab": "^5.7.0",
40
- "@atlaskit/tmp-editor-statsig": "^12.0.0",
40
+ "@atlaskit/tmp-editor-statsig": "^12.1.0",
41
41
  "@babel/runtime": "^7.0.0",
42
42
  "react-intl-next": "npm:react-intl@^5.18.1"
43
43
  },