@atlaskit/editor-core 216.7.4 → 216.7.6

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-core
 
+## 216.7.6
+
+### Patch Changes
+
+- [`9041ec452a104`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9041ec452a104) -
+  [EDITOR-4515] clean up fg platform_editor_toolbar_aifc_patch_7
+- Updated dependencies
+
+## 216.7.5
+
+### Patch Changes
+
+- [`f9ab3b2b9d564`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f9ab3b2b9d564) -
+  [ux] [ENGHEALTH-43911] update styles for show diff deleted nodes behind
+  platform_editor_jan_a11y_fixes
+- Updated dependencies
+
 ## 216.7.4
 
 ### Patch Changes

package/dist/cjs/ui/Appearance/Comment/Comment.js

@@ -195,7 +195,7 @@ var CommentEditorWithIntl = exports.CommentEditorWithIntl = function CommentEdit
     useStickyToolbar: useStickyToolbar,
     twoLineEditorToolbar: isTwoLineToolbarEnabled,
     isNewToolbarEnabled: isToolbarAIFCEnabled
-  }, isToolbarAIFCEnabled ? (0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_patch_7') ? (0, _react2.jsx)(_uiMenu.ToolbarArrowKeyNavigationProvider, {
+  }, isToolbarAIFCEnabled ? (0, _react2.jsx)(_uiMenu.ToolbarArrowKeyNavigationProvider, {
     editorView: editorView,
     childComponentSelector: "[data-testid='ak-editor-main-toolbar']",
     isShortcutToFocusToolbar: isShortcutToFocusToolbar,
@@ -211,14 +211,6 @@ var CommentEditorWithIntl = exports.CommentEditorWithIntl = function CommentEdit
     popupsBoundariesElement: popupsBoundariesElement,
     popupsScrollableElement: popupsScrollableElement,
     popupsMountPoint: popupsMountPoint
-  }), customPrimaryToolbarComponents ? customToolbarSlot : null) : (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(_CommentToolbar.CommentToolbar, {
-    editorAPI: editorAPI,
-    editorView: editorView,
-    editorAppearance: appearance,
-    disabled: patch6Enabled ? !!disabled : undefined,
-    popupsBoundariesElement: popupsBoundariesElement,
-    popupsScrollableElement: popupsScrollableElement,
-    popupsMountPoint: popupsMountPoint
   }), customPrimaryToolbarComponents ? customToolbarSlot : null) : (0, _react2.jsx)(_uiMenu.ToolbarArrowKeyNavigationProvider, {
     editorView: editorView,
     childComponentSelector: "[data-testid='ak-editor-main-toolbar']",

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

@@ -15,7 +15,6 @@ var _contextPanel = require("@atlaskit/editor-common/context-panel");
 var _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _toolbar2 = require("../../../utils/toolbar");
 var _ExcludeFromHydration = _interopRequireDefault(require("../../ExcludeFromHydration"));
@@ -136,6 +135,6 @@ 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))))));
+    }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents)), /*#__PURE__*/_react.default.createElement(_ToolbarPortal.ToolbarPortalMountPoint, null))))));
   });
 };

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

