@atlaskit/renderer 130.0.0 → 130.1.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/renderer
 
+## 130.1.0
+
+### Minor Changes
+
+- [`b6bb07e5d72ac`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b6bb07e5d72ac) -
+  [ux] Fix for #hot-301450, add new media option for fallback media name fetcher to allow confluence
+  to use the attachment service instead of the media service to get filenames. After DC -> Cloud
+  migration filenames were not properly copied across to the media service causing inline media to
+  show an error.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 130.0.1
+
+### Patch Changes
+
+- [`74fadc941d049`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/74fadc941d049) -
+  change div to span for InlineNodeRendererWrapper
+- Updated dependencies
+
 ## 130.0.0
 
 ### Major Changes

package/dist/cjs/react/index.js

@@ -593,9 +593,10 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
   }, {
     key: "getMediaInlineProps",
     value: function getMediaInlineProps(node) {
-      var _this$media6;
+      var _this$media6, _this$media7;
       return _objectSpread(_objectSpread({}, this.getProps(node)), {}, {
-        ssr: (_this$media6 = this.media) === null || _this$media6 === void 0 ? void 0 : _this$media6.ssr
+        ssr: (_this$media6 = this.media) === null || _this$media6 === void 0 ? void 0 : _this$media6.ssr,
+        fallbackMediaNameFetcher: (_this$media7 = this.media) === null || _this$media7 === void 0 ? void 0 : _this$media7.fallbackMediaNameFetcher
       });
     }
   }, {

package/dist/cjs/react/nodes/mediaInline.js

@@ -31,7 +31,8 @@ var RenderMediaInline = function RenderMediaInline(_ref) {
     clipboardAttrs = _ref.clipboardAttrs,
     collectionName = _ref.collection,
     eventHandlers = _ref.eventHandlers,
-    identifier = _ref.identifier;
+    identifier = _ref.identifier,
+    fallbackMediaNameFetcher = _ref.fallbackMediaNameFetcher;
   var _useState = (0, _react.useState)(),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     contextIdentifier = _useState2[0],
@@ -141,7 +142,8 @@ var RenderMediaInline = function RenderMediaInline(_ref) {
       shouldOpenMediaViewer: shouldOpenMediaViewer,
       shouldDisplayToolTip: shouldDisplayToolTip,
       mediaClientConfig: mediaClient.mediaClientConfig,
-      mediaViewerItems: Array.from(_MediaCard.mediaIdentifierMap.values())
+      mediaViewerItems: Array.from(_MediaCard.mediaIdentifierMap.values()),
+      fallbackMediaNameFetcher: fallbackMediaNameFetcher
     }))
   );
 };
@@ -156,7 +158,8 @@ var MediaInline = function MediaInline(props) {
     width = props.width,
     height = props.height,
     marks = props.marks,
-    ssr = props.ssr;
+    ssr = props.ssr,
+    fallbackMediaNameFetcher = props.fallbackMediaNameFetcher;
   var clipboardAttrs = {
     id: id,
     collection: collection
@@ -209,7 +212,8 @@ var MediaInline = function MediaInline(props) {
     rendererAppearance: rendererAppearance,
     intl: intl,
     collection: collection,
-    featureFlags: featureFlags
+    featureFlags: featureFlags,
+    fallbackMediaNameFetcher: fallbackMediaNameFetcher
   });
 };
 var _default = exports.default = (0, _reactIntl.injectIntl)(MediaInline);

package/dist/cjs/ui/ExtensionRenderer.js

@@ -152,7 +152,7 @@ var InlineNodeRendererWrapper = exports.InlineNodeRendererWrapper = function Inl
     isPlainTextMacro = _ref.isPlainTextMacro,
     ssrPlaceholder = _ref.ssrPlaceholder,
     ssrPlaceholderReplace = _ref.ssrPlaceholderReplace;
