FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix a crash when nesting a ProxyViewContainer in FlexboxLayout. by hdeshev · Pull Request #3685 · NativeScript/NativeScript · GitHub

/ NativeScript Public

Fix a crash when nesting a ProxyViewContainer in FlexboxLayout. #3685

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
hdeshev merged 1 commit into from
Feb 23, 2017
Conversation 1 Commits 1 Checks 0 Files changed
Merged

Fix a crash when nesting a ProxyViewContainer in FlexboxLayout. #3685

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 .ts  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
14 changes: 14 additions & 0 deletions tests/app/ui/layouts/flexbox-layout-tests.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1911,6 +1911,20 @@ export const testWrap_childMargin_vertical = test(
}
);

let activity_flexbox_with_proxy_view_container = () => getViews(
`<FlexboxLayout id="flexbox">
<ProxyViewContainer></ProxyViewContainer>
</FlexboxLayout>`
);

export const testFlexboxLayout_does_not_crash_with_proxy_view_container = test(
activity_flexbox_with_proxy_view_container,
noop,
({root, flexbox}) => {
TKUnit.assert(flexbox.id === "flexbox", "FlexboxLayout actually there");
}
);

// Omit testEmptyChildren
// Omit testDivider_directionRow_verticalBeginning

Expand Down
42 changes: 33 additions & 9 deletions tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout.ios.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,28 @@ import makeMeasureSpec = layout.makeMeasureSpec;
import getMeasureSpecMode = layout.getMeasureSpecMode;
import getMeasureSpecSize = layout.getMeasureSpecSize;

// `eachLayoutChild` iterates over children, and we need more - indexed access.
// This class tries to accomodate that by collecting all children in an
// array no more than once per measure.
class MeasureContext {
private children: View[];

constructor(private owner: FlexboxLayout) {
this.children = [];
this.owner.eachLayoutChild((child) => {
this.children.push(child);
});
}

public get childrenCount(): number {
return this.children.length;
}

public childAt(index: number): View {
return this.children[index];
}
}

class FlexLine {

_left: number = Number.MAX_VALUE;
Expand Down Expand Up @@ -144,15 +166,17 @@ export class FlexboxLayout extends FlexboxLayoutBase {
private _orderCache: number[];
private _flexLines: FlexLine[] = [];
private _childrenFrozen: boolean[];
private measureContext: MeasureContext;

public onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void {
this.measureContext = new MeasureContext(this);
// Omit: super.onMeasure(widthMeasureSpec, heightMeasureSpec);

if (this._isOrderChangedFromLastMeasurement) {
this._reorderedIndices = this._createReorderedIndices();
}
if (!this._childrenFrozen || this._childrenFrozen.length < this.getChildrenCount()) {
this._childrenFrozen = new Array(this.getChildrenCount());
if (!this._childrenFrozen || this._childrenFrozen.length < this.measureContext.childrenCount) {
this._childrenFrozen = new Array(this.measureContext.childrenCount);
}

switch (this.flexDirection) {
Expand All @@ -177,13 +201,13 @@ export class FlexboxLayout extends FlexboxLayoutBase {
child = null;
} else {
let reorderedIndex = this._reorderedIndices[index];
child = this.getChildAt(reorderedIndex);
child = this.measureContext.childAt(reorderedIndex);
}
return child;
}

private _createReorderedIndices(): number[] {
let childCount = this.getChildrenCount();
let childCount = this.measureContext.childrenCount;
let orders = this._createOrders(childCount);
return this._sortOrdersIntoReorderedIndices(childCount, orders);
}
Expand All @@ -206,7 +230,7 @@ export class FlexboxLayout extends FlexboxLayoutBase {
private _createOrders(childCount: number): Order[] {
let orders: Order[] = [];
for (let i = 0; i < childCount; i++) {
let child = this.getChildAt(i);
let child = this.measureContext.childAt(i);
let order = new Order();
order.order = FlexboxLayout.getOrder(child);
order.index = i;
Expand All @@ -216,15 +240,15 @@ export class FlexboxLayout extends FlexboxLayoutBase {
}

private get _isOrderChangedFromLastMeasurement(): boolean {
let childCount = this.getChildrenCount();
let childCount = this.measureContext.childrenCount;
if (!this._orderCache) {
this._orderCache = [];
}
if (this._orderCache.length !== childCount) {
return true;
}
for (let i = 0; i < childCount; i++) {
let view = this.getChildAt(i);
let view = this.measureContext.childAt(i);
if (view === null) {
continue;
}
Expand All @@ -244,7 +268,7 @@ export class FlexboxLayout extends FlexboxLayoutBase {
this._flexLines.length = 0;

(() => {
let childCount = this.getChildrenCount();
let childCount = this.measureContext.childrenCount;
let paddingStart = FlexboxLayout.getPaddingStart(this);
let paddingEnd = FlexboxLayout.getPaddingEnd(this);
let largestHeightInRow = Number.MIN_VALUE;
Expand Down Expand Up @@ -359,7 +383,7 @@ export class FlexboxLayout extends FlexboxLayoutBase {

this._flexLines.length = 0;

let childCount = this.getChildrenCount();
let childCount = this.measureContext.childrenCount;
let paddingTop = this.effectivePaddingTop;
let paddingBottom = this.effectivePaddingBottom;
let largestWidthInColumn = Number.MIN_VALUE;
Expand Down
Back | FazBrowse Home | New Git URL