fix offset padding

This commit is contained in:
Julien Calixte
2025-07-06 17:26:46 +02:00
parent df250750e5
commit 06ed2e4223
2 changed files with 36 additions and 28 deletions

View File

@@ -1,34 +1,42 @@
import { computed, onMounted, Ref, ref, toValue } from 'vue' import { computed, onMounted, Ref, ref, toValue } from "vue"
import { NOTE_WIDTH } from '@/constants/note-width' import { NOTE_WIDTH } from "@/constants/note-width"
import { useOverlay } from '@/hooks/useOverlay.hook' import { useOverlay } from "@/hooks/useOverlay.hook"
import { useRouteQueryStackedNotes } from '@/hooks/useRouteQueryStackedNotes.hook' import { useRouteQueryStackedNotes } from "@/hooks/useRouteQueryStackedNotes.hook"
const BOOKMARK_WIDTH = 2 const BOOKMARK_WIDTH = 2
const OFFSET = 24 // stacked-note padding
export const useNoteOverlay = ( export const useNoteOverlay = (
className: string, className: string,
index: Ref<number> | number index: Ref<number> | number,
) => { ) => {
const { x, y, isMobile } = useOverlay() const { x, y, isMobile } = useOverlay()
const noteHeight = ref(0) const noteHeight = ref(0)
// TODO: it seems to have a wrong offset,
// visible when there are a lot of notes.
const displayNoteOverlay = computed(() => { const displayNoteOverlay = computed(() => {
const valueIndex = toValue(index) const valueIndex = toValue(index)
if (valueIndex === 1) {
console.log(
valueIndex,
x.value > valueIndex * NOTE_WIDTH,
x.value,
valueIndex * NOTE_WIDTH,
)
}
if (isMobile.value) { if (isMobile.value) {
return y.value > valueIndex * noteHeight.value return y.value > valueIndex * noteHeight.value
} else { } else {
return x.value > valueIndex * NOTE_WIDTH return x.value > valueIndex * NOTE_WIDTH - valueIndex * OFFSET
} }
}) })
onMounted(() => { onMounted(() => {
const { stackedNotes } = useRouteQueryStackedNotes() const { stackedNotes } = useRouteQueryStackedNotes()
const noteElement = document.querySelector( const noteElement = document.querySelector(
`.${className}` `.${className}`,
) as HTMLElement | null ) as HTMLElement | null
if (!noteElement) { if (!noteElement) {
@@ -42,7 +50,7 @@ export const useNoteOverlay = (
noteElement.style.left = `${(toValue(index) + 1) * BOOKMARK_WIDTH}rem` noteElement.style.left = `${(toValue(index) + 1) * BOOKMARK_WIDTH}rem`
const stackedNoteContainers = document.querySelectorAll( const stackedNoteContainers = document.querySelectorAll(
'.stacked-note' ".stacked-note",
) as NodeListOf<HTMLElement> ) as NodeListOf<HTMLElement>
stackedNoteContainers.forEach((stackedNote, ind) => { stackedNoteContainers.forEach((stackedNote, ind) => {
@@ -54,6 +62,6 @@ export const useNoteOverlay = (
}) })
return { return {
displayNoteOverlay displayNoteOverlay,
} }
} }

View File

@@ -1,12 +1,12 @@
import { computed, onMounted, onUnmounted, watch } from 'vue' import { computed, onMounted, onUnmounted, watch } from "vue"
import { noteEventBus } from '@/bus/noteEventBus' import { noteEventBus } from "@/bus/noteEventBus"
import { NOTE_WIDTH } from '@/constants/note-width' import { NOTE_WIDTH } from "@/constants/note-width"
import { useOverlay } from '@/hooks/useOverlay.hook' import { useOverlay } from "@/hooks/useOverlay.hook"
import { useRouteQueryStackedNotes } from '@/hooks/useRouteQueryStackedNotes.hook' import { useRouteQueryStackedNotes } from "@/hooks/useRouteQueryStackedNotes.hook"
import { resolvePath } from '@/modules/repo/services/resolvePath' import { resolvePath } from "@/modules/repo/services/resolvePath"
import { useUserRepoStore } from '@/modules/repo/store/userRepo.store' import { useUserRepoStore } from "@/modules/repo/store/userRepo.store"
import { pathToNotePathTitle } from '@/utils/noteTitle' import { pathToNotePathTitle } from "@/utils/noteTitle"
export const useNoteView = (containerClass: string) => { export const useNoteView = (containerClass: string) => {
const store = useUserRepoStore() const store = useUserRepoStore()
@@ -18,34 +18,34 @@ export const useNoteView = (containerClass: string) => {
if (!note) { if (!note) {
return obj return obj
} }
const filePath = store.files.find((file) => file.sha === note)?.path ?? '' const filePath = store.files.find((file) => file.sha === note)?.path ?? ""
obj[note] = pathToNotePathTitle(filePath) obj[note] = pathToNotePathTitle(filePath)
return obj return obj
}, {}) }, {}),
) )
const unsubscribeLink = noteEventBus.addEventBusListener( const unsubscribeLink = noteEventBus.addEventBusListener(
({ path, currentNoteSHA }) => { ({ path, currentNoteSHA }) => {
const currentFile = store.files.find( const currentFile = store.files.find(
(file) => file.sha === currentNoteSHA (file) => file.sha === currentNoteSHA,
) )
const finalPath = resolvePath(currentFile?.path ?? '', path) const finalPath = resolvePath(currentFile?.path ?? "", path)
const file = store.files.find((file) => file.path === finalPath) const file = store.files.find((file) => file.path === finalPath)
if (!file?.sha) { if (!file?.sha) {
return return
} }
addStackedNote(currentNoteSHA ?? '', file.sha) addStackedNote(currentNoteSHA ?? "", file.sha)
} },
) )
const resizeContainer = () => { const resizeContainer = () => {
const container = document.querySelector( const container = document.querySelector(
`.${containerClass}` `.${containerClass}`,
) as HTMLElement | null ) as HTMLElement | null
if (!container) { if (!container) {
return return
@@ -68,10 +68,10 @@ export const useNoteView = (containerClass: string) => {
}) })
watch(stackedNotes, resizeContainer, { watch(stackedNotes, resizeContainer, {
immediate: true immediate: true,
}) })
return { return {
titles titles,
} }
} }