@atlaskit/renderer 114.11.0 → 114.11.2

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/renderer
 
+## 114.11.2
+
+### Patch Changes
+
+- [#147828](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/147828)
+  [`874be077a3f5f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/874be077a3f5f) -
+  Wrap RendererFunctionalComponent into memo
+
+## 114.11.1
+
+### Patch Changes
+
+- [#147372](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/147372)
+  [`9a77b2e8909a2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9a77b2e8909a2) -
+  Adding anlytics to help identify root cause of why annotaiton are not applied on some ranges
+- [#147400](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/147400)
+  [`800ff50276ed7`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/800ff50276ed7) -
+  Clean up experiment platform_editor_nested_non_bodied_macros
+- Updated dependencies
+
 ## 114.11.0
 
 ### Minor Changes

package/dist/cjs/actions/index.js

@@ -33,6 +33,54 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
     // This module can only be used when wrapped with
     // the <RendererContext> component for now.
     (0, _defineProperty2.default)(this, "initFromContext", false);
+    // TODO: EDITOR-595 - This method is temporary and should be removed once the following issue
+    // has been identified and fixed: https://atlassian.slack.com/archives/C08JK0WSCH5/p1745902609966999
+    // This is a copy of the original canApplyAnnotationOnRange. If that returns false this is run to figure out exactly why
+    // the annotation cannot be applied to the range.
+    (0, _defineProperty2.default)(this, "_privateWhyCannotApplyAnnotationOnRange", function (pos, doc, schema) {
+      var from = pos.from,
+        to = pos.to;
+      if (isNaN(from + to) || to - from <= 0 || to < 0 || from < 0) {
+        return 'position invalid';
+      }
+      var reasons = [];
+      doc.nodesBetween(from, to, function (node, _pos, parent) {
+        // Special exception for hardBreak nodes
+        if (schema.nodes.hardBreak === node.type) {
+          return false;
+        }
+
+        // For block elements or text nodes, we want to check
+        // if annotations are allowed inside this tree
+        // or if we're leaf and not text
+        if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
+          var isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
+          if (node.isInline && !node.isText && !isAllowedInlineNode) {
+            reasons.push("Err 1 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf));
+            return false;
+          } else if (node.isLeaf && !node.isText && !isAllowedInlineNode) {
+            reasons.push("Err 2 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf));
+            return false;
+          } else if (node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
+            reasons.push("Err 3 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf, ", parent: ").concat(parent === null || parent === void 0 ? void 0 : parent.type.name));
+            return false;
+          }
+        } else {
+          if (node.isInline && !node.isText) {
+            reasons.push("Err 4 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf));
+            return false;
+          } else if (node.isLeaf && !node.isText) {
+            reasons.push("Err 5 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf));
+            return false;
+          } else if (node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
+            reasons.push("Err 6 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf, ", parent: ").concat(parent === null || parent === void 0 ? void 0 : parent.type.name));
+            return false;
+          }
+        }
+        return true;
+      });
+      return reasons.join(', ');
+    });
     this.initFromContext = initFromContext;
     this.transformer = new _editorJsonTransformer.JSONTransformer();
   }
@@ -67,21 +115,82 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
     key: "_privateValidatePositionsForAnnotation",
     value: function _privateValidatePositionsForAnnotation(from, to) {
       if (!this.doc || !this.schema) {
+        if (this.onAnalyticsEvent && (0, _platformFeatureFlags.fg)('platform_renderer_annotations_create_debug_logging')) {
+          this.onAnalyticsEvent({
+            // @ts-ignore
+            action: 'failed',
+            // @ts-ignore
+            actionSubject: 'applyAnnotation',
+            // @ts-ignore
+            actionSubjectId: 'inlineCommentFailureReason',
+            eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+            attributes: {
+              // @ts-ignore
+              reason: "Annotation Position validation failed - Missing doc or schema",
+              commentsOnInlineNodesAllowed: (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes'),
+              isDocValid: !!this.doc,
+              isSchemaValid: !!this.schema
+            }
+          });
+        }
         return false;
       }
       var currentSelection = _state.TextSelection.create(this.doc, from, to);
       if ((0, _utils.isEmptyTextSelection)(currentSelection, this.schema)) {
+        if (this.onAnalyticsEvent && (0, _platformFeatureFlags.fg)('platform_renderer_annotations_create_debug_logging')) {
+          this.onAnalyticsEvent({
+            // @ts-ignore
+            action: 'failed',
+            // @ts-ignore
+            actionSubject: 'applyAnnotation',
+            // @ts-ignore
+            actionSubjectId: 'inlineCommentFailureReason',
+            eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+            attributes: {
+              // @ts-ignore
+              reason: "Annotation Position validation - Empty Text Selection",
+              commentsOnInlineNodesAllowed: (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes'),
+              from: from,
+              to: to
+            }
+          });
+        }
         return false;
       }
-      return (0, _utils.canApplyAnnotationOnRange)({
+      var result = (0, _utils.canApplyAnnotationOnRange)({
         from: from,
         to: to
       }, this.doc, this.schema);
+      if (!result && this.onAnalyticsEvent && (0, _platformFeatureFlags.fg)('platform_renderer_annotations_create_debug_logging')) {
+        this.onAnalyticsEvent({
+          // @ts-ignore
+          action: 'failed',
+          // @ts-ignore
+          actionSubject: 'applyAnnotation',
+          // @ts-ignore
+          actionSubjectId: 'inlineCommentFailureReason',
+          eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+          attributes: {
+            // @ts-ignore
+            reason: "Annotation canApplyAnnotationOnRange failed",
+            details: this._privateWhyCannotApplyAnnotationOnRange({
+              from: from,
+              to: to
+            }, this.doc, this.schema),
+            commentsOnInlineNodesAllowed: (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes'),
+            from: from,
+            to: to
+          }
+        });
+      }
+      return result;
     }
-    //#endregion
   }, {
     key: "deleteAnnotation",
-    value: function deleteAnnotation(annotationId, annotationType) {
+    value:
+    //#endregion
+
+    function deleteAnnotation(annotationId, annotationType) {
       if (!this.doc || !this.schema || !this.schema.marks.annotation) {
         return false;
       }
@@ -232,6 +341,24 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
     key: "isValidAnnotationPosition",
     value: function isValidAnnotationPosition(pos) {
       if (!pos || !this.doc) {
+        if (this.onAnalyticsEvent && (0, _platformFeatureFlags.fg)('platform_renderer_annotations_create_debug_logging')) {
+          this.onAnalyticsEvent({
+            // @ts-ignore
+            action: 'failed',
+            // @ts-ignore
+            actionSubject: 'applyAnnotation',
+            // @ts-ignore
+            actionSubjectId: 'inlineCommentFailureReason',
+            eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+            attributes: {
+              // @ts-ignore
+              reason: "Annotation Position validation failed - Missing doc or position",
+              commentsOnInlineNodesAllowed: (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes'),
+              isPosValid: !!pos,
+              isDocValid: !!this.doc
+            }
+          });
+        }
         return false;
       }
       return this._privateValidatePositionsForAnnotation(pos.from, pos.to);
@@ -293,6 +420,25 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
     key: "applyAnnotation",
     value: function applyAnnotation(pos, annotation) {
       if (!this.doc || !pos || !this.schema) {
+        if (this.onAnalyticsEvent && (0, _platformFeatureFlags.fg)('platform_renderer_annotations_create_debug_logging')) {
+          this.onAnalyticsEvent({
+            // @ts-ignore
+            action: 'failed',
+            // @ts-ignore
+            actionSubject: 'applyAnnotation',
+            // @ts-ignore
+            actionSubjectId: 'inlineCommentFailureReason',
+            eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+            attributes: {
+              // @ts-ignore
+              reason: "Annotation applyAnnotation failed - Missing doc, position or schema",
+              commentsOnInlineNodesAllowed: (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes'),
+              isPosValid: !!pos,
+              isDocValid: !!this.doc,
+              isSchemaValid: !!this.schema
+            }
+          });
+        }
         return false;
       }
       var from = pos.from,
@@ -326,6 +472,22 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
         doc = _step$apply2.doc,
         failed = _step$apply2.failed;
       if (failed || !doc) {
+        if (this.onAnalyticsEvent && (0, _platformFeatureFlags.fg)('platform_renderer_annotations_create_debug_logging')) {
+          this.onAnalyticsEvent({
+            // @ts-ignore
+            action: 'failed',
+            // @ts-ignore
+            actionSubject: 'applyAnnotation',
+            // @ts-ignore
+            actionSubjectId: 'inlineCommentFailureReason',
+            eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+            attributes: {
+              // @ts-ignore
+              reason: "Annotation applyAnnotation failed - ".concat(failed),
+              commentsOnInlineNodesAllowed: (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')
+            }
+          });
+        }
         return false;
       }
       var originalSelection = doc.textBetween(from, to);

package/dist/cjs/react/marks/alignment.js

@@ -6,28 +6,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = Alignment;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _adfSchema = require("@atlaskit/adf-schema");
-var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
-var _templateObject;
 /**
  * @jsxRuntime classic
  * @jsx jsx
  */
+
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
-var MarkWrapperOld = function MarkWrapperOld(props) {
-  var styles = props['data-align'] ? // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
-  (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\ttext-align: ", ";\n\t\t\t"])), _adfSchema.alignmentPositionMap[props['data-align']]) : '';
-  return (0, _react2.jsx)("div", (0, _extends2.default)({
-    // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
-    css: styles
-    // Ignored via go/ees005
-    // eslint-disable-next-line react/jsx-props-no-spreading
-  }, props), props.children);
-};
-var MarkWrapperNew = function MarkWrapperNew(props) {
+
+var MarkWrapper = function MarkWrapper(props) {
   var dataAlign = props['data-align'] ? _adfSchema.alignmentPositionMap[props['data-align']] : undefined;
   return (0, _react2.jsx)("div", (0, _extends2.default)({
     style: {
@@ -37,7 +26,6 @@ var MarkWrapperNew = function MarkWrapperNew(props) {
     // eslint-disable-next-line react/jsx-props-no-spreading
   }, props), props.children);
 };
-var MarkWrapper = (0, _platformFeatureFlagsReact.componentWithFG)('platform_editor_emotion_refactor_renderer', MarkWrapperNew, MarkWrapperOld);
 function Alignment(props) {
   return (0, _react2.jsx)(MarkWrapper
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766

package/dist/cjs/react/nodes/codeBlock/components/codeBlockContainer.js

@@ -6,24 +6,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _react = require("@emotion/react");
-var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _colors = require("@atlaskit/theme/colors");
 var _styles = require("@atlaskit/editor-common/styles");
 var _codeBlockButtonContainer = _interopRequireDefault(require("./codeBlockButtonContainer"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _templateObject;
 /**
  * @jsxRuntime classic
  * @jsx jsx
  */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
-// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-var codeBlockStyleOverridesOld = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\ttab-size: 4;\n\tbackground-color: ", ";\n\n\t&:hover {\n\t\tbutton {\n\t\t\topacity: 1;\n\t\t}\n\t}\n\n\tbutton {\n\t\topacity: 0;\n\t\ttransition: opacity 0.2s ease 0s;\n\t}\n\n\t", " {\n\t\tfont-size: ", ";\n\t\tline-height: 1.5rem;\n\t\tbackground-image: ", ";\n\t\tbackground-attachment: local, local, local, local, scroll, scroll, scroll, scroll;\n\t\tbackground-position:\n\t\t\t0 0,\n\t\t\t0 0,\n\t\t\t100% 0,\n\t\t\t100% 0,\n\t\t\t100% 0,\n\t\t\t100% 0,\n\t\t\t0 0,\n\t\t\t0 0;\n\t}\n"])), "var(--ds-surface-raised, ".concat(_colors.N20, ")"), _styles.CodeBlockSharedCssClassName.DS_CODEBLOCK, (0, _editorSharedStyles.relativeFontSizeToBase16)(14), (0, _editorSharedStyles.overflowShadow)({
-  leftCoverWidth: "var(--ds-space-300, 24px)"
-}));
-var codeBlockStyleOverridesNew = (0, _react.css)((0, _defineProperty2.default)({
+
+var codeBlockStyleOverrides = (0, _react.css)((0, _defineProperty2.default)({
   tabSize: 4,
   backgroundColor: "var(--ds-surface-raised, ".concat(_colors.N20, ")"),
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -57,7 +50,7 @@ var CodeBlockContainer = function CodeBlockContainer(_ref) {
   return (0, _react.jsx)("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     className: className,
-    css: (0, _platformFeatureFlags.fg)('platform_editor_emotion_refactor_renderer') ? codeBlockStyleOverridesNew : codeBlockStyleOverridesOld
+    css: codeBlockStyleOverrides
   }, (0, _react.jsx)(_codeBlockButtonContainer.default, {
     allowCopyToClipboard: allowCopyToClipboard,
     allowWrapCodeBlock: allowWrapCodeBlock,

package/dist/cjs/react/nodes/codeBlock/components/lightWeightCodeBlock.js

@@ -12,10 +12,9 @@ var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _styles = require("@atlaskit/editor-common/styles");
-var _useBidiWarnings3 = require("../../../hooks/use-bidi-warnings");
+var _useBidiWarnings2 = require("../../../hooks/use-bidi-warnings");
 var _consts = require("../../../../consts");
-var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
-var _templateObject, _templateObject2;
+var _templateObject;
 /* eslint-disable @atlaskit/ui-styling-standard/no-imported-style-values */
 /* eslint-disable @atlaskit/ui-styling-standard/no-unsafe-values */
 /* eslint-disable @atlaskit/ui-styling-standard/no-nested-selectors */
@@ -26,7 +25,7 @@ var _templateObject, _templateObject2;
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-var codeBlockSharedStylesNew = (0, _react2.css)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(_styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTENT_WRAPPED, "\n\t\t> .").concat(_styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTENT_WRAPPER, "\n\t\t> .").concat(_styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTENT), {
+var codeBlockSharedStyles = (0, _react2.css)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(_styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTENT_WRAPPED, "\n\t\t> .").concat(_styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTENT_WRAPPER, "\n\t\t> .").concat(_styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTENT), {
   marginRight: "var(--ds-space-100, 8px)",
   code: {
     display: 'block',
@@ -125,10 +124,7 @@ var codeBlockSharedStylesNew = (0, _react2.css)((0, _defineProperty2.default)((0
   color: "var(--ds-text-subtlest, #505F79)",
   boxSizing: 'content-box'
 })));
-
-// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-var lightWeightCodeBlockStylesOld = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\t.", " {\n\t\tcursor: text;\n\t}\n"])), _styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER);
-var lightWeightCodeBlockStylesNew = (0, _react2.css)((0, _defineProperty2.default)({}, ".".concat(_styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER), {
+var lightWeightCodeBlockStyles = (0, _react2.css)((0, _defineProperty2.default)({}, ".".concat(_styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER), {
   cursor: 'text'
 }));
 var LightWeightCodeBlockCssClassName = exports.LightWeightCodeBlockCssClassName = {
@@ -147,9 +143,9 @@ var getLightWeightCodeBlockStylesForRootRendererStyleSheet = exports.getLightWei
   // NOTE: This must be added after other .code-block styles in the root
   // Renderer stylesheet.
   // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- needs manual remediation
-  return (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n\t\t.", "\n\t\t\t> .", "\n\t\t\t.", " {\n\t\t\tmargin-top: ", ";\n\t\t}\n\t"])), _consts.RendererCssClassName.DOCUMENT, LightWeightCodeBlockCssClassName.CONTAINER, _styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER, _editorSharedStyles.blockNodesVerticalMargin);
+  return (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\t\t.", "\n\t\t\t> .", "\n\t\t\t.", " {\n\t\t\tmargin-top: ", ";\n\t\t}\n\t"])), _consts.RendererCssClassName.DOCUMENT, LightWeightCodeBlockCssClassName.CONTAINER, _styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER, _editorSharedStyles.blockNodesVerticalMargin);
 };
-var LightWeightCodeBlockOld = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
+var LightWeightCodeBlock = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var text = _ref.text,
     _ref$codeBidiWarningT = _ref.codeBidiWarningTooltipEnabled,
     codeBidiWarningTooltipEnabled = _ref$codeBidiWarningT === void 0 ? true : _ref$codeBidiWarningT,
@@ -157,51 +153,11 @@ var LightWeightCodeBlockOld = /*#__PURE__*/(0, _react.forwardRef)(function (_ref
   var textRows = (0, _react.useMemo)(function () {
     return (text !== null && text !== void 0 ? text : '').split('\n');
   }, [text]);
-  var _useBidiWarnings = (0, _useBidiWarnings3.useBidiWarnings)({
+  var _useBidiWarnings = (0, _useBidiWarnings2.useBidiWarnings)({
       enableWarningTooltip: codeBidiWarningTooltipEnabled
     }),
     renderBidiWarnings = _useBidiWarnings.renderBidiWarnings;
   var classNames = [LightWeightCodeBlockCssClassName.CONTAINER, className].join(' ');
-  return (0, _react2.jsx)("div", {
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-    className: classNames,
-    ref: ref
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-    ,
-    css: [(0, _styles.codeBlockSharedStyles)(), lightWeightCodeBlockStylesOld]
-  }, (0, _react2.jsx)("div", {
-    className: _styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER
-  }, (0, _react2.jsx)("div", {
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-    className: _styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTENT_WRAPPER
-  }, (0, _react2.jsx)("div", {
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-    className: _styles.CodeBlockSharedCssClassName.CODEBLOCK_LINE_NUMBER_GUTTER
-  }, textRows.map(function (_, index) {
-    return (
-      // Ignored via go/ees005
-      // eslint-disable-next-line react/no-array-index-key
-      (0, _react2.jsx)("span", {
-        key: index
-      })
-    );
-  })), (0, _react2.jsx)("div", {
-    className: _styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTENT
-  }, (0, _react2.jsx)("code", null, renderBidiWarnings(text))))));
-});
-var LightWeightCodeBlockNew = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
-  var text = _ref2.text,
-    _ref2$codeBidiWarning = _ref2.codeBidiWarningTooltipEnabled,
-    codeBidiWarningTooltipEnabled = _ref2$codeBidiWarning === void 0 ? true : _ref2$codeBidiWarning,
-    className = _ref2.className;
-  var textRows = (0, _react.useMemo)(function () {
-    return (text !== null && text !== void 0 ? text : '').split('\n');
-  }, [text]);
-  var _useBidiWarnings2 = (0, _useBidiWarnings3.useBidiWarnings)({
-      enableWarningTooltip: codeBidiWarningTooltipEnabled
-    }),
-    renderBidiWarnings = _useBidiWarnings2.renderBidiWarnings;
-  var classNames = [LightWeightCodeBlockCssClassName.CONTAINER, className].join(' ');
   var codeBlockBackgroundImage = (0, _editorSharedStyles.overflowShadow)({
     leftCoverWidth: "var(--ds-space-300, 24px)"
   });
@@ -211,7 +167,7 @@ var LightWeightCodeBlockNew = /*#__PURE__*/(0, _react.forwardRef)(function (_ref
     ref: ref
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
     ,
-    css: [codeBlockSharedStylesNew, lightWeightCodeBlockStylesNew],
+    css: [codeBlockSharedStyles, lightWeightCodeBlockStyles],
     style: {
       '--ak-renderer-codeblock-content-wrapper-bg-img': codeBlockBackgroundImage
     }
@@ -235,5 +191,4 @@ var LightWeightCodeBlockNew = /*#__PURE__*/(0, _react.forwardRef)(function (_ref
     className: _styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTENT
   }, (0, _react2.jsx)("code", null, renderBidiWarnings(text))))));
 });
-var LightWeightCodeBlock = (0, _platformFeatureFlagsReact.componentWithFG)('platform_editor_emotion_refactor_renderer', LightWeightCodeBlockNew, LightWeightCodeBlockOld);
 var _default = exports.default = LightWeightCodeBlock;

package/dist/cjs/react/nodes/layoutColumn.js

@@ -9,7 +9,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _ui = require("@atlaskit/editor-common/ui");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -18,7 +17,7 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 
 // localized styles, was from clearNextSiblingMarginTopStyle in @atlaskit/editor-common/ui
-var clearNextSiblingMarginTopStyleNew = (0, _react2.css)({
+var clearNextSiblingMarginTopStyle = (0, _react2.css)({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '& + *': {
     // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
@@ -27,17 +26,10 @@ var clearNextSiblingMarginTopStyleNew = (0, _react2.css)({
 });
 
 // localized styles, was from clearNextSiblingBlockMarkMarginTopStyle in @atlaskit/editor-common/ui
-var clearNextSiblingBlockMarkMarginTopStyleNew = (0, _react2.css)((0, _defineProperty2.default)({}, "+ .fabric-editor-block-mark > p,\n\t  + .fabric-editor-block-mark > h1,\n\t  + .fabric-editor-block-mark > h2,\n\t  + .fabric-editor-block-mark > h3,\n\t  + .fabric-editor-block-mark > h4,\n\t  + .fabric-editor-block-mark > h5,\n\t  + .fabric-editor-block-mark > h6\n\t", {
+var clearNextSiblingBlockMarkMarginTopStyle = (0, _react2.css)((0, _defineProperty2.default)({}, "+ .fabric-editor-block-mark > p,\n\t  + .fabric-editor-block-mark > h1,\n\t  + .fabric-editor-block-mark > h2,\n\t  + .fabric-editor-block-mark > h3,\n\t  + .fabric-editor-block-mark > h4,\n\t  + .fabric-editor-block-mark > h5,\n\t  + .fabric-editor-block-mark > h6\n\t", {
   // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
   marginTop: '0 !important'
 }));
-
-// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-var layoutColumnClearMarginTopStyles = (0, _react2.css)(
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-_ui.clearNextSiblingMarginTopStyle,
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-_ui.clearNextSiblingBlockMarkMarginTopStyle);
 function LayoutSection(props) {
   return (0, _react2.jsx)("div", {
     "data-layout-column": true,
@@ -46,6 +38,6 @@ function LayoutSection(props) {
       flexBasis: "".concat(props.width, "%")
     }
   }, (0, _react2.jsx)(_ui.WidthProvider, null, (0, _react2.jsx)("div", {
-    css: (0, _platformFeatureFlags.fg)('platform_editor_emotion_refactor_renderer') ? [clearNextSiblingMarginTopStyleNew, clearNextSiblingBlockMarkMarginTopStyleNew] : layoutColumnClearMarginTopStyles
+    css: [clearNextSiblingMarginTopStyle, clearNextSiblingBlockMarkMarginTopStyle]
   }), props.children));
 }

package/dist/cjs/react/nodes/media/index.js

@@ -15,7 +15,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _analyticsNext = require("@atlaskit/analytics-next");
@@ -36,10 +35,8 @@ var _reactIntlNext = require("react-intl-next");
 var _useInlineCommentsFilter = require("../../../ui/annotations/hooks/use-inline-comments-filter");
 var _useInlineCommentSubscriber = require("../../../ui/annotations/hooks/use-inline-comment-subscriber");
 var _types = require("@atlaskit/editor-common/types");
-var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
 var _excluded = ["marks", "mediaSingleElement", "isDrafting"],
   _excluded2 = ["marks", "mediaSingleElement", "isDrafting"];
-var _templateObject;
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -65,19 +62,14 @@ var linkStyle = (0, _react2.css)({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
   height: '100% !important'
 });
-
-// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- Ignored via go/DSP-18766
-var borderStyleOld = function borderStyleOld(color, width) {
-  return (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\tposition: absolute;\n\twidth: 100% !important;\n\theight: 100% !important;\n\tborder-radius: ", "px;\n\tbox-shadow: 0 0 0 ", "px ", ";\n"])), width, width, color);
-};
-var borderStyleNew = (0, _react2.css)({
+var borderStyle = (0, _react2.css)({
   position: 'absolute',
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
   width: '100% !important',
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
   height: '100% !important'
 });
-var MediaBorderOld = function MediaBorderOld(_ref) {
+var MediaBorder = function MediaBorder(_ref) {
   var _mark$attrs$color, _mark$attrs$size;
   var mark = _ref.mark,
     children = _ref.children;
@@ -87,32 +79,11 @@ var MediaBorderOld = function MediaBorderOld(_ref) {
   var borderColor = (_mark$attrs$color = mark === null || mark === void 0 ? void 0 : mark.attrs.color) !== null && _mark$attrs$color !== void 0 ? _mark$attrs$color : '';
   var borderWidth = (_mark$attrs$size = mark === null || mark === void 0 ? void 0 : mark.attrs.size) !== null && _mark$attrs$size !== void 0 ? _mark$attrs$size : 0;
   var paletteColorValue = (0, _editorPalette.hexToEditorBorderPaletteColor)(borderColor) || borderColor;
-  return (0, _react2.jsx)("div", {
-    "data-mark-type": "border",
-    "data-color": borderColor,
-    "data-size": borderWidth
-    // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-    ,
-    css: borderStyleOld(paletteColorValue, borderWidth)
-  }, (0, _react2.jsx)(_ui.MediaBorderGapFiller, {
-    borderColor: borderColor
-  }), children);
-};
-var MediaBorderNew = function MediaBorderNew(_ref2) {
-  var _mark$attrs$color2, _mark$attrs$size2;
-  var mark = _ref2.mark,
-    children = _ref2.children;
-  if (!mark) {
-    return (0, _react2.jsx)(_react.Fragment, null, children);
-  }
-  var borderColor = (_mark$attrs$color2 = mark === null || mark === void 0 ? void 0 : mark.attrs.color) !== null && _mark$attrs$color2 !== void 0 ? _mark$attrs$color2 : '';
-  var borderWidth = (_mark$attrs$size2 = mark === null || mark === void 0 ? void 0 : mark.attrs.size) !== null && _mark$attrs$size2 !== void 0 ? _mark$attrs$size2 : 0;
-  var paletteColorValue = (0, _editorPalette.hexToEditorBorderPaletteColor)(borderColor) || borderColor;
   return (0, _react2.jsx)("div", {
     "data-mark-type": "border",
     "data-color": borderColor,
     "data-size": borderWidth,
-    css: borderStyleNew,
+    css: borderStyle,
     style: {
       borderRadius: "".concat(borderWidth, "px"),
       boxShadow: "0 0 0 ".concat(borderWidth, "px ").concat(paletteColorValue)
@@ -121,11 +92,10 @@ var MediaBorderNew = function MediaBorderNew(_ref2) {
     borderColor: borderColor
   }), children);
 };
-var MediaBorder = (0, _platformFeatureFlagsReact.componentWithFG)('platform_editor_emotion_refactor_renderer', MediaBorderNew, MediaBorderOld);
-var MediaLink = function MediaLink(_ref3) {
-  var mark = _ref3.mark,
-    children = _ref3.children,
-    onClick = _ref3.onClick;
+var MediaLink = function MediaLink(_ref2) {
+  var mark = _ref2.mark,
+    children = _ref2.children,
+    onClick = _ref2.onClick;
   if (!mark) {
     return (0, _react2.jsx)(_react.Fragment, null, children);
   }
@@ -138,9 +108,9 @@ var MediaLink = function MediaLink(_ref3) {
     css: linkStyle
   }, children);
 };
-var MediaAnnotation = function MediaAnnotation(_ref4) {
-  var mark = _ref4.mark,
-    children = _ref4.children;
+var MediaAnnotation = function MediaAnnotation(_ref3) {
+  var mark = _ref3.mark,
+    children = _ref3.children;
   if (!mark) {
     return (0, _react2.jsx)(_react.Fragment, null, children);
   }
@@ -158,10 +128,10 @@ var MediaAnnotation = function MediaAnnotation(_ref4) {
     useBlockLevel: true
   }, children);
 };
-var _MediaAnnotations = function MediaAnnotations(_ref5) {
-  var _ref5$marks = _ref5.marks,
-    marks = _ref5$marks === void 0 ? [] : _ref5$marks,
-    children = _ref5.children;
+var _MediaAnnotations = function MediaAnnotations(_ref4) {
+  var _ref4$marks = _ref4.marks,
+    marks = _ref4$marks === void 0 ? [] : _ref4$marks,
+    children = _ref4.children;
   // Early Exit
   if (marks.length === 0) {
     return (0, _react2.jsx)(_react.Fragment, null, children);
@@ -178,13 +148,13 @@ var _MediaAnnotations = function MediaAnnotations(_ref5) {
   }, children) : (0, _react2.jsx)(_react.Fragment, null, children)));
 };
 var CommentBadge = (0, _reactIntlNext.injectIntl)(_mediaSingle.CommentBadge);
-var CommentBadgeWrapper = function CommentBadgeWrapper(_ref6) {
+var CommentBadgeWrapper = function CommentBadgeWrapper(_ref5) {
   var _marks$map;
-  var marks = _ref6.marks,
-    mediaSingleElement = _ref6.mediaSingleElement,
-    _ref6$isDrafting = _ref6.isDrafting,
-    isDrafting = _ref6$isDrafting === void 0 ? false : _ref6$isDrafting,
-    rest = (0, _objectWithoutProperties2.default)(_ref6, _excluded);
+  var marks = _ref5.marks,
+    mediaSingleElement = _ref5.mediaSingleElement,
+    _ref5$isDrafting = _ref5.isDrafting,
+    isDrafting = _ref5$isDrafting === void 0 ? false : _ref5$isDrafting,
+    rest = (0, _objectWithoutProperties2.default)(_ref5, _excluded);
   var _useState = (0, _react.useState)('default'),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     status = _useState2[0],
@@ -261,13 +231,13 @@ var CommentBadgeWrapper = function CommentBadgeWrapper(_ref6) {
  * when clean up platform_editor_add_media_from_url feature flag
  */
 
-var CommentBadgeNextWrapper = function CommentBadgeNextWrapper(_ref7) {
+var CommentBadgeNextWrapper = function CommentBadgeNextWrapper(_ref6) {
   var _marks$map2;
-  var marks = _ref7.marks,
-    mediaSingleElement = _ref7.mediaSingleElement,
-    _ref7$isDrafting = _ref7.isDrafting,
-    isDrafting = _ref7$isDrafting === void 0 ? false : _ref7$isDrafting,
-    rest = (0, _objectWithoutProperties2.default)(_ref7, _excluded2);
+  var marks = _ref6.marks,
+    mediaSingleElement = _ref6.mediaSingleElement,
+    _ref6$isDrafting = _ref6.isDrafting,
+    isDrafting = _ref6$isDrafting === void 0 ? false : _ref6$isDrafting,
+    rest = (0, _objectWithoutProperties2.default)(_ref6, _excluded2);
   var _useState5 = (0, _react.useState)('default'),
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     status = _useState6[0],
@@ -386,8 +356,8 @@ var Media = /*#__PURE__*/function (_PureComponent) {
         mediaWidth: width,
         mediaHeight: height,
         useMinimumZIndex: true
-      }, function (_ref9) {
-        var visible = _ref9.visible;
+      }, function (_ref8) {
+        var visible = _ref8.visible;
         return (0, _react2.jsx)(_react.default.Fragment, null, visible && (0, _react2.jsx)(_mediaSingle.ExternalImageBadge, {
           type: _this.props.type,
           url: _this.props.type === 'external' ? _this.props.url : undefined