-  return (0, _react.jsx)("div", {
+  return (0, _react.jsx)("span", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     className: "inline-extension-renderer ".concat(isPlainTextMacro ? 'plain-text-macro' : ''),
     css: [inlineExtensionStyle, isPlainTextMacro && plainTextMacroStyle],

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

@@ -71,7 +71,7 @@ var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var TABLE_INFO_TIMEOUT = 10000;
 var RENDER_EVENT_SAMPLE_RATE = 0.2;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "129.0.0";
+var packageVersion = "130.0.1";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/es2019/react/index.js

@@ -531,10 +531,11 @@ export default class ReactSerializer {
     };
   }
   getMediaInlineProps(node) {
-    var _this$media6;
+    var _this$media6, _this$media7;
     return {
       ...this.getProps(node),
-      ssr: (_this$media6 = this.media) === null || _this$media6 === void 0 ? void 0 : _this$media6.ssr
+      ssr: (_this$media6 = this.media) === null || _this$media6 === void 0 ? void 0 : _this$media6.ssr,
+      fallbackMediaNameFetcher: (_this$media7 = this.media) === null || _this$media7 === void 0 ? void 0 : _this$media7.fallbackMediaNameFetcher
     };
   }
   getTaskItemProps(node, path = []) {

package/dist/es2019/react/nodes/mediaInline.js

@@ -16,7 +16,8 @@ const RenderMediaInline = ({
   clipboardAttrs,
   collection: collectionName,
   eventHandlers,
-  identifier
+  identifier,
+  fallbackMediaNameFetcher
 }) => {
   const [contextIdentifier, setContextIdentifier] = useState();
   const [fileState, setFileState] = useState();
@@ -107,7 +108,8 @@ const RenderMediaInline = ({
       shouldOpenMediaViewer: shouldOpenMediaViewer,
       shouldDisplayToolTip: shouldDisplayToolTip,
       mediaClientConfig: mediaClient.mediaClientConfig,
-      mediaViewerItems: Array.from(mediaIdentifierMap.values())
+      mediaViewerItems: Array.from(mediaIdentifierMap.values()),
+      fallbackMediaNameFetcher: fallbackMediaNameFetcher
     }))
   );
 };
@@ -123,7 +125,8 @@ const MediaInline = props => {
     width,
     height,
     marks,
-    ssr
+    ssr,
+    fallbackMediaNameFetcher
   } = props;
   const clipboardAttrs = {
     id,
@@ -174,7 +177,8 @@ const MediaInline = props => {
     rendererAppearance: rendererAppearance,
     intl: intl,
     collection: collection,
-    featureFlags: featureFlags
+    featureFlags: featureFlags,
+    fallbackMediaNameFetcher: fallbackMediaNameFetcher
   });
 };
 export default injectIntl(MediaInline);

package/dist/es2019/ui/ExtensionRenderer.js

