javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-14 01:43:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): ignore inserting child if < 0 (#10690)

Browse Source
This commit is contained in:
Nathan Walker
2025-02-05 09:59:30 -08:00
committed by GitHub
parent 3a7206fc3b
commit 2305511187
4 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/core/ui/layouts/layout-base-common.ts
View File

@ -49,14 +49,14 @@ export class LayoutBaseCommon extends CustomLayoutView implements LayoutBaseDefi
this._registerLayoutChild(child);
}
public insertChild(child: View, atIndex: number): void {
if (atIndex < 0) {
throw new Error('Cannot insert a child to a negative index.');
public insertChild(child: View, atIndex: number): boolean {
if (atIndex > -1) {
this._subViews.splice(atIndex, 0, child);
this._addView(child, atIndex);
this._registerLayoutChild(child);
return true;
}
this._subViews.splice(atIndex, 0, child);
this._addView(child, atIndex);
this._registerLayoutChild(child);
return false;
}
public removeChild(child: View): void {

2
packages/core/ui/layouts/layout-base.d.ts vendored
View File

@ -34,7 +34,7 @@ export class LayoutBase extends CustomLayoutView {
* @param view The view to be added to the end of the children array.
* @param atIndex The insertion index.
*/
insertChild(child: View, atIndex: number): void;
insertChild(child: View, atIndex: number): boolean;
/**
* Removes the specified view from the children array.

9
packages/core/ui/layouts/layout-base.ios.ts
View File

@ -11,9 +11,12 @@ export class LayoutBase extends LayoutBaseCommon {
this.requestLayout();
}
public insertChild(child: View, atIndex: number): void {
super.insertChild(child, atIndex);
this.requestLayout();
public insertChild(child: View, atIndex: number): boolean {
if (super.insertChild(child, atIndex)) {
this.requestLayout();
return true;
}
return false;
}
public removeChild(child: View): void {

27
packages/core/ui/layouts/root-layout/index.android.ts
View File

@ -8,20 +8,23 @@ import { LinearGradient } from '../../styling/linear-gradient';
export * from './root-layout-common';
export class RootLayout extends RootLayoutBase {
insertChild(view: View, atIndex: number): void {
super.insertChild(view, atIndex);
if (!view.hasGestureObservers()) {
// block tap events from going through to layers behind the view
if (view.nativeViewProtected) {
view.nativeViewProtected.setOnTouchListener(
new android.view.View.OnTouchListener({
onTouch: function (view, event) {
return true;
},
}),
);
insertChild(view: View, atIndex: number): boolean {
if (super.insertChild(view, atIndex)) {
if (!view.hasGestureObservers()) {
// block tap events from going through to layers behind the view
if (view.nativeViewProtected) {
view.nativeViewProtected.setOnTouchListener(
new android.view.View.OnTouchListener({
onTouch: function (view, event) {
return true;
},
}),
);
}
}
return true;
}
return false;
}
removeChild(view: View): void {
if (view.hasGestureObservers() && view.nativeViewProtected) {