From 254fb1e35717a4084609e2e8201245884f27fdd3 Mon Sep 17 00:00:00 2001
From: Andriy Zubanych <AZubanych@commonwealth.com>
Date: Wed, 25 Nov 2020 12:33:22 +0200
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20added=20support=20fo?=
 =?UTF-8?q?r=20subscript/superscript=20types?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../README.md                                 |  2 ++
 packages/rich-text-html-renderer/README.md    |  2 ++
 .../src/__test__/index.test.ts                |  8 ++++++++
 packages/rich-text-html-renderer/src/index.ts |  2 ++
 .../__snapshots__/index.test.tsx.snap         | 20 +++++++++++++++++++
 .../src/__test__/index.test.tsx               |  2 ++
 .../rich-text-react-renderer/src/index.tsx    |  2 ++
 packages/rich-text-types/src/marks.ts         |  2 ++
 8 files changed, 40 insertions(+)

diff --git a/packages/gatsby-transformer-contentful-richtext/README.md b/packages/gatsby-transformer-contentful-richtext/README.md
index ed3b62d4..5a6ebcff 100644
--- a/packages/gatsby-transformer-contentful-richtext/README.md
+++ b/packages/gatsby-transformer-contentful-richtext/README.md
@@ -196,3 +196,5 @@ The `renderMark` keys should be one of the following `MARKS` properties as defin
   - `ITALIC`
   - `UNDERLINE`
   - `CODE`
+  - `SUPERSCRIPT`
+  - `SUBSCRIPT`
diff --git a/packages/rich-text-html-renderer/README.md b/packages/rich-text-html-renderer/README.md
index 86876d58..5f7d6652 100644
--- a/packages/rich-text-html-renderer/README.md
+++ b/packages/rich-text-html-renderer/README.md
@@ -171,3 +171,5 @@ The `renderMark` keys should be one of the following `MARKS` properties as defin
 - `ITALIC`
 - `UNDERLINE`
 - `CODE`
