@atlaskit/editor-core 215.17.4 → 215.18.1

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/editor-core
 
+## 215.18.1
+
+### Patch Changes
+
+- [`a24253b5a6d68`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a24253b5a6d68) -
+  [ux] [A11Y-25850] update the outer box shadow color for find and replace matches to comply with
+  color contrast minimum ratio
+- Updated dependencies
+
+## 215.18.0
+
+### Minor Changes
+
+- [`a36ac8c9961b1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a36ac8c9961b1) -
+  [ux] [EDITOR-2608] updated show diff deleted block nodes design
+
+### Patch Changes
+
+- [`f3bc89931d4a2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f3bc89931d4a2) -
+  Added a example page in editor-core with basic text formatting and media plugin only
+- Updated dependencies
+
 ## 215.17.4
 
 ### Patch Changes

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

@@ -278,6 +278,10 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     (0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') && _expandStyles.expandStylesMixin_fg_platform_visual_refresh_icons, (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) ?
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    (0, _platformFeatureFlags.fg)('platform_editor_a11y_find_replace_focus_ring') ?
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    _findReplaceStyles.findReplaceStylesNewWithA11Y :
+    // 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, (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_find_codeblock_color_contrast_fix') &&

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.findReplaceStylesWithCodeblockColorContrastFix = exports.findReplaceStylesNewWithCodeblockColorContrastFix = exports.findReplaceStylesNew = exports.findReplaceStyles = void 0;
+exports.findReplaceStylesWithCodeblockColorContrastFix = exports.findReplaceStylesNewWithCodeblockColorContrastFix = exports.findReplaceStylesNewWithA11Y = 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");
@@ -202,6 +202,179 @@ var findReplaceStylesNew = exports.findReplaceStylesNew = (0, _react.css)({
   },
   /** Dark mode */
 
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-expand-title.search-match-dark > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
+    boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder, #AE4787)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-bolder-pressed, #77325B)", "\n\t\t"),
+    backgroundColor: "var(--ds-background-accent-magenta-bolder-pressed, #77325B)",
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.ak-editor-expand__title-input': {
+      color: "var(--ds-text-inverse, #FFFFFF)"
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-expand-title.selected-search-match.search-match-dark > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
+    boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder, #AE4787)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-bolder-hovered, #943D73)", "\n\t\t"),
+    backgroundColor: "var(--ds-background-accent-magenta-bolder-hovered, #943D73)"
+  }
+});
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _react.css)({
+  /** Text match styles */
+
+  /** Light mode */
+
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-text': {
+    borderRadius: "var(--ds-space-050, 4px)",
+    boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-border-accent-magenta, #CD519D)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-subtler, #FDD0EC)", "\n\t\t"),
+    // 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
+    backgroundColor: "var(--ds-background-accent-magenta-subtler, #FDD0EC)".concat(" !important"),
+    color: "var(--ds-text, #292A2E)"
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-text.selected-search-match': {
+    boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-border-accent-magenta, #CD519D)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", "\n\t\t"),
+    // 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
+    backgroundColor: "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)".concat(" !important")
+  },
+  /** Dark mode */
+
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-text.search-match-dark': {
+    boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder, #AE4787)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-bolder-pressed, #77325B)", "\n\t\t"),
+    // 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
+    backgroundColor: "var(--ds-background-accent-magenta-bolder-pressed, #77325B)".concat(" !important"),
+    color: "var(--ds-text-inverse, #FFFFFF)"
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-text.selected-search-match.search-match-dark': {
+    boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder, #AE4787)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-bolder-hovered, #943D73)", "\n\t\t"),
+    // 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
+    backgroundColor: "var(--ds-background-accent-magenta-bolder-hovered, #943D73)".concat(" !important")
+  },
+  /** Block match styles */
+
+  /** Light mode */
+
+  /** Without node selection */
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-border-accent-magenta, #CD519D)", ",\n\t\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-subtler, #FDD0EC)", "\n\t\t\t")
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: "\n\t\t\t0px 0px 0px 4px ".concat("var(--ds-background-accent-magenta-subtler, #FDD0EC)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-border-accent-magenta, #CD519D)", "\n\t\t\t")
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block.search-match-block-selected': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-border-accent-magenta, #CD519D)", ",\n\t\t\tinset 0 0 0 4px ", "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", "\n\t\t\t")
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: "\n\t\t\t0px 0px 0px 4px ".concat("var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-border-accent-magenta, #CD519D)", "\n\t\t\t")
+    }
+  },
+  /** With node selection */
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block.ak-editor-selected-node': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>div::after': {
+      boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-border-accent-magenta, #CD519D)", ",\n\t\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-subtler, #FDD0EC)", ",\n\t\t\t0 0 0 1px ", "var(--ds-border-selected, #1868DB)", "\n\t\t\t")
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ", 0px 0px 0px 4px ", "var(--ds-background-accent-magenta-subtler, #FDD0EC)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-magenta-subtler-pressed, #F797D2)")
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block.search-match-block-selected.ak-editor-selected-node': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-border-accent-magenta, #CD519D)", ",\n\t\t\tinset 0 0 0 4px ", "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", ",\n\t\t\t0 0 0 1px ", "var(--ds-border-selected, #1868DB)", "\n\t\t\t")
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ", 0px 0px 0px 4px ", "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-magenta-subtler-pressed, #F797D2)")
+    }
+  },
+  /** Dark mode */
+  /** Without node selection */
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block.search-match-dark': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder, #AE4787)", ",\n\t\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-bolder-pressed, #77325B)", "\n\t\t\t")
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: "0px 0px 0px 4px ".concat("var(--ds-background-accent-magenta-bolder-pressed, #77325B)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)")
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block.search-match-block-selected.search-match-dark': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder, #AE4787)", ",\n\t\t\tinset 0 0 0 4px ", "var(--ds-background-accent-magenta-bolder-hovered, #943D73)", "\n\t\t\t")
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: "0px 0px 0px 4px ".concat("var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)")
+    }
+  },
+  /** With node selection */
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block.search-match-dark.ak-editor-selected-node': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>div::after': {
+      boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder, #AE4787)", ",\n\t\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-bolder-pressed, #77325B)", ",\n\t\t\t0 0 0 1px ", "var(--ds-border-selected, #1868DB)", "\n\t\t\t")
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ", 0px 0px 0px 4px ", "var(--ds-background-accent-magenta-bolder-pressed, #77325B)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)")
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block.search-match-block-selected.search-match-dark.ak-editor-selected-node': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder, #AE4787)", ",\n\t\t\tinset 0 0 0 4px ", "var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ",\n\t\t\t0 0 0 1px ", "var(--ds-border-selected, #1868DB)", "\n\t\t\t")
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ", 0px 0px 0px 4px ", "var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)")
+    }
+  },
+  /** Expand title match styles */
+
+  /** Light mode */
+
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-expand-title > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
+    borderRadius: "var(--ds-space-050, 4px)",
+    boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-border-accent-magenta, #CD519D)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-subtler, #FDD0EC)", "\n\t\t"),
+    backgroundColor: "var(--ds-background-accent-magenta-subtler, #FDD0EC)",
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.ak-editor-expand__title-input': {
+      color: "var(--ds-text, #292A2E)"
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-expand-title.selected-search-match > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
+    boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-border-accent-magenta, #CD519D)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", "\n\t\t"),
+    backgroundColor: "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)"
+  },
+  /** Dark mode */
+
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '.search-match-expand-title.search-match-dark > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
     boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder, #AE4787)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-bolder-pressed, #77325B)", "\n\t\t"),

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

