From 8feef7bf5e20954514a7d6b0c2d06ccf0ee68630 Mon Sep 17 00:00:00 2001
From: Alf Eaton <alf.eaton@overleaf.com>
Date: Wed, 3 Jan 2024 12:40:19 +0000
Subject: [PATCH] Remove findEffect (#16343)

GitOrigin-RevId: b8472f5128deac5e7f94fb1ec1e64899a8da510a
---
 .../source-editor/extensions/visual/visual.ts  | 18 +++++++++++-------
 .../js/features/source-editor/utils/effects.ts |  5 -----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/services/web/frontend/js/features/source-editor/extensions/visual/visual.ts b/services/web/frontend/js/features/source-editor/extensions/visual/visual.ts
index c397af13b8..abcf1b2ce4 100644
--- a/services/web/frontend/js/features/source-editor/extensions/visual/visual.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/visual/visual.ts
@@ -12,7 +12,6 @@ import { markDecorations } from './mark-decorations'
 import { EditorView, ViewPlugin } from '@codemirror/view'
 import { visualKeymap } from './visual-keymap'
 import { mousedown, mouseDownEffect } from './selection'
-import { findEffect } from '../../utils/effects'
 import { forceParsing, syntaxTree } from '@codemirror/language'
 import { hasLanguageLoadedEffect } from '../language'
 import { restoreScrollPosition } from '../scroll-position'
@@ -34,14 +33,18 @@ type Options = {
 const visualConf = new Compartment()
 
 export const toggleVisualEffect = StateEffect.define<boolean>()
-export const findToggleVisualEffect = findEffect(toggleVisualEffect)
 
 const visualState = StateField.define<boolean>({
   create() {
     return false
   },
   update(value, tr) {
-    return findToggleVisualEffect(tr)?.value ?? value
+    for (const effect of tr.effects) {
+      if (effect.is(toggleVisualEffect)) {
+        return effect.value
+      }
+    }
+    return value
   },
 })
 
@@ -80,10 +83,11 @@ export const sourceOnly = (visual: boolean, extension: Extension) => {
 
     // Respond to switching editor modes
     EditorState.transactionExtender.of(tr => {
-      const effect = findToggleVisualEffect(tr)
-      if (effect) {
-        return {
-          effects: conf.reconfigure(configure(effect.value)),
+      for (const effect of tr.effects) {
+        if (effect.is(toggleVisualEffect)) {
+          return {
+            effects: conf.reconfigure(configure(effect.value)),
+          }
         }
       }
       return null
diff --git a/services/web/frontend/js/features/source-editor/utils/effects.ts b/services/web/frontend/js/features/source-editor/utils/effects.ts
index c7f159d416..6ff612a5cb 100644
--- a/services/web/frontend/js/features/source-editor/utils/effects.ts
+++ b/services/web/frontend/js/features/source-editor/utils/effects.ts
@@ -12,8 +12,3 @@ export const updateHasEffect =
     update.transactions.some(tr =>
       tr.effects.some(effect => effect.is(effectType))
     )
-
-export const findEffect =
-  <T>(effectType: StateEffectType<T>) =>
-  (tr: Transaction) =>
-    tr.effects.find(effect => effect.is(effectType))