refactor: rename search panel callback and update related usages

Author: AbhishekA1509

src/Shared/Components/CodeEditor/CodeEditor.tsx

@@ -87,7 +87,7 @@ const CodeEditor = <DiffView extends boolean = false>({
     onBlur,
     onFocus,
     autoFocus,
-    onOpenSearchPanel = noop,
+    onSearchPanelOpen = noop,
     onSearchBarAction = noop,
     collapseUnchangedDiffView = false,
     ...resProps
@@ -210,10 +210,10 @@ const CodeEditor = <DiffView extends boolean = false>({
         keymap.of([
             ...vscodeKeymap.filter(({ key }) => key !== 'Mod-Alt-Enter' && key !== 'Mod-Enter' && key !== 'Mod-f'),
             ...(!disableSearch
-                ? [{ key: 'Mod-f', run: getOpenSearchPanel(onOpenSearchPanel), scope: 'editor search-panel' }]
+                ? [{ key: 'Mod-f', run: getOpenSearchPanel(onSearchPanelOpen), scope: 'editor search-panel' }]
                 : []),
             { key: 'Mod-Enter', run: replaceAll, scope: 'editor search-panel' },
-            { key: 'Mod-Alt-f', run: getOpenSearchPanelWithReplace(onOpenSearchPanel), scope: 'editor search-panel' },
+            { key: 'Mod-Alt-f', run: getOpenSearchPanelWithReplace(onSearchPanelOpen), scope: 'editor search-panel' },
             { key: 'Escape', run: blurOnEscape, stopPropagation: true },
         ]),
         indentationMarkers(),

src/Shared/Components/CodeEditor/Commands/findAndReplace.ts

@@ -37,19 +37,19 @@ export const getShowReplaceField = (state: EditorState) => {
     return curState || false
 }
 
-export const getOpenSearchPanel: (onOpenSearchPanel: () => void) => Command =
-    (onOpenSearchPanel: () => void) => (view: EditorView) => {
+export const getOpenSearchPanel: (onSearchPanelOpen: () => void) => Command =
+    (onSearchPanelOpen: () => void) => (view: EditorView) => {
         view.dispatch({
             effects: [setShowReplaceField.of(searchPanelOpen(view.state) ? getShowReplaceField(view.state) : false)],
         })
         cmOpenSearchPanel(view)
-        onOpenSearchPanel()
+        onSearchPanelOpen()
         return true
     }
 
-export const getOpenSearchPanelWithReplace: (onOpenSearchPanel: () => void) => Command =
-    (onOpenSearchPanel: () => void) => (view: EditorView) => {
-        getOpenSearchPanel(onOpenSearchPanel)(view)
+export const getOpenSearchPanelWithReplace: (onSearchPanelOpen: () => void) => Command =
+    (onSearchPanelOpen: () => void) => (view: EditorView) => {
+        getOpenSearchPanel(onSearchPanelOpen)(view)
         view.dispatch({ effects: [setShowReplaceField.of(!view.state.readOnly && true)] })
         return true
     }

src/Shared/Components/CodeEditor/Extensions/findAndReplace.tsx

@@ -121,8 +121,8 @@ const FindReplace = ({ view, defaultQuery, defaultShowReplace, onSearchBarAction
 
     useEffect(() => {
         if (!defaultQuery.eq(query)) {
-            setMatchesCount(getUpdatedSearchMatchesCount(defaultQuery, view))
             onSearchBarAction?.()
+            setMatchesCount(getUpdatedSearchMatchesCount(defaultQuery, view))
             setQuery(defaultQuery)
         }
     }, [defaultQuery])
@@ -146,13 +146,15 @@ const FindReplace = ({ view, defaultQuery, defaultShowReplace, onSearchBarAction
     const onNext = (e?: MouseEvent<HTMLButtonElement>) => {
         e?.preventDefault()
         e?.stopPropagation()
+        onSearchBarAction?.()
         findNext(view)
         setMatchesCount(getUpdatedSearchMatchesCount(query, view))
     }
 
     const onPrevious = (e?: MouseEvent<HTMLButtonElement>) => {
         e?.preventDefault()
         e?.stopPropagation()
+        onSearchBarAction?.()
         findPrevious(view)
         setMatchesCount(getUpdatedSearchMatchesCount(query, view))
     }
@@ -164,7 +166,6 @@ const FindReplace = ({ view, defaultQuery, defaultShowReplace, onSearchBarAction
     const onFindKeyDown = (e: ReactKeyboardEvent<HTMLInputElement>) => {
         e.stopPropagation()
         if (e.key === 'Enter') {
-            onSearchBarAction?.()
             e.preventDefault()
             if (e.shiftKey) {
                 onPrevious()
@@ -182,6 +183,7 @@ const FindReplace = ({ view, defaultQuery, defaultShowReplace, onSearchBarAction
         e.stopPropagation()
         if (e.key === 'Enter') {
             e.preventDefault()
+            onSearchBarAction?.()
             replaceNext(view)
         }
     }
@@ -191,10 +193,12 @@ const FindReplace = ({ view, defaultQuery, defaultShowReplace, onSearchBarAction
     }
 
     const onReplaceTextClick = () => {
+        onSearchBarAction?.()
         replaceNext(view)
     }
 
     const onReplaceTextAllClick = () => {
+        onSearchBarAction?.()
         replaceAll(view)
     }
 

src/Shared/Components/CodeEditor/types.ts

@@ -84,7 +84,7 @@ export type CodeEditorProps<DiffView extends boolean = false> = {
     disableSearch?: boolean
     diffView?: DiffView
     theme?: AppThemeType
-    onOpenSearchPanel?: () => void
+    onSearchPanelOpen?: () => void
     /**
      * This method is triggered when user types something in the search/replace bar or applies a search or replace action.
      */