@@ -39,18 +39,39 @@ var smartCardDiffStyles = exports.smartCardDiffStyles = (0, _react.css)((0, _def
 })));
 
 // 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 showDiffDeletedNodeStyles = exports.showDiffDeletedNodeStyles = (0, _react.css)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(SmartCardSharedCssClassName.EMBED_CARD_CONTAINER), (0, _defineProperty2.default)({}, "&.show-diff-deleted-node .".concat(SmartCardSharedCssClassName.LOADER_WRAPPER, " > div::after"), {
+var showDiffDeletedNodeStyles = exports.showDiffDeletedNodeStyles = (0, _react.css)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(SmartCardSharedCssClassName.EMBED_CARD_CONTAINER), (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, "&.show-diff-deleted-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-gray, #7D818A)"),
   borderColor: 'transparent'
+}), "&.show-diff-deleted-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-red, #E2483D)"),
+  borderColor: 'transparent'
+}), "&.show-diff-deleted-node .".concat(SmartCardSharedCssClassName.LOADER_WRAPPER), {
+  opacity: 0.6
 })), '.show-diff-deleted-node .media-card-wrapper', {
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '& > div': {
     // 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-gray, #7D818A)"),
-    borderRadius: "calc(".concat("var(--ds-radius-xsmall, 2px)", " + 1px)"),
+    borderRadius: "var(--ds-radius-small, 4px)",
     opacity: 0.6
   }
+}), '.show-diff-deleted-node-traditional .media-card-wrapper', {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '& > div': {
+    // 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-red, #E2483D)"),
+    borderRadius: "var(--ds-radius-small, 4px)"
+  }
+}), '[data-prosemirror-node-name="blockquote"].show-diff-deleted-node', {
+  textDecoration: 'line-through'
+}), '[data-prosemirror-node-name="blockquote"].show-diff-deleted-node-traditional', {
+  textDecoration: 'line-through',
+  textDecorationColor: "var(--ds-border-accent-red, #E2483D)"
+}), '[data-prosemirror-node-name="embedCard"].show-diff-deleted-node-traditional', {
+  textDecoration: 'line-through',
+  textDecorationColor: "var(--ds-border-accent-red, #E2483D)"
 }));
 
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766

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

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

