From 80ddf541f3a58a5f21f5135060945a6078b5ddbc Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Mon, 4 Mar 2024 02:44:21 +0000
Subject: [PATCH 1/9] 3.10.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 462a7d27..e2bc0a90 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "improved-initiative",
-  "version": "3.9.4",
+  "version": "3.10.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "improved-initiative",
-      "version": "3.9.4",
+      "version": "3.10.1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index a18f99ae..0b7cc670 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "improved-initiative",
-  "version": "3.10.0",
+  "version": "3.10.1",
   "description": "Combat tracker for Dungeons and Dragons (D&D) 5th Edition",
   "license": "MIT",
   "repository": {

From d2da11405ec51fe81a550f1d410be819ddbea49d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Mar 2024 02:45:03 +0000
Subject: [PATCH 2/9] Bump ip from 1.1.8 to 1.1.9

Bumps [ip](https://github.com/indutny/node-ip) from 1.1.8 to 1.1.9.
- [Commits](https://github.com/indutny/node-ip/compare/v1.1.8...v1.1.9)

---
updated-dependencies:
- dependency-name: ip
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e2bc0a90..99d1d459 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29,7 +29,7 @@
         "express-session": "^1.17.3",
         "express-socket.io-session": "^1.3.5",
         "ioredis": "^5.3.2",
-        "ip": "^1.1.8",
+        "ip": "^1.1.9",
         "json-url": "^2.6.0",
         "knockout": "^3.5.1",
         "localforage": "^1.10.0",
@@ -11479,9 +11479,9 @@
       }
     },
     "node_modules/ip": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
-      "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
+      "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ=="
     },
     "node_modules/ipaddr.js": {
       "version": "1.9.1",
@@ -29288,9 +29288,9 @@
       }
     },
     "ip": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
-      "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
+      "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ=="
     },
     "ipaddr.js": {
       "version": "1.9.1",
diff --git a/package.json b/package.json
index 0b7cc670..3f8f4a6c 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "express-session": "^1.17.3",
     "express-socket.io-session": "^1.3.5",
     "ioredis": "^5.3.2",
-    "ip": "^1.1.8",
+    "ip": "^1.1.9",
     "json-url": "^2.6.0",
     "knockout": "^3.5.1",
     "localforage": "^1.10.0",

From 58527255f5ff240b2acdffdd41c6c87fe49efeda Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 16 Mar 2024 23:25:55 +0000
Subject: [PATCH 3/9] Bump follow-redirects from 1.15.4 to 1.15.6

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.4...v1.15.6)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e2bc0a90..4d447c28 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10037,9 +10037,9 @@
       "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.4",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
-      "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
       "funding": [
         {
           "type": "individual",
@@ -28238,9 +28238,9 @@
       "dev": true
     },
     "follow-redirects": {
-      "version": "1.15.4",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
-      "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw=="
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA=="
     },
     "for-each": {
       "version": "0.3.3",

From 8a148b18d3ac5b2d5396d29b6e713c3d4245d8ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2024 08:58:32 +0000
Subject: [PATCH 4/9] Bump express from 4.18.2 to 4.19.2

Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.18.2...4.19.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 105 +++++++++-------------------------------------
 package.json      |   2 +-
 2 files changed, 20 insertions(+), 87 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e2bc0a90..7e8bc427 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,7 @@
         "browser-filesaver": "^1.1.1",
         "color": "^3.2.1",
         "connect-redis": "^7.1.0",
-        "express": "^4.18.2",
+        "express": "^4.19.2",
         "express-session": "^1.17.3",
         "express-socket.io-session": "^1.3.5",
         "ioredis": "^5.3.2",
@@ -7576,9 +7576,9 @@
       "dev": true
     },
     "node_modules/cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -9436,16 +9436,16 @@
       }
     },
     "node_modules/express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "version": "4.19.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
+        "body-parser": "1.20.2",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.5.0",
+        "cookie": "0.6.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -9557,29 +9557,6 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
-    "node_modules/express/node_modules/body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
-      "dependencies": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.11.0",
-        "raw-body": "2.5.1",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
-    },
     "node_modules/express/node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -9591,21 +9568,7 @@
     "node_modules/express/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "node_modules/express/node_modules/raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
-      "dependencies": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/express/node_modules/safe-buffer": {
       "version": "5.2.1",
@@ -26382,9 +26345,9 @@
       "dev": true
     },
     "cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw=="
     },
     "cookie-parser": {
       "version": "1.3.5",
@@ -27749,16 +27712,16 @@
       }
     },
     "express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "version": "4.19.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
       "requires": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
