@atlaskit/editor-core 188.2.1 → 188.2.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-core
 
+## 188.2.4
+
+### Patch Changes
+
+- [#39425](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/39425) [`4c27d14af2e`](https://bitbucket.org/atlassian/atlassian-frontend/commits/4c27d14af2e) - [ED-19408] Fix issue where FocusTrap returnFocus was causing the cursor to end up at the beginning of the document when inserting elements using the element browser modal.
+
+## 188.2.3
+
+### Patch Changes
+
+- [#41015](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/41015) [`a372c39bc57`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a372c39bc57) - ED-20297 fixed nested video overlapping issue
+
 ## 188.2.1
 
 ### Patch Changes

package/dist/cjs/plugins/media/ui/ResizableMediaSingle/ResizableMediaSingleNext.js

@@ -504,6 +504,9 @@ var ResizableMediaSingleNext = /*#__PURE__*/function (_React$Component) {
       // set undefined to fall back to 100%
       undefined : this.calcMaxWidth(lineLength, containerWidth, fullWidthMode);
       var minWidth = this.calcMinWidth(isVideoFile, lineLength);
+
+      // while is not resizing, we take 100% as min-width if the container width is less than the min-width
+      var minViewWidth = isResizing ? minWidth : "min(".concat(minWidth, "px, 100%)");
       return (0, _react2.jsx)("div", {
         css: (0, _styled.wrapperStyle)({
           layout: layout,
@@ -514,7 +517,7 @@ var ResizableMediaSingleNext = /*#__PURE__*/function (_React$Component) {
           isExtendedResizeExperienceOn: true
         })
       }, (0, _react2.jsx)(_resizer.ResizerNext, {
-        minWidth: minWidth,
+        minWidth: minViewWidth,
         maxWidth: maxWidth,
         className: resizerNextClassName,
         snapGap: _mediaSingle.MEDIA_SINGLE_SNAP_GAP,

package/dist/cjs/ui/ElementBrowser/InsertMenu.js

@@ -63,9 +63,6 @@ var InsertMenu = function InsertMenu(_ref) {
   var onInsertItem = (0, _react.useCallback)(function (item) {
     var _pluginInjectionApi$q;
     toggleVisiblity();
-    if (!editorView.hasFocus()) {
-      editorView.focus();
-    }
     pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$q = pluginInjectionApi.quickInsert) === null || _pluginInjectionApi$q === void 0 || _pluginInjectionApi$q.actions.insertItem(item)(editorView.state, editorView.dispatch);
   }, [editorView, toggleVisiblity, pluginInjectionApi]);
   var getItems = (0, _react.useCallback)(function (query, category) {

package/dist/cjs/version-wrapper.js

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

package/dist/es2019/plugins/media/ui/ResizableMediaSingle/ResizableMediaSingleNext.js

@@ -419,6 +419,9 @@ class ResizableMediaSingleNext extends React.Component {
     // set undefined to fall back to 100%
     undefined : this.calcMaxWidth(lineLength, containerWidth, fullWidthMode);
     const minWidth = this.calcMinWidth(isVideoFile, lineLength);
+
+    // while is not resizing, we take 100% as min-width if the container width is less than the min-width
+    const minViewWidth = isResizing ? minWidth : `min(${minWidth}px, 100%)`;
     return jsx("div", {
       css: wrapperStyle({
         layout,
@@ -429,7 +432,7 @@ class ResizableMediaSingleNext extends React.Component {
         isExtendedResizeExperienceOn: true
       })
     }, jsx(ResizerNext, {
-      minWidth: minWidth,
+      minWidth: minViewWidth,
       maxWidth: maxWidth,
       className: resizerNextClassName,
       snapGap: MEDIA_SINGLE_SNAP_GAP,

package/dist/es2019/ui/ElementBrowser/InsertMenu.js

@@ -44,9 +44,6 @@ const InsertMenu = ({
   const onInsertItem = useCallback(item => {
     var _pluginInjectionApi$q;
     toggleVisiblity();
-    if (!editorView.hasFocus()) {
-      editorView.focus();
-    }
     pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$q = pluginInjectionApi.quickInsert) === null || _pluginInjectionApi$q === void 0 ? void 0 : _pluginInjectionApi$q.actions.insertItem(item)(editorView.state, editorView.dispatch);
   }, [editorView, toggleVisiblity, pluginInjectionApi]);
   const getItems = useCallback((query, category) => {

package/dist/es2019/version-wrapper.js

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

package/dist/esm/plugins/media/ui/ResizableMediaSingle/ResizableMediaSingleNext.js

@@ -498,6 +498,9 @@ var ResizableMediaSingleNext = /*#__PURE__*/function (_React$Component) {
       // set undefined to fall back to 100%
       undefined : this.calcMaxWidth(lineLength, containerWidth, fullWidthMode);
       var minWidth = this.calcMinWidth(isVideoFile, lineLength);
+
+      // while is not resizing, we take 100% as min-width if the container width is less than the min-width
+      var minViewWidth = isResizing ? minWidth : "min(".concat(minWidth, "px, 100%)");
       return jsx("div", {
         css: wrapperStyle({
           layout: layout,
@@ -508,7 +511,7 @@ var ResizableMediaSingleNext = /*#__PURE__*/function (_React$Component) {
           isExtendedResizeExperienceOn: true
         })
       }, jsx(ResizerNext, {
-        minWidth: minWidth,
+        minWidth: minViewWidth,
         maxWidth: maxWidth,
         className: resizerNextClassName,
         snapGap: MEDIA_SINGLE_SNAP_GAP,

package/dist/esm/ui/ElementBrowser/InsertMenu.js

@@ -57,9 +57,6 @@ var InsertMenu = function InsertMenu(_ref) {
   var onInsertItem = useCallback(function (item) {
     var _pluginInjectionApi$q;
     toggleVisiblity();
-    if (!editorView.hasFocus()) {
-      editorView.focus();
-    }
     pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$q = pluginInjectionApi.quickInsert) === null || _pluginInjectionApi$q === void 0 || _pluginInjectionApi$q.actions.insertItem(item)(editorView.state, editorView.dispatch);
   }, [editorView, toggleVisiblity, pluginInjectionApi]);
   var getItems = useCallback(function (query, category) {

package/dist/esm/version-wrapper.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "188.2.1",
+  "version": "188.2.4",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -155,7 +155,7 @@
     "@af/integration-testing": "*",
     "@af/visual-regression": "*",
     "@atlaskit/code": "^14.6.0",
-    "@atlaskit/collab-provider": "9.14.0",
+    "@atlaskit/collab-provider": "9.15.0",
     "@atlaskit/dropdown-menu": "^11.14.0",
     "@atlaskit/editor-extension-dropbox": "^0.4.0",
     "@atlaskit/editor-plugin-table": "^4.0.0",
@@ -169,7 +169,7 @@
     "@atlaskit/media-integration-test-helpers": "^3.0.0",
     "@atlaskit/media-test-helpers": "^33.0.0",
     "@atlaskit/menu": "^1.11.0",
-    "@atlaskit/modal-dialog": "^12.7.0",
+    "@atlaskit/modal-dialog": "^12.8.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
     "@atlaskit/renderer": "^108.15.0",
     "@atlaskit/section-message": "^6.4.0",