@atlaskit/editor-core 202.3.4 → 202.4.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-core
 
+## 202.4.0
+
+### Minor Changes
+
+- [#165765](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/165765)
+  [`3f441f30e6507`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3f441f30e6507) -
+  Bump adf-schema to 46.0.0
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 202.3.4
 
 ### Patch Changes

package/dist/cjs/create-editor/create-schema.js

@@ -8,10 +8,10 @@ exports.addMetadataAttributes = void 0;
 exports.createSchema = createSchema;
 exports.wrapToDOMProxy = exports.wrapNodeSpecProxy = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _schema = require("@atlaskit/adf-schema/schema");
 var _prosemirrorDomMetadata = require("@atlaskit/editor-common/prosemirror-dom-metadata");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _sanitizeNodes = require("../utils/sanitizeNodes");
 var _createEditor = require("./create-editor");
 var _sortByOrder = require("./sort-by-order");
 /**
@@ -103,7 +103,7 @@ function createSchema(editorConfig) {
     }
     return acc;
   }, {}));
-  var nodes = (0, _sanitizeNodes.sanitizeNodes)(editorConfig.nodes.sort((0, _sortByOrder.sortByOrder)('nodes')).reduce(function (acc, node) {
+  var nodes = (0, _schema.sanitizeNodes)(editorConfig.nodes.sort((0, _sortByOrder.sortByOrder)('nodes')).reduce(function (acc, node) {
     if ((0, _platformFeatureFlags.fg)('platform_editor_breakout_use_css')) {
       acc[node.name] = wrapNodeSpecProxy(node.node);
     } else {

package/dist/cjs/version-wrapper.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "202.3.4";
+var version = exports.version = "202.4.0";

package/dist/es2019/create-editor/create-schema.js

@@ -1,7 +1,7 @@
+import { sanitizeNodes } from '@atlaskit/adf-schema/schema';
 import { createProseMirrorMetadata } from '@atlaskit/editor-common/prosemirror-dom-metadata';
 import { Schema } from '@atlaskit/editor-prosemirror/model';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { sanitizeNodes } from '../utils/sanitizeNodes';
 import { fixExcludes } from './create-editor';
 import { sortByOrder } from './sort-by-order';
 /**

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "202.3.4";
+export const version = "202.4.0";

package/dist/esm/create-editor/create-schema.js

@@ -1,8 +1,8 @@
 import _typeof from "@babel/runtime/helpers/typeof";
+import { sanitizeNodes } from '@atlaskit/adf-schema/schema';
 import { createProseMirrorMetadata } from '@atlaskit/editor-common/prosemirror-dom-metadata';
 import { Schema } from '@atlaskit/editor-prosemirror/model';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { sanitizeNodes } from '../utils/sanitizeNodes';
 import { fixExcludes } from './create-editor';
 import { sortByOrder } from './sort-by-order';
 /**

package/dist/esm/version-wrapper.js

@@ -1,2 +1,2 @@
 export var name = "@atlaskit/editor-core";
-export var version = "202.3.4";
+export var version = "202.4.0";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "202.3.4",
+	"version": "202.4.0",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -38,12 +38,12 @@
 	},
 	"dependencies": {
 		"@atlaskit/activity-provider": "^2.5.0",
-		"@atlaskit/adf-schema": "^44.2.0",
+		"@atlaskit/adf-schema": "^46.1.0",
 		"@atlaskit/analytics-namespaced-context": "^6.12.0",
 		"@atlaskit/analytics-next": "^10.1.0",
 		"@atlaskit/analytics-next-stable-react-context": "1.0.1",
 		"@atlaskit/button": "^20.3.0",
-		"@atlaskit/editor-common": "^95.6.0",
+		"@atlaskit/editor-common": "^95.7.0",
 		"@atlaskit/editor-json-transformer": "^8.21.0",
 		"@atlaskit/editor-plugin-quick-insert": "1.7.1",
 		"@atlaskit/editor-plugins": "^5.7.0",
@@ -83,8 +83,8 @@
 		"@af/visual-regression": "*",
 		"@atlaskit/adf-utils": "^19.13.0",
 		"@atlaskit/analytics-listeners": "^8.13.0",
-		"@atlaskit/collab-provider": "10.1.2",
-		"@atlaskit/editor-plugin-annotation": "1.25.2",
+		"@atlaskit/collab-provider": "10.1.3",
+		"@atlaskit/editor-plugin-annotation": "1.25.3",
 		"@atlaskit/editor-plugin-card": "^4.4.0",
 		"@atlaskit/editor-plugin-list": "^3.9.0",
 		"@atlaskit/editor-plugin-paste": "^2.0.0",
@@ -356,6 +356,10 @@
 		"platform_inline_node_as_valid_annotation_selection": {
 			"type": "boolean",
 			"referenceOnly": true
+		},
+		"platform_editor_hide_external_media_badge": {
+			"type": "boolean",
+			"referenceOnly": true
 		}
 	},
 	"stricter": {

package/dist/cjs/utils/sanitizeNodes.js

@@ -1,63 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.sanitizeNodes = sanitizeNodes;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-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; }
-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) { (0, _defineProperty2.default)(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; }
-function sanitizeNodes(nodes, supportedMarks) {
-  var nodeNames = Object.keys(nodes);
-  nodeNames.forEach(function (nodeKey) {
-    var nodeSpec = _objectSpread({}, nodes[nodeKey]);
-    if (nodeSpec.marks && nodeSpec.marks !== '_') {
-      nodeSpec.marks = nodeSpec.marks.split(' ').filter(function (mark) {
-        return !!supportedMarks[mark];
-      }).join(' ');
-    }
-    if (nodeSpec.content) {
-      nodeSpec.content = sanitizeNodeSpecContent(nodes, nodeSpec.content);
-    }
-    nodes[nodeKey] = nodeSpec;
-  });
-  return nodes;
-}
-function sanitizeNodeSpecContent(nodes, rawContent) {
-  var content = rawContent.replace(/\W/g, ' ');
-  var contentKeys = content.split(' ');
-  var unsupportedContentKeys = contentKeys.filter(function (contentKey) {
-    return !isContentSupported(nodes, contentKey);
-  });
-  return unsupportedContentKeys.reduce(function (newContent, nodeName) {
-    return sanitizedContent(newContent, nodeName);
-  }, rawContent);
-}
-function sanitizedContent(content, invalidContent) {
-  if (!invalidContent.length) {
-    return content || '';
-  }
-  if (!content || !content.match(/\w/)) {
-    return '';
-  }
-  var pattern = "(".concat(invalidContent, "((\\s)*\\|)+)|((\\|(\\s)*)+").concat(invalidContent, ")|(").concat(invalidContent, "$)|(").concat(invalidContent, "(\\+|\\*))");
-  return content.replace(new RegExp(pattern, 'g'), '').replace('  ', ' ').trim();
-}
-function isContentSupported(nodes, contentKey) {
-  var nodeKeys = Object.keys(nodes);
-
-  // content is with valid node
-  if (nodeKeys.indexOf(contentKey) > -1) {
-    return true;
-  }
-
-  // content is with valid group
-  for (var supportedKey in nodes) {
-    var nodeSpec = nodes[supportedKey];
-    if (nodeSpec && nodeSpec.group === contentKey) {
-      return true;
-    }
-  }
-  return false;
-}

package/dist/es2019/utils/sanitizeNodes.js

@@ -1,49 +0,0 @@
-export function sanitizeNodes(nodes, supportedMarks) {
-  const nodeNames = Object.keys(nodes);
-  nodeNames.forEach(nodeKey => {
-    const nodeSpec = {
-      ...nodes[nodeKey]
-    };
-    if (nodeSpec.marks && nodeSpec.marks !== '_') {
-      nodeSpec.marks = nodeSpec.marks.split(' ').filter(mark => !!supportedMarks[mark]).join(' ');
-    }
-    if (nodeSpec.content) {
-      nodeSpec.content = sanitizeNodeSpecContent(nodes, nodeSpec.content);
-    }
-    nodes[nodeKey] = nodeSpec;
-  });
-  return nodes;
-}
-function sanitizeNodeSpecContent(nodes, rawContent) {
-  const content = rawContent.replace(/\W/g, ' ');
-  const contentKeys = content.split(' ');
-  const unsupportedContentKeys = contentKeys.filter(contentKey => !isContentSupported(nodes, contentKey));
-  return unsupportedContentKeys.reduce((newContent, nodeName) => sanitizedContent(newContent, nodeName), rawContent);
-}
-function sanitizedContent(content, invalidContent) {
-  if (!invalidContent.length) {
-    return content || '';
-  }
-  if (!content || !content.match(/\w/)) {
-    return '';
-  }
-  const pattern = `(${invalidContent}((\\s)*\\|)+)|((\\|(\\s)*)+${invalidContent})|(${invalidContent}$)|(${invalidContent}(\\+|\\*))`;
-  return content.replace(new RegExp(pattern, 'g'), '').replace('  ', ' ').trim();
-}
-function isContentSupported(nodes, contentKey) {
-  const nodeKeys = Object.keys(nodes);
-
-  // content is with valid node
-  if (nodeKeys.indexOf(contentKey) > -1) {
-    return true;
-  }
-
-  // content is with valid group
-  for (const supportedKey in nodes) {
-    const nodeSpec = nodes[supportedKey];
-    if (nodeSpec && nodeSpec.group === contentKey) {
-      return true;
-    }
-  }
-  return false;
-}

package/dist/esm/utils/sanitizeNodes.js

@@ -1,56 +0,0 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-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; }
-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; }
-export function sanitizeNodes(nodes, supportedMarks) {
-  var nodeNames = Object.keys(nodes);
-  nodeNames.forEach(function (nodeKey) {
-    var nodeSpec = _objectSpread({}, nodes[nodeKey]);
-    if (nodeSpec.marks && nodeSpec.marks !== '_') {
-      nodeSpec.marks = nodeSpec.marks.split(' ').filter(function (mark) {
-        return !!supportedMarks[mark];
-      }).join(' ');
-    }
-    if (nodeSpec.content) {
-      nodeSpec.content = sanitizeNodeSpecContent(nodes, nodeSpec.content);
-    }
-    nodes[nodeKey] = nodeSpec;
-  });
-  return nodes;
-}
-function sanitizeNodeSpecContent(nodes, rawContent) {
-  var content = rawContent.replace(/\W/g, ' ');
-  var contentKeys = content.split(' ');
-  var unsupportedContentKeys = contentKeys.filter(function (contentKey) {
-    return !isContentSupported(nodes, contentKey);
-  });
-  return unsupportedContentKeys.reduce(function (newContent, nodeName) {
-    return sanitizedContent(newContent, nodeName);
-  }, rawContent);
-}
-function sanitizedContent(content, invalidContent) {
-  if (!invalidContent.length) {
-    return content || '';
-  }
-  if (!content || !content.match(/\w/)) {
-    return '';
-  }
-  var pattern = "(".concat(invalidContent, "((\\s)*\\|)+)|((\\|(\\s)*)+").concat(invalidContent, ")|(").concat(invalidContent, "$)|(").concat(invalidContent, "(\\+|\\*))");
-  return content.replace(new RegExp(pattern, 'g'), '').replace('  ', ' ').trim();
-}
-function isContentSupported(nodes, contentKey) {
-  var nodeKeys = Object.keys(nodes);
-
-  // content is with valid node
-  if (nodeKeys.indexOf(contentKey) > -1) {
-    return true;
-  }
-
-  // content is with valid group
-  for (var supportedKey in nodes) {
-    var nodeSpec = nodes[supportedKey];
-    if (nodeSpec && nodeSpec.group === contentKey) {
-      return true;
-    }
-  }
-  return false;
-}

package/dist/types/utils/sanitizeNodes.d.ts

@@ -1,8 +0,0 @@
-import type { MarkSpec, NodeSpec } from '@atlaskit/editor-prosemirror/model';
-export declare function sanitizeNodes(nodes: {
-    [key: string]: NodeSpec;
-}, supportedMarks: {
-    [key: string]: MarkSpec;
-}): {
-    [key: string]: NodeSpec;
-};

package/dist/types-ts4.5/utils/sanitizeNodes.d.ts

@@ -1,8 +0,0 @@
-import type { MarkSpec, NodeSpec } from '@atlaskit/editor-prosemirror/model';
-export declare function sanitizeNodes(nodes: {
-    [key: string]: NodeSpec;
-}, supportedMarks: {
-    [key: string]: MarkSpec;
-}): {
-    [key: string]: NodeSpec;
-};