@@ -34,7 +34,7 @@ import { embedCardStyles } from './styles/embedCardStyles';
 import { emojiDangerStyles, emojiStyles, scaledEmojiStyles, getDenseEmojiStyles, getScaledDenseEmojiStyles } 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, extensionDiffStyles } from './styles/extensionStyles';
-import { findReplaceStyles, findReplaceStylesWithCodeblockColorContrastFix, findReplaceStylesNew, findReplaceStylesNewWithCodeblockColorContrastFix } from './styles/findReplaceStyles';
+import { findReplaceStyles, findReplaceStylesWithCodeblockColorContrastFix, findReplaceStylesNew, findReplaceStylesNewWithCodeblockColorContrastFix, findReplaceStylesNewWithA11Y } from './styles/findReplaceStyles';
 import { firstBlockNodeStyles } from './styles/firstBlockNodeStyles';
 import { firstFloatingToolbarButtonStyles } from './styles/floatingToolbarStyles';
 import { fullPageEditorStyles } from './styles/fullPageEditorStyles';
@@ -274,6 +274,10 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     fg('platform-visual-refresh-icons') && expandStylesMixin_fg_platform_visual_refresh_icons, expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ?
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    fg('platform_editor_a11y_find_replace_focus_ring') ?
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    findReplaceStylesNewWithA11Y :
+    // 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, expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) && fg('platform_editor_find_codeblock_color_contrast_fix') &&

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

