vzcode 1.14.0 → 1.15.0

package/src/client/useActions.ts

@@ -115,6 +115,35 @@ export const useActions = (
     [dispatch],
   );
 
+  // Update search results file matching line visibility to be
+  const setSearchLineVisibility = useCallback(
+    (
+      files: ShareDBDoc<VZCodeContent>,
+      id: string,
+      line: number,
+    ) => {
+      dispatch({
+        type: 'hide_search_results_line',
+        files: files,
+        id: id,
+        line: line,
+      });
+    },
+    [dispatch],
+  );
+
+  // Update search results active element
+  const setSearchFocusedIndex = useCallback(
+    (focusedIndex: number, childIndex: number) => {
+      dispatch({
+        type: 'set_active_search_index',
+        focusedIndex: focusedIndex,
+        childIndex: childIndex,
+      });
+    },
+    [dispatch],
+  );
+
   // Toggle the focused variable, which should focus the search input
   const toggleSearchFocused = useCallback(() => {
     dispatch({
@@ -200,6 +229,8 @@ export const useActions = (
     setSearch,
     setSearchResults,
     setSearchFileVisibility,
+    setSearchLineVisibility,
+    setSearchFocusedIndex,
     toggleSearchFocused,
     setIsSettingsOpen,
     setIsDocOpen,

package/src/client/useKeyboardShortcuts.ts

@@ -4,7 +4,8 @@ import { syntaxTree } from '@codemirror/language';
 import { SyntaxNode, SyntaxNodeRef } from '@lezer/common';
 import { EditorView } from '@codemirror/view';
 import { EditorState } from '@codemirror/state';
-import { FileId } from '../types';
+import { FileId, PaneId } from '../types';
+import { editorCacheKey } from './useEditorCache';
 
 /*
   The following is a helpful resource for the following Code Mirror Syntax Tree methods below
@@ -175,6 +176,7 @@ const sideBarKeyBoardMap = {
 export const useKeyboardShortcuts = ({
   closeTabs,
   activeFileId,
+  activePaneId,
   handleOpenCreateFileModal,
   setActiveFileLeft,
   setActiveFileRight,
@@ -187,6 +189,7 @@ export const useKeyboardShortcuts = ({
 }: {
   closeTabs: (fileIds: FileId[]) => void;
   activeFileId: FileId | null;
+  activePaneId: PaneId;
   handleOpenCreateFileModal: () => void;
   setActiveFileLeft: () => void;
   setActiveFileRight: () => void;
@@ -198,6 +201,12 @@ export const useKeyboardShortcuts = ({
   codeEditorRef: React.RefObject<HTMLDivElement>;
 }) => {
   useEffect(() => {
+    // This key is needed to look up the current editor in the editor cache.
+    const cacheKey = editorCacheKey(
+      activeFileId,
+      activePaneId,
+    );
+
     const handleKeyPress = (event: KeyboardEvent) => {
       if (shouldTriggerRun(event)) {
         event.preventDefault();
@@ -321,8 +330,9 @@ export const useKeyboardShortcuts = ({
       }
 
       // Move current cursor and center view in the editor to destination node
+
       const editor: EditorView =
-        editorCache.get(activeFileId).editor;
+        editorCache.get(cacheKey).editor;
       const closestDefinition: SyntaxNode = definingNode;
 
       editor.dispatch({
@@ -355,7 +365,7 @@ export const useKeyboardShortcuts = ({
       }
 
       const editor: EditorView =
-        editorCache.get(activeFileId).editor;
+        editorCache.get(cacheKey).editor;
       const tree = syntaxTree(editor.state);
       const element = event.target as HTMLSpanElement;
 

package/src/client/vzReducer/createInitialState.ts

@@ -17,7 +17,13 @@ export const createInitialState = ({
   },
   activePaneId: 'root',
   theme: defaultTheme,
-  search: { pattern: '', results: {}, focused: false },
+  search: {
+    pattern: '',
+    results: {},
+    focused: false,
+    focusedIndex: null,
+    focusedChildIndex: null,
+  },
   isSearchOpen: false,
   isSettingsOpen: false,
   isDocOpen: false,

package/src/client/vzReducer/index.ts

@@ -27,6 +27,8 @@ import {
   setSearchReducer,
   setSearchResultsReducer,
   setSearchFileVisibilityReducer,
+  setSearchLineVisibilityReducer,
+  setSearchFocusedIndexReducer,
   toggleSearchFocusedReducer,
 } from './searchReducer';
 import { toggleAutoFollowReducer } from './toggleAutoFollowReducer';
@@ -134,6 +136,23 @@ export type VZAction =
       visibility: SearchFileVisibility;
     }
 
+  // `hide_search_results_line`
+  //  * Hides a current search pattern file's specific matching line
+  | {
+      type: 'hide_search_results_line';
+      files: ShareDBDoc<VZCodeContent>;
+      id: string;
+      line: number;
+    }
+
+  // `set_active_search_index`
+  //  * Sets focused (file) index and child focused (line) index for search results
+  | {
+      type: 'set_active_search_index';
+      focusedIndex: number;
+      childIndex: number;
+    }
+
   // `toggle_search_focused`
   // * Toggles focused variable to trigger search input focus
   | { type: 'toggle_search_focused' }
@@ -170,6 +189,8 @@ const reducers = [
   setSearchReducer,
   setSearchResultsReducer,
   setSearchFileVisibilityReducer,
+  setSearchLineVisibilityReducer,
+  setSearchFocusedIndexReducer,
   toggleSearchFocusedReducer,
   setIsSearchOpenReducer,
   setIsSettingsOpenReducer,

package/src/client/vzReducer/openTabReducer.ts

@@ -58,6 +58,9 @@ export const openTabReducer = (
     newTabList = [...activePane.tabList, newTabState];
   }
 
+  // If the tab is persistent, the editor should focus on the next render.
+  const editorWantsFocus = !action.isTransient;
+
   return {
     ...state,
     pane: updatePane({
@@ -66,8 +69,6 @@ export const openTabReducer = (
       newTabList,
       newActiveFileId: action.fileId,
     }),
-
-    // If the tab is persistent, the editor should focus on the next render.
-    editorWantsFocus: !action.isTransient,
+    editorWantsFocus,
   };
 };

package/src/client/vzReducer/searchReducer.ts

@@ -31,6 +31,7 @@ function searchPattern(
             line: j + 1,
             index: index,
             text: lines[j],
+            isClosed: false,
           });
         }
       }
@@ -75,8 +76,11 @@ export const setSearchReducer = (
     ? {
         ...state,
         search: {
+          ...state.search,
           pattern: action.value,
           results: {},
+          focusedIndex: 0,
+          focusedChildIndex: null,
           focused: true,
         },
       }
@@ -90,6 +94,7 @@ export const setSearchResultsReducer = (
     ? {
         ...state,
         search: {
+          ...state.search,
           pattern: state.search.pattern,
           results: searchPattern(
             action.files,
@@ -108,13 +113,53 @@ export const setSearchFileVisibilityReducer = (
     ? {
         ...state,
         search: {
+          ...state.search,
           pattern: state.search.pattern,
           results: updateSearchFileVisibility(
             state.search.results,
             action.id,
             action.visibility,
           ),
-          focused: state.search.focused,
+        },
+      }
+    : state;
+
+export const setSearchLineVisibilityReducer = (
+  state: VZState,
+  action: VZAction,
+): VZState =>
+  action.type === 'hide_search_results_line'
+    ? {
+        ...state,
+        search: {
+          ...state.search,
+          results: {
+            ...state.search.results,
+            [action.id]: {
+              ...state.search.results[action.id],
+              matches: state.search.results[
+                action.id
+              ].matches.filter(
+                (match, index) =>
+                  match.line !== action.line,
+              ),
+            },
+          },
+        },
+      }
+    : state;
+
+export const setSearchFocusedIndexReducer = (
+  state: VZState,
+  action: VZAction,
+): VZState =>
+  action.type === 'set_active_search_index'
+    ? {
+        ...state,
+        search: {
+          ...state.search,
+          focusedIndex: action.focusedIndex,
+          focusedChildIndex: action.childIndex,
         },
       }
     : state;

package/src/types.ts

@@ -80,6 +80,8 @@ export interface SearchFile {
 export interface SearchResults {
   pattern: string;
   results: SearchResult;
+  focusedIndex: number | null;
+  focusedChildIndex: number | null;
   focused: boolean;
 }