From fe79c47d1f2a9293acb9d6ab8db933e1d8c9c53b Mon Sep 17 00:00:00 2001 From: Nivedin <53208152+nivedin@users.noreply.github.com> Date: Tue, 2 Jul 2024 13:41:20 +0530 Subject: [PATCH] fix: codemirror crashing due to cursor not updating (#4151) fix: cursor not updating while filtering --- .../lenses/renderers/JSONLensRenderer.vue | 4 ++-- .../src/composables/codemirror.ts | 17 +++++------------ 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/packages/hoppscotch-common/src/components/lenses/renderers/JSONLensRenderer.vue b/packages/hoppscotch-common/src/components/lenses/renderers/JSONLensRenderer.vue index f9ae2f42a..91f2d8db4 100644 --- a/packages/hoppscotch-common/src/components/lenses/renderers/JSONLensRenderer.vue +++ b/packages/hoppscotch-common/src/components/lenses/renderers/JSONLensRenderer.vue @@ -307,8 +307,8 @@ const jsonResponseBodyText = computed(() => { () => JSONPath({ path: filterQueryText.value, - json: parsedJSON, - }) as undefined, + json: parsedJSON as any, + }), (err): BodyParseError => ({ type: "JSON_PATH_QUERY_FAILED", error: err as Error, diff --git a/packages/hoppscotch-common/src/composables/codemirror.ts b/packages/hoppscotch-common/src/composables/codemirror.ts index a2a4d25e2..c2005f027 100644 --- a/packages/hoppscotch-common/src/composables/codemirror.ts +++ b/packages/hoppscotch-common/src/composables/codemirror.ts @@ -297,19 +297,12 @@ export function useCodemirror( options.onUpdate(update) } - if (update.selectionSet) { - const cursorPos = update.state.selection.main.head - const line = update.state.doc.lineAt(cursorPos) + const cursorPos = update.state.selection.main.head + const line = update.state.doc.lineAt(cursorPos) - cachedCursor.value = { - line: line.number - 1, - ch: cursorPos - line.from, - } - - cursor.value = { - line: cachedCursor.value.line, - ch: cachedCursor.value.ch, - } + cachedCursor.value = { + line: line.number - 1, + ch: cursorPos - line.from, } cursor.value = {