javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Register ProxyViewContainer children with parent layout.

Browse Source 
- Fixes a crash when used in a GridLayout on iOS since the layout needs to be
notified of any layout children changes.
- Adds a _parentChanged hook for all views.
This commit is contained in:
Hristo Deshev
2016-01-28 18:27:31 +02:00
parent e6da4f3377
commit 698345f171
7 changed files with 114 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
apps/tests/ui/proxy-view-container/proxy-view-container-tests.ts
View File

@@ -6,7 +6,7 @@ import color = require("color");
import platform = require("platform");
import {ProxyViewContainer} from "ui/proxy-view-container";
import {View, Button, StackLayout} from "ui";
import {View, Button, LayoutBase, StackLayout, GridLayout} from "ui";
export function test_add_children_to_attached_proxy() {
var outer = new StackLayout();
@@ -27,6 +27,34 @@ export function test_add_children_to_attached_proxy() {
helper.buildUIAndRunTest(outer, testAction);
}
export function test_children_immediately_registered_in_parent_grid_layout() {
var outer = new GridLayout();
var proxy = new ProxyViewContainer();
function testAction(views: Array<viewModule.View>) {
outer.addChild(proxy);
proxy.addChild(createBtn("1"));
assertNativeChildren(outer, ["1"]);
};
helper.buildUIAndRunTest(outer, testAction);
}
export function test_children_registered_in_parent_grid_layout_on_attach() {
var outer = new GridLayout();
var proxy = new ProxyViewContainer();
function testAction(views: Array<viewModule.View>) {
proxy.addChild(createBtn("1"));
outer.addChild(proxy);
assertNativeChildren(outer, ["1"]);
};
helper.buildUIAndRunTest(outer, testAction);
}
export function test_add_children_to_detached_proxy() {
var outer = new StackLayout();
var proxy = new ProxyViewContainer();
@@ -139,16 +167,16 @@ function createBtn(text: string): Button {
return b;
}
function assertNativeChildren(stack: StackLayout, arr: Array<string>) {
if (stack.android) {
let android: org.nativescript.widgets.StackLayout = stack.android;
function assertNativeChildren(layout: LayoutBase, arr: Array<string>) {
if (layout.android) {
let android: org.nativescript.widgets.LayoutBase = layout.android;
TKUnit.assertEqual(android.getChildCount(), arr.length, "Native children");
for (let i = 0; i < arr.length; i++) {
let nativeBtn = <android.widget.Button>android.getChildAt(i);
TKUnit.assertEqual(nativeBtn.getText(), arr[i]);
}
} else if (stack.ios) {
let ios: UIView = stack.ios;
} else if (layout.ios) {
let ios: UIView = layout.ios;
TKUnit.assertEqual(ios.subviews.count, arr.length, "Native children");
for (let i = 0; i < arr.length; i++) {
let nativeBtn = <UIButton>ios.subviews[i];