npm - @atlaskit/editor-core - Versions diffs - 216.1.0 → 216.1.2 - Mend

@atlaskit/editor-core 216.1.0 → 216.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,24 @@
 # @atlaskit/editor-core
+## 216.1.2
+### Patch Changes
+- [`fabf67c3ca239`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fabf67c3ca239) -
+  EDITOR-4191 Use node selection for all nodes selected via drag handle
+- Updated dependencies
+## 216.1.1
+### Patch Changes
+- [`8691a6ca57af0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8691a6ca57af0) -
+  [ux] [A11Y-25850] update selected find/replace match focus ring color behind
+  platform_editor_a11y_find_replace_focus_ring
+- [`f0bc994a5bdf6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f0bc994a5bdf6) -
+  Fixes toolbar not appearing when platform_editor_toolbar_delay_render_fix is disabled
+- Updated dependencies
 ## 216.1.0
 ### Minor Changes

package/dist/cjs/ui/Appearance/FullPage/FullPageToolbarNext.js CHANGED Viewed

@@ -108,7 +108,7 @@ var FullPageToolbarNext = exports.FullPageToolbarNext = function FullPageToolbar
       showKeyline: showKeyline || ContextPanelWidth > 0
     }, beforeIcon && /*#__PURE__*/_react.default.createElement("div", {
       className: (0, _runtime.ax)([styles.mainToolbarIconBefore, (0, _expValEquals.expValEquals)('platform_editor_toolbar_support_custom_components', 'isEnabled', true) && styles.mainToolbarIconBeforeNew])
-    }, beforeIcon), (0, _expValEquals.expValEquals)('platform_editor_toolbar_support_custom_components', 'isEnabled', true) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(FirstChildWrapper, null, primaryToolbarDockingConfigEnabled && components && (0, _toolbar2.isToolbar)(toolbar) && (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || ((0, _expValEquals.expValEquals)('platform_editor_ssr_renderer', 'isEnabled', true) && (0, _coreUtils.isSSR)() || editorView) && (0, _expValEquals.expValEquals)('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) && !(0, _coreUtils.isSSR)()) && /*#__PURE__*/_react.default.createElement(_Toolbar.ToolbarNext, {
+    }, beforeIcon), (0, _expValEquals.expValEquals)('platform_editor_toolbar_support_custom_components', 'isEnabled', true) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(FirstChildWrapper, null, primaryToolbarDockingConfigEnabled && components && (0, _toolbar2.isToolbar)(toolbar) && (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || ((0, _expValEquals.expValEquals)('platform_editor_ssr_renderer', 'isEnabled', true) && (0, _coreUtils.isSSR)() || editorView) && (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) || !(0, _coreUtils.isSSR)())) && /*#__PURE__*/_react.default.createElement(_Toolbar.ToolbarNext, {
       toolbar: toolbar,
       components: components,
       editorView: editorView,
@@ -121,7 +121,7 @@ var FullPageToolbarNext = exports.FullPageToolbarNext = function FullPageToolbar
     }, !!customPrimaryToolbarComponents && 'before' in customPrimaryToolbarComponents && /*#__PURE__*/_react.default.createElement("div", {
       "data-testid": 'before-primary-toolbar-components-plugin',
       className: (0, _runtime.ax)([styles.beforePrimaryToolbarComponents])
-    }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents)), (0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_patch_7') && /*#__PURE__*/_react.default.createElement(_ToolbarPortal.ToolbarPortalMountPoint, null)) : primaryToolbarDockingConfigEnabled && components && (0, _toolbar2.isToolbar)(toolbar) && (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView && (0, _expValEquals.expValEquals)('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) && !(0, _coreUtils.isSSR)()) && /*#__PURE__*/_react.default.createElement(_Toolbar.ToolbarNext, {
+    }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents)), (0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_patch_7') && /*#__PURE__*/_react.default.createElement(_ToolbarPortal.ToolbarPortalMountPoint, null)) : primaryToolbarDockingConfigEnabled && components && (0, _toolbar2.isToolbar)(toolbar) && (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView && (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) || !(0, _coreUtils.isSSR)())) && /*#__PURE__*/_react.default.createElement(_Toolbar.ToolbarNext, {
       toolbar: toolbar,
       components: components,
       editorView: editorView,

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

@@ -200,7 +200,11 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _blockTypeStyles.blocktypeStyles, (0, _expValEquals.expValEquals)('platform_editor_block_menu', 'isEnabled', true) &&
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    _blockTypeStyles.blockquoteSelectedNodeStyles, (0, _expVal.expVal)('platform_editor_blockquote_zero_padding', 'isEnabled', false) ?
+    _blockTypeStyles.blockquoteSelectedNodeStyles, (0, _expValEquals.expValEquals)('platform_editor_block_menu', 'isEnabled', true) &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    _blockTypeStyles.listSelectedNodeStyles, (0, _expValEquals.expValEquals)('platform_editor_block_menu', 'isEnabled', true) &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    _blockTypeStyles.textSelectedNodeStyles, (0, _expVal.expVal)('platform_editor_blockquote_zero_padding', 'isEnabled', false) ?
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _blockTypeStyles.blockquoteZeroPadding : null,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

package/dist/cjs/ui/EditorContentContainer/styles/blockTypeStyles.js CHANGED Viewed

@@ -1,9 +1,11 @@
 "use strict";
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.blocktypeStyles_without_fg_platform_editor_typography_ugc = exports.blocktypeStyles_fg_platform_editor_typography_ugc = exports.blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes = exports.blocktypeStyles = exports.blockquoteZeroPadding = exports.blockquoteSelectedNodeStyles = exports.blockquoteDangerStyles = void 0;
+exports.textSelectedNodeStyles = exports.listSelectedNodeStyles = exports.blocktypeStyles_without_fg_platform_editor_typography_ugc = exports.blocktypeStyles_fg_platform_editor_typography_ugc = exports.blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes = exports.blocktypeStyles = exports.blockquoteZeroPadding = exports.blockquoteSelectedNodeStyles = exports.blockquoteDangerStyles = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("@emotion/react");
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
@@ -128,24 +130,18 @@ var blockquoteDangerStyles = exports.blockquoteDangerStyles = (0, _react.css)({
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 var blockquoteSelectedNodeStyles = exports.blockquoteSelectedNodeStyles = (0, _react.css)({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  '.ProseMirror': {
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-    '& blockquote': {
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
-      '&.ak-editor-selected-node': {
-        background: "var(--ds-blanket-selected, #388BFF14)",
-        borderLeftColor: "var(--ds-border-selected, #1868DB)",
-        WebkitUserSelect: 'text',
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
-        '&::selection, *::selection': {
-          backgroundColor: 'transparent'
-        },
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
-        '&::-moz-selection, *::-moz-selection': {
-          backgroundColor: 'transparent'
-        }
-      }
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror blockquote.ak-editor-selected-node': {
+    background: "var(--ds-background-accent-blue-subtler, #CFE1FD)",
+    borderLeftColor: "var(--ds-border-selected, #1868DB)",
+    WebkitUserSelect: 'text',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+    '&::selection, *::selection': {
+      backgroundColor: 'transparent'
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+    '&::-moz-selection, *::-moz-selection': {
+      backgroundColor: 'transparent'
     }
   }
 });
@@ -337,4 +333,45 @@ var blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes = exports.block
   '.ak-editor-content-area .ak-editor-content-area .ProseMirror blockquote': {
     paddingLeft: "var(--ds-space-200, 16px)"
   }
-});
+});
+// This class applies when the node is selected directly or is included in the selected range
+var isSelectedNode = '.ak-editor-selected-node';
+var isOuterMostSelectedNode = "".concat(isSelectedNode, ":not(").concat(isSelectedNode, " *)");
+// This class applies when there is a node selection on this node directly
+var isOnlySelectedNode = '.ProseMirror-selectednode';
+var isOuterMostOnlySelectedNode = "".concat(isOnlySelectedNode, ":not(").concat(isOnlySelectedNode, " *)");
+var isList = ':is(ul, ol, div[data-node-type="actionList"])';
+var isOuterMostList = "".concat(isList, ":not(").concat(isList, " *)");
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+var listSelectedNodeStyles = exports.listSelectedNodeStyles = (0, _react.css)((0, _defineProperty2.default)({}, ".ProseMirror ".concat(isOuterMostList).concat(isOuterMostSelectedNode), {
+  background: "var(--ds-background-accent-blue-subtler, #CFE1FD)",
+  WebkitUserSelect: 'text',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+  '&::selection, *::selection': {
+    backgroundColor: 'transparent'
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+  '&::-moz-selection, *::-moz-selection': {
+    backgroundColor: 'transparent'
+  }
+}));
+var isText = ":is(p, h1, h2, h3, h4, h5, h6)";
+var isRootText = "".concat(isText, ":not(").concat(isList, " ").concat(isText, ")");
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+var textSelectedNodeStyles = exports.textSelectedNodeStyles = (0, _react.css)((0, _defineProperty2.default)({}, ".ProseMirror ".concat(isRootText).concat(isOuterMostOnlySelectedNode), {
+  background: "var(--ds-background-accent-blue-subtler, #CFE1FD)",
+  WebkitUserSelect: 'text',
+  boxShadow: "0 -4px 0 ".concat("var(--ds-background-accent-blue-subtler, #CFE1FD)", ", 0 4px 0 ", "var(--ds-background-accent-blue-subtler, #CFE1FD)"),
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+  '&::selection, *::selection': {
+    backgroundColor: 'transparent'
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+  '&::-moz-selection, *::-moz-selection': {
+    backgroundColor: 'transparent'
+  }
+}));

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

@@ -220,10 +220,7 @@ var findReplaceStylesNew = exports.findReplaceStylesNew = (0, _react.css)({
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _react.css)({
-  /** Text match styles */
-  /** Light mode */
+  // text - inactive match - light mode
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '.search-match-text': {
     borderRadius: "var(--ds-space-050, 4px)",
@@ -233,15 +230,15 @@ var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _r
     backgroundColor: "var(--ds-background-accent-magenta-subtler, #FDD0EC)".concat(" !important"),
     color: "var(--ds-text, #292A2E)"
   },
+  // text - active match - light mode
   // 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"),
+    boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ",\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 */
+  // text - inactive match - 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"),
@@ -250,6 +247,7 @@ var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _r
     backgroundColor: "var(--ds-background-accent-magenta-bolder-pressed, #77325B)".concat(" !important"),
     color: "var(--ds-text-inverse, #FFFFFF)"
   },
+  // text - active match - dark mode
   // 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"),
@@ -257,11 +255,7 @@ var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _r
     // 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 */
+  // block node - inactive match - 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
@@ -273,18 +267,19 @@ var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _r
       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")
     }
   },
+  // block node - active match - light mode - without node selection
   // 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")
+      boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ",\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")
+      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-background-accent-magenta-bolder-hovered, #943D73)", "\n\t\t\t")
     }
   },
