@atlaskit/editor-plugin-show-diff 6.1.1 → 6.1.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 (26) hide show
  1. package/CHANGELOG.md +13 -0
  2. package/dist/cjs/pm-plugins/calculateDiffDecorations.js +17 -8
  3. package/dist/cjs/pm-plugins/decorations/colorSchemes/standard.js +1 -1
  4. package/dist/cjs/pm-plugins/decorations/colorSchemes/traditional.js +39 -2
  5. package/dist/cjs/pm-plugins/decorations/createBlockChangedDecoration.js +34 -26
  6. package/dist/cjs/pm-plugins/decorations/createNodeChangedDecorationWidget.js +10 -4
  7. package/dist/cjs/pm-plugins/main.js +7 -4
  8. package/dist/es2019/pm-plugins/calculateDiffDecorations.js +16 -8
  9. package/dist/es2019/pm-plugins/decorations/colorSchemes/standard.js +1 -1
  10. package/dist/es2019/pm-plugins/decorations/colorSchemes/traditional.js +38 -1
  11. package/dist/es2019/pm-plugins/decorations/createBlockChangedDecoration.js +33 -27
  12. package/dist/es2019/pm-plugins/decorations/createNodeChangedDecorationWidget.js +13 -6
  13. package/dist/es2019/pm-plugins/main.js +5 -2
  14. package/dist/esm/pm-plugins/calculateDiffDecorations.js +17 -8
  15. package/dist/esm/pm-plugins/decorations/colorSchemes/standard.js +1 -1
  16. package/dist/esm/pm-plugins/decorations/colorSchemes/traditional.js +38 -1
  17. package/dist/esm/pm-plugins/decorations/createBlockChangedDecoration.js +35 -27
  18. package/dist/esm/pm-plugins/decorations/createNodeChangedDecorationWidget.js +11 -5
  19. package/dist/esm/pm-plugins/main.js +7 -4
  20. package/dist/types/pm-plugins/decorations/colorSchemes/traditional.d.ts +9 -0
  21. package/dist/types/pm-plugins/decorations/createBlockChangedDecoration.d.ts +8 -5
  22. package/dist/types/pm-plugins/decorations/createNodeChangedDecorationWidget.d.ts +1 -1
  23. package/dist/types-ts4.5/pm-plugins/decorations/colorSchemes/traditional.d.ts +9 -0
  24. package/dist/types-ts4.5/pm-plugins/decorations/createBlockChangedDecoration.d.ts +8 -5
  25. package/dist/types-ts4.5/pm-plugins/decorations/createNodeChangedDecorationWidget.d.ts +1 -1
  26. package/package.json +3 -3
@@ -1,15 +1,24 @@
1
1
  export declare const traditionalInsertStyle: string;
2
2
  export declare const traditionalInsertStyleActive: string;
3
3
  export declare const deletedTraditionalContentStyle: string;
4
+ /** Emphasised (pressed) strikethrough for traditional removed text when active */
5
+ export declare const deletedTraditionalContentStyleActive: string;
4
6
  export declare const deletedTraditionalContentStyleUnbounded: string;
7
+ /** Emphasised (pressed) strikethrough line for traditional when active */
8
+ export declare const deletedTraditionalContentStyleUnboundedActive: string;
5
9
  export declare const deletedTraditionalStyleQuoteNode: string;
6
10
  export declare const deletedTraditionalBlockOutline: string;
7
11
  export declare const deletedTraditionalBlockOutlineRounded: string;
8
12
  export declare const deletedTraditionalRowStyle: string;
9
13
  export declare const traditionalStyleQuoteNode: string;
14
+ export declare const traditionalStyleQuoteNodeActive: string;
10
15
  export declare const traditionalStyleRuleNode: string;
16
+ export declare const traditionalStyleRuleNodeActive: string;
11
17
  export declare const traditionalStyleNode: string;
18
+ export declare const traditionalStyleNodeActive: string;
12
19
  export declare const traditionalStyleCardBlockNode: string;
20
+ export declare const traditionalStyleCardBlockNodeActive: string;
13
21
  export declare const traditionalDecorationMarkerVariable: string;
22
+ export declare const traditionalDecorationMarkerVariableActive: string;
14
23
  export declare const traditionalAddedCellOverlayStyle: string;
15
24
  export declare const deletedTraditionalCellOverlayStyle: string;
@@ -1,17 +1,20 @@
1
1
  import { Decoration } from '@atlaskit/editor-prosemirror/view';
2
2
  import type { ColorScheme } from '../../showDiffPluginType';
3
3
  /**
4
- * Inline decoration used for insertions as the content already exists in the document
4
+ * Node decoration used for block-level insertions. When isActive, uses emphasised (pressed) styling.
5
5
  *
6
- * @param change Changeset "change" containing information about the change content + range
7
- * @returns Prosemirror inline decoration
6
+ * @param change Node range and name
7
+ * @param colorScheme Optional color scheme
8
+ * @param isActive Whether this node is part of the currently active/focused change
9
+ * @returns Prosemirror node decoration or undefined
8
10
  */
9
- export declare const createBlockChangedDecoration: ({ change, colorScheme, isInserted, }: {
11
+ export declare const createBlockChangedDecoration: ({ change, colorScheme, isInserted, isActive, }: {
10
12
  change: {
11
13
  from: number;
12
14
  name: string;
13
15
  to: number;
14
16
  };
15
17
  colorScheme?: ColorScheme;
16
- isInserted: boolean;
18
+ isActive?: boolean;
19
+ isInserted?: boolean;
17
20
  }) => Decoration | undefined;
@@ -9,7 +9,7 @@ import type { NodeViewSerializer } from '../NodeViewSerializer';
9
9
  * that is not in the current document.
10
10
  */
11
11
  export declare const createNodeChangedDecorationWidget: ({ change, doc, nodeViewSerializer, colorScheme, newDoc, intl, isActive, isInserted, }: {
12
- change: Pick<Change, "fromA" | "toA" | "fromB" | "deleted">;
12
+ change: Pick<Change, "fromA" | "toA" | "fromB" | "deleted" | "toB">;
13
13
  colorScheme?: ColorScheme;
14
14
  doc: PMNode;
15
15
  intl: IntlShape;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-show-diff",
3
- "version": "6.1.1",
3
+ "version": "6.1.3",
4
4
  "description": "ShowDiff plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -33,7 +33,7 @@
33
33
  "@atlaskit/editor-prosemirror": "^7.3.0",
34
34
  "@atlaskit/editor-tables": "^2.9.0",
35
35
  "@atlaskit/platform-feature-flags": "^1.1.0",
36
- "@atlaskit/tmp-editor-statsig": "^39.0.0",
36
+ "@atlaskit/tmp-editor-statsig": "^40.0.0",
37
37
  "@atlaskit/tokens": "^11.1.0",
38
38
  "@babel/runtime": "^7.0.0",
39
39
  "lodash": "^4.17.21",
@@ -45,7 +45,7 @@
45
45
  "@atlassian/content-reconciliation": "^0.1.3506"
46
46
  },
47
47
  "peerDependencies": {
48
- "@atlaskit/editor-common": "^112.3.0",
48
+ "@atlaskit/editor-common": "^112.4.0",
49
49
  "react": "^18.2.0"
50
50
  },
51
51
  "techstack": {