Commit 3604df8
File tree
- tns-core-modules/ui
- layouts/grid-layout
- proxy-view-container
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -5,7 +5,7 @@ export * from "../layout-base"; | |||
| 5 | 5 | ||
| 6 | 6 | function validateArgs(element: View): View { | |
| 7 | 7 | if (!element) { | |
| 8 | - throw new Error("element cannot be null or undefinied."); | ||
| 8 | + throw new Error("element cannot be null or undefined."); | ||
| 9 | 9 | } | |
| 10 | 10 | return element; | |
| 11 | 11 | } | |
@@ -291,7 +291,7 @@ export class GridLayoutBase extends LayoutBase implements GridLayoutDefinition { | |||
| 291 | 291 | } | |
| 292 | 292 | ||
| 293 | 293 | protected invalidate(): void { | |
| 294 | - // handled natively in android and overriden in ios. | ||
| 294 | + // handled natively in android and overridden in ios. | ||
| 295 | 295 | } | |
| 296 | 296 | ||
| 297 | 297 | set rows(value: string) { | |
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -136,6 +136,10 @@ export class GridLayout extends GridLayoutBase { | |||
| 136 | 136 | ||
| 137 | 137 | this.eachLayoutChild((child, last) => { | |
| 138 | 138 | let measureSpecs = this.map.get(child); | |
| 139 | + if (!measureSpecs) { | ||
| 140 | + return; | ||
| 141 | + } | ||
| 142 | + | ||
| 139 | 143 | this.updateMeasureSpecs(child, measureSpecs); | |
| 140 | 144 | this.helper.addMeasureSpec(measureSpecs); | |
| 141 | 145 | }); | |
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -131,12 +131,12 @@ export class ProxyViewContainer extends LayoutBase implements ProxyViewContainer | |||
| 131 | 131 | const oldLayout = <LayoutBase>oldParent; | |
| 132 | 132 | ||
| 133 | 133 | if (addingToParent && newLayout instanceof LayoutBase) { | |
| 134 | - this.eachChildView((child) => { | ||
| 134 | + this.eachLayoutChild((child) => { | ||
| 135 | 135 | newLayout._registerLayoutChild(child); | |
| 136 | 136 | return true; | |
| 137 | 137 | }); | |
| 138 | 138 | } else if (oldLayout instanceof LayoutBase) { | |
| 139 | - this.eachChildView((child) => { | ||
| 139 | + this.eachLayoutChild((child) => { | ||
| 140 | 140 | oldLayout._unregisterLayoutChild(child); | |
| 141 | 141 | return true; | |
| 142 | 142 | }); | |
0 commit comments