@atlaskit/editor-core 187.29.2 → 187.29.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-core
 
+## 187.29.3
+
+### Patch Changes
+
+- [`9650cf173e5`](https://bitbucket.org/atlassian/atlassian-frontend/commits/9650cf173e5) - Fix bug where if mediaSingle node is first item in document it is treated as video
+
 ## 187.29.2
 
 ### Patch Changes

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

@@ -372,7 +372,7 @@ var ResizableMediaSingleNext = /*#__PURE__*/function (_React$Component) {
     get: function get() {
       var pos = this.pos;
       // need to pass view because we may not get updated props in time
-      return pos && this.props.view.state.doc.resolve(pos);
+      return pos === null ? pos : this.props.view.state.doc.resolve(pos);
     }
   }, {
     key: "aspectRatio",
@@ -430,50 +430,49 @@ var ResizableMediaSingleNext = /*#__PURE__*/function (_React$Component) {
     key: "checkVideoFile",
     value: function () {
       var _checkVideoFile = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(viewMediaClientConfig) {
-        var $pos, mediaNode, mediaClient, state;
+        var mediaNode, mediaClient, state;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              $pos = this.$pos;
-              if (!(!$pos || !viewMediaClientConfig)) {
-                _context2.next = 3;
+              if (!(this.pos === null || !viewMediaClientConfig)) {
+                _context2.next = 2;
                 break;
               }
               return _context2.abrupt("return");
-            case 3:
-              mediaNode = this.props.view.state.doc.nodeAt($pos.pos + 1);
+            case 2:
+              mediaNode = this.props.view.state.doc.nodeAt(this.pos + 1);
               if (!(!mediaNode || !mediaNode.attrs.id)) {
-                _context2.next = 6;
+                _context2.next = 5;
                 break;
               }
               return _context2.abrupt("return");
-            case 6:
+            case 5:
               mediaClient = (0, _mediaClient.getMediaClient)(viewMediaClientConfig);
-              _context2.prev = 7;
-              _context2.next = 10;
+              _context2.prev = 6;
+              _context2.next = 9;
               return mediaClient.file.getCurrentState(mediaNode.attrs.id, {
                 collectionName: mediaNode.attrs.collection
               });
-            case 10:
+            case 9:
               state = _context2.sent;
               if (state && state.status !== 'error' && state.mediaType === 'image') {
                 this.setState({
                   isVideoFile: false
                 });
               }
-              _context2.next = 17;
+              _context2.next = 16;
               break;
-            case 14:
-              _context2.prev = 14;
-              _context2.t0 = _context2["catch"](7);
+            case 13:
+              _context2.prev = 13;
+              _context2.t0 = _context2["catch"](6);
               this.setState({
                 isVideoFile: false
               });
-            case 17:
+            case 16:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[7, 14]]);
+        }, _callee2, this, [[6, 13]]);
       }));
       function checkVideoFile(_x) {
         return _checkVideoFile.apply(this, arguments);

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.29.2";
+var version = "187.29.3";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

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

@@ -326,7 +326,7 @@ class ResizableMediaSingleNext extends React.Component {
   get $pos() {
     const pos = this.pos;
     // need to pass view because we may not get updated props in time
-    return pos && this.props.view.state.doc.resolve(pos);
+    return pos === null ? pos : this.props.view.state.doc.resolve(pos);
   }
   get aspectRatio() {
     const {
@@ -377,11 +377,10 @@ class ResizableMediaSingleNext extends React.Component {
     return this.isNestedNode() ? [] : generateDefaultGuidelines(lineLength, containerWidth, fullWidthMode);
   }
   async checkVideoFile(viewMediaClientConfig) {
-    const $pos = this.$pos;
-    if (!$pos || !viewMediaClientConfig) {
+    if (this.pos === null || !viewMediaClientConfig) {
       return;
     }
-    const mediaNode = this.props.view.state.doc.nodeAt($pos.pos + 1);
+    const mediaNode = this.props.view.state.doc.nodeAt(this.pos + 1);
     if (!mediaNode || !mediaNode.attrs.id) {
       return;
     }

package/dist/es2019/version-wrapper.js

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

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

@@ -365,7 +365,7 @@ var ResizableMediaSingleNext = /*#__PURE__*/function (_React$Component) {
     get: function get() {
       var pos = this.pos;
       // need to pass view because we may not get updated props in time
-      return pos && this.props.view.state.doc.resolve(pos);
+      return pos === null ? pos : this.props.view.state.doc.resolve(pos);
     }
   }, {
     key: "aspectRatio",
@@ -423,50 +423,49 @@ var ResizableMediaSingleNext = /*#__PURE__*/function (_React$Component) {
     key: "checkVideoFile",
     value: function () {
       var _checkVideoFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(viewMediaClientConfig) {
-        var $pos, mediaNode, mediaClient, state;
+        var mediaNode, mediaClient, state;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              $pos = this.$pos;
-              if (!(!$pos || !viewMediaClientConfig)) {
-                _context2.next = 3;
+              if (!(this.pos === null || !viewMediaClientConfig)) {
+                _context2.next = 2;
                 break;
               }
               return _context2.abrupt("return");
-            case 3:
-              mediaNode = this.props.view.state.doc.nodeAt($pos.pos + 1);
+            case 2:
+              mediaNode = this.props.view.state.doc.nodeAt(this.pos + 1);
               if (!(!mediaNode || !mediaNode.attrs.id)) {
-                _context2.next = 6;
+                _context2.next = 5;
                 break;
               }
               return _context2.abrupt("return");
-            case 6:
+            case 5:
               mediaClient = getMediaClient(viewMediaClientConfig);
-              _context2.prev = 7;
-              _context2.next = 10;
+              _context2.prev = 6;
+              _context2.next = 9;
               return mediaClient.file.getCurrentState(mediaNode.attrs.id, {
                 collectionName: mediaNode.attrs.collection
               });
-            case 10:
+            case 9:
               state = _context2.sent;
               if (state && state.status !== 'error' && state.mediaType === 'image') {
                 this.setState({
                   isVideoFile: false
                 });
               }
-              _context2.next = 17;
+              _context2.next = 16;
               break;
-            case 14:
-              _context2.prev = 14;
-              _context2.t0 = _context2["catch"](7);
+            case 13:
+              _context2.prev = 13;
+              _context2.t0 = _context2["catch"](6);
               this.setState({
                 isVideoFile: false
               });
-            case 17:
+            case 16:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[7, 14]]);
+        }, _callee2, this, [[6, 13]]);
       }));
       function checkVideoFile(_x) {
         return _checkVideoFile.apply(this, arguments);

package/dist/esm/version-wrapper.js

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

package/dist/types/plugins/media/ui/ResizableMediaSingle/ResizableMediaSingleNext.d.ts

@@ -27,7 +27,7 @@ declare class ResizableMediaSingleNext extends React.Component<ResizableMediaSin
     UNSAFE_componentWillReceiveProps(nextProps: Props): void;
     get wrappedLayout(): boolean;
     get pos(): number | null;
-    get $pos(): 0 | import("prosemirror-model").ResolvedPos | null;
+    get $pos(): import("prosemirror-model").ResolvedPos | null;
     get aspectRatio(): number;
     get insideInlineLike(): boolean;
     get insideLayout(): boolean;

package/dist/types-ts4.5/plugins/media/ui/ResizableMediaSingle/ResizableMediaSingleNext.d.ts

@@ -27,7 +27,7 @@ declare class ResizableMediaSingleNext extends React.Component<ResizableMediaSin
     UNSAFE_componentWillReceiveProps(nextProps: Props): void;
     get wrappedLayout(): boolean;
     get pos(): number | null;
-    get $pos(): 0 | import("prosemirror-model").ResolvedPos | null;
+    get $pos(): import("prosemirror-model").ResolvedPos | null;
     get aspectRatio(): number;
     get insideInlineLike(): boolean;
     get insideLayout(): boolean;

package/package.json

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