@forge/react 10.9.0-next.1 → 10.9.0-next.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @forge/react
 
+## 10.9.0-next.2
+
+### Minor Changes
+
+- 5a47bc2: ADFRenderer's replaceUnsupportedNodes allows images in context of MediaProvider
+
 ## 10.9.0-next.1
 
 ### Minor Changes

package/out/__test__/components/utils/replaceUnsupportedDocumentNodes.test.js

@@ -63,7 +63,7 @@ const mediaDocumentExample = {
                     }
                 },
                 {
-                    type: 'media',
+                    type: 'mediaInline',
                     attrs: {
                         id: '4478e39c-cf9b-41d1-ba92-68589487cd75',
                         type: 'file',
@@ -184,7 +184,7 @@ describe('replaceUnsupportedDocumentNodes', () => {
             expect(replacedDocument).toEqual(expectedDocument);
         });
         it('should replace unsupported media with supported nodes', () => {
-            const replacedDocument = (0, replaceUnsupportedDocumentNodes_1.replaceUnsupportedDocumentNodes)(mediaDocumentExample, replaceUnsupportedNode);
+            const replacedDocument = (0, replaceUnsupportedDocumentNodes_1.replaceUnsupportedMediaNodes)(mediaDocumentExample, replaceUnsupportedNode);
             const expectedDocument = {
                 type: 'doc',
                 version: 1,
@@ -217,7 +217,7 @@ describe('replaceUnsupportedDocumentNodes', () => {
                             {
                                 content: [
                                     {
-                                        text: 'Unsupported content: media',
+                                        text: 'Unsupported content: mediaInline',
                                         type: 'text'
                                     }
                                 ],
@@ -322,7 +322,7 @@ describe('replaceUnsupportedDocumentNodes', () => {
             expect(replacedDocument).toEqual(expectedDocument);
         });
         it('should drop unsupported media node', () => {
-            const replacedDocument = (0, replaceUnsupportedDocumentNodes_1.replaceUnsupportedDocumentNodes)(mediaDocumentExample, replaceUnsupportedNode);
+            const replacedDocument = (0, replaceUnsupportedDocumentNodes_1.replaceUnsupportedMediaNodes)(mediaDocumentExample, replaceUnsupportedNode);
             const expectedDocument = {
                 type: 'doc',
                 version: 1,

package/out/components/adf-renderer.d.ts

@@ -1,6 +1,6 @@
 import type { AdfRendererProps as PlatformAdfRendererProps } from '@atlaskit/forge-react-types';
 import type { Visitor } from '@atlaskit/adf-utils/types/index';
-declare type AdfRendererProps = PlatformAdfRendererProps & {
+declare type AdfRendererProps = Omit<PlatformAdfRendererProps, 'documentWithoutMedia'> & {
     replaceUnsupportedNode?: Visitor;
 };
 export declare const AdfRenderer: (props: AdfRendererProps) => import("react/jsx-runtime").JSX.Element;

package/out/components/adf-renderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adf-renderer.d.ts","sourceRoot":"","sources":["../../src/components/adf-renderer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,IAAI,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAChG,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAG/D,aAAK,gBAAgB,GAAG,wBAAwB,GAAG;IACjD,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAIF,eAAO,MAAM,WAAW,UAAW,gBAAgB,4CAMlD,CAAC"}
+{"version":3,"file":"adf-renderer.d.ts","sourceRoot":"","sources":["../../src/components/adf-renderer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,IAAI,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAChG,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAI/D,aAAK,gBAAgB,GAAG,IAAI,CAAC,wBAAwB,EAAE,sBAAsB,CAAC,GAAG;IAC/E,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAIF,eAAO,MAAM,WAAW,UAAW,gBAAgB,4CAiBlD,CAAC"}

package/out/components/adf-renderer.js

@@ -6,7 +6,12 @@ const replaceUnsupportedDocumentNodes_1 = require("./utils/replaceUnsupportedDoc
 const PlatformAdfRenderer = 'AdfRenderer';
 const AdfRenderer = (props) => {
     const { replaceUnsupportedNode, document, ...adfRendererProps } = props;
-    const replacedDocument = (0, replaceUnsupportedDocumentNodes_1.replaceUnsupportedDocumentNodes)(document, replaceUnsupportedNode);
-    return (0, jsx_runtime_1.jsx)(PlatformAdfRenderer, { ...adfRendererProps, document: replacedDocument });
+    const documentWithMedia = replaceUnsupportedNode
+        ? (0, replaceUnsupportedDocumentNodes_1.replaceUnsupportedDocumentNodes)(document, replaceUnsupportedNode)
+        : document;
+    const documentWithoutMedia = replaceUnsupportedNode
+        ? (0, replaceUnsupportedDocumentNodes_1.replaceUnsupportedMediaNodes)(documentWithMedia, replaceUnsupportedNode)
+        : documentWithMedia;
+    return ((0, jsx_runtime_1.jsx)(PlatformAdfRenderer, { ...adfRendererProps, document: documentWithMedia, documentWithoutMedia: documentWithoutMedia }));
 };
 exports.AdfRenderer = AdfRenderer;

package/out/components/utils/replaceUnsupportedDocumentNodes.d.ts

@@ -1,4 +1,5 @@
 import { type DocNode } from '@atlaskit/adf-schema';
 import { type Visitor } from '@atlaskit/adf-utils/types/index';
-export declare const replaceUnsupportedDocumentNodes: (document: DocNode, replaceUnsupportedNode?: Visitor) => DocNode;
+export declare const replaceUnsupportedDocumentNodes: (document: DocNode, replaceUnsupportedNode: Visitor) => DocNode;
+export declare const replaceUnsupportedMediaNodes: (document: DocNode, replaceUnsupportedNode: Visitor) => DocNode;
 //# sourceMappingURL=replaceUnsupportedDocumentNodes.d.ts.map

package/out/components/utils/replaceUnsupportedDocumentNodes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replaceUnsupportedDocumentNodes.d.ts","sourceRoot":"","sources":["../../../src/components/utils/replaceUnsupportedDocumentNodes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAA0B,KAAK,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAEvF,eAAO,MAAM,+BAA+B,aAAc,OAAO,2BAA2B,OAAO,YA4ClG,CAAC"}
+{"version":3,"file":"replaceUnsupportedDocumentNodes.d.ts","sourceRoot":"","sources":["../../../src/components/utils/replaceUnsupportedDocumentNodes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAA0B,KAAK,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAEvF,eAAO,MAAM,+BAA+B,aAAc,OAAO,0BAA0B,OAAO,KAAG,OAiCpG,CAAC;AAEF,eAAO,MAAM,4BAA4B,aAAc,OAAO,0BAA0B,OAAO,KAAG,OAYjG,CAAC"}

package/out/components/utils/replaceUnsupportedDocumentNodes.js

@@ -1,19 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.replaceUnsupportedDocumentNodes = void 0;
+exports.replaceUnsupportedMediaNodes = exports.replaceUnsupportedDocumentNodes = void 0;
 const uuid_1 = require("uuid");
 const traverse_1 = require("@atlaskit/adf-utils/traverse");
 const replaceUnsupportedDocumentNodes = (document, replaceUnsupportedNode) => {
-    if (!replaceUnsupportedNode) {
-        return document;
-    }
     const visitors = {
         // Partially supported nodes
-        media: (node, parent, index, depth) => {
-            if (!node?.attrs?.url) {
-                return replaceUnsupportedNode(node, parent, index, depth);
-            }
-        },
         emoji: (node, parent, index, depth) => {
             if (node?.attrs?.id) {
                 // Custom Atlassian generated emoji
@@ -39,7 +31,23 @@ const replaceUnsupportedDocumentNodes = (document, replaceUnsupportedNode) => {
         unsupportedInline: replaceUnsupportedNode,
         unknownBlock: replaceUnsupportedNode
     };
+    return replaceDocumentWithVisitor(document, visitors);
+};
+exports.replaceUnsupportedDocumentNodes = replaceUnsupportedDocumentNodes;
+const replaceUnsupportedMediaNodes = (document, replaceUnsupportedNode) => {
+    const mediaVisitor = (node, parent, index, depth) => {
+        if (!node?.attrs?.url) {
+            return replaceUnsupportedNode(node, parent, index, depth);
+        }
+    };
+    const visitors = {
+        media: mediaVisitor,
+        mediaInline: mediaVisitor
+    };
+    return replaceDocumentWithVisitor(document, visitors);
+};
+exports.replaceUnsupportedMediaNodes = replaceUnsupportedMediaNodes;
+const replaceDocumentWithVisitor = (document, visitors) => {
     const updatedDoc = (0, traverse_1.traverse)(document, visitors);
     return updatedDoc ? { ...updatedDoc, version: document.version } : document;
 };
-exports.replaceUnsupportedDocumentNodes = replaceUnsupportedDocumentNodes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/react",
-  "version": "10.9.0-next.1",
+  "version": "10.9.0-next.2",
   "description": "Forge React reconciler",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -19,7 +19,7 @@
   "dependencies": {
     "@atlaskit/adf-schema": "^46.0.0",
     "@atlaskit/adf-utils": "^19.12.0",
-    "@atlaskit/forge-react-types": "^0.30.0",
+    "@atlaskit/forge-react-types": "^0.33.2",
     "@forge/bridge": "^4.2.0-next.0",
     "@forge/i18n": "0.0.2",
     "@types/react-reconciler": "^0.28.8",