@atlaskit/editor-core 215.6.2 → 215.7.0

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @atlaskit/editor-core
 
+## 215.7.0
+
+### Minor Changes
+
+- [`a28ac1e7cb62d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a28ac1e7cb62d) -
+  EDITOR-2498 Add emoji disableAutoformatProp to universalPreset so jira can disable autoformatting
+  when required
+
+### Patch Changes
+
+- [`b24541c8bc571`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b24541c8bc571) -
+  [ux] Fixes an A11Y issue. When there are selected Find and Replace matches inside of a codeblock,
+  color contrast is insufficient.
+- Updated dependencies
+
+## 215.6.3
+
+### Patch Changes
+
+- [`63e63c69cd679`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/63e63c69cd679) -
+  Add styling for bullet point markers on diff
+- Updated dependencies
+
 ## 215.6.2
 
 ### Patch Changes

package/dist/cjs/presets/universal.js

@@ -149,9 +149,9 @@ function createUniversalPresetInternal(_ref) {
     HighlightComponent: (_props$mention2 = props.mention) === null || _props$mention2 === void 0 ? void 0 : _props$mention2.HighlightComponent,
     profilecardProvider: (_props$mention3 = props.mention) === null || _props$mention3 === void 0 ? void 0 : _props$mention3.profilecardProvider,
     mentionProvider: props.mentionProvider
-  }, initialPluginConfiguration === null || initialPluginConfiguration === void 0 ? void 0 : initialPluginConfiguration.mentionsPlugin)], Boolean(props.mentionProvider)).maybeAdd([_emoji.emojiPlugin, {
+  }, initialPluginConfiguration === null || initialPluginConfiguration === void 0 ? void 0 : initialPluginConfiguration.mentionsPlugin)], Boolean(props.mentionProvider)).maybeAdd([_emoji.emojiPlugin, _objectSpread({
     emojiProvider: props.emojiProvider
-  }], Boolean(props.emojiProvider)).maybeAdd([_table.tablesPlugin, {
+  }, (0, _expValEquals.expValEquals)('platform_editor_plain_text_support', 'isEnabled', true) ? initialPluginConfiguration === null || initialPluginConfiguration === void 0 ? void 0 : initialPluginConfiguration.emojiPlugin : {})], Boolean(props.emojiProvider)).maybeAdd([_table.tablesPlugin, {
     tableOptions: !props.allowTables || typeof props.allowTables === 'boolean' ? {} : props.allowTables,
     dragAndDropEnabled: (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.tableDragAndDrop) && (isFullPage || (isComment || isChromeless) && (0, _experiments.editorExperiment)('support_table_in_comment', true, {
       exposure: true

package/dist/cjs/ui/EditorContentContainer/EditorContentContainer.js

@@ -215,6 +215,8 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
     _backgroundColorStyles.textHighlightPaddingStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _list.listsStyles,
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    (0, _platformFeatureFlags.fg)('aifc_create_enabled') && _list.diffListStyles,
     // Condense vertical spacing between list items when content mode dense is active
     (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') &&
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -272,7 +274,11 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _findReplaceStyles.findReplaceStylesNew :
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    _findReplaceStyles.findReplaceStyles,
+    _findReplaceStyles.findReplaceStyles, (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_find_codeblock_color_contrast_fix') &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    _findReplaceStyles.findReplaceStylesNewWithCodeblockColorContrastFix, !(0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_find_codeblock_color_contrast_fix') &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    _findReplaceStyles.findReplaceStylesWithCodeblockColorContrastFix,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _textHighlightStyles.textHighlightStyle,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

package/dist/cjs/ui/EditorContentContainer/styles/findReplaceStyles.js

@@ -1,10 +1,13 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.findReplaceStylesNew = exports.findReplaceStyles = void 0;
+exports.findReplaceStylesWithCodeblockColorContrastFix = exports.findReplaceStylesNewWithCodeblockColorContrastFix = exports.findReplaceStylesNew = exports.findReplaceStyles = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("@emotion/react");
+var _styles = require("@atlaskit/editor-common/styles");
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
@@ -22,6 +25,26 @@ var findReplaceStyles = exports.findReplaceStyles = (0, _react.css)({
   }
 });
 
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+var findReplaceStylesWithCodeblockColorContrastFix = exports.findReplaceStylesWithCodeblockColorContrastFix = (0, _react.css)((0, _defineProperty2.default)({}, ".".concat(_styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER, " .search-match.selected-search-match"), {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  span: {
+    // we need to use !important here as we need to override inline selection styles
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
+    color: "var(--ds-text, #172B4D)".concat(" !important")
+  }
+}));
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+var findReplaceStylesNewWithCodeblockColorContrastFix = exports.findReplaceStylesNewWithCodeblockColorContrastFix = (0, _react.css)((0, _defineProperty2.default)({}, ".".concat(_styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER, " .search-match-text.selected-search-match"), {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  span: {
+    // we need to use !important here as we need to override inline selection styles
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
+    color: "var(--ds-text, #172B4D)".concat(" !important")
+  }
+}));
+
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 var findReplaceStylesNew = exports.findReplaceStylesNew = (0, _react.css)({
   /** Text match styles */

package/dist/cjs/ui/EditorContentContainer/styles/list.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.listsStylesSafariFix = exports.listsStyles = exports.getDenseListStyles = exports.EDITOR_LIST_DENSE_GAP = void 0;
+exports.listsStylesSafariFix = exports.listsStyles = exports.getDenseListStyles = exports.diffListStyles = exports.EDITOR_LIST_DENSE_GAP = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("@emotion/react");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
@@ -139,6 +139,15 @@ var listsStyles = exports.listsStyles = (0, _react.css)({
   }
 });
 
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+var diffListStyles = exports.diffListStyles = (0, _react.css)({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  'li[data-testid="show-diff-changed-decoration-node"]::marker': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+    color: 'var(--diff-decoration-marker-color)'
+  }
+});
+
 /* This prevents https://product-fabric.atlassian.net/browse/ED-20924 */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 var listsStylesSafariFix = exports.listsStylesSafariFix = (0, _react.css)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".ProseMirror:not(.".concat(BLOCK_CARD_CONTAINER, ") > li::before"), {

package/dist/cjs/ui/EditorContentContainer/styles/smartCardStyles.js

@@ -32,13 +32,9 @@ var editorControlsSmartCardStyles = exports.editorControlsSmartCardStyles = (0,
 }));
 
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-var smartCardDiffStyles = exports.smartCardDiffStyles = (0, _react.css)((0, _defineProperty2.default)({}, ".".concat(SmartCardSharedCssClassName.EMBED_CARD_CONTAINER), (0, _defineProperty2.default)((0, _defineProperty2.default)({}, "&.show-diff-changed-decoration-node-standard .".concat(SmartCardSharedCssClassName.LOADER_WRAPPER, " > div::after"), {
+var smartCardDiffStyles = exports.smartCardDiffStyles = (0, _react.css)((0, _defineProperty2.default)({}, ".".concat(SmartCardSharedCssClassName.EMBED_CARD_CONTAINER), (0, _defineProperty2.default)({}, "&[data-testid=\"show-diff-changed-decoration-node\"] .".concat(SmartCardSharedCssClassName.LOADER_WRAPPER, " > div::after"), {
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
-  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-purple, #8270DB)"),
-  borderColor: 'transparent'
-}), "&.show-diff-changed-decoration-node-traditional .".concat(SmartCardSharedCssClassName.LOADER_WRAPPER, " > div::after"), {
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
-  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-green, #22A06B)"),
+  boxShadow: "0 0 0 1px var(--diff-decoration-marker-color)",
   borderColor: 'transparent'
 })));
 

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 = "215.6.1";
+var version = exports.version = "215.6.3";

package/dist/es2019/presets/universal.js

@@ -142,7 +142,8 @@ export default function createUniversalPresetInternal({
     mentionProvider: props.mentionProvider,
     ...(initialPluginConfiguration === null || initialPluginConfiguration === void 0 ? void 0 : initialPluginConfiguration.mentionsPlugin)
   }], Boolean(props.mentionProvider)).maybeAdd([emojiPlugin, {
-    emojiProvider: props.emojiProvider
+    emojiProvider: props.emojiProvider,
+    ...(expValEquals('platform_editor_plain_text_support', 'isEnabled', true) ? initialPluginConfiguration === null || initialPluginConfiguration === void 0 ? void 0 : initialPluginConfiguration.emojiPlugin : {})
   }], Boolean(props.emojiProvider)).maybeAdd([tablesPlugin, {
     tableOptions: !props.allowTables || typeof props.allowTables === 'boolean' ? {} : props.allowTables,
     dragAndDropEnabled: (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.tableDragAndDrop) && (isFullPage || (isComment || isChromeless) && editorExperiment('support_table_in_comment', true, {

package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js

@@ -34,7 +34,7 @@ import { embedCardStyles } from './styles/embedCardStyles';
 import { emojiDangerStyles, emojiStyles, getDenseEmojiStyles } from './styles/emoji';
 import { expandStyles, getDenseExpandTitleStyles, expandStylesMixin_fg_platform_editor_nested_dnd_styles_changes, expandStylesMixin_fg_platform_visual_refresh_icons, expandStylesMixin_without_fg_platform_editor_nested_dnd_styles_changes } from './styles/expandStyles';
 import { getExtensionStyles } from './styles/extensionStyles';
-import { findReplaceStyles, findReplaceStylesNew } from './styles/findReplaceStyles';
+import { findReplaceStyles, findReplaceStylesWithCodeblockColorContrastFix, findReplaceStylesNew, findReplaceStylesNewWithCodeblockColorContrastFix } from './styles/findReplaceStyles';
 import { firstBlockNodeStyles } from './styles/firstBlockNodeStyles';
 import { firstFloatingToolbarButtonStyles } from './styles/floatingToolbarStyles';
 import { fullPageEditorStyles } from './styles/fullPageEditorStyles';
@@ -44,7 +44,7 @@ import { indentationStyles } from './styles/indentationStyles';
 import { InlineNodeViewSharedStyles } from './styles/inlineNodeViewSharedStyles';
 import { layoutBaseStyles, layoutBaseStylesAdvanced, layoutBaseStylesFixesUnderNestedDnDFG, layoutColumnMartinTopFixesNew, layoutColumnMartinTopFixesOld, layoutColumnResponsiveStyles, layoutColumnStylesAdvanced, layoutColumnStylesNotAdvanced, layoutResponsiveBaseStyles, layoutResponsiveStylesForView, layoutSectionStylesAdvanced, layoutSectionStylesNotAdvanced, layoutSelectedStylesAdvanced, layoutSelectedStylesForViewAdvanced, layoutSelectedStylesForViewNotAdvanced, layoutSelectedStylesNotAdvanced, layoutStylesForView } from './styles/layout';
 import { hyperLinkFloatingToolbarStyles, linkLegacyIconStylesFix, linkStyles } from './styles/link';
-import { getDenseListStyles, listsStyles, listsStylesSafariFix } from './styles/list';
+import { getDenseListStyles, listsStyles, diffListStyles, listsStylesSafariFix } from './styles/list';
 import { mediaAlignmentStyles, mediaCaptionStyles, mediaDangerStyles, mediaGroupStyles, mediaStyles } from './styles/mediaStyles';
 import { mentionsStyles, mentionsSelectionStyles, mentionNodeStyles, mentionsStylesMixin_platform_editor_centre_mention_padding, mentionsSelectionStylesWithSearchMatch, mentionDangerStyles } from './styles/mentions';
 import { panelStyles, panelStylesMixin, nestedPanelBorderStylesMixin, panelStylesMixin_fg_platform_editor_nested_dnd_styles_changes, panelViewStyles, nestedPanelDangerStyles } from './styles/panelStyles';
@@ -211,6 +211,8 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
     textHighlightPaddingStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     listsStyles,
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    fg('aifc_create_enabled') && diffListStyles,
     // Condense vertical spacing between list items when content mode dense is active
     expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') &&
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -268,7 +270,11 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     findReplaceStylesNew :
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    findReplaceStyles,
+    findReplaceStyles, expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) && fg('platform_editor_find_codeblock_color_contrast_fix') &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    findReplaceStylesNewWithCodeblockColorContrastFix, !expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) && fg('platform_editor_find_codeblock_color_contrast_fix') &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    findReplaceStylesWithCodeblockColorContrastFix,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     textHighlightStyle,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

package/dist/es2019/ui/EditorContentContainer/styles/findReplaceStyles.js

@@ -1,5 +1,6 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 import { css } from '@emotion/react';
+import { CodeBlockSharedCssClassName } from '@atlaskit/editor-common/styles';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 export const findReplaceStyles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -15,6 +16,32 @@ export const findReplaceStyles = css({
   }
 });
 
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export const findReplaceStylesWithCodeblockColorContrastFix = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+  [`.${CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER} .search-match.selected-search-match`]: {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    span: {
+      // we need to use !important here as we need to override inline selection styles
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
+      color: `${"var(--ds-text, #172B4D)"} !important`
+    }
+  }
+});
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export const findReplaceStylesNewWithCodeblockColorContrastFix = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+  [`.${CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER} .search-match-text.selected-search-match`]: {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    span: {
+      // we need to use !important here as we need to override inline selection styles
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
+      color: `${"var(--ds-text, #172B4D)"} !important`
+    }
+  }
+});
+
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 export const findReplaceStylesNew = css({
   /** Text match styles */

package/dist/es2019/ui/EditorContentContainer/styles/list.js

@@ -130,6 +130,15 @@ export const listsStyles = css({
   }
 });
 
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export const diffListStyles = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  'li[data-testid="show-diff-changed-decoration-node"]::marker': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+    color: 'var(--diff-decoration-marker-color)'
+  }
+});
+
 /* This prevents https://product-fabric.atlassian.net/browse/ED-20924 */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 export const listsStylesSafariFix = css({

package/dist/es2019/ui/EditorContentContainer/styles/smartCardStyles.js

@@ -29,16 +29,10 @@ export const editorControlsSmartCardStyles = css({
 export const smartCardDiffStyles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values,@atlaskit/ui-styling-standard/no-nested-selectors
   [`.${SmartCardSharedCssClassName.EMBED_CARD_CONTAINER}`]: {
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values,@atlaskit/ui-styling-standard/no-nested-selectors
-    [`&.show-diff-changed-decoration-node-standard .${SmartCardSharedCssClassName.LOADER_WRAPPER} > div::after`]: {
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
-      boxShadow: `0 0 0 1px ${"var(--ds-border-accent-purple, #8270DB)"}`,
-      borderColor: 'transparent'
-    },
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors,@atlaskit/ui-styling-standard/no-unsafe-values
-    [`&.show-diff-changed-decoration-node-traditional .${SmartCardSharedCssClassName.LOADER_WRAPPER} > div::after`]: {
+    [`&[data-testid="show-diff-changed-decoration-node"] .${SmartCardSharedCssClassName.LOADER_WRAPPER} > div::after`]: {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
-      boxShadow: `0 0 0 1px ${"var(--ds-border-accent-green, #22A06B)"}`,
+      boxShadow: `0 0 0 1px var(--diff-decoration-marker-color)`,
       borderColor: 'transparent'
     }
   }

package/dist/es2019/version-wrapper.js

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

package/dist/esm/presets/universal.js

@@ -142,9 +142,9 @@ export default function createUniversalPresetInternal(_ref) {
     HighlightComponent: (_props$mention2 = props.mention) === null || _props$mention2 === void 0 ? void 0 : _props$mention2.HighlightComponent,
     profilecardProvider: (_props$mention3 = props.mention) === null || _props$mention3 === void 0 ? void 0 : _props$mention3.profilecardProvider,
     mentionProvider: props.mentionProvider
-  }, initialPluginConfiguration === null || initialPluginConfiguration === void 0 ? void 0 : initialPluginConfiguration.mentionsPlugin)], Boolean(props.mentionProvider)).maybeAdd([emojiPlugin, {
+  }, initialPluginConfiguration === null || initialPluginConfiguration === void 0 ? void 0 : initialPluginConfiguration.mentionsPlugin)], Boolean(props.mentionProvider)).maybeAdd([emojiPlugin, _objectSpread({
     emojiProvider: props.emojiProvider
-  }], Boolean(props.emojiProvider)).maybeAdd([tablesPlugin, {
+  }, expValEquals('platform_editor_plain_text_support', 'isEnabled', true) ? initialPluginConfiguration === null || initialPluginConfiguration === void 0 ? void 0 : initialPluginConfiguration.emojiPlugin : {})], Boolean(props.emojiProvider)).maybeAdd([tablesPlugin, {
     tableOptions: !props.allowTables || typeof props.allowTables === 'boolean' ? {} : props.allowTables,
     dragAndDropEnabled: (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.tableDragAndDrop) && (isFullPage || (isComment || isChromeless) && editorExperiment('support_table_in_comment', true, {
       exposure: true

package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js

@@ -35,7 +35,7 @@ import { embedCardStyles } from './styles/embedCardStyles';
 import { emojiDangerStyles, emojiStyles, getDenseEmojiStyles } from './styles/emoji';
 import { expandStyles, getDenseExpandTitleStyles, expandStylesMixin_fg_platform_editor_nested_dnd_styles_changes, expandStylesMixin_fg_platform_visual_refresh_icons, expandStylesMixin_without_fg_platform_editor_nested_dnd_styles_changes } from './styles/expandStyles';
 import { getExtensionStyles } from './styles/extensionStyles';
-import { findReplaceStyles, findReplaceStylesNew } from './styles/findReplaceStyles';
+import { findReplaceStyles, findReplaceStylesWithCodeblockColorContrastFix, findReplaceStylesNew, findReplaceStylesNewWithCodeblockColorContrastFix } from './styles/findReplaceStyles';
 import { firstBlockNodeStyles } from './styles/firstBlockNodeStyles';
 import { firstFloatingToolbarButtonStyles } from './styles/floatingToolbarStyles';
 import { fullPageEditorStyles } from './styles/fullPageEditorStyles';
@@ -45,7 +45,7 @@ import { indentationStyles } from './styles/indentationStyles';
 import { InlineNodeViewSharedStyles } from './styles/inlineNodeViewSharedStyles';
 import { layoutBaseStyles, layoutBaseStylesAdvanced, layoutBaseStylesFixesUnderNestedDnDFG, layoutColumnMartinTopFixesNew, layoutColumnMartinTopFixesOld, layoutColumnResponsiveStyles, layoutColumnStylesAdvanced, layoutColumnStylesNotAdvanced, layoutResponsiveBaseStyles, layoutResponsiveStylesForView, layoutSectionStylesAdvanced, layoutSectionStylesNotAdvanced, layoutSelectedStylesAdvanced, layoutSelectedStylesForViewAdvanced, layoutSelectedStylesForViewNotAdvanced, layoutSelectedStylesNotAdvanced, layoutStylesForView } from './styles/layout';
 import { hyperLinkFloatingToolbarStyles, linkLegacyIconStylesFix, linkStyles } from './styles/link';
-import { getDenseListStyles, listsStyles, listsStylesSafariFix } from './styles/list';
+import { getDenseListStyles, listsStyles, diffListStyles, listsStylesSafariFix } from './styles/list';
 import { mediaAlignmentStyles, mediaCaptionStyles, mediaDangerStyles, mediaGroupStyles, mediaStyles } from './styles/mediaStyles';
 import { mentionsStyles, mentionsSelectionStyles, mentionNodeStyles, mentionsStylesMixin_platform_editor_centre_mention_padding, mentionsSelectionStylesWithSearchMatch, mentionDangerStyles } from './styles/mentions';
 import { panelStyles, panelStylesMixin, nestedPanelBorderStylesMixin, panelStylesMixin_fg_platform_editor_nested_dnd_styles_changes, panelViewStyles, nestedPanelDangerStyles } from './styles/panelStyles';
@@ -207,6 +207,8 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
     textHighlightPaddingStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     listsStyles,
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    fg('aifc_create_enabled') && diffListStyles,
     // Condense vertical spacing between list items when content mode dense is active
     expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') &&
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -264,7 +266,11 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     findReplaceStylesNew :
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    findReplaceStyles,
+    findReplaceStyles, expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) && fg('platform_editor_find_codeblock_color_contrast_fix') &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    findReplaceStylesNewWithCodeblockColorContrastFix, !expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) && fg('platform_editor_find_codeblock_color_contrast_fix') &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    findReplaceStylesWithCodeblockColorContrastFix,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     textHighlightStyle,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

package/dist/esm/ui/EditorContentContainer/styles/findReplaceStyles.js

@@ -1,5 +1,7 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 import { css } from '@emotion/react';
+import { CodeBlockSharedCssClassName } from '@atlaskit/editor-common/styles';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 export var findReplaceStyles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -15,6 +17,26 @@ export var findReplaceStyles = css({
   }
 });
 
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export var findReplaceStylesWithCodeblockColorContrastFix = css(_defineProperty({}, ".".concat(CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER, " .search-match.selected-search-match"), {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  span: {
+    // we need to use !important here as we need to override inline selection styles
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
+    color: "var(--ds-text, #172B4D)".concat(" !important")
+  }
+}));
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export var findReplaceStylesNewWithCodeblockColorContrastFix = css(_defineProperty({}, ".".concat(CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER, " .search-match-text.selected-search-match"), {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  span: {
+    // we need to use !important here as we need to override inline selection styles
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
+    color: "var(--ds-text, #172B4D)".concat(" !important")
+  }
+}));
+
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 export var findReplaceStylesNew = css({
   /** Text match styles */

package/dist/esm/ui/EditorContentContainer/styles/list.js

@@ -131,6 +131,15 @@ export var listsStyles = css({
   }
 });
 
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export var diffListStyles = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  'li[data-testid="show-diff-changed-decoration-node"]::marker': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+    color: 'var(--diff-decoration-marker-color)'
+  }
+});
+
 /* This prevents https://product-fabric.atlassian.net/browse/ED-20924 */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 export var listsStylesSafariFix = css(_defineProperty(_defineProperty({}, ".ProseMirror:not(.".concat(BLOCK_CARD_CONTAINER, ") > li::before"), {

package/dist/esm/ui/EditorContentContainer/styles/smartCardStyles.js

@@ -24,13 +24,9 @@ export var editorControlsSmartCardStyles = css(_defineProperty({}, ".".concat(Sm
 }));
 
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-export var smartCardDiffStyles = css(_defineProperty({}, ".".concat(SmartCardSharedCssClassName.EMBED_CARD_CONTAINER), _defineProperty(_defineProperty({}, "&.show-diff-changed-decoration-node-standard .".concat(SmartCardSharedCssClassName.LOADER_WRAPPER, " > div::after"), {
+export var smartCardDiffStyles = css(_defineProperty({}, ".".concat(SmartCardSharedCssClassName.EMBED_CARD_CONTAINER), _defineProperty({}, "&[data-testid=\"show-diff-changed-decoration-node\"] .".concat(SmartCardSharedCssClassName.LOADER_WRAPPER, " > div::after"), {
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
-  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-purple, #8270DB)"),
-  borderColor: 'transparent'
-}), "&.show-diff-changed-decoration-node-traditional .".concat(SmartCardSharedCssClassName.LOADER_WRAPPER, " > div::after"), {
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
-  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-green, #22A06B)"),
+  boxShadow: "0 0 0 1px var(--diff-decoration-marker-color)",
   borderColor: 'transparent'
 })));
 

package/dist/esm/version-wrapper.js

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

package/dist/types/presets/universal.d.ts

@@ -13,6 +13,9 @@ export type UniversalPresetProps = DefaultPresetPluginOptions & EditorSharedProp
  * Note: not all plugins are configurable via this mechanism, and for plugins configured -- it is only doing a subset of the configuration.
  */
 export type InitialPluginConfiguration = {
+    emojiPlugin?: {
+        disableAutoformat?: boolean;
+    };
     extensionPlugin?: {
         __rendererExtensionOptions?: ExtensionPluginOptions['__rendererExtensionOptions'];
     };

package/dist/types/ui/EditorContentContainer/styles/findReplaceStyles.d.ts

@@ -1,3 +1,5 @@
 import { type SerializedStyles } from '@emotion/react';
 export declare const findReplaceStyles: SerializedStyles;
+export declare const findReplaceStylesWithCodeblockColorContrastFix: SerializedStyles;
+export declare const findReplaceStylesNewWithCodeblockColorContrastFix: SerializedStyles;
 export declare const findReplaceStylesNew: SerializedStyles;

package/dist/types/ui/EditorContentContainer/styles/list.d.ts

@@ -1,5 +1,6 @@
 import { type SerializedStyles } from '@emotion/react';
 export declare const listsStyles: SerializedStyles;
+export declare const diffListStyles: SerializedStyles;
 export declare const listsStylesSafariFix: SerializedStyles;
 export declare const EDITOR_LIST_DENSE_GAP = "max(0px, calc((var(--ak-editor-base-font-size, 16px) - 13px) * (4 / 3)))";
 export declare const getDenseListStyles: (baseFontSize?: number) => SerializedStyles;

package/dist/types-ts4.5/presets/universal.d.ts

@@ -13,6 +13,9 @@ export type UniversalPresetProps = DefaultPresetPluginOptions & EditorSharedProp
  * Note: not all plugins are configurable via this mechanism, and for plugins configured -- it is only doing a subset of the configuration.
  */
 export type InitialPluginConfiguration = {
+    emojiPlugin?: {
+        disableAutoformat?: boolean;
+    };
     extensionPlugin?: {
         __rendererExtensionOptions?: ExtensionPluginOptions['__rendererExtensionOptions'];
     };

package/dist/types-ts4.5/ui/EditorContentContainer/styles/findReplaceStyles.d.ts

@@ -1,3 +1,5 @@
 import { type SerializedStyles } from '@emotion/react';
 export declare const findReplaceStyles: SerializedStyles;
+export declare const findReplaceStylesWithCodeblockColorContrastFix: SerializedStyles;
+export declare const findReplaceStylesNewWithCodeblockColorContrastFix: SerializedStyles;
 export declare const findReplaceStylesNew: SerializedStyles;

package/dist/types-ts4.5/ui/EditorContentContainer/styles/list.d.ts

@@ -1,5 +1,6 @@
 import { type SerializedStyles } from '@emotion/react';
 export declare const listsStyles: SerializedStyles;
+export declare const diffListStyles: SerializedStyles;
 export declare const listsStylesSafariFix: SerializedStyles;
 export declare const EDITOR_LIST_DENSE_GAP = "max(0px, calc((var(--ak-editor-base-font-size, 16px) - 13px) * (4 / 3)))";
 export declare const getDenseListStyles: (baseFontSize?: number) => SerializedStyles;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "215.6.2",
+	"version": "215.7.0",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -81,7 +81,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.16.0",
+		"@atlaskit/editor-common": "^110.17.0",
 		"@atlaskit/link-provider": "^4.0.0",
 		"@atlaskit/media-core": "^37.0.0",
 		"react": "^18.2.0",
@@ -107,7 +107,7 @@
 		"@atlaskit/primitives": "^16.0.0",
 		"@atlaskit/renderer": "^124.8.0",
 		"@atlaskit/section-message": "^8.7.0",
-		"@atlaskit/smart-card": "^43.2.0",
+		"@atlaskit/smart-card": "^43.3.0",
 		"@atlaskit/synchrony-test-helpers": "workspace:^",
 		"@atlaskit/toggle": "^15.1.0",
 		"@atlaskit/util-data-test": "^18.3.0",
@@ -440,6 +440,9 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
+		"platform_editor_find_codeblock_color_contrast_fix": {
+			"type": "boolean"
+		},
 		"platform_editor_blocktaskitem_patch_3": {
 			"type": "boolean",
 			"referenceOnly": true