@atlaskit/editor-plugin-media 1.42.9 → 1.42.11

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.
Files changed (8) hide show
  1. package/CHANGELOG.md +15 -0
  2. package/dist/cjs/toolbar/mediaInline.js +3 -3
  3. package/dist/cjs/utils/media-inline.js +7 -0
  4. package/dist/es2019/toolbar/mediaInline.js +1 -1
  5. package/dist/es2019/utils/media-inline.js +8 -1
  6. package/dist/esm/toolbar/mediaInline.js +1 -1
  7. package/dist/esm/utils/media-inline.js +8 -1
  8. package/package.json +8 -5
package/CHANGELOG.md CHANGED
@@ -1,5 +1,20 @@
1
1
  # @atlaskit/editor-plugin-media
2
2
 
3
+ ## 1.42.11
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies
8
+
9
+ ## 1.42.10
10
+
11
+ ### Patch Changes
12
+
13
+ - [#170815](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/170815)
14
+ [`13e4ced269179`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/13e4ced269179) -
15
+ [ux] ED-25879 Default image insertion type should not be 'inline'
16
+ - Updated dependencies
17
+
3
18
  ## 1.42.9
4
19
 
5
20
  ### Patch Changes
package/dist/cjs/toolbar/mediaInline.js CHANGED
@@ -12,7 +12,7 @@ var _card = require("@atlaskit/editor-common/card");
12
12
  var _messages = _interopRequireWildcard(require("@atlaskit/editor-common/messages"));
13
13
  var _state2 = require("@atlaskit/editor-prosemirror/state");
14
14
  var _delete = _interopRequireDefault(require("@atlaskit/icon/core/delete"));
15
- var _expand = _interopRequireDefault(require("@atlaskit/icon/core/expand"));
15
+ var _growDiagonal = _interopRequireDefault(require("@atlaskit/icon/core/grow-diagonal"));
16
16
  var _imageFullscreen = _interopRequireDefault(require("@atlaskit/icon/core/image-fullscreen"));
17
17
  var _imageInline = _interopRequireDefault(require("@atlaskit/icon/core/image-inline"));
18
18
  var _download = _interopRequireDefault(require("@atlaskit/icon/core/migration/download"));
@@ -77,7 +77,7 @@ var generateMediaInlineFloatingToolbar = exports.generateMediaInlineFloatingTool
77
77
  id: 'editor.media.viewer',
78
78
  testId: 'file-preview-toolbar-button',
79
79
  type: 'button',
80
- icon: _expand.default,
80
+ icon: _growDiagonal.default,
81
81
  iconFallback: _filePreview.default,
82
82
  title: intl.formatMessage(_mediaUi.messages.preview),
83
83
  onClick: function onClick() {
@@ -249,7 +249,7 @@ var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(state, intl
249
249
  id: 'editor.media.viewer',
250
250
  testId: 'file-preview-toolbar-button',
251
251
  type: 'button',
252
- icon: _expand.default,
252
+ icon: _growDiagonal.default,
253
253
  iconFallback: _filePreview.default,
254
254
  title: intl.formatMessage(_mediaUi.messages.preview),
255
255
  onClick: function onClick() {
package/dist/cjs/utils/media-inline.js CHANGED
@@ -8,6 +8,7 @@ var _mediaInline = require("@atlaskit/editor-common/media-inline");
8
8
  var _utils = require("@atlaskit/editor-common/utils");
9
9
  var _utils2 = require("@atlaskit/editor-prosemirror/utils");
10
10
  var _mediaCommon = require("@atlaskit/media-common");
11
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
11
12
  var _mediaFiles = require("../utils/media-files");
12
13
  var _mediaSingle = require("../utils/media-single");
13
14
  var _isType = require("./is-type");
@@ -16,6 +17,12 @@ var isInSupportedInlineImageParent = exports.isInSupportedInlineImageParent = fu
16
17
  return (0, _utils2.hasParentNodeOfType)([state.schema.nodes.listItem])(state.selection);
17
18
  };
18
19
  var getMediaNodeInsertionType = exports.getMediaNodeInsertionType = function getMediaNodeInsertionType(state, mediaOptions, fileMimeType) {
20
+ if ((0, _isType.isImage)(fileMimeType) && (0, _platformFeatureFlags.fg)('platform_editor_media_block_default')) {
21
+ if ((0, _mediaSingle.isMediaSingle)(state.schema, fileMimeType)) {
22
+ return 'block';
23
+ }
24
+ return 'group';
25
+ }
19
26
  var canInsertInlineNode = (0, _mediaCommon.getMediaFeatureFlag)('mediaInline', mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.featureFlags) && !(0, _utils.isInEmptyLine)(state) && (!(0, _mediaCommon2.isInsidePotentialEmptyParagraph)(state) || isInSupportedInlineImageParent(state)) && (0, _mediaFiles.canInsertMediaInline)(state);
20
27
  if ((0, _mediaInline.mediaInlineImagesEnabled)((0, _mediaCommon.getMediaFeatureFlag)('mediaInline', mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.featureFlags), mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.allowMediaInlineImages)) {
21
28
  if (canInsertInlineNode && !(0, _isType.isVideo)(fileMimeType)) {
package/dist/es2019/toolbar/mediaInline.js CHANGED
@@ -4,7 +4,7 @@ import { IconCard, IconEmbed, IconInline } from '@atlaskit/editor-common/card';
4
4
  import commonMessages, { cardMessages, mediaAndEmbedToolbarMessages } from '@atlaskit/editor-common/messages';
5
5
  import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
6
6
  import DeleteIcon from '@atlaskit/icon/core/delete';
7
- import ExpandIcon from '@atlaskit/icon/core/expand';
7
+ import ExpandIcon from '@atlaskit/icon/core/grow-diagonal';
8
8
  import ImageFullscreenIcon from '@atlaskit/icon/core/image-fullscreen';
9
9
  import ImageInlineIcon from '@atlaskit/icon/core/image-inline';
10
10
  import DownloadIcon from '@atlaskit/icon/core/migration/download';
package/dist/es2019/utils/media-inline.js CHANGED
@@ -2,14 +2,21 @@ import { mediaInlineImagesEnabled } from '@atlaskit/editor-common/media-inline';
2
2
  import { isInEmptyLine } from '@atlaskit/editor-common/utils';
3
3
  import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
4
4
  import { getMediaFeatureFlag } from '@atlaskit/media-common';
5
+ import { fg } from '@atlaskit/platform-feature-flags';
5
6
  import { canInsertMediaInline } from '../utils/media-files';
6
7
  import { isMediaSingle } from '../utils/media-single';
7
- import { isVideo } from './is-type';
8
+ import { isImage, isVideo } from './is-type';
8
9
  import { isInsidePotentialEmptyParagraph } from './media-common';
9
10
  export const isInSupportedInlineImageParent = state => {
10
11
  return hasParentNodeOfType([state.schema.nodes.listItem])(state.selection);
11
12
  };
12
13
  export const getMediaNodeInsertionType = (state, mediaOptions, fileMimeType) => {
14
+ if (isImage(fileMimeType) && fg('platform_editor_media_block_default')) {
15
+ if (isMediaSingle(state.schema, fileMimeType)) {
16
+ return 'block';
17
+ }
18
+ return 'group';
19
+ }
13
20
  const canInsertInlineNode = getMediaFeatureFlag('mediaInline', mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.featureFlags) && !isInEmptyLine(state) && (!isInsidePotentialEmptyParagraph(state) || isInSupportedInlineImageParent(state)) && canInsertMediaInline(state);
14
21
  if (mediaInlineImagesEnabled(getMediaFeatureFlag('mediaInline', mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.featureFlags), mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.allowMediaInlineImages)) {
15
22
  if (canInsertInlineNode && !isVideo(fileMimeType)) {
package/dist/esm/toolbar/mediaInline.js CHANGED
@@ -4,7 +4,7 @@ import { IconCard, IconEmbed, IconInline } from '@atlaskit/editor-common/card';
4
4
  import commonMessages, { cardMessages, mediaAndEmbedToolbarMessages } from '@atlaskit/editor-common/messages';
5
5
  import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
6
6
  import DeleteIcon from '@atlaskit/icon/core/delete';
7
- import ExpandIcon from '@atlaskit/icon/core/expand';
7
+ import ExpandIcon from '@atlaskit/icon/core/grow-diagonal';
8
8
  import ImageFullscreenIcon from '@atlaskit/icon/core/image-fullscreen';
9
9
  import ImageInlineIcon from '@atlaskit/icon/core/image-inline';
10
10
  import DownloadIcon from '@atlaskit/icon/core/migration/download';
package/dist/esm/utils/media-inline.js CHANGED
@@ -2,14 +2,21 @@ import { mediaInlineImagesEnabled } from '@atlaskit/editor-common/media-inline';
2
2
  import { isInEmptyLine } from '@atlaskit/editor-common/utils';
3
3
  import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
4
4
  import { getMediaFeatureFlag } from '@atlaskit/media-common';
5
+ import { fg } from '@atlaskit/platform-feature-flags';
5
6
  import { canInsertMediaInline } from '../utils/media-files';
6
7
  import { isMediaSingle } from '../utils/media-single';
7
- import { isVideo } from './is-type';
8
+ import { isImage, isVideo } from './is-type';
8
9
  import { isInsidePotentialEmptyParagraph } from './media-common';
9
10
  export var isInSupportedInlineImageParent = function isInSupportedInlineImageParent(state) {
10
11
  return hasParentNodeOfType([state.schema.nodes.listItem])(state.selection);
11
12
  };
12
13
  export var getMediaNodeInsertionType = function getMediaNodeInsertionType(state, mediaOptions, fileMimeType) {
14
+ if (isImage(fileMimeType) && fg('platform_editor_media_block_default')) {
15
+ if (isMediaSingle(state.schema, fileMimeType)) {
16
+ return 'block';
17
+ }
18
+ return 'group';
19
+ }
13
20
  var canInsertInlineNode = getMediaFeatureFlag('mediaInline', mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.featureFlags) && !isInEmptyLine(state) && (!isInsidePotentialEmptyParagraph(state) || isInSupportedInlineImageParent(state)) && canInsertMediaInline(state);
14
21
  if (mediaInlineImagesEnabled(getMediaFeatureFlag('mediaInline', mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.featureFlags), mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.allowMediaInlineImages)) {
15
22
  if (canInsertInlineNode && !isVideo(fileMimeType)) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-media",
3
- "version": "1.42.9",
3
+ "version": "1.42.11",
4
4
  "description": "Media plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -36,10 +36,10 @@
36
36
  "@atlaskit/analytics-namespaced-context": "^6.12.0",
37
37
  "@atlaskit/analytics-next": "^10.1.0",
38
38
  "@atlaskit/button": "^20.3.0",
39
- "@atlaskit/editor-common": "^95.10.0",
39
+ "@atlaskit/editor-common": "^96.0.0",
40
40
  "@atlaskit/editor-palette": "1.6.3",
41
41
  "@atlaskit/editor-plugin-analytics": "^1.10.0",
42
- "@atlaskit/editor-plugin-annotation": "1.25.4",
42
+ "@atlaskit/editor-plugin-annotation": "1.25.6",
43
43
  "@atlaskit/editor-plugin-decorations": "^1.3.0",
44
44
  "@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
45
45
  "@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
@@ -53,7 +53,7 @@
53
53
  "@atlaskit/editor-shared-styles": "^3.2.0",
54
54
  "@atlaskit/editor-tables": "^2.8.0",
55
55
  "@atlaskit/form": "^10.6.0",
56
- "@atlaskit/icon": "^22.28.0",
56
+ "@atlaskit/icon": "^23.0.0",
57
57
  "@atlaskit/media-card": "^78.15.0",
58
58
  "@atlaskit/media-client": "^28.5.0",
59
59
  "@atlaskit/media-client-react": "^2.4.0",
@@ -66,7 +66,7 @@
66
66
  "@atlaskit/primitives": "^13.3.0",
67
67
  "@atlaskit/textfield": "^6.6.0",
68
68
  "@atlaskit/theme": "^14.0.0",
69
- "@atlaskit/tmp-editor-statsig": "^2.21.0",
69
+ "@atlaskit/tmp-editor-statsig": "^2.22.0",
70
70
  "@atlaskit/tokens": "^2.4.0",
71
71
  "@atlaskit/tooltip": "^18.9.0",
72
72
  "@babel/runtime": "^7.0.0",
@@ -158,6 +158,9 @@
158
158
  },
159
159
  "platform_editor_hide_external_media_badge": {
160
160
  "type": "boolean"
161
+ },
162
+ "platform_editor_media_block_default": {
163
+ "type": "boolean"
161
164
  }
162
165
  },
163
166
  "stricter": {