@nativescript/core 8.3.3-next-08-08-2022-2818886196 → 8.3.3
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 +1 -1
- package/platforms/android/widgets-release.aar +0 -0
- package/platforms/ios/TNSWidgets.xcframework/Info.plist +7 -7
- 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_x86_64-maccatalyst/TNSWidgets.framework/Resources/Info.plist +1 -1
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/TNSWidgets +0 -0
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Resources/Info.plist +1 -1
- 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/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-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/ui/core/view/view-helper/index.ios.js +9 -4
- package/ui/core/view/view-helper/index.ios.js.map +1 -1
- package/ui/page/index.ios.js +7 -2
- package/ui/page/index.ios.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nativescript/core",
|
|
3
|
-
"version": "8.3.3
|
|
3
|
+
"version": "8.3.3",
|
|
4
4
|
"description": "A JavaScript library providing an easy to use api for interacting with iOS and Android platform APIs.",
|
|
5
5
|
"main": "index",
|
|
6
6
|
"types": "index.d.ts",
|
|
Binary file
|
|
@@ -8,38 +8,38 @@
|
|
|
8
8
|
<key>DebugSymbolsPath</key>
|
|
9
9
|
<string>dSYMs</string>
|
|
10
10
|
<key>LibraryIdentifier</key>
|
|
11
|
-
<string>ios-
|
|
11
|
+
<string>ios-arm64</string>
|
|
12
12
|
<key>LibraryPath</key>
|
|
13
13
|
<string>TNSWidgets.framework</string>
|
|
14
14
|
<key>SupportedArchitectures</key>
|
|
15
15
|
<array>
|
|
16
16
|
<string>arm64</string>
|
|
17
|
-
<string>x86_64</string>
|
|
18
17
|
</array>
|
|
19
18
|
<key>SupportedPlatform</key>
|
|
20
19
|
<string>ios</string>
|
|
21
|
-
<key>SupportedPlatformVariant</key>
|
|
22
|
-
<string>maccatalyst</string>
|
|
23
20
|
</dict>
|
|
24
21
|
<dict>
|
|
25
22
|
<key>DebugSymbolsPath</key>
|
|
26
23
|
<string>dSYMs</string>
|
|
27
24
|
<key>LibraryIdentifier</key>
|
|
28
|
-
<string>ios-
|
|
25
|
+
<string>ios-arm64_x86_64-simulator</string>
|
|
29
26
|
<key>LibraryPath</key>
|
|
30
27
|
<string>TNSWidgets.framework</string>
|
|
31
28
|
<key>SupportedArchitectures</key>
|
|
32
29
|
<array>
|
|
33
30
|
<string>arm64</string>
|
|
31
|
+
<string>x86_64</string>
|
|
34
32
|
</array>
|
|
35
33
|
<key>SupportedPlatform</key>
|
|
36
34
|
<string>ios</string>
|
|
35
|
+
<key>SupportedPlatformVariant</key>
|
|
36
|
+
<string>simulator</string>
|
|
37
37
|
</dict>
|
|
38
38
|
<dict>
|
|
39
39
|
<key>DebugSymbolsPath</key>
|
|
40
40
|
<string>dSYMs</string>
|
|
41
41
|
<key>LibraryIdentifier</key>
|
|
42
|
-
<string>ios-arm64_x86_64-
|
|
42
|
+
<string>ios-arm64_x86_64-maccatalyst</string>
|
|
43
43
|
<key>LibraryPath</key>
|
|
44
44
|
<string>TNSWidgets.framework</string>
|
|
45
45
|
<key>SupportedArchitectures</key>
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
<key>SupportedPlatform</key>
|
|
51
51
|
<string>ios</string>
|
|
52
52
|
<key>SupportedPlatformVariant</key>
|
|
53
|
-
<string>
|
|
53
|
+
<string>maccatalyst</string>
|
|
54
54
|
</dict>
|
|
55
55
|
</array>
|
|
56
56
|
<key>CFBundlePackageType</key>
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -47,10 +47,15 @@ var UILayoutViewController = /** @class */ (function (_super) {
|
|
|
47
47
|
}
|
|
48
48
|
if (parent) {
|
|
49
49
|
var parentPageInsetsTop = parent.nativeViewProtected.safeAreaInsets.top;
|
|
50
|
-
var currentInsetsTop = this.view.safeAreaInsets.top;
|
|
51
|
-
var additionalInsetsTop = Math.max(parentPageInsetsTop - currentInsetsTop, 0);
|
|
52
50
|
var parentPageInsetsBottom = parent.nativeViewProtected.safeAreaInsets.bottom;
|
|
51
|
+
var currentInsetsTop = this.view.safeAreaInsets.top;
|
|
53
52
|
var currentInsetsBottom = this.view.safeAreaInsets.bottom;
|
|
53
|
+
// Safe area insets include additional safe area insets too, so subtract old values
|
|
54
|
+
if (this.additionalSafeAreaInsets) {
|
|
55
|
+
currentInsetsTop -= this.additionalSafeAreaInsets.top;
|
|
56
|
+
currentInsetsBottom -= this.additionalSafeAreaInsets.bottom;
|
|
57
|
+
}
|
|
58
|
+
var additionalInsetsTop = Math.max(parentPageInsetsTop - currentInsetsTop, 0);
|
|
54
59
|
var additionalInsetsBottom = Math.max(parentPageInsetsBottom - currentInsetsBottom, 0);
|
|
55
60
|
if (additionalInsetsTop > 0 || additionalInsetsBottom > 0) {
|
|
56
61
|
var additionalInsets = new UIEdgeInsets({
|
|
@@ -231,10 +236,10 @@ export class IOSHelper {
|
|
|
231
236
|
const fullscreenPosition = IOSHelper.getPositionFromFrame(fullscreen);
|
|
232
237
|
const inWindowPosition = IOSHelper.getPositionFromFrame(inWindow);
|
|
233
238
|
const adjustedPosition = position;
|
|
234
|
-
if (position.left && inWindowPosition.left
|
|
239
|
+
if (position.left && inWindowPosition.left <= safeAreaPosition.left) {
|
|
235
240
|
adjustedPosition.left = fullscreenPosition.left;
|
|
236
241
|
}
|
|
237
|
-
if (position.top && inWindowPosition.top
|
|
242
|
+
if (position.top && inWindowPosition.top <= safeAreaPosition.top) {
|
|
238
243
|
adjustedPosition.top = fullscreenPosition.top;
|
|
239
244
|
}
|
|
240
245
|
if (inWindowPosition.right < fullscreenPosition.right && inWindowPosition.right >= safeAreaPosition.right + fullscreenPosition.left) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../../../packages/core/ui/core/view/view-helper/index.ios.ts"],"names":[],"mappings":"AAGA,WAAW;AACX,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,cAAc,sBAAsB,CAAC;AAErC,MAAM,YAAY,GAAG,eAAe,CAAC,YAAY,CAAC
|
|
1
|
+
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../../../packages/core/ui/core/view/view-helper/index.ios.ts"],"names":[],"mappings":"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"}
|
package/ui/page/index.ios.js
CHANGED
|
@@ -228,10 +228,15 @@ var UIViewControllerImpl = /** @class */ (function (_super) {
|
|
|
228
228
|
}
|
|
229
229
|
if (frameParent) {
|
|
230
230
|
var parentPageInsetsTop = frameParent.nativeViewProtected.safeAreaInsets.top;
|
|
231
|
-
var currentInsetsTop = this.view.safeAreaInsets.top;
|
|
232
|
-
var additionalInsetsTop = Math.max(parentPageInsetsTop - currentInsetsTop, 0);
|
|
233
231
|
var parentPageInsetsBottom = frameParent.nativeViewProtected.safeAreaInsets.bottom;
|
|
232
|
+
var currentInsetsTop = this.view.safeAreaInsets.top;
|
|
234
233
|
var currentInsetsBottom = this.view.safeAreaInsets.bottom;
|
|
234
|
+
// Safe area insets include additional safe area insets too, so subtract old values
|
|
235
|
+
if (this.additionalSafeAreaInsets) {
|
|
236
|
+
currentInsetsTop -= this.additionalSafeAreaInsets.top;
|
|
237
|
+
currentInsetsBottom -= this.additionalSafeAreaInsets.bottom;
|
|
238
|
+
}
|
|
239
|
+
var additionalInsetsTop = Math.max(parentPageInsetsTop - currentInsetsTop, 0);
|
|
235
240
|
var additionalInsetsBottom = Math.max(parentPageInsetsBottom - currentInsetsBottom, 0);
|
|
236
241
|
if (additionalInsetsTop > 0 || additionalInsetsBottom > 0) {
|
|
237
242
|
var additionalInsets = new UIEdgeInsets({
|
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,eAAe,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,wBAAwB,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AAE9F,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,MAAM,YAAY,GAAG,eAAe,CAAC,YAAY,CAAC;AAElD,SAAS,kBAAkB,CAAC,IAAU,EAAE,KAAK;IAC5C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;IACzB,IAAI,CAAC,KAAK,EAAE;QACX,OAAO,KAAK,CAAC;KACb;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;QACd,OAAO,KAAK,CAAC;KACb;IAED,IAAI,KAAK,CAAC,sBAAsB,EAAE,EAAE;QACnC,OAAO,IAAI,CAAC;KACZ;IAED,MAAM,eAAe,GAAS,KAAM,CAAC,gBAAgB,CAAC;IACtD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAChD,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,EAAE;YACvC,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC,cAAc,KAAK,cAAc,CAAC,IAAI,CAAC;SACjE;KACD;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAED,SAAS,oBAAoB,CAAC,UAAgC,EAAE,IAAU;IACzE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;QAChB,OAAO,KAAK,CAAC;KACb;IAED,6CAA6C;IAC7C,IAAI,UAAU,CAAC,kBAAkB,IAAI,UAAU,CAAC,kBAAkB,EAAE;QACnE,OAAO,KAAK,CAAC;KACb;IAED,IAAI,UAAU,CAAC,oBAAoB,IAAI,UAAU,CAAC,oBAAoB,CAAC,eAAe,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE;QAClH,OAAO,KAAK,CAAC;KACb;IAED,OAAO,IAAI,CAAC;AACb,CAAC
|
|
1
|
+
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/page/index.ios.ts"],"names":[],"mappings":"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"}
|