@atlaskit/editor-plugin-show-diff 24.1.3 → 24.1.6
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 +25 -0
- package/dist/cjs/pm-plugins/NodeViewSerializer.js +6 -14
- package/dist/cjs/pm-plugins/decorations/colorSchemes/factory.js +61 -61
- package/dist/cjs/pm-plugins/decorations/colorSchemes/standard.js +30 -30
- package/dist/cjs/pm-plugins/decorations/colorSchemes/traditional.js +38 -38
- package/dist/cjs/pm-plugins/decorations/createBlockChangedDecoration.js +9 -4
- package/dist/cjs/pm-plugins/decorations/createBlockChangedDecoration.styles.legacy.js +2 -2
- package/dist/cjs/pm-plugins/decorations/createInlineChangedDecoration.js +3 -3
- package/dist/cjs/pm-plugins/decorations/revealStyles.js +5 -5
- package/dist/cjs/pm-plugins/decorations/utils/wrapBlockNodeView.js +10 -10
- package/dist/cjs/pm-plugins/decorations/utils/wrapBlockNodeViewStyles.legacy.js +4 -4
- package/dist/cjs/pm-plugins/scrollToDiff.js +2 -2
- package/dist/cjs/ui/ContributorTag/buildContributorTagDom.js +6 -6
- package/dist/cjs/ui/ContributorTag/contributorAvatarRenderer.js +7 -7
- package/dist/cjs/ui/IndicatorBar/IndicatorBarContentComponent.js +2 -2
- package/dist/es2019/pm-plugins/NodeViewSerializer.js +7 -15
- package/dist/es2019/pm-plugins/decorations/colorSchemes/factory.js +1 -1
- package/dist/es2019/pm-plugins/decorations/colorSchemes/standard.js +1 -1
- package/dist/es2019/pm-plugins/decorations/colorSchemes/traditional.js +1 -1
- package/dist/es2019/pm-plugins/decorations/createBlockChangedDecoration.js +7 -2
- package/dist/es2019/pm-plugins/decorations/createBlockChangedDecoration.styles.legacy.js +1 -1
- package/dist/es2019/pm-plugins/decorations/createInlineChangedDecoration.js +1 -1
- package/dist/es2019/pm-plugins/decorations/revealStyles.js +1 -1
- package/dist/es2019/pm-plugins/decorations/utils/wrapBlockNodeView.js +2 -2
- package/dist/es2019/pm-plugins/decorations/utils/wrapBlockNodeViewStyles.legacy.js +1 -1
- package/dist/es2019/pm-plugins/scrollToDiff.js +1 -1
- package/dist/es2019/ui/ContributorTag/buildContributorTagDom.js +1 -1
- package/dist/es2019/ui/ContributorTag/contributorAvatarRenderer.js +1 -1
- package/dist/es2019/ui/IndicatorBar/IndicatorBarContentComponent.js +1 -1
- package/dist/esm/pm-plugins/NodeViewSerializer.js +6 -14
- package/dist/esm/pm-plugins/decorations/colorSchemes/factory.js +1 -1
- package/dist/esm/pm-plugins/decorations/colorSchemes/standard.js +1 -1
- package/dist/esm/pm-plugins/decorations/colorSchemes/traditional.js +1 -1
- package/dist/esm/pm-plugins/decorations/createBlockChangedDecoration.js +7 -2
- package/dist/esm/pm-plugins/decorations/createBlockChangedDecoration.styles.legacy.js +1 -1
- package/dist/esm/pm-plugins/decorations/createInlineChangedDecoration.js +1 -1
- package/dist/esm/pm-plugins/decorations/revealStyles.js +1 -1
- package/dist/esm/pm-plugins/decorations/utils/wrapBlockNodeView.js +2 -2
- package/dist/esm/pm-plugins/decorations/utils/wrapBlockNodeViewStyles.legacy.js +1 -1
- package/dist/esm/pm-plugins/scrollToDiff.js +1 -1
- package/dist/esm/ui/ContributorTag/buildContributorTagDom.js +1 -1
- package/dist/esm/ui/ContributorTag/contributorAvatarRenderer.js +1 -1
- package/dist/esm/ui/IndicatorBar/IndicatorBarContentComponent.js +1 -1
- package/dist/types/pm-plugins/NodeViewSerializer.d.ts +1 -1
- package/dist/types/pm-plugins/calculateDiff/calculateDiffDecorations.d.ts +1 -1
- package/dist/types/pm-plugins/decorations/createContributorTagWidget.d.ts +1 -1
- package/dist/types/pm-plugins/main.d.ts +1 -1
- package/dist/types/pm-plugins/scrollToDiff.d.ts +1 -1
- package/dist/types/showDiffPluginType.d.ts +5 -4
- package/dist/types/ui/ContributorTag/contributorTagController.d.ts +1 -1
- package/dist/types/ui/IndicatorBar/IndicatorBarContentComponent.d.ts +1 -1
- package/docs/0-intro.tsx +1 -1
- package/package.json +5 -5
|
@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.wrapBlockNodeView = exports.injectInnerWrapper = exports.createRemovedLozenge = exports.createContentWrapper = void 0;
|
|
8
8
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
9
|
-
var
|
|
10
|
-
var
|
|
9
|
+
var _cssHelper = require("@atlaskit/editor-common/css-helper");
|
|
10
|
+
var _trackChanges = require("@atlaskit/editor-common/messages/track-changes");
|
|
11
11
|
var _nodeTypeUtils = require("@atlaskit/editor-common/utils/node-type-utils");
|
|
12
12
|
var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
|
|
13
13
|
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
@@ -145,7 +145,7 @@ var createRemovedLozenge = exports.createRemovedLozenge = function createRemoved
|
|
|
145
145
|
var colorScheme = arguments.length > 2 ? arguments[2] : undefined;
|
|
146
146
|
var inCell = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
|
|
147
147
|
var container = document.createElement('span');
|
|
148
|
-
var containerStyle = (0,
|
|
148
|
+
var containerStyle = (0, _cssHelper.convertToInlineCss)({
|
|
149
149
|
position: 'absolute',
|
|
150
150
|
top: "var(--ds-space-075, 6px)",
|
|
151
151
|
right: "var(--ds-space-075, 6px)",
|
|
@@ -162,7 +162,7 @@ var createRemovedLozenge = exports.createRemovedLozenge = function createRemoved
|
|
|
162
162
|
// A column label sits over an already-grey deleted cell, so use the red Removed treatment.
|
|
163
163
|
var lozengeInnerStyle = (0, _wrapBlockNodeViewStyles.resolveRemovedLozengeStyle)(colorScheme, inCell || isActive);
|
|
164
164
|
lozengeElement.setAttribute('style', lozengeInnerStyle);
|
|
165
|
-
lozengeElement.textContent = intl.formatMessage(
|
|
165
|
+
lozengeElement.textContent = intl.formatMessage(_trackChanges.trackChangesMessages.removed).toUpperCase();
|
|
166
166
|
if (inCell) {
|
|
167
167
|
lozengeElement.setAttribute('style', "".concat(lozengeInnerStyle, ";").concat(containerStyle));
|
|
168
168
|
lozengeElement.setAttribute('data-testid', 'show-diff-removed-lozenge');
|
|
@@ -180,7 +180,7 @@ var createRemovedLozenge = exports.createRemovedLozenge = function createRemoved
|
|
|
180
180
|
*/
|
|
181
181
|
var createBlockNodeWrapper = function createBlockNodeWrapper() {
|
|
182
182
|
var wrapper = document.createElement('div');
|
|
183
|
-
var baseStyle = (0,
|
|
183
|
+
var baseStyle = (0, _cssHelper.convertToInlineCss)({
|
|
184
184
|
position: 'relative',
|
|
185
185
|
display: 'block',
|
|
186
186
|
opacity: 1
|
|
@@ -275,7 +275,7 @@ var applyInlineLeafNodeStyles = function applyInlineLeafNodeStyles(_ref7) {
|
|
|
275
275
|
* font metrics, not from an inline-level child. `flow-root` keeps the formatting context but is
|
|
276
276
|
* block-level — unlike `block`, which lets the child paragraph's top margin collapse out.
|
|
277
277
|
*/
|
|
278
|
-
var quoteBlockLevelStyle = (0,
|
|
278
|
+
var quoteBlockLevelStyle = (0, _cssHelper.convertToInlineCss)({
|
|
279
279
|
display: 'flow-root'
|
|
280
280
|
});
|
|
281
281
|
var applyTextLikeBlockNodeStyles = function applyTextLikeBlockNodeStyles(_ref8) {
|
|
@@ -359,7 +359,7 @@ var createBlockNodeContentWrapper = function createBlockNodeContentWrapper(_ref9
|
|
|
359
359
|
var _nodeView$querySelect;
|
|
360
360
|
// Give an empty deleted column height so its diff box doesn't collapse
|
|
361
361
|
var placeholderTarget = (_nodeView$querySelect = nodeView.querySelector('[data-layout-content]')) !== null && _nodeView$querySelect !== void 0 ? _nodeView$querySelect : nodeView;
|
|
362
|
-
appendStyleToElement(placeholderTarget, (0,
|
|
362
|
+
appendStyleToElement(placeholderTarget, (0, _cssHelper.convertToInlineCss)({
|
|
363
363
|
minHeight: "var(--ds-space-300, 24px)"
|
|
364
364
|
}));
|
|
365
365
|
}
|
|
@@ -444,7 +444,7 @@ var handleMediaSingleWithLozenge = function handleMediaSingleWithLozenge(_ref1)
|
|
|
444
444
|
|
|
445
445
|
// Add relative positioning to media node to anchor lozenge
|
|
446
446
|
var currentStyle = mediaNode.getAttribute('style') || '';
|
|
447
|
-
var relativePositionStyle = (0,
|
|
447
|
+
var relativePositionStyle = (0, _cssHelper.convertToInlineCss)({
|
|
448
448
|
position: 'relative'
|
|
449
449
|
});
|
|
450
450
|
mediaNode.setAttribute('style', "".concat(currentStyle).concat(relativePositionStyle));
|
|
@@ -508,7 +508,7 @@ var wrapBlockNode = function wrapBlockNode(_ref10) {
|
|
|
508
508
|
// right edge — host it on the breakout element, which must establish a containing block.
|
|
509
509
|
var breakoutHost = (0, _fg.fg)('platform_editor_ai_show_diff_patch_2') ? findBreakoutElement(targetNode, nodeView) : null;
|
|
510
510
|
if (breakoutHost) {
|
|
511
|
-
appendStyleToElement(breakoutHost, (0,
|
|
511
|
+
appendStyleToElement(breakoutHost, (0, _cssHelper.convertToInlineCss)({
|
|
512
512
|
position: 'relative'
|
|
513
513
|
}));
|
|
514
514
|
breakoutHost.append(lozenge);
|
|
@@ -648,7 +648,7 @@ var createContentWrapper = exports.createContentWrapper = function createContent
|
|
|
648
648
|
var isInserted = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
|
|
649
649
|
var reveal = arguments.length > 3 ? arguments[3] : undefined;
|
|
650
650
|
var wrapper = document.createElement('span');
|
|
651
|
-
var baseStyle = (0,
|
|
651
|
+
var baseStyle = (0, _cssHelper.convertToInlineCss)({
|
|
652
652
|
position: 'relative',
|
|
653
653
|
width: 'fit-content'
|
|
654
654
|
});
|
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.resolveRemovedLozengeStyleLegacy = exports.resolveNestedInsertedNodeStyleLegacy = exports.resolveCellOverlayStyleLegacy = exports.hasRestingDeletedRingLegacy = exports.getInsertedContentStyleLegacy = exports.getDeletedContentStyleUnboundedLegacy = exports.getDeletedContentStyleLegacy = exports.getChangedNodeStyleLegacy = exports.getChangedContentStyleLegacy = void 0;
|
|
7
|
-
var
|
|
7
|
+
var _cssHelper = require("@atlaskit/editor-common/css-helper");
|
|
8
8
|
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
9
9
|
var _standard = require("../colorSchemes/standard");
|
|
10
10
|
var _traditional = require("../colorSchemes/traditional");
|
|
@@ -19,7 +19,7 @@ var _traditional = require("../colorSchemes/traditional");
|
|
|
19
19
|
* `colorSchemes/standard.ts`, `colorSchemes/traditional.ts` (EDITOR-8281).
|
|
20
20
|
*/
|
|
21
21
|
|
|
22
|
-
var lozengeStyle = (0,
|
|
22
|
+
var lozengeStyle = (0, _cssHelper.convertToInlineCss)({
|
|
23
23
|
display: 'inline-flex',
|
|
24
24
|
boxSizing: 'border-box',
|
|
25
25
|
position: 'static',
|
|
@@ -35,7 +35,7 @@ var lozengeStyle = (0, _lazyNodeView.convertToInlineCss)({
|
|
|
35
35
|
whiteSpace: 'nowrap',
|
|
36
36
|
color: "var(--ds-text-warning-inverse, #292A2E)"
|
|
37
37
|
});
|
|
38
|
-
var lozengeStyleActiveStandard = (0,
|
|
38
|
+
var lozengeStyleActiveStandard = (0, _cssHelper.convertToInlineCss)({
|
|
39
39
|
display: 'inline-flex',
|
|
40
40
|
boxSizing: 'border-box',
|
|
41
41
|
position: 'static',
|
|
@@ -51,7 +51,7 @@ var lozengeStyleActiveStandard = (0, _lazyNodeView.convertToInlineCss)({
|
|
|
51
51
|
whiteSpace: 'nowrap',
|
|
52
52
|
color: "var(--ds-text-warning-inverse, #292A2E)"
|
|
53
53
|
});
|
|
54
|
-
var lozengeStyleActiveTraditional = (0,
|
|
54
|
+
var lozengeStyleActiveTraditional = (0, _cssHelper.convertToInlineCss)({
|
|
55
55
|
display: 'inline-flex',
|
|
56
56
|
boxSizing: 'border-box',
|
|
57
57
|
position: 'static',
|
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.scrollToDecoration = void 0;
|
|
7
|
-
var
|
|
7
|
+
var _table = require("@atlaskit/editor-common/styles/table");
|
|
8
8
|
var _getStickyHeaderHeight = require("@atlaskit/editor-common/table/get-sticky-header-height");
|
|
9
9
|
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
10
10
|
var _decorationKeys = require("./decorations/decorationKeys");
|
|
@@ -22,7 +22,7 @@ function updateScrollTargetMargin(view, targetPos, api) {
|
|
|
22
22
|
var _api$limitedMode;
|
|
23
23
|
var isLimitedModeEnabled = Boolean(api === null || api === void 0 || (_api$limitedMode = api.limitedMode) === null || _api$limitedMode === void 0 || (_api$limitedMode = _api$limitedMode.sharedState.currentState()) === null || _api$limitedMode === void 0 ? void 0 : _api$limitedMode.enabled);
|
|
24
24
|
var tableHeaderHeight = isLimitedModeEnabled ? undefined : (0, _getStickyHeaderHeight.getStickyHeaderHeight)(view, targetPos);
|
|
25
|
-
view.dom.style.setProperty(_decorationKeys.SCROLL_TARGET_MARGIN_CSS_PROPERTY, "".concat(tableHeaderHeight ? tableHeaderHeight +
|
|
25
|
+
view.dom.style.setProperty(_decorationKeys.SCROLL_TARGET_MARGIN_CSS_PROPERTY, "".concat(tableHeaderHeight ? tableHeaderHeight + _table.tableMarginTop : 0, "px"));
|
|
26
26
|
}
|
|
27
27
|
|
|
28
28
|
/**
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.buildContributorTagDom = exports.TAG_EXIT_FALLBACK_MS = exports.MAX_TAG_WIDTH = exports.CONTRIBUTOR_TAG_Z_INDEX = exports.CONTRIBUTOR_TAG_TOOLTIP_STYLES = exports.CONTRIBUTOR_TAG_TESTID = exports.CONTRIBUTOR_TAG_REVEALED_ATTRIBUTE = exports.CONTRIBUTOR_TAG_NAME_TESTID = exports.CONTRIBUTOR_TAG_CLASS = void 0;
|
|
8
8
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
9
|
-
var
|
|
9
|
+
var _cssHelper = require("@atlaskit/editor-common/css-helper");
|
|
10
10
|
var _constants = require("@atlaskit/editor-shared-styles/constants");
|
|
11
11
|
var CONTRIBUTOR_TAG_TESTID = exports.CONTRIBUTOR_TAG_TESTID = 'diff-contributor-tag';
|
|
12
12
|
var CONTRIBUTOR_TAG_NAME_TESTID = exports.CONTRIBUTOR_TAG_NAME_TESTID = 'diff-contributor-tag-name';
|
|
@@ -77,7 +77,7 @@ var CONTRIBUTOR_TAG_TOOLTIP_STYLES = exports.CONTRIBUTOR_TAG_TOOLTIP_STYLES = {
|
|
|
77
77
|
// Positioned against the host widget its decoration renders on the change's first character:
|
|
78
78
|
// `bottom: 100%` lifts the tag onto the line above, `inset-inline-start` starts it on that
|
|
79
79
|
// character.
|
|
80
|
-
var constraintStyle = (0,
|
|
80
|
+
var constraintStyle = (0, _cssHelper.convertToInlineCss)({
|
|
81
81
|
// `flex`, not `block`: a block box lays the tag on a line box whose strut is the *paragraph's*
|
|
82
82
|
// line-height (~24px) against the tag's ~20px, so `bottom: 100%` pins that leftover strut to the
|
|
83
83
|
// change and the tag floats above it. A flex container has no line box.
|
|
@@ -107,7 +107,7 @@ var constraintStyle = (0, _lazyNodeView.convertToInlineCss)({
|
|
|
107
107
|
// `backgroundColor` comes from the model, and is set by the controller. `opacity`, `pointer-events`
|
|
108
108
|
// and the transition between their two states are in `contributorTagStyles` — see
|
|
109
109
|
// `CONTRIBUTOR_TAG_CLASS`.
|
|
110
|
-
var tagStyle = (0,
|
|
110
|
+
var tagStyle = (0, _cssHelper.convertToInlineCss)({
|
|
111
111
|
display: 'inline-flex',
|
|
112
112
|
alignItems: 'center',
|
|
113
113
|
gap: "var(--ds-space-025, 2px)",
|
|
@@ -132,12 +132,12 @@ var tagStyle = (0, _lazyNodeView.convertToInlineCss)({
|
|
|
132
132
|
whiteSpace: 'nowrap',
|
|
133
133
|
boxSizing: 'border-box'
|
|
134
134
|
});
|
|
135
|
-
var avatarsStyle = (0,
|
|
135
|
+
var avatarsStyle = (0, _cssHelper.convertToInlineCss)({
|
|
136
136
|
display: 'inline-flex',
|
|
137
137
|
alignItems: 'center',
|
|
138
138
|
flexShrink: 0
|
|
139
139
|
});
|
|
140
|
-
var nameStyle = (0,
|
|
140
|
+
var nameStyle = (0, _cssHelper.convertToInlineCss)({
|
|
141
141
|
display: 'block',
|
|
142
142
|
minWidth: 0,
|
|
143
143
|
overflow: 'hidden',
|
|
@@ -146,7 +146,7 @@ var nameStyle = (0, _lazyNodeView.convertToInlineCss)({
|
|
|
146
146
|
});
|
|
147
147
|
|
|
148
148
|
/** `@atlaskit/visually-hidden`, inlined. */
|
|
149
|
-
var srLabelStyle = (0,
|
|
149
|
+
var srLabelStyle = (0, _cssHelper.convertToInlineCss)({
|
|
150
150
|
width: '1px',
|
|
151
151
|
height: '1px',
|
|
152
152
|
padding: 0,
|
|
@@ -7,7 +7,7 @@ exports.contributorAvatarRenderer = void 0;
|
|
|
7
7
|
var _bindEventListener = require("bind-event-listener");
|
|
8
8
|
var _avatarSizes = require("@atlaskit/avatar/avatar-sizes");
|
|
9
9
|
var _default = require("@atlaskit/avatar/constants/default");
|
|
10
|
-
var
|
|
10
|
+
var _cssHelper = require("@atlaskit/editor-common/css-helper");
|
|
11
11
|
var _contributorTagIcons = require("./contributorTagIcons");
|
|
12
12
|
/**
|
|
13
13
|
* Agent kinds with a custom contributor-tag icon, used as a fallback glyph when no `avatarUrl` is
|
|
@@ -37,7 +37,7 @@ var AVATAR_BOX_SIZE = AVATAR_SIZE + AVATAR_RING_WIDTH * 2;
|
|
|
37
37
|
|
|
38
38
|
/** Reused from `@atlaskit/avatar`'s `avatar-content`, so the two shapes cannot drift. */
|
|
39
39
|
var HEXAGON_CLIP_PATH = 'polygon(45% 1.33975%, 46.5798% 0.60307%, 48.26352% 0.15192%, 50% 0%, 51.73648% 0.15192%, 53.4202% 0.60307%, 55% 1.33975%, 89.64102% 21.33975%, 91.06889% 22.33956%, 92.30146% 23.57212%, 93.30127% 25%, 94.03794% 26.5798%, 94.48909% 28.26352%, 94.64102% 30%, 94.64102% 70%, 94.48909% 71.73648%, 94.03794% 73.4202%, 93.30127% 75%, 92.30146% 76.42788%, 91.06889% 77.66044%, 89.64102% 78.66025%, 55% 98.66025%, 53.4202% 99.39693%, 51.73648% 99.84808%, 50% 100%, 48.26352% 99.84808%, 46.5798% 99.39693%, 45% 98.66025%, 10.35898% 78.66025%, 8.93111% 77.66044%, 7.69854% 76.42788%, 6.69873% 75%, 5.96206% 73.4202%, 5.51091% 71.73648%, 5.35898% 70%, 5.35898% 30%, 5.51091% 28.26352%, 5.96206% 26.5798%, 6.69873% 25%, 7.69854% 23.57212%, 8.93111% 22.33956%, 10.35898% 21.33975%)';
|
|
40
|
-
var boxStyle = (0,
|
|
40
|
+
var boxStyle = (0, _cssHelper.convertToInlineCss)({
|
|
41
41
|
display: 'inline-flex',
|
|
42
42
|
alignItems: 'center',
|
|
43
43
|
justifyContent: 'center',
|
|
@@ -48,7 +48,7 @@ var boxStyle = (0, _lazyNodeView.convertToInlineCss)({
|
|
|
48
48
|
});
|
|
49
49
|
|
|
50
50
|
/** Agents get a drop shadow instead of a ring, so their box skips the ring's padding. */
|
|
51
|
-
var agentBoxStyle = (0,
|
|
51
|
+
var agentBoxStyle = (0, _cssHelper.convertToInlineCss)({
|
|
52
52
|
display: 'inline-flex',
|
|
53
53
|
alignItems: 'center',
|
|
54
54
|
justifyContent: 'center',
|
|
@@ -57,7 +57,7 @@ var agentBoxStyle = (0, _lazyNodeView.convertToInlineCss)({
|
|
|
57
57
|
width: "".concat(AVATAR_SIZE, "px"),
|
|
58
58
|
height: "".concat(AVATAR_SIZE, "px")
|
|
59
59
|
});
|
|
60
|
-
var shapeStyle = (0,
|
|
60
|
+
var shapeStyle = (0, _cssHelper.convertToInlineCss)({
|
|
61
61
|
display: 'flex',
|
|
62
62
|
alignItems: 'center',
|
|
63
63
|
justifyContent: 'center',
|
|
@@ -75,11 +75,11 @@ var shapeStyle = (0, _lazyNodeView.convertToInlineCss)({
|
|
|
75
75
|
* opacity). Light keeps the token as is.
|
|
76
76
|
*/
|
|
77
77
|
var agentShadowColor = "light-dark(".concat("var(--ds-shadow-overflow-perimeter, #1E1F211f)", ", color-mix(in srgb, ", "var(--ds-shadow-overflow-perimeter, #1E1F211f)", " 12%, transparent))");
|
|
78
|
-
var agentShadowStyle = (0,
|
|
78
|
+
var agentShadowStyle = (0, _cssHelper.convertToInlineCss)({
|
|
79
79
|
// No clip-path on `element`, so the blur isn't cut off.
|
|
80
80
|
filter: "drop-shadow(0 5px 5px ".concat(agentShadowColor, ") drop-shadow(0 1px 2px ").concat(agentShadowColor, ") drop-shadow(0 0 2px ").concat(agentShadowColor, ")")
|
|
81
81
|
});
|
|
82
|
-
var imageStyle = (0,
|
|
82
|
+
var imageStyle = (0, _cssHelper.convertToInlineCss)({
|
|
83
83
|
display: 'block',
|
|
84
84
|
width: '100%',
|
|
85
85
|
height: '100%',
|
|
@@ -87,7 +87,7 @@ var imageStyle = (0, _lazyNodeView.convertToInlineCss)({
|
|
|
87
87
|
});
|
|
88
88
|
|
|
89
89
|
/** The `@atlaskit/avatar` image fallback: a subtle glyph on a tinted box. */
|
|
90
|
-
var personFallbackStyle = (0,
|
|
90
|
+
var personFallbackStyle = (0, _cssHelper.convertToInlineCss)({
|
|
91
91
|
width: '100%',
|
|
92
92
|
height: '100%',
|
|
93
93
|
display: 'flex',
|
|
@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
8
8
|
exports.IndicatorBarContentComponent = void 0;
|
|
9
9
|
var _runtime = require("@compiled/react/runtime");
|
|
10
10
|
var _react = _interopRequireDefault(require("react"));
|
|
11
|
-
var
|
|
11
|
+
var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
|
|
12
12
|
var _decorationKeys = require("../../pm-plugins/decorations/decorationKeys");
|
|
13
13
|
var _IndicatorBar = require("./IndicatorBar");
|
|
14
14
|
var renderIndicatorBar = function renderIndicatorBar(descriptor) {
|
|
@@ -91,7 +91,7 @@ var renderIndicatorBar = function renderIndicatorBar(descriptor) {
|
|
|
91
91
|
|
|
92
92
|
var IndicatorBarContentComponent = exports.IndicatorBarContentComponent = function IndicatorBarContentComponent(_ref) {
|
|
93
93
|
var api = _ref.api;
|
|
94
|
-
var _useSharedPluginState = (0,
|
|
94
|
+
var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['showDiff'], function (state) {
|
|
95
95
|
var _state$showDiffState, _state$showDiffState2, _state$showDiffState3;
|
|
96
96
|
return {
|
|
97
97
|
showIndicators: (_state$showDiffState = state.showDiffState) === null || _state$showDiffState === void 0 ? void 0 : _state$showDiffState.showIndicators,
|
|
@@ -38,14 +38,6 @@ export function isEditorViewWithNodeViews(view) {
|
|
|
38
38
|
/** Expand-family nodes whose expanded state lives in a node-keyed WeakMap. */
|
|
39
39
|
const EXPAND_TYPES = new Set(['expand', 'nestedExpand']);
|
|
40
40
|
|
|
41
|
-
/** Merges an inline style string onto an element's existing `style` attribute. */
|
|
42
|
-
const appendInlineStyle = (element, style) => {
|
|
43
|
-
var _element$getAttribute;
|
|
44
|
-
const currentStyle = (_element$getAttribute = element.getAttribute('style')) !== null && _element$getAttribute !== void 0 ? _element$getAttribute : '';
|
|
45
|
-
const separator = currentStyle && style && !currentStyle.trimEnd().endsWith(';') ? '; ' : '';
|
|
46
|
-
element.setAttribute('style', `${currentStyle}${separator}${style}`);
|
|
47
|
-
};
|
|
48
|
-
|
|
49
41
|
/** Tables are the only node views that read and write positions, so only they need a preview. */
|
|
50
42
|
const containsTable = node => {
|
|
51
43
|
const {
|
|
@@ -99,21 +91,21 @@ export class NodeViewSerializer {
|
|
|
99
91
|
// views resolve to their real depth instead of every one of them seeing depth 0.
|
|
100
92
|
let childPos = basePos + 1;
|
|
101
93
|
children.forEach(child => {
|
|
102
|
-
|
|
94
|
+
let childNode = this.tryCreateNodeViewInner(child, childPos, editorProxy, isInserted, colorScheme) || this.serializeNode(child);
|
|
103
95
|
if (childNode) {
|
|
104
96
|
// Give inserted atomic children the same box-shadow
|
|
105
97
|
// highlight an in-place attribute change already gets (`getAtomicInlineChangedAttrs`).
|
|
106
98
|
if (isInserted && isExperimentEnabled('platform_editor_show_diff_deleted_nodeview_content') && isInlineAttrChangeNodeName(child.type.name) && childNode instanceof HTMLElement) {
|
|
107
|
-
var _childNode$getAttribu;
|
|
108
99
|
const {
|
|
109
100
|
className,
|
|
110
101
|
styleSuffix
|
|
111
102
|
} = getAtomicInlineChangedAttrs(child.type.name, colorScheme);
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
103
|
+
// create wrapper to add the diff styles to to avoid conflicting with any nodeView styles
|
|
104
|
+
const wrapper = document.createElement('span');
|
|
105
|
+
wrapper.className = className;
|
|
106
|
+
wrapper.setAttribute('style', styleSuffix);
|
|
107
|
+
wrapper.append(childNode);
|
|
108
|
+
childNode = wrapper;
|
|
117
109
|
}
|
|
118
110
|
contentDOM === null || contentDOM === void 0 ? void 0 : contentDOM.append(childNode);
|
|
119
111
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { agentBrandColorSchemes } from '@atlaskit/agent-color/agent-brand-color-schemes';
|
|
2
|
-
import { convertToInlineCss } from '@atlaskit/editor-common/
|
|
2
|
+
import { convertToInlineCss } from '@atlaskit/editor-common/css-helper';
|
|
3
3
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
4
4
|
import { getStandardDeletedTextDecorationStyle } from './getStandardDeletedTextDecorationStyle';
|
|
5
5
|
/**
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { convertToInlineCss } from '@atlaskit/editor-common/
|
|
1
|
+
import { convertToInlineCss } from '@atlaskit/editor-common/css-helper';
|
|
2
2
|
import { getStandardDeletedTextDecorationStyle } from './getStandardDeletedTextDecorationStyle';
|
|
3
3
|
export const editingStyleExtended = convertToInlineCss({
|
|
4
4
|
background: "var(--ds-background-accent-purple-subtlest, #F8EEFE)",
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { convertToInlineCss } from '@atlaskit/editor-common/
|
|
1
|
+
import { convertToInlineCss } from '@atlaskit/editor-common/css-helper';
|
|
2
2
|
export const traditionalInsertStyle = convertToInlineCss({
|
|
3
3
|
background: "var(--ds-background-accent-green-subtlest, #DCFFF1)",
|
|
4
4
|
textDecoration: 'underline',
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { convertToInlineCss } from '@atlaskit/editor-common/
|
|
1
|
+
import { convertToInlineCss } from '@atlaskit/editor-common/css-helper';
|
|
2
2
|
import { Decoration } from '@atlaskit/editor-prosemirror/view';
|
|
3
3
|
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
4
4
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
@@ -223,9 +223,14 @@ export const createBlockChangedDecoration = ({
|
|
|
223
223
|
isInserted,
|
|
224
224
|
isActive
|
|
225
225
|
});
|
|
226
|
-
const
|
|
226
|
+
const styleOld = tagAnchorName ? [nodeStyle, convertToInlineCss({
|
|
227
227
|
anchorName: `--${tagAnchorName}`
|
|
228
228
|
}), fg('platform_editor_ai_show_diff_patch_1') ? scrollMarginTopStyle : undefined].filter(Boolean).join(' ') : nodeStyle;
|
|
229
|
+
const style = fg('platform_editor_ai_show_diff_patch_2') ? [nodeStyle, tagAnchorName ? convertToInlineCss({
|
|
230
|
+
anchorName: `--${tagAnchorName}`
|
|
231
|
+
}) : undefined,
|
|
232
|
+
// only add margin top if the node actually should be styled to avoid incorrect diff decoration specs being built
|
|
233
|
+
nodeStyle ? scrollMarginTopStyle : undefined].filter(Boolean).join(' ') : styleOld;
|
|
229
234
|
const className = getNodeClass(change.name);
|
|
230
235
|
if (style || className) {
|
|
231
236
|
decorations.push(Decoration.node(change.from, change.to, {
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
* equivalent longhand; with that gate off, their CSS remains unchanged. Delete this file at
|
|
9
9
|
* cleanup, together with `colorSchemes/standard.ts`, `colorSchemes/traditional.ts` (EDITOR-8281).
|
|
10
10
|
*/
|
|
11
|
-
import { convertToInlineCss } from '@atlaskit/editor-common/
|
|
11
|
+
import { convertToInlineCss } from '@atlaskit/editor-common/css-helper';
|
|
12
12
|
import { standardDecorationMarkerVariable, deletedDecorationMarkerVariable, editingStyleQuoteNode, editingStyleRuleNode, editingStyleCardBlockNode, editingStyleNode, getStandardDeletedContentStyleNew, deletedStyleQuoteNode, addedCellOverlayStyle, addedCellOverlayRoundedStyle, deletedCellOverlayStyle, deletedCellOverlayRoundedStyle } from './colorSchemes/standard';
|
|
13
13
|
import { traditionalDecorationMarkerVariableActive, traditionalDecorationMarkerVariableNew, traditionalDeletedDecorationMarkerVariableActive, traditionalDeletedDecorationMarkerVariableNew, traditionalStyleQuoteNodeActive, traditionalStyleQuoteNodeNew, traditionalStyleRuleNodeActive, traditionalStyleRuleNodeNew, traditionalStyleCardBlockNodeActive, traditionalStyleCardBlockNodeNew, traditionalStyleNodeActive, traditionalStyleNodeNew, getDeletedTraditionalInlineStyle, deletedTraditionalStyleQuoteNode, traditionalAddedCellOverlayStyle, traditionalAddedCellOverlayRoundedStyle, deletedTraditionalCellOverlayStyle, deletedTraditionalCellOverlayRoundedStyle } from './colorSchemes/traditional';
|
|
14
14
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { convertToInlineCss } from '@atlaskit/editor-common/
|
|
1
|
+
import { convertToInlineCss } from '@atlaskit/editor-common/css-helper';
|
|
2
2
|
import { Decoration } from '@atlaskit/editor-prosemirror/view';
|
|
3
3
|
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
4
4
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { agentBrandColorSchemes } from '@atlaskit/agent-color/agent-brand-color-schemes';
|
|
2
|
-
import { convertToInlineCss } from '@atlaskit/editor-common/
|
|
2
|
+
import { convertToInlineCss } from '@atlaskit/editor-common/css-helper';
|
|
3
3
|
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
4
4
|
import { buildDeletedInlineStyleStandard, getDeletedInlineRevealColors, getInsertedInlineRevealColors } from './colorSchemes/factory';
|
|
5
5
|
import { colorSchemeRegistry } from './colorSchemes/schemes';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { convertToInlineCss } from '@atlaskit/editor-common/
|
|
2
|
-
import { trackChangesMessages } from '@atlaskit/editor-common/messages';
|
|
1
|
+
import { convertToInlineCss } from '@atlaskit/editor-common/css-helper';
|
|
2
|
+
import { trackChangesMessages } from '@atlaskit/editor-common/messages/track-changes';
|
|
3
3
|
import { getBaseNodeTypeName } from '@atlaskit/editor-common/utils/node-type-utils';
|
|
4
4
|
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
5
5
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
* remains unchanged. Delete this file at experiment cleanup, together with
|
|
9
9
|
* `colorSchemes/standard.ts`, `colorSchemes/traditional.ts` (EDITOR-8281).
|
|
10
10
|
*/
|
|
11
|
-
import { convertToInlineCss } from '@atlaskit/editor-common/
|
|
11
|
+
import { convertToInlineCss } from '@atlaskit/editor-common/css-helper';
|
|
12
12
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
13
13
|
import { deletedBlockOutline, deletedBlockOutlineActive, deletedBlockOutlineRounded, deletedBlockOutlineRoundedActive, deletedContentStyleUnbounded, deletedInlineContentStyleExtended, deletedStyleQuoteNodeWithLozenge, deletedStyleQuoteNodeWithLozengeActive, editingContentStyleInBlockExtended, editingContentStyleInBlockExtendedNoUnderline, editingStyleExtended, editingStyleExtendedNoUnderline, editingStyleActiveExtended, editingStyleActiveExtendedNoUnderline, editingStyleNode, getStandardDeletedContentStyleActive, getStandardDeletedContentStyleNew, addedCellOverlayStyle, addedCellOverlayRoundedStyle, deletedCellOverlayStyle, deletedCellOverlayRoundedStyle } from '../colorSchemes/standard';
|
|
14
14
|
import { deletedTraditionalBlockOutlineActive, deletedTraditionalBlockOutlineNew, deletedTraditionalBlockOutlineRoundedActive, deletedTraditionalBlockOutlineRoundedNew, deletedTraditionalContentStyleUnbounded, deletedTraditionalContentStyleUnboundedActive, getDeletedTraditionalInlineStyle, deletedTraditionalStyleQuoteNode, deletedTraditionalStyleQuoteNodeActive, traditionalInsertStyle, traditionalInsertStyleActive, traditionalStyleNodeActive, traditionalStyleNodeNew, traditionalAddedCellOverlayRoundedStyle, traditionalAddedCellOverlayStyleNew, deletedTraditionalCellOverlayStyle, deletedTraditionalCellOverlayRoundedStyle } from '../colorSchemes/traditional';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { tableMarginTop } from '@atlaskit/editor-common/styles';
|
|
1
|
+
import { tableMarginTop } from '@atlaskit/editor-common/styles/table';
|
|
2
2
|
import { getStickyHeaderHeight } from '@atlaskit/editor-common/table/get-sticky-header-height';
|
|
3
3
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
4
4
|
import { isDiffDecoration, SCROLL_TARGET_MARGIN_CSS_PROPERTY } from './decorations/decorationKeys';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { convertToInlineCss } from '@atlaskit/editor-common/
|
|
1
|
+
import { convertToInlineCss } from '@atlaskit/editor-common/css-helper';
|
|
2
2
|
import { akEditorSmallZIndex } from '@atlaskit/editor-shared-styles/constants';
|
|
3
3
|
export const CONTRIBUTOR_TAG_TESTID = 'diff-contributor-tag';
|
|
4
4
|
export const CONTRIBUTOR_TAG_NAME_TESTID = 'diff-contributor-tag-name';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { bind } from 'bind-event-listener';
|
|
2
2
|
import { AVATAR_SIZES } from '@atlaskit/avatar/avatar-sizes';
|
|
3
3
|
import { BORDER_WIDTH } from '@atlaskit/avatar/constants/default';
|
|
4
|
-
import { convertToInlineCss } from '@atlaskit/editor-common/
|
|
4
|
+
import { convertToInlineCss } from '@atlaskit/editor-common/css-helper';
|
|
5
5
|
import { getContributorTagIcon } from './contributorTagIcons';
|
|
6
6
|
|
|
7
7
|
/**
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* IndicatorBarContentComponent.tsx generated by @compiled/babel-plugin v3.0.2 */
|
|
2
2
|
import { ax, ix } from "@compiled/react/runtime";
|
|
3
3
|
import React from 'react';
|
|
4
|
-
import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/
|
|
4
|
+
import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
|
|
5
5
|
import { buildAnchorDecorationKey, AnchorTypeKey } from '../../pm-plugins/decorations/decorationKeys';
|
|
6
6
|
import { IndicatorBar } from './IndicatorBar';
|
|
7
7
|
const renderIndicatorBar = descriptor => {
|
|
@@ -40,14 +40,6 @@ export function isEditorViewWithNodeViews(view) {
|
|
|
40
40
|
/** Expand-family nodes whose expanded state lives in a node-keyed WeakMap. */
|
|
41
41
|
var EXPAND_TYPES = new Set(['expand', 'nestedExpand']);
|
|
42
42
|
|
|
43
|
-
/** Merges an inline style string onto an element's existing `style` attribute. */
|
|
44
|
-
var appendInlineStyle = function appendInlineStyle(element, style) {
|
|
45
|
-
var _element$getAttribute;
|
|
46
|
-
var currentStyle = (_element$getAttribute = element.getAttribute('style')) !== null && _element$getAttribute !== void 0 ? _element$getAttribute : '';
|
|
47
|
-
var separator = currentStyle && style && !currentStyle.trimEnd().endsWith(';') ? '; ' : '';
|
|
48
|
-
element.setAttribute('style', "".concat(currentStyle).concat(separator).concat(style));
|
|
49
|
-
};
|
|
50
|
-
|
|
51
43
|
/** Tables are the only node views that read and write positions, so only they need a preview. */
|
|
52
44
|
var containsTable = function containsTable(node) {
|
|
53
45
|
var table = node.type.schema.nodes.table;
|
|
@@ -114,15 +106,15 @@ export var NodeViewSerializer = /*#__PURE__*/function () {
|
|
|
114
106
|
// Give inserted atomic children the same box-shadow
|
|
115
107
|
// highlight an in-place attribute change already gets (`getAtomicInlineChangedAttrs`).
|
|
116
108
|
if (isInserted && isExperimentEnabled('platform_editor_show_diff_deleted_nodeview_content') && isInlineAttrChangeNodeName(child.type.name) && childNode instanceof HTMLElement) {
|
|
117
|
-
var _childNode$getAttribu;
|
|
118
109
|
var _getAtomicInlineChang = getAtomicInlineChangedAttrs(child.type.name, colorScheme),
|
|
119
110
|
className = _getAtomicInlineChang.className,
|
|
120
111
|
styleSuffix = _getAtomicInlineChang.styleSuffix;
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
112
|
+
// create wrapper to add the diff styles to to avoid conflicting with any nodeView styles
|
|
113
|
+
var wrapper = document.createElement('span');
|
|
114
|
+
wrapper.className = className;
|
|
115
|
+
wrapper.setAttribute('style', styleSuffix);
|
|
116
|
+
wrapper.append(childNode);
|
|
117
|
+
childNode = wrapper;
|
|
126
118
|
}
|
|
127
119
|
contentDOM === null || contentDOM === void 0 || contentDOM.append(childNode);
|
|
128
120
|
}
|
|
@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
|
2
2
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
3
3
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
4
4
|
import { agentBrandColorSchemes } from '@atlaskit/agent-color/agent-brand-color-schemes';
|
|
5
|
-
import { convertToInlineCss } from '@atlaskit/editor-common/
|
|
5
|
+
import { convertToInlineCss } from '@atlaskit/editor-common/css-helper';
|
|
6
6
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
7
7
|
import { getStandardDeletedTextDecorationStyle } from './getStandardDeletedTextDecorationStyle';
|
|
8
8
|
/**
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
2
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
3
3
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
4
|
-
import { convertToInlineCss } from '@atlaskit/editor-common/
|
|
4
|
+
import { convertToInlineCss } from '@atlaskit/editor-common/css-helper';
|
|
5
5
|
import { getStandardDeletedTextDecorationStyle } from './getStandardDeletedTextDecorationStyle';
|
|
6
6
|
export var editingStyleExtended = convertToInlineCss({
|
|
7
7
|
background: "var(--ds-background-accent-purple-subtlest, #F8EEFE)",
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
2
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
3
3
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
4
|
-
import { convertToInlineCss } from '@atlaskit/editor-common/
|
|
4
|
+
import { convertToInlineCss } from '@atlaskit/editor-common/css-helper';
|
|
5
5
|
export var traditionalInsertStyle = convertToInlineCss({
|
|
6
6
|
background: "var(--ds-background-accent-green-subtlest, #DCFFF1)",
|
|
7
7
|
textDecoration: 'underline',
|
|
@@ -2,7 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
|
|
|
2
2
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
3
3
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
4
4
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
5
|
-
import { convertToInlineCss } from '@atlaskit/editor-common/
|
|
5
|
+
import { convertToInlineCss } from '@atlaskit/editor-common/css-helper';
|
|
6
6
|
import { Decoration } from '@atlaskit/editor-prosemirror/view';
|
|
7
7
|
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
8
8
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
@@ -230,9 +230,14 @@ export var createBlockChangedDecoration = function createBlockChangedDecoration(
|
|
|
230
230
|
isInserted: isInserted,
|
|
231
231
|
isActive: isActive
|
|
232
232
|
});
|
|
233
|
-
var
|
|
233
|
+
var styleOld = tagAnchorName ? [nodeStyle, convertToInlineCss({
|
|
234
234
|
anchorName: "--".concat(tagAnchorName)
|
|
235
235
|
}), fg('platform_editor_ai_show_diff_patch_1') ? scrollMarginTopStyle : undefined].filter(Boolean).join(' ') : nodeStyle;
|
|
236
|
+
var style = fg('platform_editor_ai_show_diff_patch_2') ? [nodeStyle, tagAnchorName ? convertToInlineCss({
|
|
237
|
+
anchorName: "--".concat(tagAnchorName)
|
|
238
|
+
}) : undefined,
|
|
239
|
+
// only add margin top if the node actually should be styled to avoid incorrect diff decoration specs being built
|
|
240
|
+
nodeStyle ? scrollMarginTopStyle : undefined].filter(Boolean).join(' ') : styleOld;
|
|
236
241
|
var className = getNodeClass(change.name);
|
|
237
242
|
if (style || className) {
|
|
238
243
|
decorations.push(Decoration.node(change.from, change.to, _objectSpread({
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
* equivalent longhand; with that gate off, their CSS remains unchanged. Delete this file at
|
|
9
9
|
* cleanup, together with `colorSchemes/standard.ts`, `colorSchemes/traditional.ts` (EDITOR-8281).
|
|
10
10
|
*/
|
|
11
|
-
import { convertToInlineCss } from '@atlaskit/editor-common/
|
|
11
|
+
import { convertToInlineCss } from '@atlaskit/editor-common/css-helper';
|
|
12
12
|
import { standardDecorationMarkerVariable, deletedDecorationMarkerVariable, editingStyleQuoteNode, editingStyleRuleNode, editingStyleCardBlockNode, editingStyleNode, getStandardDeletedContentStyleNew, deletedStyleQuoteNode, addedCellOverlayStyle, addedCellOverlayRoundedStyle, deletedCellOverlayStyle, deletedCellOverlayRoundedStyle } from './colorSchemes/standard';
|
|
13
13
|
import { traditionalDecorationMarkerVariableActive, traditionalDecorationMarkerVariableNew, traditionalDeletedDecorationMarkerVariableActive, traditionalDeletedDecorationMarkerVariableNew, traditionalStyleQuoteNodeActive, traditionalStyleQuoteNodeNew, traditionalStyleRuleNodeActive, traditionalStyleRuleNodeNew, traditionalStyleCardBlockNodeActive, traditionalStyleCardBlockNodeNew, traditionalStyleNodeActive, traditionalStyleNodeNew, getDeletedTraditionalInlineStyle, deletedTraditionalStyleQuoteNode, traditionalAddedCellOverlayStyle, traditionalAddedCellOverlayRoundedStyle, deletedTraditionalCellOverlayStyle, deletedTraditionalCellOverlayRoundedStyle } from './colorSchemes/traditional';
|
|
14
14
|
|
|
@@ -2,7 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
|
|
|
2
2
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
3
3
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
4
4
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
5
|
-
import { convertToInlineCss } from '@atlaskit/editor-common/
|
|
5
|
+
import { convertToInlineCss } from '@atlaskit/editor-common/css-helper';
|
|
6
6
|
import { Decoration } from '@atlaskit/editor-prosemirror/view';
|
|
7
7
|
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
8
8
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
2
|
import { agentBrandColorSchemes } from '@atlaskit/agent-color/agent-brand-color-schemes';
|
|
3
|
-
import { convertToInlineCss } from '@atlaskit/editor-common/
|
|
3
|
+
import { convertToInlineCss } from '@atlaskit/editor-common/css-helper';
|
|
4
4
|
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
5
5
|
import { buildDeletedInlineStyleStandard, getDeletedInlineRevealColors, getInsertedInlineRevealColors } from './colorSchemes/factory';
|
|
6
6
|
import { colorSchemeRegistry } from './colorSchemes/schemes';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
|
|
2
|
-
import { convertToInlineCss } from '@atlaskit/editor-common/
|
|
3
|
-
import { trackChangesMessages } from '@atlaskit/editor-common/messages';
|
|
2
|
+
import { convertToInlineCss } from '@atlaskit/editor-common/css-helper';
|
|
3
|
+
import { trackChangesMessages } from '@atlaskit/editor-common/messages/track-changes';
|
|
4
4
|
import { getBaseNodeTypeName } from '@atlaskit/editor-common/utils/node-type-utils';
|
|
5
5
|
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
6
6
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
* remains unchanged. Delete this file at experiment cleanup, together with
|
|
9
9
|
* `colorSchemes/standard.ts`, `colorSchemes/traditional.ts` (EDITOR-8281).
|
|
10
10
|
*/
|
|
11
|
-
import { convertToInlineCss } from '@atlaskit/editor-common/
|
|
11
|
+
import { convertToInlineCss } from '@atlaskit/editor-common/css-helper';
|
|
12
12
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
13
13
|
import { deletedBlockOutline, deletedBlockOutlineActive, deletedBlockOutlineRounded, deletedBlockOutlineRoundedActive, deletedContentStyleUnbounded, deletedInlineContentStyleExtended, deletedStyleQuoteNodeWithLozenge, deletedStyleQuoteNodeWithLozengeActive, editingContentStyleInBlockExtended, editingContentStyleInBlockExtendedNoUnderline, editingStyleExtended, editingStyleExtendedNoUnderline, editingStyleActiveExtended, editingStyleActiveExtendedNoUnderline, editingStyleNode, getStandardDeletedContentStyleActive, getStandardDeletedContentStyleNew, addedCellOverlayStyle, addedCellOverlayRoundedStyle, deletedCellOverlayStyle, deletedCellOverlayRoundedStyle } from '../colorSchemes/standard';
|
|
14
14
|
import { deletedTraditionalBlockOutlineActive, deletedTraditionalBlockOutlineNew, deletedTraditionalBlockOutlineRoundedActive, deletedTraditionalBlockOutlineRoundedNew, deletedTraditionalContentStyleUnbounded, deletedTraditionalContentStyleUnboundedActive, getDeletedTraditionalInlineStyle, deletedTraditionalStyleQuoteNode, deletedTraditionalStyleQuoteNodeActive, traditionalInsertStyle, traditionalInsertStyleActive, traditionalStyleNodeActive, traditionalStyleNodeNew, traditionalAddedCellOverlayRoundedStyle, traditionalAddedCellOverlayStyleNew, deletedTraditionalCellOverlayStyle, deletedTraditionalCellOverlayRoundedStyle } from '../colorSchemes/traditional';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { tableMarginTop } from '@atlaskit/editor-common/styles';
|
|
1
|
+
import { tableMarginTop } from '@atlaskit/editor-common/styles/table';
|
|
2
2
|
import { getStickyHeaderHeight } from '@atlaskit/editor-common/table/get-sticky-header-height';
|
|
3
3
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
4
4
|
import { isDiffDecoration, SCROLL_TARGET_MARGIN_CSS_PROPERTY } from './decorations/decorationKeys';
|