prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use new color or the color of the last overlap highlight when merging highlights

Browse source
This commit is contained in:
Hongbo Wu 2023-08-18 13:54:38 +08:00
parent ce480806c0
commit ec574d0ad9
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/api/src/resolvers/highlight/index.ts
View file

@ -148,6 +148,7 @@ export const mergeHighlightResolver = authorized<
/* Compute merged annotation form the order of highlights appearing on page */
const mergedAnnotations: string[] = []
const mergedLabels: Label[] = []
const mergedColors: string[] = []
const pageHighlights = page.highlights.filter((highlight) => {
// filter out highlights that are in the overlap list
// and are of type highlight (not annotation or note)
@ -168,10 +169,15 @@ export const mergeHighlightResolver = authorized<
}
})
}
// collect colors of overlap highlights
highlight.color && mergedColors.push(highlight.color)
return false
}
return true
})
// use new color or the color of the last overlap highlight
const color = newHighlightInput.color || mergedColors[mergedColors.length - 1]
try {
const highlight: HighlightData = {
...newHighlightInput,
@ -182,7 +188,7 @@ export const mergeHighlightResolver = authorized<
mergedAnnotations.length > 0 ? mergedAnnotations.join('\n') : null,
type: HighlightType.Highlight,
labels: mergedLabels,
color: newHighlightInput.color || pageHighlights[0].color, // use new color or the color of the first highlight
color,
}
const merged = await updatePage(