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

fix(core): type collisions with namespace (#8809)

Browse Source
This commit is contained in:
Nathan Walker
2021-02-25 21:03:07 -08:00
parent 784e9c93cd
commit ab11dc9c9f
110 changed files with 1882 additions and 1827 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/ui/layouts/flexbox-layout/index.android.ts
View File

@@ -1,6 +1,6 @@
import { FlexDirection, FlexWrap, JustifyContent, AlignItems, AlignContent, FlexboxLayoutBase, orderProperty, Order, flexGrowProperty, FlexGrow, flexShrinkProperty, FlexShrink, flexWrapBeforeProperty, FlexWrapBefore, alignSelfProperty, AlignSelf, flexDirectionProperty, flexWrapProperty, justifyContentProperty, alignItemsProperty, alignContentProperty } from './flexbox-layout-common';
import { View } from '../../core/view';
import { Length, minHeightProperty, minWidthProperty } from '../../styling/style-properties';
import { Length, LengthType } from '../../styling/style-properties';
export * from './flexbox-layout-common';
@@ -149,7 +149,7 @@ export class FlexboxLayout extends FlexboxLayoutBase {
child.nativeViewProtected.setLayoutParams(lp);
}
public _setChildMinWidthNative(child: View, value: Length): void {
public _setChildMinWidthNative(child: View, value: LengthType): void {
// Check needed to maintain back-compat after https://github.com/NativeScript/NativeScript/pull/7804
if (!child._ignoreFlexMinWidthHeightReset) {
child._setMinWidthNative(0);
@@ -163,7 +163,7 @@ export class FlexboxLayout extends FlexboxLayoutBase {
}
}
public _setChildMinHeightNative(child: View, value: Length): void {
public _setChildMinHeightNative(child: View, value: LengthType): void {
// Check needed to maintain back-compat after https://github.com/NativeScript/NativeScript/pull/7804
if (!child._ignoreFlexMinWidthHeightReset) {
child._setMinHeightNative(0);