@atlaskit/editor-plugin-media 0.5.0 → 0.5.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-media
 
+## 0.5.1
+
+### Patch Changes
+
+- [#59047](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/59047) [`a792bec68ae3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a792bec68ae3) - [ED-21288] Populate width and height ADF attributes on insertion for mediaInline node of image type.
+
 ## 0.5.0
 
 ### Minor Changes

package/dist/cjs/utils/media-files.js

@@ -5,10 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.insertMediaInlineNode = exports.insertMediaGroupNode = exports.getPosInList = exports.canInsertMediaInline = void 0;
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _mediaInline = require("@atlaskit/editor-common/media-inline");
 var _selection = require("@atlaskit/editor-common/selection");
 var _utils = require("@atlaskit/editor-common/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _isType = require("./is-type");
 var _mediaCommon = require("./media-common");
 var canInsertMediaInline = exports.canInsertMediaInline = function canInsertMediaInline(state) {
   var node = state.schema.nodes.mediaInline.create({});
@@ -88,11 +91,29 @@ var insertMediaInlineNode = exports.insertMediaInlineNode = function insertMedia
     if (!mediaInline || !mediaState || collection === undefined) {
       return false;
     }
-    var id = mediaState.id;
-    var mediaInlineNode = mediaInline.create({
+    var id = mediaState.id,
+      dimensions = mediaState.dimensions,
+      _mediaState$scaleFact = mediaState.scaleFactor,
+      scaleFactor = _mediaState$scaleFact === void 0 ? 1 : _mediaState$scaleFact;
+    var mediaInlineAttrs = {
       id: id,
       collection: collection
-    });
+    };
+    if (
+    // TODO: replace it with new shouldShowInlineImage
+    (0, _platformFeatureFlags.getBooleanFF)('platform.editor.media.inline-image.base-support') && (0, _isType.isImage)(mediaState.fileMimeType)) {
+      var _ref = dimensions || {
+          width: undefined,
+          height: undefined
+        },
+        width = _ref.width,
+        height = _ref.height;
+      var scaledWidth = width ? Math.round(width / scaleFactor) : _mediaInline.DEFAULT_IMAGE_WIDTH;
+      var scaledHeight = height ? Math.round(height / scaleFactor) : _mediaInline.DEFAULT_IMAGE_HEIGHT;
+      mediaInlineAttrs.width = scaledWidth;
+      mediaInlineAttrs.height = scaledHeight;
+    }
+    var mediaInlineNode = mediaInline.create(mediaInlineAttrs);
     var space = state.schema.text(' ');
     var pos = state.selection.$to.pos;
 

package/dist/es2019/utils/media-files.js

@@ -1,8 +1,11 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH } from '@atlaskit/editor-common/media-inline';
 import { atTheBeginningOfBlock, atTheEndOfBlock, atTheEndOfDoc, endPositionOfParent, startPositionOfParent } from '@atlaskit/editor-common/selection';
 import { findFarthestParentNode, insideTableCell, isInLayoutColumn, isInListItem, isSupportedInParent, setNodeSelection, setTextSelection } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { canInsert, hasParentNode, safeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { isImage } from './is-type';
 import { copyOptionalAttrsFromMediaState, isInsidePotentialEmptyParagraph, isSelectionNonMediaBlockNode, posOfMediaGroupNearby, posOfParentMediaGroup, posOfPrecedingMediaGroup } from './media-common';
 export const canInsertMediaInline = state => {
   const node = state.schema.nodes.mediaInline.create({});
@@ -96,12 +99,30 @@ export const insertMediaInlineNode = editorAnalyticsAPI => (view, mediaState, co
     return false;
   }
   const {
-    id
+    id,
+    dimensions,
+    scaleFactor = 1
   } = mediaState;
-  const mediaInlineNode = mediaInline.create({
+  let mediaInlineAttrs = {
     id,
     collection
-  });
+  };
+  if (
+  // TODO: replace it with new shouldShowInlineImage
+  getBooleanFF('platform.editor.media.inline-image.base-support') && isImage(mediaState.fileMimeType)) {
+    const {
+      width,
+      height
+    } = dimensions || {
+      width: undefined,
+      height: undefined
+    };
+    const scaledWidth = width ? Math.round(width / scaleFactor) : DEFAULT_IMAGE_WIDTH;
+    const scaledHeight = height ? Math.round(height / scaleFactor) : DEFAULT_IMAGE_HEIGHT;
+    mediaInlineAttrs.width = scaledWidth;
+    mediaInlineAttrs.height = scaledHeight;
+  }
+  const mediaInlineNode = mediaInline.create(mediaInlineAttrs);
   const space = state.schema.text(' ');
   let pos = state.selection.$to.pos;
 

package/dist/esm/utils/media-files.js

@@ -1,8 +1,11 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH } from '@atlaskit/editor-common/media-inline';
 import { atTheBeginningOfBlock, atTheEndOfBlock, atTheEndOfDoc, endPositionOfParent, startPositionOfParent } from '@atlaskit/editor-common/selection';
 import { findFarthestParentNode, insideTableCell, isInLayoutColumn, isInListItem, isSupportedInParent, setNodeSelection, setTextSelection } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { canInsert, hasParentNode, safeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { isImage } from './is-type';
 import { copyOptionalAttrsFromMediaState, isInsidePotentialEmptyParagraph, isSelectionNonMediaBlockNode, posOfMediaGroupNearby, posOfParentMediaGroup, posOfPrecedingMediaGroup } from './media-common';
 export var canInsertMediaInline = function canInsertMediaInline(state) {
   var node = state.schema.nodes.mediaInline.create({});
@@ -82,11 +85,29 @@ export var insertMediaInlineNode = function insertMediaInlineNode(editorAnalytic
     if (!mediaInline || !mediaState || collection === undefined) {
       return false;
     }
-    var id = mediaState.id;
-    var mediaInlineNode = mediaInline.create({
+    var id = mediaState.id,
+      dimensions = mediaState.dimensions,
+      _mediaState$scaleFact = mediaState.scaleFactor,
+      scaleFactor = _mediaState$scaleFact === void 0 ? 1 : _mediaState$scaleFact;
+    var mediaInlineAttrs = {
       id: id,
       collection: collection
-    });
+    };
+    if (
+    // TODO: replace it with new shouldShowInlineImage
+    getBooleanFF('platform.editor.media.inline-image.base-support') && isImage(mediaState.fileMimeType)) {
+      var _ref = dimensions || {
+          width: undefined,
+          height: undefined
+        },
+        width = _ref.width,
+        height = _ref.height;
+      var scaledWidth = width ? Math.round(width / scaleFactor) : DEFAULT_IMAGE_WIDTH;
+      var scaledHeight = height ? Math.round(height / scaleFactor) : DEFAULT_IMAGE_HEIGHT;
+      mediaInlineAttrs.width = scaledWidth;
+      mediaInlineAttrs.height = scaledHeight;
+    }
+    var mediaInlineNode = mediaInline.create(mediaInlineAttrs);
     var space = state.schema.text(' ');
     var pos = state.selection.$to.pos;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-media",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Media plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",