@atlaskit/editor-plugin-media 1.31.9 → 1.31.10
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
CHANGED
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-media
|
|
2
2
|
|
|
3
|
+
## 1.31.10
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#143311](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/143311)
|
|
8
|
+
[`994ae05bb80fc`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/994ae05bb80fc) -
|
|
9
|
+
ED-24709: FF platform.editor.media.preview-in-full-page clean up
|
|
10
|
+
- Updated dependencies
|
|
11
|
+
|
|
3
12
|
## 1.31.9
|
|
4
13
|
|
|
5
14
|
### Patch Changes
|
|
@@ -9,7 +9,6 @@ exports.MediaViewerContainer = void 0;
|
|
|
9
9
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
10
10
|
var _react = _interopRequireWildcard(require("react"));
|
|
11
11
|
var _react2 = require("@emotion/react");
|
|
12
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
13
12
|
var _utils = require("../../toolbar/utils");
|
|
14
13
|
var _isType = require("../../utils/is-type");
|
|
15
14
|
var _PortalWrapper = require("./PortalWrapper");
|
|
@@ -53,9 +52,8 @@ var MediaViewerContainer = exports.MediaViewerContainer = function MediaViewerCo
|
|
|
53
52
|
setShowMediaViewer(false);
|
|
54
53
|
};
|
|
55
54
|
var isVideoMedia = (0, _isType.isVideo)((_mediaNode$firstChild = mediaNode.firstChild) === null || _mediaNode$firstChild === void 0 ? void 0 : _mediaNode$firstChild.attrs.__fileMimeType);
|
|
56
|
-
var
|
|
57
|
-
|
|
58
|
-
return (0, _react2.jsx)(_react.Fragment, null, enableMediaViewer ? (0, _react2.jsx)(_react.Fragment, null, isInline ? (0, _react2.jsx)("span", {
|
|
55
|
+
var shouldShowViewer = isEditorViewMode && showViewer && selectedNodeAttrs && mediaClientConfig && !isVideoMedia;
|
|
56
|
+
return (0, _react2.jsx)(_react.Fragment, null, isEditorViewMode ? (0, _react2.jsx)(_react.Fragment, null, isInline ? (0, _react2.jsx)("span", {
|
|
59
57
|
onClick: showMediaViewer,
|
|
60
58
|
css: interactiveStyles,
|
|
61
59
|
"data-testid": mediaViewerContainerTestID
|
|
@@ -6,7 +6,6 @@ import React, { Fragment, useEffect, useState } from 'react';
|
|
|
6
6
|
|
|
7
7
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
8
8
|
import { css, jsx } from '@emotion/react';
|
|
9
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
10
9
|
import { getSelectedNearestMediaContainerNodeAttrs } from '../../toolbar/utils';
|
|
11
10
|
import { isVideo } from '../../utils/is-type';
|
|
12
11
|
import { RenderMediaViewer } from './PortalWrapper';
|
|
@@ -36,9 +35,8 @@ export const MediaViewerContainer = ({
|
|
|
36
35
|
setShowMediaViewer(false);
|
|
37
36
|
};
|
|
38
37
|
const isVideoMedia = isVideo((_mediaNode$firstChild = mediaNode.firstChild) === null || _mediaNode$firstChild === void 0 ? void 0 : _mediaNode$firstChild.attrs.__fileMimeType);
|
|
39
|
-
const
|
|
40
|
-
|
|
41
|
-
return jsx(Fragment, null, enableMediaViewer ? jsx(Fragment, null, isInline ? jsx("span", {
|
|
38
|
+
const shouldShowViewer = isEditorViewMode && showViewer && selectedNodeAttrs && mediaClientConfig && !isVideoMedia;
|
|
39
|
+
return jsx(Fragment, null, isEditorViewMode ? jsx(Fragment, null, isInline ? jsx("span", {
|
|
42
40
|
onClick: showMediaViewer,
|
|
43
41
|
css: interactiveStyles,
|
|
44
42
|
"data-testid": mediaViewerContainerTestID
|
|
@@ -7,7 +7,6 @@ import React, { Fragment, useEffect, useState } from 'react';
|
|
|
7
7
|
|
|
8
8
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
9
9
|
import { css, jsx } from '@emotion/react';
|
|
10
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
11
10
|
import { getSelectedNearestMediaContainerNodeAttrs } from '../../toolbar/utils';
|
|
12
11
|
import { isVideo } from '../../utils/is-type';
|
|
13
12
|
import { RenderMediaViewer } from './PortalWrapper';
|
|
@@ -42,9 +41,8 @@ export var MediaViewerContainer = function MediaViewerContainer(_ref) {
|
|
|
42
41
|
setShowMediaViewer(false);
|
|
43
42
|
};
|
|
44
43
|
var isVideoMedia = isVideo((_mediaNode$firstChild = mediaNode.firstChild) === null || _mediaNode$firstChild === void 0 ? void 0 : _mediaNode$firstChild.attrs.__fileMimeType);
|
|
45
|
-
var
|
|
46
|
-
|
|
47
|
-
return jsx(Fragment, null, enableMediaViewer ? jsx(Fragment, null, isInline ? jsx("span", {
|
|
44
|
+
var shouldShowViewer = isEditorViewMode && showViewer && selectedNodeAttrs && mediaClientConfig && !isVideoMedia;
|
|
45
|
+
return jsx(Fragment, null, isEditorViewMode ? jsx(Fragment, null, isInline ? jsx("span", {
|
|
48
46
|
onClick: showMediaViewer,
|
|
49
47
|
css: interactiveStyles,
|
|
50
48
|
"data-testid": mediaViewerContainerTestID
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-plugin-media",
|
|
3
|
-
"version": "1.31.
|
|
3
|
+
"version": "1.31.10",
|
|
4
4
|
"description": "Media plugin for @atlaskit/editor-core",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"@atlaskit/analytics-namespaced-context": "^6.12.0",
|
|
37
37
|
"@atlaskit/analytics-next": "^10.1.0",
|
|
38
38
|
"@atlaskit/button": "^20.1.0",
|
|
39
|
-
"@atlaskit/editor-common": "^90.
|
|
39
|
+
"@atlaskit/editor-common": "^90.1.0",
|
|
40
40
|
"@atlaskit/editor-palette": "1.6.0",
|
|
41
41
|
"@atlaskit/editor-plugin-analytics": "^1.8.0",
|
|
42
42
|
"@atlaskit/editor-plugin-annotation": "1.19.7",
|
|
@@ -60,10 +60,10 @@
|
|
|
60
60
|
"@atlaskit/media-common": "^11.4.0",
|
|
61
61
|
"@atlaskit/media-filmstrip": "^47.3.0",
|
|
62
62
|
"@atlaskit/media-picker": "^66.7.0",
|
|
63
|
-
"@atlaskit/media-ui": "^25.
|
|
63
|
+
"@atlaskit/media-ui": "^25.15.0",
|
|
64
64
|
"@atlaskit/media-viewer": "^48.10.0",
|
|
65
65
|
"@atlaskit/platform-feature-flags": "^0.3.0",
|
|
66
|
-
"@atlaskit/primitives": "^12.
|
|
66
|
+
"@atlaskit/primitives": "^12.2.0",
|
|
67
67
|
"@atlaskit/textfield": "^6.5.0",
|
|
68
68
|
"@atlaskit/theme": "^13.0.0",
|
|
69
69
|
"@atlaskit/tmp-editor-statsig": "^2.1.8",
|
|
@@ -132,9 +132,6 @@
|
|
|
132
132
|
"type": "boolean",
|
|
133
133
|
"referenceOnly": "true"
|
|
134
134
|
},
|
|
135
|
-
"platform.editor.media.preview-in-full-page": {
|
|
136
|
-
"type": "boolean"
|
|
137
|
-
},
|
|
138
135
|
"platform.editor.live-view.comments-in-media-toolbar-button": {
|
|
139
136
|
"type": "boolean"
|
|
140
137
|
},
|
package/.eslintrc.js
DELETED
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
module.exports = {
|
|
2
|
-
rules: {
|
|
3
|
-
'@atlaskit/design-system/consistent-css-prop-usage': 'error',
|
|
4
|
-
'@typescript-eslint/no-unused-vars': [
|
|
5
|
-
'error',
|
|
6
|
-
{
|
|
7
|
-
args: 'none',
|
|
8
|
-
vars: 'local',
|
|
9
|
-
varsIgnorePattern: '^_',
|
|
10
|
-
ignoreRestSiblings: true,
|
|
11
|
-
},
|
|
12
|
-
],
|
|
13
|
-
'no-unused-vars': 'off',
|
|
14
|
-
},
|
|
15
|
-
};
|