fix(core): type collisions with namespace (#8809)

This commit is contained in:
Nathan Walker
2021-02-25 21:03:07 -08:00
parent 784e9c93cd
commit ab11dc9c9f
110 changed files with 1882 additions and 1827 deletions

View File

@@ -3,6 +3,7 @@ import { FormattedString } from './formatted-string';
import { Style } from '../styling/style';
import { Length } from '../styling/style-properties';
import { Property, CssProperty, InheritedCssProperty } from '../core/properties';
import { Enums } from '../enums';
import { CSSShadow } from '../styling/css-shadow';
export class TextBase extends View implements AddChildFromBuilder {
@@ -40,17 +41,17 @@ export class TextBase extends View implements AddChildFromBuilder {
/**
* Gets or sets text-alignment style property.
*/
textAlignment: TextAlignment;
textAlignment: Enums.TextAlignmentType;
/**
* Gets or sets text decorations style property.
*/
textDecoration: TextDecoration;
textDecoration: Enums.TextDecorationType;
/**
* Gets or sets text transform style property.
*/
textTransform: TextTransform;
textTransform: Enums.TextTransformType;
/**
* Gets or sets text shadow style property.
@@ -60,7 +61,7 @@ export class TextBase extends View implements AddChildFromBuilder {
/**
* Gets or sets white space style property.
*/
whiteSpace: WhiteSpace;
whiteSpace: Enums.WhiteSpaceType;
/**
* Gets or sets padding style property.
@@ -122,20 +123,15 @@ export interface TextTransformation {
export const textProperty: Property<TextBase, string>;
export const formattedTextProperty: Property<TextBase, FormattedString>;
export type WhiteSpace = 'initial' | 'normal' | 'nowrap';
export type TextAlignment = 'initial' | 'left' | 'center' | 'right';
export type TextTransform = 'initial' | 'none' | 'capitalize' | 'uppercase' | 'lowercase';
export type TextDecoration = 'none' | 'underline' | 'line-through' | 'underline line-through';
export const textAlignmentProperty: InheritedCssProperty<Style, TextAlignment>;
export const textDecorationProperty: CssProperty<Style, TextDecoration>;
export const textTransformProperty: CssProperty<Style, TextTransform>;
export const textAlignmentProperty: InheritedCssProperty<Style, Enums.TextAlignmentType>;
export const textDecorationProperty: CssProperty<Style, Enums.TextDecorationType>;
export const textTransformProperty: CssProperty<Style, Enums.TextTransformType>;
export const textShadowProperty: CssProperty<Style, CSSShadow>;
export const whiteSpaceProperty: CssProperty<Style, WhiteSpace>;
export const whiteSpaceProperty: CssProperty<Style, Enums.WhiteSpaceType>;
export const letterSpacingProperty: CssProperty<Style, number>;
export const lineHeightProperty: CssProperty<Style, number>;
//Used by tab view
export function getTransformedText(text: string, textTransform: TextTransform): string;
export function getTransformedText(text: string, textTransform: Enums.TextTransformType): string;
export const resetSymbol: symbol;