@atlaskit/editor-common 76.27.0 → 76.27.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-common
 
+## 76.27.1
+
+### Patch Changes
+
+- [#61320](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/61320) [`faf6d59c38d3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/faf6d59c38d3) - [ux] Pass in media dimensions to media card when rendered through inline image card
+
 ## 76.27.0
 
 ### Minor Changes

package/dist/cjs/media-inline/media-inline-image-card.js

@@ -10,6 +10,7 @@ var _react = require("react");
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _mediaCard = require("@atlaskit/media-card");
+var _typography = require("@atlaskit/theme/typography");
 var _mediaInlineCard = require("../messages/media-inline-card");
 var _inlineImageWrapper = require("./inline-image-wrapper");
 var _errorView = require("./views/error-view");
@@ -53,7 +54,7 @@ var MediaInlineImageCardInternal = exports.MediaInlineImageCardInternal = functi
       subscription.unsubscribe();
     };
   }, [identifier.collectionName, identifier.id, mediaClient.file]);
-  var content = function content() {
+  var content = function content(dimensions) {
     if (subscribeError) {
       var isUploading = (fileState === null || fileState === void 0 ? void 0 : fileState.status) === 'uploading';
       var errorMessage = isUploading ? _mediaInlineCard.messages.failedToUpload : _mediaInlineCard.messages.unableToLoadContent;
@@ -84,6 +85,7 @@ var MediaInlineImageCardInternal = exports.MediaInlineImageCardInternal = functi
       mediaClientConfig: mediaClient.mediaClientConfig,
       isLazy: isLazy,
       identifier: identifier,
+      dimensions: dimensions,
       selectable: true,
       disableOverlay: true,
       selected: isSelected,
@@ -93,10 +95,28 @@ var MediaInlineImageCardInternal = exports.MediaInlineImageCardInternal = functi
   var aspectRatio = (0, _react.useMemo)(function () {
     return width && height ? width / height : undefined;
   }, [width, height]);
+
+  /**
+   * scaledDimensions is used to define the correct media size fetched from media service
+   * inline images will only ever be rendererd at a maximum height of H1 and so scaled dimensions
+   * will only ever return a width and height where the height has a maximum height of H1
+   */
+  var scaledDimension = (0, _react.useMemo)(function () {
+    if (!width || !height || !aspectRatio) {
+      return {
+        width: width,
+        height: height
+      };
+    }
+    return {
+      width: Math.round(aspectRatio * _typography.headingSizes.h800.lineHeight),
+      height: _typography.headingSizes.h800.lineHeight
+    };
+  }, [width, height, aspectRatio]);
   return (0, _react2.jsx)(_inlineImageWrapper.InlineImageWrapper, {
     isSelected: isSelected,
     aspectRatio: aspectRatio
-  }, content());
+  }, content(scaledDimension));
 };
 var MediaInlineImageCard = exports.MediaInlineImageCard = (0, _reactIntlNext.injectIntl)(MediaInlineImageCardInternal, {
   enforceContext: false

package/dist/cjs/monitoring/error.js

@@ -16,7 +16,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "76.27.0";
+var packageVersion = "76.27.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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

@@ -24,7 +24,7 @@ var _templateObject, _templateObject2, _templateObject3;
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } /** @jsx jsx */
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "76.27.0";
+var packageVersion = "76.27.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/es2019/media-inline/media-inline-image-card.js

@@ -4,6 +4,7 @@ import { useEffect, useMemo, useState } from 'react';
 import { jsx } from '@emotion/react';
 import { createIntl, injectIntl } from 'react-intl-next';
 import { Card } from '@atlaskit/media-card';
+import { headingSizes } from '@atlaskit/theme/typography';
 import { messages } from '../messages/media-inline-card';
 import { InlineImageWrapper } from './inline-image-wrapper';
 import { InlineImageCardErrorView } from './views/error-view';
@@ -41,7 +42,7 @@ export const MediaInlineImageCardInternal = ({
       subscription.unsubscribe();
     };
   }, [identifier.collectionName, identifier.id, mediaClient.file]);
