Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: unusual behavior while scrolling through spotlight entries #3324

Merged
merged 3 commits into from
Sep 12, 2023
Merged

fix: unusual behavior while scrolling through spotlight entries #3324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c831de4
fix: spotlight scroll issue
anwarulislam Sep 6, 2023
6f38d43
fix: entry hidden issue
anwarulislam Sep 6, 2023
377616a
chore: back to loop mode
anwarulislam Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 7 additions & 5 deletions packages/hoppscotch-common/src/components/app/spotlight/Entry.vue
View file
Open in desktop
Expand Up @@ -80,11 +80,10 @@ const props = defineProps<{
active: boolean
}>()

const formattedShortcutKeys = computed(
() =>
props.entry.meta?.keyboardShortcut?.map((key) => {
return SPECIAL_KEY_CHARS[key] ?? capitalize(key)
})
const formattedShortcutKeys = computed(() =>
props.entry.meta?.keyboardShortcut?.map((key) => {
return SPECIAL_KEY_CHARS[key] ?? capitalize(key)
})
)

const emit = defineEmits<{
Expand Down Expand Up @@ -119,5 +118,8 @@ watch(
&.active {
@apply after:bg-accentLight;
}

scroll-padding: 4rem !important;
scroll-margin: 4rem !important;
}
</style>
20 changes: 19 additions & 1 deletion packages/hoppscotch-common/src/components/app/spotlight/index.vue
View file
Open in desktop
Expand Up @@ -40,7 +40,7 @@
:key="`result-${result.id}`"
:entry="result"
:active="isEqual(selectedEntry, [sectionIndex, entryIndex])"
@mouseover="selectedEntry = [sectionIndex, entryIndex]"
@mouseover="onMouseOver($event, sectionIndex, entryIndex)"
@action="runAction(sectionID, result)"
/>
</div>
Expand Down Expand Up @@ -178,6 +178,24 @@ function runAction(searcherID: string, result: SpotlightSearcherResult) {
emit("hide-modal")
}

let lastMousePosition: { x: number; y: number }

const onMouseOver = (
e: MouseEvent,
sectionIndex: number,
entryIndex: number
) => {
const mousePosition = {
x: e.clientX,
y: e.clientY,
}

// if the position is same, do nothing
if (isEqual(lastMousePosition, mousePosition)) return
selectedEntry.value = [sectionIndex, entryIndex]
lastMousePosition = mousePosition
}

function newUseArrowKeysForNavigation() {
const selectedEntry = ref<[number, number]>([0, 0]) // [sectionIndex, entryIndex]

Expand Down