Fix resizer on left panel
This commit is contained in:
parent
290ab894aa
commit
a5c005756e
6 changed files with 47 additions and 28 deletions
|
@ -40,8 +40,8 @@ class CollapseItem extends ResizeItem<ICollapseConfig> {
|
|||
}
|
||||
|
||||
export default class CollapseDistributor extends FixedDistributor<ICollapseConfig, CollapseItem> {
|
||||
static createItem(resizeHandle: HTMLDivElement, resizer: Resizer<ICollapseConfig>, sizer: Sizer) {
|
||||
return new CollapseItem(resizeHandle, resizer, sizer);
|
||||
static createItem(resizeHandle: HTMLDivElement, resizer: Resizer<ICollapseConfig>, sizer: Sizer, container?: HTMLElement): CollapseItem {
|
||||
return new CollapseItem(resizeHandle, resizer, sizer, container);
|
||||
}
|
||||
|
||||
private readonly toggleSize: number;
|
||||
|
@ -55,12 +55,9 @@ export default class CollapseDistributor extends FixedDistributor<ICollapseConfi
|
|||
|
||||
public resize(newSize: number) {
|
||||
const isCollapsedSize = newSize < this.toggleSize;
|
||||
if (isCollapsedSize && !this.isCollapsed) {
|
||||
this.isCollapsed = true;
|
||||
this.item.notifyCollapsed(true);
|
||||
} else if (!isCollapsedSize && this.isCollapsed) {
|
||||
this.item.notifyCollapsed(false);
|
||||
this.isCollapsed = false;
|
||||
if (isCollapsedSize !== this.isCollapsed) {
|
||||
this.isCollapsed = isCollapsedSize;
|
||||
this.item.notifyCollapsed(isCollapsedSize);
|
||||
}
|
||||
if (!isCollapsedSize) {
|
||||
super.resize(newSize);
|
||||
|
|
|
@ -26,15 +26,20 @@ export default class ResizeItem<C extends IConfig = IConfig> {
|
|||
handle: HTMLElement,
|
||||
public readonly resizer: Resizer<C>,
|
||||
public readonly sizer: Sizer,
|
||||
public readonly container?: HTMLElement,
|
||||
) {
|
||||
this.reverse = resizer.isReverseResizeHandle(handle);
|
||||
this.domNode = <HTMLElement>(this.reverse ? handle.nextElementSibling : handle.previousElementSibling);
|
||||
if (container) {
|
||||
this.domNode = <HTMLElement>(container);
|
||||
} else {
|
||||
this.domNode = <HTMLElement>(this.reverse ? handle.nextElementSibling : handle.previousElementSibling);
|
||||
}
|
||||
this.id = handle.getAttribute("data-id");
|
||||
}
|
||||
|
||||
private copyWith(handle: HTMLElement, resizer: Resizer, sizer: Sizer) {
|
||||
private copyWith(handle: HTMLElement, resizer: Resizer, sizer: Sizer, container?: HTMLElement) {
|
||||
const Ctor = this.constructor as typeof ResizeItem;
|
||||
return new Ctor(handle, resizer, sizer);
|
||||
return new Ctor(handle, resizer, sizer, container);
|
||||
}
|
||||
|
||||
private advance(forwards: boolean) {
|
||||
|
|
|
@ -35,6 +35,7 @@ export interface IConfig {
|
|||
onResizeStart?(): void;
|
||||
onResizeStop?(): void;
|
||||
onResized?(size: number, id: string, element: HTMLElement): void;
|
||||
handler?: HTMLDivElement;
|
||||
}
|
||||
|
||||
export default class Resizer<C extends IConfig = IConfig> {
|
||||
|
@ -46,7 +47,7 @@ export default class Resizer<C extends IConfig = IConfig> {
|
|||
public container: HTMLElement,
|
||||
private readonly distributorCtor: {
|
||||
new(item: ResizeItem): FixedDistributor<C, any>;
|
||||
createItem(resizeHandle: HTMLDivElement, resizer: Resizer, sizer: Sizer): ResizeItem;
|
||||
createItem(resizeHandle: HTMLDivElement, resizer: Resizer, sizer: Sizer, container: HTMLElement): ResizeItem;
|
||||
createSizer(containerElement: HTMLElement, vertical: boolean, reverse: boolean): Sizer;
|
||||
},
|
||||
public readonly config?: C,
|
||||
|
@ -68,12 +69,14 @@ export default class Resizer<C extends IConfig = IConfig> {
|
|||
}
|
||||
|
||||
public attach() {
|
||||
this.container.addEventListener("mousedown", this.onMouseDown, false);
|
||||
const attachment = this?.config?.handler.parentElement ?? this.container;
|
||||
attachment.addEventListener("mousedown", this.onMouseDown, false);
|
||||
window.addEventListener("resize", this.onResize);
|
||||
}
|
||||
|
||||
public detach() {
|
||||
this.container.removeEventListener("mousedown", this.onMouseDown, false);
|
||||
const attachment = this?.config?.handler.parentElement ?? this.container;
|
||||
attachment.removeEventListener("mousedown", this.onMouseDown, false);
|
||||
window.removeEventListener("resize", this.onResize);
|
||||
}
|
||||
|
||||
|
@ -113,7 +116,8 @@ export default class Resizer<C extends IConfig = IConfig> {
|
|||
// use closest in case the resize handle contains
|
||||
// child dom nodes that can be the target
|
||||
const resizeHandle = event.target && (<HTMLDivElement>event.target).closest(`.${this.classNames.handle}`);
|
||||
if (!resizeHandle || resizeHandle.parentElement !== this.container) {
|
||||
const hasHandler = this?.config?.handler;
|
||||
if (!resizeHandle || (!hasHandler && resizeHandle.parentElement !== this.container)) {
|
||||
return;
|
||||
}
|
||||
// prevent starting a drag operation
|
||||
|
@ -175,12 +179,15 @@ export default class Resizer<C extends IConfig = IConfig> {
|
|||
const reverse = this.isReverseResizeHandle(resizeHandle);
|
||||
const Distributor = this.distributorCtor;
|
||||
const sizer = Distributor.createSizer(this.container, vertical, reverse);
|
||||
const item = Distributor.createItem(resizeHandle, this, sizer);
|
||||
const item = Distributor.createItem(resizeHandle, this, sizer, this.container);
|
||||
const distributor = new Distributor(item);
|
||||
return { sizer, distributor };
|
||||
}
|
||||
|
||||
private getResizeHandles() {
|
||||
if (this?.config?.handler) {
|
||||
return [this.config.handler];
|
||||
}
|
||||
if (!this.container.children) return [];
|
||||
return Array.from(this.container.querySelectorAll(`.${this.classNames.handle}`)) as HTMLElement[];
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue