diff --git a/package.json b/package.json index f375fe803..c4b96f87f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nativescript", - "version": "7.0.0-rc.21", + "version": "7.0.0-rc.22", "license": "MIT", "scripts": { "nx": "nx", diff --git a/packages/core/package.json b/packages/core/package.json index 87f8b1998..ef734c125 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -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", diff --git a/packages/core/ui/index.d.ts b/packages/core/ui/index.d.ts index ed2c2d5db..436eac469 100644 --- a/packages/core/ui/index.d.ts +++ b/packages/core/ui/index.d.ts @@ -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'; diff --git a/packages/core/ui/index.ts b/packages/core/ui/index.ts index ed2c2d5db..436eac469 100644 --- a/packages/core/ui/index.ts +++ b/packages/core/ui/index.ts @@ -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'; diff --git a/packages/core/ui/web-view/index.d.ts b/packages/core/ui/web-view/index.d.ts index 47f9e7fbd..8a60f1e3a 100644 --- a/packages/core/ui/web-view/index.d.ts +++ b/packages/core/ui/web-view/index.d.ts @@ -14,7 +14,7 @@ export const urlProperty: Property; /** * 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. diff --git a/packages/core/ui/web-view/index.ios.ts b/packages/core/ui/web-view/index.ios.ts index ca1201fbf..1c4e5a6c6 100644 --- a/packages/core/ui/web-view/index.ios.ts +++ b/packages/core/ui/web-view/index.ios.ts @@ -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: diff --git a/packages/core/ui/web-view/web-view-common.ts b/packages/core/ui/web-view/web-view-common.ts index 67b9297bc..31ae82864 100644 --- a/packages/core/ui/web-view/web-view-common.ts +++ b/packages/core/ui/web-view/web-view-common.ts @@ -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(args); } - public _onLoadStarted(url: string, navigationType: NavigationType) { + public _onLoadStarted(url: string, navigationType: WebViewNavigationType) { let args = { eventName: WebViewBase.loadStartedEvent, object: this, diff --git a/packages/core/ui/web-view/web-view-interfaces.ts b/packages/core/ui/web-view/web-view-interfaces.ts index c2b3c199c..44e4262fe 100644 --- a/packages/core/ui/web-view/web-view-interfaces.ts +++ b/packages/core/ui/web-view/web-view-interfaces.ts @@ -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; } diff --git a/packages/tns-core-modules-compat/package.json b/packages/tns-core-modules-compat/package.json index b2e20e191..a60d973b2 100644 --- a/packages/tns-core-modules-compat/package.json +++ b/packages/tns-core-modules-compat/package.json @@ -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",