@@ -245,6 +245,237 @@ export const findReplaceStylesNew = css({
   },
   /** Dark mode */
 
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-expand-title.search-match-dark > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
+    boxShadow: `
+		inset 0 0 0 1px ${"var(--ds-background-accent-magenta-bolder, #AE4787)"},
+		inset 0 0 0 5px ${"var(--ds-background-accent-magenta-bolder-pressed, #77325B)"}
+		`,
+    backgroundColor: "var(--ds-background-accent-magenta-bolder-pressed, #77325B)",
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.ak-editor-expand__title-input': {
+      color: "var(--ds-text-inverse, #FFFFFF)"
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-expand-title.selected-search-match.search-match-dark > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
+    boxShadow: `
+		inset 0 0 0 1px ${"var(--ds-background-accent-magenta-bolder, #AE4787)"},
+		inset 0 0 0 5px ${"var(--ds-background-accent-magenta-bolder-hovered, #943D73)"}
+		`,
+    backgroundColor: "var(--ds-background-accent-magenta-bolder-hovered, #943D73)"
+  }
+});
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export const findReplaceStylesNewWithA11Y = css({
+  /** Text match styles */
+
+  /** Light mode */
+
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-text': {
+    borderRadius: "var(--ds-space-050, 4px)",
+    boxShadow: `
+		inset 0 0 0 1px ${"var(--ds-border-accent-magenta, #CD519D)"},
+		inset 0 0 0 5px ${"var(--ds-background-accent-magenta-subtler, #FDD0EC)"}
+		`,
+    // 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
+    backgroundColor: `${"var(--ds-background-accent-magenta-subtler, #FDD0EC)"} !important`,
+    color: "var(--ds-text, #292A2E)"
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-text.selected-search-match': {
+    boxShadow: `
+		inset 0 0 0 1px ${"var(--ds-border-accent-magenta, #CD519D)"},
+		inset 0 0 0 5px ${"var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)"}
+		`,
+    // 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
+    backgroundColor: `${"var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)"} !important`
+  },
+  /** Dark mode */
+
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-text.search-match-dark': {
+    boxShadow: `
+		inset 0 0 0 1px ${"var(--ds-background-accent-magenta-bolder, #AE4787)"},
+		inset 0 0 0 5px ${"var(--ds-background-accent-magenta-bolder-pressed, #77325B)"}
+		`,
+    // 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
+    backgroundColor: `${"var(--ds-background-accent-magenta-bolder-pressed, #77325B)"} !important`,
+    color: "var(--ds-text-inverse, #FFFFFF)"
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-text.selected-search-match.search-match-dark': {
+    boxShadow: `
+		inset 0 0 0 1px ${"var(--ds-background-accent-magenta-bolder, #AE4787)"},
+		inset 0 0 0 5px ${"var(--ds-background-accent-magenta-bolder-hovered, #943D73)"}
+		`,
+    // 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
+    backgroundColor: `${"var(--ds-background-accent-magenta-bolder-hovered, #943D73)"} !important`
+  },
+  /** Block match styles */
+
+  /** Light mode */
+
+  /** Without node selection */
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: `
+			inset 0 0 0 1px ${"var(--ds-border-accent-magenta, #CD519D)"},
+			inset 0 0 0 5px ${"var(--ds-background-accent-magenta-subtler, #FDD0EC)"}
+			`
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: `
+			0px 0px 0px 4px ${"var(--ds-background-accent-magenta-subtler, #FDD0EC)"},
+			0px 0px 0px 5px ${"var(--ds-border-accent-magenta, #CD519D)"}
+			`
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block.search-match-block-selected': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: `
+			inset 0 0 0 1px ${"var(--ds-border-accent-magenta, #CD519D)"},
+			inset 0 0 0 4px ${"var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)"}
+			`
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: `
+			0px 0px 0px 4px ${"var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)"},
+			0px 0px 0px 5px ${"var(--ds-border-accent-magenta, #CD519D)"}
+			`
+    }
+  },
+  /** With node selection */
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block.ak-editor-selected-node': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>div::after': {
+      boxShadow: `
+			inset 0 0 0 1px ${"var(--ds-border-accent-magenta, #CD519D)"},
+			inset 0 0 0 5px ${"var(--ds-background-accent-magenta-subtler, #FDD0EC)"},
+			0 0 0 1px ${"var(--ds-border-selected, #1868DB)"}
+			`
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: `0 0 0 1px ${"var(--ds-border-selected, #1868DB)"}, 0px 0px 0px 4px ${"var(--ds-background-accent-magenta-subtler, #FDD0EC)"}, 0px 0px 0px 5px ${"var(--ds-background-accent-magenta-subtler-pressed, #F797D2)"}`
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block.search-match-block-selected.ak-editor-selected-node': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: `
+			inset 0 0 0 1px ${"var(--ds-border-accent-magenta, #CD519D)"},
+			inset 0 0 0 4px ${"var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)"},
+			0 0 0 1px ${"var(--ds-border-selected, #1868DB)"}
+			`
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: `0 0 0 1px ${"var(--ds-border-selected, #1868DB)"}, 0px 0px 0px 4px ${"var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)"}, 0px 0px 0px 5px ${"var(--ds-background-accent-magenta-subtler-pressed, #F797D2)"}`
+    }
+  },
+  /** Dark mode */
+  /** Without node selection */
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block.search-match-dark': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: `
+			inset 0 0 0 1px ${"var(--ds-background-accent-magenta-bolder, #AE4787)"},
+			inset 0 0 0 5px ${"var(--ds-background-accent-magenta-bolder-pressed, #77325B)"}
+			`
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: `0px 0px 0px 4px ${"var(--ds-background-accent-magenta-bolder-pressed, #77325B)"}, 0px 0px 0px 5px ${"var(--ds-background-accent-magenta-bolder, #AE4787)"}`
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block.search-match-block-selected.search-match-dark': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: `
+			inset 0 0 0 1px ${"var(--ds-background-accent-magenta-bolder, #AE4787)"},
+			inset 0 0 0 4px ${"var(--ds-background-accent-magenta-bolder-hovered, #943D73)"}
+			`
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: `0px 0px 0px 4px ${"var(--ds-background-accent-magenta-bolder-hovered, #943D73)"}, 0px 0px 0px 5px ${"var(--ds-background-accent-magenta-bolder, #AE4787)"}`
+    }
+  },
+  /** With node selection */
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block.search-match-dark.ak-editor-selected-node': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>div::after': {
+      boxShadow: `
+			inset 0 0 0 1px ${"var(--ds-background-accent-magenta-bolder, #AE4787)"},
+			inset 0 0 0 5px ${"var(--ds-background-accent-magenta-bolder-pressed, #77325B)"},
+			0 0 0 1px ${"var(--ds-border-selected, #1868DB)"}
+			`
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: `0 0 0 1px ${"var(--ds-border-selected, #1868DB)"}, 0px 0px 0px 4px ${"var(--ds-background-accent-magenta-bolder-pressed, #77325B)"}, 0px 0px 0px 5px ${"var(--ds-background-accent-magenta-bolder, #AE4787)"}`
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block.search-match-block-selected.search-match-dark.ak-editor-selected-node': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: `
+			inset 0 0 0 1px ${"var(--ds-background-accent-magenta-bolder, #AE4787)"},
+			inset 0 0 0 4px ${"var(--ds-background-accent-magenta-bolder-hovered, #943D73)"},
+			0 0 0 1px ${"var(--ds-border-selected, #1868DB)"}
+			`
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: `0 0 0 1px ${"var(--ds-border-selected, #1868DB)"}, 0px 0px 0px 4px ${"var(--ds-background-accent-magenta-bolder-hovered, #943D73)"}, 0px 0px 0px 5px ${"var(--ds-background-accent-magenta-bolder, #AE4787)"}`
+    }
+  },
+  /** Expand title match styles */
+
+  /** Light mode */
+
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-expand-title > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
+    borderRadius: "var(--ds-space-050, 4px)",
+    boxShadow: `
+		inset 0 0 0 1px ${"var(--ds-border-accent-magenta, #CD519D)"},
+		inset 0 0 0 5px ${"var(--ds-background-accent-magenta-subtler, #FDD0EC)"}
+		`,
+    backgroundColor: "var(--ds-background-accent-magenta-subtler, #FDD0EC)",
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.ak-editor-expand__title-input': {
+      color: "var(--ds-text, #292A2E)"
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-expand-title.selected-search-match > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
+    boxShadow: `
+		inset 0 0 0 1px ${"var(--ds-border-accent-magenta, #CD519D)"},
+		inset 0 0 0 5px ${"var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)"}
+		`,
+    backgroundColor: "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)"
+  },
+  /** Dark mode */
+
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '.search-match-expand-title.search-match-dark > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
     boxShadow: `

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