@@ -237,9 +237,11 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _rule.ruleStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    _smartCardStyles.smartCardDiffStyles,
+    _smartCardStyles.smartCardDiffStyles, (0, _platformFeatureFlags.fg)('platform_editor_ai_generic_prep_for_aifc_2') && ((0, _platformFeatureFlags.fg)('platform_editor_jan_a11y_fixes')
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    (0, _platformFeatureFlags.fg)('platform_editor_ai_generic_prep_for_aifc_2') && _smartCardStyles.showDiffDeletedNodeStyles,
+    ? _smartCardStyles.showDiffDeletedNodeStylesNew
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    : _smartCardStyles.showDiffDeletedNodeStyles),
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _mediaStyles.mediaStyles, contentMode === 'compact' && ((0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) ||
     // eslint-disable-next-line @atlaskit/platform/no-preconditioning

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.smartLinksInLivePagesStyles = exports.smartCardStylesWithSearchMatchAndPreviewPanelResponsiveness = exports.smartCardStylesWithSearchMatchAndBlockMenuDangerStyles = exports.smartCardStylesWithSearchMatch = exports.smartCardStyles = exports.smartCardDiffStyles = exports.showDiffDeletedNodeStyles = exports.linkingVisualRefreshV1Styles = exports.editorControlsSmartCardStyles = exports.SmartCardSharedCssClassName = exports.FLOATING_TOOLBAR_LINKPICKER_CLASSNAME = exports.DATASOURCE_INNER_CONTAINER_CLASSNAME = void 0;
+exports.smartLinksInLivePagesStyles = exports.smartCardStylesWithSearchMatchAndPreviewPanelResponsiveness = exports.smartCardStylesWithSearchMatchAndBlockMenuDangerStyles = exports.smartCardStylesWithSearchMatch = exports.smartCardStyles = exports.smartCardDiffStyles = exports.showDiffDeletedNodeStylesNew = exports.showDiffDeletedNodeStyles = exports.linkingVisualRefreshV1Styles = exports.editorControlsSmartCardStyles = exports.SmartCardSharedCssClassName = exports.FLOATING_TOOLBAR_LINKPICKER_CLASSNAME = exports.DATASOURCE_INNER_CONTAINER_CLASSNAME = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("@emotion/react");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
@@ -74,6 +74,42 @@ var showDiffDeletedNodeStyles = exports.showDiffDeletedNodeStyles = (0, _react.c
   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
+var showDiffDeletedNodeStylesNew = exports.showDiffDeletedNodeStylesNew = (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.8
+})), '.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: "var(--ds-radius-small, 4px)",
+    opacity: 0.8
+  }
+}), '.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
 var smartCardStyles = exports.smartCardStyles = (0, _react.css)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(SmartCardSharedCssClassName.INLINE_CARD_CONTAINER), (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({
   maxWidth: 'calc(100% - 20px)',

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

package/dist/es2019/ui/Appearance/Comment/Comment.js

@@ -183,7 +183,7 @@ export const CommentEditorWithIntl = props => {
     useStickyToolbar: useStickyToolbar,
     twoLineEditorToolbar: isTwoLineToolbarEnabled,
     isNewToolbarEnabled: isToolbarAIFCEnabled
-  }, isToolbarAIFCEnabled ? fg('platform_editor_toolbar_aifc_patch_7') ? jsx(ToolbarArrowKeyNavigationProvider, {
+  }, isToolbarAIFCEnabled ? jsx(ToolbarArrowKeyNavigationProvider, {
     editorView: editorView,
     childComponentSelector: "[data-testid='ak-editor-main-toolbar']",
     isShortcutToFocusToolbar: isShortcutToFocusToolbar,
@@ -199,14 +199,6 @@ export const CommentEditorWithIntl = props => {
     popupsBoundariesElement: popupsBoundariesElement,
     popupsScrollableElement: popupsScrollableElement,
     popupsMountPoint: popupsMountPoint
-  }), customPrimaryToolbarComponents ? customToolbarSlot : null) : jsx(React.Fragment, null, jsx(CommentToolbar, {
-    editorAPI: editorAPI,
-    editorView: editorView,
-    editorAppearance: appearance,
-    disabled: patch6Enabled ? !!disabled : undefined,
-    popupsBoundariesElement: popupsBoundariesElement,
-    popupsScrollableElement: popupsScrollableElement,
-    popupsMountPoint: popupsMountPoint
   }), customPrimaryToolbarComponents ? customToolbarSlot : null) : jsx(ToolbarArrowKeyNavigationProvider, {
     editorView: editorView,
     childComponentSelector: "[data-testid='ak-editor-main-toolbar']",

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

@@ -7,7 +7,6 @@ import { ContextPanelConsumer } from '@atlaskit/editor-common/context-panel';
 import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { shouldShowPrimaryToolbar, TOOLBARS } from '@atlaskit/editor-common/toolbar';
 import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isToolbar } from '../../../utils/toolbar';
 import ExcludeFromHydration from '../../ExcludeFromHydration';
@@ -130,5 +129,5 @@ 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)))))));
+  }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents)), /*#__PURE__*/React.createElement(ToolbarPortalMountPoint, null)))))));
 };

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

@@ -56,7 +56,7 @@ import { scrollbarStyles } from './styles/scrollbarStyles';
 import { hideCursorWhenHideSelectionStyles, hideSelectionStyles, selectedNodeStyles } from './styles/selectionStyles';
 import { selectionToolbarAnimationStyles } from './styles/selectionToolbarStyles';
 import { shadowStyles } from './styles/shadowStyles';
-import { editorControlsSmartCardStyles, linkingVisualRefreshV1Styles, showDiffDeletedNodeStyles, smartCardDiffStyles, smartCardStyles, smartCardStylesWithSearchMatch, smartCardStylesWithSearchMatchAndBlockMenuDangerStyles, smartCardStylesWithSearchMatchAndPreviewPanelResponsiveness, smartLinksInLivePagesStyles } from './styles/smartCardStyles';
+import { editorControlsSmartCardStyles, linkingVisualRefreshV1Styles, showDiffDeletedNodeStyles, showDiffDeletedNodeStylesNew, 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, tableEmptyRowStyles, tableLayoutFixes } from './styles/tableStyles';
@@ -233,9 +233,11 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     ruleStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    smartCardDiffStyles,
+    smartCardDiffStyles, fg('platform_editor_ai_generic_prep_for_aifc_2') && (fg('platform_editor_jan_a11y_fixes')
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    fg('platform_editor_ai_generic_prep_for_aifc_2') && showDiffDeletedNodeStyles,
+    ? showDiffDeletedNodeStylesNew
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    : showDiffDeletedNodeStyles),
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     mediaStyles, contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
     // eslint-disable-next-line @atlaskit/platform/no-preconditioning

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

