@atlaskit/editor-core 187.43.11 → 187.43.12

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-core
 
+## 187.43.12
+
+### Patch Changes
+
+- [`621b904a076`](https://bitbucket.org/atlassian/atlassian-frontend/commits/621b904a076) - ED-19729 fix behaviour of image floating toolbar layout
+
 ## 187.43.11
 
 ### Patch Changes

package/dist/cjs/plugins/media/nodeviews/mediaSingle.js

@@ -366,7 +366,7 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
           origWidth: width,
           layout: layout,
           // This will only be used when calculating legacy media single width
-          // thus we use the legecy value (exclude table as container node)
+          // thus we use the legacy value (exclude table as container node)
           contentWidth: contentWidthForLegacyExperience,
           containerWidth: containerWidth,
           gutterOffset: _mediaSingle.MEDIA_SINGLE_GUTTER_SIZE

package/dist/cjs/plugins/media/pm-plugins/main.js

@@ -41,6 +41,7 @@ var _CaptionPlaceholder = require("../ui/CaptionPlaceholder");
 var _reactIntlNext = require("react-intl-next");
 var _mediaTaskManager = require("./mediaTaskManager");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
+var _mediaSingle2 = require("@atlaskit/editor-common/media-single");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 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; }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
@@ -515,6 +516,11 @@ var MediaPluginStateImplementation = /*#__PURE__*/function () {
       var selectedContainer = this.selectedMediaContainerNode();
       if (selectedContainer && this.isMediaSchemaNode(selectedContainer)) {
         newElement = this.getDomElement(this.view.domAtPos.bind(this.view));
+        if (selectedContainer.type === this.view.state.schema.nodes.mediaSingle) {
+          this.currentMaxWidth = (0, _mediaSingle2.getMaxWidthForNestedNodeNext)(this.view, this.view.state.selection.$anchor.pos) || undefined;
+        } else {
+          this.currentMaxWidth = undefined;
+        }
       }
       if (this.element !== newElement) {
         this.element = newElement;

package/dist/cjs/plugins/media/toolbar/index.js

@@ -246,11 +246,9 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
       var _widthPlugin$sharedSt;
       var contentWidth = widthPlugin === null || widthPlugin === void 0 ? void 0 : (_widthPlugin$sharedSt = widthPlugin.sharedState.currentState()) === null || _widthPlugin$sharedSt === void 0 ? void 0 : _widthPlugin$sharedSt.lineLength;
       var selectedNode = (0, _utils2.getSelectedMediaSingle)(state);
-      if (selectedNode && contentWidth) {
-        var width = selectedNode.node.attrs.width;
-        if (width >= contentWidth) {
-          isChangingLayoutDisabled = true;
-        }
+      var selectedNodeMaxWidth = pluginState.currentMaxWidth || contentWidth;
+      if (selectedNode && selectedNodeMaxWidth && selectedNode.node.attrs.width >= selectedNodeMaxWidth) {
+        isChangingLayoutDisabled = true;
       }
     }
     var layoutButtons = (0, _card.buildLayoutButtons)(state, intl, state.schema.nodes.mediaSingle, widthPlugin, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a3 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a3 === void 0 ? void 0 : _pluginInjectionApi$a3.actions, allowResizing, allowResizingInTables, true, true, isChangingLayoutDisabled);

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "187.43.11";
+var version = "187.43.12";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/es2019/plugins/media/nodeviews/mediaSingle.js

@@ -273,7 +273,7 @@ export default class MediaSingleNode extends Component {
         origWidth: width,
         layout,
         // This will only be used when calculating legacy media single width
-        // thus we use the legecy value (exclude table as container node)
+        // thus we use the legacy value (exclude table as container node)
         contentWidth: contentWidthForLegacyExperience,
         containerWidth,
         gutterOffset: MEDIA_SINGLE_GUTTER_SIZE

package/dist/es2019/plugins/media/pm-plugins/main.js

@@ -24,6 +24,7 @@ import { CAPTION_PLACEHOLDER_ID } from '../ui/CaptionPlaceholder';
 import { RawIntlProvider } from 'react-intl-next';
 import { MediaTaskManager } from './mediaTaskManager';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { getMaxWidthForNestedNodeNext } from '@atlaskit/editor-common/media-single';
 export { stateKey } from './plugin-key';
 export const MEDIA_CONTENT_WRAP_CLASS_NAME = 'media-content-wrap';
 export const MEDIA_PLUGIN_IS_RESIZING_KEY = 'mediaSinglePlugin.isResizing';
@@ -437,6 +438,11 @@ export class MediaPluginStateImplementation {
     const selectedContainer = this.selectedMediaContainerNode();
     if (selectedContainer && this.isMediaSchemaNode(selectedContainer)) {
       newElement = this.getDomElement(this.view.domAtPos.bind(this.view));
+      if (selectedContainer.type === this.view.state.schema.nodes.mediaSingle) {
+        this.currentMaxWidth = getMaxWidthForNestedNodeNext(this.view, this.view.state.selection.$anchor.pos) || undefined;
+      } else {
+        this.currentMaxWidth = undefined;
+      }
     }
     if (this.element !== newElement) {
       this.element = newElement;

package/dist/es2019/plugins/media/toolbar/index.js

@@ -246,13 +246,9 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
       var _widthPlugin$sharedSt;
       const contentWidth = widthPlugin === null || widthPlugin === void 0 ? void 0 : (_widthPlugin$sharedSt = widthPlugin.sharedState.currentState()) === null || _widthPlugin$sharedSt === void 0 ? void 0 : _widthPlugin$sharedSt.lineLength;
       const selectedNode = getSelectedMediaSingle(state);
-      if (selectedNode && contentWidth) {
-        const {
-          width
-        } = selectedNode.node.attrs;
-        if (width >= contentWidth) {
-          isChangingLayoutDisabled = true;
-        }
+      const selectedNodeMaxWidth = pluginState.currentMaxWidth || contentWidth;
+      if (selectedNode && selectedNodeMaxWidth && selectedNode.node.attrs.width >= selectedNodeMaxWidth) {
+        isChangingLayoutDisabled = true;
       }
     }
     const layoutButtons = buildLayoutButtons(state, intl, state.schema.nodes.mediaSingle, widthPlugin, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a3 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a3 === void 0 ? void 0 : _pluginInjectionApi$a3.actions, allowResizing, allowResizingInTables, true, true, isChangingLayoutDisabled);

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "187.43.11";
+export const version = "187.43.12";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/plugins/media/nodeviews/mediaSingle.js

@@ -357,7 +357,7 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
           origWidth: width,
           layout: layout,
           // This will only be used when calculating legacy media single width
-          // thus we use the legecy value (exclude table as container node)
+          // thus we use the legacy value (exclude table as container node)
           contentWidth: contentWidthForLegacyExperience,
           containerWidth: containerWidth,
           gutterOffset: MEDIA_SINGLE_GUTTER_SIZE

package/dist/esm/plugins/media/pm-plugins/main.js

@@ -33,6 +33,7 @@ import { CAPTION_PLACEHOLDER_ID } from '../ui/CaptionPlaceholder';
 import { RawIntlProvider } from 'react-intl-next';
 import { MediaTaskManager } from './mediaTaskManager';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { getMaxWidthForNestedNodeNext } from '@atlaskit/editor-common/media-single';
 export { stateKey } from './plugin-key';
 export var MEDIA_CONTENT_WRAP_CLASS_NAME = 'media-content-wrap';
 export var MEDIA_PLUGIN_IS_RESIZING_KEY = 'mediaSinglePlugin.isResizing';
@@ -498,6 +499,11 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
       var selectedContainer = this.selectedMediaContainerNode();
       if (selectedContainer && this.isMediaSchemaNode(selectedContainer)) {
         newElement = this.getDomElement(this.view.domAtPos.bind(this.view));
+        if (selectedContainer.type === this.view.state.schema.nodes.mediaSingle) {
+          this.currentMaxWidth = getMaxWidthForNestedNodeNext(this.view, this.view.state.selection.$anchor.pos) || undefined;
+        } else {
+          this.currentMaxWidth = undefined;
+        }
       }
       if (this.element !== newElement) {
         this.element = newElement;

package/dist/esm/plugins/media/toolbar/index.js

@@ -239,11 +239,9 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
       var _widthPlugin$sharedSt;
       var contentWidth = widthPlugin === null || widthPlugin === void 0 ? void 0 : (_widthPlugin$sharedSt = widthPlugin.sharedState.currentState()) === null || _widthPlugin$sharedSt === void 0 ? void 0 : _widthPlugin$sharedSt.lineLength;
       var selectedNode = getSelectedMediaSingle(state);
-      if (selectedNode && contentWidth) {
-        var width = selectedNode.node.attrs.width;
-        if (width >= contentWidth) {
-          isChangingLayoutDisabled = true;
-        }
+      var selectedNodeMaxWidth = pluginState.currentMaxWidth || contentWidth;
+      if (selectedNode && selectedNodeMaxWidth && selectedNode.node.attrs.width >= selectedNodeMaxWidth) {
+        isChangingLayoutDisabled = true;
       }
     }
     var layoutButtons = buildLayoutButtons(state, intl, state.schema.nodes.mediaSingle, widthPlugin, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a3 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a3 === void 0 ? void 0 : _pluginInjectionApi$a3.actions, allowResizing, allowResizingInTables, true, true, isChangingLayoutDisabled);

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "187.43.11";
+export var version = "187.43.12";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/types/plugins/media/pm-plugins/main.d.ts

@@ -37,6 +37,7 @@ export declare class MediaPluginStateImplementation implements MediaPluginState
     newInsertionBehaviour?: boolean;
     isResizing: boolean;
     resizingWidth: number;
+    currentMaxWidth?: number;
     private view;
     private destroyed;
     private contextIdentifierProvider?;

package/dist/types/plugins/media/pm-plugins/types.d.ts

@@ -34,6 +34,7 @@ export interface MediaPluginState {
     mediaOptions?: MediaOptions;
     isResizing: boolean;
     resizingWidth: number;
+    currentMaxWidth?: number;
     dispatch?: Dispatch;
     onContextIdentifierProvider: (_name: string, provider?: Promise<ContextIdentifierProvider>) => Promise<void>;
     setMediaProvider: (mediaProvider?: Promise<MediaProvider>) => Promise<void>;

package/dist/types-ts4.5/plugins/media/pm-plugins/main.d.ts

@@ -37,6 +37,7 @@ export declare class MediaPluginStateImplementation implements MediaPluginState
     newInsertionBehaviour?: boolean;
     isResizing: boolean;
     resizingWidth: number;
+    currentMaxWidth?: number;
     private view;
     private destroyed;
     private contextIdentifierProvider?;

package/dist/types-ts4.5/plugins/media/pm-plugins/types.d.ts

@@ -34,6 +34,7 @@ export interface MediaPluginState {
     mediaOptions?: MediaOptions;
     isResizing: boolean;
     resizingWidth: number;
+    currentMaxWidth?: number;
     dispatch?: Dispatch;
     onContextIdentifierProvider: (_name: string, provider?: Promise<ContextIdentifierProvider>) => Promise<void>;
     setMediaProvider: (mediaProvider?: Promise<MediaProvider>) => Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "187.43.11",
+  "version": "187.43.12",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/report.api.md

@@ -1290,6 +1290,8 @@ interface MediaPluginState {
   // (undocumented)
   allUploadsFinished: boolean;
   // (undocumented)
+  currentMaxWidth?: number;
+  // (undocumented)
   destroy(): void;
   // (undocumented)
   dispatch?: Dispatch;

package/tmp/api-report-tmp.d.ts

@@ -1172,6 +1172,8 @@ interface MediaPluginState {
     // (undocumented)
     allUploadsFinished: boolean;
     // (undocumented)
+    currentMaxWidth?: number;
+    // (undocumented)
     destroy(): void;
     // (undocumented)
     dispatch?: Dispatch;