@atlaskit/renderer 109.12.5 → 109.13.1
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 +16 -0
- package/dist/cjs/actions/index.js +8 -4
- package/dist/cjs/actions/matches-utils.js +16 -5
- package/dist/cjs/ui/Renderer/index.js +1 -1
- package/dist/cjs/ui/Renderer/style.js +1 -2
- package/dist/es2019/actions/index.js +8 -4
- package/dist/es2019/actions/matches-utils.js +18 -5
- package/dist/es2019/ui/Renderer/index.js +1 -1
- package/dist/es2019/ui/Renderer/style.js +31 -32
- package/dist/esm/actions/index.js +8 -4
- package/dist/esm/actions/matches-utils.js +16 -5
- package/dist/esm/ui/Renderer/index.js +1 -1
- package/dist/esm/ui/Renderer/style.js +1 -2
- package/dist/types/actions/matches-utils.d.ts +2 -1
- package/dist/types-ts4.5/actions/matches-utils.d.ts +2 -1
- package/package.json +4 -7
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,21 @@
|
|
|
1
1
|
# @atlaskit/renderer
|
|
2
2
|
|
|
3
|
+
## 109.13.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#86408](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/86408) [`6bff86c31d81`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6bff86c31d81) - Clean up feature flag for increasing visibility of table scroll shadows
|
|
8
|
+
|
|
9
|
+
## 109.13.0
|
|
10
|
+
|
|
11
|
+
### Minor Changes
|
|
12
|
+
|
|
13
|
+
- [#86103](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/86103) [`af2544086b27`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/af2544086b27) - Changed comment create mutation to send pos if comment is added to a block node
|
|
14
|
+
|
|
15
|
+
### Patch Changes
|
|
16
|
+
|
|
17
|
+
- Updated dependencies
|
|
18
|
+
|
|
3
19
|
## 109.12.5
|
|
4
20
|
|
|
5
21
|
### Patch Changes
|
|
@@ -231,13 +231,15 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
|
|
|
231
231
|
var originalSelection = doc.textBetween(from, to);
|
|
232
232
|
var _getIndexMatch = (0, _matchesUtils.getIndexMatch)(this.doc, this.schema, originalSelection, from),
|
|
233
233
|
numMatches = _getIndexMatch.numMatches,
|
|
234
|
-
matchIndex = _getIndexMatch.matchIndex
|
|
234
|
+
matchIndex = _getIndexMatch.matchIndex,
|
|
235
|
+
blockNodePos = _getIndexMatch.blockNodePos;
|
|
235
236
|
return {
|
|
236
237
|
step: step,
|
|
237
238
|
doc: this.transformer.encode(doc),
|
|
238
239
|
originalSelection: originalSelection,
|
|
239
240
|
numMatches: numMatches,
|
|
240
|
-
matchIndex: matchIndex
|
|
241
|
+
matchIndex: matchIndex,
|
|
242
|
+
pos: blockNodePos
|
|
241
243
|
};
|
|
242
244
|
}
|
|
243
245
|
}, {
|
|
@@ -251,11 +253,13 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
|
|
|
251
253
|
var originalSelection = this.doc.textBetween(from, to);
|
|
252
254
|
var _getIndexMatch2 = (0, _matchesUtils.getIndexMatch)(this.doc, this.schema, originalSelection, from),
|
|
253
255
|
numMatches = _getIndexMatch2.numMatches,
|
|
254
|
-
matchIndex = _getIndexMatch2.matchIndex
|
|
256
|
+
matchIndex = _getIndexMatch2.matchIndex,
|
|
257
|
+
blockNodePos = _getIndexMatch2.blockNodePos;
|
|
255
258
|
return {
|
|
256
259
|
originalSelection: originalSelection,
|
|
257
260
|
numMatches: numMatches,
|
|
258
|
-
matchIndex: matchIndex
|
|
261
|
+
matchIndex: matchIndex,
|
|
262
|
+
pos: blockNodePos
|
|
259
263
|
};
|
|
260
264
|
}
|
|
261
265
|
}]);
|
|
@@ -11,18 +11,28 @@ exports.getIndexMatch = getIndexMatch;
|
|
|
11
11
|
function getIndexMatch(doc, schema, selectedText, startIndex) {
|
|
12
12
|
var textContent = '';
|
|
13
13
|
var matchIndex = 0;
|
|
14
|
+
var numMatches = 0;
|
|
15
|
+
var blockNodePos;
|
|
14
16
|
doc.descendants(function (node, pos) {
|
|
17
|
+
var nodeType = node.type;
|
|
18
|
+
var media = schema.nodes.media;
|
|
19
|
+
|
|
15
20
|
// Mirrors Confluence backend and doesn't construct textContent if it doesn't allow annotations
|
|
16
|
-
|
|
21
|
+
// Don't skip media node so that block node can be defined its startIndex in within [nodeStart, nodeEnd]
|
|
22
|
+
if ((node.isText || !nodeType.allowsMarkType(schema.marks.annotation)) && nodeType !== media) {
|
|
17
23
|
// Note: `return true` as a parent disallowing annotations does not mean a child disallows annotations.
|
|
18
24
|
// Eg: panel (invalid) > p (valid)
|
|
19
25
|
return true;
|
|
20
26
|
}
|
|
21
27
|
var nodeStart = pos;
|
|
22
28
|
var nodeEnd = nodeStart + node.nodeSize;
|
|
23
|
-
|
|
24
|
-
// If the start of the annotation selection is within the current node, we scan the document for previous occurrences
|
|
25
29
|
if (startIndex >= nodeStart && startIndex <= nodeEnd) {
|
|
30
|
+
// if it's a node block, set position to pos to indicate to the backend
|
|
31
|
+
// that it's an annotation on a block node
|
|
32
|
+
if (nodeType === media) {
|
|
33
|
+
blockNodePos = pos;
|
|
34
|
+
}
|
|
35
|
+
// If the start of the annotation selection is within the current node, we scan the document for previous occurrences
|
|
26
36
|
// Find the index by counting all previous instances of the selectedText in the partial textContent
|
|
27
37
|
// Need to scan from start, up to `startIndex` (which includes partial of the current node)
|
|
28
38
|
textContent += doc.textBetween(nodeStart, startIndex - 1);
|
|
@@ -37,11 +47,12 @@ function getIndexMatch(doc, schema, selectedText, startIndex) {
|
|
|
37
47
|
});
|
|
38
48
|
|
|
39
49
|
// Count total number of matches in final text
|
|
40
|
-
|
|
50
|
+
numMatches = countMatches(textContent, selectedText);
|
|
41
51
|
return {
|
|
42
52
|
numMatches: numMatches,
|
|
43
53
|
matchIndex: matchIndex,
|
|
44
|
-
textContent: textContent
|
|
54
|
+
textContent: textContent,
|
|
55
|
+
blockNodePos: blockNodePos
|
|
45
56
|
};
|
|
46
57
|
}
|
|
47
58
|
|
|
@@ -55,7 +55,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
55
55
|
var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
|
|
56
56
|
var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
57
57
|
var packageName = "@atlaskit/renderer";
|
|
58
|
-
var packageVersion = "109.
|
|
58
|
+
var packageVersion = "109.13.1";
|
|
59
59
|
var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
|
|
60
60
|
(0, _inherits2.default)(Renderer, _PureComponent);
|
|
61
61
|
var _super = _createSuper(Renderer);
|
|
@@ -13,7 +13,6 @@ var _colors = _interopRequireWildcard(require("@atlaskit/theme/colors"));
|
|
|
13
13
|
var colors = _colors;
|
|
14
14
|
var _typography = require("@atlaskit/theme/typography");
|
|
15
15
|
var _tokens = require("@atlaskit/tokens");
|
|
16
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
17
16
|
var _mediaInline = require("@atlaskit/editor-common/media-inline");
|
|
18
17
|
var _styles = require("@atlaskit/editor-common/styles");
|
|
19
18
|
var _ui = require("@atlaskit/editor-common/ui");
|
|
@@ -104,7 +103,7 @@ var breakoutWidthStyle = function breakoutWidthStyle() {
|
|
|
104
103
|
return (0, _react.css)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n *:not([data-mark-type='fragment'])\n .", " {\n // TODO - improve inline style logic on table container so important styles aren't required here\n width: 100% !important;\n left: 0 !important;\n }\n\n [data-mark-type='fragment'] * .", " {\n // TODO - improve inline style logic on table container so important styles aren't required here\n width: 100% !important;\n left: 0 !important;\n }\n "])), _styles.TableSharedCssClassName.TABLE_CONTAINER, _styles.TableSharedCssClassName.TABLE_CONTAINER);
|
|
105
104
|
};
|
|
106
105
|
var getShadowOverrides = function getShadowOverrides() {
|
|
107
|
-
return (0,
|
|
106
|
+
return (0, _react.css)(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2.default)(["\n /** Shadow overrides */\n &.", "::after,\n &.", "::before {\n width: ", "px;\n background: linear-gradient(\n to left,\n transparent 0,\n ", " 140%\n ),\n linear-gradient(\n to right,\n ", " 0px,\n transparent 1px\n );\n }\n\n &.", "::after {\n background: linear-gradient(\n to right,\n transparent 0,\n ", " 140%\n ),\n linear-gradient(\n to left,\n ", " 0px,\n transparent 1px\n );\n right: 0px;\n }\n "])), _ui.shadowClassNames.RIGHT_SHADOW, _ui.shadowClassNames.LEFT_SHADOW, tableShadowWidth, "var(--ds-shadow-overflow-spread, ".concat(_colors.N40A, ")"), "var(--ds-shadow-overflow-perimeter, transparent)", _ui.shadowClassNames.RIGHT_SHADOW, "var(--ds-shadow-overflow-spread, ".concat(_colors.N40A, ")"), "var(--ds-shadow-overflow-perimeter, transparent)");
|
|
108
107
|
};
|
|
109
108
|
var rendererStyles = exports.rendererStyles = function rendererStyles(wrapperProps) {
|
|
110
109
|
return function (theme) {
|
|
@@ -210,14 +210,16 @@ export default class RendererActions {
|
|
|
210
210
|
const originalSelection = doc.textBetween(from, to);
|
|
211
211
|
const {
|
|
212
212
|
numMatches,
|
|
213
|
-
matchIndex
|
|
213
|
+
matchIndex,
|
|
214
|
+
blockNodePos
|
|
214
215
|
} = getIndexMatch(this.doc, this.schema, originalSelection, from);
|
|
215
216
|
return {
|
|
216
217
|
step,
|
|
217
218
|
doc: this.transformer.encode(doc),
|
|
218
219
|
originalSelection,
|
|
219
220
|
numMatches,
|
|
220
|
-
matchIndex
|
|
221
|
+
matchIndex,
|
|
222
|
+
pos: blockNodePos
|
|
221
223
|
};
|
|
222
224
|
}
|
|
223
225
|
generateAnnotationIndexMatch(pos) {
|
|
@@ -231,12 +233,14 @@ export default class RendererActions {
|
|
|
231
233
|
const originalSelection = this.doc.textBetween(from, to);
|
|
232
234
|
const {
|
|
233
235
|
numMatches,
|
|
234
|
-
matchIndex
|
|
236
|
+
matchIndex,
|
|
237
|
+
blockNodePos
|
|
235
238
|
} = getIndexMatch(this.doc, this.schema, originalSelection, from);
|
|
236
239
|
return {
|
|
237
240
|
originalSelection,
|
|
238
241
|
numMatches,
|
|
239
|
-
matchIndex
|
|
242
|
+
matchIndex,
|
|
243
|
+
pos: blockNodePos
|
|
240
244
|
};
|
|
241
245
|
}
|
|
242
246
|
}
|
|
@@ -4,18 +4,30 @@
|
|
|
4
4
|
export function getIndexMatch(doc, schema, selectedText, startIndex) {
|
|
5
5
|
let textContent = '';
|
|
6
6
|
let matchIndex = 0;
|
|
7
|
+
let numMatches = 0;
|
|
8
|
+
let blockNodePos;
|
|
7
9
|
doc.descendants((node, pos) => {
|
|
10
|
+
const nodeType = node.type;
|
|
11
|
+
const {
|
|
12
|
+
media
|
|
13
|
+
} = schema.nodes;
|
|
14
|
+
|
|
8
15
|
// Mirrors Confluence backend and doesn't construct textContent if it doesn't allow annotations
|
|
9
|
-
|
|
16
|
+
// Don't skip media node so that block node can be defined its startIndex in within [nodeStart, nodeEnd]
|
|
17
|
+
if ((node.isText || !nodeType.allowsMarkType(schema.marks.annotation)) && nodeType !== media) {
|
|
10
18
|
// Note: `return true` as a parent disallowing annotations does not mean a child disallows annotations.
|
|
11
19
|
// Eg: panel (invalid) > p (valid)
|
|
12
20
|
return true;
|
|
13
21
|
}
|
|
14
22
|
const nodeStart = pos;
|
|
15
23
|
const nodeEnd = nodeStart + node.nodeSize;
|
|
16
|
-
|
|
17
|
-
// If the start of the annotation selection is within the current node, we scan the document for previous occurrences
|
|
18
24
|
if (startIndex >= nodeStart && startIndex <= nodeEnd) {
|
|
25
|
+
// if it's a node block, set position to pos to indicate to the backend
|
|
26
|
+
// that it's an annotation on a block node
|
|
27
|
+
if (nodeType === media) {
|
|
28
|
+
blockNodePos = pos;
|
|
29
|
+
}
|
|
30
|
+
// If the start of the annotation selection is within the current node, we scan the document for previous occurrences
|
|
19
31
|
// Find the index by counting all previous instances of the selectedText in the partial textContent
|
|
20
32
|
// Need to scan from start, up to `startIndex` (which includes partial of the current node)
|
|
21
33
|
textContent += doc.textBetween(nodeStart, startIndex - 1);
|
|
@@ -30,11 +42,12 @@ export function getIndexMatch(doc, schema, selectedText, startIndex) {
|
|
|
30
42
|
});
|
|
31
43
|
|
|
32
44
|
// Count total number of matches in final text
|
|
33
|
-
|
|
45
|
+
numMatches = countMatches(textContent, selectedText);
|
|
34
46
|
return {
|
|
35
47
|
numMatches,
|
|
36
48
|
matchIndex,
|
|
37
|
-
textContent
|
|
49
|
+
textContent,
|
|
50
|
+
blockNodePos
|
|
38
51
|
};
|
|
39
52
|
}
|
|
40
53
|
|
|
@@ -36,7 +36,7 @@ import { EditorMediaClientProvider } from '../../react/utils/EditorMediaClientPr
|
|
|
36
36
|
export const NORMAL_SEVERITY_THRESHOLD = 2000;
|
|
37
37
|
export const DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
38
38
|
const packageName = "@atlaskit/renderer";
|
|
39
|
-
const packageVersion = "109.
|
|
39
|
+
const packageVersion = "109.13.1";
|
|
40
40
|
export class Renderer extends PureComponent {
|
|
41
41
|
constructor(props) {
|
|
42
42
|
super(props);
|
|
@@ -5,7 +5,6 @@ import { fontFamily, fontSize } from '@atlaskit/theme/constants';
|
|
|
5
5
|
import * as colors from '@atlaskit/theme/colors';
|
|
6
6
|
import { headingSizes as headingSizesImport } from '@atlaskit/theme/typography';
|
|
7
7
|
import { getGlobalTheme } from '@atlaskit/tokens';
|
|
8
|
-
import { getBooleanFF } from '@atlaskit/platform-feature-flags';
|
|
9
8
|
import { mediaInlineImageStyles } from '@atlaskit/editor-common/media-inline';
|
|
10
9
|
import { tableSharedStyle, columnLayoutSharedStyle, blockquoteSharedStyles, headingsSharedStyles, ruleSharedStyles, whitespaceSharedStyles, paragraphSharedStyles, listsSharedStyles, indentationSharedStyles, blockMarksSharedStyles, mediaSingleSharedStyle, TableSharedCssClassName, tableMarginTop, codeMarkSharedStyles, shadowSharedStyle, dateSharedStyle, richMediaClassName, tasksAndDecisionsStyles, smartCardSharedStyles, tableCellPadding, textColorStyles, codeBlockInListSafariFix, SmartCardSharedCssClassName } from '@atlaskit/editor-common/styles';
|
|
11
10
|
import { shadowClassNames } from '@atlaskit/editor-common/ui';
|
|
@@ -360,37 +359,37 @@ const breakoutWidthStyle = () => {
|
|
|
360
359
|
`;
|
|
361
360
|
};
|
|
362
361
|
const getShadowOverrides = () => {
|
|
363
|
-
return
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
362
|
+
return css`
|
|
363
|
+
/** Shadow overrides */
|
|
364
|
+
&.${shadowClassNames.RIGHT_SHADOW}::after,
|
|
365
|
+
&.${shadowClassNames.LEFT_SHADOW}::before {
|
|
366
|
+
width: ${tableShadowWidth}px;
|
|
367
|
+
background: linear-gradient(
|
|
368
|
+
to left,
|
|
369
|
+
transparent 0,
|
|
370
|
+
${`var(--ds-shadow-overflow-spread, ${N40A})`} 140%
|
|
371
|
+
),
|
|
372
|
+
linear-gradient(
|
|
373
|
+
to right,
|
|
374
|
+
${"var(--ds-shadow-overflow-perimeter, transparent)"} 0px,
|
|
375
|
+
transparent 1px
|
|
376
|
+
);
|
|
377
|
+
}
|
|
378
|
+
|
|
379
|
+
&.${shadowClassNames.RIGHT_SHADOW}::after {
|
|
380
|
+
background: linear-gradient(
|
|
381
|
+
to right,
|
|
382
|
+
transparent 0,
|
|
383
|
+
${`var(--ds-shadow-overflow-spread, ${N40A})`} 140%
|
|
384
|
+
),
|
|
385
|
+
linear-gradient(
|
|
386
|
+
to left,
|
|
387
|
+
${"var(--ds-shadow-overflow-perimeter, transparent)"} 0px,
|
|
388
|
+
transparent 1px
|
|
389
|
+
);
|
|
390
|
+
right: 0px;
|
|
391
|
+
}
|
|
392
|
+
`;
|
|
394
393
|
};
|
|
395
394
|
export const rendererStyles = wrapperProps => theme => {
|
|
396
395
|
// This is required to be compatible with styled-components prop structure.
|
|
@@ -224,13 +224,15 @@ var RendererActions = /*#__PURE__*/function () {
|
|
|
224
224
|
var originalSelection = doc.textBetween(from, to);
|
|
225
225
|
var _getIndexMatch = getIndexMatch(this.doc, this.schema, originalSelection, from),
|
|
226
226
|
numMatches = _getIndexMatch.numMatches,
|
|
227
|
-
matchIndex = _getIndexMatch.matchIndex
|
|
227
|
+
matchIndex = _getIndexMatch.matchIndex,
|
|
228
|
+
blockNodePos = _getIndexMatch.blockNodePos;
|
|
228
229
|
return {
|
|
229
230
|
step: step,
|
|
230
231
|
doc: this.transformer.encode(doc),
|
|
231
232
|
originalSelection: originalSelection,
|
|
232
233
|
numMatches: numMatches,
|
|
233
|
-
matchIndex: matchIndex
|
|
234
|
+
matchIndex: matchIndex,
|
|
235
|
+
pos: blockNodePos
|
|
234
236
|
};
|
|
235
237
|
}
|
|
236
238
|
}, {
|
|
@@ -244,11 +246,13 @@ var RendererActions = /*#__PURE__*/function () {
|
|
|
244
246
|
var originalSelection = this.doc.textBetween(from, to);
|
|
245
247
|
var _getIndexMatch2 = getIndexMatch(this.doc, this.schema, originalSelection, from),
|
|
246
248
|
numMatches = _getIndexMatch2.numMatches,
|
|
247
|
-
matchIndex = _getIndexMatch2.matchIndex
|
|
249
|
+
matchIndex = _getIndexMatch2.matchIndex,
|
|
250
|
+
blockNodePos = _getIndexMatch2.blockNodePos;
|
|
248
251
|
return {
|
|
249
252
|
originalSelection: originalSelection,
|
|
250
253
|
numMatches: numMatches,
|
|
251
|
-
matchIndex: matchIndex
|
|
254
|
+
matchIndex: matchIndex,
|
|
255
|
+
pos: blockNodePos
|
|
252
256
|
};
|
|
253
257
|
}
|
|
254
258
|
}]);
|
|
@@ -4,18 +4,28 @@
|
|
|
4
4
|
export function getIndexMatch(doc, schema, selectedText, startIndex) {
|
|
5
5
|
var textContent = '';
|
|
6
6
|
var matchIndex = 0;
|
|
7
|
+
var numMatches = 0;
|
|
8
|
+
var blockNodePos;
|
|
7
9
|
doc.descendants(function (node, pos) {
|
|
10
|
+
var nodeType = node.type;
|
|
11
|
+
var media = schema.nodes.media;
|
|
12
|
+
|
|
8
13
|
// Mirrors Confluence backend and doesn't construct textContent if it doesn't allow annotations
|
|
9
|
-
|
|
14
|
+
// Don't skip media node so that block node can be defined its startIndex in within [nodeStart, nodeEnd]
|
|
15
|
+
if ((node.isText || !nodeType.allowsMarkType(schema.marks.annotation)) && nodeType !== media) {
|
|
10
16
|
// Note: `return true` as a parent disallowing annotations does not mean a child disallows annotations.
|
|
11
17
|
// Eg: panel (invalid) > p (valid)
|
|
12
18
|
return true;
|
|
13
19
|
}
|
|
14
20
|
var nodeStart = pos;
|
|
15
21
|
var nodeEnd = nodeStart + node.nodeSize;
|
|
16
|
-
|
|
17
|
-
// If the start of the annotation selection is within the current node, we scan the document for previous occurrences
|
|
18
22
|
if (startIndex >= nodeStart && startIndex <= nodeEnd) {
|
|
23
|
+
// if it's a node block, set position to pos to indicate to the backend
|
|
24
|
+
// that it's an annotation on a block node
|
|
25
|
+
if (nodeType === media) {
|
|
26
|
+
blockNodePos = pos;
|
|
27
|
+
}
|
|
28
|
+
// If the start of the annotation selection is within the current node, we scan the document for previous occurrences
|
|
19
29
|
// Find the index by counting all previous instances of the selectedText in the partial textContent
|
|
20
30
|
// Need to scan from start, up to `startIndex` (which includes partial of the current node)
|
|
21
31
|
textContent += doc.textBetween(nodeStart, startIndex - 1);
|
|
@@ -30,11 +40,12 @@ export function getIndexMatch(doc, schema, selectedText, startIndex) {
|
|
|
30
40
|
});
|
|
31
41
|
|
|
32
42
|
// Count total number of matches in final text
|
|
33
|
-
|
|
43
|
+
numMatches = countMatches(textContent, selectedText);
|
|
34
44
|
return {
|
|
35
45
|
numMatches: numMatches,
|
|
36
46
|
matchIndex: matchIndex,
|
|
37
|
-
textContent: textContent
|
|
47
|
+
textContent: textContent,
|
|
48
|
+
blockNodePos: blockNodePos
|
|
38
49
|
};
|
|
39
50
|
}
|
|
40
51
|
|
|
@@ -46,7 +46,7 @@ import { EditorMediaClientProvider } from '../../react/utils/EditorMediaClientPr
|
|
|
46
46
|
export var NORMAL_SEVERITY_THRESHOLD = 2000;
|
|
47
47
|
export var DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
48
48
|
var packageName = "@atlaskit/renderer";
|
|
49
|
-
var packageVersion = "109.
|
|
49
|
+
var packageVersion = "109.13.1";
|
|
50
50
|
export var Renderer = /*#__PURE__*/function (_PureComponent) {
|
|
51
51
|
_inherits(Renderer, _PureComponent);
|
|
52
52
|
var _super = _createSuper(Renderer);
|
|
@@ -7,7 +7,6 @@ import { fontFamily, fontSize } from '@atlaskit/theme/constants';
|
|
|
7
7
|
import * as colors from '@atlaskit/theme/colors';
|
|
8
8
|
import { headingSizes as headingSizesImport } from '@atlaskit/theme/typography';
|
|
9
9
|
import { getGlobalTheme } from '@atlaskit/tokens';
|
|
10
|
-
import { getBooleanFF } from '@atlaskit/platform-feature-flags';
|
|
11
10
|
import { mediaInlineImageStyles } from '@atlaskit/editor-common/media-inline';
|
|
12
11
|
import { tableSharedStyle, columnLayoutSharedStyle, blockquoteSharedStyles, headingsSharedStyles, ruleSharedStyles, whitespaceSharedStyles, paragraphSharedStyles, listsSharedStyles, indentationSharedStyles, blockMarksSharedStyles, mediaSingleSharedStyle, TableSharedCssClassName, tableMarginTop, codeMarkSharedStyles, shadowSharedStyle, dateSharedStyle, richMediaClassName, tasksAndDecisionsStyles, smartCardSharedStyles, tableCellPadding, textColorStyles, codeBlockInListSafariFix, SmartCardSharedCssClassName } from '@atlaskit/editor-common/styles';
|
|
13
12
|
import { shadowClassNames } from '@atlaskit/editor-common/ui';
|
|
@@ -96,7 +95,7 @@ var breakoutWidthStyle = function breakoutWidthStyle() {
|
|
|
96
95
|
return css(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n *:not([data-mark-type='fragment'])\n .", " {\n // TODO - improve inline style logic on table container so important styles aren't required here\n width: 100% !important;\n left: 0 !important;\n }\n\n [data-mark-type='fragment'] * .", " {\n // TODO - improve inline style logic on table container so important styles aren't required here\n width: 100% !important;\n left: 0 !important;\n }\n "])), TableSharedCssClassName.TABLE_CONTAINER, TableSharedCssClassName.TABLE_CONTAINER);
|
|
97
96
|
};
|
|
98
97
|
var getShadowOverrides = function getShadowOverrides() {
|
|
99
|
-
return
|
|
98
|
+
return css(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n /** Shadow overrides */\n &.", "::after,\n &.", "::before {\n width: ", "px;\n background: linear-gradient(\n to left,\n transparent 0,\n ", " 140%\n ),\n linear-gradient(\n to right,\n ", " 0px,\n transparent 1px\n );\n }\n\n &.", "::after {\n background: linear-gradient(\n to right,\n transparent 0,\n ", " 140%\n ),\n linear-gradient(\n to left,\n ", " 0px,\n transparent 1px\n );\n right: 0px;\n }\n "])), shadowClassNames.RIGHT_SHADOW, shadowClassNames.LEFT_SHADOW, tableShadowWidth, "var(--ds-shadow-overflow-spread, ".concat(N40A, ")"), "var(--ds-shadow-overflow-perimeter, transparent)", shadowClassNames.RIGHT_SHADOW, "var(--ds-shadow-overflow-spread, ".concat(N40A, ")"), "var(--ds-shadow-overflow-perimeter, transparent)");
|
|
100
99
|
};
|
|
101
100
|
export var rendererStyles = function rendererStyles(wrapperProps) {
|
|
102
101
|
return function (theme) {
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { Node, Schema } from '@atlaskit/editor-prosemirror/model';
|
|
1
|
+
import type { Node, Schema } from '@atlaskit/editor-prosemirror/model';
|
|
2
2
|
export declare function getIndexMatch(doc: Node, schema: Schema, selectedText: string, startIndex: number): {
|
|
3
3
|
numMatches: number;
|
|
4
4
|
matchIndex: number;
|
|
5
5
|
textContent: string;
|
|
6
|
+
blockNodePos?: number;
|
|
6
7
|
};
|
|
7
8
|
export declare function countMatches(searchString: string, query: string): number;
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { Node, Schema } from '@atlaskit/editor-prosemirror/model';
|
|
1
|
+
import type { Node, Schema } from '@atlaskit/editor-prosemirror/model';
|
|
2
2
|
export declare function getIndexMatch(doc: Node, schema: Schema, selectedText: string, startIndex: number): {
|
|
3
3
|
numMatches: number;
|
|
4
4
|
matchIndex: number;
|
|
5
5
|
textContent: string;
|
|
6
|
+
blockNodePos?: number;
|
|
6
7
|
};
|
|
7
8
|
export declare function countMatches(searchString: string, query: string): number;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/renderer",
|
|
3
|
-
"version": "109.
|
|
3
|
+
"version": "109.13.1",
|
|
4
4
|
"description": "Renderer component",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"@atlaskit/analytics-next": "^9.2.0",
|
|
32
32
|
"@atlaskit/button": "^17.8.0",
|
|
33
33
|
"@atlaskit/code": "^15.1.0",
|
|
34
|
-
"@atlaskit/editor-common": "^78.
|
|
34
|
+
"@atlaskit/editor-common": "^78.23.0",
|
|
35
35
|
"@atlaskit/editor-json-transformer": "^8.10.0",
|
|
36
36
|
"@atlaskit/editor-palette": "1.5.3",
|
|
37
37
|
"@atlaskit/editor-prosemirror": "3.0.0",
|
|
@@ -47,11 +47,11 @@
|
|
|
47
47
|
"@atlaskit/media-ui": "^25.4.0",
|
|
48
48
|
"@atlaskit/media-viewer": "^48.4.0",
|
|
49
49
|
"@atlaskit/platform-feature-flags": "^0.2.0",
|
|
50
|
-
"@atlaskit/smart-card": "^26.
|
|
50
|
+
"@atlaskit/smart-card": "^26.51.0",
|
|
51
51
|
"@atlaskit/status": "^1.4.0",
|
|
52
52
|
"@atlaskit/task-decision": "^17.9.0",
|
|
53
53
|
"@atlaskit/theme": "^12.7.0",
|
|
54
|
-
"@atlaskit/tokens": "^1.
|
|
54
|
+
"@atlaskit/tokens": "^1.43.0",
|
|
55
55
|
"@atlaskit/tooltip": "^18.1.0",
|
|
56
56
|
"@babel/runtime": "^7.0.0",
|
|
57
57
|
"@emotion/react": "^11.7.1",
|
|
@@ -121,9 +121,6 @@
|
|
|
121
121
|
"platform.editor.custom-table-width": {
|
|
122
122
|
"type": "boolean"
|
|
123
123
|
},
|
|
124
|
-
"platform.editor.table.increase-shadow-visibility_lh89r": {
|
|
125
|
-
"type": "boolean"
|
|
126
|
-
},
|
|
127
124
|
"platform.media-experience.media-viewer-v2_hgsii": {
|
|
128
125
|
"type": "boolean",
|
|
129
126
|
"referenceOnly": "true"
|