@atlaskit/editor-common 114.47.1 → 114.47.2
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 +8 -0
- package/dist/cjs/monitoring/error.js +1 -1
- package/dist/cjs/preset/core-plugin/index.js +1 -3
- package/dist/cjs/ui/DropList/index.js +1 -1
- package/dist/cjs/utils/document.js +4 -12
- package/dist/cjs/utils/processRawValue.js +6 -20
- package/dist/es2019/monitoring/error.js +1 -1
- package/dist/es2019/preset/core-plugin/index.js +1 -3
- package/dist/es2019/ui/DropList/index.js +1 -1
- package/dist/es2019/utils/document.js +4 -12
- package/dist/es2019/utils/processRawValue.js +6 -20
- package/dist/esm/monitoring/error.js +1 -1
- package/dist/esm/preset/core-plugin/index.js +1 -3
- package/dist/esm/ui/DropList/index.js +1 -1
- package/dist/esm/utils/document.js +4 -12
- package/dist/esm/utils/processRawValue.js +6 -20
- package/dist/types/utils/document.d.ts +1 -1
- package/dist/types-ts4.5/utils/document.d.ts +1 -1
- package/package.json +3 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
# @atlaskit/editor-common
|
|
2
2
|
|
|
3
|
+
## 114.47.2
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`5e34be0ba10b6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5e34be0ba10b6) -
|
|
8
|
+
Cleanup show diff experiments
|
|
9
|
+
- Updated dependencies
|
|
10
|
+
|
|
3
11
|
## 114.47.1
|
|
4
12
|
|
|
5
13
|
### Patch Changes
|
|
@@ -19,7 +19,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
19
19
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
20
20
|
var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
21
21
|
var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
22
|
-
var packageVersion = "114.47.
|
|
22
|
+
var packageVersion = "114.47.1";
|
|
23
23
|
var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
|
|
24
24
|
// Remove URL as it has UGC
|
|
25
25
|
// Ignored via go/ees007
|
|
@@ -137,9 +137,7 @@ var corePlugin = exports.corePlugin = function corePlugin(_ref) {
|
|
|
137
137
|
if (content) {
|
|
138
138
|
var _options$scrollIntoVi2;
|
|
139
139
|
var tr = state.tr.replaceWith(0, state.doc.nodeSize - 2, content);
|
|
140
|
-
|
|
141
|
-
tr.setMeta('replaceDocument', true);
|
|
142
|
-
}
|
|
140
|
+
tr.setMeta('replaceDocument', true);
|
|
143
141
|
if ((options === null || options === void 0 ? void 0 : options.addToHistory) === false) {
|
|
144
142
|
tr.setMeta('addToHistory', false);
|
|
145
143
|
}
|
|
@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
24
24
|
* @jsx jsx
|
|
25
25
|
*/ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
26
26
|
var packageName = "@atlaskit/editor-common";
|
|
27
|
-
var packageVersion = "114.47.
|
|
27
|
+
var packageVersion = "114.47.1";
|
|
28
28
|
var halfFocusRing = 1;
|
|
29
29
|
var dropOffset = '0, 8';
|
|
30
30
|
var fadeIn = (0, _react2.keyframes)({
|
|
@@ -204,13 +204,13 @@ function marksEqualIgnoringOrder(m1, m2) {
|
|
|
204
204
|
* @param doc1 PMNode
|
|
205
205
|
* @param doc2 PMNode
|
|
206
206
|
* @param attributesToIgnore Specific array of attribute keys to ignore - defaults to ignoring all
|
|
207
|
-
* @param opts.ignoreMarkOrder If mark order should be ignored to still be equal (e.g. reversed annotation marks).
|
|
207
|
+
* @param opts.ignoreMarkOrder If mark order should be ignored to still be equal (e.g. reversed annotation marks). Defaults to true.
|
|
208
208
|
* @returns boolean
|
|
209
209
|
*/
|
|
210
210
|
|
|
211
211
|
function areNodesEqualIgnoreAttrs(node1, node2, attributesToIgnore, opts) {
|
|
212
212
|
var _opts$ignoreMarkOrder;
|
|
213
|
-
var ignoreMarkOrder = (_opts$ignoreMarkOrder = opts === null || opts === void 0 ? void 0 : opts.ignoreMarkOrder) !== null && _opts$ignoreMarkOrder !== void 0 ? _opts$ignoreMarkOrder :
|
|
213
|
+
var ignoreMarkOrder = (_opts$ignoreMarkOrder = opts === null || opts === void 0 ? void 0 : opts.ignoreMarkOrder) !== null && _opts$ignoreMarkOrder !== void 0 ? _opts$ignoreMarkOrder : true;
|
|
214
214
|
if (node1.isText) {
|
|
215
215
|
if (ignoreMarkOrder) {
|
|
216
216
|
return node1.text === node2.text && marksEqualIgnoringOrder(node1.marks, node2.marks);
|
|
@@ -221,11 +221,7 @@ function areNodesEqualIgnoreAttrs(node1, node2, attributesToIgnore, opts) {
|
|
|
221
221
|
|
|
222
222
|
// If no attributes to ignore, compare all attributes
|
|
223
223
|
if (!attributesToIgnore || attributesToIgnore.length === 0) {
|
|
224
|
-
|
|
225
|
-
return node1 === node2 || node1.hasMarkup(node2.type, node1.attrs, node1.marks) && marksEqual && areFragmentsEqual(node1.content, node2.content, undefined, opts);
|
|
226
|
-
} else {
|
|
227
|
-
return node1 === node2 || node1.hasMarkup(node2.type, node1.attrs, node2.marks) && areFragmentsEqual(node1.content, node2.content);
|
|
228
|
-
}
|
|
224
|
+
return node1 === node2 || node1.hasMarkup(node2.type, node1.attrs, node1.marks) && marksEqual && areFragmentsEqual(node1.content, node2.content, undefined, opts);
|
|
229
225
|
}
|
|
230
226
|
|
|
231
227
|
// Build attrs to compare by excluding ignored attributes
|
|
@@ -236,11 +232,7 @@ function areNodesEqualIgnoreAttrs(node1, node2, attributesToIgnore, opts) {
|
|
|
236
232
|
attrsToCompare[key] = node1.attrs[key];
|
|
237
233
|
}
|
|
238
234
|
}
|
|
239
|
-
|
|
240
|
-
return node1 === node2 || node1.type === node2.type && node1.hasMarkup(node2.type, attrsToCompare, node1.marks) && marksEqual && areFragmentsEqual(node1.content, node2.content, attributesToIgnore, opts);
|
|
241
|
-
} else {
|
|
242
|
-
return node1 === node2 || node1.hasMarkup(node2.type, attrsToCompare, node2.marks) && areFragmentsEqual(node1.content, node2.content, attributesToIgnore);
|
|
243
|
-
}
|
|
235
|
+
return node1 === node2 || node1.type === node2.type && node1.hasMarkup(node2.type, attrsToCompare, node1.marks) && marksEqual && areFragmentsEqual(node1.content, node2.content, attributesToIgnore, opts);
|
|
244
236
|
}
|
|
245
237
|
function areFragmentsEqual(frag1, frag2, attributesToIgnore, opts) {
|
|
246
238
|
if (frag1.content.length !== frag2.content.length) {
|
|
@@ -19,32 +19,18 @@ var transformNestedTablesWithAnalytics = function transformNestedTablesWithAnaly
|
|
|
19
19
|
var _transformNestedTable = (0, _transforms.transformNestedTablesIncomingDocument)(node),
|
|
20
20
|
transformedAdf = _transformNestedTable.transformedAdf,
|
|
21
21
|
isTransformed = _transformNestedTable.isTransformed;
|
|
22
|
-
if (
|
|
23
|
-
if (
|
|
24
|
-
if (dispatchAnalyticsEvent) {
|
|
25
|
-
dispatchAnalyticsEvent({
|
|
26
|
-
action: _analytics.ACTION.NESTED_TABLE_TRANSFORMED,
|
|
27
|
-
actionSubject: _analytics.ACTION_SUBJECT.EDITOR,
|
|
28
|
-
eventType: _analytics.EVENT_TYPE.OPERATIONAL
|
|
29
|
-
});
|
|
30
|
-
}
|
|
31
|
-
return {
|
|
32
|
-
transformedAdf: transformedAdf,
|
|
33
|
-
isTransformed: isTransformed
|
|
34
|
-
};
|
|
35
|
-
}
|
|
36
|
-
} else {
|
|
37
|
-
if (isTransformed && dispatchAnalyticsEvent) {
|
|
22
|
+
if (isTransformed) {
|
|
23
|
+
if (dispatchAnalyticsEvent) {
|
|
38
24
|
dispatchAnalyticsEvent({
|
|
39
25
|
action: _analytics.ACTION.NESTED_TABLE_TRANSFORMED,
|
|
40
26
|
actionSubject: _analytics.ACTION_SUBJECT.EDITOR,
|
|
41
27
|
eventType: _analytics.EVENT_TYPE.OPERATIONAL
|
|
42
28
|
});
|
|
43
|
-
return {
|
|
44
|
-
transformedAdf: transformedAdf,
|
|
45
|
-
isTransformed: isTransformed
|
|
46
|
-
};
|
|
47
29
|
}
|
|
30
|
+
return {
|
|
31
|
+
transformedAdf: transformedAdf,
|
|
32
|
+
isTransformed: isTransformed
|
|
33
|
+
};
|
|
48
34
|
}
|
|
49
35
|
} catch (e) {
|
|
50
36
|
// eslint-disable-next-line no-console
|
|
@@ -4,7 +4,7 @@ import { isFedRamp } from './environment';
|
|
|
4
4
|
import { normaliseSentryBreadcrumbs, SERIALIZABLE_ATTRIBUTES } from './normalise-sentry-breadcrumbs';
|
|
5
5
|
const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
6
6
|
const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
7
|
-
const packageVersion = "114.47.
|
|
7
|
+
const packageVersion = "114.47.1";
|
|
8
8
|
const sanitiseSentryEvents = (data, _hint) => {
|
|
9
9
|
// Remove URL as it has UGC
|
|
10
10
|
// Ignored via go/ees007
|
|
@@ -137,9 +137,7 @@ export const corePlugin = ({
|
|
|
137
137
|
if (content) {
|
|
138
138
|
var _options$scrollIntoVi2;
|
|
139
139
|
const tr = state.tr.replaceWith(0, state.doc.nodeSize - 2, content);
|
|
140
|
-
|
|
141
|
-
tr.setMeta('replaceDocument', true);
|
|
142
|
-
}
|
|
140
|
+
tr.setMeta('replaceDocument', true);
|
|
143
141
|
if ((options === null || options === void 0 ? void 0 : options.addToHistory) === false) {
|
|
144
142
|
tr.setMeta('addToHistory', false);
|
|
145
143
|
}
|
|
@@ -14,7 +14,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
|
|
|
14
14
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
15
15
|
import Layer from '../Layer';
|
|
16
16
|
const packageName = "@atlaskit/editor-common";
|
|
17
|
-
const packageVersion = "114.47.
|
|
17
|
+
const packageVersion = "114.47.1";
|
|
18
18
|
const halfFocusRing = 1;
|
|
19
19
|
const dropOffset = '0, 8';
|
|
20
20
|
const fadeIn = keyframes({
|
|
@@ -165,13 +165,13 @@ function marksEqualIgnoringOrder(m1, m2) {
|
|
|
165
165
|
* @param doc1 PMNode
|
|
166
166
|
* @param doc2 PMNode
|
|
167
167
|
* @param attributesToIgnore Specific array of attribute keys to ignore - defaults to ignoring all
|
|
168
|
-
* @param opts.ignoreMarkOrder If mark order should be ignored to still be equal (e.g. reversed annotation marks).
|
|
168
|
+
* @param opts.ignoreMarkOrder If mark order should be ignored to still be equal (e.g. reversed annotation marks). Defaults to true.
|
|
169
169
|
* @returns boolean
|
|
170
170
|
*/
|
|
171
171
|
|
|
172
172
|
export function areNodesEqualIgnoreAttrs(node1, node2, attributesToIgnore, opts) {
|
|
173
173
|
var _opts$ignoreMarkOrder;
|
|
174
|
-
const ignoreMarkOrder = (_opts$ignoreMarkOrder = opts === null || opts === void 0 ? void 0 : opts.ignoreMarkOrder) !== null && _opts$ignoreMarkOrder !== void 0 ? _opts$ignoreMarkOrder :
|
|
174
|
+
const ignoreMarkOrder = (_opts$ignoreMarkOrder = opts === null || opts === void 0 ? void 0 : opts.ignoreMarkOrder) !== null && _opts$ignoreMarkOrder !== void 0 ? _opts$ignoreMarkOrder : true;
|
|
175
175
|
if (node1.isText) {
|
|
176
176
|
if (ignoreMarkOrder) {
|
|
177
177
|
return node1.text === node2.text && marksEqualIgnoringOrder(node1.marks, node2.marks);
|
|
@@ -182,11 +182,7 @@ export function areNodesEqualIgnoreAttrs(node1, node2, attributesToIgnore, opts)
|
|
|
182
182
|
|
|
183
183
|
// If no attributes to ignore, compare all attributes
|
|
184
184
|
if (!attributesToIgnore || attributesToIgnore.length === 0) {
|
|
185
|
-
|
|
186
|
-
return node1 === node2 || node1.hasMarkup(node2.type, node1.attrs, node1.marks) && marksEqual && areFragmentsEqual(node1.content, node2.content, undefined, opts);
|
|
187
|
-
} else {
|
|
188
|
-
return node1 === node2 || node1.hasMarkup(node2.type, node1.attrs, node2.marks) && areFragmentsEqual(node1.content, node2.content);
|
|
189
|
-
}
|
|
185
|
+
return node1 === node2 || node1.hasMarkup(node2.type, node1.attrs, node1.marks) && marksEqual && areFragmentsEqual(node1.content, node2.content, undefined, opts);
|
|
190
186
|
}
|
|
191
187
|
|
|
192
188
|
// Build attrs to compare by excluding ignored attributes
|
|
@@ -199,11 +195,7 @@ export function areNodesEqualIgnoreAttrs(node1, node2, attributesToIgnore, opts)
|
|
|
199
195
|
attrsToCompare[key] = node1.attrs[key];
|
|
200
196
|
}
|
|
201
197
|
}
|
|
202
|
-
|
|
203
|
-
return node1 === node2 || node1.type === node2.type && node1.hasMarkup(node2.type, attrsToCompare, node1.marks) && marksEqual && areFragmentsEqual(node1.content, node2.content, attributesToIgnore, opts);
|
|
204
|
-
} else {
|
|
205
|
-
return node1 === node2 || node1.hasMarkup(node2.type, attrsToCompare, node2.marks) && areFragmentsEqual(node1.content, node2.content, attributesToIgnore);
|
|
206
|
-
}
|
|
198
|
+
return node1 === node2 || node1.type === node2.type && node1.hasMarkup(node2.type, attrsToCompare, node1.marks) && marksEqual && areFragmentsEqual(node1.content, node2.content, attributesToIgnore, opts);
|
|
207
199
|
}
|
|
208
200
|
function areFragmentsEqual(frag1, frag2, attributesToIgnore, opts) {
|
|
209
201
|
if (frag1.content.length !== frag2.content.length) {
|
|
@@ -12,32 +12,18 @@ const transformNestedTablesWithAnalytics = (node, dispatchAnalyticsEvent) => {
|
|
|
12
12
|
transformedAdf,
|
|
13
13
|
isTransformed
|
|
14
14
|
} = transformNestedTablesIncomingDocument(node);
|
|
15
|
-
if (
|
|
16
|
-
if (
|
|
17
|
-
if (dispatchAnalyticsEvent) {
|
|
18
|
-
dispatchAnalyticsEvent({
|
|
19
|
-
action: ACTION.NESTED_TABLE_TRANSFORMED,
|
|
20
|
-
actionSubject: ACTION_SUBJECT.EDITOR,
|
|
21
|
-
eventType: EVENT_TYPE.OPERATIONAL
|
|
22
|
-
});
|
|
23
|
-
}
|
|
24
|
-
return {
|
|
25
|
-
transformedAdf,
|
|
26
|
-
isTransformed
|
|
27
|
-
};
|
|
28
|
-
}
|
|
29
|
-
} else {
|
|
30
|
-
if (isTransformed && dispatchAnalyticsEvent) {
|
|
15
|
+
if (isTransformed) {
|
|
16
|
+
if (dispatchAnalyticsEvent) {
|
|
31
17
|
dispatchAnalyticsEvent({
|
|
32
18
|
action: ACTION.NESTED_TABLE_TRANSFORMED,
|
|
33
19
|
actionSubject: ACTION_SUBJECT.EDITOR,
|
|
34
20
|
eventType: EVENT_TYPE.OPERATIONAL
|
|
35
21
|
});
|
|
36
|
-
return {
|
|
37
|
-
transformedAdf,
|
|
38
|
-
isTransformed
|
|
39
|
-
};
|
|
40
22
|
}
|
|
23
|
+
return {
|
|
24
|
+
transformedAdf,
|
|
25
|
+
isTransformed
|
|
26
|
+
};
|
|
41
27
|
}
|
|
42
28
|
} catch (e) {
|
|
43
29
|
// eslint-disable-next-line no-console
|
|
@@ -10,7 +10,7 @@ import { isFedRamp } from './environment';
|
|
|
10
10
|
import { normaliseSentryBreadcrumbs, SERIALIZABLE_ATTRIBUTES } from './normalise-sentry-breadcrumbs';
|
|
11
11
|
var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
12
12
|
var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
13
|
-
var packageVersion = "114.47.
|
|
13
|
+
var packageVersion = "114.47.1";
|
|
14
14
|
var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
|
|
15
15
|
// Remove URL as it has UGC
|
|
16
16
|
// Ignored via go/ees007
|
|
@@ -132,9 +132,7 @@ export var corePlugin = function corePlugin(_ref) {
|
|
|
132
132
|
if (content) {
|
|
133
133
|
var _options$scrollIntoVi2;
|
|
134
134
|
var tr = state.tr.replaceWith(0, state.doc.nodeSize - 2, content);
|
|
135
|
-
|
|
136
|
-
tr.setMeta('replaceDocument', true);
|
|
137
|
-
}
|
|
135
|
+
tr.setMeta('replaceDocument', true);
|
|
138
136
|
if ((options === null || options === void 0 ? void 0 : options.addToHistory) === false) {
|
|
139
137
|
tr.setMeta('addToHistory', false);
|
|
140
138
|
}
|
|
@@ -21,7 +21,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
|
|
|
21
21
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
22
22
|
import Layer from '../Layer';
|
|
23
23
|
var packageName = "@atlaskit/editor-common";
|
|
24
|
-
var packageVersion = "114.47.
|
|
24
|
+
var packageVersion = "114.47.1";
|
|
25
25
|
var halfFocusRing = 1;
|
|
26
26
|
var dropOffset = '0, 8';
|
|
27
27
|
var fadeIn = keyframes({
|
|
@@ -189,13 +189,13 @@ function marksEqualIgnoringOrder(m1, m2) {
|
|
|
189
189
|
* @param doc1 PMNode
|
|
190
190
|
* @param doc2 PMNode
|
|
191
191
|
* @param attributesToIgnore Specific array of attribute keys to ignore - defaults to ignoring all
|
|
192
|
-
* @param opts.ignoreMarkOrder If mark order should be ignored to still be equal (e.g. reversed annotation marks).
|
|
192
|
+
* @param opts.ignoreMarkOrder If mark order should be ignored to still be equal (e.g. reversed annotation marks). Defaults to true.
|
|
193
193
|
* @returns boolean
|
|
194
194
|
*/
|
|
195
195
|
|
|
196
196
|
export function areNodesEqualIgnoreAttrs(node1, node2, attributesToIgnore, opts) {
|
|
197
197
|
var _opts$ignoreMarkOrder;
|
|
198
|
-
var ignoreMarkOrder = (_opts$ignoreMarkOrder = opts === null || opts === void 0 ? void 0 : opts.ignoreMarkOrder) !== null && _opts$ignoreMarkOrder !== void 0 ? _opts$ignoreMarkOrder :
|
|
198
|
+
var ignoreMarkOrder = (_opts$ignoreMarkOrder = opts === null || opts === void 0 ? void 0 : opts.ignoreMarkOrder) !== null && _opts$ignoreMarkOrder !== void 0 ? _opts$ignoreMarkOrder : true;
|
|
199
199
|
if (node1.isText) {
|
|
200
200
|
if (ignoreMarkOrder) {
|
|
201
201
|
return node1.text === node2.text && marksEqualIgnoringOrder(node1.marks, node2.marks);
|
|
@@ -206,11 +206,7 @@ export function areNodesEqualIgnoreAttrs(node1, node2, attributesToIgnore, opts)
|
|
|
206
206
|
|
|
207
207
|
// If no attributes to ignore, compare all attributes
|
|
208
208
|
if (!attributesToIgnore || attributesToIgnore.length === 0) {
|
|
209
|
-
|
|
210
|
-
return node1 === node2 || node1.hasMarkup(node2.type, node1.attrs, node1.marks) && marksEqual && areFragmentsEqual(node1.content, node2.content, undefined, opts);
|
|
211
|
-
} else {
|
|
212
|
-
return node1 === node2 || node1.hasMarkup(node2.type, node1.attrs, node2.marks) && areFragmentsEqual(node1.content, node2.content);
|
|
213
|
-
}
|
|
209
|
+
return node1 === node2 || node1.hasMarkup(node2.type, node1.attrs, node1.marks) && marksEqual && areFragmentsEqual(node1.content, node2.content, undefined, opts);
|
|
214
210
|
}
|
|
215
211
|
|
|
216
212
|
// Build attrs to compare by excluding ignored attributes
|
|
@@ -221,11 +217,7 @@ export function areNodesEqualIgnoreAttrs(node1, node2, attributesToIgnore, opts)
|
|
|
221
217
|
attrsToCompare[key] = node1.attrs[key];
|
|
222
218
|
}
|
|
223
219
|
}
|
|
224
|
-
|
|
225
|
-
return node1 === node2 || node1.type === node2.type && node1.hasMarkup(node2.type, attrsToCompare, node1.marks) && marksEqual && areFragmentsEqual(node1.content, node2.content, attributesToIgnore, opts);
|
|
226
|
-
} else {
|
|
227
|
-
return node1 === node2 || node1.hasMarkup(node2.type, attrsToCompare, node2.marks) && areFragmentsEqual(node1.content, node2.content, attributesToIgnore);
|
|
228
|
-
}
|
|
220
|
+
return node1 === node2 || node1.type === node2.type && node1.hasMarkup(node2.type, attrsToCompare, node1.marks) && marksEqual && areFragmentsEqual(node1.content, node2.content, attributesToIgnore, opts);
|
|
229
221
|
}
|
|
230
222
|
function areFragmentsEqual(frag1, frag2, attributesToIgnore, opts) {
|
|
231
223
|
if (frag1.content.length !== frag2.content.length) {
|
|
@@ -11,32 +11,18 @@ var transformNestedTablesWithAnalytics = function transformNestedTablesWithAnaly
|
|
|
11
11
|
var _transformNestedTable = transformNestedTablesIncomingDocument(node),
|
|
12
12
|
transformedAdf = _transformNestedTable.transformedAdf,
|
|
13
13
|
isTransformed = _transformNestedTable.isTransformed;
|
|
14
|
-
if (
|
|
15
|
-
if (
|
|
16
|
-
if (dispatchAnalyticsEvent) {
|
|
17
|
-
dispatchAnalyticsEvent({
|
|
18
|
-
action: ACTION.NESTED_TABLE_TRANSFORMED,
|
|
19
|
-
actionSubject: ACTION_SUBJECT.EDITOR,
|
|
20
|
-
eventType: EVENT_TYPE.OPERATIONAL
|
|
21
|
-
});
|
|
22
|
-
}
|
|
23
|
-
return {
|
|
24
|
-
transformedAdf: transformedAdf,
|
|
25
|
-
isTransformed: isTransformed
|
|
26
|
-
};
|
|
27
|
-
}
|
|
28
|
-
} else {
|
|
29
|
-
if (isTransformed && dispatchAnalyticsEvent) {
|
|
14
|
+
if (isTransformed) {
|
|
15
|
+
if (dispatchAnalyticsEvent) {
|
|
30
16
|
dispatchAnalyticsEvent({
|
|
31
17
|
action: ACTION.NESTED_TABLE_TRANSFORMED,
|
|
32
18
|
actionSubject: ACTION_SUBJECT.EDITOR,
|
|
33
19
|
eventType: EVENT_TYPE.OPERATIONAL
|
|
34
20
|
});
|
|
35
|
-
return {
|
|
36
|
-
transformedAdf: transformedAdf,
|
|
37
|
-
isTransformed: isTransformed
|
|
38
|
-
};
|
|
39
21
|
}
|
|
22
|
+
return {
|
|
23
|
+
transformedAdf: transformedAdf,
|
|
24
|
+
isTransformed: isTransformed
|
|
25
|
+
};
|
|
40
26
|
}
|
|
41
27
|
} catch (e) {
|
|
42
28
|
// eslint-disable-next-line no-console
|
|
@@ -31,7 +31,7 @@ export declare const isReplaceDocOperation: (transactions: readonly Transaction[
|
|
|
31
31
|
* @param doc1 PMNode
|
|
32
32
|
* @param doc2 PMNode
|
|
33
33
|
* @param attributesToIgnore Specific array of attribute keys to ignore - defaults to ignoring all
|
|
34
|
-
* @param opts.ignoreMarkOrder If mark order should be ignored to still be equal (e.g. reversed annotation marks).
|
|
34
|
+
* @param opts.ignoreMarkOrder If mark order should be ignored to still be equal (e.g. reversed annotation marks). Defaults to true.
|
|
35
35
|
* @returns boolean
|
|
36
36
|
*/
|
|
37
37
|
export declare function areNodesEqualIgnoreAttrs(node1: Node, node2: Node, attributesToIgnore?: string[], opts?: {
|
|
@@ -31,7 +31,7 @@ export declare const isReplaceDocOperation: (transactions: readonly Transaction[
|
|
|
31
31
|
* @param doc1 PMNode
|
|
32
32
|
* @param doc2 PMNode
|
|
33
33
|
* @param attributesToIgnore Specific array of attribute keys to ignore - defaults to ignoring all
|
|
34
|
-
* @param opts.ignoreMarkOrder If mark order should be ignored to still be equal (e.g. reversed annotation marks).
|
|
34
|
+
* @param opts.ignoreMarkOrder If mark order should be ignored to still be equal (e.g. reversed annotation marks). Defaults to true.
|
|
35
35
|
* @returns boolean
|
|
36
36
|
*/
|
|
37
37
|
export declare function areNodesEqualIgnoreAttrs(node1: Node, node2: Node, attributesToIgnore?: string[], opts?: {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-common",
|
|
3
|
-
"version": "114.47.
|
|
3
|
+
"version": "114.47.2",
|
|
4
4
|
"description": "A package that contains common classes and components for editor and renderer",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
"@atlaskit/editor-toolbar": "^1.7.0",
|
|
59
59
|
"@atlaskit/editor-toolbar-model": "^0.5.0",
|
|
60
60
|
"@atlaskit/emoji": "^70.10.0",
|
|
61
|
-
"@atlaskit/icon": "^35.
|
|
61
|
+
"@atlaskit/icon": "^35.3.0",
|
|
62
62
|
"@atlaskit/link": "^3.4.0",
|
|
63
63
|
"@atlaskit/link-datasource": "^5.4.0",
|
|
64
64
|
"@atlaskit/link-picker": "^5.2.0",
|
|
@@ -87,7 +87,7 @@
|
|
|
87
87
|
"@atlaskit/task-decision": "^20.1.0",
|
|
88
88
|
"@atlaskit/teams-app-config": "^1.12.0",
|
|
89
89
|
"@atlaskit/textfield": "^8.3.0",
|
|
90
|
-
"@atlaskit/tmp-editor-statsig": "^
|
|
90
|
+
"@atlaskit/tmp-editor-statsig": "^84.0.0",
|
|
91
91
|
"@atlaskit/tokens": "^13.0.0",
|
|
92
92
|
"@atlaskit/tooltip": "^22.3.0",
|
|
93
93
|
"@atlaskit/width-detector": "^5.1.0",
|
|
@@ -219,9 +219,6 @@
|
|
|
219
219
|
"p2m-drop-down-motion": {
|
|
220
220
|
"type": "boolean"
|
|
221
221
|
},
|
|
222
|
-
"platform_editor_show_diff_scroll_navigation": {
|
|
223
|
-
"type": "boolean"
|
|
224
|
-
},
|
|
225
222
|
"platform_editor_content_mode_button_mvp": {
|
|
226
223
|
"type": "boolean"
|
|
227
224
|
},
|