@atlaskit/editor-core 96.0.0 → 97.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +30 -0
- package/dist/es2015/plugins/card/pm-plugins/doc.js +2 -1
- package/dist/es2015/plugins/card/pm-plugins/doc.js.map +1 -1
- package/dist/es2015/plugins/media/nodeviews/media.d.ts +3 -3
- package/dist/es2015/plugins/media/nodeviews/media.js +23 -12
- package/dist/es2015/plugins/media/nodeviews/media.js.map +1 -1
- package/dist/es2015/plugins/media/nodeviews/mediaSingle.d.ts +3 -4
- package/dist/es2015/plugins/media/nodeviews/mediaSingle.js +15 -33
- package/dist/es2015/plugins/media/nodeviews/mediaSingle.js.map +1 -1
- package/dist/es2015/plugins/media/styles.js +1 -1
- package/dist/es2015/plugins/media/styles.js.map +1 -1
- package/dist/es2015/plugins/media/ui/ResizableMediaSingle/Resizer.d.ts +9 -5
- package/dist/es2015/plugins/media/ui/ResizableMediaSingle/Resizer.js +11 -15
- package/dist/es2015/plugins/media/ui/ResizableMediaSingle/Resizer.js.map +1 -1
- package/dist/es2015/plugins/media/ui/ResizableMediaSingle/index.d.ts +4 -0
- package/dist/es2015/plugins/media/ui/ResizableMediaSingle/index.js +38 -0
- package/dist/es2015/plugins/media/ui/ResizableMediaSingle/index.js.map +1 -1
- package/dist/es2015/plugins/media/ui/ResizableMediaSingle/types.d.ts +2 -0
- package/dist/es2015/utils/index.js +2 -1
- package/dist/es2015/utils/index.js.map +1 -1
- package/dist/es5/plugins/card/pm-plugins/doc.js +2 -1
- package/dist/es5/plugins/card/pm-plugins/doc.js.map +1 -1
- package/dist/es5/plugins/media/nodeviews/media.d.ts +3 -3
- package/dist/es5/plugins/media/nodeviews/media.js +23 -12
- package/dist/es5/plugins/media/nodeviews/media.js.map +1 -1
- package/dist/es5/plugins/media/nodeviews/mediaSingle.d.ts +3 -4
- package/dist/es5/plugins/media/nodeviews/mediaSingle.js +15 -33
- package/dist/es5/plugins/media/nodeviews/mediaSingle.js.map +1 -1
- package/dist/es5/plugins/media/styles.js +1 -1
- package/dist/es5/plugins/media/styles.js.map +1 -1
- package/dist/es5/plugins/media/ui/ResizableMediaSingle/Resizer.d.ts +9 -5
- package/dist/es5/plugins/media/ui/ResizableMediaSingle/Resizer.js +11 -15
- package/dist/es5/plugins/media/ui/ResizableMediaSingle/Resizer.js.map +1 -1
- package/dist/es5/plugins/media/ui/ResizableMediaSingle/index.d.ts +4 -0
- package/dist/es5/plugins/media/ui/ResizableMediaSingle/index.js +38 -0
- package/dist/es5/plugins/media/ui/ResizableMediaSingle/index.js.map +1 -1
- package/dist/es5/plugins/media/ui/ResizableMediaSingle/types.d.ts +2 -0
- package/dist/es5/utils/index.js +2 -1
- package/dist/es5/utils/index.js.map +1 -1
- package/dist/package.json +1 -1
- package/package.json +16 -16
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,35 @@
|
|
|
1
1
|
# @atlaskit/editor-core
|
|
2
2
|
|
|
3
|
+
## 97.0.0
|
|
4
|
+
- [minor] [b1627a5837](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/b1627a5837):
|
|
5
|
+
|
|
6
|
+
- Enable inline video player in Editor and Renderer
|
|
7
|
+
- Updated dependencies [85d5d168fd](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/85d5d168fd):
|
|
8
|
+
- @atlaskit/editor-common@30.0.0
|
|
9
|
+
- @atlaskit/renderer@37.0.0
|
|
10
|
+
- @atlaskit/emoji@53.0.0
|
|
11
|
+
- @atlaskit/media-card@51.0.0
|
|
12
|
+
- @atlaskit/media-filmstrip@25.0.0
|
|
13
|
+
- @atlaskit/media-picker@31.0.0
|
|
14
|
+
- @atlaskit/editor-bitbucket-transformer@4.1.7
|
|
15
|
+
- @atlaskit/editor-json-transformer@4.1.7
|
|
16
|
+
- @atlaskit/editor-markdown-transformer@2.1.7
|
|
17
|
+
- @atlaskit/editor-test-helpers@6.3.12
|
|
18
|
+
- @atlaskit/task-decision@11.1.6
|
|
19
|
+
- @atlaskit/util-data-test@10.0.34
|
|
20
|
+
- @atlaskit/media-test-helpers@19.1.0
|
|
21
|
+
- @atlaskit/media-core@26.2.0
|
|
22
|
+
|
|
23
|
+
## 96.0.2
|
|
24
|
+
- [patch] [4e764a26d4](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/4e764a26d4):
|
|
25
|
+
|
|
26
|
+
- ED-6070: Don't render proper mediaCard on mobile until we have a valid collection
|
|
27
|
+
|
|
28
|
+
## 96.0.1
|
|
29
|
+
- [patch] [af85018](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/af85018):
|
|
30
|
+
|
|
31
|
+
- ED-6064: always undo smart cards to links
|
|
32
|
+
|
|
3
33
|
## 96.0.0
|
|
4
34
|
- Updated dependencies [dadef80](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/dadef80):
|
|
5
35
|
- Updated dependencies [3ad16f3](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/3ad16f3):
|
|
@@ -4,6 +4,7 @@ import { resolveCard, queueCards } from './actions';
|
|
|
4
4
|
import { appearanceForNodeType } from '../utils';
|
|
5
5
|
import { processRawValue, getStepRange } from '../../../utils';
|
|
6
6
|
import { md } from '../../paste/pm-plugins/main';
|
|
7
|
+
import { closeHistory } from 'prosemirror-history';
|
|
7
8
|
export var replaceQueuedUrlWithCard = function (url, cardData) { return function (editorState, dispatch) {
|
|
8
9
|
var state = pluginKey.getState(editorState);
|
|
9
10
|
if (!state) {
|
|
@@ -42,7 +43,7 @@ export var replaceQueuedUrlWithCard = function (url, cardData) { return function
|
|
|
42
43
|
});
|
|
43
44
|
}
|
|
44
45
|
if (dispatch) {
|
|
45
|
-
dispatch(resolveCard(url)(tr));
|
|
46
|
+
dispatch(resolveCard(url)(closeHistory(tr)));
|
|
46
47
|
}
|
|
47
48
|
return true;
|
|
48
49
|
}; };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doc.js","sourceRoot":"","sources":["../../../../../src/plugins/card/pm-plugins/doc.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAE5E,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAGjD,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE/D,OAAO,EAAE,EAAE,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"doc.js","sourceRoot":"","sources":["../../../../../src/plugins/card/pm-plugins/doc.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAE5E,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAGjD,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE/D,OAAO,EAAE,EAAE,EAAE,MAAM,6BAA6B,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,CAAC,IAAM,wBAAwB,GAAG,UACtC,GAAW,EACX,QAAa,IACD,OAAA,UAAC,WAAW,EAAE,QAAQ;IAClC,IAAM,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAgC,CAAC;IAC7E,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,KAAK,CAAC;KACd;IAED,iCAAiC;IACjC,IAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAA,GAAG,IAAI,OAAA,GAAG,CAAC,GAAG,KAAK,GAAG,EAAf,CAAe,CAAC,CAAC;IAE/D,mCAAmC;IACnC,IAAM,MAAM,GAAW,WAAW,CAAC,MAAM,CAAC;IAClC,IAAA,oCAAU,CAAkB;IACpC,IAAM,OAAO,GAAG,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAElD,IAAI,EAAE,GAAG,WAAW,CAAC,EAAE,CAAC;IACxB,IAAI,OAAO,EAAE;QACX,QAAQ,CAAC,OAAO,CAAC,UAAA,OAAO;YACtB,qDAAqD;YACrD,IAAM,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACxC,IAAM,IAAI,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAChC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBAC9B,OAAO;aACR;YAED,qBAAqB;YACrB,IAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,EAAzB,CAAyB,CAAC,CAAC;YACpE,IAAI,CAAC,QAAQ,EAAE;gBACb,OAAO;aACR;YAED,IAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC;YAC5B,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,IAAI,SAAS,KAAK,GAAG,EAAE;gBACpD,OAAO;aACR;YAED,4EAA4E;YAC5E,IAAM,KAAK,GAAG,CAAC,OAAO,CAAC,CAAC;YACxB,IAAI,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE;gBAC/B,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;aAC9B;YAED,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;KACJ;IAED,IAAI,QAAQ,EAAE;QACZ,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KAC9C;IACD,OAAO,IAAI,CAAC;AACd,CAAC,EAjDa,CAiDb,CAAC;AAEF,MAAM,CAAC,IAAM,uBAAuB,GAAG,UACrC,KAAkB,EAClB,EAAe,EACf,iBAAiC;IAAjC,kCAAA,EAAA,wBAAiC;IAEzB,IAAA,qBAAM,CAAW;IACjB,IAAA,wBAAI,CAAkB;IAE9B,IAAM,SAAS,GAAG,YAAY,CAAC,EAAE,CAAC,CAAC;IACnC,IAAI,CAAC,SAAS,EAAE;QACd,4CAA4C;QAC5C,OAAO,EAAE,CAAC;KACX;IAED,IAAM,QAAQ,GAAc,EAAE,CAAC;IAC/B,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,EAAE,UAAC,IAAI,EAAE,GAAG;QAC1D,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,OAAO,IAAI,CAAC;SACb;QAED,IAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,IAAI,KAAK,IAAI,EAAlB,CAAkB,CAAC,CAAC;QAE7D,IAAI,QAAQ,EAAE;YACZ,+EAA+E;YAC/E,uEAAuE;YACvE,IAAM,kBAAkB,GAAG,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAErE,qEAAqE;YACrE,IAAI,IAAI,CAAC,IAAI,KAAK,kBAAkB,EAAE;gBACpC,OAAO,KAAK,CAAC;aACd;YAED,QAAQ,CAAC,IAAI,CAAC;gBACZ,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI;gBACxB,GAAG,KAAA;gBACH,UAAU,EAAE,QAAQ;aACV,CAAC,CAAC;SACf;QAED,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC;AAClC,CAAC,CAAC;AAEF,MAAM,CAAC,IAAM,wBAAwB,GAAY,UAAC,KAAK,EAAE,QAAQ;IAC/D,IAAM,YAAY,GAChB,KAAK,CAAC,SAAS,YAAY,aAAa,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC;IACnE,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,KAAK,CAAC;KACd;IAEO,IAAA,8BAAI,CAAwB;IAEpC,IAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC,oBAAoB,CACtC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,EAAE;QACxC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;KAC9C,CAAC,EACF,KAAK,CACN,CAAC;IAEF,IAAI,QAAQ,EAAE;QACZ,QAAQ,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,CAAC;KAC/B;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,CAAC,IAAM,yBAAyB,GAEvB,UAAA,UAAU,IAAI,OAAA,UAAC,KAAK,EAAE,QAAQ;IAC3C,IAAM,YAAY,GAChB,KAAK,CAAC,SAAS,YAAY,aAAa,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC;IACnE,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,KAAK,CAAC;KACd;IAED,IAAI,qBAAqB,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,UAAU,EAAE;QAC3D,OAAO,KAAK,CAAC;KACd;IAEK,IAAA,uBAA8C,EAA5C,0BAAU,EAAE,wBAAgC,CAAC;IACrD,IAAM,GAAG,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC;IAEjC,IAAI,UAAU,KAAK,OAAO,IAAI,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,KAAK,CAAC,EAAE;QAC3E,IAAM,IAAE,GAAG,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAClC,GAAG,GAAG,CAAC,EACP,GAAG,GAAG,YAAY,CAAC,QAAQ,GAAG,CAAC,EAC/B,SAAS,CAAC,aAAa,CACrB,YAAY,CAAC,KAAK,EAClB,SAAS,EACT,YAAY,CAAC,KAAK,CACnB,CACF,CAAC;QAEF,IAAI,QAAQ,EAAE;YACZ,QAAQ,CAAC,IAAE,CAAC,cAAc,EAAE,CAAC,CAAC;SAC/B;QACD,OAAO,IAAI,CAAC;KACb;IAED,IAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC,aAAa,CAC/B,GAAG,EACH,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,EAChD,YAAY,CAAC,KAAK,EAClB,YAAY,CAAC,KAAK,CACnB,CAAC;IAEF,IAAI,QAAQ,EAAE;QACZ,QAAQ,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,CAAC;KAC/B;IAED,OAAO,IAAI,CAAC;AACd,CAAC,EA3C4B,CA2C5B,CAAC"}
|
|
@@ -3,8 +3,8 @@ import { Node as PMNode } from 'prosemirror-model';
|
|
|
3
3
|
import { EditorView } from 'prosemirror-view';
|
|
4
4
|
import { ProviderFactory, ImageLoaderProps } from '@atlaskit/editor-common';
|
|
5
5
|
import { ProsemirrorGetPosHandler, ReactNodeProps } from '../../../nodeviews';
|
|
6
|
-
import { Context, ImageResizeMode } from '@atlaskit/media-core';
|
|
7
6
|
import { MediaProvider } from '../pm-plugins/main';
|
|
7
|
+
import { Context, ImageResizeMode } from '@atlaskit/media-core';
|
|
8
8
|
import { CardDimensions, CardEventHandler, CardOnClickCallback } from '@atlaskit/media-card';
|
|
9
9
|
import { MediaType, MediaBaseAttributes } from '@atlaskit/adf-schema';
|
|
10
10
|
import { ImageStatus } from '@atlaskit/editor-common';
|
|
@@ -19,17 +19,16 @@ export interface MediaNodeProps extends ReactNodeProps {
|
|
|
19
19
|
providerFactory?: ProviderFactory;
|
|
20
20
|
cardDimensions: CardDimensions;
|
|
21
21
|
isMediaSingle?: boolean;
|
|
22
|
-
mediaProvider?: Promise<MediaProvider>;
|
|
23
22
|
onClick?: CardOnClickCallback;
|
|
24
23
|
onExternalImageLoaded?: (dimensions: {
|
|
25
24
|
width: number;
|
|
26
25
|
height: number;
|
|
27
26
|
}) => void;
|
|
28
27
|
editorAppearance: EditorAppearance;
|
|
28
|
+
mediaProvider?: Promise<MediaProvider>;
|
|
29
29
|
}
|
|
30
30
|
export interface Props extends Partial<MediaBaseAttributes> {
|
|
31
31
|
type: MediaType;
|
|
32
|
-
mediaProvider?: Promise<MediaProvider>;
|
|
33
32
|
cardDimensions?: CardDimensions;
|
|
34
33
|
onClick?: CardOnClickCallback;
|
|
35
34
|
onDelete?: CardEventHandler;
|
|
@@ -40,6 +39,7 @@ export interface Props extends Partial<MediaBaseAttributes> {
|
|
|
40
39
|
imageStatus?: ImageStatus;
|
|
41
40
|
context: Context;
|
|
42
41
|
disableOverlay?: boolean;
|
|
42
|
+
mediaProvider?: Promise<MediaProvider>;
|
|
43
43
|
}
|
|
44
44
|
export interface MediaNodeState {
|
|
45
45
|
viewContext?: Context;
|
|
@@ -16,20 +16,22 @@ var MediaNode = /** @class */ (function (_super) {
|
|
|
16
16
|
viewContext: undefined,
|
|
17
17
|
};
|
|
18
18
|
_this.updateMediaContext = function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
19
|
-
var
|
|
20
|
-
return tslib_1.__generator(this, function (
|
|
21
|
-
switch (
|
|
22
|
-
case 0:
|
|
19
|
+
var _a, viewContext;
|
|
20
|
+
return tslib_1.__generator(this, function (_b) {
|
|
21
|
+
switch (_b.label) {
|
|
22
|
+
case 0:
|
|
23
|
+
if (!this.props.mediaProvider) return [3 /*break*/, 3];
|
|
24
|
+
_a = this;
|
|
25
|
+
return [4 /*yield*/, this.props.mediaProvider];
|
|
23
26
|
case 1:
|
|
24
|
-
mediaProvider =
|
|
25
|
-
|
|
26
|
-
return [4 /*yield*/, mediaProvider.viewContext];
|
|
27
|
+
_a.mediaProvider = _b.sent();
|
|
28
|
+
return [4 /*yield*/, this.mediaProvider.viewContext];
|
|
27
29
|
case 2:
|
|
28
|
-
viewContext =
|
|
30
|
+
viewContext = _b.sent();
|
|
29
31
|
if (viewContext && this.hasBeenMounted) {
|
|
30
32
|
this.setState({ viewContext: viewContext });
|
|
31
33
|
}
|
|
32
|
-
|
|
34
|
+
_b.label = 3;
|
|
33
35
|
case 3: return [2 /*return*/];
|
|
34
36
|
}
|
|
35
37
|
});
|
|
@@ -41,7 +43,6 @@ var MediaNode = /** @class */ (function (_super) {
|
|
|
41
43
|
};
|
|
42
44
|
var view = _this.props.view;
|
|
43
45
|
_this.pluginState = mediaStateKey.getState(view.state);
|
|
44
|
-
_this.mediaProvider = props.mediaProvider;
|
|
45
46
|
return _this;
|
|
46
47
|
}
|
|
47
48
|
MediaNode.prototype.shouldComponentUpdate = function (nextProps, nextState) {
|
|
@@ -64,13 +65,23 @@ var MediaNode = /** @class */ (function (_super) {
|
|
|
64
65
|
this.pluginState.handleMediaNodeUnmount(node);
|
|
65
66
|
this.hasBeenMounted = false;
|
|
66
67
|
};
|
|
68
|
+
MediaNode.prototype.componentWillReceiveProps = function (props) {
|
|
69
|
+
this.updateMediaContext();
|
|
70
|
+
};
|
|
67
71
|
MediaNode.prototype.componentDidUpdate = function () {
|
|
68
72
|
this.pluginState.updateElement();
|
|
69
73
|
};
|
|
70
74
|
MediaNode.prototype.render = function () {
|
|
71
75
|
var _a = this.props, node = _a.node, selected = _a.selected, cardDimensions = _a.cardDimensions, onClick = _a.onClick, editorAppearance = _a.editorAppearance;
|
|
72
76
|
var _b = node.attrs, id = _b.id, type = _b.type, collection = _b.collection, url = _b.url, __key = _b.__key;
|
|
73
|
-
|
|
77
|
+
/**
|
|
78
|
+
* On mobile we don't receive a collectionName until the `upload-end` event.
|
|
79
|
+
* We don't want to render a proper card until we have a valid collection.
|
|
80
|
+
* Render loading until we do.
|
|
81
|
+
*/
|
|
82
|
+
var isMobile = editorAppearance === 'mobile';
|
|
83
|
+
var isMobileReady = isMobile ? typeof collection === 'string' : true;
|
|
84
|
+
if (!this.state.viewContext || !isMobileReady) {
|
|
74
85
|
return React.createElement(CardView, { status: "loading", dimensions: cardDimensions });
|
|
75
86
|
}
|
|
76
87
|
/** For new images, the media state will be loaded inside the plugin state */
|
|
@@ -87,7 +98,7 @@ var MediaNode = /** @class */ (function (_super) {
|
|
|
87
98
|
mediaItemType: 'file',
|
|
88
99
|
collectionName: collection,
|
|
89
100
|
};
|
|
90
|
-
return (React.createElement(Card, { context: this.state.viewContext, resizeMode: "stretchy-fit", dimensions: cardDimensions, identifier: identifier, selectable: true, selected: selected, disableOverlay: true, onClick: onClick, useInlinePlayer:
|
|
101
|
+
return (React.createElement(Card, { context: this.state.viewContext, resizeMode: "stretchy-fit", dimensions: cardDimensions, identifier: identifier, selectable: true, selected: selected, disableOverlay: true, onClick: onClick, useInlinePlayer: !isMobile, isLazy: !isMobile }));
|
|
91
102
|
};
|
|
92
103
|
return MediaNode;
|
|
93
104
|
}(Component));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media.js","sourceRoot":"","sources":["../../../../../src/plugins/media/nodeviews/media.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAKlC,OAAO,EAEL,QAAQ,IAAI,aAAa,
|
|
1
|
+
{"version":3,"file":"media.js","sourceRoot":"","sources":["../../../../../src/plugins/media/nodeviews/media.tsx"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { EditorView, NodeView } from 'prosemirror-view';
|
|
|
4
4
|
import { MediaSingleLayout } from '@atlaskit/adf-schema';
|
|
5
5
|
import { CardEvent } from '@atlaskit/media-card';
|
|
6
6
|
import { EventDispatcher } from '../../../event-dispatcher';
|
|
7
|
-
import { MediaStateStatus } from '../types';
|
|
7
|
+
import { MediaStateStatus, MediaProvider } from '../types';
|
|
8
8
|
import { EditorAppearance } from '../../../types';
|
|
9
9
|
export interface MediaSingleNodeProps {
|
|
10
10
|
node: PMNode;
|
|
@@ -15,6 +15,7 @@ export interface MediaSingleNodeProps {
|
|
|
15
15
|
getPos: () => number;
|
|
16
16
|
lineLength: number;
|
|
17
17
|
editorAppearance: EditorAppearance;
|
|
18
|
+
mediaProvider?: Promise<MediaProvider>;
|
|
18
19
|
}
|
|
19
20
|
export interface MediaSingleNodeState {
|
|
20
21
|
width?: number;
|
|
@@ -29,11 +30,9 @@ export default class MediaSingleNode extends Component<MediaSingleNodeProps, Med
|
|
|
29
30
|
lastMediaStatus: undefined;
|
|
30
31
|
};
|
|
31
32
|
constructor(props: any);
|
|
32
|
-
shouldComponentUpdate(nextProps:
|
|
33
|
+
shouldComponentUpdate(nextProps: MediaSingleNodeProps): boolean;
|
|
33
34
|
componentDidUpdate(): void;
|
|
34
35
|
private onExternalImageLoaded;
|
|
35
|
-
private getMediaNodeStatus;
|
|
36
|
-
private hasMediaStateUpdated;
|
|
37
36
|
private mediaChildHasUpdated;
|
|
38
37
|
selectMediaSingle: ({ event }: CardEvent) => void;
|
|
39
38
|
updateSize: (width: number | null, layout: MediaSingleLayout) => void;
|
|
@@ -33,17 +33,6 @@ var MediaSingleNode = /** @class */ (function (_super) {
|
|
|
33
33
|
_this.forceUpdate();
|
|
34
34
|
});
|
|
35
35
|
};
|
|
36
|
-
_this.getMediaNodeStatus = function (childNode) {
|
|
37
|
-
if (childNode) {
|
|
38
|
-
var state = _this.mediaPluginState.getMediaNodeState(childNode.attrs.__key);
|
|
39
|
-
return state && state.status;
|
|
40
|
-
}
|
|
41
|
-
return undefined;
|
|
42
|
-
};
|
|
43
|
-
_this.hasMediaStateUpdated = function (nextProps) {
|
|
44
|
-
return (_this.getMediaNodeStatus(nextProps.node.firstChild) !==
|
|
45
|
-
_this.state.lastMediaStatus);
|
|
46
|
-
};
|
|
47
36
|
_this.mediaChildHasUpdated = function (nextProps) {
|
|
48
37
|
if (!_this.props.node.firstChild || !nextProps.node.firstChild) {
|
|
49
38
|
return false;
|
|
@@ -71,15 +60,14 @@ var MediaSingleNode = /** @class */ (function (_super) {
|
|
|
71
60
|
_this.mediaPluginState = stateKey.getState(_this.props.view.state);
|
|
72
61
|
return _this;
|
|
73
62
|
}
|
|
74
|
-
MediaSingleNode.prototype.shouldComponentUpdate = function (nextProps
|
|
63
|
+
MediaSingleNode.prototype.shouldComponentUpdate = function (nextProps) {
|
|
75
64
|
if (this.props.node.attrs.width !== nextProps.node.attrs.width ||
|
|
76
65
|
this.props.selected() !== nextProps.selected() ||
|
|
77
66
|
this.props.node.attrs.layout !== nextProps.node.attrs.layout ||
|
|
78
67
|
this.props.width !== nextProps.width ||
|
|
79
68
|
this.props.lineLength !== nextProps.lineLength ||
|
|
80
69
|
this.props.getPos !== nextProps.getPos ||
|
|
81
|
-
this.mediaChildHasUpdated(nextProps)
|
|
82
|
-
this.hasMediaStateUpdated(nextProps)) {
|
|
70
|
+
this.mediaChildHasUpdated(nextProps)) {
|
|
83
71
|
return true;
|
|
84
72
|
}
|
|
85
73
|
return false;
|
|
@@ -89,14 +77,9 @@ var MediaSingleNode = /** @class */ (function (_super) {
|
|
|
89
77
|
if (this.props.selected()) {
|
|
90
78
|
this.mediaPluginState.updateLayout(layout);
|
|
91
79
|
}
|
|
92
|
-
this.setState({
|
|
93
|
-
lastMediaStatus: this.getMediaNodeStatus(this.props.node.firstChild),
|
|
94
|
-
});
|
|
95
80
|
};
|
|
96
81
|
MediaSingleNode.prototype.render = function () {
|
|
97
|
-
var _this = this;
|
|
98
82
|
var _a = this.props, selected = _a.selected, getPos = _a.getPos, node = _a.node, state = _a.view.state, editorAppearance = _a.editorAppearance;
|
|
99
|
-
var lastMediaStatus = this.state.lastMediaStatus;
|
|
100
83
|
var _b = node.attrs, layout = _b.layout, mediaSingleWidth = _b.width;
|
|
101
84
|
var childNode = node.firstChild;
|
|
102
85
|
var _c = childNode.attrs, width = _c.width, height = _c.height, type = _c.type;
|
|
@@ -109,8 +92,7 @@ var MediaSingleNode = /** @class */ (function (_super) {
|
|
|
109
92
|
height = stateHeight || DEFAULT_HEIGHT;
|
|
110
93
|
}
|
|
111
94
|
}
|
|
112
|
-
var
|
|
113
|
-
var canResize = !!this.mediaPluginState.options.allowResizing && !isLoading;
|
|
95
|
+
var canResize = !!this.mediaPluginState.options.allowResizing;
|
|
114
96
|
var pos = getPos();
|
|
115
97
|
if (pos) {
|
|
116
98
|
var $pos = state.doc.resolve(pos);
|
|
@@ -135,16 +117,12 @@ var MediaSingleNode = /** @class */ (function (_super) {
|
|
|
135
117
|
layout: layout,
|
|
136
118
|
width: width,
|
|
137
119
|
height: height,
|
|
138
|
-
isLoading: isLoading,
|
|
139
120
|
containerWidth: this.props.width,
|
|
140
121
|
lineLength: this.props.lineLength,
|
|
141
122
|
pctWidth: mediaSingleWidth,
|
|
142
123
|
};
|
|
143
|
-
var MediaChild = (React.createElement(
|
|
144
|
-
|
|
145
|
-
return (React.createElement(MediaItem, { node: childNode, view: _this.props.view, getPos: _this.props.getPos, cardDimensions: cardDimensions, mediaProvider: mediaProvider, selected: selected(), onClick: _this.selectMediaSingle, onExternalImageLoaded: _this.onExternalImageLoaded, editorAppearance: editorAppearance }));
|
|
146
|
-
} }));
|
|
147
|
-
return canResize ? (React.createElement(ResizableMediaSingle, tslib_1.__assign({}, props, { getPos: getPos, updateSize: this.updateSize, displayGrid: createDisplayGrid(this.props.eventDispatcher), gridSize: 12, state: this.props.view.state, appearance: this.mediaPluginState.options.appearance, selected: this.props.selected() }), MediaChild)) : (React.createElement(MediaSingle, tslib_1.__assign({}, props), MediaChild));
|
|
124
|
+
var MediaChild = (React.createElement(MediaItem, { node: childNode, view: this.props.view, getPos: this.props.getPos, cardDimensions: cardDimensions, mediaProvider: this.props.mediaProvider, selected: selected(), onClick: this.selectMediaSingle, onExternalImageLoaded: this.onExternalImageLoaded, editorAppearance: editorAppearance }));
|
|
125
|
+
return canResize ? (React.createElement(ResizableMediaSingle, tslib_1.__assign({}, props, { getPos: getPos, updateSize: this.updateSize, displayGrid: createDisplayGrid(this.props.eventDispatcher), gridSize: 12, mediaProvider: this.props.mediaProvider, state: this.props.view.state, appearance: this.mediaPluginState.options.appearance, selected: this.props.selected() }), MediaChild)) : (React.createElement(MediaSingle, tslib_1.__assign({}, props), MediaChild));
|
|
148
126
|
};
|
|
149
127
|
return MediaSingleNode;
|
|
150
128
|
}(Component));
|
|
@@ -157,12 +135,16 @@ var MediaSingleNodeView = /** @class */ (function (_super) {
|
|
|
157
135
|
MediaSingleNodeView.prototype.render = function () {
|
|
158
136
|
var _this = this;
|
|
159
137
|
var _a = this.reactComponentProps, eventDispatcher = _a.eventDispatcher, editorAppearance = _a.editorAppearance;
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
138
|
+
var mediaPluginState = stateKey.getState(this.view.state);
|
|
139
|
+
return (React.createElement(WithProviders, { providers: ['mediaProvider'], providerFactory: mediaPluginState.options.providerFactory, renderNode: function (_a) {
|
|
140
|
+
var mediaProvider = _a.mediaProvider;
|
|
141
|
+
return (React.createElement(WithPluginState, { editorView: _this.view, plugins: {
|
|
142
|
+
width: widthPluginKey,
|
|
143
|
+
reactNodeViewState: reactNodeViewStateKey,
|
|
144
|
+
}, render: function (_a) {
|
|
145
|
+
var width = _a.width, reactNodeViewState = _a.reactNodeViewState;
|
|
146
|
+
return (React.createElement(MediaSingleNode, { width: width.width, lineLength: width.lineLength, node: _this.node, getPos: _this.getPos, mediaProvider: mediaProvider, view: _this.view, selected: function () { return _this.getPos() === reactNodeViewState; }, eventDispatcher: eventDispatcher, editorAppearance: editorAppearance }));
|
|
147
|
+
} }));
|
|
166
148
|
} }));
|
|
167
149
|
};
|
|
168
150
|
MediaSingleNodeView.prototype.createDomRef = function () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mediaSingle.js","sourceRoot":"","sources":["../../../../../src/plugins/media/nodeviews/mediaSingle.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAIlC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAErE,OAAO,EAAE,gCAAgC,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAoB,MAAM,oBAAoB,CAAC;AAChE,OAAO,aAAa,MAAM,kCAAkC,CAAC;AAC7D,OAAO,SAAS,MAAM,SAAS,CAAC;AAChC,OAAO,eAAe,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,SAAS,IAAI,cAAc,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,QAAQ,IAAI,qBAAqB,EAAE,MAAM,iDAAiD,CAAC;AACpG,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,oBAAoB,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAI1D,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElD,IAAM,aAAa,GAAG,GAAG,CAAC;AAC1B,IAAM,cAAc,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"mediaSingle.js","sourceRoot":"","sources":["../../../../../src/plugins/media/nodeviews/mediaSingle.tsx"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import * as tslib_1 from "tslib";
|
|
|
4
4
|
import { css } from 'styled-components';
|
|
5
5
|
import { mediaSingleSharedStyle } from '@atlaskit/editor-common';
|
|
6
6
|
import { colors } from '@atlaskit/theme';
|
|
7
|
-
export var mediaStyles = css(templateObject_1 || (templateObject_1 = tslib_1.__makeTemplateObject(["\n .ProseMirror {\n ", " & [layout='full-width'] .media-single,\n & [layout='wide'] .media-single {\n margin-left: 50%;\n transform: translateX(-50%);\n }\n\n
|
|
7
|
+
export var mediaStyles = css(templateObject_1 || (templateObject_1 = tslib_1.__makeTemplateObject(["\n .ProseMirror {\n ", " & [layout='full-width'] .media-single,\n & [layout='wide'] .media-single {\n margin-left: 50%;\n transform: translateX(-50%);\n }\n\n & [layout^='wrap-'] + [layout^='wrap-'] {\n clear: none;\n & + p,\n & + div[class^='fabric-editor-align'],\n & + ul,\n & + ol,\n & + h1,\n & + h2,\n & + h3,\n & + h4,\n & + h5,\n & + h6 {\n clear: both !important;\n }\n & .media-single {\n margin-left: 0;\n margin-right: 0;\n }\n }\n }\n\n .mediaSingle-resize-handle-right,\n .mediaSingle-resize-handle-left {\n display: flex;\n flex-direction: column;\n\n /* vertical align */\n justify-content: center;\n }\n\n .mediaSingle-resize-handle-right {\n align-items: flex-end;\n padding-right: 12px;\n margin-right: -12px;\n }\n\n .mediaSingle-resize-handle-left {\n align-items: flex-start;\n padding-left: 12px;\n margin-left: -12px;\n }\n\n .mediaSingle-resize-handle-right::after,\n .mediaSingle-resize-handle-left::after {\n content: ' ';\n display: flex;\n width: 3px;\n height: 64px;\n\n border-radius: 6px;\n }\n\n .media-single:hover .mediaSingle-resize-handle-left::after,\n .media-single:hover .mediaSingle-resize-handle-right::after {\n background: ", ";\n }\n\n .mediaSingle-selected .mediaSingle-resize-handle-right::after,\n .mediaSingle-selected .mediaSingle-resize-handle-left::after,\n .media-single .mediaSingle-resize-handle-right:hover::after,\n .media-single .mediaSingle-resize-handle-left:hover::after,\n .media-single.is-resizing .mediaSingle-resize-handle-right::after,\n .media-single.is-resizing .mediaSingle-resize-handle-left::after {\n background: ", ";\n }\n\n .__resizable_base__ {\n left: unset !important;\n width: auto !important;\n height: auto !important;\n }\n"], ["\n .ProseMirror {\n ", " & [layout='full-width'] .media-single,\n & [layout='wide'] .media-single {\n margin-left: 50%;\n transform: translateX(-50%);\n }\n\n & [layout^='wrap-'] + [layout^='wrap-'] {\n clear: none;\n & + p,\n & + div[class^='fabric-editor-align'],\n & + ul,\n & + ol,\n & + h1,\n & + h2,\n & + h3,\n & + h4,\n & + h5,\n & + h6 {\n clear: both !important;\n }\n & .media-single {\n margin-left: 0;\n margin-right: 0;\n }\n }\n }\n\n .mediaSingle-resize-handle-right,\n .mediaSingle-resize-handle-left {\n display: flex;\n flex-direction: column;\n\n /* vertical align */\n justify-content: center;\n }\n\n .mediaSingle-resize-handle-right {\n align-items: flex-end;\n padding-right: 12px;\n margin-right: -12px;\n }\n\n .mediaSingle-resize-handle-left {\n align-items: flex-start;\n padding-left: 12px;\n margin-left: -12px;\n }\n\n .mediaSingle-resize-handle-right::after,\n .mediaSingle-resize-handle-left::after {\n content: ' ';\n display: flex;\n width: 3px;\n height: 64px;\n\n border-radius: 6px;\n }\n\n .media-single:hover .mediaSingle-resize-handle-left::after,\n .media-single:hover .mediaSingle-resize-handle-right::after {\n background: ", ";\n }\n\n .mediaSingle-selected .mediaSingle-resize-handle-right::after,\n .mediaSingle-selected .mediaSingle-resize-handle-left::after,\n .media-single .mediaSingle-resize-handle-right:hover::after,\n .media-single .mediaSingle-resize-handle-left:hover::after,\n .media-single.is-resizing .mediaSingle-resize-handle-right::after,\n .media-single.is-resizing .mediaSingle-resize-handle-left::after {\n background: ", ";\n }\n\n .__resizable_base__ {\n left: unset !important;\n width: auto !important;\n height: auto !important;\n }\n"])), mediaSingleSharedStyle, colors.N60, colors.B200);
|
|
8
8
|
var templateObject_1;
|
|
9
9
|
/* `left: unset` above is to work around Chrome bug where rendering a div with
|
|
10
10
|
* that style applied inside a container that has a scroll, causes any svgs on
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../../src/plugins/media/styles.ts"],"names":[],"mappings":";AAAA,8BAA8B;AAC9B,kBAAkB;AAClB,OAAO,EAAE,GAAG,EAAgC,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,MAAM,CAAC,IAAM,WAAW,GAAG,GAAG,
|
|
1
|
+
{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../../src/plugins/media/styles.ts"],"names":[],"mappings":";AAAA,8BAA8B;AAC9B,kBAAkB;AAClB,OAAO,EAAE,GAAG,EAAgC,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,MAAM,CAAC,IAAM,WAAW,GAAG,GAAG,87DAAA,0BAExB,EAAsB,uyCA4DV,EAAU,0aASV,EAAW,kIAQ5B,KA7EK,sBAAsB,EA4DV,MAAM,CAAC,GAAG,EASV,MAAM,CAAC,IAAI,CAQ5B,CAAC;;AAEF;;;;;;;GAOG"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
|
+
import { RefObject } from 'react';
|
|
2
3
|
import { MediaSingleLayout } from '@atlaskit/adf-schema';
|
|
3
4
|
import { Props, EnabledHandles } from './types';
|
|
4
5
|
import Resizable from 're-resizable';
|
|
5
6
|
import { ResizableDirection, NumberSize } from 're-resizable';
|
|
6
7
|
export declare const handleSides: string[];
|
|
7
8
|
export declare const alignementLayouts: string[];
|
|
8
|
-
|
|
9
|
+
declare type ResizerProps = Props & {
|
|
9
10
|
selected: boolean;
|
|
10
11
|
enable: EnabledHandles;
|
|
11
12
|
calcNewSize: (newWidth: number, stop: boolean) => {
|
|
@@ -16,13 +17,16 @@ export default class Resizer extends React.Component<Props & {
|
|
|
16
17
|
scaleFactor?: number;
|
|
17
18
|
getColumnLeft: () => number;
|
|
18
19
|
isInlineLike: boolean;
|
|
19
|
-
}
|
|
20
|
+
};
|
|
21
|
+
declare type ResizerState = {
|
|
20
22
|
isResizing: boolean;
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
+
};
|
|
24
|
+
export default class Resizer extends React.Component<ResizerProps, ResizerState> {
|
|
25
|
+
resizable: RefObject<Resizable>;
|
|
23
26
|
state: {
|
|
24
27
|
isResizing: boolean;
|
|
25
28
|
};
|
|
29
|
+
constructor(props: ResizerProps);
|
|
26
30
|
handleResizeStart: (event: any) => void;
|
|
27
31
|
handleResize: (event: MouseEvent | TouchEvent, direction: ResizableDirection, elementRef: HTMLDivElement, delta: NumberSize) => void;
|
|
28
32
|
highlights: (newWidth: any) => number[] | string[];
|
|
@@ -30,6 +34,6 @@ export default class Resizer extends React.Component<Props & {
|
|
|
30
34
|
width: number;
|
|
31
35
|
height: number;
|
|
32
36
|
}) => void;
|
|
33
|
-
setResizableRef: (ref: any) => void;
|
|
34
37
|
render(): JSX.Element;
|
|
35
38
|
}
|
|
39
|
+
export {};
|
|
@@ -20,8 +20,8 @@ var snapTo = function (target, points) {
|
|
|
20
20
|
};
|
|
21
21
|
var Resizer = /** @class */ (function (_super) {
|
|
22
22
|
tslib_1.__extends(Resizer, _super);
|
|
23
|
-
function Resizer() {
|
|
24
|
-
var _this = _super
|
|
23
|
+
function Resizer(props) {
|
|
24
|
+
var _this = _super.call(this, props) || this;
|
|
25
25
|
_this.state = {
|
|
26
26
|
isResizing: false,
|
|
27
27
|
};
|
|
@@ -33,17 +33,18 @@ var Resizer = /** @class */ (function (_super) {
|
|
|
33
33
|
});
|
|
34
34
|
};
|
|
35
35
|
_this.handleResize = function (event, direction, elementRef, delta) {
|
|
36
|
-
|
|
36
|
+
var resizable = _this.resizable.current;
|
|
37
|
+
if (!resizable || !resizable.state.original) {
|
|
37
38
|
return;
|
|
38
39
|
}
|
|
39
|
-
var newWidth = Math.max(
|
|
40
|
+
var newWidth = Math.max(resizable.state.original.width +
|
|
40
41
|
delta.width * (_this.props.scaleFactor || 1), _this.props.snapPoints[0]);
|
|
41
42
|
var newSize = _this.props.calcNewSize(newWidth, false);
|
|
42
43
|
if (newSize.layout !== _this.props.layout) {
|
|
43
44
|
_this.props.updateSize(newSize.width, newSize.layout);
|
|
44
45
|
}
|
|
45
46
|
_this.props.displayGrid(true, gridTypeForLayout(newSize.layout), _this.highlights(newWidth));
|
|
46
|
-
|
|
47
|
+
resizable.updateSize({ width: newWidth, height: 'auto' });
|
|
47
48
|
};
|
|
48
49
|
_this.highlights = function (newWidth) {
|
|
49
50
|
var snapWidth = snapTo(newWidth, _this.props.snapPoints);
|
|
@@ -73,13 +74,11 @@ var Resizer = /** @class */ (function (_super) {
|
|
|
73
74
|
return highlight;
|
|
74
75
|
};
|
|
75
76
|
_this.handleResizeStop = function (event, direction, refToElement, delta) {
|
|
76
|
-
|
|
77
|
+
var resizable = _this.resizable.current;
|
|
78
|
+
if (!resizable || !resizable.state.original) {
|
|
77
79
|
return;
|
|
78
80
|
}
|
|
79
|
-
|
|
80
|
-
return;
|
|
81
|
-
}
|
|
82
|
-
var newWidth = Math.max(_this.resizable.state.original.width + delta.width, _this.props.snapPoints[0]);
|
|
81
|
+
var newWidth = Math.max(resizable.state.original.width + delta.width, _this.props.snapPoints[0]);
|
|
83
82
|
var snapWidth = snapTo(newWidth, _this.props.snapPoints);
|
|
84
83
|
var newSize = _this.props.calcNewSize(snapWidth, true);
|
|
85
84
|
// show committed grid size
|
|
@@ -89,9 +88,7 @@ var Resizer = /** @class */ (function (_super) {
|
|
|
89
88
|
_this.props.displayGrid(false, gridTypeForLayout(_this.props.layout));
|
|
90
89
|
});
|
|
91
90
|
};
|
|
92
|
-
_this.
|
|
93
|
-
_this.resizable = ref;
|
|
94
|
-
};
|
|
91
|
+
_this.resizable = React.createRef();
|
|
95
92
|
return _this;
|
|
96
93
|
}
|
|
97
94
|
Resizer.prototype.render = function () {
|
|
@@ -113,10 +110,9 @@ var Resizer = /** @class */ (function (_super) {
|
|
|
113
110
|
});
|
|
114
111
|
// Ideally, Resizable would let you pass in the component rather than
|
|
115
112
|
// the div. For now, we just apply the same styles using CSS
|
|
116
|
-
return (React.createElement(Resizable, { ref: this.
|
|
113
|
+
return (React.createElement(Resizable, { ref: this.resizable, onResize: this.handleResize, size: {
|
|
117
114
|
width: shouldHalfSize ? halfSize : this.props.width || 0,
|
|
118
115
|
}, className: classnames('media-single', "image-" + this.props.layout, this.props.className, {
|
|
119
|
-
'is-loading': this.props.isLoading,
|
|
120
116
|
'is-resizing': this.state.isResizing,
|
|
121
117
|
'not-resized': !this.props.pctWidth,
|
|
122
118
|
'mediaSingle-selected': this.props.selected,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Resizer.js","sourceRoot":"","sources":["../../../../../../src/plugins/media/ui/ResizableMediaSingle/Resizer.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Resizer.js","sourceRoot":"","sources":["../../../../../../src/plugins/media/ui/ResizableMediaSingle/Resizer.tsx"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,11 @@ import * as React from 'react';
|
|
|
2
2
|
import { MediaSingleLayout } from '@atlaskit/adf-schema';
|
|
3
3
|
import { Props } from './types';
|
|
4
4
|
export default class ResizableMediaSingle extends React.Component<Props> {
|
|
5
|
+
state: {
|
|
6
|
+
isVideoFile: boolean;
|
|
7
|
+
};
|
|
5
8
|
readonly wrappedLayout: boolean;
|
|
9
|
+
componentDidMount(): Promise<void>;
|
|
6
10
|
calcNewSize: (newWidth: number, stop: boolean) => {
|
|
7
11
|
width: number;
|
|
8
12
|
layout: MediaSingleLayout;
|
|
@@ -12,6 +12,10 @@ var ResizableMediaSingle = /** @class */ (function (_super) {
|
|
|
12
12
|
tslib_1.__extends(ResizableMediaSingle, _super);
|
|
13
13
|
function ResizableMediaSingle() {
|
|
14
14
|
var _this = _super !== null && _super.apply(this, arguments) || this;
|
|
15
|
+
_this.state = {
|
|
16
|
+
// We default to true until we resolve the file type
|
|
17
|
+
isVideoFile: true,
|
|
18
|
+
};
|
|
15
19
|
_this.calcNewSize = function (newWidth, stop) {
|
|
16
20
|
var layout = _this.props.layout;
|
|
17
21
|
var newPct = calcPctFromPx(newWidth, _this.props.lineLength) * 100;
|
|
@@ -56,6 +60,36 @@ var ResizableMediaSingle = /** @class */ (function (_super) {
|
|
|
56
60
|
enumerable: true,
|
|
57
61
|
configurable: true
|
|
58
62
|
});
|
|
63
|
+
ResizableMediaSingle.prototype.componentDidMount = function () {
|
|
64
|
+
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
65
|
+
var $pos, mediaProvider, getMediaNode, viewContext, state;
|
|
66
|
+
return tslib_1.__generator(this, function (_a) {
|
|
67
|
+
switch (_a.label) {
|
|
68
|
+
case 0:
|
|
69
|
+
$pos = this.$pos;
|
|
70
|
+
if (!$pos || !this.props.mediaProvider) {
|
|
71
|
+
return [2 /*return*/];
|
|
72
|
+
}
|
|
73
|
+
return [4 /*yield*/, this.props.mediaProvider];
|
|
74
|
+
case 1:
|
|
75
|
+
mediaProvider = _a.sent();
|
|
76
|
+
getMediaNode = this.props.state.doc.nodeAt($pos.pos + 1);
|
|
77
|
+
return [4 /*yield*/, mediaProvider.viewContext];
|
|
78
|
+
case 2:
|
|
79
|
+
viewContext = _a.sent();
|
|
80
|
+
return [4 /*yield*/, viewContext.file.getCurrentState(getMediaNode.attrs.id)];
|
|
81
|
+
case 3:
|
|
82
|
+
state = _a.sent();
|
|
83
|
+
if (state.status !== 'error' && state.mediaType === 'image') {
|
|
84
|
+
this.setState({
|
|
85
|
+
isVideoFile: false,
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
return [2 /*return*/];
|
|
89
|
+
}
|
|
90
|
+
});
|
|
91
|
+
});
|
|
92
|
+
};
|
|
59
93
|
Object.defineProperty(ResizableMediaSingle.prototype, "$pos", {
|
|
60
94
|
get: function () {
|
|
61
95
|
var pos = this.props.getPos();
|
|
@@ -112,6 +146,10 @@ var ResizableMediaSingle = /** @class */ (function (_super) {
|
|
|
112
146
|
if (!$pos) {
|
|
113
147
|
return snapPoints;
|
|
114
148
|
}
|
|
149
|
+
var isVideoFile = this.state.isVideoFile;
|
|
150
|
+
snapPoints = isVideoFile
|
|
151
|
+
? snapPoints.filter(function (width) { return width > 320; })
|
|
152
|
+
: snapPoints;
|
|
115
153
|
var isTopLevel = $pos.parent.type.name === 'doc';
|
|
116
154
|
if (isTopLevel && appearance === 'full-page') {
|
|
117
155
|
snapPoints.push(akEditorWideLayoutWidth);
|