javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

5620 GridLayout addChild to set row and column (#6411)

Browse Source
This commit is contained in:
Rakesh Girase
2018-10-19 13:20:41 +01:00
committed by Alexander Vakrilov
parent 4407af7dd6
commit a3f149325f
3 changed files with 132 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
tests/app/ui/layouts/grid-layout-tests.ts
View File

@ -183,6 +183,121 @@ export class GridLayoutTest extends testModule.UITest<RemovalTrackingGridLayout>
GridLayout.setColumnSpan(new Button(), 0);
}
public test_addChildAtCell_with_all_params() {
let btn = new Button();
let row: number = 1;
let column: number = 2;
let rowSpan: number = 3;
let columnSpan: number = 4;
this.testView.addChildAtCell(btn, row, column, rowSpan, columnSpan);
TKUnit.assertEqual(
this.row(btn),
row,
"'row' property not applied For GridLayout addChildAtCell."
);
TKUnit.assertEqual(
this.col(btn),
column,
"'column' property not applied For GridLayout addChildAtCell."
);
TKUnit.assertEqual(
this.rowSpan(btn),
rowSpan,
"'rowSpan' property not applied For GridLayout addChildAtCell."
);
TKUnit.assertEqual(
this.colSpan(btn),
columnSpan,
"'columnSpan' property not applied For GridLayout addChildAtCell."
);
}
public test_addChildAtCell_without_optional_params() {
let btn = new Button();
let row: number = 1;
let column: number = 2;
let defaultSpanValue: number = 1;
this.testView.addChildAtCell(btn, row, column);
TKUnit.assertEqual(
this.row(btn),
row,
"'row' property not applied For GridLayout addChildAtCell."
);
TKUnit.assertEqual(
this.col(btn),
column,
"'column' property not applied For GridLayout addChildAtCell."
);
TKUnit.assertEqual(
this.rowSpan(btn),
defaultSpanValue,
"'rowSpan' property not applied For GridLayout addChildAtCell without optional params."
);
TKUnit.assertEqual(
this.colSpan(btn),
defaultSpanValue,
"'colSpan' property not applied For GridLayout addChildAtCell without optional params."
);
}
public test_addChildAtCell_without_rowSpan() {
let btn = new Button();
let row: number = 1;
let column: number = 2;
let columnSpan: number = 2;
let defaultSpanValue: number = 1;
this.testView.addChildAtCell(btn, row, column, undefined, columnSpan);
TKUnit.assertEqual(
this.row(btn),
row,
"'row' property not applied For GridLayout addChildAtCell without rowspan."
);
TKUnit.assertEqual(
this.col(btn),
column,
"'column' property not applied For GridLayout addChildAtCell without rowspan."
);
TKUnit.assertEqual(
this.rowSpan(btn),
defaultSpanValue,
"'rowSpan' property not applied For GridLayout addChildAtCell without rowspan."
);
TKUnit.assertEqual(
this.colSpan(btn),
columnSpan,
"'columnSpan' property not applied For GridLayout addChildAtCell without rowspan."
);
}
public test_addChildAtCell_without_columnSpan() {
let btn = new Button();
let row: number = 1;
let column: number = 2;
let rowSpan: number = 2;
let defaultSpanValue: number = 1;
this.testView.addChildAtCell(btn, row, column, rowSpan);
TKUnit.assertEqual(
this.row(btn),
row,
"'row' property not applied For GridLayout addChildAtCell without columnSpan."
);
TKUnit.assertEqual(
this.col(btn),
column,
"'column' property not applied For GridLayout addChildAtCell without columnSpan."
);
TKUnit.assertEqual(
this.rowSpan(btn),
rowSpan,
"'rowSpan' property not applied For GridLayout addChildAtCell without columnSpan."
);
TKUnit.assertEqual(
this.colSpan(btn),
defaultSpanValue,
"'columnSpan' property not applied For GridLayout addChildAtCell without columnSpan."
);
}
public test_addRow_shouldThrow_onNullValues() {
TKUnit.assertThrows(() => {
this.testView.addRow(null);

12
tns-core-modules/ui/layouts/grid-layout/grid-layout-common.ts
View File

@ -178,6 +178,18 @@ export class GridLayoutBase extends LayoutBase implements GridLayoutDefinition {
this.invalidate();
}
public addChildAtCell(view: View, row: number, column: number, rowSpan?: number, columnSpan?: number): void {
this.addChild(view);
GridLayoutBase.setRow(view, row);
GridLayoutBase.setColumn(view, column);
if (rowSpan) {
GridLayoutBase.setRowSpan(view, rowSpan);
}
if (columnSpan) {
GridLayoutBase.setColumnSpan(view, columnSpan);
}
}
public removeRow(itemSpec: ItemSpec): void {
if (!itemSpec) {
throw new Error("Value is null.");

5
tns-core-modules/ui/layouts/grid-layout/grid-layout.d.ts vendored
View File

@ -101,6 +101,11 @@ export class GridLayout extends LayoutBase {
*/
public addRow(itemSpec: ItemSpec): void;
/**
* Adds a child at specific cell in GridLayout. Optional rowSpan and columnSpan attributes
*/
public addChildAtCell(view: View, row: number, column: number, rowSpan?: number, columnSpan?: number): void;
/**
* Removes a column specification from a GridLayout.
*/