@@ -47,6 +47,16 @@ export const showDiffDeletedNodeStyles = css({
       // 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-gray, #7D818A)"}`,
       borderColor: 'transparent'
+    },
+    // 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-deleted-node-traditional .${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-red, #E2483D)"}`,
+      borderColor: 'transparent'
+    },
+    // 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-deleted-node .${SmartCardSharedCssClassName.LOADER_WRAPPER}`]: {
+      opacity: 0.6
     }
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -55,9 +65,32 @@ export const showDiffDeletedNodeStyles = css({
     '& > div': {
       // 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-gray, #7D818A)"}`,
-      borderRadius: `calc(${"var(--ds-radius-xsmall, 2px)"} + 1px)`,
+      borderRadius: "var(--ds-radius-small, 4px)",
       opacity: 0.6
     }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.show-diff-deleted-node-traditional .media-card-wrapper': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '& > div': {
+      // 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-red, #E2483D)"}`,
+      borderRadius: "var(--ds-radius-small, 4px)"
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '[data-prosemirror-node-name="blockquote"].show-diff-deleted-node': {
+    textDecoration: 'line-through'
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '[data-prosemirror-node-name="blockquote"].show-diff-deleted-node-traditional': {
+    textDecoration: 'line-through',
+    textDecorationColor: "var(--ds-border-accent-red, #E2483D)"
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '[data-prosemirror-node-name="embedCard"].show-diff-deleted-node-traditional': {
+    textDecoration: 'line-through',
+    textDecorationColor: "var(--ds-border-accent-red, #E2483D)"
   }
 });
 

package/dist/es2019/version-wrapper.js

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

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

@@ -35,7 +35,7 @@ import { embedCardStyles } from './styles/embedCardStyles';
 import { emojiDangerStyles, emojiStyles, scaledEmojiStyles, getDenseEmojiStyles, getScaledDenseEmojiStyles } 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, extensionDiffStyles } from './styles/extensionStyles';
-import { findReplaceStyles, findReplaceStylesWithCodeblockColorContrastFix, findReplaceStylesNew, findReplaceStylesNewWithCodeblockColorContrastFix } from './styles/findReplaceStyles';
+import { findReplaceStyles, findReplaceStylesWithCodeblockColorContrastFix, findReplaceStylesNew, findReplaceStylesNewWithCodeblockColorContrastFix, findReplaceStylesNewWithA11Y } from './styles/findReplaceStyles';
 import { firstBlockNodeStyles } from './styles/firstBlockNodeStyles';
 import { firstFloatingToolbarButtonStyles } from './styles/floatingToolbarStyles';
 import { fullPageEditorStyles } from './styles/fullPageEditorStyles';
@@ -270,6 +270,10 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     fg('platform-visual-refresh-icons') && expandStylesMixin_fg_platform_visual_refresh_icons, expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ?
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    fg('platform_editor_a11y_find_replace_focus_ring') ?
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    findReplaceStylesNewWithA11Y :
+    // 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, expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) && fg('platform_editor_find_codeblock_color_contrast_fix') &&

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

@@ -194,6 +194,179 @@ export var findReplaceStylesNew = css({
   },
   /** Dark mode */
 
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-expand-title.search-match-dark > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
+    boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder, #AE4787)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-bolder-pressed, #77325B)", "\n\t\t"),
+    backgroundColor: "var(--ds-background-accent-magenta-bolder-pressed, #77325B)",
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.ak-editor-expand__title-input': {
+      color: "var(--ds-text-inverse, #FFFFFF)"
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-expand-title.selected-search-match.search-match-dark > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
+    boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder, #AE4787)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-bolder-hovered, #943D73)", "\n\t\t"),
+    backgroundColor: "var(--ds-background-accent-magenta-bolder-hovered, #943D73)"
+  }
+});
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export var findReplaceStylesNewWithA11Y = css({
+  /** Text match styles */
+
+  /** Light mode */
+
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-text': {
+    borderRadius: "var(--ds-space-050, 4px)",
+    boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-border-accent-magenta, #CD519D)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-subtler, #FDD0EC)", "\n\t\t"),
+    // 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
+    backgroundColor: "var(--ds-background-accent-magenta-subtler, #FDD0EC)".concat(" !important"),
+    color: "var(--ds-text, #292A2E)"
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-text.selected-search-match': {
+    boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-border-accent-magenta, #CD519D)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", "\n\t\t"),
+    // 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
+    backgroundColor: "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)".concat(" !important")
+  },
+  /** Dark mode */
+
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-text.search-match-dark': {
+    boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder, #AE4787)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-bolder-pressed, #77325B)", "\n\t\t"),
+    // 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
+    backgroundColor: "var(--ds-background-accent-magenta-bolder-pressed, #77325B)".concat(" !important"),
+    color: "var(--ds-text-inverse, #FFFFFF)"
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-text.selected-search-match.search-match-dark': {
+    boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder, #AE4787)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-bolder-hovered, #943D73)", "\n\t\t"),
+    // 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
+    backgroundColor: "var(--ds-background-accent-magenta-bolder-hovered, #943D73)".concat(" !important")
+  },
+  /** Block match styles */
+
+  /** Light mode */
+
+  /** Without node selection */
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-border-accent-magenta, #CD519D)", ",\n\t\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-subtler, #FDD0EC)", "\n\t\t\t")
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: "\n\t\t\t0px 0px 0px 4px ".concat("var(--ds-background-accent-magenta-subtler, #FDD0EC)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-border-accent-magenta, #CD519D)", "\n\t\t\t")
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block.search-match-block-selected': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-border-accent-magenta, #CD519D)", ",\n\t\t\tinset 0 0 0 4px ", "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", "\n\t\t\t")
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: "\n\t\t\t0px 0px 0px 4px ".concat("var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-border-accent-magenta, #CD519D)", "\n\t\t\t")
+    }
+  },
+  /** With node selection */
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block.ak-editor-selected-node': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>div::after': {
+      boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-border-accent-magenta, #CD519D)", ",\n\t\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-subtler, #FDD0EC)", ",\n\t\t\t0 0 0 1px ", "var(--ds-border-selected, #1868DB)", "\n\t\t\t")
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ", 0px 0px 0px 4px ", "var(--ds-background-accent-magenta-subtler, #FDD0EC)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-magenta-subtler-pressed, #F797D2)")
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block.search-match-block-selected.ak-editor-selected-node': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-border-accent-magenta, #CD519D)", ",\n\t\t\tinset 0 0 0 4px ", "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", ",\n\t\t\t0 0 0 1px ", "var(--ds-border-selected, #1868DB)", "\n\t\t\t")
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ", 0px 0px 0px 4px ", "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-magenta-subtler-pressed, #F797D2)")
+    }
+  },
+  /** Dark mode */
+  /** Without node selection */
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block.search-match-dark': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder, #AE4787)", ",\n\t\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-bolder-pressed, #77325B)", "\n\t\t\t")
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: "0px 0px 0px 4px ".concat("var(--ds-background-accent-magenta-bolder-pressed, #77325B)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)")
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block.search-match-block-selected.search-match-dark': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder, #AE4787)", ",\n\t\t\tinset 0 0 0 4px ", "var(--ds-background-accent-magenta-bolder-hovered, #943D73)", "\n\t\t\t")
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: "0px 0px 0px 4px ".concat("var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)")
+    }
+  },
+  /** With node selection */
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block.search-match-dark.ak-editor-selected-node': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>div::after': {
+      boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder, #AE4787)", ",\n\t\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-bolder-pressed, #77325B)", ",\n\t\t\t0 0 0 1px ", "var(--ds-border-selected, #1868DB)", "\n\t\t\t")
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ", 0px 0px 0px 4px ", "var(--ds-background-accent-magenta-bolder-pressed, #77325B)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)")
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-block.search-match-block-selected.search-match-dark.ak-editor-selected-node': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder, #AE4787)", ",\n\t\t\tinset 0 0 0 4px ", "var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ",\n\t\t\t0 0 0 1px ", "var(--ds-border-selected, #1868DB)", "\n\t\t\t")
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .hover-card-trigger-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container>span': {
+      boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ", 0px 0px 0px 4px ", "var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)")
+    }
+  },
+  /** Expand title match styles */
+
+  /** Light mode */
+
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-expand-title > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
+    borderRadius: "var(--ds-space-050, 4px)",
+    boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-border-accent-magenta, #CD519D)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-subtler, #FDD0EC)", "\n\t\t"),
+    backgroundColor: "var(--ds-background-accent-magenta-subtler, #FDD0EC)",
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.ak-editor-expand__title-input': {
+      color: "var(--ds-text, #292A2E)"
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.search-match-expand-title.selected-search-match > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
+    boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-border-accent-magenta, #CD519D)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", "\n\t\t"),
+    backgroundColor: "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)"
+  },
+  /** Dark mode */
+
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '.search-match-expand-title.search-match-dark > .ak-editor-expand__title-container > .ak-editor-expand__input-container': {
     boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder, #AE4787)", ",\n\t\tinset 0 0 0 5px ", "var(--ds-background-accent-magenta-bolder-pressed, #77325B)", "\n\t\t"),

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

@@ -31,18 +31,39 @@ export var smartCardDiffStyles = css(_defineProperty({}, ".".concat(SmartCardSha
 })));
 
 // 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 showDiffDeletedNodeStyles = css(_defineProperty(_defineProperty({}, ".".concat(SmartCardSharedCssClassName.EMBED_CARD_CONTAINER), _defineProperty({}, "&.show-diff-deleted-node .".concat(SmartCardSharedCssClassName.LOADER_WRAPPER, " > div::after"), {
