@atlaskit/adf-schema 24.0.1 → 24.0.3

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/adf-schema
 
+## 24.0.3
+
+### Patch Changes
+
+- [`c2510fa261f`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c2510fa261f) - [ux] ED-15961 [ux] Updates the presentation of text color to use dark and light mode colors when those modes are enabled
+- Updated dependencies
+
+## 24.0.2
+
+### Patch Changes
+
+- [`b86981a0cf0`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b86981a0cf0) - [ux] ED-15426 fix broken copy paste of block card. Add content to schema toDOM.
+- Updated dependencies
+
 ## 24.0.1
 
 ### Patch Changes

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

@@ -11,6 +11,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
+var _editorPalette = require("@atlaskit/editor-palette");
+
 var _groups = require("../groups");
 
 var _colors = require("../../utils/colors");
@@ -85,7 +87,15 @@ var textColor = {
         color: hexColor
       } : false;
     }
-  }, {
+  }, // This rule ensures when loading from a renderer or editor where the
+  // presented text color does not match the stored hex color -- that the
+  // text color is preserved.
+  //
+  // This was initially introduced to ensure text-color marks were not lost
+  // when text-color was used inside a link, and is now also used to support
+  // where the hex color stored in ADF is used as an ID for a design system
+  // token (and based on theme mode -- the presented color will change).
+  {
     tag: '.fabric-text-color-mark',
     getAttrs: function getAttrs(maybeElement) {
       if (!(maybeElement instanceof HTMLElement)) {
@@ -99,9 +109,13 @@ var textColor = {
     }
   }],
   toDOM: function toDOM(mark) {
+    // Note -- while there is no way to create custom colors using default tooling
+    // the editor does supported ad hoc color values -- and there may be content
+    // which has been migrated or created via apis which use such values.
+    var paletteColorValue = (0, _editorPalette.hexToEditorTextPaletteColor)(mark.attrs.color) || mark.attrs.color;
     return ['span', (0, _defineProperty2.default)({
       class: 'fabric-text-color-mark',
-      style: "--custom-text-color: ".concat(mark.attrs.color)
+      style: "--custom-palette-color: ".concat(paletteColorValue)
     }, 'data-text-custom-color', mark.attrs.color)];
   }
 };

package/dist/cjs/schema/nodes/block-card.js

@@ -45,12 +45,14 @@ var blockCard = {
     }
   }],
   toDOM: function toDOM(node) {
+    var _node$attrs;
+
     var attrs = {
       'data-block-card': '',
       href: node.attrs.url || '',
       'data-card-data': node.attrs.data ? JSON.stringify(node.attrs.data) : ''
     };
-    return ['a', attrs];
+    return ['a', attrs, (node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.url) || ' '];
   }
 };
 exports.blockCard = blockCard;

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "24.0.1",
+	"version": "24.0.3",
 	"sideEffects": false
 }

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

@@ -1,3 +1,4 @@
+import { hexToEditorTextPaletteColor } from '@atlaskit/editor-palette';
 import { COLOR } from '../groups';
 import { rgbToHex, N0, N80, P50, P300, P500, T75, T300, T500, G75, G300, G500, R75, R300, R500, Y75, Y200, Y400, B75, B100, B500 } from '../../utils/colors';
 const colorArrayPalette = [// default row
@@ -56,7 +57,15 @@ export const textColor = {
         color: hexColor
       } : false;
     }
-  }, {
+  }, // This rule ensures when loading from a renderer or editor where the
+  // presented text color does not match the stored hex color -- that the
+  // text color is preserved.
+  //
+  // This was initially introduced to ensure text-color marks were not lost
+  // when text-color was used inside a link, and is now also used to support
+  // where the hex color stored in ADF is used as an ID for a design system
+  // token (and based on theme mode -- the presented color will change).
+  {
     tag: '.fabric-text-color-mark',
     getAttrs: maybeElement => {
       if (!(maybeElement instanceof HTMLElement)) {
@@ -71,9 +80,13 @@ export const textColor = {
   }],
 
   toDOM(mark) {
+    // Note -- while there is no way to create custom colors using default tooling
+    // the editor does supported ad hoc color values -- and there may be content
+    // which has been migrated or created via apis which use such values.
+    const paletteColorValue = hexToEditorTextPaletteColor(mark.attrs.color) || mark.attrs.color;
     return ['span', {
       class: 'fabric-text-color-mark',
-      style: `--custom-text-color: ${mark.attrs.color}`,
+      style: `--custom-palette-color: ${paletteColorValue}`,
       ['data-text-custom-color']: mark.attrs.color
     }];
   }

package/dist/es2019/schema/nodes/block-card.js

@@ -39,12 +39,14 @@ export const blockCard = {
   }],
 
   toDOM(node) {
+    var _node$attrs;
+
     const attrs = {
       'data-block-card': '',
       href: node.attrs.url || '',
       'data-card-data': node.attrs.data ? JSON.stringify(node.attrs.data) : ''
     };
-    return ['a', attrs];
+    return ['a', attrs, (node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.url) || ' '];
   }
 
 };

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "24.0.1",
+	"version": "24.0.3",
 	"sideEffects": false
 }

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

