javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: expose more from web-view

Browse Source
This commit is contained in:
Nathan Walker
2020-07-18 13:04:47 -07:00
parent bc1f1a14c5
commit 448400a610
9 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/package.json
View File

@@ -3,7 +3,7 @@
"main": "index",
"types": "index.d.ts",
"description": "NativeScript Core Modules",
"version": "7.0.0-rc.21",
"version": "7.0.0-rc.22",
"homepage": "https://nativescript.org",
"repository": {
"type": "git",

2
packages/core/ui/index.d.ts vendored
View File

@@ -61,4 +61,4 @@ export { TextField } from './text-field';
export { TextView } from './text-view';
export { TimePicker } from './time-picker';
export { Transition } from './transition';
export { WebView } from './web-view';
export { WebView, LoadEventData, WebViewNavigationType } from './web-view';

2
packages/core/ui/index.ts
View File

@@ -61,4 +61,4 @@ export { TextField } from './text-field';
export { TextView } from './text-view';
export { TimePicker } from './time-picker';
export { Transition } from './transition';
export { WebView } from './web-view';
export { WebView, LoadEventData, WebViewNavigationType } from './web-view';

2
packages/core/ui/web-view/index.d.ts vendored
View File

@@ -14,7 +14,7 @@ export const urlProperty: Property<WebView, string>;
/**
* Represents navigation type
*/
export type NavigationType = 'linkClicked' | 'formSubmitted' | 'backForward' | 'reload' | 'formResubmitted' | 'other' | undefined;
export type WebViewNavigationType = 'linkClicked' | 'formSubmitted' | 'backForward' | 'reload' | 'formResubmitted' | 'other' | undefined;
/**
* Represents a standard WebView widget.

4
packages/core/ui/web-view/index.ios.ts
View File

@@ -1,4 +1,4 @@
import { NavigationType } from '.';
import { WebViewNavigationType } from '.';
import { WebViewBase } from './web-view-common';
import { profile } from '../../profiling';
import { Trace } from '../../trace';
@@ -18,7 +18,7 @@ class WKNavigationDelegateImpl extends NSObject implements WKNavigationDelegate
public webViewDecidePolicyForNavigationActionDecisionHandler(webView: WKWebView, navigationAction: WKNavigationAction, decisionHandler: any): void {
const owner = this._owner.get();
if (owner && navigationAction.request.URL) {
let navType: NavigationType = 'other';
let navType: WebViewNavigationType = 'other';
switch (navigationAction.navigationType) {
case WKNavigationType.LinkActivated:

4
packages/core/ui/web-view/web-view-common.ts
View File

@@ -1,4 +1,4 @@
import { LoadEventData, NavigationType } from './web-view-interfaces';
import { LoadEventData, WebViewNavigationType } from './web-view-interfaces';
import { ContainerView, CSSType } from '../core/view';
import { Property } from '../core/properties';
import { EventData } from '../../data/observable';
@@ -27,7 +27,7 @@ export abstract class WebViewBase extends ContainerView {
this.notify(<any>args);
}
public _onLoadStarted(url: string, navigationType: NavigationType) {
public _onLoadStarted(url: string, navigationType: WebViewNavigationType) {
let args = <LoadEventData>{
eventName: WebViewBase.loadStartedEvent,
object: this,

4
packages/core/ui/web-view/web-view-interfaces.ts
View File

@@ -1,11 +1,11 @@
import { WebView } from '.';
import { EventData } from '../../data/observable';
export type NavigationType = 'linkClicked' | 'formSubmitted' | 'backForward' | 'reload' | 'formResubmitted' | 'other' | undefined;
export type WebViewNavigationType = 'linkClicked' | 'formSubmitted' | 'backForward' | 'reload' | 'formResubmitted' | 'other' | undefined;
export interface LoadEventData extends EventData {
url: string;
navigationType: NavigationType;
navigationType: WebViewNavigationType;
error: string;
}

2
packages/tns-core-modules-compat/package.json
View File

@@ -3,7 +3,7 @@
"main": "index",
"types": "index.d.ts",
"description": "Compatibility with old style tns-core-modules imports for NativeScript.",
"version": "7.0.0-rc.21",
"version": "7.0.0-rc.22",
"homepage": "https://nativescript.org",
"repository": {
"type": "git",