@atlaskit/editor-plugin-show-diff 10.6.2 → 10.7.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.
- package/CHANGELOG.md +19 -0
- package/dist/cjs/pm-plugins/decorations/colorSchemes/standard.js +3 -3
- package/dist/es2019/pm-plugins/decorations/colorSchemes/standard.js +3 -3
- package/dist/esm/pm-plugins/decorations/colorSchemes/standard.js +3 -3
- package/dist/types/pm-plugins/calculateDiff/smart/helpers.d.ts +2 -2
- package/dist/types/pm-plugins/decorations/createNodeChangedDecorationWidget.d.ts +1 -1
- package/dist/types/pm-plugins/decorations/decorationKeys.d.ts +8 -8
- package/package.json +13 -13
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,24 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-show-diff
|
|
2
2
|
|
|
3
|
+
## 10.7.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [`51c33ef5349b6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/51c33ef5349b6) -
|
|
8
|
+
Enable compatibility with React 19.2.0
|
|
9
|
+
|
|
10
|
+
### Patch Changes
|
|
11
|
+
|
|
12
|
+
- Updated dependencies
|
|
13
|
+
|
|
14
|
+
## 10.6.3
|
|
15
|
+
|
|
16
|
+
### Patch Changes
|
|
17
|
+
|
|
18
|
+
- [`cdcab84f9ff37`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/cdcab84f9ff37) -
|
|
19
|
+
EDITOR-7839: Decrease cell overlay opacity for standard added cell styles
|
|
20
|
+
- Updated dependencies
|
|
21
|
+
|
|
3
22
|
## 10.6.2
|
|
4
23
|
|
|
5
24
|
### Patch Changes
|
|
@@ -171,8 +171,8 @@ var addedCellOverlayStyle = exports.addedCellOverlayStyle = (0, _lazyNodeView.co
|
|
|
171
171
|
left: 0,
|
|
172
172
|
width: '100%',
|
|
173
173
|
height: '100%',
|
|
174
|
-
backgroundColor: "rgba(from ".concat("var(--ds-background-accent-purple-subtlest, #F8EEFE)", " r g b / 0.
|
|
175
|
-
zIndex:
|
|
174
|
+
backgroundColor: "rgba(from ".concat("var(--ds-background-accent-purple-subtlest, #F8EEFE)", " r g b / 0.2)"),
|
|
175
|
+
zIndex: 2,
|
|
176
176
|
outline: "1px solid ".concat("var(--ds-border-accent-purple, #AF59E1)"),
|
|
177
177
|
pointerEvents: 'none'
|
|
178
178
|
});
|
|
@@ -182,7 +182,7 @@ var addedCellOverlayRoundedStyle = exports.addedCellOverlayRoundedStyle = (0, _l
|
|
|
182
182
|
left: 0,
|
|
183
183
|
width: '100%',
|
|
184
184
|
height: '100%',
|
|
185
|
-
backgroundColor: "rgba(from ".concat("var(--ds-background-accent-purple-subtlest, #F8EEFE)", " r g b / 0.
|
|
185
|
+
backgroundColor: "rgba(from ".concat("var(--ds-background-accent-purple-subtlest, #F8EEFE)", " r g b / 0.2)"),
|
|
186
186
|
zIndex: 2,
|
|
187
187
|
outline: "1px solid ".concat("var(--ds-border-accent-purple, #AF59E1)"),
|
|
188
188
|
pointerEvents: 'none',
|
|
@@ -165,8 +165,8 @@ export const addedCellOverlayStyle = convertToInlineCss({
|
|
|
165
165
|
left: 0,
|
|
166
166
|
width: '100%',
|
|
167
167
|
height: '100%',
|
|
168
|
-
backgroundColor: `rgba(from ${"var(--ds-background-accent-purple-subtlest, #F8EEFE)"} r g b / 0.
|
|
169
|
-
zIndex:
|
|
168
|
+
backgroundColor: `rgba(from ${"var(--ds-background-accent-purple-subtlest, #F8EEFE)"} r g b / 0.2)`,
|
|
169
|
+
zIndex: 2,
|
|
170
170
|
outline: `1px solid ${"var(--ds-border-accent-purple, #AF59E1)"}`,
|
|
171
171
|
pointerEvents: 'none'
|
|
172
172
|
});
|
|
@@ -176,7 +176,7 @@ export const addedCellOverlayRoundedStyle = convertToInlineCss({
|
|
|
176
176
|
left: 0,
|
|
177
177
|
width: '100%',
|
|
178
178
|
height: '100%',
|
|
179
|
-
backgroundColor: `rgba(from ${"var(--ds-background-accent-purple-subtlest, #F8EEFE)"} r g b / 0.
|
|
179
|
+
backgroundColor: `rgba(from ${"var(--ds-background-accent-purple-subtlest, #F8EEFE)"} r g b / 0.2)`,
|
|
180
180
|
zIndex: 2,
|
|
181
181
|
outline: `1px solid ${"var(--ds-border-accent-purple, #AF59E1)"}`,
|
|
182
182
|
pointerEvents: 'none',
|
|
@@ -165,8 +165,8 @@ export var addedCellOverlayStyle = convertToInlineCss({
|
|
|
165
165
|
left: 0,
|
|
166
166
|
width: '100%',
|
|
167
167
|
height: '100%',
|
|
168
|
-
backgroundColor: "rgba(from ".concat("var(--ds-background-accent-purple-subtlest, #F8EEFE)", " r g b / 0.
|
|
169
|
-
zIndex:
|
|
168
|
+
backgroundColor: "rgba(from ".concat("var(--ds-background-accent-purple-subtlest, #F8EEFE)", " r g b / 0.2)"),
|
|
169
|
+
zIndex: 2,
|
|
170
170
|
outline: "1px solid ".concat("var(--ds-border-accent-purple, #AF59E1)"),
|
|
171
171
|
pointerEvents: 'none'
|
|
172
172
|
});
|
|
@@ -176,7 +176,7 @@ export var addedCellOverlayRoundedStyle = convertToInlineCss({
|
|
|
176
176
|
left: 0,
|
|
177
177
|
width: '100%',
|
|
178
178
|
height: '100%',
|
|
179
|
-
backgroundColor: "rgba(from ".concat("var(--ds-background-accent-purple-subtlest, #F8EEFE)", " r g b / 0.
|
|
179
|
+
backgroundColor: "rgba(from ".concat("var(--ds-background-accent-purple-subtlest, #F8EEFE)", " r g b / 0.2)"),
|
|
180
180
|
zIndex: 2,
|
|
181
181
|
outline: "1px solid ".concat("var(--ds-border-accent-purple, #AF59E1)"),
|
|
182
182
|
pointerEvents: 'none',
|
|
@@ -13,7 +13,7 @@ export type SmartSpanData = {
|
|
|
13
13
|
* Build the `deleted`/`inserted` span arrays a `Change` needs. A length of 0 yields an
|
|
14
14
|
* empty array (no change on that side).
|
|
15
15
|
*/
|
|
16
|
-
export declare const createSpans: (length: number, data?: SmartSpanData) => Change[
|
|
16
|
+
export declare const createSpans: (length: number, data?: SmartSpanData) => Change['inserted'];
|
|
17
17
|
/**
|
|
18
18
|
* Build a promoted `Change` spanning `[fromA,toA)` in the original doc and `[fromB,toB)`
|
|
19
19
|
* in the new doc, with both sides marked changed (mirrors `groupChangesByBlock` so the
|
|
@@ -28,7 +28,7 @@ export declare const makePromotedChange: (fromA: number, toA: number, fromB: num
|
|
|
28
28
|
* Read the `smartLevel` tag off a change's spans, if present. Returns `undefined` for
|
|
29
29
|
* changes not produced by the `smart` classifier (e.g. inline/block/step diff types).
|
|
30
30
|
*/
|
|
31
|
-
export declare const smartChangeLevel: (change: Pick<Change,
|
|
31
|
+
export declare const smartChangeLevel: (change: Pick<Change, 'inserted' | 'deleted'>) => SmartChangeLevel | undefined;
|
|
32
32
|
/**
|
|
33
33
|
* Coalesce changes that overlap in new-doc (B) coordinates.
|
|
34
34
|
*
|
|
@@ -13,7 +13,7 @@ export declare const createNodeChangedDecorationWidget: ({ change, doc, nodeView
|
|
|
13
13
|
from: number;
|
|
14
14
|
to: number;
|
|
15
15
|
};
|
|
16
|
-
change: Pick<Change,
|
|
16
|
+
change: Pick<Change, 'fromA' | 'toA' | 'fromB' | 'deleted' | 'toB'>;
|
|
17
17
|
colorScheme?: ColorScheme;
|
|
18
18
|
diffType?: DiffType;
|
|
19
19
|
doc: PMNode;
|
|
@@ -5,8 +5,8 @@ import type { DiffDescriptor, DiffType } from '../../showDiffPluginType';
|
|
|
5
5
|
* Each family owns its own key space and spec shape.
|
|
6
6
|
*/
|
|
7
7
|
export declare const DecorationFamily: {
|
|
8
|
-
readonly diff:
|
|
9
|
-
readonly anchor:
|
|
8
|
+
readonly diff: 'diff';
|
|
9
|
+
readonly anchor: 'anchor';
|
|
10
10
|
};
|
|
11
11
|
type DecorationFamilyValue = (typeof DecorationFamily)[keyof typeof DecorationFamily];
|
|
12
12
|
type BaseDecorationSpec<TFamily extends DecorationFamilyValue> = {
|
|
@@ -20,10 +20,10 @@ export type DiffDecorationSpec = BaseDecorationSpec<typeof DecorationFamily.diff
|
|
|
20
20
|
nodeName?: string;
|
|
21
21
|
};
|
|
22
22
|
export declare const AnchorTypeKey: {
|
|
23
|
-
readonly from:
|
|
24
|
-
readonly to:
|
|
25
|
-
readonly left:
|
|
26
|
-
readonly docMargin:
|
|
23
|
+
readonly from: 'from';
|
|
24
|
+
readonly to: 'to';
|
|
25
|
+
readonly left: 'left';
|
|
26
|
+
readonly docMargin: 'doc-margin';
|
|
27
27
|
};
|
|
28
28
|
type InlineAnchorType = Exclude<(typeof AnchorTypeKey)[keyof typeof AnchorTypeKey], typeof AnchorTypeKey.docMargin>;
|
|
29
29
|
export type AnchorDecorationSpec = (BaseDecorationSpec<typeof DecorationFamily.anchor> & {
|
|
@@ -54,13 +54,13 @@ export declare const buildAnchorDecorationKey: ({ diffId, anchorType, }: {
|
|
|
54
54
|
* distinguishable.
|
|
55
55
|
*/
|
|
56
56
|
export declare const buildDiffDecorationKey: ({ decorationKeyPrefix, isActive, diffId, diffType, }: {
|
|
57
|
-
decorationKeyPrefix: (typeof DiffDecorationKey)[DiffDescriptor[
|
|
57
|
+
decorationKeyPrefix: (typeof DiffDecorationKey)[DiffDescriptor['type']];
|
|
58
58
|
diffId?: string;
|
|
59
59
|
diffType?: DiffType;
|
|
60
60
|
isActive?: boolean;
|
|
61
61
|
}) => string;
|
|
62
62
|
export declare const buildDiffDecorationSpec: ({ decorationType, diffId, isActive, nodeName, side, diffType, }: {
|
|
63
|
-
decorationType: DiffDescriptor[
|
|
63
|
+
decorationType: DiffDescriptor['type'];
|
|
64
64
|
diffId: string;
|
|
65
65
|
diffType?: DiffType;
|
|
66
66
|
isActive?: boolean;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-plugin-show-diff",
|
|
3
|
-
"version": "10.
|
|
3
|
+
"version": "10.7.0",
|
|
4
4
|
"description": "ShowDiff plugin for @atlaskit/editor-core",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -20,15 +20,15 @@
|
|
|
20
20
|
"sideEffects": false,
|
|
21
21
|
"atlaskit:src": "src/index.ts",
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@atlaskit/adf-schema": "^56.
|
|
23
|
+
"@atlaskit/adf-schema": "^56.2.0",
|
|
24
24
|
"@atlaskit/custom-steps": "^1.0.0",
|
|
25
|
-
"@atlaskit/editor-plugin-analytics": "^12.
|
|
26
|
-
"@atlaskit/editor-plugin-expand": "^13.
|
|
27
|
-
"@atlaskit/editor-plugin-user-intent": "^10.
|
|
25
|
+
"@atlaskit/editor-plugin-analytics": "^12.1.0",
|
|
26
|
+
"@atlaskit/editor-plugin-expand": "^13.2.0",
|
|
27
|
+
"@atlaskit/editor-plugin-user-intent": "^10.2.0",
|
|
28
28
|
"@atlaskit/editor-prosemirror": "^8.0.0",
|
|
29
29
|
"@atlaskit/editor-tables": "^3.0.0",
|
|
30
30
|
"@atlaskit/platform-feature-flags": "^2.1.0",
|
|
31
|
-
"@atlaskit/tmp-editor-statsig": "^
|
|
31
|
+
"@atlaskit/tmp-editor-statsig": "^135.7.0",
|
|
32
32
|
"@atlaskit/tokens": "^16.3.0",
|
|
33
33
|
"@babel/runtime": "^7.0.0",
|
|
34
34
|
"@compiled/react": "^1.0.0",
|
|
@@ -37,12 +37,12 @@
|
|
|
37
37
|
"prosemirror-changeset": "^2.3.1"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
|
-
"@atlaskit/adf-utils": "^20.
|
|
40
|
+
"@atlaskit/adf-utils": "^20.4.0",
|
|
41
41
|
"@atlaskit/button": "^24.3.0",
|
|
42
42
|
"@atlaskit/css": "^1.0.0",
|
|
43
|
-
"@atlaskit/dropdown-menu": "^17.
|
|
44
|
-
"@atlaskit/editor-core": "^221.
|
|
45
|
-
"@atlaskit/editor-json-transformer": "^9.
|
|
43
|
+
"@atlaskit/dropdown-menu": "^17.2.0",
|
|
44
|
+
"@atlaskit/editor-core": "^221.16.0",
|
|
45
|
+
"@atlaskit/editor-json-transformer": "^9.2.0",
|
|
46
46
|
"@atlaskit/form": "^16.1.0",
|
|
47
47
|
"@atlaskit/primitives": "^22.2.0",
|
|
48
48
|
"@atlaskit/section-message": "^9.2.0",
|
|
@@ -50,12 +50,12 @@
|
|
|
50
50
|
"@atlassian/confluence-presets": "workspace:^",
|
|
51
51
|
"@atlassian/content-reconciliation": "^0.1.3506",
|
|
52
52
|
"@atlassian/structured-docs-types": "workspace:^",
|
|
53
|
-
"react": "^
|
|
53
|
+
"react": "^19.2.0",
|
|
54
54
|
"react-intl": "^7.0.0"
|
|
55
55
|
},
|
|
56
56
|
"peerDependencies": {
|
|
57
|
-
"@atlaskit/editor-common": "^116.
|
|
58
|
-
"react": "^18.2.0"
|
|
57
|
+
"@atlaskit/editor-common": "^116.45.0",
|
|
58
|
+
"react": "^18.2.0 || ^19.2.0"
|
|
59
59
|
},
|
|
60
60
|
"techstack": {
|
|
61
61
|
"@atlassian/frontend": {
|