Skip to content

fix: merge and simplify redundant 'findSlot' func #119

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

Open
Marco-Pagani wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: merge and simplify redundant 'findSlot' func #119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 4 additions & 33 deletions src/vue-horizontal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,37 +116,8 @@ export default Vue.extend({
const container = this.$refs.container as Element
return container.children
},
findPrevSlot(x: number): Element | undefined {
const children = this.children()

for (let i = 0; i < children.length; i++) {
const rect = children[i].getBoundingClientRect()

if (rect.left <= x && x <= rect.right) {
return children[i]
}

if (x <= rect.left) {
return children[i]
}
}
},
findNextSlot(x: number): Element | undefined {
const children = this.children()

for (let i = 0; i < children.length; i++) {
const rect = children[i].getBoundingClientRect()

if (rect.right <= x) {
continue;
} else if (rect.left <= x) {
return children[i];
}

if (x <= rect.left) {
return children[i];
}
}
findTargetSlot(targetPos: number): Element | undefined {
return [...this.children()].find((element) => targetPos <= element.getBoundingClientRect().right)
},
/**
* Toggle and scroll to the previous set of horizontal content.
Expand All @@ -157,7 +128,7 @@ export default Vue.extend({
const container = this.$refs.container as Element
const left = container.getBoundingClientRect().left
const x = left + (container.clientWidth * -this.displacement) - delta
const element = this.findPrevSlot(x)
const element = this.findTargetSlot(x)

if (element) {
const width = element.getBoundingClientRect().left - left
Expand All @@ -177,7 +148,7 @@ export default Vue.extend({
const container = this.$refs.container as Element
const left = container.getBoundingClientRect().left
const x = left + (container.clientWidth * this.displacement) + delta
const element = this.findNextSlot(x)
const element = this.findTargetSlot(x)

if (element) {
const width = element.getBoundingClientRect().left - left
Expand Down