Skip to content

chore: cherry-pick community pr #7230 #7299

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.

Sign up for GitHub

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

Merged
manoldonev merged 1 commit into from
Jun 3, 2019
+8 −4
Merged

chore: cherry-pick community pr #7230 #7299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tns-core-modules/ui/layouts/grid-layout/grid-layout-common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export * from "../layout-base";

function validateArgs(element: View): View {
if (!element) {
throw new Error("element cannot be null or undefinied.");
throw new Error("element cannot be null or undefined.");
}
return element;
}
Expand Down Expand Up @@ -291,7 +291,7 @@ export class GridLayoutBase extends LayoutBase implements GridLayoutDefinition {
}

protected invalidate(): void {
// handled natively in android and overriden in ios.
// handled natively in android and overridden in ios.
}

set rows(value: string) {
Expand Down
4 changes: 4 additions & 0 deletions tns-core-modules/ui/layouts/grid-layout/grid-layout.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@ export class GridLayout extends GridLayoutBase {

this.eachLayoutChild((child, last) => {
let measureSpecs = this.map.get(child);
if (!measureSpecs) {
return;
}

this.updateMeasureSpecs(child, measureSpecs);
this.helper.addMeasureSpec(measureSpecs);
});
Expand Down
4 changes: 2 additions & 2 deletions tns-core-modules/ui/proxy-view-container/proxy-view-container.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,12 @@ export class ProxyViewContainer extends LayoutBase implements ProxyViewContainer
const oldLayout = <LayoutBase>oldParent;

if (addingToParent && newLayout instanceof LayoutBase) {
this.eachChildView((child) => {
this.eachLayoutChild((child) => {
newLayout._registerLayoutChild(child);
return true;
});
} else if (oldLayout instanceof LayoutBase) {
this.eachChildView((child) => {
this.eachLayoutChild((child) => {
oldLayout._unregisterLayoutChild(child);
return true;
});
Expand Down