chore: typing fixes

This commit is contained in:
Nathan Walker
2021-02-25 13:32:05 -08:00
parent 19ce9fc2bf
commit 1cd6854370
6 changed files with 148 additions and 146 deletions

View File

@ -16,6 +16,7 @@ moduleAlias.addAliases({
'@nativescript/core/color': path.resolve(tnsCoreModules, 'color/color-common'), '@nativescript/core/color': path.resolve(tnsCoreModules, 'color/color-common'),
'@nativescript/core/ui/styling/font': path.resolve(tnsCoreModules, 'ui/styling/font-common'), '@nativescript/core/ui/styling/font': path.resolve(tnsCoreModules, 'ui/styling/font-common'),
'@nativescript/core/ui/styling/background': path.resolve(tnsCoreModules, 'ui/styling/background-common'), '@nativescript/core/ui/styling/background': path.resolve(tnsCoreModules, 'ui/styling/background-common'),
'@nativescript/core/ui/styling/css-shadow': path.resolve(tnsCoreModules, 'ui/styling/css-shadow'),
'@nativescript/core': tnsCoreModules, '@nativescript/core': tnsCoreModules,
'~': __dirname, '~': __dirname,

View File

@ -2,23 +2,24 @@
// the imports don't work. We need to fully switch to jest & set up ts support // the imports don't work. We need to fully switch to jest & set up ts support
// todo: fix tests. // todo: fix tests.
// import { parseCSSShadow } from "@nativescript/core/ui/styling/css-shadow"; import { parseCSSShadow } from '@nativescript/core/ui/styling/css-shadow';
// import { zeroLength } from "@nativescript/core"; import { zeroLength } from '@nativescript/core';
import { assert } from 'chai';
// describe('ui', () => { describe('ui', () => {
// describe('styling', () => { describe('styling', () => {
// describe('css-shadow', () => { describe('css-shadow', () => {
// it('empty', () => {
// it("empty", () => { const shadow = parseCSSShadow('');
// const shadow = parseCSSShadow("")
// expect(shadow.inset).toBe(false) // expect(shadow.inset).toBe(false)
// expect(shadow.offsetX).toBe(zeroLength) // expect(shadow.offsetX).toBe(zeroLength)
// expect(shadow.offsetY).toBe(zeroLength) // expect(shadow.offsetY).toBe(zeroLength)
// expect(shadow.blurRadius).toBe(zeroLength) // expect(shadow.blurRadius).toBe(zeroLength)
// expect(shadow.spreadRadius).toBe(zeroLength) // expect(shadow.spreadRadius).toBe(zeroLength)
// expect(shadow.color).toBe('black') // expect(shadow.color).toBe('black')
// }); assert.equal(shadow.inset, false);
// });
// it("1px 1px 2px black", () => { // it("1px 1px 2px black", () => {
// const shadow = parseCSSShadow("1px 1px 2px black") // const shadow = parseCSSShadow("1px 1px 2px black")
// expect(shadow.inset).toBe(false) // expect(shadow.inset).toBe(false)
@ -28,7 +29,7 @@
// expect(shadow.spreadRadius).toBe(zeroLength) // expect(shadow.spreadRadius).toBe(zeroLength)
// expect(shadow.color).toBe('black') // expect(shadow.color).toBe('black')
// }); // });
//
// it("#fc0 1px 0 10px", () => { // it("#fc0 1px 0 10px", () => {
// const shadow = parseCSSShadow("#fc0 1px 0 10px") // const shadow = parseCSSShadow("#fc0 1px 0 10px")
// expect(shadow.inset).toBe(false) // expect(shadow.inset).toBe(false)
@ -38,7 +39,7 @@
// expect(shadow.spreadRadius).toBe(zeroLength) // expect(shadow.spreadRadius).toBe(zeroLength)
// expect(shadow.color).toBe('#fc0') // expect(shadow.color).toBe('#fc0')
// }); // });
//
// it("5px 5px #558abb", () => { // it("5px 5px #558abb", () => {
// const shadow = parseCSSShadow("5px 5px #558abb") // const shadow = parseCSSShadow("5px 5px #558abb")
// expect(shadow.inset).toBe(false) // expect(shadow.inset).toBe(false)
@ -48,7 +49,7 @@
// expect(shadow.spreadRadius).toBe(zeroLength) // expect(shadow.spreadRadius).toBe(zeroLength)
// expect(shadow.color).toBe('#558abb') // expect(shadow.color).toBe('#558abb')
// }); // });
//
// it("white 2px 5px", () => { // it("white 2px 5px", () => {
// const shadow = parseCSSShadow("white 2px 5px") // const shadow = parseCSSShadow("white 2px 5px")
// expect(shadow.inset).toBe(false) // expect(shadow.inset).toBe(false)
@ -58,7 +59,7 @@
// expect(shadow.spreadRadius).toBe(zeroLength) // expect(shadow.spreadRadius).toBe(zeroLength)
// expect(shadow.color).toBe('white') // expect(shadow.color).toBe('white')
// }); // });
//
// it("5px 10px", () => { // it("5px 10px", () => {
// const shadow = parseCSSShadow("5px 10px") // const shadow = parseCSSShadow("5px 10px")
// expect(shadow.inset).toBe(false) // expect(shadow.inset).toBe(false)
@ -68,7 +69,7 @@
// expect(shadow.spreadRadius).toBe(zeroLength) // expect(shadow.spreadRadius).toBe(zeroLength)
// expect(shadow.color).toBe('black') // expect(shadow.color).toBe('black')
// }); // });
//
// // box // // box
// it("60px -16px teal", () => { // it("60px -16px teal", () => {
// const shadow = parseCSSShadow("60px -16px teal") // const shadow = parseCSSShadow("60px -16px teal")
@ -79,7 +80,7 @@
// expect(shadow.spreadRadius).toBe(zeroLength) // expect(shadow.spreadRadius).toBe(zeroLength)
// expect(shadow.color).toBe('teal') // expect(shadow.color).toBe('teal')
// }); // });
//
// it("10px 5px 5px black", () => { // it("10px 5px 5px black", () => {
// const shadow = parseCSSShadow("10px 5px 5px black") // const shadow = parseCSSShadow("10px 5px 5px black")
// expect(shadow.inset).toBe(false) // expect(shadow.inset).toBe(false)
@ -89,7 +90,7 @@
// expect(shadow.spreadRadius).toBe(zeroLength) // expect(shadow.spreadRadius).toBe(zeroLength)
// expect(shadow.color).toBe('black') // expect(shadow.color).toBe('black')
// }); // });
//
// it("2px 2px 2px 1px rgba(0, 0, 0, 0.2)", () => { // it("2px 2px 2px 1px rgba(0, 0, 0, 0.2)", () => {
// const shadow = parseCSSShadow("2px 2px 2px 1px rgba(0, 0, 0, 0.2)") // const shadow = parseCSSShadow("2px 2px 2px 1px rgba(0, 0, 0, 0.2)")
// expect(shadow.inset).toBe(false) // expect(shadow.inset).toBe(false)
@ -99,7 +100,7 @@
// expect(shadow.spreadRadius).toBe(1) // expect(shadow.spreadRadius).toBe(1)
// expect(shadow.color).toBe('rgba(0, 0, 0, 0.2)') // expect(shadow.color).toBe('rgba(0, 0, 0, 0.2)')
// }); // });
//
// it("inset 5em 1em gold", () => { // it("inset 5em 1em gold", () => {
// const shadow = parseCSSShadow("inset 5em 1em gold") // const shadow = parseCSSShadow("inset 5em 1em gold")
// expect(shadow.inset).toBe(true) // expect(shadow.inset).toBe(true)
@ -109,7 +110,7 @@
// expect(shadow.spreadRadius).toBe(zeroLength) // expect(shadow.spreadRadius).toBe(zeroLength)
// expect(shadow.color).toBe('gold') // expect(shadow.color).toBe('gold')
// }); // });
//
// it("5 10", () => { // it("5 10", () => {
// const shadow = parseCSSShadow("5 10") // const shadow = parseCSSShadow("5 10")
// expect(shadow.inset).toBe(false) // expect(shadow.inset).toBe(false)
@ -119,7 +120,7 @@
// expect(shadow.spreadRadius).toBe(zeroLength) // expect(shadow.spreadRadius).toBe(zeroLength)
// expect(shadow.color).toBe('black') // expect(shadow.color).toBe('black')
// }); // });
//
// it("2 2 2 #333", () => { // it("2 2 2 #333", () => {
// const shadow = parseCSSShadow("2 2 2 #333") // const shadow = parseCSSShadow("2 2 2 #333")
// expect(shadow.inset).toBe(false) // expect(shadow.inset).toBe(false)
@ -129,7 +130,7 @@
// expect(shadow.spreadRadius).toBe(zeroLength) // expect(shadow.spreadRadius).toBe(zeroLength)
// expect(shadow.color).toBe('#333') // expect(shadow.color).toBe('#333')
// }); // });
//
// it("-1 -1 1 #333", () => { // it("-1 -1 1 #333", () => {
// const shadow = parseCSSShadow("-1 -1 1 #333") // const shadow = parseCSSShadow("-1 -1 1 #333")
// expect(shadow.inset).toBe(false) // expect(shadow.inset).toBe(false)
@ -139,7 +140,6 @@
// expect(shadow.spreadRadius).toBe(zeroLength) // expect(shadow.spreadRadius).toBe(zeroLength)
// expect(shadow.color).toBe('#333') // expect(shadow.color).toBe('#333')
// }); // });
// }); });
// }); });
// }); });
//

View File

@ -96,7 +96,7 @@ export declare class Page extends PageBase {
/** /**
* Should page changed be annnounced to the screen reader. * Should page changed be annnounced to the screen reader.
*/ */
public accessibilityAnnouncePageEnabled = true; public accessibilityAnnouncePageEnabled: boolean;
/** /**
* A basic method signature to hook an event listener (shortcut alias to the addEventListener method). * A basic method signature to hook an event listener (shortcut alias to the addEventListener method).

View File

@ -1,6 +1,7 @@
import { View } from '../core/view'; import { View } from '../core/view';
import { Property, CoercibleProperty } from '../core/properties'; import { Property, CoercibleProperty } from '../core/properties';
import { EventData } from '../../data/observable'; import { EventData } from '../../data/observable';
import type { SliderBase } from './slider-common';
/** /**
* Represents a slider component. * Represents a slider component.

View File

@ -2,7 +2,7 @@ import { Color } from '../../color';
import { View } from '../core/view'; import { View } from '../core/view';
import { BackgroundRepeat } from '../../css/parser'; import { BackgroundRepeat } from '../../css/parser';
import { LinearGradient } from '../styling/linear-gradient'; import { LinearGradient } from '../styling/linear-gradient';
import { BoxShadow } from './box-shadow'; import { CSSShadow } from './css-shadow';
export enum CacheMode { export enum CacheMode {
none, none,
@ -30,7 +30,7 @@ export declare class Background {
public borderBottomRightRadius: number; public borderBottomRightRadius: number;
public borderBottomLeftRadius: number; public borderBottomLeftRadius: number;
public clipPath: string; public clipPath: string;
public boxShadow: string | BoxShadow; public boxShadow: string | CSSShadow;
public withColor(value: Color): Background; public withColor(value: Color): Background;
public withImage(value: string | LinearGradient): Background; public withImage(value: string | LinearGradient): Background;
@ -50,7 +50,7 @@ export declare class Background {
public withBorderBottomRightRadius(value: number): Background; public withBorderBottomRightRadius(value: number): Background;
public withBorderBottomLeftRadius(value: number): Background; public withBorderBottomLeftRadius(value: number): Background;
public withClipPath(value: string): Background; public withClipPath(value: string): Background;
public withBoxShadow(value: BoxShadow): Background; public withBoxShadow(value: CSSShadow): Background;
public isEmpty(): boolean; public isEmpty(): boolean;
@ -67,7 +67,7 @@ export declare class Background {
public getUniformBorderWidth(): number; public getUniformBorderWidth(): number;
public getUniformBorderRadius(): number; public getUniformBorderRadius(): number;
public hasBoxShadow(): boolean; public hasBoxShadow(): boolean;
public getBoxShadow(): BoxShadow; public getBoxShadow(): CSSShadow;
} }
export namespace ios { export namespace ios {

View File

@ -130,7 +130,7 @@ export type TextDecoration = 'none' | 'underline' | 'line-through' | 'underline
export const textAlignmentProperty: InheritedCssProperty<Style, TextAlignment>; export const textAlignmentProperty: InheritedCssProperty<Style, TextAlignment>;
export const textDecorationProperty: CssProperty<Style, TextDecoration>; export const textDecorationProperty: CssProperty<Style, TextDecoration>;
export const textTransformProperty: CssProperty<Style, TextTransform>; export const textTransformProperty: CssProperty<Style, TextTransform>;
export const textShadowProperty: CssProperty<Style, TextShadow>; export const textShadowProperty: CssProperty<Style, CSSShadow>;
export const whiteSpaceProperty: CssProperty<Style, WhiteSpace>; export const whiteSpaceProperty: CssProperty<Style, WhiteSpace>;
export const letterSpacingProperty: CssProperty<Style, number>; export const letterSpacingProperty: CssProperty<Style, number>;
export const lineHeightProperty: CssProperty<Style, number>; export const lineHeightProperty: CssProperty<Style, number>;