@nativescript/core 8.3.6 → 8.4.0-next-11-12-2022-3452147114
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/accessibility/accessibility-service.android.js +1 -1
- package/accessibility/accessibility-service.android.js.map +1 -1
- package/accessibility/index.android.js +4 -3
- package/accessibility/index.android.js.map +1 -1
- package/application/index.android.js +11 -0
- package/application/index.android.js.map +1 -1
- package/application/index.ios.js.map +1 -1
- package/color/index.ios.js +6 -2
- package/color/index.ios.js.map +1 -1
- package/connectivity/index.android.js +4 -3
- package/connectivity/index.android.js.map +1 -1
- package/data/observable/index.js +9 -2
- package/data/observable/index.js.map +1 -1
- package/debugger/webinspector-css.ios.js.map +1 -1
- package/debugger/webinspector-dom.ios.js.map +1 -1
- package/debugger/webinspector-network.ios.js.map +1 -1
- package/file-system/file-system-access.android.js +13 -2
- package/file-system/file-system-access.android.js.map +1 -1
- package/file-system/index.js +2 -2
- package/file-system/index.js.map +1 -1
- package/fps-meter/fps-native.android.d.ts +1 -1
- package/fps-meter/fps-native.android.js +6 -6
- package/fps-meter/fps-native.android.js.map +1 -1
- package/package.json +1 -1
- package/platform/index.android.js +3 -2
- package/platform/index.android.js.map +1 -1
- package/platforms/android/widgets-release.aar +0 -0
- package/platforms/ios/src/UIView+NativeScript.h +1 -1
- package/platforms/ios/src/UIView+NativeScript.m +13 -7
- package/ui/action-bar/action-bar-common.js.map +1 -1
- package/ui/action-bar/index.android.js +9 -13
- package/ui/action-bar/index.android.js.map +1 -1
- package/ui/activity-indicator/activity-indicator-common.js.map +1 -1
- package/ui/animation/index.android.d.ts +1 -1
- package/ui/animation/index.android.js +3 -3
- package/ui/animation/index.android.js.map +1 -1
- package/ui/animation/index.ios.js +17 -17
- package/ui/animation/index.ios.js.map +1 -1
- package/ui/builder/binding-builder.js +1 -12
- package/ui/builder/binding-builder.js.map +1 -1
- package/ui/builder/index.js +15 -2
- package/ui/builder/index.js.map +1 -1
- package/ui/builder/xml2ui.js.map +1 -1
- package/ui/button/button-common.js.map +1 -1
- package/ui/button/index.android.d.ts +0 -1
- package/ui/button/index.android.js +5 -15
- package/ui/button/index.android.js.map +1 -1
- package/ui/button/index.ios.js.map +1 -1
- package/ui/core/view/index.android.js +4 -7
- package/ui/core/view/index.android.js.map +1 -1
- package/ui/core/view/index.ios.js +1 -1
- package/ui/core/view/index.ios.js.map +1 -1
- package/ui/core/view-base/index.js.map +1 -1
- package/ui/date-picker/date-picker-common.js.map +1 -1
- package/ui/editable-text-base/editable-text-base-common.js.map +1 -1
- package/ui/editable-text-base/index.android.js +2 -5
- package/ui/editable-text-base/index.android.js.map +1 -1
- package/ui/editable-text-base/index.ios.js +5 -0
- package/ui/editable-text-base/index.ios.js.map +1 -1
- package/ui/frame/frame-common.js.map +1 -1
- package/ui/frame/index.android.js.map +1 -1
- package/ui/frame/index.ios.js.map +1 -1
- package/ui/html-view/html-view-common.d.ts +2 -0
- package/ui/html-view/html-view-common.js +7 -0
- package/ui/html-view/html-view-common.js.map +1 -1
- package/ui/html-view/index.android.js +14 -3
- package/ui/html-view/index.android.js.map +1 -1
- package/ui/html-view/index.d.ts +4 -3
- package/ui/html-view/index.ios.js +10 -4
- package/ui/html-view/index.ios.js.map +1 -1
- package/ui/image/image-common.js.map +1 -1
- package/ui/label/index.android.js.map +1 -1
- package/ui/label/index.ios.js.map +1 -1
- package/ui/layouts/absolute-layout/absolute-layout-common.js.map +1 -1
- package/ui/layouts/dock-layout/dock-layout-common.js.map +1 -1
- package/ui/layouts/flexbox-layout/flexbox-layout-common.js.map +1 -1
- package/ui/layouts/grid-layout/grid-layout-common.js.map +1 -1
- package/ui/layouts/root-layout/root-layout-common.js.map +1 -1
- package/ui/layouts/stack-layout/stack-layout-common.js.map +1 -1
- package/ui/layouts/wrap-layout/wrap-layout-common.js.map +1 -1
- package/ui/list-picker/index.android.js +0 -3
- package/ui/list-picker/index.android.js.map +1 -1
- package/ui/list-picker/index.ios.js.map +1 -1
- package/ui/list-picker/list-picker-common.js.map +1 -1
- package/ui/list-view/index.android.js.map +1 -1
- package/ui/list-view/index.ios.js.map +1 -1
- 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 +22 -9
- package/ui/page/index.android.js.map +1 -1
- package/ui/page/page-common.js.map +1 -1
- package/ui/placeholder/index.android.js.map +1 -1
- package/ui/progress/progress-common.js.map +1 -1
- package/ui/proxy-view-container/index.js.map +1 -1
- package/ui/repeater/index.js.map +1 -1
- package/ui/scroll-view/scroll-view-common.js.map +1 -1
- package/ui/search-bar/search-bar-common.js.map +1 -1
- package/ui/segmented-bar/index.android.js +3 -5
- package/ui/segmented-bar/index.android.js.map +1 -1
- package/ui/segmented-bar/segmented-bar-common.js.map +1 -1
- package/ui/slider/slider-common.js.map +1 -1
- package/ui/styling/css-selector/index.d.ts +1 -1
- package/ui/styling/css-selector/index.js.map +1 -1
- package/ui/styling/font-common.d.ts +3 -3
- package/ui/styling/font-interfaces.d.ts +1 -1
- package/ui/styling/font.android.js +8 -4
- package/ui/styling/font.android.js.map +1 -1
- package/ui/styling/font.d.ts +11 -11
- package/ui/styling/font.ios.js +3 -0
- package/ui/styling/font.ios.js.map +1 -1
- package/ui/styling/style/index.d.ts +3 -3
- package/ui/styling/style-properties.js.map +1 -1
- package/ui/styling/style-scope.js +40 -30
- package/ui/styling/style-scope.js.map +1 -1
- package/ui/switch/switch-common.js.map +1 -1
- package/ui/tab-view/index.ios.js.map +1 -1
- package/ui/tab-view/tab-view-common.js.map +1 -1
- package/ui/text-base/formatted-string.js.map +1 -1
- package/ui/text-base/index.android.js +6 -3
- package/ui/text-base/index.android.js.map +1 -1
- package/ui/text-base/index.ios.js +47 -19
- package/ui/text-base/index.ios.js.map +1 -1
- package/ui/text-base/span.js.map +1 -1
- package/ui/text-field/index.ios.js.map +1 -1
- package/ui/text-field/text-field-common.js.map +1 -1
- package/ui/text-view/index.android.js.map +1 -1
- package/ui/text-view/index.ios.js.map +1 -1
- package/ui/time-picker/index.android.js +3 -4
- package/ui/time-picker/index.android.js.map +1 -1
- package/ui/time-picker/time-picker-common.js.map +1 -1
- package/ui/web-view/index.android.js +8 -1
- package/ui/web-view/index.android.js.map +1 -1
- package/ui/web-view/index.d.ts +6 -0
- package/ui/web-view/index.ios.d.ts +3 -0
- package/ui/web-view/index.ios.js +15 -0
- package/ui/web-view/index.ios.js.map +1 -1
- package/ui/web-view/web-view-common.js.map +1 -1
- package/utils/index.android.js +4 -5
- package/utils/index.android.js.map +1 -1
- package/utils/index.d.ts +2 -0
- package/utils/layout-helper/index.android.js +1 -1
- package/utils/layout-helper/index.android.js.map +1 -1
- package/utils/utils-common.d.ts +1 -0
- package/utils/utils-common.js +2 -0
- package/utils/utils-common.js.map +1 -1
package/ui/web-view/index.ios.js
CHANGED
|
@@ -3,6 +3,7 @@ import { profile } from '../../profiling';
|
|
|
3
3
|
import { Trace } from '../../trace';
|
|
4
4
|
export * from './web-view-common';
|
|
5
5
|
import { knownFolders } from '../../file-system';
|
|
6
|
+
import { booleanConverter } from '../core/view-base';
|
|
6
7
|
var WKNavigationDelegateImpl = /** @class */ (function (_super) {
|
|
7
8
|
__extends(WKNavigationDelegateImpl, _super);
|
|
8
9
|
function WKNavigationDelegateImpl() {
|
|
@@ -148,12 +149,26 @@ var UIScrollViewDelegateImpl = /** @class */ (function (_super) {
|
|
|
148
149
|
return UIScrollViewDelegateImpl;
|
|
149
150
|
}(NSObject));
|
|
150
151
|
export class WebView extends WebViewBase {
|
|
152
|
+
get iosAllowInlineMediaPlayback() {
|
|
153
|
+
return this._iosAllowInlineMediaPlayback;
|
|
154
|
+
}
|
|
155
|
+
set iosAllowInlineMediaPlayback(value) {
|
|
156
|
+
// Note: can be set on the view markup,
|
|
157
|
+
// thus the converter usage (value could come in as string).
|
|
158
|
+
// Property.setNative should not be used because
|
|
159
|
+
// it should be set before nativeView is created
|
|
160
|
+
this._iosAllowInlineMediaPlayback = booleanConverter(value);
|
|
161
|
+
}
|
|
151
162
|
createNativeView() {
|
|
152
163
|
const jScript = "var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'initial-scale=1.0'); document.getElementsByTagName('head')[0].appendChild(meta);";
|
|
153
164
|
const wkUScript = WKUserScript.alloc().initWithSourceInjectionTimeForMainFrameOnly(jScript, 1 /* WKUserScriptInjectionTime.AtDocumentEnd */, true);
|
|
154
165
|
const wkUController = WKUserContentController.new();
|
|
155
166
|
wkUController.addUserScript(wkUScript);
|
|
156
167
|
const configuration = WKWebViewConfiguration.new();
|
|
168
|
+
if (this.iosAllowInlineMediaPlayback) {
|
|
169
|
+
configuration.allowsInlineMediaPlayback = true;
|
|
170
|
+
configuration.allowsPictureInPictureMediaPlayback = true;
|
|
171
|
+
}
|
|
157
172
|
configuration.userContentController = wkUController;
|
|
158
173
|
configuration.preferences.setValueForKey(true, 'allowFileAccessFromFileURLs');
|
|
159
174
|
return new WKWebView({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/web-view/index.ios.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/web-view/index.ios.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-view-common.js","sourceRoot":"","sources":["../../../../../packages/core/ui/web-view/web-view-common.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,cAAc,uBAAuB,CAAC;AAEtC,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,QAAQ,CAAsB,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;AAE9E,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,QAAQ,CAAuB,EAAE,IAAI,EAAE,aAAa,EAAE,YAAY,EAAE,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"web-view-common.js","sourceRoot":"","sources":["../../../../../packages/core/ui/web-view/web-view-common.ts"],"names":[],"mappings":"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"}
|
package/utils/index.android.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ad } from './native-helper';
|
|
2
|
-
import {
|
|
2
|
+
import { SDK_VERSION } from '../utils';
|
|
3
3
|
import { FileSystemAccess } from '../file-system/file-system-access';
|
|
4
4
|
import { Trace } from '../trace';
|
|
5
5
|
export { ad, dataDeserialize, dataSerialize, iOSNativeHelper } from './native-helper';
|
|
@@ -90,14 +90,13 @@ Applications cannot access internal storage of other application on Android (see
|
|
|
90
90
|
intent.addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK);
|
|
91
91
|
chooserIntent.addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK);
|
|
92
92
|
// Android SDK <28 only requires starting the chooser Intent straight forwardly
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
Trace.write(`detected sdk version ${sdkVersion} (< ${MIN_URI_SHARE_RESTRICTED_APK_VERSION}), using simple openFile`, Trace.categories.Debug);
|
|
93
|
+
if (SDK_VERSION < MIN_URI_SHARE_RESTRICTED_APK_VERSION) {
|
|
94
|
+
Trace.write(`detected sdk version ${SDK_VERSION} (< ${MIN_URI_SHARE_RESTRICTED_APK_VERSION}), using simple openFile`, Trace.categories.Debug);
|
|
96
95
|
intent.setDataAndType(android.net.Uri.fromFile(new java.io.File(filePath)), mimeType);
|
|
97
96
|
context.startActivity(chooserIntent);
|
|
98
97
|
return true;
|
|
99
98
|
}
|
|
100
|
-
Trace.write(`detected sdk version ${
|
|
99
|
+
Trace.write(`detected sdk version ${SDK_VERSION} (>= ${MIN_URI_SHARE_RESTRICTED_APK_VERSION}), using URI openFile`, Trace.categories.Debug);
|
|
101
100
|
// Android SDK 24+ introduced file system permissions changes that disallow
|
|
102
101
|
// exposing URIs between applications
|
|
103
102
|
//
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../packages/core/utils/index.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AACrC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../packages/core/utils/index.android.ts"],"names":[],"mappings":"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"}
|
package/utils/index.d.ts
CHANGED
|
@@ -8,7 +8,7 @@ export function makeMeasureSpec(size, mode) {
|
|
|
8
8
|
if (sdkVersion === undefined) {
|
|
9
9
|
// check whether the old layout is needed
|
|
10
10
|
sdkVersion = ad.getApplicationContext().getApplicationInfo().targetSdkVersion;
|
|
11
|
-
useOldMeasureSpec = sdkVersion <=
|
|
11
|
+
useOldMeasureSpec = sdkVersion <= 17;
|
|
12
12
|
}
|
|
13
13
|
if (useOldMeasureSpec) {
|
|
14
14
|
return size + mode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../../packages/core/utils/layout-helper/index.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEtC,cAAc,wBAAwB,CAAC;AAEvC,IAAI,OAAe,CAAC;AAEpB,IAAI,UAAkB,CAAC;AACvB,IAAI,iBAAiB,GAAG,KAAK,CAAC;AAE9B,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,IAAY;IACzD,IAAI,UAAU,KAAK,SAAS,EAAE;QAC7B,yCAAyC;QACzC,UAAU,GAAG,EAAE,CAAC,qBAAqB,EAAE,CAAC,kBAAkB,EAAE,CAAC,gBAAgB,CAAC;QAC9E,iBAAiB,GAAG,UAAU,IAAI,
|
|
1
|
+
{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../../packages/core/utils/layout-helper/index.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEtC,cAAc,wBAAwB,CAAC;AAEvC,IAAI,OAAe,CAAC;AAEpB,IAAI,UAAkB,CAAC;AACvB,IAAI,iBAAiB,GAAG,KAAK,CAAC;AAE9B,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,IAAY;IACzD,IAAI,UAAU,KAAK,SAAS,EAAE;QAC7B,yCAAyC;QACzC,UAAU,GAAG,EAAE,CAAC,qBAAqB,EAAE,CAAC,kBAAkB,EAAE,CAAC,gBAAgB,CAAC;QAC9E,iBAAiB,GAAG,UAAU,IAAI,EAAE,CAAC;KACrC;IAED,IAAI,iBAAiB,EAAE;QACtB,OAAO,IAAI,GAAG,IAAI,CAAC;KACnB;IAED,OAAO,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,iBAAiB;IAChC,IAAI,OAAO,KAAK,SAAS,EAAE;QAC1B,OAAO,GAAG,EAAE,CAAC,YAAY,EAAE,CAAC,iBAAiB,EAAE,CAAC,OAAO,CAAC;KACxD;IAED,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAa;IAC3C,OAAO,KAAK,GAAG,iBAAiB,EAAE,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,KAAa;IACtD,OAAO,KAAK,GAAG,iBAAiB,EAAE,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,UAAe,CAAC,uBAAuB,EAAE,KAAa,EAAE,SAAiB,EAAE,MAAc,EAAE,UAAkB;IAC9I,MAAM,IAAI,GAAsB,UAAU,CAAC;IAC3C,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;IAErF,OAAO;QACN,KAAK,EAAE,IAAI,CAAC,gBAAgB,EAAE;QAC9B,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE;KAChC,CAAC;AACH,CAAC"}
|
package/utils/utils-common.d.ts
CHANGED
|
@@ -20,3 +20,4 @@ export declare function mainThreadify(func: Function): (...args: any[]) => void;
|
|
|
20
20
|
export declare function debounce(fn: any, delay?: number): (...args: Array<any>) => void;
|
|
21
21
|
export declare function throttle(fn: any, delay?: number): () => void;
|
|
22
22
|
export declare function queueGC(delay?: number, useThrottle?: boolean): void;
|
|
23
|
+
export declare const SDK_VERSION: number;
|
package/utils/utils-common.js
CHANGED
|
@@ -3,6 +3,7 @@ import { dispatchToMainThread, dispatchToUIThread, isMainThread } from './mainth
|
|
|
3
3
|
import { sanitizeModuleName } from '../ui/builder/module-name-sanitizer';
|
|
4
4
|
import * as layout from './layout-helper';
|
|
5
5
|
import { GC } from './index';
|
|
6
|
+
import { Device } from '../platform';
|
|
6
7
|
export { layout };
|
|
7
8
|
export * from './mainthread-helper';
|
|
8
9
|
export * from './macrotask-scheduler';
|
|
@@ -155,4 +156,5 @@ export function queueGC(delay = 900, useThrottle) {
|
|
|
155
156
|
debouncedGC.get(delay)();
|
|
156
157
|
}
|
|
157
158
|
}
|
|
159
|
+
export const SDK_VERSION = parseInt(Device.sdkVersion, 10);
|
|
158
160
|
//# sourceMappingURL=utils-common.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils-common.js","sourceRoot":"","sources":["../../../../packages/core/utils/utils-common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAC7F,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"utils-common.js","sourceRoot":"","sources":["../../../../packages/core/utils/utils-common.ts"],"names":[],"mappings":"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"}
|