-  /** With node selection */
+  // block node - inactive match - light mode - 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
@@ -293,22 +288,22 @@ var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _r
     },
     // 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)")
+      boxShadow: "\n\t\t\t0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ",\n\t\t\t0px 0px 0px 4px ", "var(--ds-background-accent-magenta-subtler, #FDD0EC)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-border-accent-magenta, #CD519D)", "\n\t\t\t")
     }
   },
+  // block node - active match - light mode - with node selection
   // 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")
+      boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ",\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)")
+      boxShadow: "\n\t\t\t0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ",\n\t\t\t0px 0px 0px 4px ", "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder-hovered, #943D73)", "\n\t\t\t")
     }
   },
-  /** Dark mode */
-  /** Without node selection */
+  // block node - inactive match - 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
@@ -317,9 +312,10 @@ var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _r
     },
     // 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)")
+      boxShadow: "\n\t\t\t0px 0px 0px 4px ".concat("var(--ds-background-accent-magenta-bolder-pressed, #77325B)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)", "\n\t\t\t")
     }
   },
+  // block node - active match - dark mode - without node selection
   // 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
@@ -328,10 +324,10 @@ var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _r
     },
     // 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)")
+      boxShadow: "\n\t\t\t0px 0px 0px 4px ".concat("var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)", "\n\t\t\t")
     }
   },