+export var showDiffDeletedNodeStyles = css(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ".".concat(SmartCardSharedCssClassName.EMBED_CARD_CONTAINER), _defineProperty(_defineProperty(_defineProperty({}, "&.show-diff-deleted-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-gray, #7D818A)"),
   borderColor: 'transparent'
+}), "&.show-diff-deleted-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-red, #E2483D)"),
+  borderColor: 'transparent'
+}), "&.show-diff-deleted-node .".concat(SmartCardSharedCssClassName.LOADER_WRAPPER), {
+  opacity: 0.6
 })), '.show-diff-deleted-node .media-card-wrapper', {
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '& > div': {
     // 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-gray, #7D818A)"),
-    borderRadius: "calc(".concat("var(--ds-radius-xsmall, 2px)", " + 1px)"),
+    borderRadius: "var(--ds-radius-small, 4px)",
     opacity: 0.6
   }
+}), '.show-diff-deleted-node-traditional .media-card-wrapper', {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '& > div': {
+    // 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-red, #E2483D)"),
+    borderRadius: "var(--ds-radius-small, 4px)"
+  }
+}), '[data-prosemirror-node-name="blockquote"].show-diff-deleted-node', {
+  textDecoration: 'line-through'
+}), '[data-prosemirror-node-name="blockquote"].show-diff-deleted-node-traditional', {
+  textDecoration: 'line-through',
+  textDecorationColor: "var(--ds-border-accent-red, #E2483D)"
+}), '[data-prosemirror-node-name="embedCard"].show-diff-deleted-node-traditional', {
+  textDecoration: 'line-through',
+  textDecorationColor: "var(--ds-border-accent-red, #E2483D)"
 }));
 
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766

