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.

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(grid): Fix calculate height when initially grid has no data #3950 #3970

Merged
merged 7 commits into from
Feb 28, 2019

Conversation

mpavlinov
Copy link
Contributor

Closes #3950 #3949

Additional information (check all that apply):

  • Bug fix
  • New functionality
  • Documentation
  • Demos
  • CI/CD

Checklist:

  • All relevant tags have been applied to this PR
  • This PR includes unit tests covering all the new code
  • This PR includes API docs for newly added methods/properties
  • This PR includes feature/README.MD updates for the feature docs
  • This PR includes general feature table updates in the root README.MD
  • This PR includes CHANGELOG.MD updates for newly added functionality
  • This PR contains breaking changes
  • This PR includes ng update migrations for the breaking changes
  • This PR includes behavioral changes and the feature specification has been updated with them

MayaKirova
MayaKirova previously approved these changes Feb 21, 2019
dkamburov
dkamburov previously approved these changes Feb 21, 2019
@mpavlinov mpavlinov dismissed stale reviews from dkamburov and MayaKirova via d9a7d9c February 24, 2019 19:30
@MayaKirova MayaKirova added 💥 status: in-test PRs currently being tested ✅ status: verified Applies to PRs that have passed manual verification and removed ❌ status: awaiting-test PRs awaiting manual verification 💥 status: in-test PRs currently being tested labels Feb 25, 2019
@@ -3413,7 +3413,7 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
* Sets this._height
*/
protected _derivePossibleHeight() {
if ((this._height && this._height.indexOf('%') === -1) || !this._height || !this.isAttachedToDom) {
if ((this._height && this._height.indexOf('%') === -1) || !this._height || !this.isAttachedToDom || this.rowBasedHeight === 0) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check seems to be getting out of control. Consider refactoring it in a method, or simplifying it.

@kdinev kdinev merged commit 2dc45dd into 6.2.x Feb 28, 2019
@kdinev kdinev deleted the mpavlov/issue-3950-62x branch February 28, 2019 08:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
grid: general version: 6.2.x ✅ status: verified Applies to PRs that have passed manual verification
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants