@atlaskit/editor-core 98.9.0 → 98.9.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 +5 -0
- package/dist/es2015/actions/index.js +3 -2
- package/dist/es2015/actions/index.js.map +1 -1
- package/dist/es2015/utils/filter/node-filter.d.ts +2 -0
- package/dist/es2015/utils/filter/node-filter.js +20 -0
- package/dist/es2015/utils/filter/node-filter.js.map +1 -0
- package/dist/es2015/utils/mark.d.ts +0 -2
- package/dist/es2015/utils/mark.js +0 -13
- package/dist/es2015/utils/mark.js.map +1 -1
- package/dist/es5/actions/index.js +2 -1
- package/dist/es5/actions/index.js.map +1 -1
- package/dist/es5/utils/filter/node-filter.d.ts +2 -0
- package/dist/es5/utils/filter/node-filter.js +23 -0
- package/dist/es5/utils/filter/node-filter.js.map +1 -0
- package/dist/es5/utils/mark.d.ts +0 -2
- package/dist/es5/utils/mark.js +0 -14
- package/dist/es5/utils/mark.js.map +1 -1
- package/dist/package.json +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
# @atlaskit/editor-core
|
|
2
2
|
|
|
3
|
+
## 98.9.1
|
|
4
|
+
- [patch] [ebb0a98051](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/ebb0a98051):
|
|
5
|
+
|
|
6
|
+
- remove empty status before publishing document
|
|
7
|
+
|
|
3
8
|
## 98.9.0
|
|
4
9
|
- [minor] [59ae46e1cf](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/59ae46e1cf):
|
|
5
10
|
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import * as tslib_1 from "tslib";
|
|
2
2
|
import { TextSelection } from 'prosemirror-state';
|
|
3
|
-
import { compose, getEditorValueWithMedia, insertFileFromDataUrl as insertFileFromUrl, toJSON,
|
|
3
|
+
import { compose, getEditorValueWithMedia, insertFileFromDataUrl as insertFileFromUrl, toJSON, processRawValue, } from '../utils';
|
|
4
|
+
import { sanitizeNode } from '../utils/filter/node-filter';
|
|
4
5
|
import { safeInsert } from 'prosemirror-utils';
|
|
5
6
|
var EditorActions = /** @class */ (function () {
|
|
6
7
|
function EditorActions() {
|
|
@@ -88,7 +89,7 @@ var EditorActions = /** @class */ (function () {
|
|
|
88
89
|
if (this.contentTransformer) {
|
|
89
90
|
return [2 /*return*/, this.contentTransformer.encode(doc)];
|
|
90
91
|
}
|
|
91
|
-
return [2 /*return*/, compose(
|
|
92
|
+
return [2 /*return*/, compose(sanitizeNode, toJSON)(doc)];
|
|
92
93
|
}
|
|
93
94
|
});
|
|
94
95
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/actions/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGlD,OAAO,EACL,OAAO,EACP,uBAAuB,EACvB,qBAAqB,IAAI,iBAAiB,EAC1C,MAAM,EACN,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/actions/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import * as tslib_1 from "tslib";
|
|
2
|
+
import { traverse } from '@atlaskit/adf-utils';
|
|
3
|
+
export function sanitizeNode(json) {
|
|
4
|
+
var sanitizedJSON = traverse(json, {
|
|
5
|
+
text: function (node) {
|
|
6
|
+
if (!node || !Array.isArray(node.marks)) {
|
|
7
|
+
return node;
|
|
8
|
+
}
|
|
9
|
+
return tslib_1.__assign({}, node, { marks: node.marks.filter(function (mark) { return ['emojiQuery', 'typeAheadQuery'].indexOf(mark.type) === -1; }) });
|
|
10
|
+
},
|
|
11
|
+
status: function (node) {
|
|
12
|
+
if (node.attrs && !!node.attrs.text) {
|
|
13
|
+
return node;
|
|
14
|
+
}
|
|
15
|
+
return false; // empty status
|
|
16
|
+
},
|
|
17
|
+
});
|
|
18
|
+
return sanitizedJSON;
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=node-filter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"node-filter.js","sourceRoot":"","sources":["../../../../src/utils/filter/node-filter.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAG/C,MAAM,UAAU,YAAY,CAAC,IAAiB;IAC5C,IAAM,aAAa,GAAG,QAAQ,CAAC,IAAW,EAAE;QAC1C,IAAI,EAAE,UAAA,IAAI;YACR,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBACvC,OAAO,IAAI,CAAC;aACb;YAED,4BACK,IAAI,IACP,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CACtB,UAAA,IAAI,IAAI,OAAA,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAA1D,CAA0D,CACnE,IACD;QACJ,CAAC;QACD,MAAM,EAAE,UAAA,IAAI;YACV,IAAI,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;gBACnC,OAAO,IAAI,CAAC;aACb;YACD,OAAO,KAAK,CAAC,CAAC,eAAe;QAC/B,CAAC;KACF,CAAgB,CAAC;IAElB,OAAO,aAAa,CAAC;AACvB,CAAC"}
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import { Node, Mark, MarkType } from 'prosemirror-model';
|
|
2
2
|
import { SelectionRange, EditorState, Transaction } from 'prosemirror-state';
|
|
3
|
-
import { JSONDocNode } from '@atlaskit/editor-json-transformer';
|
|
4
3
|
export declare const isMarkAllowedInRange: (doc: Node<any>, ranges: SelectionRange<any>[], type: MarkType<any>) => boolean;
|
|
5
4
|
export declare const isMarkExcluded: (type: MarkType<any>, marks?: Mark<any>[] | null | undefined) => boolean;
|
|
6
5
|
export declare const removeBlockMarks: (state: EditorState<any>, marks: (MarkType<any> | undefined)[]) => Transaction<any> | undefined;
|
|
7
|
-
export declare function removeQueryMarksFromJSON(json: JSONDocNode): JSONDocNode;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import * as tslib_1 from "tslib";
|
|
2
|
-
import { traverse } from '@atlaskit/adf-utils';
|
|
3
1
|
export var isMarkAllowedInRange = function (doc, ranges, type) {
|
|
4
2
|
var _loop_1 = function (i) {
|
|
5
3
|
var _a = ranges[i], $from = _a.$from, $to = _a.$to;
|
|
@@ -53,15 +51,4 @@ export var removeBlockMarks = function (state, marks) {
|
|
|
53
51
|
});
|
|
54
52
|
return blockMarksExists ? tr : undefined;
|
|
55
53
|
};
|
|
56
|
-
export function removeQueryMarksFromJSON(json) {
|
|
57
|
-
var sanitizedJSON = traverse(json, {
|
|
58
|
-
text: function (node) {
|
|
59
|
-
if (!node || !Array.isArray(node.marks)) {
|
|
60
|
-
return node;
|
|
61
|
-
}
|
|
62
|
-
return tslib_1.__assign({}, node, { marks: node.marks.filter(function (mark) { return ['emojiQuery', 'typeAheadQuery'].indexOf(mark.type) === -1; }) });
|
|
63
|
-
},
|
|
64
|
-
});
|
|
65
|
-
return sanitizedJSON;
|
|
66
|
-
}
|
|
67
54
|
//# sourceMappingURL=mark.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mark.js","sourceRoot":"","sources":["../../../src/utils/mark.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mark.js","sourceRoot":"","sources":["../../../src/utils/mark.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
var tslib_1 = require("tslib");
|
|
4
4
|
var prosemirror_state_1 = require("prosemirror-state");
|
|
5
5
|
var utils_1 = require("../utils");
|
|
6
|
+
var node_filter_1 = require("../utils/filter/node-filter");
|
|
6
7
|
var prosemirror_utils_1 = require("prosemirror-utils");
|
|
7
8
|
var EditorActions = /** @class */ (function () {
|
|
8
9
|
function EditorActions() {
|
|
@@ -90,7 +91,7 @@ var EditorActions = /** @class */ (function () {
|
|
|
90
91
|
if (this.contentTransformer) {
|
|
91
92
|
return [2 /*return*/, this.contentTransformer.encode(doc)];
|
|
92
93
|
}
|
|
93
|
-
return [2 /*return*/, utils_1.compose(
|
|
94
|
+
return [2 /*return*/, utils_1.compose(node_filter_1.sanitizeNode, utils_1.toJSON)(doc)];
|
|
94
95
|
}
|
|
95
96
|
});
|
|
96
97
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/actions/index.ts"],"names":[],"mappings":";;;AACA,uDAAkD;AAGlD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/actions/index.ts"],"names":[],"mappings":";;;AACA,uDAAkD;AAGlD,kCAMkB;AAClB,2DAA2D;AAE3D,uDAA+C;AAkB/C;IAAA;QAIU,cAAS,GAAgC,EAAE,CAAC;IAkMtD,CAAC;IAhMQ,kBAAI,GAAX,UACE,IAAgB,EAChB,eAAgC,EAChC,WAA8B;QAE9B,IAAM,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC;QAC1C,aAAa,CAAC,sBAAsB,CAAC,IAAI,EAAE,eAAe,EAAE,WAAW,CAAC,CAAC;QACzE,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,sEAAsE;IACtE,6CAAqB,GAArB;QACE,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,kDAA0B,GAA1B;QACE,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED,8DAA8D;IAC9D,8CAAsB,GAAtB,UACE,UAAsB,EACtB,eAAgC,EAChC,kBAAqC;QAErC,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QAEvC,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,UAAU,EAAE;YAClC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;YAC7B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,UAAA,EAAE,IAAI,OAAA,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAA/B,CAA+B,CAAC,CAAC;SAC/D;aAAM,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU,EAAE;YACzC,MAAM,IAAI,KAAK,CACb,0GAA0G,CAC3G,CAAC;SACH;IACH,CAAC;IAED,8DAA8D;IAC9D,gDAAwB,GAAxB;QACE,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC;QACpC,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;IACnC,CAAC;IAED,yCAAiB,GAAjB,UAAkB,EAAwB;QACxC,oEAAoE;QACpE,sBAAsB;QACtB,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,eAAe,EAAE;YAC3C,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;SAC3C;QAED,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1B,CAAC;IAED,2CAAmB,GAAnB,UAAoB,EAAwB;QAC1C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,KAAK,EAAE,EAAR,CAAQ,CAAC,CAAC;IACxD,CAAC;IAED,6BAAK,GAAL;QACE,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE;YAClD,OAAO,KAAK,CAAC;SACd;QAED,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QACxB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,CAAC;QACpE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,4BAAI,GAAJ;QACE,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE;YACnD,OAAO,KAAK,CAAC;SACd;QAEA,IAAI,CAAC,UAAU,CAAC,GAAmB,CAAC,IAAI,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,6BAAK,GAAL;QACE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,OAAO,KAAK,CAAC;SACd;QAED,IAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAC3B,IAAA,wBAAK,CAAgB;QAC7B,IAAM,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,EAAE;aAC3B,YAAY,CAAC,iCAAa,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;aACxE,eAAe,EAAE,CAAC;QAErB,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAExB,OAAO,IAAI,CAAC;IACd,CAAC;IAEK,gCAAQ,GAAd;;;;;4BACc,qBAAM,+BAAuB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAA;;wBAApD,GAAG,GAAG,SAA8C;wBAE1D,IAAI,CAAC,GAAG,EAAE;4BACR,sBAAO;yBACR;wBAED,IAAI,IAAI,CAAC,kBAAkB,EAAE;4BAC3B,sBAAO,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAC;yBAC5C;wBAED,sBAAO,eAAO,CACZ,0BAAY,EACZ,cAAM,CACP,CAAC,GAAG,CAAC,EAAC;;;;KACR;IAED,uCAAe,GAAf,UAAgB,QAAa,EAAE,oBAA2B;QAA3B,qCAAA,EAAA,2BAA2B;QACxD,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,IAAI,EAAE;YACnE,OAAO,KAAK,CAAC;SACd;QAEO,IAAA,6BAAK,CAAqB;QAC1B,IAAA,qBAAM,CAAW;QAEzB,IAAM,cAAc,GAAG,IAAI,CAAC,kBAAkB;YAC5C,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE;YAClD,CAAC,CAAC,QAAQ,CAAC;QAEb,IAAM,OAAO,GAAG,uBAAe,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAExD,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,KAAK,CAAC;SACd;QAED,mGAAmG;QACnG,IAAI,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,QAAQ,GAAG,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAE1E,IAAI,oBAAoB,EAAE;YACxB,EAAE,GAAG,EAAE,CAAC,cAAc,EAAE,CAAC;SAC1B;QAED,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAE7B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,wCAAgB,GAAhB,UAAiB,QAAgC;QAC/C,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,OAAO,KAAK,CAAC;SACd;QAEO,IAAA,6BAAK,CAAqB;QAElC,IAAI,CAAC,QAAQ,EAAE;YACb,IAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,cAAc,EAAE,CAAC;YACvD,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC7B,OAAO,IAAI,CAAC;SACb;QAEO,IAAA,qBAAM,CAAW;QACzB,IAAM,OAAO,GAAG,uBAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAElD,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,KAAK,CAAC;SACd;QAED,iHAAiH;QACjH,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,8BAAU,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC;QAEzE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,kCAAU,GAAV,UAAW,IAAY;QACrB,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,EAAE;YAC7B,OAAO,KAAK,CAAC;SACd;QAEO,IAAA,6BAAK,CAAqB;QAClC,IAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC;QAEtC,IAAI,SAAS,IAAI,SAAS,CAAC,IAAI,KAAK,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE;YAChE,OAAO,KAAK,CAAC;SACd;QAED,IAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,CAAC;QACtD,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAE7B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,6CAAqB,GAArB,UAAsB,GAAW,EAAE,QAAgB;QACjD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,OAAO,KAAK,CAAC;SACd;QACD,6BAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IACH,oBAAC;AAAD,CAAC,AAtMD,IAsMC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
var tslib_1 = require("tslib");
|
|
4
|
+
var adf_utils_1 = require("@atlaskit/adf-utils");
|
|
5
|
+
function sanitizeNode(json) {
|
|
6
|
+
var sanitizedJSON = adf_utils_1.traverse(json, {
|
|
7
|
+
text: function (node) {
|
|
8
|
+
if (!node || !Array.isArray(node.marks)) {
|
|
9
|
+
return node;
|
|
10
|
+
}
|
|
11
|
+
return tslib_1.__assign({}, node, { marks: node.marks.filter(function (mark) { return ['emojiQuery', 'typeAheadQuery'].indexOf(mark.type) === -1; }) });
|
|
12
|
+
},
|
|
13
|
+
status: function (node) {
|
|
14
|
+
if (node.attrs && !!node.attrs.text) {
|
|
15
|
+
return node;
|
|
16
|
+
}
|
|
17
|
+
return false; // empty status
|
|
18
|
+
},
|
|
19
|
+
});
|
|
20
|
+
return sanitizedJSON;
|
|
21
|
+
}
|
|
22
|
+
exports.sanitizeNode = sanitizeNode;
|
|
23
|
+
//# sourceMappingURL=node-filter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"node-filter.js","sourceRoot":"","sources":["../../../../src/utils/filter/node-filter.ts"],"names":[],"mappings":";;;AAAA,iDAA+C;AAG/C,SAAgB,YAAY,CAAC,IAAiB;IAC5C,IAAM,aAAa,GAAG,oBAAQ,CAAC,IAAW,EAAE;QAC1C,IAAI,EAAE,UAAA,IAAI;YACR,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBACvC,OAAO,IAAI,CAAC;aACb;YAED,4BACK,IAAI,IACP,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CACtB,UAAA,IAAI,IAAI,OAAA,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAA1D,CAA0D,CACnE,IACD;QACJ,CAAC;QACD,MAAM,EAAE,UAAA,IAAI;YACV,IAAI,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;gBACnC,OAAO,IAAI,CAAC;aACb;YACD,OAAO,KAAK,CAAC,CAAC,eAAe;QAC/B,CAAC;KACF,CAAgB,CAAC;IAElB,OAAO,aAAa,CAAC;AACvB,CAAC;AAvBD,oCAuBC"}
|
package/dist/es5/utils/mark.d.ts
CHANGED
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import { Node, Mark, MarkType } from 'prosemirror-model';
|
|
2
2
|
import { SelectionRange, EditorState, Transaction } from 'prosemirror-state';
|
|
3
|
-
import { JSONDocNode } from '@atlaskit/editor-json-transformer';
|
|
4
3
|
export declare const isMarkAllowedInRange: (doc: Node<any>, ranges: SelectionRange<any>[], type: MarkType<any>) => boolean;
|
|
5
4
|
export declare const isMarkExcluded: (type: MarkType<any>, marks?: Mark<any>[] | null | undefined) => boolean;
|
|
6
5
|
export declare const removeBlockMarks: (state: EditorState<any>, marks: (MarkType<any> | undefined)[]) => Transaction<any> | undefined;
|
|
7
|
-
export declare function removeQueryMarksFromJSON(json: JSONDocNode): JSONDocNode;
|
package/dist/es5/utils/mark.js
CHANGED
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
var tslib_1 = require("tslib");
|
|
4
|
-
var adf_utils_1 = require("@atlaskit/adf-utils");
|
|
5
3
|
exports.isMarkAllowedInRange = function (doc, ranges, type) {
|
|
6
4
|
var _loop_1 = function (i) {
|
|
7
5
|
var _a = ranges[i], $from = _a.$from, $to = _a.$to;
|
|
@@ -55,16 +53,4 @@ exports.removeBlockMarks = function (state, marks) {
|
|
|
55
53
|
});
|
|
56
54
|
return blockMarksExists ? tr : undefined;
|
|
57
55
|
};
|
|
58
|
-
function removeQueryMarksFromJSON(json) {
|
|
59
|
-
var sanitizedJSON = adf_utils_1.traverse(json, {
|
|
60
|
-
text: function (node) {
|
|
61
|
-
if (!node || !Array.isArray(node.marks)) {
|
|
62
|
-
return node;
|
|
63
|
-
}
|
|
64
|
-
return tslib_1.__assign({}, node, { marks: node.marks.filter(function (mark) { return ['emojiQuery', 'typeAheadQuery'].indexOf(mark.type) === -1; }) });
|
|
65
|
-
},
|
|
66
|
-
});
|
|
67
|
-
return sanitizedJSON;
|
|
68
|
-
}
|
|
69
|
-
exports.removeQueryMarksFromJSON = removeQueryMarksFromJSON;
|
|
70
56
|
//# sourceMappingURL=mark.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mark.js","sourceRoot":"","sources":["../../../src/utils/mark.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mark.js","sourceRoot":"","sources":["../../../src/utils/mark.ts"],"names":[],"mappings":";;AAGa,QAAA,oBAAoB,GAAG,UAClC,GAAS,EACT,MAA6B,EAC7B,IAAc;4BAEL,CAAC;QACF,IAAA,cAA0B,EAAxB,gBAAK,EAAE,YAAiB,CAAC;QACjC,IAAI,GAAG,GAAG,KAAK,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QACpE,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,UAAA,IAAI;YACvC,IAAI,GAAG,EAAE;gBACP,OAAO,KAAK,CAAC;aACd;YACD,GAAG,GAAG,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QACH,IAAI,GAAG,EAAE;4BACA,GAAG;SACX;IACH,CAAC;IAZD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE;8BAA7B,CAAC;;;KAYT;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEW,QAAA,cAAc,GAAG,UAC5B,IAAc,EACd,KAA0B;IAE1B,IAAI,KAAK,EAAE;QACT,OAAO,KAAK,CAAC,IAAI,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAA9C,CAA8C,CAAC,CAAC;KAC3E;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,IAAM,GAAG,GAAG,UAAI,EAA0B,IAAK,OAAA,UAAC,GAAM,IAAK,OAAA,CAAC,EAAE,CAAC,GAAG,CAAC,EAAR,CAAQ,EAApB,CAAoB,CAAC;AAEvD,QAAA,gBAAgB,GAAG,UAC9B,KAAkB,EAClB,KAAkC;IAE1B,IAAA,2BAAS,EAAE,qBAAM,CAAW;IAC9B,IAAA,aAAE,CAAW;IAEnB,kCAAkC;IAClC,IAAM,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC5C,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;QAC9B,OAAO,SAAS,CAAC;KAClB;IAED,8BAA8B;IAC9B,IAAI,gBAAgB,GAAG,KAAK,CAAC;IAE7B,IAAM,OAAO,GAAG,UAAC,IAAU,IAAK,OAAA,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAArC,CAAqC,CAAC;IACtE;;;OAGG;IACH,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,EAAE,UAAC,IAAI,EAAE,GAAG;QAC7D,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YACpE,gBAAgB,GAAG,IAAI,CAAC;YACxB,IAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC3C,IAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;YAC1D,EAAE,GAAG,EAAE,CAAC,aAAa,CACnB,WAAW,CAAC,GAAG,EACf,SAAS,EACT,IAAI,CAAC,KAAK,EACV,iBAAiB,CAClB,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IACH,OAAO,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AAC3C,CAAC,CAAC"}
|
package/dist/package.json
CHANGED