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

fix: patch to direction:rtl flipped the content. fixing logic instead #295

Merged
merged 3 commits into from
Jun 18, 2022
Merged

fix: patch to direction:rtl flipped the content. fixing logic instead #295

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af51464
fix: patch to direction:rtl flipped the content. fixing logic instead
Jun 7, 2022
21dd242
fix: when scrollbar not hidden - moveTo can exceed the maximum index
Jun 7, 2022
6a72bce
Revert "fix: when scrollbar not hidden - moveTo can exceed the maximu…
Jun 7, 2022
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
36 changes: 12 additions & 24 deletions projects/ngx-drag-scroll/src/lib/ngx-drag-scroll.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ import { DragScrollItemDirective } from './ngx-drag-scroll-item';
overflow: hidden;
display: block;
}
.rtl-compensation {
direction: ltr;
transform: scaleX(-1);
}
.drag-scroll-content {
height: 100%;
overflow: auto;
Expand Down Expand Up @@ -266,13 +262,7 @@ export class DragScrollComponent implements OnDestroy, AfterViewInit, OnChanges,
this.dsInitialized.emit();
this.adjustMarginToLastChild();

// after rtl compensation class is added this will reset to false so first time it's true - it sticks
if (!this.rtl) {
this.rtl = getComputedStyle(this._contentRef.nativeElement).getPropertyValue('direction') === 'rtl';
if (this.rtl) {
this._contentRef.nativeElement.classList.add('rtl-compensation')
}
}
this.rtl = getComputedStyle(this._contentRef.nativeElement).getPropertyValue('direction') === 'rtl';
}

ngAfterViewChecked() {
Expand Down Expand Up @@ -321,13 +311,8 @@ export class DragScrollComponent implements OnDestroy, AfterViewInit, OnChanges,
// Drag X
if (!this.xDisabled && !this.dragDisabled) {
const clientX = (event as MouseEvent).clientX;
if (this.rtl) {
this._contentRef.nativeElement.scrollLeft =
this._contentRef.nativeElement.scrollLeft + clientX - this.downX;
} else {
this._contentRef.nativeElement.scrollLeft =
this._contentRef.nativeElement.scrollLeft - clientX + this.downX;
}
this._contentRef.nativeElement.scrollLeft =
this._contentRef.nativeElement.scrollLeft - clientX + this.downX;
this.downX = clientX;
}

Expand Down Expand Up @@ -630,8 +615,9 @@ export class DragScrollComponent implements OnDestroy, AfterViewInit, OnChanges,
private scrollTo(element: Element, to: number, duration: number) {
const self = this;
self.isAnimating = true;
const rtlFactor = this.rtl ? -1 : 1;
const start = element.scrollLeft,
change = to - start - this.snapOffset,
change = (rtlFactor * to) - start - this.snapOffset,
increment = 20;
let currentTime = 0;

Expand Down Expand Up @@ -665,20 +651,22 @@ export class DragScrollComponent implements OnDestroy, AfterViewInit, OnChanges,
}

private locateCurrentIndex(snap?: boolean) {
const scrollLeft = Math.abs(this._contentRef.nativeElement.scrollLeft);

this.currentChildWidth((currentChildWidth, nextChildrenWidth, childrenWidth, idx: number, stop) => {
if (
(this._contentRef.nativeElement.scrollLeft >= childrenWidth &&
this._contentRef.nativeElement.scrollLeft <= nextChildrenWidth)
(scrollLeft >= childrenWidth &&
scrollLeft <= nextChildrenWidth)
) {
if (nextChildrenWidth - this._contentRef.nativeElement.scrollLeft > currentChildWidth / 2 && !this.isScrollReachesRightEnd()) {
if (nextChildrenWidth - scrollLeft > currentChildWidth / 2 && !this.isScrollReachesRightEnd()) {
// roll back scrolling
if (!this.isAnimating) {
this.currIndex = idx;
}
if (snap) {
this.scrollTo(this._contentRef.nativeElement, childrenWidth, this.snapDuration);
}
} else if (this._contentRef.nativeElement.scrollLeft !== 0) {
} else if (scrollLeft !== 0) {
// forward scrolling
if (!this.isAnimating) {
this.currIndex = idx + 1;
Expand Down Expand Up @@ -788,7 +776,7 @@ export class DragScrollComponent implements OnDestroy, AfterViewInit, OnChanges,
}

private isScrollReachesRightEnd(): boolean {
const scrollLeftPos = this._contentRef.nativeElement.scrollLeft + this._contentRef.nativeElement.offsetWidth;
const scrollLeftPos = Math.abs(this._contentRef.nativeElement.scrollLeft) + this._contentRef.nativeElement.offsetWidth;
return scrollLeftPos >= this._contentRef.nativeElement.scrollWidth;
}

Expand Down