From 37d5569a3e3f3d290ddb9b12088498b741849981 Mon Sep 17 00:00:00 2001 From: Svetoslav Date: Fri, 8 Feb 2019 11:08:12 +0200 Subject: [PATCH 1/4] chore: bump package versions to 5.3.0 (#6877) --- tns-core-modules/package.json | 2 +- tns-platform-declarations/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tns-core-modules/package.json b/tns-core-modules/package.json index 17a3e7421c..642d7903df 100644 --- a/tns-core-modules/package.json +++ b/tns-core-modules/package.json @@ -1,7 +1,7 @@ { "name": "tns-core-modules", "description": "Telerik NativeScript Core Modules", - "version": "5.2.0", + "version": "5.3.0", "homepage": "https://www.nativescript.org", "repository": { "type": "git", diff --git a/tns-platform-declarations/package.json b/tns-platform-declarations/package.json index b3d093a342..e22938abe9 100644 --- a/tns-platform-declarations/package.json +++ b/tns-platform-declarations/package.json @@ -1,6 +1,6 @@ { "name": "tns-platform-declarations", - "version": "5.2.0", + "version": "5.3.0", "description": "Platform-specific TypeScript declarations for NativeScript for accessing native objects", "main": "", "scripts": { From 44b8acd79c60efded73b35c885fcca1003e1d0c1 Mon Sep 17 00:00:00 2001 From: Vasil Chimev Date: Thu, 14 Feb 2019 14:03:13 +0200 Subject: [PATCH 2/4] feat(HMR): apply changes in page styles at runtime when app root is a frame (#6857) * feat(HMR): apply changes in page styles at runtime * fix: livesync tests * test: changeCssFile method * refactor: address comments Add a comment. Update `let` to `const`. Update `changesCssFile` test. * test: add an assert --- tests/app/ui/styling/style-tests.ts | 17 +++++++ .../application/application-common.ts | 18 ++++--- .../application/application.ios.ts | 8 +-- tns-core-modules/module.d.ts | 2 +- tns-core-modules/ui/core/view/view-common.ts | 8 +++ tns-core-modules/ui/core/view/view.d.ts | 51 +++++++++++-------- tns-core-modules/ui/frame/frame-common.ts | 23 ++++++--- tns-core-modules/ui/frame/frame.android.ts | 38 +++++++------- tns-core-modules/ui/styling/style-scope.d.ts | 1 + tns-core-modules/ui/styling/style-scope.ts | 13 +++++ 10 files changed, 120 insertions(+), 59 deletions(-) diff --git a/tests/app/ui/styling/style-tests.ts b/tests/app/ui/styling/style-tests.ts index e9dc498d29..ffe9873caa 100644 --- a/tests/app/ui/styling/style-tests.ts +++ b/tests/app/ui/styling/style-tests.ts @@ -674,6 +674,23 @@ export function test_CSS_isAppliedOnPage_From_addCssFile() { }); } +export function test_CSS_isAppliedOnPage_From_changeCssFile() { + const testButton = new buttonModule.Button(); + testButton.text = "Test"; + + const testCss = "button { color: blue; }"; + + const testFunc = function (views: Array) { + helper.assertViewColor(testButton, "#0000FF"); + const page: pageModule.Page = views[1]; + page.changeCssFile("~/ui/styling/test.css"); + helper.assertViewBackgroundColor(page, "#FF0000"); + TKUnit.assert(testButton.style.color === undefined, "Color should not have a value"); + } + + helper.buildUIAndRunTest(testButton, testFunc, { pageCss: testCss }); +} + const invalidCSS = ".invalid { " + "color: invalidValue; " + "background-color: invalidValue; " + diff --git a/tns-core-modules/application/application-common.ts b/tns-core-modules/application/application-common.ts index f113902d82..0b877e1e7f 100644 --- a/tns-core-modules/application/application-common.ts +++ b/tns-core-modules/application/application-common.ts @@ -82,19 +82,23 @@ export function setApplication(instance: iOSApplication | AndroidApplication): v export function livesync(rootView: View, context?: ModuleContext) { events.notify({ eventName: "livesync", object: app }); const liveSyncCore = global.__onLiveSyncCore; - let reapplyAppCss = false; + let reapplyAppStyles = false; + let reapplyLocalStyles = false; - if (context) { - const fullFileName = getCssFileName(); - const fileName = fullFileName.substring(0, fullFileName.lastIndexOf(".") + 1); + if (context && context.path) { const extensions = ["css", "scss"]; - reapplyAppCss = extensions.some(ext => context.path === fileName.concat(ext)); + const appStylesFullFileName = getCssFileName(); + const appStylesFileName = appStylesFullFileName.substring(0, appStylesFullFileName.lastIndexOf(".") + 1); + reapplyAppStyles = extensions.some(ext => context.path === appStylesFileName.concat(ext)); + if (!reapplyAppStyles) { + reapplyLocalStyles = extensions.some(ext => context.path.endsWith(ext)); + } } - if (reapplyAppCss && rootView) { + if (reapplyAppStyles && rootView) { rootView._onCssStateChange(); } else if (liveSyncCore) { - liveSyncCore(); + reapplyLocalStyles ? liveSyncCore(context) : liveSyncCore(); } } diff --git a/tns-core-modules/application/application.ios.ts b/tns-core-modules/application/application.ios.ts index 7362023a6c..6601904a0f 100644 --- a/tns-core-modules/application/application.ios.ts +++ b/tns-core-modules/application/application.ios.ts @@ -225,9 +225,9 @@ class IOSApplication implements IOSApplicationDefinition { } } - public _onLivesync(): void { + public _onLivesync(context?: ModuleContext): void { // If view can't handle livesync set window controller. - if (this._rootView && !this._rootView._onLivesync()) { + if (this._rootView && !this._rootView._onLivesync(context)) { this.setWindowContent(); } } @@ -264,8 +264,8 @@ exports.ios = iosApp; setApplication(iosApp); // attach on global, so it can be overwritten in NativeScript Angular -(global).__onLiveSyncCore = function () { - iosApp._onLivesync(); +(global).__onLiveSyncCore = function (context?: ModuleContext) { + iosApp._onLivesync(context); } let mainEntry: NavigationEntry; diff --git a/tns-core-modules/module.d.ts b/tns-core-modules/module.d.ts index 76f015c560..406efac7c1 100644 --- a/tns-core-modules/module.d.ts +++ b/tns-core-modules/module.d.ts @@ -52,7 +52,7 @@ declare namespace NodeJS { __inspector?: any; __extends: any; __onLiveSync: (context?: { type: string, path: string }) => void; - __onLiveSyncCore: () => void; + __onLiveSyncCore: (context?: { type: string, path: string }) => void; __onUncaughtError: (error: NativeScriptError) => void; __onDiscardedError: (error: NativeScriptError) => void; TNS_WEBPACK?: boolean; diff --git a/tns-core-modules/ui/core/view/view-common.ts b/tns-core-modules/ui/core/view/view-common.ts index b529898650..f12fabdc3e 100644 --- a/tns-core-modules/ui/core/view/view-common.ts +++ b/tns-core-modules/ui/core/view/view-common.ts @@ -105,6 +105,14 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition { this._updateStyleScope(cssFileName); } + public changeCssFile(cssFileName: string): void { + const scope = this._styleScope; + if (scope && cssFileName) { + scope.changeCssFile(cssFileName); + this._onCssStateChange(); + } + } + public _updateStyleScope(cssFileName?: string, cssString?: string, css?: string): void { let scope = this._styleScope; if (!scope) { diff --git a/tns-core-modules/ui/core/view/view.d.ts b/tns-core-modules/ui/core/view/view.d.ts index d638efc1ee..505ff3faf8 100644 --- a/tns-core-modules/ui/core/view/view.d.ts +++ b/tns-core-modules/ui/core/view/view.d.ts @@ -18,14 +18,14 @@ export function PseudoClassHandler(...pseudoClasses: string[]): MethodDecorator; /** * Specifies the type name for the instances of this View class, * that is used when matching CSS type selectors. - * + * * Usage: * ``` * @CSSType("Button") * class Button extends View { * } * ``` - * + * * Internally the decorator set `Button.prototype.cssType = "Button"`. * @param type The type name, e. g. "Button", "Label", etc. */ @@ -50,8 +50,8 @@ export type px = number; export type percent = number; /** - * The Point interface describes a two dimensional location. - * It has two properties x and y, representing the x and y coordinate of the location. + * The Point interface describes a two dimensional location. + * It has two properties x and y, representing the x and y coordinate of the location. */ export interface Point { /** @@ -66,8 +66,8 @@ export interface Point { } /** - * The Size interface describes abstract dimensions in two dimensional space. - * It has two properties width and height, representing the width and height values of the size. + * The Size interface describes abstract dimensions in two dimensional space. + * It has two properties width and height, representing the width and height values of the size. */ export interface Size { /** @@ -99,8 +99,8 @@ export interface ShownModallyData extends EventData { } /** - * This class is the base class for all UI components. - * A View occupies a rectangular area on the screen and is responsible for drawing and layouting of all UI components within. + * This class is the base class for all UI components. + * A View occupies a rectangular area on the screen and is responsible for drawing and layouting of all UI components within. */ export abstract class View extends ViewBase { /** @@ -475,13 +475,13 @@ export abstract class View extends ViewBase { * [Deprecated. Please use the on() instead.] Adds a gesture observer. * @param type - Type of the gesture. * @param callback - A function that will be executed when gesture is received. - * @param thisArg - An optional parameter which will be used as `this` context for callback execution. + * @param thisArg - An optional parameter which will be used as `this` context for callback execution. */ observe(type: GestureTypes, callback: (args: GestureEventData) => void, thisArg?: any); /** * A basic method signature to hook an event listener (shortcut alias to the addEventListener method). - * @param eventNames - String corresponding to events (e.g. "propertyChange"). Optionally could be used more events separated by `,` (e.g. "propertyChange", "change") or you can use gesture types. + * @param eventNames - String corresponding to events (e.g. "propertyChange"). Optionally could be used more events separated by `,` (e.g. "propertyChange", "change") or you can use gesture types. * @param callback - Callback function which will be executed when event is raised. * @param thisArg - An optional parameter which will be used as `this` context for callback execution. */ @@ -527,12 +527,12 @@ export abstract class View extends ViewBase { modal: View; /** - * Animates one or more properties of the view based on the supplied options. + * Animates one or more properties of the view based on the supplied options. */ public animate(options: AnimationDefinition): AnimationPromise; /** - * Creates an Animation object based on the supplied options. + * Creates an Animation object based on the supplied options. */ public createAnimation(options: AnimationDefinition): Animation; @@ -562,7 +562,7 @@ export abstract class View extends ViewBase { public getActualSize(): Size; /** - * Derived classes can override this method to handle Android back button press. + * Derived classes can override this method to handle Android back button press. */ onBackPressed(): boolean; @@ -575,7 +575,7 @@ export abstract class View extends ViewBase { /** * @private * Adds a new values to current css. - * @param cssString - A valid css which will be added to current css. + * @param cssString - A valid css which will be added to current css. */ addCss(cssString: string): void; @@ -586,13 +586,20 @@ export abstract class View extends ViewBase { */ addCssFile(cssFileName: string): void; + /** + * @private + * Changes the current css to the content of the file. + * @param cssFileName - A valid file name (from the application root) which contains a valid css. + */ + changeCssFile(cssFileName: string): void; + // Lifecycle events _getNativeViewsCount(): number; _eachLayoutView(callback: (View) => void): void; - + /** - * Iterates over children of type View. + * Iterates over children of type View. * @param callback Called for each child of type View. Iteration stops if this method returns falsy value. */ public eachChildView(callback: (view: View) => boolean): void; @@ -673,7 +680,7 @@ export abstract class View extends ViewBase { /** * @private */ - _onLivesync(): boolean; + _onLivesync(context?: { type: string, path: string }): boolean; /** * @private */ @@ -681,9 +688,9 @@ export abstract class View extends ViewBase { /** * Updates styleScope or create new styleScope. - * @param cssFileName - * @param cssString - * @param css + * @param cssFileName + * @param cssString + * @param css */ _updateStyleScope(cssFileName?: string, cssString?: string, css?: string): void; @@ -715,7 +722,7 @@ export abstract class View extends ViewBase { } /** - * Base class for all UI components that are containers. + * Base class for all UI components that are containers. */ export class ContainerView extends View { /** @@ -725,7 +732,7 @@ export class ContainerView extends View { } /** - * Base class for all UI components that implement custom layouts. + * Base class for all UI components that implement custom layouts. */ export class CustomLayoutView extends ContainerView { //@private diff --git a/tns-core-modules/ui/frame/frame-common.ts b/tns-core-modules/ui/frame/frame-common.ts index a92093ee87..c9f47b2059 100644 --- a/tns-core-modules/ui/frame/frame-common.ts +++ b/tns-core-modules/ui/frame/frame-common.ts @@ -76,7 +76,7 @@ export class FrameBase extends CustomLayoutView implements FrameDefinition { if (backstackIndex !== -1) { backstack = backstackIndex; } else { - // NOTE: We don't search for entries in navigationQueue because there is no way for + // NOTE: We don't search for entries in navigationQueue because there is no way for // developer to get reference to BackstackEntry unless transition is completed. // At that point the entry is put in the backstack array. // If we start to return Backstack entry from navigate method then @@ -153,7 +153,7 @@ export class FrameBase extends CustomLayoutView implements FrameDefinition { // } // let currentPage = this._currentEntry.resolvedPage; - // let currentNavigationEntry = this._currentEntry.entry; + // let currentNavigationEntry = this._currentEntry.entry; // if (currentPage["isBiOrientational"] && currentNavigationEntry.moduleName) { // if (this.canGoBack()){ // this.goBack(); @@ -162,7 +162,7 @@ export class FrameBase extends CustomLayoutView implements FrameDefinition { // currentNavigationEntry.backstackVisible = false; // } // // Re-navigate to the same page so the other (.port or .land) xml is loaded. - // this.navigate(currentNavigationEntry); + // this.navigate(currentNavigationEntry); // } // } @@ -224,7 +224,7 @@ export class FrameBase extends CustomLayoutView implements FrameDefinition { newPage.onNavigatedTo(isBack); // Reset executing entry after NavigatedTo is raised; - // we do not want to execute two navigations in parallel in case + // we do not want to execute two navigations in parallel in case // additional navigation is triggered from the NavigatedTo handler. this._executingEntry = null; } @@ -259,7 +259,7 @@ export class FrameBase extends CustomLayoutView implements FrameDefinition { return true; } } - + return false; } @@ -563,7 +563,7 @@ export class FrameBase extends CustomLayoutView implements FrameDefinition { return result; } - public _onLivesync(): boolean { + public _onLivesync(context?: ModuleContext): boolean { super._onLivesync(); if (!this._currentEntry || !this._currentEntry.entry) { @@ -571,6 +571,17 @@ export class FrameBase extends CustomLayoutView implements FrameDefinition { } const currentEntry = this._currentEntry.entry; + if (context && context.path) { + // Use topmost instead of this to cover nested frames scenario + const topmostFrame = topmost(); + const moduleName = topmostFrame.currentEntry.moduleName; + const reapplyStyles = context.path.includes(moduleName); + if (reapplyStyles && moduleName) { + topmostFrame.currentPage.changeCssFile(context.path); + return true; + } + } + const newEntry: NavigationEntry = { animated: false, clearHistory: true, diff --git a/tns-core-modules/ui/frame/frame.android.ts b/tns-core-modules/ui/frame/frame.android.ts index fdde423abd..387c9b1931 100644 --- a/tns-core-modules/ui/frame/frame.android.ts +++ b/tns-core-modules/ui/frame/frame.android.ts @@ -82,13 +82,13 @@ function getAttachListener(): android.view.View.OnAttachStateChangeListener { return attachStateChangeListener; } -export function reloadPage(): void { +export function reloadPage(context?: ModuleContext): void { const activity = application.android.foregroundActivity; const callbacks: AndroidActivityCallbacks = activity[CALLBACKS]; if (callbacks) { const rootView: View = callbacks.getRootView(); - if (!rootView || !rootView._onLivesync()) { + if (!rootView || !rootView._onLivesync(context)) { callbacks.resetActivityContent(activity); } } else { @@ -153,7 +153,7 @@ export class Frame extends FrameBase { // In case activity was destroyed because of back button pressed (e.g. app exit) // and application is restored from recent apps, current fragment isn't recreated. // In this case call _navigateCore in order to recreate the current fragment. - // Don't call navigate because it will fire navigation events. + // Don't call navigate because it will fire navigation events. // As JS instances are alive it is already done for the current page. if (!this.isLoaded || this._executingEntry || !this._attachedToWindow) { return; @@ -183,13 +183,13 @@ export class Frame extends FrameBase { const entry = this._currentEntry; if (entry && manager && !manager.findFragmentByTag(entry.fragmentTag)) { // Simulate first navigation (e.g. no animations or transitions) - // we need to cache the original animation settings so we can restore them later; otherwise as the - // simulated first navigation is not animated (it is actually a zero duration animator) the "popExit" animation + // we need to cache the original animation settings so we can restore them later; otherwise as the + // simulated first navigation is not animated (it is actually a zero duration animator) the "popExit" animation // is broken when transaction.setCustomAnimations(...) is used in a scenario with: // 1) forward navigation // 2) suspend / resume app - // 3) back navigation -- the exiting fragment is erroneously animated with the exit animator from the - // simulated navigation (NoTransition, zero duration animator) and thus the fragment immediately disappears; + // 3) back navigation -- the exiting fragment is erroneously animated with the exit animator from the + // simulated navigation (NoTransition, zero duration animator) and thus the fragment immediately disappears; // the user only sees the animation of the entering fragment as per its specific enter animation settings. // NOTE: we are restoring the animation settings in Frame.setCurrent(...) as navigation completes asynchronously this._cachedAnimatorState = getAnimatorState(this._currentEntry); @@ -727,7 +727,7 @@ function ensureFragmentClass() { return; } - // this require will apply the FragmentClass implementation + // this require will apply the FragmentClass implementation require("ui/frame/fragment"); if (!fragmentClass) { @@ -855,11 +855,11 @@ class FragmentCallbacksImplementation implements AndroidFragmentCallbacks { entry.viewSavedState = null; } - // fixes 'java.lang.IllegalStateException: The specified child already has a parent. You must call removeView() on the child's parent first'. + // fixes 'java.lang.IllegalStateException: The specified child already has a parent. You must call removeView() on the child's parent first'. // on app resume in nested frame scenarios with support library version greater than 26.0.0 - // HACK: this whole code block shouldn't be necessary as the native view is supposedly removed from its parent - // right after onDestroyView(...) is called but for some reason the fragment view (page) still thinks it has a - // parent while its supposed parent believes it properly removed its children; in order to "force" the child to + // HACK: this whole code block shouldn't be necessary as the native view is supposedly removed from its parent + // right after onDestroyView(...) is called but for some reason the fragment view (page) still thinks it has a + // parent while its supposed parent believes it properly removed its children; in order to "force" the child to // lose its parent we temporarily add it to the parent, and then remove it (addViewInLayout doesn't trigger layout pass) const nativeView = page.nativeViewProtected; if (nativeView != null) { @@ -908,8 +908,8 @@ class FragmentCallbacksImplementation implements AndroidFragmentCallbacks { } // [nested frames / fragments] see https://github.com/NativeScript/NativeScript/issues/6629 - // retaining reference to a destroyed fragment here somehow causes a cryptic - // "IllegalStateException: Failure saving state: active fragment has cleared index: -1" + // retaining reference to a destroyed fragment here somehow causes a cryptic + // "IllegalStateException: Failure saving state: active fragment has cleared index: -1" // in a specific mixed parent / nested frame navigation scenario entry.fragment = null; @@ -1019,15 +1019,15 @@ class ActivityCallbacksImplementation implements AndroidActivityCallbacks { } // NOTE: activity.onPostResume() is called when activity resume is complete and we can - // safely raise the application resume event; + // safely raise the application resume event; // onActivityResumed(...) lifecycle callback registered in application is called too early - // and raising the application resume event there causes issues like + // and raising the application resume event there causes issues like // https://github.com/NativeScript/NativeScript/issues/6708 if ((activity).isNativeScriptActivity) { const args = { eventName: application.resumeEvent, - object: application.android, - android: activity + object: application.android, + android: activity }; application.notify(args); application.android.paused = false; @@ -1151,7 +1151,7 @@ class ActivityCallbacksImplementation implements AndroidActivityCallbacks { // Paths that go trough this method: // 1. Application initial start - there is no rootView in callbacks. - // 2. Application revived after Activity is destroyed. this._rootView should have been restored by id in onCreate. + // 2. Application revived after Activity is destroyed. this._rootView should have been restored by id in onCreate. // 3. Livesync if rootView has no custom _onLivesync. this._rootView should have been cleared upfront. Launch event should not fired // 4. _resetRootView method. this._rootView should have been cleared upfront. Launch event should not fired private setActivityContent( diff --git a/tns-core-modules/ui/styling/style-scope.d.ts b/tns-core-modules/ui/styling/style-scope.d.ts index b5bf016840..eff3fe292e 100644 --- a/tns-core-modules/ui/styling/style-scope.d.ts +++ b/tns-core-modules/ui/styling/style-scope.d.ts @@ -29,6 +29,7 @@ export class CssState { export class StyleScope { public css: string; public addCss(cssString: string, cssFileName: string): void; + public changeCssFile(cssFileName: string): void; public static createSelectorsFromCss(css: string, cssFileName: string, keyframes: Object): RuleSet[]; public static createSelectorsFromImports(tree: SyntaxTree, keyframes: Object): RuleSet[]; diff --git a/tns-core-modules/ui/styling/style-scope.ts b/tns-core-modules/ui/styling/style-scope.ts index a915b559dd..104b0b213d 100644 --- a/tns-core-modules/ui/styling/style-scope.ts +++ b/tns-core-modules/ui/styling/style-scope.ts @@ -568,6 +568,19 @@ export class StyleScope { this.appendCss(null, cssFileName); } + @profile + private changeCssFile(cssFileName: string): void { + if (!cssFileName) { + return; + } + + const cssSelectors = CSSSource.fromURI(cssFileName, this._keyframes); + this._css = cssSelectors.source; + this._localCssSelectors = cssSelectors.selectors; + this._localCssSelectorVersion++; + this.ensureSelectors(); + } + @profile private setCss(cssString: string, cssFileName?): void { this._css = cssString; From 1b5d3071e29aa7699e671dc8fca1102c56bf4068 Mon Sep 17 00:00:00 2001 From: Martin Bektchiev Date: Thu, 14 Feb 2019 14:19:52 +0200 Subject: [PATCH 3/4] fix(debugger): Enable iOS inspector modules on creation When the application is being debugged with `--debug-brk --bundle` options, the JS implementation objects handling the debugging protocol are created after their corresponding domains' `enable` methods have been called by the debugger frontend. As a workaround we now manually call `enable` in their constructors. related to https://github.com/NativeScript/ios-runtime/issues/1055 and https://github.com/NativeScript/ios-runtime/issues/1057 --- .../debugger/webinspector-css.ios.ts | 4 ++ .../debugger/webinspector-dom.ios.ts | 4 ++ .../debugger/webinspector-network.ios.ts | 38 ++++++++++--------- 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/tns-core-modules/debugger/webinspector-css.ios.ts b/tns-core-modules/debugger/webinspector-css.ios.ts index e248a6d041..8e7c353f42 100644 --- a/tns-core-modules/debugger/webinspector-css.ios.ts +++ b/tns-core-modules/debugger/webinspector-css.ios.ts @@ -18,6 +18,10 @@ export class CSSDomainDebugger implements inspectorCommandTypes.CSSDomain.CSSDom this.commands = {}; attachCSSInspectorCommandCallbacks(this.commands); + + // By default start enabled because we can miss the "enable" event when + // running with `--debug-brk` -- the frontend will send it before we've been created + this.enable(); } get enabled(): boolean { diff --git a/tns-core-modules/debugger/webinspector-dom.ios.ts b/tns-core-modules/debugger/webinspector-dom.ios.ts index 038147be44..54f934e345 100644 --- a/tns-core-modules/debugger/webinspector-dom.ios.ts +++ b/tns-core-modules/debugger/webinspector-dom.ios.ts @@ -20,6 +20,10 @@ export class DOMDomainDebugger implements inspectorCommandTypes.DOMDomain.DOMDom attachDOMInspectorEventCallbacks(this.events); attachDOMInspectorCommandCallbacks(this.commands); + + // By default start enabled because we can miss the "enable event when + // running with `--debug-brk` -- the frontend will send it before we've been created + this.enable(); } get enabled(): boolean { diff --git a/tns-core-modules/debugger/webinspector-network.ios.ts b/tns-core-modules/debugger/webinspector-network.ios.ts index 769dbf402e..bce24b9c7c 100644 --- a/tns-core-modules/debugger/webinspector-network.ios.ts +++ b/tns-core-modules/debugger/webinspector-network.ios.ts @@ -64,7 +64,7 @@ export class Request { this._resourceType = "Other"; return; } - + this._mimeType = value; var resourceType = "Other"; @@ -112,19 +112,19 @@ export class Request { this._resourceType = value; } } - + public responseReceived(response: inspectorCommandTypes.NetworkDomain.Response): void { if (this._networkDomainDebugger.enabled) { this._networkDomainDebugger.events.responseReceived(this.requestID, frameId, loaderId, __inspectorTimestamp(), this.resourceType, response); } } - + public loadingFinished(): void { if (this._networkDomainDebugger.enabled) { this._networkDomainDebugger.events.loadingFinished(this.requestID, __inspectorTimestamp()); } } - + public requestWillBeSent(request: inspectorCommandTypes.NetworkDomain.Request): void { if (this._networkDomainDebugger.enabled) { this._networkDomainDebugger.events.requestWillBeSent(this.requestID, frameId, loaderId, request.url, request, __inspectorTimestamp(), { type: "Script" }); @@ -136,9 +136,13 @@ export class Request { export class NetworkDomainDebugger implements inspectorCommandTypes.NetworkDomain.NetworkDomainDispatcher { private _enabled: boolean; public events: inspectorCommandTypes.NetworkDomain.NetworkFrontend; - + constructor() { this.events = new inspectorCommands.NetworkDomain.NetworkFrontend(); + + // By default start enabled because we can miss the "enable" event when + // running with `--debug-brk` -- the frontend will send it before we've been created + this.enable(); } get enabled(): boolean { @@ -156,7 +160,7 @@ export class NetworkDomainDebugger implements inspectorCommandTypes.NetworkDomai } this._enabled = true; } - + /** * Disables network tracking, prevents network events from being sent to the client. */ @@ -166,14 +170,14 @@ export class NetworkDomainDebugger implements inspectorCommandTypes.NetworkDomai } this._enabled = false; } - + /** * Specifies whether to always send extra HTTP headers with the requests from this page. */ setExtraHTTPHeaders(params: inspectorCommandTypes.NetworkDomain.SetExtraHTTPHeadersMethodArguments): void { // } - + /** * Returns content served for the given request. */ @@ -187,9 +191,9 @@ export class NetworkDomainDebugger implements inspectorCommandTypes.NetworkDomai body: body, base64Encoded: !resource_data.hasTextContent }; - } + } } - + /** * Tells whether clearing browser cache is supported. */ @@ -198,14 +202,14 @@ export class NetworkDomainDebugger implements inspectorCommandTypes.NetworkDomai result: false }; } - + /** * Clears browser cache. */ clearBrowserCache(): void { // } - + /** * Tells whether clearing browser cookies is supported. */ @@ -214,21 +218,21 @@ export class NetworkDomainDebugger implements inspectorCommandTypes.NetworkDomai result: false }; } - + /** * Clears browser cookies. */ clearBrowserCookies(): void { // } - + /** * Toggles ignoring cache for each request. If true, cache will not be used. */ setCacheDisabled(params: inspectorCommandTypes.NetworkDomain.SetCacheDisabledMethodArguments): void { // } - + /** * Loads a resource in the context of a frame on the inspected page without cross origin checks. */ @@ -245,7 +249,7 @@ export class NetworkDomainDebugger implements inspectorCommandTypes.NetworkDomai status: 200 } } - + public static idSequence: number = 0; create(): Request { let id = (++NetworkDomainDebugger.idSequence).toString(); @@ -264,4 +268,4 @@ export class RuntimeDomainDebugger { compileScript(): { scriptId?: string, exceptionDetails?: Object } { return {}; } -} \ No newline at end of file +} From 749785f5334f3c04c6fc2bfee631493f886e1a4f Mon Sep 17 00:00:00 2001 From: Martin Yankov Date: Mon, 18 Feb 2019 17:56:45 +0200 Subject: [PATCH 4/4] fix(ios): opaque bars break ui layout --- .../ui-tests-app/action-bar/flat-layout.xml | 10 ++++++++++ .../action-bar/flat-scrollview.xml | 6 +++--- .../action-bar/flat-tab-opaque-bar.ts | 7 +++++++ .../action-bar/flat-tab-opaque-bar.xml | 13 ++++++++++++ apps/app/ui-tests-app/action-bar/flat-tab.xml | 8 ++++---- apps/app/ui-tests-app/action-bar/flat.xml | 14 +++++++------ apps/app/ui-tests-app/action-bar/main-page.ts | 2 ++ .../nested-frames/mid-screen-y-n-flat.xml | 2 +- tns-core-modules/ui/core/view/view.ios.ts | 3 +++ tns-core-modules/ui/page/page.ios.ts | 20 ++++++------------- tns-core-modules/ui/tab-view/tab-view.ios.ts | 3 +++ 11 files changed, 60 insertions(+), 28 deletions(-) create mode 100644 apps/app/ui-tests-app/action-bar/flat-layout.xml create mode 100644 apps/app/ui-tests-app/action-bar/flat-tab-opaque-bar.ts create mode 100644 apps/app/ui-tests-app/action-bar/flat-tab-opaque-bar.xml diff --git a/apps/app/ui-tests-app/action-bar/flat-layout.xml b/apps/app/ui-tests-app/action-bar/flat-layout.xml new file mode 100644 index 0000000000..f7f64f9654 --- /dev/null +++ b/apps/app/ui-tests-app/action-bar/flat-layout.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/apps/app/ui-tests-app/action-bar/flat-scrollview.xml b/apps/app/ui-tests-app/action-bar/flat-scrollview.xml index 2a851d7efd..7617e5db96 100644 --- a/apps/app/ui-tests-app/action-bar/flat-scrollview.xml +++ b/apps/app/ui-tests-app/action-bar/flat-scrollview.xml @@ -1,10 +1,10 @@ - + - - + + \ No newline at end of file diff --git a/apps/app/ui-tests-app/action-bar/flat-tab-opaque-bar.ts b/apps/app/ui-tests-app/action-bar/flat-tab-opaque-bar.ts new file mode 100644 index 0000000000..a0b131f61d --- /dev/null +++ b/apps/app/ui-tests-app/action-bar/flat-tab-opaque-bar.ts @@ -0,0 +1,7 @@ +import { EventData } from "tns-core-modules/data/observable"; +import { TabView } from "tns-core-modules/ui/tab-view"; + +export function onLoaded(args: EventData) { + const tabView = args.object; + tabView.ios.tabBar.translucent = false; +} diff --git a/apps/app/ui-tests-app/action-bar/flat-tab-opaque-bar.xml b/apps/app/ui-tests-app/action-bar/flat-tab-opaque-bar.xml new file mode 100644 index 0000000000..8314ca6179 --- /dev/null +++ b/apps/app/ui-tests-app/action-bar/flat-tab-opaque-bar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/apps/app/ui-tests-app/action-bar/flat-tab.xml b/apps/app/ui-tests-app/action-bar/flat-tab.xml index 02844a4299..fc177b4411 100644 --- a/apps/app/ui-tests-app/action-bar/flat-tab.xml +++ b/apps/app/ui-tests-app/action-bar/flat-tab.xml @@ -1,13 +1,13 @@ - + - + - - + + diff --git a/apps/app/ui-tests-app/action-bar/flat.xml b/apps/app/ui-tests-app/action-bar/flat.xml index fd4dbd18b5..725cd0aa9f 100644 --- a/apps/app/ui-tests-app/action-bar/flat.xml +++ b/apps/app/ui-tests-app/action-bar/flat.xml @@ -1,9 +1,11 @@ - - - - - + + + + + + +