+        "body-parser": "1.20.2",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.5.0",
+        "cookie": "0.6.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -27786,25 +27749,6 @@
         "vary": "~1.1.2"
       },
       "dependencies": {
-        "body-parser": {
-          "version": "1.20.1",
-          "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-          "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
-          "requires": {
-            "bytes": "3.1.2",
-            "content-type": "~1.0.4",
-            "debug": "2.6.9",
-            "depd": "2.0.0",
-            "destroy": "1.2.0",
-            "http-errors": "2.0.0",
-            "iconv-lite": "0.4.24",
-            "on-finished": "2.4.1",
-            "qs": "6.11.0",
-            "raw-body": "2.5.1",
-            "type-is": "~1.6.18",
-            "unpipe": "1.0.0"
-          }
-        },
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -27816,18 +27760,7 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "raw-body": {
-          "version": "2.5.1",
-          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-          "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
-          "requires": {
-            "bytes": "3.1.2",
-            "http-errors": "2.0.0",
-            "iconv-lite": "0.4.24",
-            "unpipe": "1.0.0"
-          }
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         },
         "safe-buffer": {
           "version": "5.2.1",
diff --git a/package.json b/package.json
index 0b7cc670..bd72c3b2 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
     "browser-filesaver": "^1.1.1",
     "color": "^3.2.1",
     "connect-redis": "^7.1.0",
-    "express": "^4.18.2",
+    "express": "^4.19.2",
     "express-session": "^1.17.3",
     "express-socket.io-session": "^1.3.5",
     "ioredis": "^5.3.2",

From 519263ab3da834a5fc16376a653eb2244b52c669 Mon Sep 17 00:00:00 2001
From: Evan Bailey <cynicaloptimist@gmail.com>
Date: Thu, 4 Apr 2024 20:23:36 -0700
Subject: [PATCH 5/9] Add tooltips

---
 client/StatBlockEditor/StatBlockEditor.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/StatBlockEditor/StatBlockEditor.tsx b/client/StatBlockEditor/StatBlockEditor.tsx
index e2c969cf..8882b020 100644
--- a/client/StatBlockEditor/StatBlockEditor.tsx
+++ b/client/StatBlockEditor/StatBlockEditor.tsx
@@ -74,11 +74,11 @@ export class StatBlockEditor extends React.Component<
 
     const buttons = (
       <>
-        <Button onClick={this.close} fontAwesomeIcon="times" />
+        <Button onClick={this.close} fontAwesomeIcon="times" tooltip="Close Editor" />
         {this.props.onDelete && (
-          <Button onClick={this.delete} fontAwesomeIcon="trash" />
+          <Button onClick={this.delete} fontAwesomeIcon="trash" tooltip="Delete StatBlock" />
         )}
-        <SubmitButton fontAwesomeIcon="save" />
+        <SubmitButton fontAwesomeIcon="save" tooltip="Save Changes" />
       </>
     );
 

From d4ce6c5243b04efb1a47fc9b59198cbcdf6ebaef Mon Sep 17 00:00:00 2001
From: Evan Bailey <cynicaloptimist@gmail.com>
Date: Thu, 4 Apr 2024 23:05:25 -0700
Subject: [PATCH 6/9] Use Meta() to bust filter cache

---
 client/Library/FilterCache.ts                 | 21 +++++++++++++++++--
 .../StatBlockLibraryReferencePane.tsx         |  1 -
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/client/Library/FilterCache.ts b/client/Library/FilterCache.ts
index 8138f824..032a99d5 100644
--- a/client/Library/FilterCache.ts
+++ b/client/Library/FilterCache.ts
@@ -1,3 +1,4 @@
+import _ = require("lodash");
 import { Listable } from "../../common/Listable";
 import { Listing, ListingOrigin } from "./Listing";
 
@@ -70,13 +71,29 @@ export class FilterCache<T extends Listing<Listable>> {
 
   private filterCache: Record<string, T[]> = {};
 
-  public UpdateIfItemsChanged(newItems) {
-    if (newItems.length != this.initialLength) {
+  public UpdateIfItemsChanged(newItems: T[]) {
+    if (
+      newItems.length != this.initialLength ||
+      this.itemsHaveUpdatedMeta(newItems)
+    ) {
       this.filterCache = {};
       this.initializeItems(newItems);
     }
   }
 
+  private itemsHaveUpdatedMeta(newItems: T[]) {
+    for (let i = 0; i < newItems.length; i++) {
+      const newItem = newItems[i];
+      const currentItem = this.allItems[i];
+      if (!currentItem) {
+        return true;
+      }
+      if (_.isEqual(newItem.Meta(), currentItem.Meta())) {
+        return true;
+      }
+    }
+  }
+
   public GetFilteredEntries = (filter: string) => {
     if (this.filterCache[filter]) {
       return this.filterCache[filter];
diff --git a/client/Library/ReferencePane/StatBlockLibraryReferencePane.tsx b/client/Library/ReferencePane/StatBlockLibraryReferencePane.tsx
index a192385a..467e3ed0 100644
--- a/client/Library/ReferencePane/StatBlockLibraryReferencePane.tsx
+++ b/client/Library/ReferencePane/StatBlockLibraryReferencePane.tsx
@@ -146,7 +146,6 @@ export class StatBlockLibraryReferencePane extends React.Component<
     };
 
   private editStatBlock = (l: Listing<StatBlock>) => {
-    l.Meta.subscribe(_ => this.forceUpdate());
     this.props.librariesCommander.EditStatBlock(l, this.props.library);
   };
 

From 725fad9f60176c5077145bb99f4be75e24223e62 Mon Sep 17 00:00:00 2001
From: Evan Bailey <cynicaloptimist@gmail.com>
Date: Thu, 9 May 2024 16:39:34 -0700
Subject: [PATCH 7/9] Render spell reference inside li tags

---
 client/TextEnricher/TextEnricher.tsx | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/client/TextEnricher/TextEnricher.tsx b/client/TextEnricher/TextEnricher.tsx
index f46c9b11..94228482 100644
--- a/client/TextEnricher/TextEnricher.tsx
+++ b/client/TextEnricher/TextEnricher.tsx
@@ -77,6 +77,15 @@ export class TextEnricher {
           return <p>{replacer(children[0])}</p>;
         }
         return <p>{children}</p>;
+      },
+      li: ({ children, className, node, ...rest }) => {
+        if (isString(children)) {
+          return <li>{replacer(children)}</li>;
+        }
+        if (children.length == 1 && isString(children[0])) {
+          return <li>{replacer(children[0])}</li>;
+        }
+        return <li>{children}</li>;
       }
     };
 

From bf32ce2af40ee51d0716c148b3f10253aef8bdcd Mon Sep 17 00:00:00 2001
From: Evan Bailey <cynicaloptimist@gmail.com>
Date: Sat, 18 May 2024 20:05:30 -0700
Subject: [PATCH 8/9] extract method

---
 client/TextEnricher/TextEnricher.tsx | 33 ++++++++++++++--------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/client/TextEnricher/TextEnricher.tsx b/client/TextEnricher/TextEnricher.tsx
index 94228482..5f0dbde5 100644
--- a/client/TextEnricher/TextEnricher.tsx
+++ b/client/TextEnricher/TextEnricher.tsx
@@ -70,23 +70,11 @@ export class TextEnricher {
       Omit<NormalComponents, keyof SpecialComponents> & SpecialComponents
     > = {
       p: ({ children }) => {
-        if (isString(children)) {
-          return <p>{replacer(children)}</p>;
-        }
-        if (children.length == 1 && isString(children[0])) {
-          return <p>{replacer(children[0])}</p>;
-        }
-        return <p>{children}</p>;
+        return <p>{this.applyReplacer(replacer, children)}</p>;
+      },
+      li: ({ children }) => {
+        return <li>{this.applyReplacer(replacer, children)}</li>;
       },
-      li: ({ children, className, node, ...rest }) => {
-        if (isString(children)) {
-          return <li>{replacer(children)}</li>;
-        }
-        if (children.length == 1 && isString(children[0])) {
-          return <li>{replacer(children[0])}</li>;
-        }
-        return <li>{children}</li>;
-      }
     };
 
     return (
@@ -94,6 +82,19 @@ export class TextEnricher {
     );
   };
 
+  private applyReplacer(
+    replacer: any,
+    children: React.ReactNode & React.ReactNode[]
+  ) {
+    if (isString(children)) {
+      return replacer(children);
+    }
+    if (children.length == 1 && isString(children[0])) {
+      return replacer(children[0]);
+    }
+    return children;
+  }
+
   private buildReactReplacer(
     originalText: string,
     updateTextSource?: (newText: string) => void

From 0ce0330af64253b92576eb6b814a98654b8b656f Mon Sep 17 00:00:00 2001
From: Evan Bailey <cynicaloptimist@gmail.com>
Date: Sat, 18 May 2024 20:08:32 -0700
Subject: [PATCH 9/9] Enrich italic and bold elements

---
 client/TextEnricher/TextEnricher.tsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/client/TextEnricher/TextEnricher.tsx b/client/TextEnricher/TextEnricher.tsx
index 5f0dbde5..f9702753 100644
--- a/client/TextEnricher/TextEnricher.tsx
+++ b/client/TextEnricher/TextEnricher.tsx
@@ -75,6 +75,12 @@ export class TextEnricher {
       li: ({ children }) => {
         return <li>{this.applyReplacer(replacer, children)}</li>;
       },
+      strong: ({ children }) => {
+        return <strong>{this.applyReplacer(replacer, children)}</strong>;
+      },
+      em: ({ children }) => {
+        return <em>{this.applyReplacer(replacer, children)}</em>;
+      }
     };
 
     return (