Skip to content

Commit d5ed8e5

Browse files
fixed resize bar heigh
1 parent 85fcfc3 commit d5ed8e5

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@synapsium/ngx-scrollbar",
3-
"version": "1.0.1",
3+
"version": "1.0.2",
44
"description": "Angular wrapper library for beautiful charts based on Chartjs",
55
"author": "https://github.com/synapsium/ngx-scrollbar/graphs/contributors",
66
"license": "MIT",

src/lib/scrollbar.directive.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ export class ScrollbarDirective implements AfterViewInit, OnDestroy, OnChanges {
209209
horizontalTrackbar.thickness = this._calcThicknessBar(Axis.X);
210210
horizontalTrackbar.bar = new Bar();
211211
horizontalTrackbar.bar.element = this._horizontalBarElement;
212-
horizontalTrackbar.bar.size = this._calcSizeBar(Axis.X);
212+
horizontalTrackbar.bar.size = this._calcSizeBar(Axis.X, horizontalTrackbar.thickness);
213213
horizontalTrackbar.bar.offset = this._calcPositionBar(Axis.X, horizontalTrackbar.bar.size);
214214
this._model.scrollbar.trackbars.push(horizontalTrackbar);
215215

@@ -219,7 +219,7 @@ export class ScrollbarDirective implements AfterViewInit, OnDestroy, OnChanges {
219219
verticalTrackbar.thickness = this._calcThicknessBar(Axis.Y);
220220
verticalTrackbar.bar = new Bar();
221221
verticalTrackbar.bar.element = this._verticalBarElement;
222-
verticalTrackbar.bar.size = this._calcSizeBar(Axis.Y);
222+
verticalTrackbar.bar.size = this._calcSizeBar(Axis.Y, verticalTrackbar.thickness);
223223
verticalTrackbar.bar.offset = this._calcPositionBar(Axis.Y, verticalTrackbar.bar.size);
224224
this._model.scrollbar.trackbars.push(verticalTrackbar);
225225
}
@@ -376,8 +376,8 @@ export class ScrollbarDirective implements AfterViewInit, OnDestroy, OnChanges {
376376
* @param offsetBottom - Bottom offset
377377
*/
378378
private _updateResizeContainerSize(offsetRight: number, offsetBottom: number): void {
379-
this._renderer.setStyle(this._resizeElement, 'height', `calc(100% - ${offsetBottom}px)`);
380-
this._renderer.setStyle(this._resizeElement, 'width', `calc(100% - ${offsetRight}px)`);
379+
this._renderer.setStyle(this._resizeElement, 'min-height', `calc(100% - ${offsetBottom}px)`);
380+
this._renderer.setStyle(this._resizeElement, 'min-width', `calc(100% - ${offsetRight}px)`);
381381
}
382382

383383
/**
@@ -399,8 +399,8 @@ export class ScrollbarDirective implements AfterViewInit, OnDestroy, OnChanges {
399399
* @param offsetBottom - Bottom offset
400400
*/
401401
private _hideNativeScrollbar(offsetRight: number, offsetBottom: number): void {
402-
this._renderer.setStyle(this._offsetElement, 'right', `-${offsetRight}px`);
403-
this._renderer.setStyle(this._offsetElement, 'bottom', `-${offsetBottom}px`);
402+
this._renderer.setStyle(this._offsetElement, 'right', `-${offsetRight + 1}px`);
403+
this._renderer.setStyle(this._offsetElement, 'bottom', `-${offsetBottom + 1}px`);
404404
}
405405

406406
/**
@@ -448,15 +448,15 @@ export class ScrollbarDirective implements AfterViewInit, OnDestroy, OnChanges {
448448
* @param axis - X for horizontal, Y for vertical
449449
* @returns size.
450450
*/
451-
private _calcSizeBar(axis: Axis): number {
452-
const contentSize = axis === Axis.X ? (<any>this._contentElement).scrollWidth : (<any>this._contentElement).scrollHeight;
451+
private _calcSizeBar(axis: Axis, offset: number): number {
452+
const contentSize = axis === Axis.X ? (<any>this._contentElement).scrollWidth - offset : (<any>this._contentElement).scrollHeight - offset;
453453
const hostSize = axis === Axis.X ? (<any>this._element.nativeElement).clientWidth : (<any>this._element.nativeElement).clientHeight;
454454

455455
if (hostSize + 1 >= contentSize || contentSize === 0) {
456456
return 0;
457457
}
458458

459-
const sizeBar = ~~((hostSize * hostSize) / contentSize);
459+
const sizeBar = ~~((hostSize * hostSize) / (contentSize + offset));
460460

461461
if (this._config.barMaxSize > 0 && sizeBar > this._config.barMaxSize) {
462462
return this._config.barMaxSize;
@@ -477,11 +477,11 @@ export class ScrollbarDirective implements AfterViewInit, OnDestroy, OnChanges {
477477
this._contentElement['offsetHeight'] - this._contentElement['clientHeight'];
478478

479479
if (thickness > this._config.trackbarMaxThickness) {
480-
return this._config.trackbarMaxThickness + 1;
480+
return this._config.trackbarMaxThickness;
481481
} else if (thickness < this._config.trackbarMinThickness) {
482-
return this._config.trackbarMinThickness + 1;
482+
return this._config.trackbarMinThickness;
483483
} else {
484-
return thickness + 1;
484+
return thickness;
485485
}
486486
}
487487

0 commit comments

Comments
 (0)