@@ -1,5 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import { hexToEditorTextPaletteColor } from '@atlaskit/editor-palette';
 import { COLOR } from '../groups';
 import { rgbToHex, N0, N80, P50, P300, P500, T75, T300, T500, G75, G300, G500, R75, R300, R500, Y75, Y200, Y400, B75, B100, B500 } from '../../utils/colors';
 var colorArrayPalette = [// default row
@@ -70,7 +71,15 @@ export var textColor = {
         color: hexColor
       } : false;
     }
-  }, {
+  }, // This rule ensures when loading from a renderer or editor where the
+  // presented text color does not match the stored hex color -- that the
+  // text color is preserved.
+  //
+  // This was initially introduced to ensure text-color marks were not lost
+  // when text-color was used inside a link, and is now also used to support
+  // where the hex color stored in ADF is used as an ID for a design system
+  // token (and based on theme mode -- the presented color will change).
+  {
     tag: '.fabric-text-color-mark',
     getAttrs: function getAttrs(maybeElement) {
       if (!(maybeElement instanceof HTMLElement)) {
@@ -84,9 +93,13 @@ export var textColor = {
     }
   }],
   toDOM: function toDOM(mark) {
+    // Note -- while there is no way to create custom colors using default tooling
+    // the editor does supported ad hoc color values -- and there may be content
+    // which has been migrated or created via apis which use such values.
+    var paletteColorValue = hexToEditorTextPaletteColor(mark.attrs.color) || mark.attrs.color;
     return ['span', _defineProperty({
       class: 'fabric-text-color-mark',
-      style: "--custom-text-color: ".concat(mark.attrs.color)
+      style: "--custom-palette-color: ".concat(paletteColorValue)
     }, 'data-text-custom-color', mark.attrs.color)];
   }
 };

package/dist/esm/schema/nodes/block-card.js

@@ -38,11 +38,13 @@ export var blockCard = {
     }
   }],
   toDOM: function toDOM(node) {
+    var _node$attrs;
+
     var attrs = {
       'data-block-card': '',
       href: node.attrs.url || '',
       'data-card-data': node.attrs.data ? JSON.stringify(node.attrs.data) : ''
     };
-    return ['a', attrs];
+    return ['a', attrs, (node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.url) || ' '];
   }
 };

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "24.0.1",
+	"version": "24.0.3",
 	"sideEffects": false
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "24.0.1",
+  "version": "24.0.3",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -12,13 +12,6 @@
   "module": "dist/esm/index.js",
   "module:es2019": "dist/es2019/index.js",
   "types": "dist/types/index.d.ts",
-  "typesVersions": {
-    ">=4.0 <4.5": {
-      "*": [
-        "dist/types-ts4.0/*"
-      ]
-    }
-  },
   "sideEffects": false,
   "atlaskit:src": "src/index.ts",
   "atlassian": {
@@ -46,7 +39,8 @@
   },
   "dependencies": {
     "@atlaskit/codemod-utils": "^4.1.0",
-    "@atlaskit/editor-tables": "^2.1.0",
+    "@atlaskit/editor-palette": "0.1.0",
+    "@atlaskit/editor-tables": "^2.2.0",
     "@babel/runtime": "^7.0.0",
     "@types/linkify-it": "^2.0.4",
     "@types/prosemirror-model": "^1.11.0",
@@ -61,7 +55,7 @@
     "@atlaskit/adf-utils": "^17.1.0",
     "@atlaskit/editor-json-transformer": "^8.8.0",
     "@atlaskit/editor-test-helpers": "^17.2.0",
-    "@atlaskit/json-schema-generator": "^3.2.0",
+    "@atlaskit/json-schema-generator": "^3.3.0",
     "@atlassian/adf-sample": "^1.1.0",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
     "@types/prosemirror-history": "^1.0.1",
@@ -79,7 +73,10 @@
       ]
     },
     "@repo/internal": {
-      "deprecation": "no-deprecated-imports"
+      "deprecation": "no-deprecated-imports",
+      "styling": [
+        "emotion"
+      ]
     }
   },
   "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.1"