-  /** With node selection */
+  // block node - inactive match - dark mode - 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
@@ -340,9 +336,10 @@ var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _r
     },
     // 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)")
+      boxShadow: "\n\t\t\t0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ",\n\t\t\t0px 0px 0px 4px ", "var(--ds-background-accent-magenta-bolder-pressed, #77325B)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)", "\n\t\t\t")
     }
   },
+  // block node - active match - dark mode - with node selection
   // 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
@@ -351,13 +348,10 @@ var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _r
     },
     // 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)")
+      boxShadow: "\n\t\t\t0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ",\n\t\t\t0px 0px 0px 4px ", "var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)", "\n\t\t\t")
     }
   },
-  /** Expand title match styles */
-  /** Light mode */
+  // expand title - inactive match - 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)",
@@ -368,13 +362,13 @@ var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _r
       color: "var(--ds-text, #292A2E)"
     }
   },
+  // expand title - active match - light mode
   // 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"),
+    boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ",\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 */
+  // expand title - inactive match - 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"),
@@ -384,6 +378,7 @@ var findReplaceStylesNewWithA11Y = exports.findReplaceStylesNewWithA11Y = (0, _r
       color: "var(--ds-text-inverse, #FFFFFF)"
     }
   },
+  // expand title - active match - dark mode
   // 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"),

package/dist/cjs/version-wrapper.js CHANGED Viewed

@@ -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 = "216.0.2";
+var version = exports.version = "216.1.1";

package/dist/es2019/ui/Appearance/FullPage/FullPageToolbarNext.js CHANGED Viewed

