@atlaskit/renderer 126.2.1 → 126.2.2

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/renderer
 
+## 126.2.2
+
+### Patch Changes
+
+- [`a90e1c030d692`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a90e1c030d692) -
+  Fix display of inline insert excerpt macro width in Confluence
+- [`5c3f8d87c2290`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5c3f8d87c2290) -
+  Cleanup general AIFC bug fix feature gate
+- Updated dependencies
+
 ## 126.2.1
 
 ### Patch Changes

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

@@ -55,6 +55,7 @@ var renderExtension = exports.renderExtension = function renderExtension(content
   var localId = arguments.length > 7 ? arguments[7] : undefined;
   var shouldDisplayExtensionAsInline = arguments.length > 8 ? arguments[8] : undefined;
   var node = arguments.length > 9 ? arguments[9] : undefined;
+  var isInsideOfInlineExtension = arguments.length > 10 ? arguments[10] : undefined;
   var overflowContainerClass = !removeOverflow ? _consts.RendererCssClassName.EXTENSION_OVERFLOW_CONTAINER : '';
 
   // by default, we assume the extension is at top level, (direct child of doc node)
@@ -94,7 +95,7 @@ var renderExtension = exports.renderExtension = function renderExtension(content
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
       ,
       className: overflowContainerClass,
-      css: [(0, _platformFeatureFlags.fg)('platform_fix_macro_renders_in_layouts') && containerStyle]
+      css: [!(isInsideOfInlineExtension && (0, _expValEquals.expValEquals)('confluence_inline_insert_excerpt_width_bugfix', 'isEnabled', true)) && (0, _platformFeatureFlags.fg)('platform_fix_macro_renders_in_layouts') && containerStyle]
     }, content));
   }
   return (0, _react.jsx)(_ui.WidthConsumer, null, function (_ref2) {
@@ -117,7 +118,7 @@ var renderExtension = exports.renderExtension = function renderExtension(content
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
       ,
       className: overflowContainerClass,
-      css: [(0, _platformFeatureFlags.fg)('platform_fix_macro_renders_in_layouts') && containerStyle]
+      css: [!(isInsideOfInlineExtension && (0, _expValEquals.expValEquals)('confluence_inline_insert_excerpt_width_bugfix', 'isEnabled', true)) && (0, _platformFeatureFlags.fg)('platform_fix_macro_renders_in_layouts') && containerStyle]
     }, content));
   });
 };
