@atlaskit/renderer 124.5.1 → 124.5.3

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/renderer
 
+## 124.5.3
+
+### Patch Changes
+
+- [`e22968790f2b5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e22968790f2b5) -
+  [ux] [EDITOR-2374] prevent style overrides on codemarks in excerpts
+- Updated dependencies
+
+## 124.5.2
+
+### Patch Changes
+
+- [`eec573b4a7a6a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/eec573b4a7a6a) -
+  Passing the precise Pixel width when available instead of the container width, and passing height
+  100% to avoid attempting height calculations to remove changes for VC
+- Updated dependencies
+
 ## 124.5.1
 
 ### Patch Changes

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

@@ -140,12 +140,21 @@ var MediaSingleWithChildren = function MediaSingleWithChildren(props) {
   var padding = isFullPage ? _style.FullPagePadding * 2 : 0;
   var calcDimensions = (0, _react.useCallback)(function (mediaContainerWidth) {
     var containerWidth = getMediaContainerWidth(mediaContainerWidth, layout);
-    var maxWidth = (0, _coreUtils.isSSR)() && widthAttr && typeof widthAttr === 'number' && (0, _platformFeatureFlags.fg)('platform_editor_fix_image_size_diff_during_ssr') ? Math.max(widthAttr, containerWidth) : containerWidth;
-    var maxHeight = height / width * maxWidth;
-    var cardDimensions = {
-      width: "".concat(maxWidth, "px"),
-      height: "".concat(maxHeight, "px")
-    };
+    var cardDimensions = {};
+    if ((0, _platformFeatureFlags.fg)('media-perf-uplift-mutation-fix')) {
+      var maxWidth = widthAttr && typeof widthAttr === 'number' ? widthAttr : containerWidth;
+      cardDimensions = {
+        width: "".concat(maxWidth, "px"),
+        height: "100%"
+      };
+    } else {
+      var _maxWidth = (0, _coreUtils.isSSR)() && widthAttr && typeof widthAttr === 'number' && (0, _platformFeatureFlags.fg)('platform_editor_fix_image_size_diff_during_ssr') ? Math.max(widthAttr, containerWidth) : containerWidth;
+      var maxHeight = height / width * _maxWidth;
+      cardDimensions = {
+        width: "".concat(_maxWidth, "px"),
+        height: "".concat(maxHeight, "px")
+      };
+    }
     var nonFullWidthSize = containerWidth;
     if (!isInsideOfBlockNode && rendererAppearance !== 'comment') {
       var isContainerSizeGreaterThanMaxFullPageWidth = containerWidth - padding >= _editorSharedStyles.akEditorDefaultLayoutWidth;

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

@@ -717,7 +717,7 @@ var codeMarkSharedStyles = (0, _react.css)({
 });
 var extensionStyle = (0, _react.css)({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
-  '.ak-renderer-extension :not([data-inline-card-lozenge] *)': {
+  '.ak-renderer-extension :not([data-inline-card-lozenge] *, code)': {
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     fontSize: 'var(--ak-renderer-base-font-size)'
   }

package/dist/es2019/react/nodes/mediaSingle/index.js

@@ -127,12 +127,21 @@ const MediaSingleWithChildren = props => {
   const padding = isFullPage ? FullPagePadding * 2 : 0;
   const calcDimensions = useCallback(mediaContainerWidth => {
     const containerWidth = getMediaContainerWidth(mediaContainerWidth, layout);
-    const maxWidth = isSSR() && widthAttr && typeof widthAttr === 'number' && fg('platform_editor_fix_image_size_diff_during_ssr') ? Math.max(widthAttr, containerWidth) : containerWidth;
-    const maxHeight = height / width * maxWidth;
-    const cardDimensions = {
-      width: `${maxWidth}px`,
-      height: `${maxHeight}px`
-    };
+    let cardDimensions = {};
+    if (fg('media-perf-uplift-mutation-fix')) {
+      const maxWidth = widthAttr && typeof widthAttr === 'number' ? widthAttr : containerWidth;
+      cardDimensions = {
+        width: `${maxWidth}px`,
+        height: `100%`
+      };
+    } else {
+      const maxWidth = isSSR() && widthAttr && typeof widthAttr === 'number' && fg('platform_editor_fix_image_size_diff_during_ssr') ? Math.max(widthAttr, containerWidth) : containerWidth;
+      const maxHeight = height / width * maxWidth;
+      cardDimensions = {
+        width: `${maxWidth}px`,
+        height: `${maxHeight}px`
+      };
+    }
     let nonFullWidthSize = containerWidth;
     if (!isInsideOfBlockNode && rendererAppearance !== 'comment') {
       const isContainerSizeGreaterThanMaxFullPageWidth = containerWidth - padding >= akEditorDefaultLayoutWidth;

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

@@ -824,7 +824,7 @@ const codeMarkSharedStyles = css({
 });
 const extensionStyle = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
-  '.ak-renderer-extension :not([data-inline-card-lozenge] *)': {
+  '.ak-renderer-extension :not([data-inline-card-lozenge] *, code)': {
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     fontSize: 'var(--ak-renderer-base-font-size)'
   }

package/dist/esm/react/nodes/mediaSingle/index.js

@@ -130,12 +130,21 @@ var MediaSingleWithChildren = function MediaSingleWithChildren(props) {
   var padding = isFullPage ? FullPagePadding * 2 : 0;
   var calcDimensions = useCallback(function (mediaContainerWidth) {
     var containerWidth = getMediaContainerWidth(mediaContainerWidth, layout);
-    var maxWidth = isSSR() && widthAttr && typeof widthAttr === 'number' && fg('platform_editor_fix_image_size_diff_during_ssr') ? Math.max(widthAttr, containerWidth) : containerWidth;
-    var maxHeight = height / width * maxWidth;
-    var cardDimensions = {
-      width: "".concat(maxWidth, "px"),
-      height: "".concat(maxHeight, "px")
-    };
+    var cardDimensions = {};
+    if (fg('media-perf-uplift-mutation-fix')) {
+      var maxWidth = widthAttr && typeof widthAttr === 'number' ? widthAttr : containerWidth;
+      cardDimensions = {
+        width: "".concat(maxWidth, "px"),
+        height: "100%"
+      };
+    } else {
+      var _maxWidth = isSSR() && widthAttr && typeof widthAttr === 'number' && fg('platform_editor_fix_image_size_diff_during_ssr') ? Math.max(widthAttr, containerWidth) : containerWidth;
+      var maxHeight = height / width * _maxWidth;
+      cardDimensions = {
+        width: "".concat(_maxWidth, "px"),
+        height: "".concat(maxHeight, "px")
+      };
+    }
     var nonFullWidthSize = containerWidth;
     if (!isInsideOfBlockNode && rendererAppearance !== 'comment') {
       var isContainerSizeGreaterThanMaxFullPageWidth = containerWidth - padding >= akEditorDefaultLayoutWidth;

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

@@ -710,7 +710,7 @@ var codeMarkSharedStyles = css({
 });
 var extensionStyle = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
-  '.ak-renderer-extension :not([data-inline-card-lozenge] *)': {
+  '.ak-renderer-extension :not([data-inline-card-lozenge] *, code)': {
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     fontSize: 'var(--ak-renderer-base-font-size)'
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "124.5.1",
+	"version": "124.5.3",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -57,8 +57,8 @@
 		"@atlaskit/status": "^3.0.0",
 		"@atlaskit/task-decision": "^19.2.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^13.12.0",
-		"@atlaskit/tokens": "^6.5.0",
+		"@atlaskit/tmp-editor-statsig": "^13.13.0",
+		"@atlaskit/tokens": "^7.0.0",
 		"@atlaskit/tooltip": "^20.5.0",
 		"@atlaskit/visually-hidden": "^3.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -250,6 +250,9 @@
 		},
 		"hot-121622_lazy_load_expand_content": {
 			"type": "boolean"
+		},
+		"media-perf-uplift-mutation-fix": {
+			"type": "boolean"
 		}
 	}
 }