From 9577f33b709157babbe744a6bc6d92534cff762f Mon Sep 17 00:00:00 2001
From: adams85 <31276480+adams85@users.noreply.github.com>
Date: Tue, 4 Feb 2025 13:33:05 +0100
Subject: [PATCH] Prevent unwanted dispose in development when Strict Mode is
 enabled (#68)

* Prevent unwanted dispose in development when Strict Mode is enabled (https://github.com/configcat/react-sdk/issues/67)

* Suggestion on making the ConfigCatClient reference tracking a bit more robust

* Bump version
---
 package-lock.json         |  4 ++--
 package.json              |  2 +-
 src/ConfigCatProvider.tsx | 25 +++++++++++--------------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index db9be65..1c212c7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "configcat-react",
-  "version": "4.8.0",
+  "version": "4.8.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "configcat-react",
-      "version": "4.8.0",
+      "version": "4.8.1",
       "license": "MIT",
       "dependencies": {
         "configcat-common": "9.3.1",
diff --git a/package.json b/package.json
index 4f283b9..3278a8d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "configcat-react",
-  "version": "4.8.0",
+  "version": "4.8.1",
   "scripts": {
     "build": "npm run build:esm && npm run build:cjs",
     "build:esm": "tsc -p tsconfig.build.esm.json && gulp esm",
diff --git a/src/ConfigCatProvider.tsx b/src/ConfigCatProvider.tsx
index fefbbd6..f14b21f 100644
--- a/src/ConfigCatProvider.tsx
+++ b/src/ConfigCatProvider.tsx
@@ -18,7 +18,9 @@ type ConfigCatProviderProps = {
 
 type ConfigCatProviderState = ConfigCatContextData;
 
-const initializedClients = new Map<string, number>();
+type AugmentedConfigCatClient = IConfigCatClient & {
+  $reactSdk_providers?: Set<ConfigCatProvider>;
+}
 
 class ConfigCatProvider extends Component<PropsWithChildren<ConfigCatProviderProps>, ConfigCatProviderState, {}> {
   private configChangedHandler?: (newConfig: IConfig) => void;
@@ -26,18 +28,18 @@ class ConfigCatProvider extends Component<PropsWithChildren<ConfigCatProviderPro
   constructor(props: ConfigCatProviderProps) {
     super(props);
 
-    const client: IConfigCatClient = !isServerContext()
+    const client = (!isServerContext()
       ? this.initializeConfigCatClient()
-      : new ConfigCatClientStub();
+      : new ConfigCatClientStub()
+    ) as AugmentedConfigCatClient;
+
+    const providers = client.$reactSdk_providers ??= new Set();
+    providers.add(this);
 
     this.state = { client };
   }
 
   componentDidMount(): void {
-    const { sdkKey } = this.props;
-
-    initializedClients.set(sdkKey, (initializedClients.get(sdkKey) ?? 0) + 1);
-
     this.configChangedHandler = newConfig => this.reactConfigChanged(newConfig);
 
     this.state.client.waitForReady().then(() => {
@@ -56,14 +58,9 @@ class ConfigCatProvider extends Component<PropsWithChildren<ConfigCatProviderPro
       delete this.configChangedHandler;
     }
 
-    const { sdkKey } = this.props;
-
-    const refCount = (initializedClients.get(sdkKey) ?? 1) - 1;
-    initializedClients.set(sdkKey, refCount);
-
-    if (refCount <= 0) {
+    const providers = (this.state.client as AugmentedConfigCatClient).$reactSdk_providers;
+    if (providers?.delete(this) && !providers.size) {
       this.state.client.dispose();
-      initializedClients.delete(sdkKey);
     }
   }