@nativescript/core 9.1.0-alpha.9 → 9.1.0-next.1
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/application/application-common.d.ts +0 -1
- package/application/application-common.js +5 -40
- package/application/application-common.js.map +1 -1
- package/application/application.android.d.ts +1 -1
- package/application/application.android.js +4 -8
- package/application/application.android.js.map +1 -1
- package/application/application.ios.d.ts +16 -1
- package/application/application.ios.js +86 -12
- package/application/application.ios.js.map +1 -1
- package/config/config.interface.d.ts +6 -0
- package/core-types/index.d.ts +2 -2
- package/css/CSS3Parser.js +3 -2
- package/css/CSS3Parser.js.map +1 -1
- package/data/observable/index.js +37 -9
- package/data/observable/index.js.map +1 -1
- package/debugger/dom-types.js +31 -1
- package/debugger/dom-types.js.map +1 -1
- package/fetch/index.mjs +2 -2
- package/file-system/file-system-access.ios.js +18 -10
- package/file-system/file-system-access.ios.js.map +1 -1
- package/file-system/index.d.ts +3 -3
- package/index.d.ts +1 -0
- package/inspector_modules.js +1 -1
- package/inspector_modules.js.map +1 -1
- package/package.json +1 -1
- package/platforms/android/widgets-release.aar +0 -0
- package/platforms/ios/TNSWidgets.xcframework/Info.plist +14 -14
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Info.plist +0 -0
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/TNSWidgets +0 -0
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets +0 -0
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/aarch64/TNSWidgets.yml +78 -78
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Resources/Info.plist +7 -7
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Resources/Info.plist +7 -7
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/TNSWidgets +0 -0
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/Current/Resources/Info.plist +7 -7
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/Current/TNSWidgets +0 -0
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets +0 -0
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/aarch64/TNSWidgets.yml +78 -78
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/x86_64/TNSWidgets.yml +78 -78
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Info.plist +0 -0
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/TNSWidgets +0 -0
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/_CodeSignature/CodeResources +1 -1
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets +0 -0
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/aarch64/TNSWidgets.yml +78 -78
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/x86_64/TNSWidgets.yml +78 -78
- package/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Info.plist +0 -0
- package/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/TNSWidgets +0 -0
- package/platforms/ios/TNSWidgets.xcframework/xros-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets +0 -0
- package/platforms/ios/TNSWidgets.xcframework/xros-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/aarch64/TNSWidgets.yml +78 -78
- package/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Info.plist +0 -0
- package/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/TNSWidgets +0 -0
- package/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/_CodeSignature/CodeResources +1 -1
- package/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets +0 -0
- package/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/aarch64/TNSWidgets.yml +78 -78
- package/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/x86_64/TNSWidgets.yml +78 -78
- package/platforms/ios/src/NativeScriptMainWindow.swift +72 -39
- package/trace/index.d.ts +2 -2
- package/ui/action-bar/action-bar-common.js +0 -1
- package/ui/action-bar/action-bar-common.js.map +1 -1
- package/ui/animation/keyframe-animation.d.ts +1 -1
- package/ui/builder/index.js +9 -1
- package/ui/builder/index.js.map +1 -1
- package/ui/core/properties/property-shared.js +11 -2
- package/ui/core/properties/property-shared.js.map +1 -1
- package/ui/core/view/index.android.js +26 -6
- package/ui/core/view/index.android.js.map +1 -1
- package/ui/core/view/index.d.ts +33 -1
- package/ui/core/view/index.ios.js +11 -2
- package/ui/core/view/index.ios.js.map +1 -1
- package/ui/core/view/view-common.d.ts +18 -0
- package/ui/core/view/view-common.js +47 -0
- package/ui/core/view/view-common.js.map +1 -1
- package/ui/core/view/view-helper/index.ios.d.ts +6 -20
- package/ui/core/view/view-helper/index.ios.js +10 -31
- package/ui/core/view/view-helper/index.ios.js.map +1 -1
- package/ui/core/view/view-helper/view-helper-common.js +21 -3
- package/ui/core/view/view-helper/view-helper-common.js.map +1 -1
- package/ui/core/view-base/index.d.ts +13 -8
- package/ui/core/view-base/index.js +48 -33
- package/ui/core/view-base/index.js.map +1 -1
- package/ui/frame/frame-common.js +2 -12
- package/ui/frame/frame-common.js.map +1 -1
- package/ui/frame/frame-helper-for-android.js +12 -3
- package/ui/frame/frame-helper-for-android.js.map +1 -1
- package/ui/frame/index.android.js +28 -0
- package/ui/frame/index.android.js.map +1 -1
- package/ui/image/image-common.js +1 -1
- package/ui/image/image-common.js.map +1 -1
- package/ui/image/index.android.js +13 -1
- package/ui/image/index.android.js.map +1 -1
- package/ui/layouts/absolute-layout/index.ios.js +4 -5
- package/ui/layouts/absolute-layout/index.ios.js.map +1 -1
- package/ui/layouts/dock-layout/index.ios.js +4 -5
- package/ui/layouts/dock-layout/index.ios.js.map +1 -1
- package/ui/layouts/flexbox-layout/flexbox-layout-common.d.ts +7 -0
- package/ui/layouts/flexbox-layout/flexbox-layout-common.js +18 -0
- package/ui/layouts/flexbox-layout/flexbox-layout-common.js.map +1 -1
- package/ui/layouts/flexbox-layout/index.android.d.ts +5 -0
- package/ui/layouts/flexbox-layout/index.android.js +15 -0
- package/ui/layouts/flexbox-layout/index.android.js.map +1 -1
- package/ui/layouts/flexbox-layout/index.d.ts +19 -1
- package/ui/layouts/flexbox-layout/index.ios.d.ts +2 -0
- package/ui/layouts/flexbox-layout/index.ios.js +245 -198
- package/ui/layouts/flexbox-layout/index.ios.js.map +1 -1
- package/ui/layouts/grid-layout/index.ios.js +4 -5
- package/ui/layouts/grid-layout/index.ios.js.map +1 -1
- package/ui/layouts/layout-base-common.d.ts +1 -0
- package/ui/layouts/layout-base-common.js +21 -0
- package/ui/layouts/layout-base-common.js.map +1 -1
- package/ui/layouts/stack-layout/index.ios.js +4 -5
- package/ui/layouts/stack-layout/index.ios.js.map +1 -1
- package/ui/layouts/wrap-layout/index.ios.js +4 -5
- package/ui/layouts/wrap-layout/index.ios.js.map +1 -1
- package/ui/list-view/index.android.js +3 -2
- package/ui/list-view/index.android.js.map +1 -1
- package/ui/list-view/index.ios.d.ts +2 -2
- package/ui/list-view/index.ios.js +15 -17
- package/ui/list-view/index.ios.js.map +1 -1
- package/ui/list-view/list-view-common.d.ts +1 -0
- package/ui/list-view/list-view-common.js +15 -0
- package/ui/list-view/list-view-common.js.map +1 -1
- package/ui/page/index.android.d.ts +1 -0
- package/ui/page/index.android.js +4 -0
- package/ui/page/index.android.js.map +1 -1
- package/ui/page/index.ios.d.ts +2 -1
- package/ui/page/index.ios.js +8 -5
- package/ui/page/index.ios.js.map +1 -1
- package/ui/scroll-view/index.d.ts +3 -5
- package/ui/scroll-view/index.ios.d.ts +3 -1
- package/ui/scroll-view/index.ios.js +26 -20
- package/ui/scroll-view/index.ios.js.map +1 -1
- package/ui/scroll-view/scroll-view-common.js +1 -1
- package/ui/scroll-view/scroll-view-common.js.map +1 -1
- package/ui/styling/css-selector.d.ts +20 -5
- package/ui/styling/css-selector.js +134 -28
- package/ui/styling/css-selector.js.map +1 -1
- package/ui/styling/style/index.d.ts +5 -0
- package/ui/styling/style/index.js.map +1 -1
- package/ui/styling/style-properties.d.ts +4 -0
- package/ui/styling/style-properties.js +116 -63
- package/ui/styling/style-properties.js.map +1 -1
- package/ui/styling/style-scope.d.ts +9 -1
- package/ui/styling/style-scope.js +40 -7
- package/ui/styling/style-scope.js.map +1 -1
- package/ui/switch/index.ios.js +2 -1
- package/ui/switch/index.ios.js.map +1 -1
- package/ui/tab-view/index.android.d.ts +3 -1
- package/ui/tab-view/index.android.js +56 -46
- package/ui/tab-view/index.android.js.map +1 -1
- package/ui/tab-view/index.ios.js +1 -0
- package/ui/tab-view/index.ios.js.map +1 -1
- package/ui/tab-view/tab-view-common.d.ts +1 -0
- package/ui/tab-view/tab-view-common.js +12 -3
- package/ui/tab-view/tab-view-common.js.map +1 -1
- package/ui/text-base/index.android.d.ts +1 -1
- package/ui/text-base/index.android.js +8 -8
- package/ui/text-base/index.android.js.map +1 -1
- package/ui/text-base/index.ios.js +5 -3
- package/ui/text-base/index.ios.js.map +1 -1
- package/ui/transition/shared-transition.d.ts +1 -0
- package/ui/transition/shared-transition.js +13 -8
- package/ui/transition/shared-transition.js.map +1 -1
- package/utils/layout-helper/index.ios.js +11 -3
- package/utils/layout-helper/index.ios.js.map +1 -1
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,OAAO,EAAE,6BAA6B,EAAE,MAAM,mBAAmB,CAAC;AAElE,OAAO,EAAkB,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3E,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/page/index.ios.ts"],"names":[],"mappings":"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"}
|
|
@@ -72,13 +72,11 @@ export class ScrollView extends ContentView {
|
|
|
72
72
|
orientation: CoreTypes.OrientationType;
|
|
73
73
|
|
|
74
74
|
/**
|
|
75
|
-
* iOS-only.
|
|
76
|
-
* the safe area. Maps to `UIScrollView.contentInsetAdjustmentBehavior`.
|
|
75
|
+
* iOS-only. Maps to `UIScrollView.contentInsetAdjustmentBehavior`.
|
|
77
76
|
*
|
|
78
77
|
* - `never` (default): NativeScript subtracts safe-area insets manually.
|
|
79
|
-
* - `automatic` / `scrollableAxes` / `always`: iOS
|
|
80
|
-
*
|
|
81
|
-
* to avoid scroll-drift during fast scroll + rubber-band bounce.
|
|
78
|
+
* - `automatic` / `scrollableAxes` / `always`: iOS manages insets — recommended
|
|
79
|
+
* with large titles to avoid scroll drift.
|
|
82
80
|
*
|
|
83
81
|
* @nsProperty
|
|
84
82
|
*/
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { ScrollViewBase, scrollBarIndicatorVisibleProperty, isScrollEnabledProperty } from './scroll-view-common';
|
|
1
|
+
import { ScrollViewBase, scrollBarIndicatorVisibleProperty, isScrollEnabledProperty, iosContentInsetAdjustmentBehaviorProperty } from './scroll-view-common';
|
|
2
2
|
export * from './scroll-view-common';
|
|
3
3
|
export declare class ScrollView extends ScrollViewBase {
|
|
4
4
|
[isScrollEnabledProperty.getDefault]: () => boolean;
|
|
5
5
|
[isScrollEnabledProperty.setNative]: (value: boolean) => void;
|
|
6
6
|
[scrollBarIndicatorVisibleProperty.getDefault]: () => boolean;
|
|
7
7
|
[scrollBarIndicatorVisibleProperty.setNative]: (value: boolean) => void;
|
|
8
|
+
[iosContentInsetAdjustmentBehaviorProperty.setNative]: (value: "never" | "automatic" | "scrollableAxes" | "always") => void;
|
|
8
9
|
nativeViewProtected: UIScrollView;
|
|
9
10
|
private _contentMeasuredWidth;
|
|
10
11
|
private _contentMeasuredHeight;
|
|
@@ -17,6 +18,7 @@ export declare class ScrollView extends ScrollViewBase {
|
|
|
17
18
|
protected attachNative(): void;
|
|
18
19
|
protected detachNative(): void;
|
|
19
20
|
protected updateScrollBarVisibility(value: any): void;
|
|
21
|
+
protected updateContentInsetAdjustmentBehavior(value: 'never' | 'automatic' | 'scrollableAxes' | 'always'): void;
|
|
20
22
|
get horizontalOffset(): number;
|
|
21
23
|
get verticalOffset(): number;
|
|
22
24
|
get scrollableWidth(): number;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ScrollViewBase, scrollBarIndicatorVisibleProperty, isScrollEnabledProperty } from './scroll-view-common';
|
|
1
|
+
import { ScrollViewBase, scrollBarIndicatorVisibleProperty, isScrollEnabledProperty, iosContentInsetAdjustmentBehaviorProperty } from './scroll-view-common';
|
|
2
2
|
import { layout } from '../../utils';
|
|
3
3
|
import { SDK_VERSION } from '../../utils/constants';
|
|
4
4
|
import { View } from '../core/view';
|
|
@@ -43,6 +43,9 @@ export class ScrollView extends ScrollViewBase {
|
|
|
43
43
|
super.initNativeView();
|
|
44
44
|
this.updateScrollBarVisibility(this.scrollBarIndicatorVisible);
|
|
45
45
|
this._setNativeClipToBounds();
|
|
46
|
+
// UIKit defaults to `automatic` while the property defaults to `never`, and
|
|
47
|
+
// setNative only runs for non-default values — so apply it up front.
|
|
48
|
+
this.updateContentInsetAdjustmentBehavior(this.iosContentInsetAdjustmentBehavior);
|
|
46
49
|
}
|
|
47
50
|
disposeNativeView() {
|
|
48
51
|
super.disposeNativeView();
|
|
@@ -80,6 +83,23 @@ export class ScrollView extends ScrollViewBase {
|
|
|
80
83
|
this.nativeViewProtected.showsVerticalScrollIndicator = value;
|
|
81
84
|
}
|
|
82
85
|
}
|
|
86
|
+
updateContentInsetAdjustmentBehavior(value) {
|
|
87
|
+
if (!this.nativeViewProtected || SDK_VERSION <= 10) {
|
|
88
|
+
return;
|
|
89
|
+
}
|
|
90
|
+
// https://developer.apple.com/documentation/uikit/uiscrollview/contentinsetadjustmentbehavior
|
|
91
|
+
let behavior = 2 /* UIScrollViewContentInsetAdjustmentBehavior.Never */;
|
|
92
|
+
if (value === 'automatic') {
|
|
93
|
+
behavior = 0 /* UIScrollViewContentInsetAdjustmentBehavior.Automatic */;
|
|
94
|
+
}
|
|
95
|
+
else if (value === 'scrollableAxes') {
|
|
96
|
+
behavior = 1 /* UIScrollViewContentInsetAdjustmentBehavior.ScrollableAxes */;
|
|
97
|
+
}
|
|
98
|
+
else if (value === 'always') {
|
|
99
|
+
behavior = 3 /* UIScrollViewContentInsetAdjustmentBehavior.Always */;
|
|
100
|
+
}
|
|
101
|
+
this.nativeViewProtected.contentInsetAdjustmentBehavior = behavior;
|
|
102
|
+
}
|
|
83
103
|
get horizontalOffset() {
|
|
84
104
|
return this.nativeViewProtected ? this.nativeViewProtected.contentOffset.x : 0;
|
|
85
105
|
}
|
|
@@ -110,6 +130,9 @@ export class ScrollView extends ScrollViewBase {
|
|
|
110
130
|
[scrollBarIndicatorVisibleProperty.setNative](value) {
|
|
111
131
|
this.updateScrollBarVisibility(value);
|
|
112
132
|
}
|
|
133
|
+
[iosContentInsetAdjustmentBehaviorProperty.setNative](value) {
|
|
134
|
+
this.updateContentInsetAdjustmentBehavior(value);
|
|
135
|
+
}
|
|
113
136
|
scrollToVerticalOffset(value, animated) {
|
|
114
137
|
if (this.nativeViewProtected && this.orientation === 'vertical' && this.isScrollEnabled) {
|
|
115
138
|
const bounds = this.nativeViewProtected.bounds.size;
|
|
@@ -150,25 +173,8 @@ export class ScrollView extends ScrollViewBase {
|
|
|
150
173
|
if (!this.nativeViewProtected) {
|
|
151
174
|
return;
|
|
152
175
|
}
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
// 0=automatic, 1=scrollableAxes, 2=never, 3=always
|
|
156
|
-
const behavior = this.iosContentInsetAdjustmentBehavior;
|
|
157
|
-
let nativeBehavior = 2; // .never (preserves prior default)
|
|
158
|
-
if (behavior === 'automatic')
|
|
159
|
-
nativeBehavior = 0;
|
|
160
|
-
else if (behavior === 'scrollableAxes')
|
|
161
|
-
nativeBehavior = 1;
|
|
162
|
-
else if (behavior === 'always')
|
|
163
|
-
nativeBehavior = 3;
|
|
164
|
-
this.nativeViewProtected.contentInsetAdjustmentBehavior = nativeBehavior;
|
|
165
|
-
}
|
|
166
|
-
// When iOS' automatic content-inset adjustment is in use, do NOT subtract the
|
|
167
|
-
// scrollview's safe-area insets (which include the dynamic navigation bar height
|
|
168
|
-
// when `prefersLargeTitles` is on). Doing so causes contentSize and inner-content
|
|
169
|
-
// position to oscillate as the navbar grows/shrinks, producing scroll drift
|
|
170
|
-
// during fast scroll-up + rubber-band bounce. iOS will set
|
|
171
|
-
// `adjustedContentInset` itself so the content visually sits below the navbar.
|
|
176
|
+
// When iOS adjusts content insets itself, don't also subtract safe-area insets here —
|
|
177
|
+
// doing both makes contentSize track the dynamic navbar height and causes scroll drift with large titles.
|
|
172
178
|
const useIOSInsetAdjustment = SDK_VERSION > 10 && this.iosContentInsetAdjustmentBehavior !== 'never';
|
|
173
179
|
const insets = useIOSInsetAdjustment ? { left: 0, top: 0, right: 0, bottom: 0 } : this.getSafeAreaInsets();
|
|
174
180
|
let scrollWidth = right - left - insets.right - insets.left;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/scroll-view/index.ios.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,iCAAiC,EAAE,uBAAuB,
|
|
1
|
+
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/scroll-view/index.ios.ts"],"names":[],"mappings":"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"}
|
|
@@ -94,7 +94,7 @@ const insetAdjustmentConverter = makeParser(makeValidator('never', 'automatic',
|
|
|
94
94
|
export const iosContentInsetAdjustmentBehaviorProperty = new Property({
|
|
95
95
|
name: 'iosContentInsetAdjustmentBehavior',
|
|
96
96
|
defaultValue: 'never',
|
|
97
|
-
affectsLayout:
|
|
97
|
+
affectsLayout: __APPLE__,
|
|
98
98
|
valueConverter: insetAdjustmentConverter,
|
|
99
99
|
});
|
|
100
100
|
iosContentInsetAdjustmentBehaviorProperty.register(ScrollViewBase);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scroll-view-common.js","sourceRoot":"","sources":["../../../../../packages/core/ui/scroll-view/scroll-view-common.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"scroll-view-common.js","sourceRoot":"","sources":["../../../../../packages/core/ui/scroll-view/scroll-view-common.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { DataType as CSSWhatDataType } from 'css-what';
|
|
2
2
|
import '../../globals';
|
|
3
3
|
import * as ReworkCSS from '../../css';
|
|
4
|
-
export declare const MEDIA_QUERY_SEPARATOR = "&&";
|
|
5
4
|
/**
|
|
6
5
|
* An interface describing the shape of a type on which the selectors may apply.
|
|
7
6
|
* Note, the ui/core/view.View implements Node.
|
|
@@ -62,6 +61,14 @@ export declare abstract class SelectorBase {
|
|
|
62
61
|
* Dynamic selectors depend on attributes and pseudo classes.
|
|
63
62
|
*/
|
|
64
63
|
dynamic: boolean;
|
|
64
|
+
/**
|
|
65
|
+
* Selector contains an adjacent sibling ('+') combinator, so its match depends on the direct previous sibling.
|
|
66
|
+
*/
|
|
67
|
+
hasAdjacentCombinator: boolean;
|
|
68
|
+
/**
|
|
69
|
+
* Selector contains a general sibling ('~') combinator, so its match depends on all previous siblings.
|
|
70
|
+
*/
|
|
71
|
+
hasSiblingCombinator: boolean;
|
|
65
72
|
abstract match(node: Node): boolean;
|
|
66
73
|
abstract mayMatch(node: Node): boolean;
|
|
67
74
|
abstract trackChanges(node: Node, map: ChangeAccumulator): void;
|
|
@@ -201,7 +208,7 @@ export declare namespace Selector {
|
|
|
201
208
|
export declare class RuleSet {
|
|
202
209
|
selectors: SelectorCore[];
|
|
203
210
|
declarations: Declaration[];
|
|
204
|
-
mediaQueryString: string;
|
|
211
|
+
mediaQueryString: string | string[];
|
|
205
212
|
tag?: string | number;
|
|
206
213
|
scopedTag?: string;
|
|
207
214
|
constructor(selectors: SelectorCore[], declarations: Declaration[]);
|
|
@@ -210,13 +217,21 @@ export declare class RuleSet {
|
|
|
210
217
|
}
|
|
211
218
|
export declare function fromAstNode(astRule: ReworkCSS.Rule): RuleSet;
|
|
212
219
|
export declare function createSelector(sel: string): SimpleSelector | SimpleSelectorSequence | ComplexSelector;
|
|
213
|
-
export declare function matchMediaQueryString(mediaQueryString: string, cachedQueries: string[]): boolean;
|
|
220
|
+
export declare function matchMediaQueryString(mediaQueryString: string | string[], cachedQueries: string[]): boolean;
|
|
214
221
|
export declare abstract class SelectorScope<T extends Node> implements LookupSorter {
|
|
215
222
|
private id;
|
|
216
223
|
private class;
|
|
217
224
|
private type;
|
|
218
225
|
private universal;
|
|
219
226
|
position: number;
|
|
227
|
+
/**
|
|
228
|
+
* True when any selector in the scope contains an adjacent sibling ('+') combinator.
|
|
229
|
+
*/
|
|
230
|
+
hasAdjacentCombinatorSelectors: boolean;
|
|
231
|
+
/**
|
|
232
|
+
* True when any selector in the scope contains a general sibling ('~') combinator.
|
|
233
|
+
*/
|
|
234
|
+
hasSiblingCombinatorSelectors: boolean;
|
|
220
235
|
getSelectorCandidates(node: T): SelectorCore[];
|
|
221
236
|
sortById(id: string, sel: SelectorCore): void;
|
|
222
237
|
sortByClass(cssClass: string, sel: SelectorCore): void;
|
|
@@ -227,8 +242,8 @@ export declare abstract class SelectorScope<T extends Node> implements LookupSor
|
|
|
227
242
|
}
|
|
228
243
|
export declare class MediaQuerySelectorScope<T extends Node> extends SelectorScope<T> {
|
|
229
244
|
private _mediaQueryString;
|
|
230
|
-
constructor(mediaQueryString: string);
|
|
231
|
-
get mediaQueryString(): string;
|
|
245
|
+
constructor(mediaQueryString: string | string[]);
|
|
246
|
+
get mediaQueryString(): string | string[];
|
|
232
247
|
}
|
|
233
248
|
export declare class StyleSheetSelectorScope<T extends Node> extends SelectorScope<T> {
|
|
234
249
|
private mediaQuerySelectorScopes;
|
|
@@ -3,7 +3,6 @@ import '../../globals';
|
|
|
3
3
|
import { isCssVariable } from '../core/properties';
|
|
4
4
|
import { isNullOrUndefined } from '../../utils/types';
|
|
5
5
|
import { checkIfMediaQueryMatches } from '../../media-query-list';
|
|
6
|
-
export const MEDIA_QUERY_SEPARATOR = '&&';
|
|
7
6
|
var Combinator;
|
|
8
7
|
(function (Combinator) {
|
|
9
8
|
Combinator["descendant"] = " ";
|
|
@@ -66,6 +65,8 @@ function SelectorProperties(specificity, rarity, dynamic = false) {
|
|
|
66
65
|
cls.prototype.rarity = rarity;
|
|
67
66
|
cls.prototype.combinator = undefined;
|
|
68
67
|
cls.prototype.dynamic = dynamic;
|
|
68
|
+
cls.prototype.hasAdjacentCombinator = false;
|
|
69
|
+
cls.prototype.hasSiblingCombinator = false;
|
|
69
70
|
return cls;
|
|
70
71
|
};
|
|
71
72
|
}
|
|
@@ -75,6 +76,8 @@ function FunctionalPseudoClassProperties(specificity, rarity, pseudoSelectorList
|
|
|
75
76
|
cls.prototype.rarity = rarity;
|
|
76
77
|
cls.prototype.combinator = undefined;
|
|
77
78
|
cls.prototype.dynamic = false;
|
|
79
|
+
cls.prototype.hasAdjacentCombinator = false;
|
|
80
|
+
cls.prototype.hasSiblingCombinator = false;
|
|
78
81
|
cls.prototype.pseudoSelectorListType = pseudoSelectorListType;
|
|
79
82
|
return cls;
|
|
80
83
|
};
|
|
@@ -213,6 +216,10 @@ let AttributeSelector = class AttributeSelector extends SimpleSelector {
|
|
|
213
216
|
this.test = test;
|
|
214
217
|
this.value = value;
|
|
215
218
|
this.ignoreCase = ignoreCase;
|
|
219
|
+
// Normalize once at construction instead of on every match
|
|
220
|
+
if (ignoreCase && value) {
|
|
221
|
+
this.value = value.toLowerCase();
|
|
222
|
+
}
|
|
216
223
|
}
|
|
217
224
|
toString() {
|
|
218
225
|
return `[${this.attribute}${wrap(AttributeSelectorOperator[this.test] ?? this.test)}${this.value || ''}]${wrap(this.combinator)}`;
|
|
@@ -229,7 +236,6 @@ let AttributeSelector = class AttributeSelector extends SimpleSelector {
|
|
|
229
236
|
attr += '';
|
|
230
237
|
if (this.ignoreCase) {
|
|
231
238
|
attr = attr.toLowerCase();
|
|
232
|
-
this.value = this.value.toLowerCase();
|
|
233
239
|
}
|
|
234
240
|
// =
|
|
235
241
|
if (this.test === 'equals') {
|
|
@@ -322,6 +328,8 @@ export class FunctionalPseudoClassSelector extends PseudoClassSelector {
|
|
|
322
328
|
this.specificity = specificity;
|
|
323
329
|
// Functional pseudo-classes become dynamic based on selectors in selector list
|
|
324
330
|
this.dynamic = this.selectors.some((sel) => sel.dynamic);
|
|
331
|
+
this.hasAdjacentCombinator = this.selectors.some((sel) => sel.hasAdjacentCombinator);
|
|
332
|
+
this.hasSiblingCombinator = this.selectors.some((sel) => sel.hasSiblingCombinator);
|
|
325
333
|
}
|
|
326
334
|
toString() {
|
|
327
335
|
return `:${this.cssPseudoClass}(${this.selectors.join(', ')})${wrap(this.combinator)}`;
|
|
@@ -388,18 +396,35 @@ export class SimpleSelectorSequence extends SimpleSelector {
|
|
|
388
396
|
this.specificity = selectors.reduce((sum, sel) => sel.specificity + sum, 0);
|
|
389
397
|
this.head = selectors.reduce((prev, curr) => (!prev || curr.rarity > prev.rarity ? curr : prev), null);
|
|
390
398
|
this.dynamic = selectors.some((sel) => sel.dynamic);
|
|
399
|
+
this.hasAdjacentCombinator = selectors.some((sel) => sel.hasAdjacentCombinator);
|
|
400
|
+
this.hasSiblingCombinator = selectors.some((sel) => sel.hasSiblingCombinator);
|
|
391
401
|
}
|
|
392
402
|
toString() {
|
|
393
403
|
return `${this.selectors.join('')}${wrap(this.combinator)}`;
|
|
394
404
|
}
|
|
395
405
|
match(node) {
|
|
396
|
-
|
|
406
|
+
const selectors = this.selectors;
|
|
407
|
+
for (let i = 0, length = selectors.length; i < length; i++) {
|
|
408
|
+
if (!selectors[i].match(node)) {
|
|
409
|
+
return false;
|
|
410
|
+
}
|
|
411
|
+
}
|
|
412
|
+
return true;
|
|
397
413
|
}
|
|
398
414
|
mayMatch(node) {
|
|
399
|
-
|
|
415
|
+
const selectors = this.selectors;
|
|
416
|
+
for (let i = 0, length = selectors.length; i < length; i++) {
|
|
417
|
+
if (!selectors[i].mayMatch(node)) {
|
|
418
|
+
return false;
|
|
419
|
+
}
|
|
420
|
+
}
|
|
421
|
+
return true;
|
|
400
422
|
}
|
|
401
423
|
trackChanges(node, map) {
|
|
402
|
-
|
|
424
|
+
const selectors = this.selectors;
|
|
425
|
+
for (let i = 0, length = selectors.length; i < length; i++) {
|
|
426
|
+
selectors[i].trackChanges(node, map);
|
|
427
|
+
}
|
|
403
428
|
}
|
|
404
429
|
lookupSort(sorter, base) {
|
|
405
430
|
this.head.lookupSort(sorter, base || this);
|
|
@@ -414,6 +439,8 @@ export class ComplexSelector extends SelectorCore {
|
|
|
414
439
|
const groups = [];
|
|
415
440
|
this.specificity = 0;
|
|
416
441
|
this.dynamic = false;
|
|
442
|
+
this.hasAdjacentCombinator = false;
|
|
443
|
+
this.hasSiblingCombinator = false;
|
|
417
444
|
for (let i = selectors.length - 1; i >= 0; i--) {
|
|
418
445
|
const sel = selectors[i];
|
|
419
446
|
switch (sel.combinator) {
|
|
@@ -428,7 +455,10 @@ export class ComplexSelector extends SelectorCore {
|
|
|
428
455
|
currentGroup.push(siblingsToGroup);
|
|
429
456
|
break;
|
|
430
457
|
case Combinator.adjacent:
|
|
458
|
+
this.hasAdjacentCombinator = true;
|
|
459
|
+
break;
|
|
431
460
|
case Combinator.sibling:
|
|
461
|
+
this.hasSiblingCombinator = true;
|
|
432
462
|
break;
|
|
433
463
|
default:
|
|
434
464
|
throw new Error(`Unsupported combinator "${sel.combinator}" for selector ${sel}.`);
|
|
@@ -437,6 +467,12 @@ export class ComplexSelector extends SelectorCore {
|
|
|
437
467
|
if (sel.dynamic) {
|
|
438
468
|
this.dynamic = true;
|
|
439
469
|
}
|
|
470
|
+
if (sel.hasAdjacentCombinator) {
|
|
471
|
+
this.hasAdjacentCombinator = true;
|
|
472
|
+
}
|
|
473
|
+
if (sel.hasSiblingCombinator) {
|
|
474
|
+
this.hasSiblingCombinator = true;
|
|
475
|
+
}
|
|
440
476
|
siblingsToGroup.push(sel);
|
|
441
477
|
}
|
|
442
478
|
this.groups = groups.map((g) => new Selector.ChildGroup(g.map((selectors) => (selectors.length > 1 ? new Selector.SiblingGroup(selectors) : selectors[0]))));
|
|
@@ -446,27 +482,39 @@ export class ComplexSelector extends SelectorCore {
|
|
|
446
482
|
return this.selectors.join('');
|
|
447
483
|
}
|
|
448
484
|
match(node) {
|
|
449
|
-
|
|
485
|
+
const groups = this.groups;
|
|
486
|
+
for (let i = 0, length = groups.length; i < length; i++) {
|
|
487
|
+
const group = groups[i];
|
|
450
488
|
if (i === 0) {
|
|
451
489
|
node = group.getMatchingNode(node, true);
|
|
452
|
-
|
|
490
|
+
if (!node) {
|
|
491
|
+
return false;
|
|
492
|
+
}
|
|
453
493
|
}
|
|
454
494
|
else {
|
|
455
495
|
let ancestor = node;
|
|
496
|
+
let matched = false;
|
|
456
497
|
while ((ancestor = ancestor.parent ?? ancestor._modalParent)) {
|
|
457
498
|
if ((node = group.getMatchingNode(ancestor, true))) {
|
|
458
|
-
|
|
499
|
+
matched = true;
|
|
500
|
+
break;
|
|
459
501
|
}
|
|
460
502
|
}
|
|
461
|
-
|
|
503
|
+
if (!matched) {
|
|
504
|
+
return false;
|
|
505
|
+
}
|
|
462
506
|
}
|
|
463
|
-
}
|
|
507
|
+
}
|
|
508
|
+
return true;
|
|
464
509
|
}
|
|
465
510
|
mayMatch(node) {
|
|
466
511
|
return false;
|
|
467
512
|
}
|
|
468
513
|
trackChanges(node, map) {
|
|
469
|
-
|
|
514
|
+
const selectors = this.selectors;
|
|
515
|
+
for (let i = 0, length = selectors.length; i < length; i++) {
|
|
516
|
+
selectors[i].trackChanges(node, map);
|
|
517
|
+
}
|
|
470
518
|
}
|
|
471
519
|
lookupSort(sorter, base) {
|
|
472
520
|
this.last.lookupSort(sorter, base || this);
|
|
@@ -529,8 +577,20 @@ export var Selector;
|
|
|
529
577
|
this.dynamic = selectors.some((sel) => sel.dynamic);
|
|
530
578
|
}
|
|
531
579
|
getMatchingNode(node, strict) {
|
|
532
|
-
const
|
|
533
|
-
|
|
580
|
+
const selectors = this.selectors;
|
|
581
|
+
for (let i = 0, length = selectors.length; i < length; i++) {
|
|
582
|
+
if (i !== 0) {
|
|
583
|
+
node = node.parent;
|
|
584
|
+
}
|
|
585
|
+
if (!node) {
|
|
586
|
+
return null;
|
|
587
|
+
}
|
|
588
|
+
const sel = selectors[i];
|
|
589
|
+
if (!(strict ? sel.match(node) : sel.mayMatch(node))) {
|
|
590
|
+
return null;
|
|
591
|
+
}
|
|
592
|
+
}
|
|
593
|
+
return node;
|
|
534
594
|
}
|
|
535
595
|
match(node) {
|
|
536
596
|
return this.getMatchingNode(node, true) != null;
|
|
@@ -759,22 +819,40 @@ function isDeclaration(node) {
|
|
|
759
819
|
return node.type === 'declaration';
|
|
760
820
|
}
|
|
761
821
|
export function matchMediaQueryString(mediaQueryString, cachedQueries) {
|
|
762
|
-
|
|
763
|
-
|
|
764
|
-
|
|
765
|
-
|
|
822
|
+
if (!mediaQueryString) {
|
|
823
|
+
return false;
|
|
824
|
+
}
|
|
825
|
+
if (typeof mediaQueryString === 'string') {
|
|
826
|
+
// Query has already been validated
|
|
827
|
+
if (cachedQueries.includes(mediaQueryString)) {
|
|
828
|
+
return true;
|
|
829
|
+
}
|
|
830
|
+
const result = checkIfMediaQueryMatches(mediaQueryString);
|
|
831
|
+
if (result) {
|
|
832
|
+
cachedQueries.push(mediaQueryString);
|
|
833
|
+
return result;
|
|
834
|
+
}
|
|
835
|
+
return false;
|
|
836
|
+
}
|
|
837
|
+
for (let i = 0, length = mediaQueryString.length; i < length; i++) {
|
|
838
|
+
const mq = mediaQueryString[i];
|
|
766
839
|
// Query has already been validated
|
|
767
840
|
if (cachedQueries.includes(mq)) {
|
|
768
|
-
|
|
841
|
+
continue;
|
|
769
842
|
}
|
|
770
|
-
|
|
771
|
-
|
|
772
|
-
if (isMatching) {
|
|
773
|
-
cachedQueries.push(mq);
|
|
774
|
-
}
|
|
843
|
+
if (!checkIfMediaQueryMatches(mq)) {
|
|
844
|
+
return false;
|
|
775
845
|
}
|
|
776
|
-
|
|
777
|
-
}
|
|
846
|
+
cachedQueries.push(mq);
|
|
847
|
+
}
|
|
848
|
+
return true;
|
|
849
|
+
}
|
|
850
|
+
function appendSelectorCandidates(candidates, selectors) {
|
|
851
|
+
if (selectors) {
|
|
852
|
+
for (let i = 0, length = selectors.length; i < length; i++) {
|
|
853
|
+
candidates.push(selectors[i]);
|
|
854
|
+
}
|
|
855
|
+
}
|
|
778
856
|
}
|
|
779
857
|
export class SelectorScope {
|
|
780
858
|
constructor() {
|
|
@@ -783,14 +861,25 @@ export class SelectorScope {
|
|
|
783
861
|
this.type = {};
|
|
784
862
|
this.universal = [];
|
|
785
863
|
this.position = 0;
|
|
864
|
+
/**
|
|
865
|
+
* True when any selector in the scope contains an adjacent sibling ('+') combinator.
|
|
866
|
+
*/
|
|
867
|
+
this.hasAdjacentCombinatorSelectors = false;
|
|
868
|
+
/**
|
|
869
|
+
* True when any selector in the scope contains a general sibling ('~') combinator.
|
|
870
|
+
*/
|
|
871
|
+
this.hasSiblingCombinatorSelectors = false;
|
|
786
872
|
}
|
|
787
873
|
getSelectorCandidates(node) {
|
|
788
874
|
const { cssClasses, id, cssType } = node;
|
|
789
|
-
const
|
|
875
|
+
const candidates = [];
|
|
876
|
+
appendSelectorCandidates(candidates, this.universal);
|
|
877
|
+
appendSelectorCandidates(candidates, this.id[id]);
|
|
878
|
+
appendSelectorCandidates(candidates, this.type[cssType]);
|
|
790
879
|
if (cssClasses && cssClasses.size) {
|
|
791
|
-
cssClasses.forEach((c) =>
|
|
880
|
+
cssClasses.forEach((c) => appendSelectorCandidates(candidates, this.class[c]));
|
|
792
881
|
}
|
|
793
|
-
return
|
|
882
|
+
return candidates;
|
|
794
883
|
}
|
|
795
884
|
sortById(id, sel) {
|
|
796
885
|
this.addToMap(this.id, id, sel);
|
|
@@ -811,6 +900,12 @@ export class SelectorScope {
|
|
|
811
900
|
map[head].push(this.makeDocSelector(sel));
|
|
812
901
|
}
|
|
813
902
|
makeDocSelector(sel) {
|
|
903
|
+
if (sel.hasAdjacentCombinator) {
|
|
904
|
+
this.hasAdjacentCombinatorSelectors = true;
|
|
905
|
+
}
|
|
906
|
+
if (sel.hasSiblingCombinator) {
|
|
907
|
+
this.hasSiblingCombinatorSelectors = true;
|
|
908
|
+
}
|
|
814
909
|
sel.pos = this.position++;
|
|
815
910
|
return sel;
|
|
816
911
|
}
|
|
@@ -865,6 +960,17 @@ export class StyleSheetSelectorScope extends SelectorScope {
|
|
|
865
960
|
this.position = lastMediaSelectorScope.position;
|
|
866
961
|
lastMediaSelectorScope = null;
|
|
867
962
|
}
|
|
963
|
+
// Media query scopes are queried through this scope, so their combinator flags roll up
|
|
964
|
+
if (this.mediaQuerySelectorScopes) {
|
|
965
|
+
for (const selectorScope of this.mediaQuerySelectorScopes) {
|
|
966
|
+
if (selectorScope.hasAdjacentCombinatorSelectors) {
|
|
967
|
+
this.hasAdjacentCombinatorSelectors = true;
|
|
968
|
+
}
|
|
969
|
+
if (selectorScope.hasSiblingCombinatorSelectors) {
|
|
970
|
+
this.hasSiblingCombinatorSelectors = true;
|
|
971
|
+
}
|
|
972
|
+
}
|
|
973
|
+
}
|
|
868
974
|
}
|
|
869
975
|
query(node) {
|
|
870
976
|
const selectorsMatch = new SelectorsMatch();
|