@nativescript/core 8.9.3-next-07-11-2025-16231435223 → 8.9.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +4 -2
- package/profiling/index.js +20 -18
- package/profiling/index.js.map +1 -1
- package/ui/action-bar/index.android.d.ts +1 -12
- package/ui/action-bar/index.ios.d.ts +1 -32
- package/ui/activity-indicator/index.android.d.ts +1 -13
- package/ui/activity-indicator/index.ios.d.ts +1 -12
- package/ui/button/index.android.d.ts +0 -21
- package/ui/button/index.ios.d.ts +0 -33
- package/ui/core/properties/index.d.ts +4 -4
- package/ui/core/properties/index.js.map +1 -1
- package/ui/core/view/index.android.d.ts +2 -84
- package/ui/core/view/index.android.js +0 -5
- package/ui/core/view/index.android.js.map +1 -1
- package/ui/core/view/index.ios.d.ts +3 -84
- package/ui/date-picker/index.android.d.ts +1 -15
- package/ui/date-picker/index.ios.d.ts +1 -30
- package/ui/editable-text-base/index.android.d.ts +1 -33
- package/ui/editable-text-base/index.ios.d.ts +1 -16
- package/ui/frame/frame-common.d.ts +0 -1
- package/ui/frame/frame-common.js +1 -4
- package/ui/frame/frame-common.js.map +1 -1
- package/ui/frame/frame-interfaces.d.ts +1 -4
- package/ui/frame/frame-stack.d.ts +0 -1
- package/ui/frame/frame-stack.js +0 -3
- package/ui/frame/frame-stack.js.map +1 -1
- package/ui/frame/index.d.ts +1 -8
- package/ui/frame/index.ios.d.ts +2 -0
- package/ui/frame/index.ios.js +35 -24
- package/ui/frame/index.ios.js.map +1 -1
- package/ui/gestures/index.ios.js.map +1 -1
- package/ui/html-view/index.android.d.ts +1 -28
- package/ui/html-view/index.ios.d.ts +1 -18
- package/ui/image/index.android.d.ts +1 -14
- package/ui/image/index.ios.d.ts +1 -10
- package/ui/image/index.ios.js +0 -1
- package/ui/image/index.ios.js.map +1 -1
- package/ui/label/index.android.d.ts +1 -3
- package/ui/label/index.ios.d.ts +1 -13
- package/ui/layouts/dock-layout/index.android.d.ts +1 -4
- package/ui/layouts/flexbox-layout/index.android.d.ts +1 -16
- package/ui/layouts/layout-base.android.d.ts +1 -20
- package/ui/layouts/layout-base.ios.d.ts +1 -6
- package/ui/layouts/root-layout/index.android.js +19 -30
- package/ui/layouts/root-layout/index.android.js.map +1 -1
- package/ui/layouts/stack-layout/index.android.d.ts +1 -2
- package/ui/layouts/wrap-layout/index.android.d.ts +1 -5
- package/ui/list-picker/index.android.d.ts +1 -12
- package/ui/list-picker/index.ios.d.ts +1 -12
- package/ui/list-view/index.android.d.ts +2 -18
- package/ui/list-view/index.ios.d.ts +2 -12
- package/ui/page/index.android.d.ts +1 -19
- package/ui/page/index.ios.d.ts +1 -6
- package/ui/page/index.ios.js +94 -61
- package/ui/page/index.ios.js.map +1 -1
- package/ui/progress/index.android.d.ts +1 -18
- package/ui/progress/index.ios.d.ts +1 -18
- package/ui/scroll-view/index.android.d.ts +1 -10
- package/ui/scroll-view/index.ios.d.ts +1 -7
- package/ui/search-bar/index.android.d.ts +1 -42
- package/ui/search-bar/index.android.js +0 -2
- package/ui/search-bar/index.android.js.map +1 -1
- package/ui/search-bar/index.ios.d.ts +1 -31
- package/ui/search-bar/index.ios.js +3 -4
- package/ui/search-bar/index.ios.js.map +1 -1
- package/ui/segmented-bar/index.android.d.ts +1 -31
- package/ui/segmented-bar/index.ios.d.ts +1 -19
- package/ui/slider/index.android.d.ts +1 -20
- package/ui/slider/index.ios.d.ts +1 -22
- package/ui/styling/style/index.d.ts +2 -1
- package/ui/styling/style/index.js.map +1 -1
- package/ui/styling/style-properties.js +5 -5
- package/ui/styling/style-properties.js.map +1 -1
- package/ui/switch/index.android.d.ts +1 -18
- package/ui/switch/index.ios.d.ts +1 -18
- package/ui/tab-view/index.android.d.ts +1 -51
- package/ui/tab-view/index.ios.d.ts +1 -34
- package/ui/tab-view/index.ios.js +5 -2
- package/ui/tab-view/index.ios.js.map +1 -1
- package/ui/text-base/index.android.d.ts +1 -75
- package/ui/text-base/index.android.js +0 -4
- package/ui/text-base/index.android.js.map +1 -1
- package/ui/text-base/index.ios.d.ts +1 -41
- package/ui/text-field/index.android.d.ts +1 -4
- package/ui/text-field/index.ios.d.ts +1 -43
- package/ui/text-view/index.ios.d.ts +1 -47
- package/ui/time-picker/index.android.d.ts +1 -3
- package/ui/time-picker/index.ios.d.ts +1 -30
- package/ui/web-view/index.android.d.ts +1 -2
- package/ui/web-view/index.ios.d.ts +1 -2
- package/ui/web-view/web-view-common.d.ts +0 -3
- package/wgc/crypto/index.d.ts +1 -1
- package/xhr/index.d.ts +3 -3
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
import { DockLayoutBase
|
|
1
|
+
import { DockLayoutBase } from './dock-layout-common';
|
|
2
2
|
export * from './dock-layout-common';
|
|
3
3
|
export declare class DockLayout extends DockLayoutBase {
|
|
4
|
-
[stretchLastChildProperty.setNative]: (value: boolean) => void;
|
|
5
|
-
[stretchLastChildProperty.getDefault]: () => boolean;
|
|
6
|
-
[stretchLastChildProperty.setNative]: (value: boolean) => void;
|
|
7
4
|
nativeViewProtected: org.nativescript.widgets.DockLayout;
|
|
8
5
|
createNativeView(): org.nativescript.widgets.DockLayout;
|
|
9
6
|
}
|
|
@@ -1,23 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { FlexboxLayoutBase } from './flexbox-layout-common';
|
|
2
2
|
import { CoreTypes } from '../../../core-types';
|
|
3
3
|
import { View } from '../../core/view';
|
|
4
4
|
export * from './flexbox-layout-common';
|
|
5
5
|
export declare class FlexboxLayout extends FlexboxLayoutBase {
|
|
6
|
-
[flexDirectionProperty.setNative]: (flexDirection: FlexDirection) => void;
|
|
7
|
-
[flexWrapProperty.setNative]: (flexWrap: FlexWrap) => void;
|
|
8
|
-
[justifyContentProperty.setNative]: (justifyContent: JustifyContent) => void;
|
|
9
|
-
[alignItemsProperty.setNative]: (alignItems: AlignItems) => void;
|
|
10
|
-
[alignContentProperty.setNative]: (alignContent: AlignContent) => void;
|
|
11
|
-
[flexDirectionProperty.getDefault]: () => FlexDirection;
|
|
12
|
-
[flexDirectionProperty.setNative]: (flexDirection: FlexDirection) => void;
|
|
13
|
-
[flexWrapProperty.getDefault]: () => FlexWrap;
|
|
14
|
-
[flexWrapProperty.setNative]: (flexWrap: FlexWrap) => void;
|
|
15
|
-
[justifyContentProperty.getDefault]: () => JustifyContent;
|
|
16
|
-
[justifyContentProperty.setNative]: (justifyContent: JustifyContent) => void;
|
|
17
|
-
[alignItemsProperty.getDefault]: () => AlignItems;
|
|
18
|
-
[alignItemsProperty.setNative]: (alignItems: AlignItems) => void;
|
|
19
|
-
[alignContentProperty.getDefault]: () => AlignContent;
|
|
20
|
-
[alignContentProperty.setNative]: (alignContent: AlignContent) => void;
|
|
21
6
|
nativeViewProtected: org.nativescript.widgets.FlexboxLayout;
|
|
22
7
|
constructor();
|
|
23
8
|
createNativeView(): org.nativescript.widgets.FlexboxLayout;
|
|
@@ -1,23 +1,4 @@
|
|
|
1
|
-
import { LayoutBaseCommon
|
|
2
|
-
import { paddingLeftProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty } from '../styling/style-properties';
|
|
3
|
-
import { CoreTypes } from '../../core-types';
|
|
1
|
+
import { LayoutBaseCommon } from './layout-base-common';
|
|
4
2
|
export * from './layout-base-common';
|
|
5
3
|
export declare class LayoutBase extends LayoutBaseCommon {
|
|
6
|
-
[clipToBoundsProperty.setNative]: (value: boolean) => void;
|
|
7
|
-
[isPassThroughParentEnabledProperty.setNative]: (value: boolean) => void;
|
|
8
|
-
[paddingTopProperty.setNative]: (value: CoreTypes.LengthType) => void;
|
|
9
|
-
[paddingRightProperty.setNative]: (value: CoreTypes.LengthType) => void;
|
|
10
|
-
[paddingBottomProperty.setNative]: (value: CoreTypes.LengthType) => void;
|
|
11
|
-
[paddingLeftProperty.setNative]: (value: CoreTypes.LengthType) => void;
|
|
12
|
-
[clipToBoundsProperty.getDefault]: () => boolean;
|
|
13
|
-
[clipToBoundsProperty.setNative]: (value: boolean) => void;
|
|
14
|
-
[isPassThroughParentEnabledProperty.setNative]: (value: boolean) => void;
|
|
15
|
-
[paddingTopProperty.getDefault]: () => CoreTypes.LengthType;
|
|
16
|
-
[paddingTopProperty.setNative]: (value: CoreTypes.LengthType) => void;
|
|
17
|
-
[paddingRightProperty.getDefault]: () => CoreTypes.LengthType;
|
|
18
|
-
[paddingRightProperty.setNative]: (value: CoreTypes.LengthType) => void;
|
|
19
|
-
[paddingBottomProperty.getDefault]: () => CoreTypes.LengthType;
|
|
20
|
-
[paddingBottomProperty.setNative]: (value: CoreTypes.LengthType) => void;
|
|
21
|
-
[paddingLeftProperty.getDefault]: () => CoreTypes.LengthType;
|
|
22
|
-
[paddingLeftProperty.setNative]: (value: CoreTypes.LengthType) => void;
|
|
23
4
|
}
|
|
@@ -1,12 +1,7 @@
|
|
|
1
|
-
import { LayoutBaseCommon
|
|
1
|
+
import { LayoutBaseCommon } from './layout-base-common';
|
|
2
2
|
import { View } from '../core/view';
|
|
3
3
|
export * from './layout-base-common';
|
|
4
4
|
export declare class LayoutBase extends LayoutBaseCommon {
|
|
5
|
-
[clipToBoundsProperty.setNative]: (value: boolean) => void;
|
|
6
|
-
[isPassThroughParentEnabledProperty.setNative]: (value: boolean) => void;
|
|
7
|
-
[clipToBoundsProperty.getDefault]: () => boolean;
|
|
8
|
-
[clipToBoundsProperty.setNative]: (value: boolean) => void;
|
|
9
|
-
[isPassThroughParentEnabledProperty.setNative]: (value: boolean) => void;
|
|
10
5
|
nativeViewProtected: UIView;
|
|
11
6
|
addChild(child: View): void;
|
|
12
7
|
insertChild(child: View, atIndex: number): boolean;
|
|
@@ -2,7 +2,6 @@ import { Color } from '../../../color';
|
|
|
2
2
|
import { RootLayoutBase, defaultShadeCoverOptions } from './root-layout-common';
|
|
3
3
|
import { parseLinearGradient } from '../../../css/parser';
|
|
4
4
|
import { LinearGradient } from '../../styling/linear-gradient';
|
|
5
|
-
import { layout } from '../../../utils';
|
|
6
5
|
export * from './root-layout-common';
|
|
7
6
|
export class RootLayout extends RootLayoutBase {
|
|
8
7
|
insertChild(view, atIndex) {
|
|
@@ -31,19 +30,11 @@ export class RootLayout extends RootLayoutBase {
|
|
|
31
30
|
view.nativeViewProtected.bringToFront();
|
|
32
31
|
}
|
|
33
32
|
_initShadeCover(view, shadeOptions) {
|
|
34
|
-
const
|
|
33
|
+
const initialState = {
|
|
35
34
|
...defaultShadeCoverOptions.animation.enterFrom,
|
|
36
35
|
...shadeOptions?.animation?.enterFrom,
|
|
37
36
|
};
|
|
38
|
-
|
|
39
|
-
if (nativeView) {
|
|
40
|
-
nativeView.setAlpha(options.opacity);
|
|
41
|
-
nativeView.setScaleX(float(options.scaleX));
|
|
42
|
-
nativeView.setScaleY(float(options.scaleY));
|
|
43
|
-
nativeView.setTranslationX(layout.toDevicePixels(options.translateX));
|
|
44
|
-
nativeView.setTranslationY(layout.toDevicePixels(options.translateY));
|
|
45
|
-
nativeView.setRotation(float(options.rotate));
|
|
46
|
-
}
|
|
37
|
+
this._playAnimation(this._getAnimationSet(view, initialState));
|
|
47
38
|
}
|
|
48
39
|
_updateShadeCover(view, shadeOptions) {
|
|
49
40
|
const options = {
|
|
@@ -51,19 +42,6 @@ export class RootLayout extends RootLayoutBase {
|
|
|
51
42
|
...shadeOptions,
|
|
52
43
|
};
|
|
53
44
|
const duration = options.animation?.enterFrom?.duration || defaultShadeCoverOptions.animation.enterFrom.duration;
|
|
54
|
-
const isBackgroundGradient = options.color && options.color.startsWith('linear-gradient');
|
|
55
|
-
if (isBackgroundGradient) {
|
|
56
|
-
if (view.backgroundColor) {
|
|
57
|
-
view.backgroundColor = undefined;
|
|
58
|
-
}
|
|
59
|
-
const parsedGradient = parseLinearGradient(options.color);
|
|
60
|
-
view.backgroundImage = LinearGradient.parse(parsedGradient.value);
|
|
61
|
-
}
|
|
62
|
-
else {
|
|
63
|
-
if (view.backgroundImage) {
|
|
64
|
-
view.backgroundImage = undefined;
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
45
|
return this._playAnimation(this._getAnimationSet(view, {
|
|
68
46
|
translateX: 0,
|
|
69
47
|
translateY: 0,
|
|
@@ -71,7 +49,7 @@ export class RootLayout extends RootLayoutBase {
|
|
|
71
49
|
scaleY: 1,
|
|
72
50
|
rotate: 0,
|
|
73
51
|
opacity: options.opacity,
|
|
74
|
-
},
|
|
52
|
+
}, options.color), duration);
|
|
75
53
|
}
|
|
76
54
|
_closeShadeCover(view, shadeOptions) {
|
|
77
55
|
const exitState = {
|
|
@@ -80,15 +58,26 @@ export class RootLayout extends RootLayoutBase {
|
|
|
80
58
|
};
|
|
81
59
|
return this._playAnimation(this._getAnimationSet(view, exitState), exitState?.duration);
|
|
82
60
|
}
|
|
83
|
-
_getAnimationSet(view, shadeCoverAnimation, backgroundColor) {
|
|
84
|
-
const
|
|
85
|
-
animationSet
|
|
86
|
-
animationSet[
|
|
61
|
+
_getAnimationSet(view, shadeCoverAnimation, backgroundColor = defaultShadeCoverOptions.color) {
|
|
62
|
+
const isBackgroundGradient = backgroundColor && backgroundColor.startsWith('linear-gradient');
|
|
63
|
+
const animationSet = Array.create(android.animation.Animator, isBackgroundGradient ? 6 : 7);
|
|
64
|
+
animationSet[0] = android.animation.ObjectAnimator.ofFloat(view.nativeViewProtected, 'translationX', [shadeCoverAnimation.translateX]);
|
|
65
|
+
animationSet[1] = android.animation.ObjectAnimator.ofFloat(view.nativeViewProtected, 'translationY', [shadeCoverAnimation.translateY]);
|
|
87
66
|
animationSet[2] = android.animation.ObjectAnimator.ofFloat(view.nativeViewProtected, 'scaleX', [shadeCoverAnimation.scaleX]);
|
|
88
67
|
animationSet[3] = android.animation.ObjectAnimator.ofFloat(view.nativeViewProtected, 'scaleY', [shadeCoverAnimation.scaleY]);
|
|
89
68
|
animationSet[4] = android.animation.ObjectAnimator.ofFloat(view.nativeViewProtected, 'rotation', [shadeCoverAnimation.rotate]);
|
|
90
69
|
animationSet[5] = android.animation.ObjectAnimator.ofFloat(view.nativeViewProtected, 'alpha', [shadeCoverAnimation.opacity]);
|
|
91
|
-
if (
|
|
70
|
+
if (isBackgroundGradient) {
|
|
71
|
+
if (view.backgroundColor) {
|
|
72
|
+
view.backgroundColor = undefined;
|
|
73
|
+
}
|
|
74
|
+
const parsedGradient = parseLinearGradient(backgroundColor);
|
|
75
|
+
view.backgroundImage = LinearGradient.parse(parsedGradient.value);
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
if (view.backgroundImage) {
|
|
79
|
+
view.backgroundImage = undefined;
|
|
80
|
+
}
|
|
92
81
|
animationSet[6] = this._getBackgroundColorAnimator(view, backgroundColor);
|
|
93
82
|
}
|
|
94
83
|
return animationSet;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../../../packages/core/ui/layouts/root-layout/index.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAEhF,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../../../packages/core/ui/layouts/root-layout/index.android.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import { StackLayoutBase
|
|
1
|
+
import { StackLayoutBase } from './stack-layout-common';
|
|
2
2
|
export * from './stack-layout-common';
|
|
3
3
|
export declare class StackLayout extends StackLayoutBase {
|
|
4
|
-
[orientationProperty.setNative]: (value: "horizontal" | "vertical") => void;
|
|
5
4
|
nativeViewProtected: org.nativescript.widgets.StackLayout;
|
|
6
5
|
createNativeView(): org.nativescript.widgets.StackLayout;
|
|
7
6
|
}
|
|
@@ -1,10 +1,6 @@
|
|
|
1
|
-
import { WrapLayoutBase
|
|
2
|
-
import { CoreTypes } from '../../../core-types';
|
|
1
|
+
import { WrapLayoutBase } from './wrap-layout-common';
|
|
3
2
|
export * from './wrap-layout-common';
|
|
4
3
|
export declare class WrapLayout extends WrapLayoutBase {
|
|
5
|
-
[orientationProperty.setNative]: (value: "horizontal" | "vertical") => void;
|
|
6
|
-
[itemWidthProperty.setNative]: (value: CoreTypes.LengthType) => void;
|
|
7
|
-
[itemHeightProperty.setNative]: (value: CoreTypes.LengthType) => void;
|
|
8
4
|
nativeViewProtected: org.nativescript.widgets.WrapLayout;
|
|
9
5
|
createNativeView(): org.nativescript.widgets.WrapLayout;
|
|
10
6
|
}
|
|
@@ -1,17 +1,6 @@
|
|
|
1
|
-
import { ListPickerBase
|
|
2
|
-
import { colorProperty } from '../styling/style-properties';
|
|
3
|
-
import { Color } from '../../color';
|
|
1
|
+
import { ListPickerBase } from './list-picker-common';
|
|
4
2
|
export * from './list-picker-common';
|
|
5
3
|
export declare class ListPicker extends ListPickerBase {
|
|
6
|
-
[selectedIndexProperty.setNative]: (value: number) => void;
|
|
7
|
-
[itemsProperty.setNative]: (value: any[] | ItemsSource) => void;
|
|
8
|
-
[colorProperty.setNative]: (value: number | Color) => void;
|
|
9
|
-
[selectedIndexProperty.getDefault]: () => number;
|
|
10
|
-
[selectedIndexProperty.setNative]: (value: number) => void;
|
|
11
|
-
[itemsProperty.getDefault]: () => any[];
|
|
12
|
-
[itemsProperty.setNative]: (value: any[] | ItemsSource) => void;
|
|
13
|
-
[colorProperty.getDefault]: () => number;
|
|
14
|
-
[colorProperty.setNative]: (value: number | Color) => void;
|
|
15
4
|
nativeViewProtected: android.widget.NumberPicker;
|
|
16
5
|
private _selectorWheelPaint;
|
|
17
6
|
createNativeView(): globalAndroid.widget.NumberPicker;
|
|
@@ -1,17 +1,6 @@
|
|
|
1
|
-
import { ListPickerBase
|
|
2
|
-
import { Color } from '../../color';
|
|
3
|
-
import { colorProperty } from '../styling/style-properties';
|
|
1
|
+
import { ListPickerBase } from './list-picker-common';
|
|
4
2
|
export * from './list-picker-common';
|
|
5
3
|
export declare class ListPicker extends ListPickerBase {
|
|
6
|
-
[selectedIndexProperty.setNative]: (value: number) => void;
|
|
7
|
-
[itemsProperty.setNative]: (value: any[] | ItemsSource) => void;
|
|
8
|
-
[colorProperty.setNative]: (value: UIColor | Color) => void;
|
|
9
|
-
[selectedIndexProperty.getDefault]: () => number;
|
|
10
|
-
[selectedIndexProperty.setNative]: (value: number) => void;
|
|
11
|
-
[itemsProperty.getDefault]: () => any[];
|
|
12
|
-
[itemsProperty.setNative]: (value: any[] | ItemsSource) => void;
|
|
13
|
-
[colorProperty.getDefault]: () => UIColor;
|
|
14
|
-
[colorProperty.setNative]: (value: UIColor | Color) => void;
|
|
15
4
|
nativeViewProtected: UIPickerView;
|
|
16
5
|
private _dataSource;
|
|
17
6
|
private _delegate;
|
|
@@ -1,23 +1,7 @@
|
|
|
1
|
-
import { ListViewBase
|
|
2
|
-
import { View
|
|
3
|
-
import { Color } from '../../color';
|
|
1
|
+
import { ListViewBase } from './list-view-common';
|
|
2
|
+
import { View } from '../core/view';
|
|
4
3
|
export * from './list-view-common';
|
|
5
4
|
export declare class ListView extends ListViewBase {
|
|
6
|
-
[separatorColorProperty.setNative]: (value: Color | {
|
|
7
|
-
dividerHeight: number;
|
|
8
|
-
divider: android.graphics.drawable.Drawable;
|
|
9
|
-
}) => void;
|
|
10
|
-
[itemTemplatesProperty.setNative]: (value: KeyedTemplate[]) => void;
|
|
11
|
-
[separatorColorProperty.getDefault]: () => {
|
|
12
|
-
dividerHeight: number;
|
|
13
|
-
divider: android.graphics.drawable.Drawable;
|
|
14
|
-
};
|
|
15
|
-
[separatorColorProperty.setNative]: (value: Color | {
|
|
16
|
-
dividerHeight: number;
|
|
17
|
-
divider: android.graphics.drawable.Drawable;
|
|
18
|
-
}) => void;
|
|
19
|
-
[itemTemplatesProperty.getDefault]: () => KeyedTemplate[];
|
|
20
|
-
[itemTemplatesProperty.setNative]: (value: KeyedTemplate[]) => void;
|
|
21
5
|
nativeViewProtected: android.widget.ListView;
|
|
22
6
|
private _androidViewId;
|
|
23
7
|
_realizedItems: Map<globalAndroid.view.View, {
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import { ListViewBase
|
|
1
|
+
import { ListViewBase } from './list-view-common';
|
|
2
2
|
import { CoreTypes } from '../../core-types';
|
|
3
|
-
import { View
|
|
4
|
-
import { Color } from '../../color';
|
|
3
|
+
import { View } from '../core/view';
|
|
5
4
|
export * from './list-view-common';
|
|
6
5
|
declare class ListViewCell extends UITableViewCell {
|
|
7
6
|
static initWithEmptyBackground(): ListViewCell;
|
|
@@ -11,15 +10,6 @@ declare class ListViewCell extends UITableViewCell {
|
|
|
11
10
|
owner: WeakRef<View>;
|
|
12
11
|
}
|
|
13
12
|
export declare class ListView extends ListViewBase {
|
|
14
|
-
[separatorColorProperty.setNative]: (value: Color | UIColor) => void;
|
|
15
|
-
[itemTemplatesProperty.setNative]: (value: KeyedTemplate[]) => void;
|
|
16
|
-
[iosEstimatedRowHeightProperty.setNative]: (value: CoreTypes.LengthType) => void;
|
|
17
|
-
[separatorColorProperty.getDefault]: () => UIColor;
|
|
18
|
-
[separatorColorProperty.setNative]: (value: Color | UIColor) => void;
|
|
19
|
-
[itemTemplatesProperty.getDefault]: () => KeyedTemplate[];
|
|
20
|
-
[itemTemplatesProperty.setNative]: (value: KeyedTemplate[]) => void;
|
|
21
|
-
[iosEstimatedRowHeightProperty.getDefault]: () => CoreTypes.LengthType;
|
|
22
|
-
[iosEstimatedRowHeightProperty.setNative]: (value: CoreTypes.LengthType) => void;
|
|
23
13
|
nativeViewProtected: UITableView;
|
|
24
14
|
private _dataSource;
|
|
25
15
|
private _delegate;
|
|
@@ -1,25 +1,7 @@
|
|
|
1
|
-
import { PageBase
|
|
1
|
+
import { PageBase } from './page-common';
|
|
2
2
|
import { View } from '../core/view';
|
|
3
|
-
import { Color } from '../../color';
|
|
4
3
|
export * from './page-common';
|
|
5
4
|
export declare class Page extends PageBase {
|
|
6
|
-
[actionBarHiddenProperty.setNative]: (value: boolean) => void;
|
|
7
|
-
[statusBarStyleProperty.setNative]: (value: "dark" | "light" | {
|
|
8
|
-
color: number;
|
|
9
|
-
systemUiVisibility: number;
|
|
10
|
-
}) => void;
|
|
11
|
-
[androidStatusBarBackgroundProperty.setNative]: (value: number | Color) => void;
|
|
12
|
-
[actionBarHiddenProperty.setNative]: (value: boolean) => void;
|
|
13
|
-
[statusBarStyleProperty.getDefault]: () => {
|
|
14
|
-
color: number;
|
|
15
|
-
systemUiVisibility: number;
|
|
16
|
-
};
|
|
17
|
-
[statusBarStyleProperty.setNative]: (value: "dark" | "light" | {
|
|
18
|
-
color: number;
|
|
19
|
-
systemUiVisibility: number;
|
|
20
|
-
}) => void;
|
|
21
|
-
[androidStatusBarBackgroundProperty.getDefault]: () => number;
|
|
22
|
-
[androidStatusBarBackgroundProperty.setNative]: (value: number | Color) => void;
|
|
23
5
|
nativeViewProtected: org.nativescript.widgets.GridLayout;
|
|
24
6
|
createNativeView(): org.nativescript.widgets.GridLayout;
|
|
25
7
|
initNativeView(): void;
|
package/ui/page/index.ios.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { View } from '../core/view';
|
|
2
|
-
import { PageBase
|
|
2
|
+
import { PageBase } from './page-common';
|
|
3
3
|
export * from './page-common';
|
|
4
4
|
declare class UIViewControllerImpl extends UIViewController {
|
|
5
5
|
private _owner;
|
|
@@ -24,11 +24,6 @@ declare class UIViewControllerImpl extends UIViewController {
|
|
|
24
24
|
get preferredStatusBarStyle(): UIStatusBarStyle;
|
|
25
25
|
}
|
|
26
26
|
export declare class Page extends PageBase {
|
|
27
|
-
[actionBarHiddenProperty.setNative]: (value: boolean) => void;
|
|
28
|
-
[statusBarStyleProperty.setNative]: (value: string | UIBarStyle) => void;
|
|
29
|
-
[actionBarHiddenProperty.setNative]: (value: boolean) => void;
|
|
30
|
-
[statusBarStyleProperty.getDefault]: () => UIBarStyle;
|
|
31
|
-
[statusBarStyleProperty.setNative]: (value: string | UIBarStyle) => void;
|
|
32
27
|
nativeViewProtected: UIView;
|
|
33
28
|
viewController: UIViewControllerImpl;
|
|
34
29
|
onAccessibilityPerformEscape: () => boolean;
|
package/ui/page/index.ios.js
CHANGED
|
@@ -13,6 +13,38 @@ const ENTRY = '_entry';
|
|
|
13
13
|
const DELEGATE = '_delegate';
|
|
14
14
|
const TRANSITION = '_transition';
|
|
15
15
|
const NON_ANIMATED_TRANSITION = 'non-animated';
|
|
16
|
+
function isBackNavigationTo(page, entry) {
|
|
17
|
+
const frame = page.frame;
|
|
18
|
+
if (!frame) {
|
|
19
|
+
return false;
|
|
20
|
+
}
|
|
21
|
+
// if executing context is null here this most probably means back navigation through iOS back button
|
|
22
|
+
const navigationContext = frame._executingContext || {
|
|
23
|
+
navigationType: NavigationType.back,
|
|
24
|
+
};
|
|
25
|
+
const isReplace = navigationContext.navigationType === NavigationType.replace;
|
|
26
|
+
if (isReplace) {
|
|
27
|
+
return false;
|
|
28
|
+
}
|
|
29
|
+
if (frame.navigationQueueIsEmpty()) {
|
|
30
|
+
return true;
|
|
31
|
+
}
|
|
32
|
+
const queueContext = frame.getNavigationQueueContextByEntry(entry);
|
|
33
|
+
return queueContext && queueContext.navigationType === NavigationType.back;
|
|
34
|
+
}
|
|
35
|
+
function isBackNavigationFrom(controller, page) {
|
|
36
|
+
if (!page.frame) {
|
|
37
|
+
return false;
|
|
38
|
+
}
|
|
39
|
+
// Controller is cleared or backstack skipped
|
|
40
|
+
if (controller.isBackstackCleared || controller.isBackstackSkipped) {
|
|
41
|
+
return false;
|
|
42
|
+
}
|
|
43
|
+
if (controller.navigationController && controller.navigationController.viewControllers.containsObject(controller)) {
|
|
44
|
+
return false;
|
|
45
|
+
}
|
|
46
|
+
return true;
|
|
47
|
+
}
|
|
16
48
|
var UIViewControllerImpl = /** @class */ (function (_super) {
|
|
17
49
|
__extends(UIViewControllerImpl, _super);
|
|
18
50
|
function UIViewControllerImpl() {
|
|
@@ -62,19 +94,13 @@ var UIViewControllerImpl = /** @class */ (function (_super) {
|
|
|
62
94
|
return;
|
|
63
95
|
}
|
|
64
96
|
var frame = this.navigationController ? this.navigationController.owner : null;
|
|
97
|
+
var newEntry = this[ENTRY];
|
|
98
|
+
// Don't raise event if currentPage was showing modal page.
|
|
99
|
+
if (!owner._presentedViewController && newEntry && (!frame || frame.currentPage !== owner)) {
|
|
100
|
+
var isBack = isBackNavigationTo(owner, newEntry);
|
|
101
|
+
owner.onNavigatingTo(newEntry.entry.context, isBack, newEntry.entry.bindingContext);
|
|
102
|
+
}
|
|
65
103
|
if (frame) {
|
|
66
|
-
var entry = this[ENTRY];
|
|
67
|
-
var currentPage = frame.currentPage;
|
|
68
|
-
// Don't raise event if currentPage was showing modal page.
|
|
69
|
-
if (!owner._presentedViewController && entry && currentPage !== owner && !frame._executingContext) {
|
|
70
|
-
var isBack = frame.backStack.includes(entry);
|
|
71
|
-
frame._executingContext = {
|
|
72
|
-
entry: entry,
|
|
73
|
-
isBackNavigation: isBack,
|
|
74
|
-
navigationType: isBack ? NavigationType.back : NavigationType.forward,
|
|
75
|
-
};
|
|
76
|
-
frame._onNavigatingTo(entry, isBack);
|
|
77
|
-
}
|
|
78
104
|
frame._resolvedPage = owner;
|
|
79
105
|
if (owner.parent === frame) {
|
|
80
106
|
frame._inheritStyles(owner);
|
|
@@ -82,7 +108,7 @@ var UIViewControllerImpl = /** @class */ (function (_super) {
|
|
|
82
108
|
else {
|
|
83
109
|
if (!owner.parent) {
|
|
84
110
|
if (!frame._styleScope) {
|
|
85
|
-
// Make sure page will have styleScope even if frame
|
|
111
|
+
// Make sure page will have styleScope even if frame don't.
|
|
86
112
|
owner._updateStyleScope();
|
|
87
113
|
}
|
|
88
114
|
frame._addView(owner);
|
|
@@ -109,7 +135,7 @@ var UIViewControllerImpl = /** @class */ (function (_super) {
|
|
|
109
135
|
}
|
|
110
136
|
};
|
|
111
137
|
UIViewControllerImpl.prototype.viewDidAppear = function (animated) {
|
|
112
|
-
var _a, _b
|
|
138
|
+
var _a, _b;
|
|
113
139
|
_super.prototype.viewDidAppear.call(this, animated);
|
|
114
140
|
var owner = (_a = this._owner) === null || _a === void 0 ? void 0 : _a.deref();
|
|
115
141
|
if (!owner) {
|
|
@@ -117,55 +143,50 @@ var UIViewControllerImpl = /** @class */ (function (_super) {
|
|
|
117
143
|
}
|
|
118
144
|
var navigationController = this.navigationController;
|
|
119
145
|
var frame = navigationController ? navigationController.owner : null;
|
|
120
|
-
if
|
|
146
|
+
// Skip navigation events if modal page is shown.
|
|
147
|
+
if (!owner._presentedViewController && frame) {
|
|
121
148
|
var newEntry = this[ENTRY];
|
|
122
|
-
//
|
|
123
|
-
//
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
if (
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
var controller = newEntry.resolvedPage.ios;
|
|
136
|
-
if (controller) {
|
|
137
|
-
var animated_1 = frame._getIsAnimatedNavigation(newEntry.entry);
|
|
138
|
-
if (animated_1) {
|
|
139
|
-
controller[TRANSITION] = frame._getNavigationTransition(newEntry.entry);
|
|
140
|
-
}
|
|
141
|
-
else {
|
|
142
|
-
controller[TRANSITION] = {
|
|
143
|
-
name: NON_ANIMATED_TRANSITION,
|
|
144
|
-
};
|
|
145
|
-
}
|
|
146
|
-
}
|
|
147
|
-
}
|
|
148
|
-
// If page was shown with custom animation - we need to set the navigationController.delegate to the animatedDelegate.
|
|
149
|
-
if ((_d = frame.ios) === null || _d === void 0 ? void 0 : _d.controller) {
|
|
150
|
-
frame.ios.controller.delegate = this[DELEGATE];
|
|
151
|
-
}
|
|
152
|
-
frame._processNavigationQueue(owner);
|
|
153
|
-
if (!__VISIONOS__) {
|
|
154
|
-
// _processNavigationQueue will shift navigationQueue. Check canGoBack after that.
|
|
155
|
-
// Workaround for disabled backswipe on second custom native transition
|
|
156
|
-
if (frame.canGoBack()) {
|
|
157
|
-
var transitionState = SharedTransition.getState(owner.transitionId);
|
|
158
|
-
if (!(transitionState === null || transitionState === void 0 ? void 0 : transitionState.interactive)) {
|
|
159
|
-
// only consider when interactive transitions are not enabled
|
|
160
|
-
navigationController.interactivePopGestureRecognizer.delegate = navigationController;
|
|
161
|
-
navigationController.interactivePopGestureRecognizer.enabled = owner.enableSwipeBackNavigation;
|
|
162
|
-
}
|
|
149
|
+
// frame.setCurrent(...) will reset executing context so retrieve it here
|
|
150
|
+
// if executing context is null here this most probably means back navigation through iOS back button
|
|
151
|
+
var navigationContext = frame._executingContext || {
|
|
152
|
+
navigationType: NavigationType.back,
|
|
153
|
+
};
|
|
154
|
+
var isReplace = navigationContext.navigationType === NavigationType.replace;
|
|
155
|
+
frame.setCurrent(newEntry, navigationContext.navigationType);
|
|
156
|
+
if (isReplace) {
|
|
157
|
+
var controller = newEntry.resolvedPage.ios;
|
|
158
|
+
if (controller) {
|
|
159
|
+
var animated_1 = frame._getIsAnimatedNavigation(newEntry.entry);
|
|
160
|
+
if (animated_1) {
|
|
161
|
+
controller[TRANSITION] = frame._getNavigationTransition(newEntry.entry);
|
|
163
162
|
}
|
|
164
163
|
else {
|
|
165
|
-
|
|
164
|
+
controller[TRANSITION] = {
|
|
165
|
+
name: NON_ANIMATED_TRANSITION,
|
|
166
|
+
};
|
|
166
167
|
}
|
|
167
168
|
}
|
|
168
169
|
}
|
|
170
|
+
// If page was shown with custom animation - we need to set the navigationController.delegate to the animatedDelegate.
|
|
171
|
+
if ((_b = frame.ios) === null || _b === void 0 ? void 0 : _b.controller) {
|
|
172
|
+
frame.ios.controller.delegate = this[DELEGATE];
|
|
173
|
+
}
|
|
174
|
+
frame._processNavigationQueue(owner);
|
|
175
|
+
if (!__VISIONOS__) {
|
|
176
|
+
// _processNavigationQueue will shift navigationQueue. Check canGoBack after that.
|
|
177
|
+
// Workaround for disabled backswipe on second custom native transition
|
|
178
|
+
if (frame.canGoBack()) {
|
|
179
|
+
var transitionState = SharedTransition.getState(owner.transitionId);
|
|
180
|
+
if (!(transitionState === null || transitionState === void 0 ? void 0 : transitionState.interactive)) {
|
|
181
|
+
// only consider when interactive transitions are not enabled
|
|
182
|
+
navigationController.interactivePopGestureRecognizer.delegate = navigationController;
|
|
183
|
+
navigationController.interactivePopGestureRecognizer.enabled = owner.enableSwipeBackNavigation;
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
else {
|
|
187
|
+
navigationController.interactivePopGestureRecognizer.enabled = false;
|
|
188
|
+
}
|
|
189
|
+
}
|
|
169
190
|
}
|
|
170
191
|
if (!this.presentedViewController) {
|
|
171
192
|
// clear presented viewController here only if no presented controller.
|
|
@@ -186,19 +207,31 @@ var UIViewControllerImpl = /** @class */ (function (_super) {
|
|
|
186
207
|
if (!owner._presentedViewController) {
|
|
187
208
|
owner._presentedViewController = this.presentedViewController;
|
|
188
209
|
}
|
|
210
|
+
var frame = owner.frame;
|
|
211
|
+
// Skip navigation events if we are hiding because we are about to show a modal page,
|
|
212
|
+
// or because we are closing a modal page,
|
|
213
|
+
// or because we are in tab and another controller is selected.
|
|
214
|
+
var tab = this.tabBarController;
|
|
215
|
+
if (owner.onNavigatingFrom && !owner._presentedViewController && frame && (!this.presentingViewController || frame.backStack.length > 0) && frame.currentPage === owner) {
|
|
216
|
+
var willSelectViewController = tab && tab._willSelectViewController;
|
|
217
|
+
if (!willSelectViewController || willSelectViewController === tab.selectedViewController) {
|
|
218
|
+
var isBack = isBackNavigationFrom(this, owner);
|
|
219
|
+
owner.onNavigatingFrom(isBack);
|
|
220
|
+
}
|
|
221
|
+
}
|
|
189
222
|
owner.updateWithWillDisappear(animated);
|
|
190
223
|
};
|
|
191
224
|
UIViewControllerImpl.prototype.viewDidDisappear = function (animated) {
|
|
192
225
|
var _a;
|
|
193
226
|
_super.prototype.viewDidDisappear.call(this, animated);
|
|
194
|
-
var
|
|
227
|
+
var page = (_a = this._owner) === null || _a === void 0 ? void 0 : _a.deref();
|
|
195
228
|
// Exit if no page or page is hiding because it shows another page modally.
|
|
196
|
-
if (!
|
|
229
|
+
if (!page || page.modal || page._presentedViewController) {
|
|
197
230
|
return;
|
|
198
231
|
}
|
|
199
232
|
// Forward navigation does not remove page from frame so we raise unloaded manually.
|
|
200
|
-
if (
|
|
201
|
-
|
|
233
|
+
if (page.isLoaded) {
|
|
234
|
+
page.callUnloaded();
|
|
202
235
|
}
|
|
203
236
|
};
|
|
204
237
|
UIViewControllerImpl.prototype.viewWillLayoutSubviews = function () {
|
package/ui/page/index.ios.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/page/index.ios.ts"],"names":[],"mappings":"AAAA,eAAe;AACf,OAAO,EAAyB,cAAc,EAAE,MAAM,UAAU,CAAC;AAEjE,SAAS;AACT,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAE1F,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,wBAAwB,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AAC9F,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,cAAc,eAAe,CAAC;AAE9B,MAAM,KAAK,GAAG,QAAQ,CAAC;AACvB,MAAM,QAAQ,GAAG,WAAW,CAAC;AAC7B,MAAM,UAAU,GAAG,aAAa,CAAC;AACjC,MAAM,uBAAuB,GAAG,cAAc,CAAC
|
|
1
|
+
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/page/index.ios.ts"],"names":[],"mappings":"AAAA,eAAe;AACf,OAAO,EAAyB,cAAc,EAAE,MAAM,UAAU,CAAC;AAEjE,SAAS;AACT,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAE1F,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,wBAAwB,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AAC9F,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,cAAc,eAAe,CAAC;AAE9B,MAAM,KAAK,GAAG,QAAQ,CAAC;AACvB,MAAM,QAAQ,GAAG,WAAW,CAAC;AAC7B,MAAM,UAAU,GAAG,aAAa,CAAC;AACjC,MAAM,uBAAuB,GAAG,cAAc,CAAC;AAE/C,SAAS,kBAAkB,CAAC,IAAU,EAAE,KAAqB;IAC5D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;IACzB,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,OAAO,KAAK,CAAC;IACd,CAAC;IAED,qGAAqG;IACrG,MAAM,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,IAAI;QACpD,cAAc,EAAE,cAAc,CAAC,IAAI;KACnC,CAAC;IACF,MAAM,SAAS,GAAG,iBAAiB,CAAC,cAAc,KAAK,cAAc,CAAC,OAAO,CAAC;IAC9E,IAAI,SAAS,EAAE,CAAC;QACf,OAAO,KAAK,CAAC;IACd,CAAC;IAED,IAAI,KAAK,CAAC,sBAAsB,EAAE,EAAE,CAAC;QACpC,OAAO,IAAI,CAAC;IACb,CAAC;IAED,MAAM,YAAY,GAAG,KAAK,CAAC,gCAAgC,CAAC,KAAK,CAAC,CAAC;IACnE,OAAO,YAAY,IAAI,YAAY,CAAC,cAAc,KAAK,cAAc,CAAC,IAAI,CAAC;AAC5E,CAAC;AAED,SAAS,oBAAoB,CAAC,UAAgC,EAAE,IAAU;IACzE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACjB,OAAO,KAAK,CAAC;IACd,CAAC;IAED,6CAA6C;IAC7C,IAAI,UAAU,CAAC,kBAAkB,IAAI,UAAU,CAAC,kBAAkB,EAAE,CAAC;QACpE,OAAO,KAAK,CAAC;IACd,CAAC;IAED,IAAI,UAAU,CAAC,oBAAoB,IAAI,UAAU,CAAC,oBAAoB,CAAC,eAAe,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC;QACnH,OAAO,KAAK,CAAC;IACd,CAAC;IAED,OAAO,IAAI,CAAC;AACb,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgVD,MAAM,OAAO,IAAK,SAAQ,QAAQ;IASjC;QACC,KAAK,EAAE,CAAC;QALD,qBAAgB,GAAG,WAAW,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,qBAAqB,CAAC;QAMnI,MAAM,UAAU,GAAG,oBAAoB,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACzE,UAAU,CAAC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACxD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;IAC9C,CAAC;IAED,gBAAgB;QACf,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;IACjC,CAAC;IAED,iBAAiB;QAChB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,KAAK,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;IAED,aAAa;IACb,IAAI,GAAG;QACN,OAAO,IAAI,CAAC,IAAI,CAAC;IAClB,CAAC;IAEM,gBAAgB,CAAC,IAAY,EAAE,GAAW,EAAE,KAAa,EAAE,MAAc;QAC/E,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC;QAC5C,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,OAAO;QACR,CAAC;QAED,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC;QACtC,sCAAsC;QACtC,MAAM,QAAQ,GAAG,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE7H,IAAI,CAAC,mBAAmB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAChD,CAAC;IAEM,sBAAsB,CAAC,UAAkB,EAAE,KAAa;QAC9D,EAAE;IACH,CAAC;IAEM,kBAAkB;QACxB,OAAO,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC;IACtD,CAAC;IAEM,QAAQ;QACd,KAAK,CAAC,QAAQ,EAAE,CAAC;QACjB,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;QACzB,CAAC;IACF,CAAC;IACD,oBAAoB,CAAC,QAAiB;QACrC,kFAAkF;QAClF,4DAA4D;QAC5D,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;QACzB,CAAC;QACD,IAAI,CAAC,eAAe,EAAE,CAAC;IACxB,CAAC;IAED,uBAAuB,CAAC,QAAiB;QACxC,kFAAkF;QAClF,4DAA4D;IAC7D,CAAC;IAEM,eAAe;QACrB,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACjD,CAAC;IAEM,qBAAqB,CAAC,KAAc;QAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAI,KAAK,IAAI,KAAK,EAAE,CAAC;YACpB,MAAM,oBAAoB,GAA2B,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC;YAC1E,MAAM,aAAa,GAAG,oBAAoB,CAAC,aAAa,CAAC;YAEzD,aAAa,CAAC,QAAQ,GAAG,KAAK,KAAK,MAAM,CAAC,CAAC,0BAAkB,CAAC,2BAAmB,CAAC;QACnF,CAAC;IACF,CAAC;IAEM,gCAAgC,CAAC,OAAgB;QACvD,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC;QACrD,IAAI,IAAI,CAAC,KAAK,IAAI,aAAa,IAAI,aAAa,CAAC,+BAA+B,EAAE,CAAC;YAClF,gDAAgD;YAChD,OAAO,GAAG,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;YAC5C,aAAa,CAAC,+BAA+B,CAAC,OAAO,GAAG,OAAO,CAAC;QACjE,CAAC;IACF,CAAC;IAEM,SAAS,CAAC,gBAAwB,EAAE,iBAAyB;QACnE,MAAM,KAAK,GAAG,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;QAE9D,MAAM,MAAM,GAAG,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;QAC5D,MAAM,UAAU,GAAG,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;QAEhE,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3E,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;YACxD,MAAM,SAAS,GAAG,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;YAChE,MAAM,UAAU,GAAG,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;YAClE,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;QAE7F,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC5E,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAE/E,MAAM,aAAa,GAAG,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;QAClF,MAAM,cAAc,GAAG,IAAI,CAAC,mBAAmB,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;QAEtF,IAAI,CAAC,oBAAoB,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IAC1D,CAAC;IAEM,QAAQ,CAAC,IAAY,EAAE,GAAW,EAAE,KAAa,EAAE,MAAc;QACvE,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;YACzF,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,cAAc,EAAE,eAAe,CAAC,CAAC;QAC/E,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAExC,IAAI,CAAC,YAAY,IAAI,WAAW,IAAI,EAAE,EAAE,CAAC;YACxC,oDAAoD;YACpD,+CAA+C;YAC/C,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACrH,CAAC;QAED,MAAM,SAAS,GAAG,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC;QAClC,MAAM,QAAQ,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC;QAChC,MAAM,UAAU,GAAG,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QACxC,MAAM,WAAW,GAAG,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAE3C,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IACvF,CAAC;IAEM,0BAA0B,CAAC,KAAW,EAAE,OAAe;QAC7D,qDAAqD;QACrD,IAAI,IAAI,CAAC,YAAY,IAAI,KAAK,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC;YACnD,OAAO,IAAI,CAAC;QACb,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC;QAC9C,MAAM,WAAW,GAAG,KAAK,CAAC,mBAAmB,CAAC;QAE9C,MAAM,cAAc,GAAG,KAAK,CAAC,GAAG,YAAY,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC;QAChG,IAAI,cAAc,EAAE,CAAC;YACpB,6DAA6D;YAC7D,IAAI,IAAI,CAAC,cAAc,CAAC,uBAAuB,KAAK,cAAc,EAAE,CAAC;gBACpE,OAAO,IAAI,CAAC;YACb,CAAC;YAED,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,YAAY,IAAI,WAAW,EAAE,CAAC;YACjC,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,IAAI,YAAY,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAC3E,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YACtC,CAAC;iBAAM,CAAC;gBACP,YAAY,CAAC,oBAAoB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YACzD,CAAC;YAED,OAAO,IAAI,CAAC;QACb,CAAC;QAED,OAAO,KAAK,CAAC;IACd,CAAC;IAEM,+BAA+B,CAAC,KAAW;QACjD,qDAAqD;QACrD,IAAI,IAAI,CAAC,YAAY,IAAI,KAAK,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC;YACnD,OAAO;QACR,CAAC;QAED,MAAM,cAAc,GAAG,KAAK,CAAC,GAAG,YAAY,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC;QAChG,IAAI,cAAc,EAAE,CAAC;YACpB,cAAc,CAAC,8BAA8B,EAAE,CAAC;QACjD,CAAC;QAED,KAAK,CAAC,+BAA+B,CAAC,KAAK,CAAC,CAAC;IAC9C,CAAC;IAED,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC,KAAc;QACjD,IAAI,CAAC,gCAAgC,CAAC,KAAK,CAAC,CAAC;QAE7C,mCAAmC;QACnC,2BAA2B,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAEjD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAI,KAAK,EAAE,CAAC;YACX,qDAAqD;YACrD,KAAK,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACpC,CAAC;IACF,CAAC;IAED,CAAC,sBAAsB,CAAC,UAAU,CAAC;QAClC,kCAA0B;IAC3B,CAAC;IACD,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC,KAA0B;QAC5D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAI,KAAK,EAAE,CAAC;YACX,MAAM,aAAa,GAA4B,KAAK,CAAC,GAAG,CAAC,UAAW,CAAC,aAAa,CAAC;YACnF,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC/B,aAAa,CAAC,QAAQ,GAAG,KAAK,KAAK,MAAM,CAAC,CAAC,0BAAkB,CAAC,2BAAmB,CAAC;YACnF,CAAC;iBAAM,CAAC;gBACP,aAAa,CAAC,QAAQ,GAAG,KAAK,CAAC;YAChC,CAAC;QACF,CAAC;IACF,CAAC;IAEM,0BAA0B,CAAC,OAAO,GAAG,KAAK;QAChD,IAAI,CAAC,6BAA6B,EAAE,EAAE,CAAC;YACtC,OAAO;QACR,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACb,MAAM,eAAe,GAAG,wBAAwB,CAAC,IAAI,CAAC,CAAC;YACvD,IAAI,eAAe,EAAE,CAAC;gBACrB,MAAM,MAAM,GAAG,eAAe,CAAC,mBAAmB,CAAC;gBACnD,IAAI,MAAM,EAAE,CAAC;oBACZ,+BAA+B,CAAC,wCAAwC,EAAE,MAAM,CAAC,CAAC;oBAElF,OAAO;gBACR,CAAC;YACF,CAAC;QACF,CAAC;QAED,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YAC1B,+BAA+B,CAAC,wCAAwC,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;YAEpG,OAAO;QACR,CAAC;QAED,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC7B,+BAA+B,CAAC,wCAAwC,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;YAEpG,OAAO;QACR,CAAC;QAED,IAAI,IAAI,CAAC,SAAS,CAAC,kBAAkB,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YAC/D,+BAA+B,CAAC,wCAAwC,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAErG,OAAO;QACR,CAAC;QAED,+BAA+B,CAAC,wCAAwC,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACrG,CAAC;CACD;AAED,SAAS,2BAA2B,CAAC,UAA4B;IAChE,IAAI,CAAC,UAAU,EAAE,CAAC;QACjB,OAAO;IACR,CAAC;IAED,UAAU,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;IAEjC,MAAM,uBAAuB,GAAG,UAAU,CAAC,uBAAuB,CAAC;IACnE,IAAI,uBAAuB,EAAE,CAAC;QAC7B,OAAO,2BAA2B,CAAC,uBAAuB,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,gBAAgB,GAAG,UAAU,CAAC,oBAAoB,CAAC;IACzD,IAAI,IAAI,GAAG,UAAU,CAAC,oBAAoB,CAAC,KAAK,CAAC;IACjD,OAAO,IAAI,GAAG,CAAC,EAAE,CAAC;QACjB,MAAM,eAAe,GAAG,gBAAgB,CAAC,EAAE,IAAI,CAAC,CAAC;QACjD,IAAI,eAAe,YAAY,kBAAkB,EAAE,CAAC;YACnD,2BAA2B,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC;QACrE,CAAC;aAAM,IAAI,eAAe,YAAY,sBAAsB,EAAE,CAAC;YAC9D,2BAA2B,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC;QAChE,CAAC;aAAM,IAAI,eAAe,YAAY,qBAAqB,EAAE,CAAC;YAC7D,2BAA2B,CAAC,eAAe,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QACzE,CAAC;aAAM,CAAC;YACP,2BAA2B,CAAC,eAAe,CAAC,CAAC;QAC9C,CAAC;IACF,CAAC;AACF,CAAC"}
|