@@ -102,7 +102,7 @@ export const FullPageToolbarNext = ({
     showKeyline: showKeyline || ContextPanelWidth > 0
   }, beforeIcon && /*#__PURE__*/React.createElement("div", {
     className: ax([styles.mainToolbarIconBefore, expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) && styles.mainToolbarIconBeforeNew])
-  }, beforeIcon), expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FirstChildWrapper, null, primaryToolbarDockingConfigEnabled && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || (expValEquals('platform_editor_ssr_renderer', 'isEnabled', true) && isSSR() || editorView) && expValEquals('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) && !isSSR()) && /*#__PURE__*/React.createElement(ToolbarNext, {
+  }, beforeIcon), expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FirstChildWrapper, null, primaryToolbarDockingConfigEnabled && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || (expValEquals('platform_editor_ssr_renderer', 'isEnabled', true) && isSSR() || editorView) && (!expValEquals('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) || !isSSR())) && /*#__PURE__*/React.createElement(ToolbarNext, {
     toolbar: toolbar,
     components: components,
     editorView: editorView,
@@ -115,7 +115,7 @@ export const FullPageToolbarNext = ({
   }, !!customPrimaryToolbarComponents && 'before' in customPrimaryToolbarComponents && /*#__PURE__*/React.createElement("div", {
     "data-testid": 'before-primary-toolbar-components-plugin',
     className: ax([styles.beforePrimaryToolbarComponents])
-  }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents)), fg('platform_editor_toolbar_aifc_patch_7') && /*#__PURE__*/React.createElement(ToolbarPortalMountPoint, null)) : primaryToolbarDockingConfigEnabled && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView && expValEquals('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) && !isSSR()) && /*#__PURE__*/React.createElement(ToolbarNext, {
+  }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents)), fg('platform_editor_toolbar_aifc_patch_7') && /*#__PURE__*/React.createElement(ToolbarPortalMountPoint, null)) : primaryToolbarDockingConfigEnabled && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView && (!expValEquals('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) || !isSSR())) && /*#__PURE__*/React.createElement(ToolbarNext, {
     toolbar: toolbar,
     components: components,
     editorView: editorView,

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

@@ -22,7 +22,7 @@ import { annotationStyles } from './styles/annotationStyles';
 import { backgroundColorStyles, textHighlightPaddingStyles } from './styles/backgroundColorStyles';
 import { baseStyles, baseStylesMaxContainerWidthFixes, editorLargeGutterPuddingBaseStyles, editorLargeGutterPuddingBaseStylesEditorControls, editorLargeGutterPuddingReducedBaseStyles } from './styles/baseStyles';
 import { blockMarksStyles } from './styles/blockMarksStyles';
-import { blockquoteSelectedNodeStyles, blockquoteDangerStyles, blocktypeStyles, blockquoteZeroPadding, blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes, blocktypeStyles_fg_platform_editor_typography_ugc, blocktypeStyles_without_fg_platform_editor_typography_ugc } from './styles/blockTypeStyles';
+import { blockquoteDangerStyles, blockquoteSelectedNodeStyles, blockquoteZeroPadding, blocktypeStyles, blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes, blocktypeStyles_fg_platform_editor_typography_ugc, blocktypeStyles_without_fg_platform_editor_typography_ugc, listSelectedNodeStyles, textSelectedNodeStyles } from './styles/blockTypeStyles';
 import { codeBidiWarningStyles } from './styles/codeBidiWarningStyles';
 import { codeBgColorStyles, codeBlockStyles, codeBlockStylesWithEmUnits, firstCodeBlockWithNoMargin, firstCodeBlockWithNoMarginOld } from './styles/codeBlockStyles';
 import { codeMarkStyles } from './styles/codeMarkStyles';
@@ -59,7 +59,7 @@ import { shadowStyles } from './styles/shadowStyles';
 import { editorControlsSmartCardStyles, linkingVisualRefreshV1Styles, showDiffDeletedNodeStyles, smartCardDiffStyles, smartCardStyles, smartCardStylesWithSearchMatch, smartCardStylesWithSearchMatchAndBlockMenuDangerStyles, smartCardStylesWithSearchMatchAndPreviewPanelResponsiveness, smartLinksInLivePagesStyles } from './styles/smartCardStyles';
 import { statusDangerStyles, statusStyles, statusStylesMixin_fg_platform_component_visual_refresh, statusStylesMixin_fg_platform_component_visual_refresh_with_search_match, statusStylesMixin_without_fg_platform_component_visual_refresh, statusStylesMixin_without_fg_platform_component_visual_refresh_with_search_match } from './styles/statusStyles';
 import { syncBlockStyles } from './styles/syncBlockStyles';
-import { tableCommentEditorStyles, tableContainerOverflowY, tableContainerStyles, tableLayoutFixes, tableEmptyRowStyles } from './styles/tableStyles';
+import { tableCommentEditorStyles, tableContainerOverflowY, tableContainerStyles, tableEmptyRowStyles, tableLayoutFixes } from './styles/tableStyles';
 import { decisionDangerStyles, decisionIconWithVisualRefresh, decisionStyles, getDenseTasksAndDecisionsStyles, taskItemStyles, taskItemStylesWithBlockTaskItem, tasksAndDecisionsStyles } from './styles/tasksAndDecisionsStyles';
 import { telepointerColorAndCommonStyle, telepointerStyle } from './styles/telepointerStyles';
 import { textColorStyles } from './styles/textColorStyles';
@@ -196,7 +196,11 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     blocktypeStyles, expValEquals('platform_editor_block_menu', 'isEnabled', true) &&
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    blockquoteSelectedNodeStyles, expVal('platform_editor_blockquote_zero_padding', 'isEnabled', false) ?
+    blockquoteSelectedNodeStyles, expValEquals('platform_editor_block_menu', 'isEnabled', true) &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    listSelectedNodeStyles, expValEquals('platform_editor_block_menu', 'isEnabled', true) &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    textSelectedNodeStyles, expVal('platform_editor_blockquote_zero_padding', 'isEnabled', false) ?
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     blockquoteZeroPadding : null,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

package/dist/es2019/ui/EditorContentContainer/styles/blockTypeStyles.js CHANGED Viewed

@@ -121,24 +121,18 @@ export const blockquoteDangerStyles = css({
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 export const blockquoteSelectedNodeStyles = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  '.ProseMirror': {
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-    '& blockquote': {
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
-      '&.ak-editor-selected-node': {
-        background: "var(--ds-blanket-selected, #388BFF14)",
-        borderLeftColor: "var(--ds-border-selected, #1868DB)",
-        WebkitUserSelect: 'text',
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
-        '&::selection, *::selection': {
-          backgroundColor: 'transparent'
-        },
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
-        '&::-moz-selection, *::-moz-selection': {
-          backgroundColor: 'transparent'
-        }
-      }
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror blockquote.ak-editor-selected-node': {
+    background: "var(--ds-background-accent-blue-subtler, #CFE1FD)",
+    borderLeftColor: "var(--ds-border-selected, #1868DB)",
+    WebkitUserSelect: 'text',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+    '&::selection, *::selection': {
+      backgroundColor: 'transparent'
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+    '&::-moz-selection, *::-moz-selection': {
+      backgroundColor: 'transparent'
     }
   }
 });
@@ -330,4 +324,52 @@ export const blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes = css(
   '.ak-editor-content-area .ak-editor-content-area .ProseMirror blockquote': {
     paddingLeft: "var(--ds-space-200, 16px)"
   }
+});
+// This class applies when the node is selected directly or is included in the selected range
+const isSelectedNode = '.ak-editor-selected-node';
+const isOuterMostSelectedNode = `${isSelectedNode}:not(${isSelectedNode} *)`;
+// This class applies when there is a node selection on this node directly
+const isOnlySelectedNode = '.ProseMirror-selectednode';
+const isOuterMostOnlySelectedNode = `${isOnlySelectedNode}:not(${isOnlySelectedNode} *)`;
+const isList = ':is(ul, ol, div[data-node-type="actionList"])';
+const isOuterMostList = `${isList}:not(${isList} *)`;
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export const listSelectedNodeStyles = css({
+  // only apply selected styles to the outermost list to avoid nested selection styles for lists within lists
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values
+  [`.ProseMirror ${isOuterMostList}${isOuterMostSelectedNode}`]: {
+    background: "var(--ds-background-accent-blue-subtler, #CFE1FD)",
+    WebkitUserSelect: 'text',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+    '&::selection, *::selection': {
+      backgroundColor: 'transparent'
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+    '&::-moz-selection, *::-moz-selection': {
+      backgroundColor: 'transparent'
+    }
+  }
+});
+const isText = `:is(p, h1, h2, h3, h4, h5, h6)`;
+const isRootText = `${isText}:not(${isList} ${isText})`;
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export const textSelectedNodeStyles = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values
+  [`.ProseMirror ${isRootText}${isOuterMostOnlySelectedNode}`]: {
+    background: "var(--ds-background-accent-blue-subtler, #CFE1FD)",
+    WebkitUserSelect: 'text',
+    boxShadow: `0 -4px 0 ${"var(--ds-background-accent-blue-subtler, #CFE1FD)"}, 0 4px 0 ${"var(--ds-background-accent-blue-subtler, #CFE1FD)"}`,
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+    '&::selection, *::selection': {
+      backgroundColor: 'transparent'
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+    '&::-moz-selection, *::-moz-selection': {
+      backgroundColor: 'transparent'
+    }
+  }
 });

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

@@ -269,10 +269,7 @@ export const findReplaceStylesNew = css({
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 export const findReplaceStylesNewWithA11Y = css({
-  /** Text match styles */
-  /** Light mode */
+  // text - inactive match - light mode
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '.search-match-text': {
     borderRadius: "var(--ds-space-050, 4px)",
@@ -285,18 +282,18 @@ export const findReplaceStylesNewWithA11Y = css({
     backgroundColor: `${"var(--ds-background-accent-magenta-subtler, #FDD0EC)"} !important`,
     color: "var(--ds-text, #292A2E)"
   },
+  // text - active match - light mode
   // 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 1px ${"var(--ds-background-accent-magenta-bolder-hovered, #943D73)"},
 		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 */
+  // text - inactive match - dark mode
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '.search-match-text.search-match-dark': {
     boxShadow: `
@@ -308,6 +305,7 @@ export const findReplaceStylesNewWithA11Y = css({
     backgroundColor: `${"var(--ds-background-accent-magenta-bolder-pressed, #77325B)"} !important`,
     color: "var(--ds-text-inverse, #FFFFFF)"
   },
+  // text - active match - dark mode
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '.search-match-text.selected-search-match.search-match-dark': {
     boxShadow: `
@@ -318,11 +316,7 @@ export const findReplaceStylesNewWithA11Y = css({
     // 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 */
+  // block node - inactive match - 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
@@ -340,12 +334,13 @@ export const findReplaceStylesNewWithA11Y = css({
 			`
     }
   },
+  // block node - active match - light mode - without node selection
   // 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 1px ${"var(--ds-background-accent-magenta-bolder-hovered, #943D73)"},
 			inset 0 0 0 4px ${"var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)"}
 			`
     },
@@ -353,11 +348,11 @@ export const findReplaceStylesNewWithA11Y = css({
     '.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)"}
+			0px 0px 0px 5px ${"var(--ds-background-accent-magenta-bolder-hovered, #943D73)"}
 			`
     }
   },
-  /** With node selection */
+  // block node - inactive match - light mode - 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
@@ -370,26 +365,34 @@ export const findReplaceStylesNewWithA11Y = css({
     },
     // 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)"}`
+      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-border-accent-magenta, #CD519D)"}
+			`
     }
   },
+  // block node - active match - light mode - with node selection
   // 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 1px ${"var(--ds-background-accent-magenta-bolder-hovered, #943D73)"},
 			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)"}`
+      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-bolder-hovered, #943D73)"}
+			`
     }
   },
-  /** Dark mode */
-  /** Without node selection */
+  // block node - inactive match - 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
@@ -401,9 +404,13 @@ export const findReplaceStylesNewWithA11Y = css({
     },
     // 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)"}`
+      boxShadow: `
+			0px 0px 0px 4px ${"var(--ds-background-accent-magenta-bolder-pressed, #77325B)"},
+			0px 0px 0px 5px ${"var(--ds-background-accent-magenta-bolder, #AE4787)"}
+			`
     }
   },
+  // block node - active match - dark mode - without node selection
   // 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
@@ -415,10 +422,13 @@ export const findReplaceStylesNewWithA11Y = css({
     },
     // 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)"}`
+      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 */
+  // block node - inactive match - dark mode - 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
@@ -431,9 +441,14 @@ export const findReplaceStylesNewWithA11Y = css({
     },
     // 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)"}`
+      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)"}
+			`
     }
   },
+  // block node - active match - dark mode - with node selection
   // 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
@@ -446,13 +461,14 @@ export const findReplaceStylesNewWithA11Y = css({
     },
     // 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)"}`
+      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 */
+  // expand title - inactive match - 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)",
@@ -466,16 +482,16 @@ export const findReplaceStylesNewWithA11Y = css({
       color: "var(--ds-text, #292A2E)"
     }
   },
+  // expand title - active match - light mode
   // 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 1px ${"var(--ds-background-accent-magenta-bolder-hovered, #943D73)"},
 		inset 0 0 0 5px ${"var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)"}
 		`,
     backgroundColor: "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)"
   },
-  /** Dark mode */
+  // expand title - inactive match - 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: `
@@ -488,6 +504,7 @@ export const findReplaceStylesNewWithA11Y = css({
       color: "var(--ds-text-inverse, #FFFFFF)"
     }
   },
+  // expand title - active match - dark mode
   // 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: `

package/dist/es2019/version-wrapper.js CHANGED Viewed

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

package/dist/esm/ui/Appearance/FullPage/FullPageToolbarNext.js CHANGED Viewed

@@ -99,7 +99,7 @@ export var FullPageToolbarNext = function FullPageToolbarNext(_ref4) {
       showKeyline: showKeyline || ContextPanelWidth > 0
     }, beforeIcon && /*#__PURE__*/React.createElement("div", {
       className: ax([styles.mainToolbarIconBefore, expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) && styles.mainToolbarIconBeforeNew])
-    }, beforeIcon), expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FirstChildWrapper, null, primaryToolbarDockingConfigEnabled && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || (expValEquals('platform_editor_ssr_renderer', 'isEnabled', true) && isSSR() || editorView) && expValEquals('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) && !isSSR()) && /*#__PURE__*/React.createElement(ToolbarNext, {
+    }, beforeIcon), expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FirstChildWrapper, null, primaryToolbarDockingConfigEnabled && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || (expValEquals('platform_editor_ssr_renderer', 'isEnabled', true) && isSSR() || editorView) && (!expValEquals('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) || !isSSR())) && /*#__PURE__*/React.createElement(ToolbarNext, {
       toolbar: toolbar,
       components: components,
       editorView: editorView,
@@ -112,7 +112,7 @@ export var FullPageToolbarNext = function FullPageToolbarNext(_ref4) {
     }, !!customPrimaryToolbarComponents && 'before' in customPrimaryToolbarComponents && /*#__PURE__*/React.createElement("div", {
       "data-testid": 'before-primary-toolbar-components-plugin',
       className: ax([styles.beforePrimaryToolbarComponents])
-    }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents)), fg('platform_editor_toolbar_aifc_patch_7') && /*#__PURE__*/React.createElement(ToolbarPortalMountPoint, null)) : primaryToolbarDockingConfigEnabled && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView && expValEquals('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) && !isSSR()) && /*#__PURE__*/React.createElement(ToolbarNext, {
+    }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents)), fg('platform_editor_toolbar_aifc_patch_7') && /*#__PURE__*/React.createElement(ToolbarPortalMountPoint, null)) : primaryToolbarDockingConfigEnabled && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView && (!expValEquals('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) || !isSSR())) && /*#__PURE__*/React.createElement(ToolbarNext, {
       toolbar: toolbar,
       components: components,
       editorView: editorView,

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

@@ -23,7 +23,7 @@ import { annotationStyles } from './styles/annotationStyles';
 import { backgroundColorStyles, textHighlightPaddingStyles } from './styles/backgroundColorStyles';
 import { baseStyles, baseStylesMaxContainerWidthFixes, editorLargeGutterPuddingBaseStyles, editorLargeGutterPuddingBaseStylesEditorControls, editorLargeGutterPuddingReducedBaseStyles } from './styles/baseStyles';
 import { blockMarksStyles } from './styles/blockMarksStyles';
-import { blockquoteSelectedNodeStyles, blockquoteDangerStyles, blocktypeStyles, blockquoteZeroPadding, blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes, blocktypeStyles_fg_platform_editor_typography_ugc, blocktypeStyles_without_fg_platform_editor_typography_ugc } from './styles/blockTypeStyles';
+import { blockquoteDangerStyles, blockquoteSelectedNodeStyles, blockquoteZeroPadding, blocktypeStyles, blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes, blocktypeStyles_fg_platform_editor_typography_ugc, blocktypeStyles_without_fg_platform_editor_typography_ugc, listSelectedNodeStyles, textSelectedNodeStyles } from './styles/blockTypeStyles';
 import { codeBidiWarningStyles } from './styles/codeBidiWarningStyles';
 import { codeBgColorStyles, codeBlockStyles, codeBlockStylesWithEmUnits, firstCodeBlockWithNoMargin, firstCodeBlockWithNoMarginOld } from './styles/codeBlockStyles';
 import { codeMarkStyles } from './styles/codeMarkStyles';
@@ -60,7 +60,7 @@ import { shadowStyles } from './styles/shadowStyles';
 import { editorControlsSmartCardStyles, linkingVisualRefreshV1Styles, showDiffDeletedNodeStyles, smartCardDiffStyles, smartCardStyles, smartCardStylesWithSearchMatch, smartCardStylesWithSearchMatchAndBlockMenuDangerStyles, smartCardStylesWithSearchMatchAndPreviewPanelResponsiveness, smartLinksInLivePagesStyles } from './styles/smartCardStyles';
 import { statusDangerStyles, statusStyles, statusStylesMixin_fg_platform_component_visual_refresh, statusStylesMixin_fg_platform_component_visual_refresh_with_search_match, statusStylesMixin_without_fg_platform_component_visual_refresh, statusStylesMixin_without_fg_platform_component_visual_refresh_with_search_match } from './styles/statusStyles';
 import { syncBlockStyles } from './styles/syncBlockStyles';
-import { tableCommentEditorStyles, tableContainerOverflowY, tableContainerStyles, tableLayoutFixes, tableEmptyRowStyles } from './styles/tableStyles';
+import { tableCommentEditorStyles, tableContainerOverflowY, tableContainerStyles, tableEmptyRowStyles, tableLayoutFixes } from './styles/tableStyles';
 import { decisionDangerStyles, decisionIconWithVisualRefresh, decisionStyles, getDenseTasksAndDecisionsStyles, taskItemStyles, taskItemStylesWithBlockTaskItem, tasksAndDecisionsStyles } from './styles/tasksAndDecisionsStyles';
 import { telepointerColorAndCommonStyle, telepointerStyle } from './styles/telepointerStyles';
 import { textColorStyles } from './styles/textColorStyles';
@@ -192,7 +192,11 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     blocktypeStyles, expValEquals('platform_editor_block_menu', 'isEnabled', true) &&
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    blockquoteSelectedNodeStyles, expVal('platform_editor_blockquote_zero_padding', 'isEnabled', false) ?
+    blockquoteSelectedNodeStyles, expValEquals('platform_editor_block_menu', 'isEnabled', true) &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    listSelectedNodeStyles, expValEquals('platform_editor_block_menu', 'isEnabled', true) &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    textSelectedNodeStyles, expVal('platform_editor_blockquote_zero_padding', 'isEnabled', false) ?
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     blockquoteZeroPadding : null,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

package/dist/esm/ui/EditorContentContainer/styles/blockTypeStyles.js CHANGED Viewed

@@ -1,3 +1,4 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 import { css } from '@emotion/react';
 // This style is needed to avoid Confluence's batch.css overrides that expand blockquote with extra padding after SSR.
@@ -121,24 +122,18 @@ export var blockquoteDangerStyles = css({
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 export var blockquoteSelectedNodeStyles = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  '.ProseMirror': {
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-    '& blockquote': {
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
-      '&.ak-editor-selected-node': {
-        background: "var(--ds-blanket-selected, #388BFF14)",
-        borderLeftColor: "var(--ds-border-selected, #1868DB)",
-        WebkitUserSelect: 'text',
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
-        '&::selection, *::selection': {
-          backgroundColor: 'transparent'
-        },
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
-        '&::-moz-selection, *::-moz-selection': {
-          backgroundColor: 'transparent'
-        }
-      }
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror blockquote.ak-editor-selected-node': {
+    background: "var(--ds-background-accent-blue-subtler, #CFE1FD)",
+    borderLeftColor: "var(--ds-border-selected, #1868DB)",
+    WebkitUserSelect: 'text',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+    '&::selection, *::selection': {
+      backgroundColor: 'transparent'
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+    '&::-moz-selection, *::-moz-selection': {
+      backgroundColor: 'transparent'
     }
   }
 });
@@ -330,4 +325,45 @@ export var blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes = css({
   '.ak-editor-content-area .ak-editor-content-area .ProseMirror blockquote': {
     paddingLeft: "var(--ds-space-200, 16px)"
   }
-});
+});
+// This class applies when the node is selected directly or is included in the selected range
+var isSelectedNode = '.ak-editor-selected-node';
+var isOuterMostSelectedNode = "".concat(isSelectedNode, ":not(").concat(isSelectedNode, " *)");
+// This class applies when there is a node selection on this node directly
+var isOnlySelectedNode = '.ProseMirror-selectednode';
+var isOuterMostOnlySelectedNode = "".concat(isOnlySelectedNode, ":not(").concat(isOnlySelectedNode, " *)");
+var isList = ':is(ul, ol, div[data-node-type="actionList"])';
+var isOuterMostList = "".concat(isList, ":not(").concat(isList, " *)");
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export var listSelectedNodeStyles = css(_defineProperty({}, ".ProseMirror ".concat(isOuterMostList).concat(isOuterMostSelectedNode), {
+  background: "var(--ds-background-accent-blue-subtler, #CFE1FD)",
+  WebkitUserSelect: 'text',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+  '&::selection, *::selection': {
+    backgroundColor: 'transparent'
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+  '&::-moz-selection, *::-moz-selection': {
+    backgroundColor: 'transparent'
+  }
+}));
+var isText = ":is(p, h1, h2, h3, h4, h5, h6)";
+var isRootText = "".concat(isText, ":not(").concat(isList, " ").concat(isText, ")");
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export var textSelectedNodeStyles = css(_defineProperty({}, ".ProseMirror ".concat(isRootText).concat(isOuterMostOnlySelectedNode), {
+  background: "var(--ds-background-accent-blue-subtler, #CFE1FD)",
+  WebkitUserSelect: 'text',
+  boxShadow: "0 -4px 0 ".concat("var(--ds-background-accent-blue-subtler, #CFE1FD)", ", 0 4px 0 ", "var(--ds-background-accent-blue-subtler, #CFE1FD)"),
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+  '&::selection, *::selection': {
+    backgroundColor: 'transparent'
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+  '&::-moz-selection, *::-moz-selection': {
+    backgroundColor: 'transparent'
+  }
+}));

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

@@ -212,10 +212,7 @@ export var findReplaceStylesNew = css({
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 export var findReplaceStylesNewWithA11Y = css({
-  /** Text match styles */
-  /** Light mode */
+  // text - inactive match - light mode
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '.search-match-text': {
     borderRadius: "var(--ds-space-050, 4px)",
@@ -225,15 +222,15 @@ export var findReplaceStylesNewWithA11Y = css({
     backgroundColor: "var(--ds-background-accent-magenta-subtler, #FDD0EC)".concat(" !important"),
     color: "var(--ds-text, #292A2E)"
   },
+  // text - active match - light mode
   // 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"),
+    boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ",\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 */
+  // text - inactive match - 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"),
@@ -242,6 +239,7 @@ export var findReplaceStylesNewWithA11Y = css({
     backgroundColor: "var(--ds-background-accent-magenta-bolder-pressed, #77325B)".concat(" !important"),
     color: "var(--ds-text-inverse, #FFFFFF)"
   },
+  // text - active match - dark mode
   // 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"),
@@ -249,11 +247,7 @@ export var findReplaceStylesNewWithA11Y = css({
     // 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 */
+  // block node - inactive match - 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
@@ -265,18 +259,19 @@ export var findReplaceStylesNewWithA11Y = css({
       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")
     }
   },
+  // block node - active match - light mode - without node selection
   // 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")
+      boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ",\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")
+      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-background-accent-magenta-bolder-hovered, #943D73)", "\n\t\t\t")
     }
   },
-  /** With node selection */
+  // block node - inactive match - light mode - 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
@@ -285,22 +280,22 @@ export var findReplaceStylesNewWithA11Y = css({
     },
     // 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)")
+      boxShadow: "\n\t\t\t0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ",\n\t\t\t0px 0px 0px 4px ", "var(--ds-background-accent-magenta-subtler, #FDD0EC)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-border-accent-magenta, #CD519D)", "\n\t\t\t")
     }
   },
+  // block node - active match - light mode - with node selection
   // 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")
+      boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ",\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)")
+      boxShadow: "\n\t\t\t0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ",\n\t\t\t0px 0px 0px 4px ", "var(--ds-background-accent-magenta-subtlest-pressed, #FCB6E1)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder-hovered, #943D73)", "\n\t\t\t")
     }
   },
-  /** Dark mode */
-  /** Without node selection */
+  // block node - inactive match - 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
@@ -309,9 +304,10 @@ export var findReplaceStylesNewWithA11Y = css({
     },
     // 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)")
+      boxShadow: "\n\t\t\t0px 0px 0px 4px ".concat("var(--ds-background-accent-magenta-bolder-pressed, #77325B)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)", "\n\t\t\t")
     }
   },
+  // block node - active match - dark mode - without node selection
   // 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
@@ -320,10 +316,10 @@ export var findReplaceStylesNewWithA11Y = css({
     },
     // 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)")
+      boxShadow: "\n\t\t\t0px 0px 0px 4px ".concat("var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)", "\n\t\t\t")
     }
   },
-  /** With node selection */
+  // block node - inactive match - dark mode - 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
@@ -332,9 +328,10 @@ export var findReplaceStylesNewWithA11Y = css({
     },
     // 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)")
+      boxShadow: "\n\t\t\t0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ",\n\t\t\t0px 0px 0px 4px ", "var(--ds-background-accent-magenta-bolder-pressed, #77325B)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)", "\n\t\t\t")
     }
   },
+  // block node - active match - dark mode - with node selection
   // 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
@@ -343,13 +340,10 @@ export var findReplaceStylesNewWithA11Y = css({
     },
     // 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)")
+      boxShadow: "\n\t\t\t0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)", ",\n\t\t\t0px 0px 0px 4px ", "var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ",\n\t\t\t0px 0px 0px 5px ", "var(--ds-background-accent-magenta-bolder, #AE4787)", "\n\t\t\t")
     }
   },
-  /** Expand title match styles */
-  /** Light mode */
+  // expand title - inactive match - 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)",
@@ -360,13 +354,13 @@ export var findReplaceStylesNewWithA11Y = css({
       color: "var(--ds-text, #292A2E)"
     }
   },
+  // expand title - active match - light mode
   // 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"),
+    boxShadow: "\n\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-magenta-bolder-hovered, #943D73)", ",\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 */
+  // expand title - inactive match - 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"),
@@ -376,6 +370,7 @@ export var findReplaceStylesNewWithA11Y = css({
       color: "var(--ds-text-inverse, #FFFFFF)"
     }
   },
+  // expand title - active match - dark mode
   // 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"),

package/dist/esm/version-wrapper.js CHANGED Viewed

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

package/dist/types/ui/EditorContentContainer/styles/blockTypeStyles.d.ts CHANGED Viewed

@@ -6,3 +6,5 @@ export declare const blockquoteSelectedNodeStyles: SerializedStyles;
 export declare const blocktypeStyles_fg_platform_editor_typography_ugc: SerializedStyles;
 export declare const blocktypeStyles_without_fg_platform_editor_typography_ugc: SerializedStyles;
 export declare const blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes: SerializedStyles;
+export declare const listSelectedNodeStyles: SerializedStyles;
+export declare const textSelectedNodeStyles: SerializedStyles;

package/dist/types-ts4.5/ui/EditorContentContainer/styles/blockTypeStyles.d.ts CHANGED Viewed

@@ -6,3 +6,5 @@ export declare const blockquoteSelectedNodeStyles: SerializedStyles;
 export declare const blocktypeStyles_fg_platform_editor_typography_ugc: SerializedStyles;
 export declare const blocktypeStyles_without_fg_platform_editor_typography_ugc: SerializedStyles;
 export declare const blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes: SerializedStyles;
+export declare const listSelectedNodeStyles: SerializedStyles;
+export declare const textSelectedNodeStyles: SerializedStyles;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "216.1.0",
+	"version": "216.1.2",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -66,7 +66,7 @@
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/react-ufo": "^4.16.0",
 		"@atlaskit/task-decision": "^19.2.0",
-		"@atlaskit/tmp-editor-statsig": "^16.3.0",
+		"@atlaskit/tmp-editor-statsig": "^16.4.0",
 		"@atlaskit/tokens": "^9.0.0",
 		"@atlaskit/tooltip": "^20.11.0",
 		"@atlaskit/width-detector": "^5.0.0",
@@ -83,7 +83,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^111.1.0",
+		"@atlaskit/editor-common": "^111.2.0",
 		"@atlaskit/link-provider": "^4.0.0",
 		"@atlaskit/media-core": "^37.0.0",
 		"react": "^18.2.0",