@atlaskit/adf-schema 33.1.2 → 33.2.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 33.2.0
+
+### Minor Changes
+
+- e958e89: ED-20043: Adding Multi-bodied Extension to enable Nested Bodied Macros (NBM)
+
+## 33.1.3
+
+### Patch Changes
+
+- 6ac028f: [ux] ED-20700 Clean up color inversion feature flag
+
 ## 33.1.2
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -531,6 +531,12 @@ Object.defineProperty(exports, "extension", {
     return _schema.extension;
   }
 });
+Object.defineProperty(exports, "extensionFrame", {
+  enumerable: true,
+  get: function get() {
+    return _schema.extensionFrame;
+  }
+});
 Object.defineProperty(exports, "fragment", {
   enumerable: true,
   get: function get() {
@@ -759,6 +765,12 @@ Object.defineProperty(exports, "mentionToJSON", {
     return _schema.mentionToJSON;
   }
 });
+Object.defineProperty(exports, "multiBodiedExtension", {
+  enumerable: true,
+  get: function get() {
+    return _schema.multiBodiedExtension;
+  }
+});
 Object.defineProperty(exports, "nestedExpand", {
   enumerable: true,
   get: function get() {

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

@@ -187,6 +187,12 @@ var nodesInOrder = [{
 }, {
   name: 'bodiedExtension',
   spec: _nodes.bodiedExtension
+}, {
+  name: 'multiBodiedExtension',
+  spec: _nodes.multiBodiedExtension
+}, {
+  name: 'extensionFrame',
+  spec: _nodes.extensionFrame
 }, {
   name: 'inlineCard',
   spec: _nodes.inlineCard

package/dist/cjs/schema/index.js

@@ -243,6 +243,12 @@ Object.defineProperty(exports, "extension", {
     return _nodes.extension;
   }
 });
+Object.defineProperty(exports, "extensionFrame", {
+  enumerable: true,
+  get: function get() {
+    return _nodes.extensionFrame;
+  }
+});
 Object.defineProperty(exports, "fragment", {
   enumerable: true,
   get: function get() {
@@ -417,6 +423,12 @@ Object.defineProperty(exports, "mentionToJSON", {
     return _nodes.mentionToJSON;
   }
 });
+Object.defineProperty(exports, "multiBodiedExtension", {
+  enumerable: true,
+  get: function get() {
+    return _nodes.multiBodiedExtension;
+  }
+});
 Object.defineProperty(exports, "nestedExpand", {
   enumerable: true,
   get: function get() {

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

@@ -10,7 +10,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _editorPalette = require("../../utils/editor-palette");
 var _groups = require("../groups");
 var _colors = require("../../utils/colors");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 /**
  * @name textColor_mark
  */
@@ -84,6 +83,12 @@ function invertCustomColor(customColor) {
     hex = customColor;
   } else if ((0, _colors.isRgb)(customColor)) {
     hex = (0, _colors.rgbToHex)(customColor);
+    if (hex === null) {
+      // in some cases the rgb color is invalid, in this case we just return the color
+      // See https://product-fabric.atlassian.net/browse/DTR-2003 for a ticket to improve the isRgb function
+      // to align with the rgbToHex function
+      return customColor;
+    }
   } else {
     return customColor;
   }
@@ -168,38 +173,35 @@ var textColor = {
     // 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.
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.dm-invert-text-color_cvho2')) {
-      /**
-       * The Editor persists custom text colors when content has been migrated from the old editor, or created via
-       * apis.
-       *
-       * This behaviour predates the introduction of dark mode.
-       *
-       * Without the inversion logic below, text with custom colors, can be hard to read when the user loads the page in dark mode.
-       *
-       * This introduces inversion of the presentation of the custom text colors when the user is in dark mode.
-       *
-       * This can be done without additional changes to account for users copying and pasting content inside the Editor, because of
-       * how we detect text colors copied from external editor sources. Where we load the background color from a
-       * seperate attribute (data-text-custom-color), instead of the inline style.
-       *
-       * See the following document for more details on this behaviour
-       * https://hello.atlassian.net/wiki/spaces/CCECO/pages/2908658046/Unsupported+custom+text+colors+in+dark+theme+Editor+Job+Story
-       */
-      var tokenColor = (0, _editorPalette.hexToEditorTextPaletteColor)(mark.attrs.color);
-      if (tokenColor) {
-        paletteColorValue = (0, _editorPalette.hexToEditorTextPaletteColor)(mark.attrs.color) || mark.attrs.color;
+
+    /**
+     * The Editor persists custom text colors when content has been migrated from the old editor, or created via
+     * apis.
+     *
+     * This behaviour predates the introduction of dark mode.
+     *
+     * Without the inversion logic below, text with custom colors, can be hard to read when the user loads the page in dark mode.
+     *
+     * This introduces inversion of the presentation of the custom text colors when the user is in dark mode.
+     *
+     * This can be done without additional changes to account for users copying and pasting content inside the Editor, because of
+     * how we detect text colors copied from external editor sources. Where we load the background color from a
+     * seperate attribute (data-text-custom-color), instead of the inline style.
+     *
+     * See the following document for more details on this behaviour
+     * https://hello.atlassian.net/wiki/spaces/CCECO/pages/2908658046/Unsupported+custom+text+colors+in+dark+theme+Editor+Job+Story
+     */
+    var tokenColor = (0, _editorPalette.hexToEditorTextPaletteColor)(mark.attrs.color);
+    if (tokenColor) {
+      paletteColorValue = (0, _editorPalette.hexToEditorTextPaletteColor)(mark.attrs.color) || mark.attrs.color;
+    } else {
+      if (getGlobalTheme().colorMode === 'dark') {
+        // if we have a custom color, we need to check if we are in dark mode
+        paletteColorValue = invertCustomColor(mark.attrs.color);
       } else {
-        if (getGlobalTheme().colorMode === 'dark') {
-          // if we have a custom color, we need to check if we are in dark mode
-          paletteColorValue = invertCustomColor(mark.attrs.color);
-        } else {
-          // if we are in light mode, we can just set the color
-          paletteColorValue = mark.attrs.color;
-        }
+        // if we are in light mode, we can just set the color
+        paletteColorValue = mark.attrs.color;
       }
-    } else {
-      paletteColorValue = (0, _editorPalette.hexToEditorTextPaletteColor)(mark.attrs.color) || mark.attrs.color;
     }
     return ['span', (0, _defineProperty2.default)({
       class: 'fabric-text-color-mark',

package/dist/cjs/schema/nodes/index.js

@@ -142,6 +142,12 @@ Object.defineProperty(exports, "extension", {
     return _extension.extension;
   }
 });
+Object.defineProperty(exports, "extensionFrame", {
+  enumerable: true,
+  get: function get() {
+    return _multiBodiedExtension.extensionFrame;
+  }
+});
 Object.defineProperty(exports, "getCellAttrs", {
   enumerable: true,
   get: function get() {
@@ -280,6 +286,12 @@ Object.defineProperty(exports, "mentionToJSON", {
     return _mention.toJSON;
   }
 });
+Object.defineProperty(exports, "multiBodiedExtension", {
+  enumerable: true,
+  get: function get() {
+    return _multiBodiedExtension.multiBodiedExtension;
+  }
+});
 Object.defineProperty(exports, "nestedExpand", {
   enumerable: true,
   get: function get() {
@@ -502,9 +514,6 @@ var _decisionList = require("./decision-list");
 var _decisionItem = require("./decision-item");
 var _taskList = require("./task-list");
 var _taskItem = require("./task-item");
-var _extension = require("./extension");
-var _inlineExtension = require("./inline-extension");
-var _bodiedExtension = require("./bodied-extension");
 var _date = require("./date");
 var _placeholder = require("./placeholder");
 var _layoutSection = require("./layout-section");
@@ -515,4 +524,8 @@ var _unsupportedBlock = require("./unsupported-block");
 var _unsupportedInline = require("./unsupported-inline");
 var _status = require("./status");
 var _nestedExpand = require("./nested-expand");
-var _embedCard = require("./embed-card");
+var _embedCard = require("./embed-card");
+var _extension = require("./extension");
+var _inlineExtension = require("./inline-extension");
+var _bodiedExtension = require("./bodied-extension");
+var _multiBodiedExtension = require("./multi-bodied-extension");

package/dist/cjs/schema/nodes/multi-bodied-extension.js

@@ -0,0 +1,102 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.multiBodiedExtension = exports.extensionFrame = void 0;
+var _extensions = require("../../utils/extensions");
+/**
+ * @stage 0
+ * @name extensionFrame_node
+ * @description Wraps the block content
+ */
+
+/**
+ * @returns NodeSpec for ExtensionFrameDefinition
+ */
+var extensionFrame = {
+  type: 'extensionFrame',
+  content: '(panel | paragraph | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | extension | bodiedExtension | unsupportedBlock | blockCard | embedCard)+',
+  isolating: true,
+  marks: 'alignment indentation dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
+  selectable: true,
+  attrs: {},
+  parseDOM: [{
+    context: 'extensionFrame//',
+    tag: 'div[data-extension-frame]',
+    skip: true
+  }, {
+    tag: 'div[data-extension-frame]'
+  }],
+  toDOM: function toDOM() {
+    var attrs = {
+      'data-extension-frame': 'true'
+    };
+    return ['div', attrs, 0];
+  }
+};
+
+/**
+ * @stage 0
+ * @name multiBodiedExtension_node
+ * @description Wraps multiple extensionFrame objects.
+ */
+exports.extensionFrame = extensionFrame;
+/**
+ * @returns NodeSpec for MultiBodiedExtensionDefinition
+ */
+var createMultiBodiedExtensionNodeSpec = function createMultiBodiedExtensionNodeSpec() {
+  var nodeSpec = {
+    inline: false,
+    group: 'block',
+    marks: 'dataConsumer fragment',
+    content: 'extensionFrame+',
+    defining: true,
+    selectable: true,
+    attrs: {
+      extensionKey: {
+        default: ''
+      },
+      extensionType: {
+        default: ''
+      },
+      parameters: {
+        default: null
+      },
+      text: {
+        default: null
+      },
+      layout: {
+        default: 'default'
+      },
+      localId: {
+        default: null
+      }
+    },
+    parseDOM: [{
+      context: 'multiBodiedExtension//',
+      tag: '[data-node-type="multi-bodied-extension"]',
+      skip: true
+    }, {
+      tag: '[data-node-type="multi-bodied-extension"]',
+      getAttrs: function getAttrs(domNode) {
+        return (0, _extensions.getExtensionAttrs)(domNode);
+      }
+    }],
+    toDOM: function toDOM(node) {
+      var attrs = {
+        'data-node-type': 'multi-bodied-extension',
+        'data-extension-type': node.attrs.extensionType,
+        'data-extension-key': node.attrs.extensionKey,
+        'data-text': node.attrs.text,
+        'data-parameters': JSON.stringify(node.attrs.parameters),
+        'data-layout': node.attrs.layout,
+        'data-local-id:': node.attrs.localId
+      };
+      return ['div', attrs, 0];
+    }
+  };
+  return nodeSpec;
+};
+var multiBodiedExtension = createMultiBodiedExtensionNodeSpec();
+exports.multiBodiedExtension = multiBodiedExtension;

package/dist/cjs/schema/nodes/tableNodes.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.toJSONTableHeader = exports.toJSONTableCell = exports.tableWithCustomWidth = exports.tableToJSON = exports.tableRow = exports.tablePrefixSelector = exports.tableHeaderSelector = exports.tableHeader = exports.tableCellSelector = exports.tableCellContentWrapperSelector = exports.tableCellContentDomSelector = exports.tableCell = exports.tableBackgroundColorPalette = exports.tableBackgroundColorNames = exports.tableBackgroundBorderColor = exports.table = exports.setGlobalTheme = exports.getCellDomAttrs = exports.getCellAttrs = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _editorPalette = require("../../utils/editor-palette");
 var _colors = require("../../utils/colors");
 var _uuid = require("../../utils/uuid");
@@ -74,6 +73,12 @@ function invertCustomColor(customColor) {
     hex = customColor;
   } else if ((0, _colors.isRgb)(customColor)) {
     hex = (0, _colors.rgbToHex)(customColor);
+    if (hex === null) {
+      // in some cases the rgb color is invalid, in this case we just return the color
+      // See https://product-fabric.atlassian.net/browse/DTR-2003 for a ticket to improve the isRgb function
+      // to align with the rgbToHex function
+      return customColor;
+    }
   } else {
     return customColor;
   }
@@ -140,40 +145,36 @@ var getCellDomAttrs = function getCellDomAttrs(node) {
       attrs.style = '';
     } else {
       var color = (0, _colors.isRgb)(background) && (0, _colors.rgbToHex)(background) ? (0, _colors.rgbToHex)(background) : background;
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.dm-invert-tablecell-bgcolor_9fz6s')) {
-        /**
-         * The Editor supports users pasting content from external sources with custom table cell backgrounds and having those
-         * backgrounds persisted.
-         *
-         * This feature predates the introduction of dark mode.
-         *
-         * Without the inversion logic below, tokenised content (ie. text), can be hard to read when the user loads the page in dark mode.
-         *
-         * This introduces inversion of the presentation of the custom background color when the user is in dark mode.
-         *
-         * This can be done without additional changes to account for users copying and pasting content inside the Editor, because of
-         * how we detect table cell background colors copied from external editor sources. Where we load the background color from a
-         * seperate attribute (data-cell-background), instead of the inline style.
-         *
-         * See the following document for more details on this behaviour
-         * https://hello.atlassian.net/wiki/spaces/CCECO/pages/2892247168/Unsupported+custom+table+cell+background+colors+in+dark+theme+Editor+Job+Story
-         */
-        var tokenColor = (0, _editorPalette.hexToEditorBackgroundPaletteRawValue)(color);
-        if (tokenColor) {
-          attrs.style = "background-color: ".concat(tokenColor, ";");
-        } else {
+
+      /**
+       * The Editor supports users pasting content from external sources with custom table cell backgrounds and having those
+       * backgrounds persisted.
+       *
+       * This feature predates the introduction of dark mode.
+       *
+       * Without the inversion logic below, tokenised content (ie. text), can be hard to read when the user loads the page in dark mode.
+       *
+       * This introduces inversion of the presentation of the custom background color when the user is in dark mode.
+       *
+       * This can be done without additional changes to account for users copying and pasting content inside the Editor, because of
+       * how we detect table cell background colors copied from external editor sources. Where we load the background color from a
+       * seperate attribute (data-cell-background), instead of the inline style.
+       *
+       * See the following document for more details on this behaviour
+       * https://hello.atlassian.net/wiki/spaces/CCECO/pages/2892247168/Unsupported+custom+table+cell+background+colors+in+dark+theme+Editor+Job+Story
+       */
+      var tokenColor = (0, _editorPalette.hexToEditorBackgroundPaletteRawValue)(color);
+      if (tokenColor) {
+        attrs.style = "background-color: ".concat(tokenColor, ";");
+      } else {
+        // if we have a custom color, we need to check if we are in dark mode
+        if (getGlobalTheme().colorMode === 'dark') {
           // if we have a custom color, we need to check if we are in dark mode
-          if (getGlobalTheme().colorMode === 'dark') {
-            // if we have a custom color, we need to check if we are in dark mode
-            attrs.style = "background-color: ".concat(invertCustomColor(color), ";");
-          } else {
-            // if we are in light mode, we can just set the color
-            attrs.style = "background-color: ".concat(background, ";");
-          }
+          attrs.style = "background-color: ".concat(invertCustomColor(color), ";");
+        } else {
+          // if we are in light mode, we can just set the color
+          attrs.style = "background-color: ".concat(background, ";");
         }
-      } else {
-        var _tokenColor = (0, _editorPalette.hexToEditorBackgroundPaletteRawValue)(color) || color;
-        attrs.style = "".concat(attrs.style || '', "background-color: ").concat(_tokenColor, ";");
       }
 
       /**

package/dist/es2019/index.js

@@ -1,3 +1,3 @@
 export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
-colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette } from './schema';
+colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, extensionFrame, multiBodiedExtension } from './schema';
 export { B100, B400, B50, B500, B75, G200, G300, G400, G50, G500, G75, N0, N20, N200, N30, N300, N40, N50, N500, N60, N80, N800, N90, P100, P300, P400, P50, P500, P75, R100, R300, R400, R50, R500, R75, T100, T300, T50, T500, T75, Y200, Y400, Y50, Y500, Y75, acNameToEmoji, acShortcutToEmoji, emojiIdToAcName, generateUuid, getEmojiAcName, getLinkMatch, hexToRgb, hexToRgba, isHex, isRgb, isSafeUrl, linkify, linkifyMatch, normalizeHexColor, normalizeUrl, rgbToHex, uuid } from './utils';

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

@@ -1,7 +1,7 @@
 import { Schema } from '@atlaskit/editor-prosemirror/model';
 import { COLOR, FONT_STYLE, SEARCH_QUERY, LINK } from './groups';
 import { link, em, strong, textColor, strike, subsup, underline, code, typeAheadQuery, confluenceInlineComment, breakout, alignment, indentation, annotation, unsupportedMark, unsupportedNodeAttribute, dataConsumer, fragment, border } from './marks';
-import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItem, heading, blockquote, codeBlock, panel, rule, image, mention, media, mediaInline, mediaSingleFull, mediaGroup, hardBreak, emoji, table, tableCell, tableHeader, tableRow, decisionList, decisionItem, taskList, taskItem, unknownBlock, extension, inlineExtension, bodiedExtension, date, placeholder, layoutSection, layoutColumn, inlineCard, blockCard, unsupportedBlock, unsupportedInline, status, expand, nestedExpand, embedCard, caption } from './nodes';
+import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItem, heading, blockquote, codeBlock, panel, rule, image, mention, media, mediaInline, mediaSingleFull, mediaGroup, hardBreak, emoji, table, tableCell, tableHeader, tableRow, decisionList, decisionItem, taskList, taskItem, unknownBlock, extension, inlineExtension, bodiedExtension, multiBodiedExtension, extensionFrame, date, placeholder, layoutSection, layoutColumn, inlineCard, blockCard, unsupportedBlock, unsupportedInline, status, expand, nestedExpand, embedCard, caption } from './nodes';
 function addItems(builtInItems, config, customSpecs = {}) {
   if (!config) {
     return {};
@@ -172,6 +172,12 @@ const nodesInOrder = [{
 }, {
   name: 'bodiedExtension',
   spec: bodiedExtension
+}, {
+  name: 'multiBodiedExtension',
+  spec: multiBodiedExtension
+}, {
+  name: 'extensionFrame',
+  spec: extensionFrame
 }, {
   name: 'inlineCard',
   spec: inlineCard

package/dist/es2019/schema/index.js

@@ -1,4 +1,4 @@
-export { PanelType, blockCard, blockquote, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline } from './nodes';
+export { PanelType, blockCard, blockquote, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, extensionFrame, multiBodiedExtension } from './nodes';
 export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
 colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette } from './marks';
 export { unsupportedNodeTypesForMediaCards } from './unsupported';

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

@@ -1,7 +1,6 @@
 import { hexToEditorTextPaletteColor } from '../../utils/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, isHex, isRgb } from '../../utils/colors';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 
 /**
  * @name textColor_mark
@@ -69,6 +68,12 @@ function invertCustomColor(customColor) {
     hex = customColor;
   } else if (isRgb(customColor)) {
     hex = rgbToHex(customColor);
+    if (hex === null) {
+      // in some cases the rgb color is invalid, in this case we just return the color
+      // See https://product-fabric.atlassian.net/browse/DTR-2003 for a ticket to improve the isRgb function
+      // to align with the rgbToHex function
+      return customColor;
+    }
   } else {
     return customColor;
   }
@@ -152,38 +157,35 @@ export const textColor = {
     // 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.
-    if (getBooleanFF('platform.editor.dm-invert-text-color_cvho2')) {
-      /**
-       * The Editor persists custom text colors when content has been migrated from the old editor, or created via
-       * apis.
-       *
-       * This behaviour predates the introduction of dark mode.
-       *
-       * Without the inversion logic below, text with custom colors, can be hard to read when the user loads the page in dark mode.
-       *
-       * This introduces inversion of the presentation of the custom text colors when the user is in dark mode.
-       *
-       * This can be done without additional changes to account for users copying and pasting content inside the Editor, because of
-       * how we detect text colors copied from external editor sources. Where we load the background color from a
-       * seperate attribute (data-text-custom-color), instead of the inline style.
-       *
-       * See the following document for more details on this behaviour
-       * https://hello.atlassian.net/wiki/spaces/CCECO/pages/2908658046/Unsupported+custom+text+colors+in+dark+theme+Editor+Job+Story
-       */
-      const tokenColor = hexToEditorTextPaletteColor(mark.attrs.color);
-      if (tokenColor) {
-        paletteColorValue = hexToEditorTextPaletteColor(mark.attrs.color) || mark.attrs.color;
+
+    /**
+     * The Editor persists custom text colors when content has been migrated from the old editor, or created via
+     * apis.
+     *
+     * This behaviour predates the introduction of dark mode.
+     *
+     * Without the inversion logic below, text with custom colors, can be hard to read when the user loads the page in dark mode.
+     *
+     * This introduces inversion of the presentation of the custom text colors when the user is in dark mode.
+     *
+     * This can be done without additional changes to account for users copying and pasting content inside the Editor, because of
+     * how we detect text colors copied from external editor sources. Where we load the background color from a
+     * seperate attribute (data-text-custom-color), instead of the inline style.
+     *
+     * See the following document for more details on this behaviour
+     * https://hello.atlassian.net/wiki/spaces/CCECO/pages/2908658046/Unsupported+custom+text+colors+in+dark+theme+Editor+Job+Story
+     */
+    const tokenColor = hexToEditorTextPaletteColor(mark.attrs.color);
+    if (tokenColor) {
+      paletteColorValue = hexToEditorTextPaletteColor(mark.attrs.color) || mark.attrs.color;
+    } else {
+      if (getGlobalTheme().colorMode === 'dark') {
+        // if we have a custom color, we need to check if we are in dark mode
+        paletteColorValue = invertCustomColor(mark.attrs.color);
       } else {
-        if (getGlobalTheme().colorMode === 'dark') {
-          // if we have a custom color, we need to check if we are in dark mode
-          paletteColorValue = invertCustomColor(mark.attrs.color);
-        } else {
-          // if we are in light mode, we can just set the color
-          paletteColorValue = mark.attrs.color;
-        }
+        // if we are in light mode, we can just set the color
+        paletteColorValue = mark.attrs.color;
       }
-    } else {
-      paletteColorValue = hexToEditorTextPaletteColor(mark.attrs.color) || mark.attrs.color;
     }
     return ['span', {
       class: 'fabric-text-color-mark',

package/dist/es2019/schema/nodes/index.js

@@ -28,9 +28,6 @@ export { decisionList, decisionListSelector } from './decision-list';
 export { decisionItem } from './decision-item';
 export { taskList, taskListSelector } from './task-list';
 export { taskItem } from './task-item';
-export { extension } from './extension';
-export { inlineExtension } from './inline-extension';
-export { bodiedExtension } from './bodied-extension';
 export { date } from './date';
 export { placeholder } from './placeholder';
 export { layoutSection, layoutSectionWithSingleColumn } from './layout-section';
@@ -41,4 +38,9 @@ export { unsupportedBlock } from './unsupported-block';
 export { unsupportedInline } from './unsupported-inline';
 export { status } from './status';
 export { nestedExpand } from './nested-expand';
-export { embedCard } from './embed-card';
+export { embedCard } from './embed-card';
+// Extensions
+export { extension } from './extension';
+export { inlineExtension } from './inline-extension';
+export { bodiedExtension } from './bodied-extension';
+export { extensionFrame, multiBodiedExtension } from './multi-bodied-extension';