@atlaskit/adf-schema 36.9.1 → 36.10.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 36.10.0
+
+### Minor Changes
+
+- 4cdf270: [ED-23332] Exclude other `color` group marks from the `backgroundColor` mark
+
+## 36.9.2
+
+### Patch Changes
+
+- 6e9e5d6: migrated uuid function to use uuid npm package instead of custom random logic
+
 ## 36.9.1
 
 ### Patch Changes

package/dist/cjs/schema/marks/background-color.js

@@ -43,6 +43,7 @@ var backgroundColor = exports.backgroundColor = {
   },
   inclusive: true,
   group: _groups.COLOR,
+  excludes: "".concat(_groups.COLOR),
   parseDOM: [{
     style: 'background-color',
     getAttrs: function getAttrs(maybeValue) {

package/dist/cjs/utils/uuid.js

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.uuid = exports.generateUuid = void 0;
-/* eslint-disable no-bitwise */
+var _uuid = require("uuid");
 var generateUuid = exports.generateUuid = function generateUuid() {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-    var r = Math.random() * 16 | 0;
-    return (c === 'x' ? r : r & 0x3 | 0x8).toString(16);
-  });
+  return (0, _uuid.v4)();
 };
-/* eslint-enable no-bitwise */
-
 var staticValue = false;
 var uuid = exports.uuid = {
   setStatic: function setStatic(value) {

package/dist/es2019/schema/marks/background-color.js

@@ -30,6 +30,7 @@ export const backgroundColor = {
   },
   inclusive: true,
   group: COLOR,
+  excludes: `${COLOR}`,
   parseDOM: [{
     style: 'background-color',
     getAttrs: maybeValue => {

package/dist/es2019/utils/uuid.js

@@ -1,10 +1,7 @@
-/* eslint-disable no-bitwise */
-export const generateUuid = () => 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
-  const r = Math.random() * 16 | 0;
-  return (c === 'x' ? r : r & 0x3 | 0x8).toString(16);
-});
-/* eslint-enable no-bitwise */
-
+import { v4 as uuidGen } from 'uuid';
+export const generateUuid = () => {
+  return uuidGen();
+};
 let staticValue = false;
 export const uuid = {
   setStatic(value) {

package/dist/esm/schema/marks/background-color.js

@@ -37,6 +37,7 @@ export var backgroundColor = {
   },
   inclusive: true,
   group: COLOR,
+  excludes: "".concat(COLOR),
   parseDOM: [{
     style: 'background-color',
     getAttrs: function getAttrs(maybeValue) {

package/dist/esm/utils/uuid.js

@@ -1,12 +1,7 @@
-/* eslint-disable no-bitwise */
+import { v4 as uuidGen } from 'uuid';
 export var generateUuid = function generateUuid() {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-    var r = Math.random() * 16 | 0;
-    return (c === 'x' ? r : r & 0x3 | 0x8).toString(16);
-  });
+  return uuidGen();
 };
-/* eslint-enable no-bitwise */
-
 var staticValue = false;
 export var uuid = {
   setStatic: function setStatic(value) {

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

@@ -1,5 +1,5 @@
-export declare const generateUuid: () => string;
+export declare const generateUuid: () => any;
 export declare const uuid: {
     setStatic(value: string | false): void;
-    generate(): string;
+    generate(): any;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "36.9.1",
+  "version": "36.10.0",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -40,7 +40,8 @@
     "@babel/runtime": "^7.0.0",
     "css-color-names": "0.0.4",
     "linkify-it": "^2.0.3",
-    "memoize-one": "^6.0.0"
+    "memoize-one": "^6.0.0",
+    "uuid": "^9.0.1"
   },
   "devDependencies": {
     "@atlassian/adf-schema-json": "^1.15.0",