@@ -138,7 +138,7 @@ export const InlineNodeRendererWrapper = ({
   ssrPlaceholder,
   ssrPlaceholderReplace
 }) => {
-  return jsx("div", {
+  return jsx("span", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     className: `inline-extension-renderer ${isPlainTextMacro ? 'plain-text-macro' : ''}`,
     css: [inlineExtensionStyle, isPlainTextMacro && plainTextMacroStyle],

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

@@ -57,7 +57,7 @@ export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const TABLE_INFO_TIMEOUT = 10000;
 const RENDER_EVENT_SAMPLE_RATE = 0.2;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "129.0.0";
+const packageVersion = "130.0.1";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/esm/react/index.js

@@ -586,9 +586,10 @@ var ReactSerializer = /*#__PURE__*/function () {
   }, {
     key: "getMediaInlineProps",
     value: function getMediaInlineProps(node) {
-      var _this$media6;
+      var _this$media6, _this$media7;
       return _objectSpread(_objectSpread({}, this.getProps(node)), {}, {
-        ssr: (_this$media6 = this.media) === null || _this$media6 === void 0 ? void 0 : _this$media6.ssr
+        ssr: (_this$media6 = this.media) === null || _this$media6 === void 0 ? void 0 : _this$media6.ssr,
+        fallbackMediaNameFetcher: (_this$media7 = this.media) === null || _this$media7 === void 0 ? void 0 : _this$media7.fallbackMediaNameFetcher
       });
     }
   }, {

package/dist/esm/react/nodes/mediaInline.js

@@ -22,7 +22,8 @@ var RenderMediaInline = function RenderMediaInline(_ref) {
     clipboardAttrs = _ref.clipboardAttrs,
     collectionName = _ref.collection,
     eventHandlers = _ref.eventHandlers,
-    identifier = _ref.identifier;
+    identifier = _ref.identifier,
+    fallbackMediaNameFetcher = _ref.fallbackMediaNameFetcher;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     contextIdentifier = _useState2[0],
@@ -132,7 +133,8 @@ var RenderMediaInline = function RenderMediaInline(_ref) {
       shouldOpenMediaViewer: shouldOpenMediaViewer,
       shouldDisplayToolTip: shouldDisplayToolTip,
       mediaClientConfig: mediaClient.mediaClientConfig,
-      mediaViewerItems: Array.from(mediaIdentifierMap.values())
+      mediaViewerItems: Array.from(mediaIdentifierMap.values()),
+      fallbackMediaNameFetcher: fallbackMediaNameFetcher
     }))
   );
 };
@@ -147,7 +149,8 @@ var MediaInline = function MediaInline(props) {
     width = props.width,
     height = props.height,
     marks = props.marks,
-    ssr = props.ssr;
+    ssr = props.ssr,
+    fallbackMediaNameFetcher = props.fallbackMediaNameFetcher;
   var clipboardAttrs = {
     id: id,
     collection: collection
@@ -200,7 +203,8 @@ var MediaInline = function MediaInline(props) {
     rendererAppearance: rendererAppearance,
     intl: intl,
     collection: collection,
-    featureFlags: featureFlags
+    featureFlags: featureFlags,
+    fallbackMediaNameFetcher: fallbackMediaNameFetcher
   });
 };
 export default injectIntl(MediaInline);

package/dist/esm/ui/ExtensionRenderer.js

@@ -143,7 +143,7 @@ export var InlineNodeRendererWrapper = function InlineNodeRendererWrapper(_ref)
     isPlainTextMacro = _ref.isPlainTextMacro,
     ssrPlaceholder = _ref.ssrPlaceholder,
     ssrPlaceholderReplace = _ref.ssrPlaceholderReplace;
-  return jsx("div", {
+  return jsx("span", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     className: "inline-extension-renderer ".concat(isPlainTextMacro ? 'plain-text-macro' : ''),
     css: [inlineExtensionStyle, isPlainTextMacro && plainTextMacroStyle],

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

@@ -62,7 +62,7 @@ export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var TABLE_INFO_TIMEOUT = 10000;
 var RENDER_EVENT_SAMPLE_RATE = 0.2;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "129.0.0";
+var packageVersion = "130.0.1";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/types/react/nodes/index.d.ts

@@ -68,6 +68,7 @@ declare const MediaGroup: React.ComponentType<import("./mediaGroup").MediaGroupP
 declare const MediaInline: React.ComponentType<import("react-intl").WithIntlProps<{
     collection?: string;
     eventHandlers?: import("@atlaskit/editor-common/ui").EventHandlers;
+    fallbackMediaNameFetcher?: (id: string) => Promise<string>;
     featureFlags?: import("@atlaskit/media-common").MediaFeatureFlags;
     id: string;
     marks?: Array<Mark>;

package/dist/types/react/nodes/mediaInline.d.ts

@@ -10,6 +10,7 @@ import type { MediaSSR } from '../../types/mediaOptions';
 type MediaInlineProps = {
     collection?: string;
     eventHandlers?: EventHandlers;
+    fallbackMediaNameFetcher?: (id: string) => Promise<string>;
     featureFlags?: MediaFeatureFlags;
     id: string;
     marks?: Array<Mark>;

package/dist/types/types/mediaOptions.d.ts

@@ -10,6 +10,12 @@ export interface MediaOptions {
     allowLinking?: boolean;
     enableDownloadButton?: boolean;
     enableSyncMediaCard?: boolean;
+    /**
+     * Optional fallback fetcher to retrieve the media filename from another service
+     * Workaround for #hot-301450 where media service is missing filenames for DC -> Cloud migrated media
+     * Receives the file ID and should resolve to the filename string.
+     */
+    fallbackMediaNameFetcher?: (id: string) => Promise<string>;
     featureFlags?: MediaFeatureFlags;
     /** Extensions for the media viewer header (e.g. comment navigation button). */
     mediaViewerExtensions?: MediaViewerExtensions;

package/dist/types-ts4.5/react/nodes/index.d.ts

@@ -68,6 +68,7 @@ declare const MediaGroup: React.ComponentType<import("./mediaGroup").MediaGroupP
 declare const MediaInline: React.ComponentType<import("react-intl").WithIntlProps<{
     collection?: string;
     eventHandlers?: import("@atlaskit/editor-common/ui").EventHandlers;
+    fallbackMediaNameFetcher?: (id: string) => Promise<string>;
     featureFlags?: import("@atlaskit/media-common").MediaFeatureFlags;
     id: string;
     marks?: Array<Mark>;

package/dist/types-ts4.5/react/nodes/mediaInline.d.ts

@@ -10,6 +10,7 @@ import type { MediaSSR } from '../../types/mediaOptions';
 type MediaInlineProps = {
     collection?: string;
     eventHandlers?: EventHandlers;
+    fallbackMediaNameFetcher?: (id: string) => Promise<string>;
     featureFlags?: MediaFeatureFlags;
     id: string;
     marks?: Array<Mark>;

package/dist/types-ts4.5/types/mediaOptions.d.ts

@@ -10,6 +10,12 @@ export interface MediaOptions {
     allowLinking?: boolean;
     enableDownloadButton?: boolean;
     enableSyncMediaCard?: boolean;
+    /**
+     * Optional fallback fetcher to retrieve the media filename from another service
+     * Workaround for #hot-301450 where media service is missing filenames for DC -> Cloud migrated media
+     * Receives the file ID and should resolve to the filename string.
+     */
+    fallbackMediaNameFetcher?: (id: string) => Promise<string>;
     featureFlags?: MediaFeatureFlags;
     /** Extensions for the media viewer header (e.g. comment navigation button). */
     mediaViewerExtensions?: MediaViewerExtensions;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "130.0.0",
+	"version": "130.1.0",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -44,7 +44,7 @@
 		"@atlaskit/link-datasource": "^5.0.0",
 		"@atlaskit/link-extractors": "^2.4.0",
 		"@atlaskit/linking-common": "^9.11.0",
-		"@atlaskit/media-card": "^80.0.0",
+		"@atlaskit/media-card": "^80.1.0",
 		"@atlaskit/media-client": "^36.0.0",
 		"@atlaskit/media-client-react": "^5.0.0",
 		"@atlaskit/media-common": "^13.0.0",
@@ -53,13 +53,13 @@
 		"@atlaskit/media-viewer": "^53.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
-		"@atlaskit/pragmatic-drag-and-drop": "^1.7.0",
+		"@atlaskit/pragmatic-drag-and-drop": "^1.8.0",
 		"@atlaskit/react-ufo": "^5.14.0",
-		"@atlaskit/smart-card": "^44.0.0",
+		"@atlaskit/smart-card": "^44.1.0",
 		"@atlaskit/status": "^4.0.0",
 		"@atlaskit/task-decision": "^20.0.0",
 		"@atlaskit/theme": "^23.1.0",
-		"@atlaskit/tmp-editor-statsig": "^62.4.0",
+		"@atlaskit/tmp-editor-statsig": "^62.8.0",
 		"@atlaskit/tokens": "^13.0.0",
 		"@atlaskit/tooltip": "^21.1.0",
 		"@atlaskit/visually-hidden": "^3.0.0",
@@ -72,7 +72,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.0.0",
+		"@atlaskit/editor-common": "^114.1.0",
 		"@atlaskit/link-provider": "^4.3.0",
 		"@atlaskit/media-core": "^37.0.0",
 		"react": "^18.2.0",
@@ -92,7 +92,7 @@
 		"@atlaskit/mention": "^25.0.0",
 		"@atlaskit/modal-dialog": "^14.15.0",
 		"@atlaskit/navigation-system": "^7.3.0",
-		"@atlaskit/profilecard": "^25.0.0",
+		"@atlaskit/profilecard": "^25.1.0",
 		"@atlaskit/side-nav-items": "^1.13.0",
 		"@atlaskit/util-data-test": "^18.5.0",
 		"@atlassian/a11y-jest-testing": "^0.11.0",