@atlaskit/editor-plugin-show-diff 9.0.15 → 9.0.17

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 (13) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/dist/cjs/pm-plugins/decorations/colorSchemes/standard.js +5 -3
  3. package/dist/cjs/pm-plugins/decorations/createInlineChangedDecoration.js +1 -1
  4. package/dist/cjs/pm-plugins/decorations/createNodeChangedDecorationWidget.js +2 -2
  5. package/dist/es2019/pm-plugins/decorations/colorSchemes/standard.js +4 -2
  6. package/dist/es2019/pm-plugins/decorations/createInlineChangedDecoration.js +2 -2
  7. package/dist/es2019/pm-plugins/decorations/createNodeChangedDecorationWidget.js +3 -3
  8. package/dist/esm/pm-plugins/decorations/colorSchemes/standard.js +4 -2
  9. package/dist/esm/pm-plugins/decorations/createInlineChangedDecoration.js +2 -2
  10. package/dist/esm/pm-plugins/decorations/createNodeChangedDecorationWidget.js +3 -3
  11. package/dist/types/pm-plugins/decorations/colorSchemes/standard.d.ts +1 -1
  12. package/dist/types-ts4.5/pm-plugins/decorations/colorSchemes/standard.d.ts +1 -1
  13. package/package.json +5 -5
package/CHANGELOG.md CHANGED
@@ -1,5 +1,19 @@
1
1
  # @atlaskit/editor-plugin-show-diff
2
2
 
