@atlaskit/editor-plugin-media 1.42.5 → 1.42.7

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-media
 
+## 1.42.7
+
+### Patch Changes
+
+- Updated dependencies
+
+## 1.42.6
+
+### Patch Changes
+
+- [#165765](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/165765)
+  [`3f441f30e6507`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3f441f30e6507) -
+  Bump adf-schema to 46.0.0
+- [#168624](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/168624)
+  [`6d928c0cb9227`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6d928c0cb9227) -
+  [ux] [ED-25832] Hide external image badges for atlassian.com domains
+- Updated dependencies
+
 ## 1.42.5
 
 ### Patch Changes

package/dist/cjs/nodeviews/mediaSingle.js

@@ -476,7 +476,9 @@ var MediaSingleNode = exports.default = /*#__PURE__*/function (_Component) {
         }
         return null;
       };
-      var MediaChildren = (0, _react2.jsx)("figure", {
+      var MediaChildren =
+      // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-noninteractive-element-interactions
+      (0, _react2.jsx)("figure", {
         ref: this.mediaSingleWrapperRef,
         css: figureWrapperStyles
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -490,7 +492,11 @@ var MediaSingleNode = exports.default = /*#__PURE__*/function (_Component) {
         extendedResizeOffset: (0, _platformFeatureFlags.fg)('platform_editor_media_extended_resize_experience') && !isInsideTable
       }, function (_ref5) {
         var badgeSize = _ref5.badgeSize;
-        return (0, _react2.jsx)(_react.default.Fragment, null, shouldShowExternalMediaBadge && (0, _react2.jsx)(_mediaSingle.ExternalImageBadge, {
+        return (0, _react2.jsx)(_react.default.Fragment, null, (0, _platformFeatureFlags.fg)('platform_editor_hide_external_media_badge') ? (0, _react2.jsx)(_mediaSingle.ExternalImageBadge, {
+          badgeSize: badgeSize,
+          type: attrs.type,
+          url: attrs.type === 'external' ? attrs.url : undefined
+        }) : shouldShowExternalMediaBadge && (0, _react2.jsx)(_mediaSingle.ExternalImageBadge, {
           badgeSize: badgeSize
         }), mediaOptions.allowCommentsOnMedia && (0, _react2.jsx)(_CommentBadge.CommentBadgeNextWrapper, {
           view: view,

package/dist/cjs/nodeviews/mediaSingleNext.js

@@ -482,7 +482,9 @@ var MediaSingleNodeNext = exports.MediaSingleNodeNext = function MediaSingleNode
       widthType: widthType
     };
   }, [widthType, mediaSingleWidthAttribute]);
-  var MediaChildren = (0, _react2.jsx)("figure", {
+  var MediaChildren =
+  // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-noninteractive-element-interactions
+  (0, _react2.jsx)("figure", {
     ref: mediaSingleWrapperRef,
     css: figureWrapperStyles
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -496,7 +498,11 @@ var MediaSingleNodeNext = exports.MediaSingleNodeNext = function MediaSingleNode
     extendedResizeOffset: (0, _platformFeatureFlags.fg)('platform_editor_media_extended_resize_experience') && !isInsideTable
   }, function (_ref7) {
     var badgeSize = _ref7.badgeSize;
-    return (0, _react2.jsx)(_react.default.Fragment, null, shouldShowExternalMediaBadge && (0, _react2.jsx)(_mediaSingle.ExternalImageBadge, {
+    return (0, _react2.jsx)(_react.default.Fragment, null, (0, _platformFeatureFlags.fg)('platform_editor_hide_external_media_badge') ? (0, _react2.jsx)(_mediaSingle.ExternalImageBadge, {
+      badgeSize: badgeSize,
+      type: childMediaNodeAttrs.type,
+      url: childMediaNodeAttrs.type === 'external' ? childMediaNodeAttrs.url : undefined
+    }) : shouldShowExternalMediaBadge && (0, _react2.jsx)(_mediaSingle.ExternalImageBadge, {
       badgeSize: badgeSize
     }), mediaOptions.allowCommentsOnMedia && (0, _react2.jsx)(_CommentBadge.CommentBadgeNextWrapper, {
       view: view,

package/dist/cjs/ui/CaptionPlaceholder/index.js

@@ -39,7 +39,7 @@ var CaptionPlaceholder = exports.CaptionPlaceholder = /*#__PURE__*/_react.defaul
   var onClick = _ref.onClick;
   var message = (0, _platformFeatureFlags.fg)('platform_editor_media_interaction_improvements') ? _objectSpread({}, _media.captionMessages.placeholderWithDoubleClickPrompt) : _objectSpread({}, _media.captionMessages.placeholder);
   return (
-    // eslint-disable-next-line @atlaskit/design-system/use-primitives-text
+    // eslint-disable-next-line @atlaskit/design-system/use-primitives-text, jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
     (0, _react2.jsx)("span", {
       ref: ref,
       css: placeholder,

package/dist/cjs/ui/MediaViewer/MediaViewerContainer.js

@@ -53,11 +53,15 @@ var MediaViewerContainer = exports.MediaViewerContainer = function MediaViewerCo
   };
   var isVideoMedia = (0, _isType.isVideo)((_mediaNode$firstChild = mediaNode.firstChild) === null || _mediaNode$firstChild === void 0 ? void 0 : _mediaNode$firstChild.attrs.__fileMimeType);
   var shouldShowViewer = isEditorViewMode && showViewer && selectedNodeAttrs && mediaClientConfig && !isVideoMedia;
-  return (0, _react2.jsx)(_react.Fragment, null, isEditorViewMode ? (0, _react2.jsx)(_react.Fragment, null, isInline ? (0, _react2.jsx)("span", {
+  return (0, _react2.jsx)(_react.Fragment, null, isEditorViewMode ? (0, _react2.jsx)(_react.Fragment, null, isInline ?
+  // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
+  (0, _react2.jsx)("span", {
     onClick: showMediaViewer,
     css: interactiveStyles,
     "data-testid": mediaViewerContainerTestID
-  }, children) : (0, _react2.jsx)("div", {
+  }, children) :
+  // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
+  (0, _react2.jsx)("div", {
     onClick: showMediaViewer,
     css: interactiveStyles,
     "data-testid": mediaViewerContainerTestID

package/dist/es2019/nodeviews/mediaSingle.js

@@ -394,7 +394,9 @@ export default class MediaSingleNode extends Component {
       }
       return null;
     };
-    const MediaChildren = jsx("figure", {
+    const MediaChildren =
+    // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-noninteractive-element-interactions
+    jsx("figure", {
       ref: this.mediaSingleWrapperRef,
       css: figureWrapperStyles
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -408,7 +410,11 @@ export default class MediaSingleNode extends Component {
       extendedResizeOffset: fg('platform_editor_media_extended_resize_experience') && !isInsideTable
     }, ({
       badgeSize
-    }) => jsx(React.Fragment, null, shouldShowExternalMediaBadge && jsx(ExternalImageBadge, {
+    }) => jsx(React.Fragment, null, fg('platform_editor_hide_external_media_badge') ? jsx(ExternalImageBadge, {
+      badgeSize: badgeSize,
+      type: attrs.type,
+      url: attrs.type === 'external' ? attrs.url : undefined
+    }) : shouldShowExternalMediaBadge && jsx(ExternalImageBadge, {
       badgeSize: badgeSize
     }), mediaOptions.allowCommentsOnMedia && jsx(CommentBadgeNextWrapper, {
       view: view,

package/dist/es2019/nodeviews/mediaSingleNext.js

@@ -443,7 +443,9 @@ export const MediaSingleNodeNext = mediaSingleNodeNextProps => {
       widthType: widthType
     };
   }, [widthType, mediaSingleWidthAttribute]);
-  const MediaChildren = jsx("figure", {
+  const MediaChildren =
+  // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-noninteractive-element-interactions
+  jsx("figure", {
     ref: mediaSingleWrapperRef,
     css: figureWrapperStyles
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -457,7 +459,11 @@ export const MediaSingleNodeNext = mediaSingleNodeNextProps => {
     extendedResizeOffset: fg('platform_editor_media_extended_resize_experience') && !isInsideTable
   }, ({
     badgeSize
-  }) => jsx(React.Fragment, null, shouldShowExternalMediaBadge && jsx(ExternalImageBadge, {
+  }) => jsx(React.Fragment, null, fg('platform_editor_hide_external_media_badge') ? jsx(ExternalImageBadge, {
+    badgeSize: badgeSize,
+    type: childMediaNodeAttrs.type,
+    url: childMediaNodeAttrs.type === 'external' ? childMediaNodeAttrs.url : undefined
+  }) : shouldShowExternalMediaBadge && jsx(ExternalImageBadge, {
     badgeSize: badgeSize
   }), mediaOptions.allowCommentsOnMedia && jsx(CommentBadgeNextWrapper, {
     view: view,

package/dist/es2019/ui/CaptionPlaceholder/index.js

@@ -36,7 +36,7 @@ export const CaptionPlaceholder = /*#__PURE__*/React.forwardRef(({
     ...messages.placeholder
   };
   return (
-    // eslint-disable-next-line @atlaskit/design-system/use-primitives-text
+    // eslint-disable-next-line @atlaskit/design-system/use-primitives-text, jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
     jsx("span", {
       ref: ref,
       css: placeholder,

package/dist/es2019/ui/MediaViewer/MediaViewerContainer.js

@@ -36,11 +36,15 @@ export const MediaViewerContainer = ({
   };
   const isVideoMedia = isVideo((_mediaNode$firstChild = mediaNode.firstChild) === null || _mediaNode$firstChild === void 0 ? void 0 : _mediaNode$firstChild.attrs.__fileMimeType);
   const shouldShowViewer = isEditorViewMode && showViewer && selectedNodeAttrs && mediaClientConfig && !isVideoMedia;
-  return jsx(Fragment, null, isEditorViewMode ? jsx(Fragment, null, isInline ? jsx("span", {
+  return jsx(Fragment, null, isEditorViewMode ? jsx(Fragment, null, isInline ?
+  // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
+  jsx("span", {
     onClick: showMediaViewer,
     css: interactiveStyles,
     "data-testid": mediaViewerContainerTestID
-  }, children) : jsx("div", {
+  }, children) :
+  // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
+  jsx("div", {
     onClick: showMediaViewer,
     css: interactiveStyles,
     "data-testid": mediaViewerContainerTestID

package/dist/esm/nodeviews/mediaSingle.js

@@ -470,7 +470,9 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
         }
         return null;
       };
-      var MediaChildren = jsx("figure", {
+      var MediaChildren =
+      // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-noninteractive-element-interactions
+      jsx("figure", {
         ref: this.mediaSingleWrapperRef,
         css: figureWrapperStyles
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -484,7 +486,11 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
         extendedResizeOffset: fg('platform_editor_media_extended_resize_experience') && !isInsideTable
       }, function (_ref5) {
         var badgeSize = _ref5.badgeSize;
-        return jsx(React.Fragment, null, shouldShowExternalMediaBadge && jsx(ExternalImageBadge, {
+        return jsx(React.Fragment, null, fg('platform_editor_hide_external_media_badge') ? jsx(ExternalImageBadge, {
+          badgeSize: badgeSize,
+          type: attrs.type,
+          url: attrs.type === 'external' ? attrs.url : undefined
+        }) : shouldShowExternalMediaBadge && jsx(ExternalImageBadge, {
           badgeSize: badgeSize
         }), mediaOptions.allowCommentsOnMedia && jsx(CommentBadgeNextWrapper, {
           view: view,

package/dist/esm/nodeviews/mediaSingleNext.js

@@ -475,7 +475,9 @@ export var MediaSingleNodeNext = function MediaSingleNodeNext(mediaSingleNodeNex
       widthType: widthType
     };
   }, [widthType, mediaSingleWidthAttribute]);
-  var MediaChildren = jsx("figure", {
+  var MediaChildren =
+  // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-noninteractive-element-interactions
+  jsx("figure", {
     ref: mediaSingleWrapperRef,
     css: figureWrapperStyles
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -489,7 +491,11 @@ export var MediaSingleNodeNext = function MediaSingleNodeNext(mediaSingleNodeNex
     extendedResizeOffset: fg('platform_editor_media_extended_resize_experience') && !isInsideTable
   }, function (_ref7) {
     var badgeSize = _ref7.badgeSize;
-    return jsx(React.Fragment, null, shouldShowExternalMediaBadge && jsx(ExternalImageBadge, {
+    return jsx(React.Fragment, null, fg('platform_editor_hide_external_media_badge') ? jsx(ExternalImageBadge, {
+      badgeSize: badgeSize,
+      type: childMediaNodeAttrs.type,
+      url: childMediaNodeAttrs.type === 'external' ? childMediaNodeAttrs.url : undefined
+    }) : shouldShowExternalMediaBadge && jsx(ExternalImageBadge, {
       badgeSize: badgeSize
     }), mediaOptions.allowCommentsOnMedia && jsx(CommentBadgeNextWrapper, {
       view: view,

package/dist/esm/ui/CaptionPlaceholder/index.js

@@ -30,7 +30,7 @@ export var CaptionPlaceholder = /*#__PURE__*/React.forwardRef(function (_ref, re
   var onClick = _ref.onClick;
   var message = fg('platform_editor_media_interaction_improvements') ? _objectSpread({}, messages.placeholderWithDoubleClickPrompt) : _objectSpread({}, messages.placeholder);
   return (
-    // eslint-disable-next-line @atlaskit/design-system/use-primitives-text
+    // eslint-disable-next-line @atlaskit/design-system/use-primitives-text, jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
     jsx("span", {
       ref: ref,
       css: placeholder,

package/dist/esm/ui/MediaViewer/MediaViewerContainer.js

@@ -42,11 +42,15 @@ export var MediaViewerContainer = function MediaViewerContainer(_ref) {
   };
   var isVideoMedia = isVideo((_mediaNode$firstChild = mediaNode.firstChild) === null || _mediaNode$firstChild === void 0 ? void 0 : _mediaNode$firstChild.attrs.__fileMimeType);
   var shouldShowViewer = isEditorViewMode && showViewer && selectedNodeAttrs && mediaClientConfig && !isVideoMedia;
-  return jsx(Fragment, null, isEditorViewMode ? jsx(Fragment, null, isInline ? jsx("span", {
+  return jsx(Fragment, null, isEditorViewMode ? jsx(Fragment, null, isInline ?
+  // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
+  jsx("span", {
     onClick: showMediaViewer,
     css: interactiveStyles,
     "data-testid": mediaViewerContainerTestID
-  }, children) : jsx("div", {
+  }, children) :
+  // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
+  jsx("div", {
     onClick: showMediaViewer,
     css: interactiveStyles,
     "data-testid": mediaViewerContainerTestID

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "1.42.5",
+	"version": "1.42.7",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,14 +32,14 @@
 		"./types": "./src/types.ts"
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema": "^44.2.0",
+		"@atlaskit/adf-schema": "^46.1.0",
 		"@atlaskit/analytics-namespaced-context": "^6.12.0",
 		"@atlaskit/analytics-next": "^10.1.0",
 		"@atlaskit/button": "^20.3.0",
-		"@atlaskit/editor-common": "^95.6.0",
+		"@atlaskit/editor-common": "^95.8.0",
 		"@atlaskit/editor-palette": "1.6.3",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
-		"@atlaskit/editor-plugin-annotation": "1.25.2",
+		"@atlaskit/editor-plugin-annotation": "1.25.4",
 		"@atlaskit/editor-plugin-decorations": "^1.3.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
@@ -58,13 +58,13 @@
 		"@atlaskit/media-client": "^28.3.0",
 		"@atlaskit/media-client-react": "^2.3.0",
 		"@atlaskit/media-common": "^11.7.0",
-		"@atlaskit/media-filmstrip": "^47.5.0",
+		"@atlaskit/media-filmstrip": "^48.0.0",
 		"@atlaskit/media-picker": "^67.0.0",
 		"@atlaskit/media-ui": "^26.2.0",
 		"@atlaskit/media-viewer": "^49.4.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/primitives": "^13.2.0",
-		"@atlaskit/textfield": "^6.5.0",
+		"@atlaskit/primitives": "^13.3.0",
+		"@atlaskit/textfield": "^6.6.0",
 		"@atlaskit/theme": "^14.0.0",
 		"@atlaskit/tmp-editor-statsig": "^2.21.0",
 		"@atlaskit/tokens": "^2.3.0",
@@ -155,6 +155,9 @@
 		},
 		"platform_editor_react18_plugin_portalprovider": {
 			"type": "boolean"
+		},
+		"platform_editor_hide_external_media_badge": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {