Revert "Reduce number of react component re-renders and extra API calls"

ClearskyApp06 · Nov 24, 2024 · 0ee6762 · 0ee6762
1 parent 9ff3968
commit 0ee6762
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 35 deletions.
diff --git a/src/api/blocklist.js b/src/api/blocklist.js
@@ -4,43 +4,35 @@ import { unwrapShortHandle, v1APIPrefix, xAPIKey } from '.';
 import { parseNumberWithCommas, unwrapClearSkyURL } from './core';
 import { resolveHandleOrDID } from './resolve-handle-or-did';
 
-const blocklistFetchQueued = new Map();
-let blocklistDebounce = 0;
-
 /**
  * @param {string} handleOrDID
  */
 export function blocklist(handleOrDID) {
-  if (blocklistFetchQueued.has(handleOrDID)) return blocklistFetchQueued.get(handleOrDID);
-
-  let generator = blocklistCall(handleOrDID, 'blocklist');
-  blocklistFetchQueued.set(handleOrDID, generator);
-
-  clearTimeout(blocklistDebounce);
-  blocklistDebounce = setTimeout(() => blocklistFetchQueued.delete(handleOrDID), 1000);
+  if (!otherSideFetchQueued.has(handleOrDID)) {
+    otherSideFetchQueued.add(handleOrDID)
+    clearTimeout(debounceOtherSideFetch);
+    debounceOtherSideFetch = setTimeout(() => singleBlocklist(handleOrDID).next(), 600);
+  }
 
-  return generator;
+  return blocklistCall(handleOrDID, 'blocklist');
 }
 
-const singleBlocklistFetchQueued = new Map();
-let singleBlocklistDebounce = 0;
-
 /**
  * @param {string} handleOrDID
  */
 export function singleBlocklist(handleOrDID) {
-  if (singleBlocklistFetchQueued.has(handleOrDID)) return singleBlocklistFetchQueued.get(handleOrDID);
-
-  let generator = blocklistCall(handleOrDID, 'single-blocklist');
-
-  singleBlocklistFetchQueued.set(handleOrDID, generator);
-
-  clearTimeout(singleBlocklistDebounce);
-  singleBlocklistDebounce = setTimeout(() => singleBlocklistFetchQueued.delete(handleOrDID), 1000);
+  if (!otherSideFetchQueued.has(handleOrDID)) {
+    otherSideFetchQueued.add(handleOrDID)
+    clearTimeout(debounceOtherSideFetch);
+    debounceOtherSideFetch = setTimeout(() => blocklist(handleOrDID).next(), 600);
+  }
 
-  return generator;
+  return blocklistCall(handleOrDID, 'single-blocklist');
 }
 
+const otherSideFetchQueued = new Set();
+let debounceOtherSideFetch = 0;
+
 /**
  * @typedef {{
  *  shortDID: string,

diff --git a/src/app.js b/src/app.js
@@ -91,17 +91,16 @@ function showApp() {
 
   console.log('React createRoot/render');
   ReactDOM.createRoot(root).render(
-      <React.StrictMode>
-        <ThemeProvider theme={theme}>
-          <>
-            <RouterProvider router={router}/>
-            <div className='bluethernal-llc-watermark'>
-              © 2024 Bluethernal LLC
-            </div>
-          </>
-        </ThemeProvider>
-      </React.StrictMode>
-
+    <React.StrictMode>
+      <ThemeProvider theme={theme}>
+        <>
+          <RouterProvider router={router} />
+          <div className='bluethernal-llc-watermark'>
+            © 2024 Bluethernal LLC
+          </div>
+        </>
+      </ThemeProvider>
+    </React.StrictMode>
   );
 }
 

diff --git a/src/detail-panels/block-panel-generic/block-panel-generic.js b/src/detail-panels/block-panel-generic/block-panel-generic.js
@@ -130,7 +130,6 @@ class PanelHeader extends React.Component {
 /** @param {typeof singleBlocklist} fetch */
 async function* fetchAccountBlocking(shortHandle, fetch) {
   try {
-    console.log('fetching account blocking');
     for await (const block of fetch(unwrapShortHandle(shortHandle))) {
       yield block;
     }