@@ -94,6 +94,62 @@ export const showDiffDeletedNodeStyles = css({
   }
 });
 
+// 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 const showDiffDeletedNodeStylesNew = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values,@atlaskit/ui-styling-standard/no-nested-selectors
+  [`.${SmartCardSharedCssClassName.EMBED_CARD_CONTAINER}`]: {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values,@atlaskit/ui-styling-standard/no-nested-selectors
+    [`&.show-diff-deleted-node .${SmartCardSharedCssClassName.LOADER_WRAPPER} > div::after`]: {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
+      boxShadow: `0 0 0 1px ${"var(--ds-border-accent-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.8
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.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 ${"var(--ds-border-accent-gray, #7D818A)"}`,
+      borderRadius: "var(--ds-radius-small, 4px)",
+      opacity: 0.8
+    }
+  },
+  // 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)"
+  }
+});
+
 // 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 const smartCardStyles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors,@atlaskit/ui-styling-standard/no-unsafe-values

package/dist/es2019/version-wrapper.js

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

package/dist/esm/ui/Appearance/Comment/Comment.js

@@ -184,7 +184,7 @@ export var CommentEditorWithIntl = function CommentEditorWithIntl(props) {
     useStickyToolbar: useStickyToolbar,
     twoLineEditorToolbar: isTwoLineToolbarEnabled,
     isNewToolbarEnabled: isToolbarAIFCEnabled
-  }, isToolbarAIFCEnabled ? fg('platform_editor_toolbar_aifc_patch_7') ? jsx(ToolbarArrowKeyNavigationProvider, {
+  }, isToolbarAIFCEnabled ? jsx(ToolbarArrowKeyNavigationProvider, {
     editorView: editorView,
     childComponentSelector: "[data-testid='ak-editor-main-toolbar']",
     isShortcutToFocusToolbar: isShortcutToFocusToolbar,
@@ -200,14 +200,6 @@ export var CommentEditorWithIntl = function CommentEditorWithIntl(props) {
     popupsBoundariesElement: popupsBoundariesElement,
     popupsScrollableElement: popupsScrollableElement,
     popupsMountPoint: popupsMountPoint
-  }), customPrimaryToolbarComponents ? customToolbarSlot : null) : jsx(React.Fragment, null, jsx(CommentToolbar, {
-    editorAPI: editorAPI,
-    editorView: editorView,
-    editorAppearance: appearance,
-    disabled: patch6Enabled ? !!disabled : undefined,
-    popupsBoundariesElement: popupsBoundariesElement,
-    popupsScrollableElement: popupsScrollableElement,
-    popupsMountPoint: popupsMountPoint
   }), customPrimaryToolbarComponents ? customToolbarSlot : null) : jsx(ToolbarArrowKeyNavigationProvider, {
     editorView: editorView,
     childComponentSelector: "[data-testid='ak-editor-main-toolbar']",

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

@@ -7,7 +7,6 @@ import { ContextPanelConsumer } from '@atlaskit/editor-common/context-panel';
 import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { shouldShowPrimaryToolbar, TOOLBARS } from '@atlaskit/editor-common/toolbar';
 import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isToolbar } from '../../../utils/toolbar';
 import ExcludeFromHydration from '../../ExcludeFromHydration';
@@ -127,6 +126,6 @@ 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))))));
+    }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents)), /*#__PURE__*/React.createElement(ToolbarPortalMountPoint, null))))));
   });
 };

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

@@ -57,7 +57,7 @@ import { scrollbarStyles } from './styles/scrollbarStyles';
 import { hideCursorWhenHideSelectionStyles, hideSelectionStyles, selectedNodeStyles } from './styles/selectionStyles';
 import { selectionToolbarAnimationStyles } from './styles/selectionToolbarStyles';
 import { shadowStyles } from './styles/shadowStyles';