@@ -132,7 +133,8 @@ var Extension = function Extension(props) {
     extensionViewportSizes = props.extensionViewportSizes,
     parameters = props.parameters,
     nodeHeight = props.nodeHeight,
-    localId = props.localId;
+    localId = props.localId,
+    isInsideOfInlineExtension = props.isInsideOfInlineExtension;
   return (0, _react.jsx)(_ExtensionRenderer.default
   // Ignored via go/ees005
   // eslint-disable-next-line react/jsx-props-no-spreading
@@ -148,7 +150,7 @@ var Extension = function Extension(props) {
           handleRef: handleRef,
           shadowClassNames: shadowClassNames,
           tabIndex: (0, _platformFeatureFlags.fg)('platform_editor_dec_a11y_fixes') ? props.tabIndex : undefined
-        }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId, undefined, undefined);
+        }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId, undefined, undefined, isInsideOfInlineExtension);
       }
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
@@ -161,7 +163,7 @@ var Extension = function Extension(props) {
       handleRef: handleRef,
       shadowClassNames: shadowClassNames,
       tabIndex: (0, _platformFeatureFlags.fg)('platform_editor_dec_a11y_fixes') ? props.tabIndex : undefined
-    }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId, undefined, undefined);
+    }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId, undefined, undefined, isInsideOfInlineExtension);
   });
 };
 var _default_1 = (0, _ui.overflowShadow)(Extension, {

package/dist/cjs/ui/Renderer/RendererStyleContainer.js

@@ -29,7 +29,7 @@ var _getBaseFontSize = require("./get-base-font-size");
 var _emoji = require("@atlaskit/editor-common/emoji");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _syncBlock = require("@atlaskit/editor-common/sync-block");
-var _css, _css8;
+var _css, _css7;
 /* eslint-disable @atlaskit/ui-styling-standard/no-important-styles */
 /* eslint-disable @atlaskit/ui-styling-standard/no-imported-style-values */
 /* eslint-disable @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values */
@@ -222,37 +222,6 @@ var rendererFullWidthStylesForTableResizing = (0, _react.css)({
     width: '100% !important'
   }
 });
-
-// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
-var telepointerStyles = (0, _react.css)((0, _defineProperty2.default)({}, "#".concat(TELEPOINTER_ID), {
-  display: 'inline-block',
-  position: 'relative',
-  width: '1.5px',
-  height: '25px',
-  backgroundColor: "var(--ds-background-brand-bold, #1868DB)",
-  marginLeft: "var(--ds-space-025, 2px)",
-  '&::after': {
-    content: '"AI"',
-    position: 'absolute',
-    display: 'block',
-    top: 0,
-    left: 0,
-    // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
-    fontSize: '10px',
-    fontWeight: "var(--ds-font-weight-bold, 653)",
-    width: '12.5px',
-    height: '13px',
-    // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
-    paddingTop: '1px',
-    // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
-    paddingLeft: '1.5px',
-    // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
-    lineHeight: 'initial',
-    borderRadius: "0px ".concat("var(--ds-radius-xsmall, 2px)", " ", "var(--ds-radius-xsmall, 2px)", " 0px"),
-    color: "var(--ds-text-inverse, white)",
-    backgroundColor: "var(--ds-background-brand-bold, #1868DB)"
-  }
-}));
 var rovoTelepointerStyles = (0, _react.css)((0, _defineProperty2.default)({}, "#".concat(TELEPOINTER_ID), {
   display: 'inline-block',
   position: 'relative',
@@ -590,13 +559,13 @@ var paragraphSharedStyleScaledMargin = (0, _react.css)({
     letterSpacing: '-0.005em'
   }
 });
-var listsSharedStyles = (0, _react.css)((_css8 = {
+var listsSharedStyles = (0, _react.css)((_css7 = {
   /* =============== INDENTATION SPACING ========= */
   'ul, ol': {
     boxSizing: 'border-box',
     paddingLeft: "var(--ed--list--item-counter--padding, ".concat(_styles.listItemCounterPadding, "px)")
   }
-}, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)(_css8, "".concat(_adfSchema.orderedListSelector, ", ").concat(_adfSchema.bulletListSelector), {
+}, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)(_css7, "".concat(_adfSchema.orderedListSelector, ", ").concat(_adfSchema.bulletListSelector), {
   /*
    Ensures list item content adheres to the list's margin instead
    of filling the entire block row. This is important to allow
@@ -628,7 +597,7 @@ var listsSharedStyles = (0, _react.css)((_css8 = {
   listStyleType: 'lower-alpha'
 }), 'ol[data-indent-level="3"], ol[data-indent-level="6"]', {
   listStyleType: 'lower-roman'
-}), (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)(_css8, 'ul[data-indent-level="1"], ul[data-indent-level="4"]', {
+}), (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)(_css7, 'ul[data-indent-level="1"], ul[data-indent-level="4"]', {
   listStyleType: 'disc'
 }), 'ul[data-indent-level="2"], ul[data-indent-level="5"]', {
   listStyleType: 'circle'
@@ -1700,7 +1669,7 @@ var RendererStyleContainer = exports.RendererStyleContainer = function RendererS
         '--ak-renderer-editor-font-heading-h6': "".concat((0, _ugcTokens.editorUGCToken)('editor.font.heading.h6')),
         '--ak-renderer-editor-font-normal-text': "".concat((0, _ugcTokens.editorUGCToken)('editor.font.body'))
       },
-      css: [baseStyles, hideHeadingCopyLinkWrapperStyles, appearance === 'full-page' && isPreviewPanelResponsivenessOn && rendererFullPageStylesWithReducedPadding, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && rendererFullPageStyles, appearance === 'full-width' && rendererFullWidthStyles, (appearance === 'full-width' || appearance === 'max' && ((0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true))) && !(0, _table.isTableResizingEnabled)(appearance) && rendererFullWidthStylesForTableResizing, appearance === 'max' && ((0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true)) && rendererMaxWidthStyles, !(0, _platformFeatureFlags.fg)('platform_editor_ai_generic_prep_for_aifc_2') && telepointerStyles, (0, _platformFeatureFlags.fg)('platform_editor_ai_generic_prep_for_aifc_2') && rovoTelepointerStyles, whitespaceSharedStyles, blockquoteSharedStyles, (0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') ? headingsSharedStylesWithEditorUGC : headingsSharedStyles, headingWithAlignmentStyles, ruleSharedStyles, contentMode === 'compact' && isCompactModeSupported && extensionStyle, (0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') ? isCompactModeSupported ? paragraphStylesUGCScaledMargin : paragraphSharedStylesWithEditorUGC : isCompactModeSupported ? paragraphSharedStyleScaledMargin : paragraphSharedStyles, listsSharedStyles, browser.gecko && listsSharedStylesForGekko, indentationSharedStyles, (0, _platformFeatureFlags.fg)('platform_editor__renderer_indentation_text_margin') && indentationSharedStylesWithMarginFix, blockMarksSharedStyles, codeMarkSharedStyles, shadowSharedStyle, dateSharedStyle, textColorStyles, backgroundColorStyles, (0, _expValEquals.expValEquals)('platform_editor_text_highlight_padding', 'isEnabled', true) &&
+      css: [baseStyles, hideHeadingCopyLinkWrapperStyles, appearance === 'full-page' && isPreviewPanelResponsivenessOn && rendererFullPageStylesWithReducedPadding, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && rendererFullPageStyles, appearance === 'full-width' && rendererFullWidthStyles, (appearance === 'full-width' || appearance === 'max' && ((0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true))) && !(0, _table.isTableResizingEnabled)(appearance) && rendererFullWidthStylesForTableResizing, appearance === 'max' && ((0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true)) && rendererMaxWidthStyles, rovoTelepointerStyles, whitespaceSharedStyles, blockquoteSharedStyles, (0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') ? headingsSharedStylesWithEditorUGC : headingsSharedStyles, headingWithAlignmentStyles, ruleSharedStyles, contentMode === 'compact' && isCompactModeSupported && extensionStyle, (0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') ? isCompactModeSupported ? paragraphStylesUGCScaledMargin : paragraphSharedStylesWithEditorUGC : isCompactModeSupported ? paragraphSharedStyleScaledMargin : paragraphSharedStyles, listsSharedStyles, browser.gecko && listsSharedStylesForGekko, indentationSharedStyles, (0, _platformFeatureFlags.fg)('platform_editor__renderer_indentation_text_margin') && indentationSharedStylesWithMarginFix, blockMarksSharedStyles, codeMarkSharedStyles, shadowSharedStyle, dateSharedStyle, textColorStyles, backgroundColorStyles, (0, _expValEquals.expValEquals)('platform_editor_text_highlight_padding', 'isEnabled', true) &&
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
       textHighlightPaddingStyles, tasksAndDecisionsStyles, smartCardStyles, smartCardStylesAvatarFix, (0, _experiments.editorExperiment)('platform_editor_preview_panel_linking_exp', true) && headerSmartCardStyles, smartCardStylesAvatarMarginFix, smartCardStylesAvatarListZeroMarginTop, (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') && rendererAnnotationStyles,
       // eslint-disable-next-line @atlaskit/platform/no-preconditioning

package/dist/cjs/ui/Renderer/index.js

@@ -70,7 +70,7 @@ var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var TABLE_INFO_TIMEOUT = 10000;
 var RENDER_EVENT_SAMPLE_RATE = 0.2;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "126.2.0";
+var packageVersion = "126.2.1";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/es2019/react/nodes/extension.js

@@ -36,7 +36,7 @@ const getViewportSize = (extensionId, extensionViewportSizes) => {
 const containerStyle = css({
   containerType: 'inline-size'
 });
-export const renderExtension = (content, layout, options = {}, removeOverflow, extensionId, extensionViewportSizes, nodeHeight, localId, shouldDisplayExtensionAsInline, node) => {
+export const renderExtension = (content, layout, options = {}, removeOverflow, extensionId, extensionViewportSizes, nodeHeight, localId, shouldDisplayExtensionAsInline, node, isInsideOfInlineExtension) => {
   const overflowContainerClass = !removeOverflow ? RendererCssClassName.EXTENSION_OVERFLOW_CONTAINER : '';
 
   // by default, we assume the extension is at top level, (direct child of doc node)
@@ -76,7 +76,7 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
       ,
       className: overflowContainerClass,
-      css: [fg('platform_fix_macro_renders_in_layouts') && containerStyle]
+      css: [!(isInsideOfInlineExtension && expValEquals('confluence_inline_insert_excerpt_width_bugfix', 'isEnabled', true)) && fg('platform_fix_macro_renders_in_layouts') && containerStyle]
     }, content));
   }
   return jsx(WidthConsumer, null, ({
@@ -99,7 +99,7 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
     ,
     className: overflowContainerClass,
-    css: [fg('platform_fix_macro_renders_in_layouts') && containerStyle]
+    css: [!(isInsideOfInlineExtension && expValEquals('confluence_inline_insert_excerpt_width_bugfix', 'isEnabled', true)) && fg('platform_fix_macro_renders_in_layouts') && containerStyle]
   }, content)));
 };
 const Extension = props => {
@@ -112,7 +112,8 @@ const Extension = props => {
     extensionViewportSizes,
     parameters,
     nodeHeight,
-    localId
+    localId,
+    isInsideOfInlineExtension
   } = props;
   return jsx(ExtensionRenderer
   // Ignored via go/ees005
@@ -130,7 +131,7 @@ const Extension = props => {
           handleRef,
           shadowClassNames,
           tabIndex: fg('platform_editor_dec_a11y_fixes') ? props.tabIndex : undefined
-        }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId, undefined, undefined);
+        }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId, undefined, undefined, isInsideOfInlineExtension);
       }
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
@@ -143,7 +144,7 @@ const Extension = props => {
       handleRef,
       shadowClassNames,
       tabIndex: fg('platform_editor_dec_a11y_fixes') ? props.tabIndex : undefined
-    }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId, undefined, undefined);
+    }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId, undefined, undefined, isInsideOfInlineExtension);
   });
 };
 const _default_1 = overflowShadow(Extension, {

package/dist/es2019/ui/Renderer/RendererStyleContainer.js

@@ -296,39 +296,6 @@ const rendererFullWidthStylesForTableResizing = css({
     width: '100% !important'
   }
 });
-
-// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
-const telepointerStyles = css({
-  [`#${TELEPOINTER_ID}`]: {
-    display: 'inline-block',
-    position: 'relative',
-    width: '1.5px',
-    height: '25px',
-    backgroundColor: "var(--ds-background-brand-bold, #1868DB)",
-    marginLeft: "var(--ds-space-025, 2px)",
-    '&::after': {
-      content: '"AI"',
-      position: 'absolute',
-      display: 'block',
-      top: 0,
-      left: 0,
-      // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
-      fontSize: '10px',
-      fontWeight: "var(--ds-font-weight-bold, 653)",
-      width: '12.5px',
-      height: '13px',
-      // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
-      paddingTop: '1px',
-      // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
-      paddingLeft: '1.5px',
-      // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
-      lineHeight: 'initial',
-      borderRadius: `0px ${"var(--ds-radius-xsmall, 2px)"} ${"var(--ds-radius-xsmall, 2px)"} 0px`,
-      color: "var(--ds-text-inverse, white)",
-      backgroundColor: "var(--ds-background-brand-bold, #1868DB)"
-    }
-  }
-});
 const rovoTelepointerStyles = css({
   [`#${TELEPOINTER_ID}`]: {
     display: 'inline-block',
@@ -2131,7 +2098,7 @@ export const RendererStyleContainer = props => {
         '--ak-renderer-editor-font-heading-h6': `${editorUGCToken('editor.font.heading.h6')}`,
         '--ak-renderer-editor-font-normal-text': `${editorUGCToken('editor.font.body')}`
       },
-      css: [baseStyles, hideHeadingCopyLinkWrapperStyles, appearance === 'full-page' && isPreviewPanelResponsivenessOn && rendererFullPageStylesWithReducedPadding, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && rendererFullPageStyles, appearance === 'full-width' && rendererFullWidthStyles, (appearance === 'full-width' || appearance === 'max' && (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true))) && !isTableResizingEnabled(appearance) && rendererFullWidthStylesForTableResizing, appearance === 'max' && (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true)) && rendererMaxWidthStyles, !fg('platform_editor_ai_generic_prep_for_aifc_2') && telepointerStyles, fg('platform_editor_ai_generic_prep_for_aifc_2') && rovoTelepointerStyles, whitespaceSharedStyles, blockquoteSharedStyles, fg('platform_editor_typography_ugc') ? headingsSharedStylesWithEditorUGC : headingsSharedStyles, headingWithAlignmentStyles, ruleSharedStyles, contentMode === 'compact' && isCompactModeSupported && extensionStyle, fg('platform_editor_typography_ugc') ? isCompactModeSupported ? paragraphStylesUGCScaledMargin : paragraphSharedStylesWithEditorUGC : isCompactModeSupported ? paragraphSharedStyleScaledMargin : paragraphSharedStyles, listsSharedStyles, browser.gecko && listsSharedStylesForGekko, indentationSharedStyles, fg('platform_editor__renderer_indentation_text_margin') && indentationSharedStylesWithMarginFix, blockMarksSharedStyles, codeMarkSharedStyles, shadowSharedStyle, dateSharedStyle, textColorStyles, backgroundColorStyles, expValEquals('platform_editor_text_highlight_padding', 'isEnabled', true) &&
+      css: [baseStyles, hideHeadingCopyLinkWrapperStyles, appearance === 'full-page' && isPreviewPanelResponsivenessOn && rendererFullPageStylesWithReducedPadding, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && rendererFullPageStyles, appearance === 'full-width' && rendererFullWidthStyles, (appearance === 'full-width' || appearance === 'max' && (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true))) && !isTableResizingEnabled(appearance) && rendererFullWidthStylesForTableResizing, appearance === 'max' && (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true)) && rendererMaxWidthStyles, rovoTelepointerStyles, whitespaceSharedStyles, blockquoteSharedStyles, fg('platform_editor_typography_ugc') ? headingsSharedStylesWithEditorUGC : headingsSharedStyles, headingWithAlignmentStyles, ruleSharedStyles, contentMode === 'compact' && isCompactModeSupported && extensionStyle, fg('platform_editor_typography_ugc') ? isCompactModeSupported ? paragraphStylesUGCScaledMargin : paragraphSharedStylesWithEditorUGC : isCompactModeSupported ? paragraphSharedStyleScaledMargin : paragraphSharedStyles, listsSharedStyles, browser.gecko && listsSharedStylesForGekko, indentationSharedStyles, fg('platform_editor__renderer_indentation_text_margin') && indentationSharedStylesWithMarginFix, blockMarksSharedStyles, codeMarkSharedStyles, shadowSharedStyle, dateSharedStyle, textColorStyles, backgroundColorStyles, expValEquals('platform_editor_text_highlight_padding', 'isEnabled', true) &&
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
       textHighlightPaddingStyles, tasksAndDecisionsStyles, smartCardStyles, smartCardStylesAvatarFix, editorExperiment('platform_editor_preview_panel_linking_exp', true) && headerSmartCardStyles, smartCardStylesAvatarMarginFix, smartCardStylesAvatarListZeroMarginTop, fg('editor_inline_comments_on_inline_nodes') && rendererAnnotationStyles,
       // eslint-disable-next-line @atlaskit/platform/no-preconditioning

package/dist/es2019/ui/Renderer/index.js

@@ -56,7 +56,7 @@ export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const TABLE_INFO_TIMEOUT = 10000;
 const RENDER_EVENT_SAMPLE_RATE = 0.2;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "126.2.0";
+const packageVersion = "126.2.1";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/esm/react/nodes/extension.js

@@ -47,6 +47,7 @@ export var renderExtension = function renderExtension(content, layout) {
   var localId = arguments.length > 7 ? arguments[7] : undefined;
   var shouldDisplayExtensionAsInline = arguments.length > 8 ? arguments[8] : undefined;
   var node = arguments.length > 9 ? arguments[9] : undefined;
+  var isInsideOfInlineExtension = arguments.length > 10 ? arguments[10] : undefined;
   var overflowContainerClass = !removeOverflow ? RendererCssClassName.EXTENSION_OVERFLOW_CONTAINER : '';
 
   // by default, we assume the extension is at top level, (direct child of doc node)
@@ -86,7 +87,7 @@ export var renderExtension = function renderExtension(content, layout) {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
       ,
       className: overflowContainerClass,
-      css: [fg('platform_fix_macro_renders_in_layouts') && containerStyle]
+      css: [!(isInsideOfInlineExtension && expValEquals('confluence_inline_insert_excerpt_width_bugfix', 'isEnabled', true)) && fg('platform_fix_macro_renders_in_layouts') && containerStyle]
     }, content));
   }
   return jsx(WidthConsumer, null, function (_ref2) {
@@ -109,7 +110,7 @@ export var renderExtension = function renderExtension(content, layout) {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
       ,
       className: overflowContainerClass,
-      css: [fg('platform_fix_macro_renders_in_layouts') && containerStyle]
+      css: [!(isInsideOfInlineExtension && expValEquals('confluence_inline_insert_excerpt_width_bugfix', 'isEnabled', true)) && fg('platform_fix_macro_renders_in_layouts') && containerStyle]
     }, content));
   });
 };
@@ -124,7 +125,8 @@ var Extension = function Extension(props) {
     extensionViewportSizes = props.extensionViewportSizes,
     parameters = props.parameters,
     nodeHeight = props.nodeHeight,
-    localId = props.localId;
+    localId = props.localId,
+    isInsideOfInlineExtension = props.isInsideOfInlineExtension;
   return jsx(ExtensionRenderer
   // Ignored via go/ees005
   // eslint-disable-next-line react/jsx-props-no-spreading
@@ -140,7 +142,7 @@ var Extension = function Extension(props) {
           handleRef: handleRef,
           shadowClassNames: shadowClassNames,
           tabIndex: fg('platform_editor_dec_a11y_fixes') ? props.tabIndex : undefined
-        }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId, undefined, undefined);
+        }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId, undefined, undefined, isInsideOfInlineExtension);
       }
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
@@ -153,7 +155,7 @@ var Extension = function Extension(props) {
       handleRef: handleRef,
       shadowClassNames: shadowClassNames,
       tabIndex: fg('platform_editor_dec_a11y_fixes') ? props.tabIndex : undefined
-    }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId, undefined, undefined);
+    }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId, undefined, undefined, isInsideOfInlineExtension);
   });
 };
 var _default_1 = overflowShadow(Extension, {

package/dist/esm/ui/Renderer/RendererStyleContainer.js

@@ -1,5 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-var _css, _css8;
+var _css, _css7;
 /* eslint-disable @atlaskit/ui-styling-standard/no-important-styles */
 /* eslint-disable @atlaskit/ui-styling-standard/no-imported-style-values */
 /* eslint-disable @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values */
@@ -215,37 +215,6 @@ var rendererFullWidthStylesForTableResizing = css({
     width: '100% !important'
   }
 });
-
-// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
-var telepointerStyles = css(_defineProperty({}, "#".concat(TELEPOINTER_ID), {
-  display: 'inline-block',
-  position: 'relative',
-  width: '1.5px',
-  height: '25px',
-  backgroundColor: "var(--ds-background-brand-bold, #1868DB)",
-  marginLeft: "var(--ds-space-025, 2px)",
-  '&::after': {
-    content: '"AI"',
-    position: 'absolute',
-    display: 'block',
-    top: 0,
-    left: 0,
-    // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
-    fontSize: '10px',
-    fontWeight: "var(--ds-font-weight-bold, 653)",
-    width: '12.5px',
-    height: '13px',
-    // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
-    paddingTop: '1px',
-    // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
-    paddingLeft: '1.5px',
-    // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
-    lineHeight: 'initial',
-    borderRadius: "0px ".concat("var(--ds-radius-xsmall, 2px)", " ", "var(--ds-radius-xsmall, 2px)", " 0px"),
-    color: "var(--ds-text-inverse, white)",
-    backgroundColor: "var(--ds-background-brand-bold, #1868DB)"
-  }
-}));
 var rovoTelepointerStyles = css(_defineProperty({}, "#".concat(TELEPOINTER_ID), {
   display: 'inline-block',
   position: 'relative',
@@ -583,13 +552,13 @@ var paragraphSharedStyleScaledMargin = css({
     letterSpacing: '-0.005em'
   }
 });
-var listsSharedStyles = css((_css8 = {
+var listsSharedStyles = css((_css7 = {
   /* =============== INDENTATION SPACING ========= */
   'ul, ol': {
     boxSizing: 'border-box',
     paddingLeft: "var(--ed--list--item-counter--padding, ".concat(listItemCounterPadding, "px)")
   }
-}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_css8, "".concat(orderedListSelector, ", ").concat(bulletListSelector), {
+}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_css7, "".concat(orderedListSelector, ", ").concat(bulletListSelector), {
   /*
    Ensures list item content adheres to the list's margin instead
    of filling the entire block row. This is important to allow
@@ -621,7 +590,7 @@ var listsSharedStyles = css((_css8 = {
   listStyleType: 'lower-alpha'
 }), 'ol[data-indent-level="3"], ol[data-indent-level="6"]', {
   listStyleType: 'lower-roman'
-}), _defineProperty(_defineProperty(_defineProperty(_css8, 'ul[data-indent-level="1"], ul[data-indent-level="4"]', {
+}), _defineProperty(_defineProperty(_defineProperty(_css7, 'ul[data-indent-level="1"], ul[data-indent-level="4"]', {
   listStyleType: 'disc'
 }), 'ul[data-indent-level="2"], ul[data-indent-level="5"]', {
   listStyleType: 'circle'
@@ -1693,7 +1662,7 @@ export var RendererStyleContainer = function RendererStyleContainer(props) {
         '--ak-renderer-editor-font-heading-h6': "".concat(editorUGCToken('editor.font.heading.h6')),
         '--ak-renderer-editor-font-normal-text': "".concat(editorUGCToken('editor.font.body'))
       },
-      css: [baseStyles, hideHeadingCopyLinkWrapperStyles, appearance === 'full-page' && isPreviewPanelResponsivenessOn && rendererFullPageStylesWithReducedPadding, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && rendererFullPageStyles, appearance === 'full-width' && rendererFullWidthStyles, (appearance === 'full-width' || appearance === 'max' && (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true))) && !isTableResizingEnabled(appearance) && rendererFullWidthStylesForTableResizing, appearance === 'max' && (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true)) && rendererMaxWidthStyles, !fg('platform_editor_ai_generic_prep_for_aifc_2') && telepointerStyles, fg('platform_editor_ai_generic_prep_for_aifc_2') && rovoTelepointerStyles, whitespaceSharedStyles, blockquoteSharedStyles, fg('platform_editor_typography_ugc') ? headingsSharedStylesWithEditorUGC : headingsSharedStyles, headingWithAlignmentStyles, ruleSharedStyles, contentMode === 'compact' && isCompactModeSupported && extensionStyle, fg('platform_editor_typography_ugc') ? isCompactModeSupported ? paragraphStylesUGCScaledMargin : paragraphSharedStylesWithEditorUGC : isCompactModeSupported ? paragraphSharedStyleScaledMargin : paragraphSharedStyles, listsSharedStyles, browser.gecko && listsSharedStylesForGekko, indentationSharedStyles, fg('platform_editor__renderer_indentation_text_margin') && indentationSharedStylesWithMarginFix, blockMarksSharedStyles, codeMarkSharedStyles, shadowSharedStyle, dateSharedStyle, textColorStyles, backgroundColorStyles, expValEquals('platform_editor_text_highlight_padding', 'isEnabled', true) &&
+      css: [baseStyles, hideHeadingCopyLinkWrapperStyles, appearance === 'full-page' && isPreviewPanelResponsivenessOn && rendererFullPageStylesWithReducedPadding, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && rendererFullPageStyles, appearance === 'full-width' && rendererFullWidthStyles, (appearance === 'full-width' || appearance === 'max' && (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true))) && !isTableResizingEnabled(appearance) && rendererFullWidthStylesForTableResizing, appearance === 'max' && (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true)) && rendererMaxWidthStyles, rovoTelepointerStyles, whitespaceSharedStyles, blockquoteSharedStyles, fg('platform_editor_typography_ugc') ? headingsSharedStylesWithEditorUGC : headingsSharedStyles, headingWithAlignmentStyles, ruleSharedStyles, contentMode === 'compact' && isCompactModeSupported && extensionStyle, fg('platform_editor_typography_ugc') ? isCompactModeSupported ? paragraphStylesUGCScaledMargin : paragraphSharedStylesWithEditorUGC : isCompactModeSupported ? paragraphSharedStyleScaledMargin : paragraphSharedStyles, listsSharedStyles, browser.gecko && listsSharedStylesForGekko, indentationSharedStyles, fg('platform_editor__renderer_indentation_text_margin') && indentationSharedStylesWithMarginFix, blockMarksSharedStyles, codeMarkSharedStyles, shadowSharedStyle, dateSharedStyle, textColorStyles, backgroundColorStyles, expValEquals('platform_editor_text_highlight_padding', 'isEnabled', true) &&
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
       textHighlightPaddingStyles, tasksAndDecisionsStyles, smartCardStyles, smartCardStylesAvatarFix, editorExperiment('platform_editor_preview_panel_linking_exp', true) && headerSmartCardStyles, smartCardStylesAvatarMarginFix, smartCardStylesAvatarListZeroMarginTop, fg('editor_inline_comments_on_inline_nodes') && rendererAnnotationStyles,
       // eslint-disable-next-line @atlaskit/platform/no-preconditioning

package/dist/esm/ui/Renderer/index.js

@@ -61,7 +61,7 @@ export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var TABLE_INFO_TIMEOUT = 10000;
 var RENDER_EVENT_SAMPLE_RATE = 0.2;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "126.2.0";
+var packageVersion = "126.2.1";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/types/react/nodes/extension.d.ts

@@ -14,6 +14,7 @@ interface Props {
     extensionKey: string;
     extensionType: string;
     extensionViewportSizes?: ExtensionViewportSize[];
+    isInsideOfInlineExtension?: boolean;
     layout?: ExtensionLayout;
     localId?: string;
     marks?: PMMark[];
@@ -31,7 +32,7 @@ type AllOrNone<T> = T | {
 type RenderExtensionOptions = {
     isTopLevel?: boolean;
 } & AllOrNone<OverflowShadowProps>;
-export declare const renderExtension: (content: any, layout: string, options?: RenderExtensionOptions, removeOverflow?: boolean, extensionId?: string, extensionViewportSizes?: ExtensionViewportSize[], nodeHeight?: string, localId?: string, shouldDisplayExtensionAsInline?: (extensionParams?: ExtensionParams<Parameters>) => boolean, node?: ExtensionParams<Parameters>) => React.JSX.Element;
+export declare const renderExtension: (content: any, layout: string, options?: RenderExtensionOptions, removeOverflow?: boolean, extensionId?: string, extensionViewportSizes?: ExtensionViewportSize[], nodeHeight?: string, localId?: string, shouldDisplayExtensionAsInline?: (extensionParams?: ExtensionParams<Parameters>) => boolean, node?: ExtensionParams<Parameters>, isInsideOfInlineExtension?: boolean) => React.JSX.Element;
 declare const _default_1: {
     new (props: Props & OverflowShadowProps): {
         calcOverflowDiff: () => number;

package/dist/types-ts4.5/react/nodes/extension.d.ts

@@ -14,6 +14,7 @@ interface Props {
     extensionKey: string;
     extensionType: string;
     extensionViewportSizes?: ExtensionViewportSize[];
+    isInsideOfInlineExtension?: boolean;
     layout?: ExtensionLayout;
     localId?: string;
     marks?: PMMark[];
@@ -31,7 +32,7 @@ type AllOrNone<T> = T | {
 type RenderExtensionOptions = {
     isTopLevel?: boolean;
 } & AllOrNone<OverflowShadowProps>;
-export declare const renderExtension: (content: any, layout: string, options?: RenderExtensionOptions, removeOverflow?: boolean, extensionId?: string, extensionViewportSizes?: ExtensionViewportSize[], nodeHeight?: string, localId?: string, shouldDisplayExtensionAsInline?: (extensionParams?: ExtensionParams<Parameters>) => boolean, node?: ExtensionParams<Parameters>) => React.JSX.Element;
+export declare const renderExtension: (content: any, layout: string, options?: RenderExtensionOptions, removeOverflow?: boolean, extensionId?: string, extensionViewportSizes?: ExtensionViewportSize[], nodeHeight?: string, localId?: string, shouldDisplayExtensionAsInline?: (extensionParams?: ExtensionParams<Parameters>) => boolean, node?: ExtensionParams<Parameters>, isInsideOfInlineExtension?: boolean) => React.JSX.Element;
 declare const _default_1: {
     new (props: Props & OverflowShadowProps): {
         calcOverflowDiff: () => number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "126.2.1",
+	"version": "126.2.2",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -90,8 +90,8 @@
 		"@atlaskit/mention": "^24.4.0",
 		"@atlaskit/modal-dialog": "^14.10.0",
 		"@atlaskit/navigation-next": "patch:@atlaskit/navigation-next@npm%3A9.0.17#~/.yarn/patches/@atlaskit-navigation-next-npm-9.0.17-958ca0ab9d.patch",
-		"@atlaskit/profilecard": "^24.32.0",
-		"@atlaskit/util-data-test": "^18.4.0",
+		"@atlaskit/profilecard": "^24.33.0",
+		"@atlaskit/util-data-test": "^18.5.0",
 		"@atlassian/a11y-jest-testing": "^0.8.0",
 		"@atlassian/feature-flags-test-utils": "^1.0.0",
 		"@testing-library/react": "^16.3.0",
@@ -132,9 +132,6 @@
 		"platform-ssr-table-resize": {
 			"type": "boolean"
 		},
-		"platform_editor_ai_generic_prep_for_aifc_2": {
-			"type": "boolean"
-		},
 		"platform_fix_nested_num_column_scaling": {
 			"type": "boolean"
 		},
@@ -248,6 +245,9 @@
 		},
 		"platform_editor_table_fixed_column_width_prop": {
 			"type": "boolean"
+		},
+		"confluence_inline_insert_excerpt_width_bugfix": {
+			"type": "boolean"
 		}
 	}
 }