@atlaskit/renderer 139.1.0 → 139.1.1

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/renderer
 
+## 139.1.1
+
+### Patch Changes
+
+- [`5917191a3107d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5917191a3107d) -
+  Clean up feature gate `platform_fix_macro_renders_in_layouts`
+- [`031f2b4eddd7b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/031f2b4eddd7b) -
+  Fix code blocks remaining visible in collapsed heading sections under
+  platform_editor_collapsible_headings by overriding CodeMirror display priority. Simplify collapse
+  reconciliation by deriving section content from document positions instead of maintaining mutable
+  content flags, and separate decoration creation from section traversal.
+
+  Preserve collapsed heading state when unchanged content is rebuilt with a fresh schema instance
+  under platform_renderer_collapsible_headings.
+
+- Updated dependencies
+
 ## 139.1.0
 
 ### Minor Changes

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

@@ -11,7 +11,7 @@ var _react = require("@emotion/react");
 var _react2 = require("react");
 var _smartCard = require("@atlaskit/smart-card");
 var _ssr = require("@atlaskit/smart-card/ssr");
-var _linkProvider = require("@atlaskit/link-provider");
+var _context = require("@atlaskit/link-provider/context");
 var _ui = require("@atlaskit/editor-common/ui");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
@@ -119,7 +119,7 @@ function EmbedCardInternal(props) {
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     hasPreview = _useState6[0],
     setPreviewAvailableState = _useState6[1];
-  var cardContext = (0, _react2.useContext)(_linkProvider.SmartCardContext);
+  var cardContext = (0, _react2.useContext)(_context.SmartCardContext);
   var onResolve = function onResolve(_ref2) {
     var resolvedAspectRatio = _ref2.aspectRatio;
     var hasPreviewOnResolve = !!(cardContext && url && cardContext.extractors.getPreview(url, platform));

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

@@ -179,7 +179,7 @@ var renderExtension = exports.renderExtension = function renderExtension(content
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
       ,
       className: "".concat(_consts.RendererCssClassName.EXTENSION_INNER_WRAPPER, " ").concat(overflowContainerClass),
-      css: [(!isInsideOfTable || (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_fit_to_content_patch_2')) && !isInsideOfInlineExtension && (0, _fg.fg)('platform_fix_macro_renders_in_layouts') && containerStyle]
+      css: [(!isInsideOfTable || (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_fit_to_content_patch_2')) && !isInsideOfInlineExtension && containerStyle]
     }, asInlineAnalytics, content));
     return centerAlignClass ? (0, _react.jsx)("div", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
@@ -211,7 +211,7 @@ var renderExtension = exports.renderExtension = function renderExtension(content
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
       ,
       className: "".concat(_consts.RendererCssClassName.EXTENSION_INNER_WRAPPER, " ").concat(overflowContainerClass),
-      css: [(!isInsideOfTable || (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_fit_to_content_patch_2')) && !isInsideOfInlineExtension && (0, _fg.fg)('platform_fix_macro_renders_in_layouts') && containerStyle]
+      css: [(!isInsideOfTable || (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_fit_to_content_patch_2')) && !isInsideOfInlineExtension && containerStyle]
     }, asInlineAnalytics, content));
     return centerAlignClass ? (0, _react.jsx)("div", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop

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

@@ -9,7 +9,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
-var _linkProvider = require("@atlaskit/link-provider");
+var _useSmartCardContext = require("@atlaskit/link-provider/use-smart-card-context");
 var _smartCard = require("@atlaskit/smart-card");
 var _utils = require("@atlaskit/linking-common/utils");
 var _hooks = require("@atlaskit/smart-card/hooks");
@@ -46,7 +46,7 @@ var OverlayWithCardContext = function OverlayWithCardContext(_ref) {
     url = _ref.url,
     fireAnalyticsEvent = _ref.fireAnalyticsEvent,
     children = _ref.children;
-  var cardContext = (0, _linkProvider.useSmartCardContext)();
+  var cardContext = (0, _useSmartCardContext.useSmartCardContext)();
   // Note: useSmartLinkActions throws without smart card context. Using it here is safe
   // because we checked cardContext availability in the parent component
   var actions = (0, _hooks.useSmartLinkActions)({
@@ -144,7 +144,7 @@ var InlineCard = function InlineCard(props) {
     rendererAppearance = props.rendererAppearance,
     onSetLinkTarget = props.onSetLinkTarget;
   var portal = (0, _PortalContext.usePortal)(props);
-  var cardContext = (0, _linkProvider.useSmartCardContext)();
+  var cardContext = (0, _useSmartCardContext.useSmartCardContext)();
   var provider = (0, _providerFactory.useProvider)('cardProvider');
   var SuspenseWrapperForUrl = smartLinks === null || smartLinks === void 0 ? void 0 : smartLinks.SuspenseWrapperForUrl;
 

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

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

package/dist/cjs/ui/collapsible-headings.js

@@ -11,14 +11,22 @@ exports.useCollapsibleHeadingsController = useCollapsibleHeadingsController;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _bindEventListener = require("bind-event-listener");
+var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _collapsibleHeadingsDom = require("./collapsible-headings-dom");
 var _collapsibleHeadingsSectionModel = require("./collapsible-headings-section-model");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var CollapsibleHeadingsContext = /*#__PURE__*/_react.default.createContext(null);
 var emptyCollapsedHeadings = new Set();
 function isSameDocument(currentDocument, nextDocument) {
-  // Renderer reparses equivalent ADF on parent rerenders, so object identity is not stable.
-  return currentDocument === nextDocument || Boolean(currentDocument && nextDocument && currentDocument.eq(nextDocument));
+  if (currentDocument === nextDocument) {
+    return true;
+  }
+  if (!currentDocument || !nextDocument) {
+    return false;
+  }
+  // Node.eq compares node-type identity. The shared schema cache can be evicted by another
+  // renderer, producing different node types for identical content on the next render.
+  return currentDocument.type.schema === nextDocument.type.schema ? currentDocument.eq(nextDocument) : (0, _isEqual.default)(currentDocument.toJSON(), nextDocument.toJSON());
 }
 function supportsHiddenUntilFound(rendererRef) {
   var _rendererRef$current;

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

@@ -9,7 +9,7 @@ import { jsx, css } from '@emotion/react';
 import { useContext, useState, useRef } from 'react';
 import { Card, EmbedResizeMessageListener } from '@atlaskit/smart-card';
 import { CardSSR } from '@atlaskit/smart-card/ssr';
-import { SmartCardContext } from '@atlaskit/link-provider';
+import { SmartCardContext } from '@atlaskit/link-provider/context';
 import { WidthConsumer, UnsupportedBlock, MediaSingle as UIMediaSingle, WidthContext } from '@atlaskit/editor-common/ui';
 import { akEditorDefaultLayoutWidth, akEditorFullPageNarrowBreakout, akEditorFullWidthLayoutWidth, DEFAULT_EMBED_CARD_HEIGHT, DEFAULT_EMBED_CARD_WIDTH } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags/fg';

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

@@ -158,7 +158,7 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
       ,
       className: `${RendererCssClassName.EXTENSION_INNER_WRAPPER} ${overflowContainerClass}`,
-      css: [(!isInsideOfTable || isExperimentEnabled('platform_editor_table_fit_to_content_patch_2')) && !isInsideOfInlineExtension && fg('platform_fix_macro_renders_in_layouts') && containerStyle]
+      css: [(!isInsideOfTable || isExperimentEnabled('platform_editor_table_fit_to_content_patch_2')) && !isInsideOfInlineExtension && containerStyle]
     }, asInlineAnalytics, content));
     return centerAlignClass ? jsx("div", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
@@ -191,7 +191,7 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
       ,
       className: `${RendererCssClassName.EXTENSION_INNER_WRAPPER} ${overflowContainerClass}`,
-      css: [(!isInsideOfTable || isExperimentEnabled('platform_editor_table_fit_to_content_patch_2')) && !isInsideOfInlineExtension && fg('platform_fix_macro_renders_in_layouts') && containerStyle]
+      css: [(!isInsideOfTable || isExperimentEnabled('platform_editor_table_fit_to_content_patch_2')) && !isInsideOfInlineExtension && containerStyle]
     }, asInlineAnalytics, content));
     return centerAlignClass ? jsx("div", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop

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

@@ -7,7 +7,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import { Fragment, useState, useMemo, useEffect } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
-import { useSmartCardContext } from '@atlaskit/link-provider';
+import { useSmartCardContext } from '@atlaskit/link-provider/use-smart-card-context';
 import { Card, getObjectAri, getObjectIconUrl, getObjectName } from '@atlaskit/smart-card';
 import { isWithinPreviewPanelIFrame } from '@atlaskit/linking-common/utils';
 import { useSmartLinkActions } from '@atlaskit/smart-card/hooks';

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

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

package/dist/es2019/ui/collapsible-headings.js

@@ -1,12 +1,20 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { bind } from 'bind-event-listener';
+import isEqual from 'lodash/isEqual';
 import { COLLAPSED_CONTENT_OWNERS_ATTRIBUTE, getCollapsedContentOwners, getOwnedRendererDocuments, reconcileCollapsedHeadingContent } from './collapsible-headings-dom';
 import { buildTopLevelHeadingSections } from './collapsible-headings-section-model';
 const CollapsibleHeadingsContext = /*#__PURE__*/React.createContext(null);
 const emptyCollapsedHeadings = new Set();
 function isSameDocument(currentDocument, nextDocument) {
-  // Renderer reparses equivalent ADF on parent rerenders, so object identity is not stable.
-  return currentDocument === nextDocument || Boolean(currentDocument && nextDocument && currentDocument.eq(nextDocument));
+  if (currentDocument === nextDocument) {
+    return true;
+  }
+  if (!currentDocument || !nextDocument) {
+    return false;
+  }
+  // Node.eq compares node-type identity. The shared schema cache can be evicted by another
+  // renderer, producing different node types for identical content on the next render.
+  return currentDocument.type.schema === nextDocument.type.schema ? currentDocument.eq(nextDocument) : isEqual(currentDocument.toJSON(), nextDocument.toJSON());
 }
 function supportsHiddenUntilFound(rendererRef) {
   var _rendererRef$current;

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

@@ -10,7 +10,7 @@ import { jsx, css } from '@emotion/react';
 import { useContext, useState, useRef } from 'react';
 import { Card, EmbedResizeMessageListener } from '@atlaskit/smart-card';
 import { CardSSR } from '@atlaskit/smart-card/ssr';
-import { SmartCardContext } from '@atlaskit/link-provider';
+import { SmartCardContext } from '@atlaskit/link-provider/context';
 import { WidthConsumer, UnsupportedBlock, MediaSingle as UIMediaSingle, WidthContext } from '@atlaskit/editor-common/ui';
 import { akEditorDefaultLayoutWidth, akEditorFullPageNarrowBreakout, akEditorFullWidthLayoutWidth, DEFAULT_EMBED_CARD_HEIGHT, DEFAULT_EMBED_CARD_WIDTH } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags/fg';

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

@@ -169,7 +169,7 @@ export var renderExtension = function renderExtension(content, layout) {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
       ,
       className: "".concat(RendererCssClassName.EXTENSION_INNER_WRAPPER, " ").concat(overflowContainerClass),
-      css: [(!isInsideOfTable || isExperimentEnabled('platform_editor_table_fit_to_content_patch_2')) && !isInsideOfInlineExtension && fg('platform_fix_macro_renders_in_layouts') && containerStyle]
+      css: [(!isInsideOfTable || isExperimentEnabled('platform_editor_table_fit_to_content_patch_2')) && !isInsideOfInlineExtension && containerStyle]
     }, asInlineAnalytics, content));
     return centerAlignClass ? jsx("div", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
@@ -201,7 +201,7 @@ export var renderExtension = function renderExtension(content, layout) {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
       ,
       className: "".concat(RendererCssClassName.EXTENSION_INNER_WRAPPER, " ").concat(overflowContainerClass),
-      css: [(!isInsideOfTable || isExperimentEnabled('platform_editor_table_fit_to_content_patch_2')) && !isInsideOfInlineExtension && fg('platform_fix_macro_renders_in_layouts') && containerStyle]
+      css: [(!isInsideOfTable || isExperimentEnabled('platform_editor_table_fit_to_content_patch_2')) && !isInsideOfInlineExtension && containerStyle]
     }, asInlineAnalytics, content));
     return centerAlignClass ? jsx("div", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop

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

@@ -8,7 +8,7 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { Fragment, useState, useMemo, useEffect } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
-import { useSmartCardContext } from '@atlaskit/link-provider';
+import { useSmartCardContext } from '@atlaskit/link-provider/use-smart-card-context';
 import { Card, getObjectAri, getObjectIconUrl, getObjectName } from '@atlaskit/smart-card';
 import { isWithinPreviewPanelIFrame } from '@atlaskit/linking-common/utils';
 import { useSmartLinkActions } from '@atlaskit/smart-card/hooks';

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

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

package/dist/esm/ui/collapsible-headings.js

@@ -1,13 +1,21 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { bind } from 'bind-event-listener';
+import isEqual from 'lodash/isEqual';
 import { COLLAPSED_CONTENT_OWNERS_ATTRIBUTE, getCollapsedContentOwners, getOwnedRendererDocuments, reconcileCollapsedHeadingContent } from './collapsible-headings-dom';
 import { buildTopLevelHeadingSections } from './collapsible-headings-section-model';
 var CollapsibleHeadingsContext = /*#__PURE__*/React.createContext(null);
 var emptyCollapsedHeadings = new Set();
 function isSameDocument(currentDocument, nextDocument) {
-  // Renderer reparses equivalent ADF on parent rerenders, so object identity is not stable.
-  return currentDocument === nextDocument || Boolean(currentDocument && nextDocument && currentDocument.eq(nextDocument));
+  if (currentDocument === nextDocument) {
+    return true;
+  }
+  if (!currentDocument || !nextDocument) {
+    return false;
+  }
+  // Node.eq compares node-type identity. The shared schema cache can be evicted by another
+  // renderer, producing different node types for identical content on the next render.
+  return currentDocument.type.schema === nextDocument.type.schema ? currentDocument.eq(nextDocument) : isEqual(currentDocument.toJSON(), nextDocument.toJSON());
 }
 function supportsHiddenUntilFound(rendererRef) {
   var _rendererRef$current;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "139.1.0",
+	"version": "139.1.1",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -65,12 +65,12 @@
 		"@atlaskit/platform-feature-flags-react": "^1.2.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^3.1.0",
 		"@atlaskit/react-compiler-gating": "^0.2.0",
-		"@atlaskit/react-ufo": "^7.9.0",
+		"@atlaskit/react-ufo": "^7.10.0",
 		"@atlaskit/smart-card": "^45.22.0",
 		"@atlaskit/status": "^5.9.0",
 		"@atlaskit/task-decision": "^21.9.0",
 		"@atlaskit/theme": "^28.2.0",
-		"@atlaskit/tmp-editor-statsig": "^187.0.0",
+		"@atlaskit/tmp-editor-statsig": "^188.0.0",
 		"@atlaskit/tokens": "^16.12.0",
 		"@atlaskit/tooltip": "^24.3.0",
 		"@atlaskit/visually-hidden": "^4.4.0",
@@ -85,7 +85,7 @@
 		"uuid": "^11.1.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^121.4.0",
+		"@atlaskit/editor-common": "^121.5.0",
 		"@atlaskit/link-provider": "^5.6.0",
 		"@atlaskit/media-core": "^38.2.0",
 		"react": "^18.2.0 || ^19.2.0",
@@ -105,12 +105,13 @@
 		"@atlaskit/link-test-helpers": "^11.2.0",
 		"@atlaskit/media-core": "^38.2.0",
 		"@atlaskit/media-integration-test-helpers": "workspace:^",
+		"@atlaskit/media-state": "^3.2.0",
 		"@atlaskit/media-test-helpers": "^42.4.0",
-		"@atlaskit/mention": "^28.0.0",
+		"@atlaskit/mention": "^29.0.0",
 		"@atlaskit/modal-dialog": "^16.6.0",
 		"@atlaskit/navigation-system": "^10.16.0",
 		"@atlaskit/primitives": "^22.5.0",
-		"@atlaskit/profilecard": "^26.22.0",
+		"@atlaskit/profilecard": "^26.23.0",
 		"@atlaskit/radio": "^10.2.0",
 		"@atlaskit/range": "^12.2.0",
 		"@atlaskit/section-message": "^10.2.0",
@@ -129,7 +130,7 @@
 		"@testing-library/user-event": "^14.4.3",
 		"@types/react-loadable": "^5.4.1",
 		"ajv": "^6.12.6",
-		"jsdom": "^25.0.0",
+		"jsdom": "26.1.0",
 		"mockdate": "^3.0.5",
 		"puppeteer": "13.7.0",
 		"react": "^19.2.0",
@@ -211,9 +212,6 @@
 		"media-perf-uplift-mutation-fix": {
 			"type": "boolean"
 		},
-		"platform_fix_macro_renders_in_layouts": {
-			"type": "boolean"
-		},
 		"confluence_ttvc_inline_extensions": {
 			"type": "boolean"
 		},