feat: make text available to all span tree nodes (#55)

* feat: make text available to all tree nodes * chore: sort package.json
prismicio · May 5, 2022 · ea385cf · ea385cf
1 parent 974bbed
commit ea385cf
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
 	},
 	"main": "dist/index.cjs",
 	"module": "dist/index.js",
+	"react-native": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"files": [
 		"dist",
@@ -65,6 +66,5 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	},
-	"react-native": "dist/index.js"
+	}
 }
diff --git a/src/asTree.ts b/src/asTree.ts
@@ -146,6 +146,7 @@ const textNodeSpansToTreeNodeChildren = (
 		const parentSpanStart = (parentSpan && parentSpan.start) || 0;
 		const spanStart = span.start - parentSpanStart;
 		const spanEnd = span.end - parentSpanStart;
+		const text = node.text.slice(spanStart, spanEnd);
 
 		const childSpans: RTInlineNode[] = [];
 		for (let j = i; j < mutSpans.length; j++) {
@@ -166,14 +167,15 @@ const textNodeSpansToTreeNodeChildren = (
 			children.push(createTextTreeNode(node.text.slice(0, spanStart)));
 		}
 
+		const spanWithText = { ...span, text };
 		children.push(
 			createTreeNode(
-				span,
+				spanWithText,
 				textNodeSpansToTreeNodeChildren(
 					childSpans,
 					{
 						...node,
-						text: node.text.slice(spanStart, spanEnd),
+						text,
 					},
 					span,
 				),

diff --git a/test/snapshots/asTree.test.ts.md b/test/snapshots/asTree.test.ts.md
@@ -71,9 +71,10 @@ Generated by [AVA](https://avajs.dev).
                 },
                 end: 36,
                 start: 19,
+                text: 'multi-block span!',
                 type: 'label',
               },
-              text: undefined,
+              text: 'multi-block span!',
               type: 'label',
             },
           ],
@@ -118,9 +119,10 @@ Generated by [AVA](https://avajs.dev).
                 },
                 end: 7,
                 start: 0,
+                text: 'Heading',
                 type: 'label',
               },
-              text: undefined,
+              text: 'Heading',
               type: 'label',
             },
             {
@@ -165,9 +167,10 @@ Generated by [AVA](https://avajs.dev).
                   node: {
                     end: 26,
                     start: 20,
+                    text: 'italic',
                     type: 'em',
                   },
-                  text: undefined,
+                  text: 'italic',
                   type: 'em',
                 },
                 {
@@ -186,9 +189,10 @@ Generated by [AVA](https://avajs.dev).
               node: {
                 end: 37,
                 start: 10,
+                text: 'bold text italic still bold',
                 type: 'strong',
               },
-              text: undefined,
+              text: 'bold text italic still bold',
               type: 'strong',
             },
             {
@@ -288,9 +292,10 @@ Generated by [AVA](https://avajs.dev).
                 },
                 end: 25,
                 start: 19,
+                text: 'nested',
                 type: 'label',
               },
-              text: undefined,
+              text: 'nested',
               type: 'label',
             },
             {
@@ -427,9 +432,10 @@ Generated by [AVA](https://avajs.dev).
                       node: {
                         end: 19,
                         start: 9,
+                        text: 'now italic',
                         type: 'em',
                       },
-                      text: undefined,
+                      text: 'now italic',
                       type: 'em',
                     },
                     {
@@ -448,9 +454,10 @@ Generated by [AVA](https://avajs.dev).
                   node: {
                     end: 35,
                     start: 0,
+                    text: 'Bold and now italic but not anymore',
                     type: 'strong',
                   },
-                  text: undefined,
+                  text: 'Bold and now italic but not anymore',
                   type: 'strong',
                 },
                 {
@@ -482,9 +489,10 @@ Generated by [AVA](https://avajs.dev).
                   node: {
                     end: 53,
                     start: 49,
+                    text: 'last',
                     type: 'strong',
                   },
-                  text: undefined,
+                  text: 'last',
                   type: 'strong',
                 },
                 {
@@ -737,9 +745,10 @@ Generated by [AVA](https://avajs.dev).
                 },
                 end: 10,
                 start: 0,
+                text: 'A web link',
                 type: 'hyperlink',
               },
-              text: undefined,
+              text: 'A web link',
               type: 'hyperlink',
             },
           ],
@@ -793,9 +802,10 @@ Generated by [AVA](https://avajs.dev).
                 },
                 end: 15,
                 start: 0,
+                text: 'A document link',
                 type: 'hyperlink',
               },
-              text: undefined,
+              text: 'A document link',
               type: 'hyperlink',
             },
           ],
@@ -853,9 +863,10 @@ Generated by [AVA](https://avajs.dev).
                 },
                 end: 12,
                 start: 0,
+                text: 'A media link',
                 type: 'hyperlink',
               },
-              text: undefined,
+              text: 'A media link',
               type: 'hyperlink',
             },
           ],
@@ -910,9 +921,10 @@ Generated by [AVA](https://avajs.dev).
                 },
                 end: 22,
                 start: 0,
+                text: 'A non-image media link',
                 type: 'hyperlink',
               },
-              text: undefined,
+              text: 'A non-image media link',
               type: 'hyperlink',
             },
           ],
@@ -979,9 +991,10 @@ Generated by [AVA](https://avajs.dev).
                 },
                 end: 25,
                 start: 19,
+                text: 'nested',
                 type: 'hyperlink',
               },
-              text: undefined,
+              text: 'nested',
               type: 'hyperlink',
             },
             {

diff --git a/test/snapshots/asTree.test.ts.snap b/test/snapshots/asTree.test.ts.snap