-import { editorControlsSmartCardStyles, linkingVisualRefreshV1Styles, showDiffDeletedNodeStyles, smartCardDiffStyles, smartCardStyles, smartCardStylesWithSearchMatch, smartCardStylesWithSearchMatchAndBlockMenuDangerStyles, smartCardStylesWithSearchMatchAndPreviewPanelResponsiveness, smartLinksInLivePagesStyles } from './styles/smartCardStyles';
+import { editorControlsSmartCardStyles, linkingVisualRefreshV1Styles, showDiffDeletedNodeStyles, showDiffDeletedNodeStylesNew, 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, tableEmptyRowStyles, tableLayoutFixes } from './styles/tableStyles';
@@ -229,9 +229,11 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     ruleStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    smartCardDiffStyles,
+    smartCardDiffStyles, fg('platform_editor_ai_generic_prep_for_aifc_2') && (fg('platform_editor_jan_a11y_fixes')
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    fg('platform_editor_ai_generic_prep_for_aifc_2') && showDiffDeletedNodeStyles,
+    ? showDiffDeletedNodeStylesNew
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    : showDiffDeletedNodeStyles),
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     mediaStyles, contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
     // eslint-disable-next-line @atlaskit/platform/no-preconditioning

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

@@ -66,6 +66,42 @@ export var showDiffDeletedNodeStyles = css(_defineProperty(_defineProperty(_defi
   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
+export var showDiffDeletedNodeStylesNew = 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.8
+})), '.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: "var(--ds-radius-small, 4px)",
+    opacity: 0.8
+  }
+}), '.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
 export var smartCardStyles = css(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ".".concat(SmartCardSharedCssClassName.INLINE_CARD_CONTAINER), _defineProperty(_defineProperty(_defineProperty({
   maxWidth: 'calc(100% - 20px)',

package/dist/esm/version-wrapper.js

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

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

@@ -11,6 +11,7 @@ export declare const SmartCardSharedCssClassName: {
 export declare const editorControlsSmartCardStyles: SerializedStyles;
 export declare const smartCardDiffStyles: SerializedStyles;
 export declare const showDiffDeletedNodeStyles: SerializedStyles;
+export declare const showDiffDeletedNodeStylesNew: SerializedStyles;
 export declare const smartCardStyles: SerializedStyles;
 export declare const smartCardStylesWithSearchMatch: SerializedStyles;
 export declare const smartCardStylesWithSearchMatchAndBlockMenuDangerStyles: SerializedStyles;

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

@@ -11,6 +11,7 @@ export declare const SmartCardSharedCssClassName: {
 export declare const editorControlsSmartCardStyles: SerializedStyles;
 export declare const smartCardDiffStyles: SerializedStyles;
 export declare const showDiffDeletedNodeStyles: SerializedStyles;
+export declare const showDiffDeletedNodeStylesNew: SerializedStyles;
 export declare const smartCardStyles: SerializedStyles;
 export declare const smartCardStylesWithSearchMatch: SerializedStyles;
 export declare const smartCardStylesWithSearchMatchAndBlockMenuDangerStyles: SerializedStyles;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "216.7.4",
+	"version": "216.7.6",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -58,7 +58,7 @@
 		"@atlaskit/editor-toolbar": "^0.19.0",
 		"@atlaskit/editor-toolbar-model": "^0.3.0",
 		"@atlaskit/emoji": "^69.10.0",
-		"@atlaskit/icon": "^29.4.0",
+		"@atlaskit/icon": "^30.0.0",
 		"@atlaskit/link": "^3.3.0",
 		"@atlaskit/media-card": "^79.14.0",
 		"@atlaskit/mention": "^24.4.0",
@@ -112,7 +112,7 @@
 		"@atlaskit/synchrony-test-helpers": "workspace:^",
 		"@atlaskit/toggle": "^15.2.0",
 		"@atlaskit/util-data-test": "^18.4.0",
-		"@atlassian/a11y-jest-testing": "^0.7.0",
+		"@atlassian/a11y-jest-testing": "^0.8.0",
 		"@atlassian/adf-schema-json": "^1.33.0",
 		"@atlassian/feature-flags-test-utils": "^1.0.0",
 		"@atlassian/search-provider": "^8.0.0",
@@ -286,6 +286,9 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
+		"platform_synced_block_dogfooding": {
+			"type": "boolean"
+		},
 		"atlas_editor_typography_refreshed": {
 			"type": "boolean"
 		},
@@ -323,9 +326,6 @@
 		"platform_editor_text_highlight_padding": {
 			"type": "boolean"
 		},
-		"platform_editor_toolbar_aifc_patch_7": {
-			"type": "boolean"
-		},
 		"platform_editor_toolbar_aifc_placement_overridden": {
 			"type": "boolean"
 		},
@@ -355,6 +355,9 @@
 		},
 		"platform_editor_context_context_types_migration": {
 			"type": "boolean"
+		},
+		"platform_editor_jan_a11y_fixes": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {