Skip to content
This repository was archived by the owner on Jun 22, 2020. It is now read-only.

Commit bec30ed

Browse files
committed
fix: correct open context item
1 parent be81bda commit bec30ed

File tree

6 files changed

+32
-3
lines changed

6 files changed

+32
-3
lines changed

projects/table-builder/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@angular-ru/ng-table-builder",
3-
"version": "0.34.0",
3+
"version": "0.35.0",
44
"license": "MIT",
55
"bugs": {
66
"url": "https://github.com/Angular-RU/ng-table-builder/issues"

projects/table-builder/src/lib/table/components/ngx-context-menu/ngx-context-menu-item/ngx-context-menu-item.component.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {
44
Component,
55
ElementRef,
66
EventEmitter,
7+
HostListener,
78
Injector,
89
Input,
910
NgZone,
@@ -66,6 +67,13 @@ export class NgxContextMenuItemComponent implements OnInit, OnDestroy {
6667
return (this.itemRef && this.itemRef.nativeElement) || {};
6768
}
6869

70+
@HostListener('mouseenter')
71+
public mouseover(): void {
72+
if (this.state.opened) {
73+
detectChanges(this.cd);
74+
}
75+
}
76+
6977
public ngOnInit(): void {
7078
this.subscription = this.contextMenu.events.subscribe((): void => detectChanges(this.cd));
7179
}

projects/table-builder/src/lib/table/table-builder.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
class="table-grid__root"
1313
[style.height.px]="height"
1414
[sourceRef]="sourceRef"
15+
[class.table-grid__no-visible]="!sourceRef.length"
1516
[class.table-grid__root--is-rendered]="isRendered"
1617
[class.table-grid__root-auto-height]="autoHeightDetect"
1718
[class.table-grid__no-display]="!(columnSchema.length > 0)"

projects/table-builder/src/lib/table/table-builder.component.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,3 +103,7 @@
103103
// for correct work mutation observer
104104
opacity: 0.012 !important;
105105
}
106+
107+
.table-grid__no-visible {
108+
display: none !important;
109+
}

projects/table-builder/src/lib/table/table-builder.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ export class TableBuilderComponent extends TableBuilderApiImpl
472472
this.viewPortInfo.isScrolling = false;
473473
detectChanges(this.cd);
474474
window.requestAnimationFrame((): void => this.app.tick());
475-
}, TIME_RELOAD);
475+
}, MACRO_TIME);
476476
}
477477

478478
private getOffsetVisibleEndIndex(): number {

src/app/samples/sample-eleven/sample-eleven.component.html

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
</mat-toolbar>
44

55
<div class="night">
6-
<div class="column" *ngIf="licences.length" [@fadeAnimation]>
6+
<div class="column" *ngIf="licences.length">
77
<mat-tab-group (selectedTabChange)="update()">
88
<mat-tab label="Custom context menu">
99
<div class="column-samples">
@@ -62,6 +62,22 @@
6262
<ngx-menu-content>Export Excel</ngx-menu-content>
6363
</ngx-context-menu-item>
6464

65+
<ngx-context-menu-item>
66+
<ngx-menu-content icon></ngx-menu-content>
67+
<ngx-menu-content>Column list</ngx-menu-content>
68+
69+
<ngx-context-menu-item
70+
*ngFor="let column of table1.columnSchema"
71+
(onClick)="table1.toggleColumnVisibility(column.key); $event.preventDefault()"
72+
[visible]="column.isModel"
73+
>
74+
<ngx-menu-content no-margin>{{ column.key }}</ngx-menu-content>
75+
<ngx-menu-content no-margin align-center>
76+
<mat-checkbox color="primary" [checked]="column.isVisible"></mat-checkbox>
77+
</ngx-menu-content>
78+
</ngx-context-menu-item>
79+
</ngx-context-menu-item>
80+
6581
<ngx-context-menu-item
6682
#item
6783
divider

0 commit comments

Comments
 (0)