-
Notifications
You must be signed in to change notification settings - Fork 159
fix(hgrid): add and use lifecycle placeholder for grid connection eve… #17230
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.
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
MayaKirova
wants to merge
3
commits into
master
Choose a base branch
from
mkirova/fix-17229
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,6 +38,7 @@ import { IgxPaginatorToken } from 'igniteui-angular/paginator'; | |
| import { IgxGridCellMergePipe, IgxGridComponent, IgxGridFilteringPipe, IgxGridSortingPipe, IgxGridUnmergeActivePipe } from 'igniteui-angular/grids/grid'; | ||
|
|
||
| let NEXT_ID = 0; | ||
| const HGRID_LIFECYCLE_PLACEHOLDER_TAG = 'igc-hgrid-lifecycle-placeholder'; | ||
|
|
||
| /** | ||
| * @hidden @internal | ||
|
|
@@ -662,6 +663,7 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti | |
| * @hidden | ||
| */ | ||
| public override ngOnInit() { | ||
| this.registerLifecyclePlaceholderElement(); | ||
| // this.expansionStatesChange.pipe(takeUntil(this.destroy$)).subscribe((value: Map<any, boolean>) => { | ||
| // const res = Array.from(value.entries()).filter(({1: v}) => v === true).map(([k]) => k); | ||
| // }); | ||
|
|
@@ -674,6 +676,26 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti | |
| super.ngOnInit(); | ||
| } | ||
|
|
||
| // Event that triggers when element gets connected back to the DOM. | ||
| // Used to determine when to reopen a previously closed row editing overlay. | ||
| protected onLifecyclePlaceholderConnected(): void { | ||
| if (this.rowEditable && this.crudService.rowInEditMode && this.rowEditingOverlay && | ||
| this.rowEditingOverlay.collapsed) { | ||
| // Row is in edit mode, but overlay is closed - reopen. | ||
| this.openRowOverlay(this.crudService.rowInEditMode.id); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| // Event that triggers when element gets disconnected from the DOM, for example as a result of virtualization or caching. | ||
| // Used to determine when to close the row editing overlay. | ||
| protected onLifecyclePlaceholderDisconnected(): void { | ||
| if (this.rowEditable && this.crudService.rowInEditMode && this.rowEditingOverlay) { | ||
| // disconnected from DOM (possibly cached) & row was in edit mode - close overlay. | ||
| this.closeRowEditingOverlay(); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @hidden | ||
| */ | ||
|
|
@@ -720,6 +742,24 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti | |
| this.parentIsland.showExpandAll : this.rootGrid.showExpandAll; | ||
| } | ||
|
|
||
| private registerLifecyclePlaceholderElement(): void { | ||
| if (!this.platform.isBrowser || typeof customElements === 'undefined' || customElements.get(HGRID_LIFECYCLE_PLACEHOLDER_TAG)) { | ||
| return; | ||
| } | ||
|
|
||
| class IgxHierarchicalGridLifecyclePlaceholderElement extends HTMLElement { | ||
| public connectedCallback(): void { | ||
| this.dispatchEvent(new CustomEvent('igcConnected', { bubbles: true, composed: true })); | ||
| } | ||
|
|
||
| public disconnectedCallback(): void { | ||
| this.dispatchEvent(new CustomEvent('igcDisconnected', { bubbles: true, composed: true })); | ||
| } | ||
| } | ||
|
|
||
| customElements.define(HGRID_LIFECYCLE_PLACEHOLDER_TAG, IgxHierarchicalGridLifecyclePlaceholderElement); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Also wouldn't mind this being shortened a bit (the name) and possibly be in a self contained file, but that's not critical |
||
| } | ||
|
|
||
| /** | ||
| * @hidden | ||
| */ | ||
|
|
@@ -1232,15 +1272,15 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti | |
| { | ||
| name: null, | ||
| fields: filterableFields.map(f => ({ | ||
| field: f.field, | ||
| dataType: f.dataType, | ||
| header: f.header, | ||
| editorOptions: f.editorOptions, | ||
| filters: f.filters, | ||
| pipeArgs: f.pipeArgs, | ||
| defaultTimeFormat: f.defaultTimeFormat, | ||
| defaultDateTimeFormat: f.defaultDateTimeFormat | ||
| })) as FieldType[] | ||
| field: f.field, | ||
| dataType: f.dataType, | ||
| header: f.header, | ||
| editorOptions: f.editorOptions, | ||
| filters: f.filters, | ||
| pipeArgs: f.pipeArgs, | ||
| defaultTimeFormat: f.defaultTimeFormat, | ||
| defaultDateTimeFormat: f.defaultDateTimeFormat | ||
| })) as FieldType[] | ||
| } | ||
| ]; | ||
|
|
||
|
|
@@ -1249,7 +1289,7 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti | |
| this.data[0][rowIsland.key][0] : null; | ||
| return acc.concat(this.generateChildEntity(rowIsland, childFirstRowData)); | ||
| } | ||
| , []); | ||
| , []); | ||
| } | ||
|
|
||
| return entities; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With this specific usage, I think the events don't need to bubble at all (and even less be composed)