+- `SUPERSCRIPT`
+- `SUBSCRIPT`
diff --git a/packages/rich-text-html-renderer/src/__test__/index.test.ts b/packages/rich-text-html-renderer/src/__test__/index.test.ts
index f57202af..446db3e9 100644
--- a/packages/rich-text-html-renderer/src/__test__/index.test.ts
+++ b/packages/rich-text-html-renderer/src/__test__/index.test.ts
@@ -66,6 +66,14 @@ describe('documentToHtmlString', () => {
         doc: marksDoc(MARKS.CODE),
         expected: '<p><code>hello world</code></p>',
       },
+      {
+        doc: marksDoc(MARKS.SUPERSCRIPT),
+        expected: '<p><sup>hello world</sup></p>',
+      },
+      {
+        doc: marksDoc(MARKS.SUBSCRIPT),
+        expected: '<p><sub>hello world</sub></p>',
+      },
     ];
 
     docs.forEach(({ doc, expected }) => {
diff --git a/packages/rich-text-html-renderer/src/index.ts b/packages/rich-text-html-renderer/src/index.ts
index a8d0ed89..bfc98b27 100644
--- a/packages/rich-text-html-renderer/src/index.ts
+++ b/packages/rich-text-html-renderer/src/index.ts
@@ -36,6 +36,8 @@ const defaultMarkRenderers: RenderMark = {
   [MARKS.ITALIC]: text => `<i>${text}</i>`,
   [MARKS.UNDERLINE]: text => `<u>${text}</u>`,
   [MARKS.CODE]: text => `<code>${text}</code>`,
+  [MARKS.SUPERSCRIPT]: text => `<sup>${text}</sup>`,
+  [MARKS.SUBSCRIPT]: text => `<sub>${text}</sub>`,
 };
 
 const defaultInline = (type: string, node: Inline) =>
diff --git a/packages/rich-text-react-renderer/src/__test__/__snapshots__/index.test.tsx.snap b/packages/rich-text-react-renderer/src/__test__/__snapshots__/index.test.tsx.snap
index cbfa42f2..40c727af 100644
--- a/packages/rich-text-react-renderer/src/__test__/__snapshots__/index.test.tsx.snap
+++ b/packages/rich-text-react-renderer/src/__test__/__snapshots__/index.test.tsx.snap
@@ -144,6 +144,26 @@ Array [
 ]
 `;
 
+exports[`documentToReactComponents renders marks with default mark renderer 5`] = `
+Array [
+  <p>
+    <sup>
+      hello world
+    </sup>
+  </p>,
+]
+`;
+
+exports[`documentToReactComponents renders marks with default mark renderer 6`] = `
+Array [
+  <p>
+    <sub>
+      hello world
+    </sub>
+  </p>,
+]
+`;
+
 exports[`documentToReactComponents renders marks with the passed custom mark renderer 1`] = `
 Array [
   <p>
diff --git a/packages/rich-text-react-renderer/src/__test__/index.test.tsx b/packages/rich-text-react-renderer/src/__test__/index.test.tsx
index f084a74f..2f8a862b 100644
--- a/packages/rich-text-react-renderer/src/__test__/index.test.tsx
+++ b/packages/rich-text-react-renderer/src/__test__/index.test.tsx
@@ -60,6 +60,8 @@ describe('documentToReactComponents', () => {
       marksDoc(MARKS.BOLD),
       marksDoc(MARKS.UNDERLINE),
       marksDoc(MARKS.CODE),
+      marksDoc(MARKS.SUPERSCRIPT),
+      marksDoc(MARKS.SUBSCRIPT),
     ];
 
     docs.forEach(doc => {
diff --git a/packages/rich-text-react-renderer/src/index.tsx b/packages/rich-text-react-renderer/src/index.tsx
index ec09b3d4..8188579d 100644
--- a/packages/rich-text-react-renderer/src/index.tsx
+++ b/packages/rich-text-react-renderer/src/index.tsx
@@ -28,6 +28,8 @@ const defaultMarkRenderers: RenderMark = {
   [MARKS.ITALIC]: text => <i>{text}</i>,
   [MARKS.UNDERLINE]: text => <u>{text}</u>,
   [MARKS.CODE]: text => <code>{text}</code>,
+  [MARKS.SUPERSCRIPT]: text => <sup>{text}</sup>,
+  [MARKS.SUBSCRIPT]: text => <sub>{text}</sub>,
 };
 
 function defaultInline(type: string, node: Inline): ReactNode {
diff --git a/packages/rich-text-types/src/marks.ts b/packages/rich-text-types/src/marks.ts
index 0db065cc..a10d4557 100644
--- a/packages/rich-text-types/src/marks.ts
+++ b/packages/rich-text-types/src/marks.ts
@@ -6,4 +6,6 @@ export default {
   ITALIC: 'italic',
   UNDERLINE: 'underline',
   CODE: 'code',
+  SUPERSCRIPT: 'superscript',
+  SUBSCRIPT: 'subscript',
 };

From 8ff30391ae40aa4538107743dcf1ddbca949ae32 Mon Sep 17 00:00:00 2001
From: Maya Gillilan <maya.gillilan@contentful.com>
Date: Fri, 4 Nov 2022 14:14:59 +0100
Subject: [PATCH 2/3] chore: revert unintended changes

---
 packages/rich-text-types/src/marks.ts | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/rich-text-types/src/marks.ts b/packages/rich-text-types/src/marks.ts
index a10d4557..137da8dc 100644
--- a/packages/rich-text-types/src/marks.ts
+++ b/packages/rich-text-types/src/marks.ts
@@ -1,11 +1,13 @@
 /**
  * Map of all Contentful marks.
  */
-export default {
-  BOLD: 'bold',
-  ITALIC: 'italic',
-  UNDERLINE: 'underline',
-  CODE: 'code',
-  SUPERSCRIPT: 'superscript',
-  SUBSCRIPT: 'subscript',
-};
+enum MARKS {
+  BOLD = 'bold',
+  ITALIC = 'italic',
+  UNDERLINE = 'underline',
+  CODE = 'code',
+  SUPERSCRIPT = 'superscript',
+  SUBSCRIPT = 'subscript',
+}
+
+export default MARKS;

From 9743519dcfaaab0078c12244c6697b27aea5e84d Mon Sep 17 00:00:00 2001
From: Maya Gillilan <maya.gillilan@contentful.com>
Date: Fri, 4 Nov 2022 17:42:12 +0100
Subject: [PATCH 3/3] chore: reapply reverting change to deprecated readme

---
 packages/gatsby-transformer-contentful-richtext/README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/gatsby-transformer-contentful-richtext/README.md b/packages/gatsby-transformer-contentful-richtext/README.md
index 81fac0d1..285dff9d 100644
--- a/packages/gatsby-transformer-contentful-richtext/README.md
+++ b/packages/gatsby-transformer-contentful-richtext/README.md
@@ -194,5 +194,3 @@ The `renderMark` keys should be one of the following `MARKS` properties as defin
   - `ITALIC`
   - `UNDERLINE`
   - `CODE`
-  - `SUPERSCRIPT`
-  - `SUBSCRIPT`