-  const content = () => {
+  const content = dimensions => {
     if (subscribeError) {
       const isUploading = (fileState === null || fileState === void 0 ? void 0 : fileState.status) === 'uploading';
       const errorMessage = isUploading ? messages.failedToUpload : messages.unableToLoadContent;
@@ -72,6 +73,7 @@ export const MediaInlineImageCardInternal = ({
       mediaClientConfig: mediaClient.mediaClientConfig,
       isLazy: isLazy,
       identifier: identifier,
+      dimensions: dimensions,
       selectable: true,
       disableOverlay: true,
       selected: isSelected,
@@ -79,10 +81,28 @@ export const MediaInlineImageCardInternal = ({
     });
   };
   const aspectRatio = useMemo(() => width && height ? width / height : undefined, [width, height]);
+
+  /**
+   * scaledDimensions is used to define the correct media size fetched from media service
+   * inline images will only ever be rendererd at a maximum height of H1 and so scaled dimensions
+   * will only ever return a width and height where the height has a maximum height of H1
+   */
+  const scaledDimension = useMemo(() => {
+    if (!width || !height || !aspectRatio) {
+      return {
+        width,
+        height
+      };
+    }
+    return {
+      width: Math.round(aspectRatio * headingSizes.h800.lineHeight),
+      height: headingSizes.h800.lineHeight
+    };
+  }, [width, height, aspectRatio]);
   return jsx(InlineImageWrapper, {
     isSelected: isSelected,
     aspectRatio: aspectRatio
-  }, content());
+  }, content(scaledDimension));
 };
 export const MediaInlineImageCard = injectIntl(MediaInlineImageCardInternal, {
   enforceContext: false

package/dist/es2019/monitoring/error.js

@@ -1,6 +1,6 @@
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "76.27.0";
+const packageVersion = "76.27.1";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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

@@ -9,7 +9,7 @@ import { themed } from '@atlaskit/theme/components';
 import { borderRadius } from '@atlaskit/theme/constants';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "76.27.0";
+const packageVersion = "76.27.1";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

package/dist/esm/media-inline/media-inline-image-card.js

@@ -5,6 +5,7 @@ import { useEffect, useMemo, useState } from 'react';
 import { jsx } from '@emotion/react';
 import { createIntl, injectIntl } from 'react-intl-next';
 import { Card } from '@atlaskit/media-card';
+import { headingSizes } from '@atlaskit/theme/typography';
 import { messages } from '../messages/media-inline-card';
 import { InlineImageWrapper } from './inline-image-wrapper';
 import { InlineImageCardErrorView } from './views/error-view';
@@ -46,7 +47,7 @@ export var MediaInlineImageCardInternal = function MediaInlineImageCardInternal(
       subscription.unsubscribe();
     };
   }, [identifier.collectionName, identifier.id, mediaClient.file]);
-  var content = function content() {
+  var content = function content(dimensions) {
     if (subscribeError) {
       var isUploading = (fileState === null || fileState === void 0 ? void 0 : fileState.status) === 'uploading';
       var errorMessage = isUploading ? messages.failedToUpload : messages.unableToLoadContent;
@@ -77,6 +78,7 @@ export var MediaInlineImageCardInternal = function MediaInlineImageCardInternal(
       mediaClientConfig: mediaClient.mediaClientConfig,
       isLazy: isLazy,
       identifier: identifier,
+      dimensions: dimensions,
       selectable: true,
       disableOverlay: true,
       selected: isSelected,
@@ -86,10 +88,28 @@ export var MediaInlineImageCardInternal = function MediaInlineImageCardInternal(
   var aspectRatio = useMemo(function () {
     return width && height ? width / height : undefined;
   }, [width, height]);
+
+  /**
+   * scaledDimensions is used to define the correct media size fetched from media service
+   * inline images will only ever be rendererd at a maximum height of H1 and so scaled dimensions
+   * will only ever return a width and height where the height has a maximum height of H1
+   */
+  var scaledDimension = useMemo(function () {
+    if (!width || !height || !aspectRatio) {
+      return {
+        width: width,
+        height: height
+      };
+    }
+    return {
+      width: Math.round(aspectRatio * headingSizes.h800.lineHeight),
+      height: headingSizes.h800.lineHeight
+    };
+  }, [width, height, aspectRatio]);
   return jsx(InlineImageWrapper, {
     isSelected: isSelected,
     aspectRatio: aspectRatio
-  }, content());
+  }, content(scaledDimension));
 };
 export var MediaInlineImageCard = injectIntl(MediaInlineImageCardInternal, {
   enforceContext: false

package/dist/esm/monitoring/error.js

@@ -6,7 +6,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "76.27.0";
+var packageVersion = "76.27.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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

@@ -19,7 +19,7 @@ import { themed } from '@atlaskit/theme/components';
 import { borderRadius } from '@atlaskit/theme/constants';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "76.27.0";
+var packageVersion = "76.27.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-common",
-  "version": "76.27.0",
+  "version": "76.27.1",
   "description": "A package that contains common classes and components for editor and renderer",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -94,7 +94,7 @@
     "@atlaskit/analytics-namespaced-context": "^6.7.0",
     "@atlaskit/analytics-next": "^9.1.0",
     "@atlaskit/analytics-next-stable-react-context": "1.0.1",
-    "@atlaskit/button": "^17.0.0",
+    "@atlaskit/button": "^17.1.0",
     "@atlaskit/code": "^15.1.0",
     "@atlaskit/codemod-utils": "^4.2.0",
     "@atlaskit/custom-steps": "^0.0.9",