3
+ ## 9.0.17
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies
8
+
9
+ ## 9.0.16
10
+
11
+ ### Patch Changes
12
+
13
+ - [`3effa9ec1b6b3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3effa9ec1b6b3) -
14
+ Add borderBottom and padding to removed inline diffs to match the height of added inline diffs
15
+ - Updated dependencies
16
+
3
17
  ## 9.0.15
4
18
 
5
19
  ### Patch Changes
package/dist/cjs/pm-plugins/decorations/colorSchemes/standard.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.standardDecorationMarkerVariable = exports.editingStyleRuleNode = exports.editingStyleQuoteNode = exports.editingStyleNode = exports.editingStyleExtended = exports.editingStyleCardBlockNode = exports.editingStyleActiveExtended = exports.editingStyleActive = exports.editingStyle = exports.editingContentStyleInBlockExtended = exports.editingContentStyleInBlock = exports.deletedStyleQuoteNodeWithLozengeActive = exports.deletedStyleQuoteNodeWithLozenge = exports.deletedStyleQuoteNode = exports.deletedRowStyle = exports.deletedInlineContentBackground = exports.deletedContentStyleUnbounded = exports.deletedContentStyleNew = exports.deletedContentStyleActive = exports.deletedContentStyle = exports.deletedCellOverlayStyle = exports.deletedBlockOutlineRoundedActive = exports.deletedBlockOutlineRounded = exports.deletedBlockOutlineActive = exports.deletedBlockOutline = exports.addedCellOverlayStyle = void 0;
6
+ exports.standardDecorationMarkerVariable = exports.editingStyleRuleNode = exports.editingStyleQuoteNode = exports.editingStyleNode = exports.editingStyleExtended = exports.editingStyleCardBlockNode = exports.editingStyleActiveExtended = exports.editingStyleActive = exports.editingStyle = exports.editingContentStyleInBlockExtended = exports.editingContentStyleInBlock = exports.deletedStyleQuoteNodeWithLozengeActive = exports.deletedStyleQuoteNodeWithLozenge = exports.deletedStyleQuoteNode = exports.deletedRowStyle = exports.deletedInlineContentStyleExtended = exports.deletedContentStyleUnbounded = exports.deletedContentStyleNew = exports.deletedContentStyleActive = exports.deletedContentStyle = exports.deletedCellOverlayStyle = exports.deletedBlockOutlineRoundedActive = exports.deletedBlockOutlineRounded = exports.deletedBlockOutlineActive = exports.deletedBlockOutline = exports.addedCellOverlayStyle = void 0;
7
7
  var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
8
8
  // delete on platform_editor_diff_plugin_extended cleanup
9
9
  var editingStyle = exports.editingStyle = (0, _lazyNodeView.convertToInlineCss)({
@@ -67,8 +67,10 @@ var deletedContentStyleNew = exports.deletedContentStyleNew = (0, _lazyNodeView.
67
67
  /**
68
68
  * Merge into existing styles when cleaning up
69
69
  */
70
- var deletedInlineContentBackground = exports.deletedInlineContentBackground = (0, _lazyNodeView.convertToInlineCss)({
71
- backgroundColor: "var(--ds-background-accent-gray-subtlest, #F0F1F2)"
70
+ var deletedInlineContentStyleExtended = exports.deletedInlineContentStyleExtended = (0, _lazyNodeView.convertToInlineCss)({
71
+ backgroundColor: "var(--ds-background-accent-gray-subtlest, #F0F1F2)",
72
+ borderBottom: "2px solid ".concat("var(--ds-border-accent-gray, #7D818A)"),
73
+ padding: "1px 0 2px"
72
74
  });
73
75
  var deletedContentStyleUnbounded = exports.deletedContentStyleUnbounded = (0, _lazyNodeView.convertToInlineCss)({
74
76
  position: 'absolute',
package/dist/cjs/pm-plugins/decorations/createInlineChangedDecoration.js CHANGED
@@ -52,7 +52,7 @@ var createInlineChangedDecoration = exports.createInlineChangedDecoration = func
52
52
  * Merge into existing styles when cleaning up
53
53
  */
54
54
  if ((0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
55
- style += _standard.deletedInlineContentBackground;
55
+ style += _standard.deletedInlineContentStyleExtended;
56
56
  }
57
57
  }
58
58
  }
package/dist/cjs/pm-plugins/decorations/createNodeChangedDecorationWidget.js CHANGED
@@ -45,9 +45,9 @@ var getDeletedContentStyle = function getDeletedContentStyle(colorScheme) {
45
45
  // Merge into existing styles when cleaning up
46
46
  if ((0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
47
47
  if (isActive) {
48
- return _standard.deletedContentStyleActive + _standard.deletedInlineContentBackground;
48
+ return _standard.deletedContentStyleActive + _standard.deletedInlineContentStyleExtended;
49
49
  }
50
- return _standard.deletedContentStyleNew + _standard.deletedInlineContentBackground;
50
+ return _standard.deletedContentStyleNew + _standard.deletedInlineContentStyleExtended;
51
51
  }
52
52
  if (isActive) {
53
53
  return _standard.deletedContentStyleActive;
package/dist/es2019/pm-plugins/decorations/colorSchemes/standard.js CHANGED
@@ -61,8 +61,10 @@ export const deletedContentStyleNew = convertToInlineCss({
61
61
  /**
62
62
  * Merge into existing styles when cleaning up
63
63
  */
64
- export const deletedInlineContentBackground = convertToInlineCss({
65
- backgroundColor: "var(--ds-background-accent-gray-subtlest, #F0F1F2)"
64
+ export const deletedInlineContentStyleExtended = convertToInlineCss({
65
+ backgroundColor: "var(--ds-background-accent-gray-subtlest, #F0F1F2)",
66
+ borderBottom: `2px solid ${"var(--ds-border-accent-gray, #7D818A)"}`,
67
+ padding: `1px 0 2px`
66
68
  });
67
69
  export const deletedContentStyleUnbounded = convertToInlineCss({
68
70
  position: 'absolute',
package/dist/es2019/pm-plugins/decorations/createInlineChangedDecoration.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
2
2
  import { Decoration } from '@atlaskit/editor-prosemirror/view';
3
3
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
4
- import { editingStyle, editingStyleExtended, editingStyleActive, editingStyleActiveExtended, deletedContentStyle, deletedContentStyleActive, deletedInlineContentBackground } from './colorSchemes/standard';
4
+ import { editingStyle, editingStyleExtended, editingStyleActive, editingStyleActiveExtended, deletedContentStyle, deletedContentStyleActive, deletedInlineContentStyleExtended } from './colorSchemes/standard';
5
5
  import { traditionalInsertStyle, traditionalInsertStyleActive, getDeletedTraditionalInlineStyle } from './colorSchemes/traditional';
6
6
  const displayNoneStyle = convertToInlineCss({
7
7
  display: 'none'
@@ -44,7 +44,7 @@ export const createInlineChangedDecoration = ({
44
44
  * Merge into existing styles when cleaning up
45
45
  */
46
46
  if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
47
- style += deletedInlineContentBackground;
47
+ style += deletedInlineContentStyleExtended;
48
48
  }
49
49
  }
50
50
  }
package/dist/es2019/pm-plugins/decorations/createNodeChangedDecorationWidget.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
2
2
  import { Decoration } from '@atlaskit/editor-prosemirror/view';
3
3
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
4
- import { editingStyle, editingStyleExtended, editingStyleActive, editingStyleActiveExtended, deletedContentStyle, deletedContentStyleActive, deletedContentStyleNew, deletedContentStyleUnbounded, deletedInlineContentBackground } from './colorSchemes/standard';
4
+ import { editingStyle, editingStyleExtended, editingStyleActive, editingStyleActiveExtended, deletedContentStyle, deletedContentStyleActive, deletedContentStyleNew, deletedContentStyleUnbounded, deletedInlineContentStyleExtended } from './colorSchemes/standard';
5
5
  import { traditionalInsertStyle, traditionalInsertStyleActive, getDeletedTraditionalInlineStyle, deletedTraditionalContentStyleUnbounded, deletedTraditionalContentStyleUnboundedActive } from './colorSchemes/traditional';
6
6
  import { createChangedRowDecorationWidgets } from './createChangedRowDecorationWidgets';
7
7
  import { findSafeInsertPos } from './utils/findSafeInsertPos';
@@ -31,9 +31,9 @@ const getDeletedContentStyle = (colorScheme, isActive = false) => {
31
31
  // Merge into existing styles when cleaning up
32
32
  if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
33
33
  if (isActive) {
34
- return deletedContentStyleActive + deletedInlineContentBackground;
34
+ return deletedContentStyleActive + deletedInlineContentStyleExtended;
35
35
  }
36
- return deletedContentStyleNew + deletedInlineContentBackground;
36
+ return deletedContentStyleNew + deletedInlineContentStyleExtended;
37
37
  }
38
38
  if (isActive) {
39
39
  return deletedContentStyleActive;
package/dist/esm/pm-plugins/decorations/colorSchemes/standard.js CHANGED
@@ -61,8 +61,10 @@ export var deletedContentStyleNew = convertToInlineCss({
61
61
  /**
62
62
  * Merge into existing styles when cleaning up
63
63
  */
64
- export var deletedInlineContentBackground = convertToInlineCss({
65
- backgroundColor: "var(--ds-background-accent-gray-subtlest, #F0F1F2)"
64
+ export var deletedInlineContentStyleExtended = convertToInlineCss({
65
+ backgroundColor: "var(--ds-background-accent-gray-subtlest, #F0F1F2)",
66
+ borderBottom: "2px solid ".concat("var(--ds-border-accent-gray, #7D818A)"),
67
+ padding: "1px 0 2px"
66
68
  });
67
69
  export var deletedContentStyleUnbounded = convertToInlineCss({
68
70
  position: 'absolute',
package/dist/esm/pm-plugins/decorations/createInlineChangedDecoration.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
2
2
  import { Decoration } from '@atlaskit/editor-prosemirror/view';
3
3
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
4
- import { editingStyle, editingStyleExtended, editingStyleActive, editingStyleActiveExtended, deletedContentStyle, deletedContentStyleActive, deletedInlineContentBackground } from './colorSchemes/standard';
4
+ import { editingStyle, editingStyleExtended, editingStyleActive, editingStyleActiveExtended, deletedContentStyle, deletedContentStyleActive, deletedInlineContentStyleExtended } from './colorSchemes/standard';
5
5
  import { traditionalInsertStyle, traditionalInsertStyleActive, getDeletedTraditionalInlineStyle } from './colorSchemes/traditional';
6
6
  var displayNoneStyle = convertToInlineCss({
7
7
  display: 'none'
@@ -46,7 +46,7 @@ export var createInlineChangedDecoration = function createInlineChangedDecoratio
46
46
  * Merge into existing styles when cleaning up
47
47
  */
48
48
  if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
49
- style += deletedInlineContentBackground;
49
+ style += deletedInlineContentStyleExtended;
50
50
  }
51
51
  }
52
52
  }
package/dist/esm/pm-plugins/decorations/createNodeChangedDecorationWidget.js CHANGED
@@ -5,7 +5,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
5
5
  import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
6
6
  import { Decoration } from '@atlaskit/editor-prosemirror/view';
7
7
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
8
- import { editingStyle, editingStyleExtended, editingStyleActive, editingStyleActiveExtended, deletedContentStyle, deletedContentStyleActive, deletedContentStyleNew, deletedContentStyleUnbounded, deletedInlineContentBackground } from './colorSchemes/standard';
8
+ import { editingStyle, editingStyleExtended, editingStyleActive, editingStyleActiveExtended, deletedContentStyle, deletedContentStyleActive, deletedContentStyleNew, deletedContentStyleUnbounded, deletedInlineContentStyleExtended } from './colorSchemes/standard';
9
9
  import { traditionalInsertStyle, traditionalInsertStyleActive, getDeletedTraditionalInlineStyle, deletedTraditionalContentStyleUnbounded, deletedTraditionalContentStyleUnboundedActive } from './colorSchemes/traditional';
10
10
  import { createChangedRowDecorationWidgets } from './createChangedRowDecorationWidgets';
11
11
  import { findSafeInsertPos } from './utils/findSafeInsertPos';
@@ -38,9 +38,9 @@ var getDeletedContentStyle = function getDeletedContentStyle(colorScheme) {
38
38
  // Merge into existing styles when cleaning up
39
39
  if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
40
40
  if (isActive) {
41
- return deletedContentStyleActive + deletedInlineContentBackground;
41
+ return deletedContentStyleActive + deletedInlineContentStyleExtended;
42
42
  }
43
- return deletedContentStyleNew + deletedInlineContentBackground;
43
+ return deletedContentStyleNew + deletedInlineContentStyleExtended;
44
44
  }
45
45
  if (isActive) {
46
46
  return deletedContentStyleActive;
package/dist/types/pm-plugins/decorations/colorSchemes/standard.d.ts CHANGED
@@ -10,7 +10,7 @@ export declare const deletedContentStyleNew: string;
10
10
  /**
11
11
  * Merge into existing styles when cleaning up
12
12
  */
13
- export declare const deletedInlineContentBackground: string;
13
+ export declare const deletedInlineContentStyleExtended: string;
14
14
  export declare const deletedContentStyleUnbounded: string;
15
15
  export declare const deletedStyleQuoteNode: string;
16
16
  export declare const deletedStyleQuoteNodeWithLozenge: string;
package/dist/types-ts4.5/pm-plugins/decorations/colorSchemes/standard.d.ts CHANGED
@@ -10,7 +10,7 @@ export declare const deletedContentStyleNew: string;
10
10
  /**
11
11
  * Merge into existing styles when cleaning up
12
12
  */
13
- export declare const deletedInlineContentBackground: string;
13
+ export declare const deletedInlineContentStyleExtended: string;
14
14
  export declare const deletedContentStyleUnbounded: string;
15
15
  export declare const deletedStyleQuoteNode: string;
16
16
  export declare const deletedStyleQuoteNodeWithLozenge: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-show-diff",
3
- "version": "9.0.15",
3
+ "version": "9.0.17",
4
4
  "description": "ShowDiff plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -35,8 +35,8 @@
35
35
  "@atlaskit/editor-prosemirror": "^7.3.0",
36
36
  "@atlaskit/editor-tables": "^2.10.0",
37
37
  "@atlaskit/platform-feature-flags": "^1.1.0",
38
- "@atlaskit/tmp-editor-statsig": "^99.0.0",
39
- "@atlaskit/tokens": "^13.3.0",
38
+ "@atlaskit/tmp-editor-statsig": "^100.0.0",
39
+ "@atlaskit/tokens": "^13.4.0",
40
40
  "@babel/runtime": "^7.0.0",
41
41
  "lodash": "^4.17.21",
42
42
  "memoize-one": "^6.0.0",
@@ -46,7 +46,7 @@
46
46
  "@atlaskit/adf-utils": "^19.33.0",
47
47
  "@atlaskit/button": "^23.11.0",
48
48
  "@atlaskit/css": "^0.19.0",
49
- "@atlaskit/editor-core": "^220.3.0",
49
+ "@atlaskit/editor-core": "^220.4.0",
50
50
  "@atlaskit/editor-json-transformer": "^8.33.0",
51
51
  "@atlaskit/form": "^15.5.0",
52
52
  "@atlaskit/primitives": "^19.0.0",
@@ -59,7 +59,7 @@
59
59
  "react-intl": "^6.6.2"
60
60
  },
61
61
  "peerDependencies": {
62
- "@atlaskit/editor-common": "^115.13.0",
62
+ "@atlaskit/editor-common": "^115.15.0",
63
63
  "react": "^18.2.0"
64
64
  },
65
65
  "techstack": {