package/dist/esm/version-wrapper.js

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

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

@@ -3,3 +3,4 @@ export declare const findReplaceStyles: SerializedStyles;
 export declare const findReplaceStylesWithCodeblockColorContrastFix: SerializedStyles;
 export declare const findReplaceStylesNewWithCodeblockColorContrastFix: SerializedStyles;
 export declare const findReplaceStylesNew: SerializedStyles;
+export declare const findReplaceStylesNewWithA11Y: SerializedStyles;

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

@@ -3,3 +3,4 @@ export declare const findReplaceStyles: SerializedStyles;
 export declare const findReplaceStylesWithCodeblockColorContrastFix: SerializedStyles;
 export declare const findReplaceStylesNewWithCodeblockColorContrastFix: SerializedStyles;
 export declare const findReplaceStylesNew: SerializedStyles;
+export declare const findReplaceStylesNewWithA11Y: SerializedStyles;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "215.17.4",
+	"version": "215.18.1",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -64,7 +64,7 @@
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/react-ufo": "^4.15.0",
 		"@atlaskit/task-decision": "^19.2.0",
-		"@atlaskit/tmp-editor-statsig": "^14.6.0",
+		"@atlaskit/tmp-editor-statsig": "^14.7.0",
 		"@atlaskit/tokens": "^8.4.0",
 		"@atlaskit/tooltip": "^20.10.0",
 		"@atlaskit/width-detector": "^5.0.0",
@@ -81,7 +81,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.38.0",
+		"@atlaskit/editor-common": "^110.39.0",
 		"@atlaskit/link-provider": "^4.0.0",
 		"@atlaskit/media-core": "^37.0.0",
 		"react": "^18.2.0",
@@ -94,7 +94,7 @@
 		"@atlaskit/adf-utils": "^19.26.0",
 		"@atlaskit/analytics-listeners": "^9.1.0",
 		"@atlaskit/collab-provider": "^14.1.0",
-		"@atlaskit/editor-plugin-annotation": "^6.2.0",
+		"@atlaskit/editor-plugin-annotation": "^6.3.0",
 		"@atlaskit/editor-plugin-card": "^11.5.0",
 		"@atlaskit/editor-plugin-list": "^8.2.0",
 		"@atlaskit/editor-plugin-paste": "^7.4.0",
@@ -394,6 +394,9 @@
 		"rovo_chat_enable_skills_ui_m1": {
 			"type": "boolean"
 		},
+		"platform_editor_a11y_find_replace_focus_ring": {
+			"type": "boolean"
+		},
 		"platform-custom-icon-migration": {
 			"type": "boolean"
 		}