mirror of
https://github.com/NativeScript/NativeScript.git
synced 2025-11-05 13:26:48 +08:00
chore: cleanup
This commit is contained in:
Nathan Walker
@@ -1,339 +1,279 @@
|
||||
// Types
|
||||
import { PropertyChangeData } from "../../data/observable/observable-interfaces";
|
||||
import { ViewBase } from "../core/view-base";
|
||||
import { FontStyle, FontWeight } from "../styling/font-interfaces";
|
||||
import { PropertyChangeData } from '../../data/observable';
|
||||
import { ViewBase } from '../core/view-base';
|
||||
import { FontStyle, FontWeight } from '../styling/font-interfaces';
|
||||
|
||||
// Requires.
|
||||
import { FormattedString } from "./formatted-string";
|
||||
import { Span } from "./span";
|
||||
import { View } from "../core/view";
|
||||
import {
|
||||
Property,
|
||||
CssProperty,
|
||||
InheritedCssProperty,
|
||||
makeValidator,
|
||||
makeParser,
|
||||
} from "../core/properties";
|
||||
import { Style } from "../styling/style";
|
||||
import { Length } from "../styling/style-properties";
|
||||
import { isAndroid, isIOS } from "../../platform";
|
||||
import { Observable } from "../../data/observable";
|
||||
import { FormattedString } from './formatted-string';
|
||||
import { Span } from './span';
|
||||
import { View } from '../core/view';
|
||||
import { Property, CssProperty, InheritedCssProperty, makeValidator, makeParser } from '../core/properties';
|
||||
import { Style } from '../styling/style';
|
||||
import { Length } from '../styling/style-properties';
|
||||
import { isAndroid, isIOS } from '../../platform';
|
||||
import { Observable } from '../../data/observable';
|
||||
|
||||
import {
|
||||
TextAlignment,
|
||||
TextDecoration,
|
||||
TextTransform,
|
||||
WhiteSpace,
|
||||
} from "./text-base-interfaces";
|
||||
import { TextBase as TextBaseDefinition } from ".";
|
||||
import { TextAlignment, TextDecoration, TextTransform, WhiteSpace } from './text-base-interfaces';
|
||||
import { TextBase as TextBaseDefinition } from '.';
|
||||
|
||||
export * from "./text-base-interfaces";
|
||||
export * from './text-base-interfaces';
|
||||
|
||||
const CHILD_SPAN = "Span";
|
||||
const CHILD_FORMATTED_TEXT = "formattedText";
|
||||
const CHILD_FORMATTED_STRING = "FormattedString";
|
||||
const CHILD_SPAN = 'Span';
|
||||
const CHILD_FORMATTED_TEXT = 'formattedText';
|
||||
const CHILD_FORMATTED_STRING = 'FormattedString';
|
||||
|
||||
export abstract class TextBaseCommon extends View
|
||||
implements TextBaseDefinition {
|
||||
public _isSingleLine: boolean;
|
||||
public text: string;
|
||||
public formattedText: FormattedString;
|
||||
export abstract class TextBaseCommon extends View implements TextBaseDefinition {
|
||||
public _isSingleLine: boolean;
|
||||
public text: string;
|
||||
public formattedText: FormattedString;
|
||||
|
||||
get nativeTextViewProtected() {
|
||||
return this.nativeViewProtected;
|
||||
}
|
||||
get nativeTextViewProtected() {
|
||||
return this.nativeViewProtected;
|
||||
}
|
||||
|
||||
get fontFamily(): string {
|
||||
return this.style.fontFamily;
|
||||
}
|
||||
set fontFamily(value: string) {
|
||||
this.style.fontFamily = value;
|
||||
}
|
||||
get fontFamily(): string {
|
||||
return this.style.fontFamily;
|
||||
}
|
||||
set fontFamily(value: string) {
|
||||
this.style.fontFamily = value;
|
||||
}
|
||||
|
||||
get fontSize(): number {
|
||||
return this.style.fontSize;
|
||||
}
|
||||
set fontSize(value: number) {
|
||||
this.style.fontSize = value;
|
||||
}
|
||||
get fontSize(): number {
|
||||
return this.style.fontSize;
|
||||
}
|
||||
set fontSize(value: number) {
|
||||
this.style.fontSize = value;
|
||||
}
|
||||
|
||||
get fontStyle(): FontStyle {
|
||||
return this.style.fontStyle;
|
||||
}
|
||||
set fontStyle(value: FontStyle) {
|
||||
this.style.fontStyle = value;
|
||||
}
|
||||
get fontStyle(): FontStyle {
|
||||
return this.style.fontStyle;
|
||||
}
|
||||
set fontStyle(value: FontStyle) {
|
||||
this.style.fontStyle = value;
|
||||
}
|
||||
|
||||
get fontWeight(): FontWeight {
|
||||
return this.style.fontWeight;
|
||||
}
|
||||
set fontWeight(value: FontWeight) {
|
||||
this.style.fontWeight = value;
|
||||
}
|
||||
get fontWeight(): FontWeight {
|
||||
return this.style.fontWeight;
|
||||
}
|
||||
set fontWeight(value: FontWeight) {
|
||||
this.style.fontWeight = value;
|
||||
}
|
||||
|
||||
get letterSpacing(): number {
|
||||
return this.style.letterSpacing;
|
||||
}
|
||||
set letterSpacing(value: number) {
|
||||
this.style.letterSpacing = value;
|
||||
}
|
||||
get letterSpacing(): number {
|
||||
return this.style.letterSpacing;
|
||||
}
|
||||
set letterSpacing(value: number) {
|
||||
this.style.letterSpacing = value;
|
||||
}
|
||||
|
||||
get lineHeight(): number {
|
||||
return this.style.lineHeight;
|
||||
}
|
||||
set lineHeight(value: number) {
|
||||
this.style.lineHeight = value;
|
||||
}
|
||||
get lineHeight(): number {
|
||||
return this.style.lineHeight;
|
||||
}
|
||||
set lineHeight(value: number) {
|
||||
this.style.lineHeight = value;
|
||||
}
|
||||
|
||||
get textAlignment(): TextAlignment {
|
||||
return this.style.textAlignment;
|
||||
}
|
||||
set textAlignment(value: TextAlignment) {
|
||||
this.style.textAlignment = value;
|
||||
}
|
||||
get textAlignment(): TextAlignment {
|
||||
return this.style.textAlignment;
|
||||
}
|
||||
set textAlignment(value: TextAlignment) {
|
||||
this.style.textAlignment = value;
|
||||
}
|
||||
|
||||
get textDecoration(): TextDecoration {
|
||||
return this.style.textDecoration;
|
||||
}
|
||||
set textDecoration(value: TextDecoration) {
|
||||
this.style.textDecoration = value;
|
||||
}
|
||||
get textDecoration(): TextDecoration {
|
||||
return this.style.textDecoration;
|
||||
}
|
||||
set textDecoration(value: TextDecoration) {
|
||||
this.style.textDecoration = value;
|
||||
}
|
||||
|
||||
get textTransform(): TextTransform {
|
||||
return this.style.textTransform;
|
||||
}
|
||||
set textTransform(value: TextTransform) {
|
||||
this.style.textTransform = value;
|
||||
}
|
||||
get textTransform(): TextTransform {
|
||||
return this.style.textTransform;
|
||||
}
|
||||
set textTransform(value: TextTransform) {
|
||||
this.style.textTransform = value;
|
||||
}
|
||||
|
||||
get whiteSpace(): WhiteSpace {
|
||||
return this.style.whiteSpace;
|
||||
}
|
||||
set whiteSpace(value: WhiteSpace) {
|
||||
this.style.whiteSpace = value;
|
||||
}
|
||||
get whiteSpace(): WhiteSpace {
|
||||
return this.style.whiteSpace;
|
||||
}
|
||||
set whiteSpace(value: WhiteSpace) {
|
||||
this.style.whiteSpace = value;
|
||||
}
|
||||
|
||||
get padding(): string | Length {
|
||||
return this.style.padding;
|
||||
}
|
||||
set padding(value: string | Length) {
|
||||
this.style.padding = value;
|
||||
}
|
||||
get padding(): string | Length {
|
||||
return this.style.padding;
|
||||
}
|
||||
set padding(value: string | Length) {
|
||||
this.style.padding = value;
|
||||
}
|
||||
|
||||
get paddingTop(): Length {
|
||||
return this.style.paddingTop;
|
||||
}
|
||||
set paddingTop(value: Length) {
|
||||
this.style.paddingTop = value;
|
||||
}
|
||||
get paddingTop(): Length {
|
||||
return this.style.paddingTop;
|
||||
}
|
||||
set paddingTop(value: Length) {
|
||||
this.style.paddingTop = value;
|
||||
}
|
||||
|
||||
get paddingRight(): Length {
|
||||
return this.style.paddingRight;
|
||||
}
|
||||
set paddingRight(value: Length) {
|
||||
this.style.paddingRight = value;
|
||||
}
|
||||
get paddingRight(): Length {
|
||||
return this.style.paddingRight;
|
||||
}
|
||||
set paddingRight(value: Length) {
|
||||
this.style.paddingRight = value;
|
||||
}
|
||||
|
||||
get paddingBottom(): Length {
|
||||
return this.style.paddingBottom;
|
||||
}
|
||||
set paddingBottom(value: Length) {
|
||||
this.style.paddingBottom = value;
|
||||
}
|
||||
get paddingBottom(): Length {
|
||||
return this.style.paddingBottom;
|
||||
}
|
||||
set paddingBottom(value: Length) {
|
||||
this.style.paddingBottom = value;
|
||||
}
|
||||
|
||||
get paddingLeft(): Length {
|
||||
return this.style.paddingLeft;
|
||||
}
|
||||
set paddingLeft(value: Length) {
|
||||
this.style.paddingLeft = value;
|
||||
}
|
||||
get paddingLeft(): Length {
|
||||
return this.style.paddingLeft;
|
||||
}
|
||||
set paddingLeft(value: Length) {
|
||||
this.style.paddingLeft = value;
|
||||
}
|
||||
|
||||
public _onFormattedTextContentsChanged(data: PropertyChangeData) {
|
||||
if (this.nativeViewProtected) {
|
||||
// Notifications from the FormattedString start arriving before the Android view is even created.
|
||||
this[formattedTextProperty.setNative](data.value);
|
||||
}
|
||||
}
|
||||
public _onFormattedTextContentsChanged(data: PropertyChangeData) {
|
||||
if (this.nativeViewProtected) {
|
||||
// Notifications from the FormattedString start arriving before the Android view is even created.
|
||||
this[formattedTextProperty.setNative](data.value);
|
||||
}
|
||||
}
|
||||
|
||||
public _addChildFromBuilder(name: string, value: any): void {
|
||||
if (name === CHILD_SPAN) {
|
||||
if (!this.formattedText) {
|
||||
const formattedText = new FormattedString();
|
||||
formattedText.spans.push(value);
|
||||
this.formattedText = formattedText;
|
||||
} else {
|
||||
this.formattedText.spans.push(value);
|
||||
}
|
||||
} else if (
|
||||
name === CHILD_FORMATTED_TEXT ||
|
||||
name === CHILD_FORMATTED_STRING
|
||||
) {
|
||||
this.formattedText = value;
|
||||
}
|
||||
}
|
||||
public _addChildFromBuilder(name: string, value: any): void {
|
||||
if (name === CHILD_SPAN) {
|
||||
if (!this.formattedText) {
|
||||
const formattedText = new FormattedString();
|
||||
formattedText.spans.push(value);
|
||||
this.formattedText = formattedText;
|
||||
} else {
|
||||
this.formattedText.spans.push(value);
|
||||
}
|
||||
} else if (name === CHILD_FORMATTED_TEXT || name === CHILD_FORMATTED_STRING) {
|
||||
this.formattedText = value;
|
||||
}
|
||||
}
|
||||
|
||||
_requestLayoutOnTextChanged(): void {
|
||||
this.requestLayout();
|
||||
}
|
||||
_requestLayoutOnTextChanged(): void {
|
||||
this.requestLayout();
|
||||
}
|
||||
|
||||
eachChild(callback: (child: ViewBase) => boolean): void {
|
||||
let text = this.formattedText;
|
||||
if (text) {
|
||||
callback(text);
|
||||
}
|
||||
}
|
||||
eachChild(callback: (child: ViewBase) => boolean): void {
|
||||
let text = this.formattedText;
|
||||
if (text) {
|
||||
callback(text);
|
||||
}
|
||||
}
|
||||
|
||||
_setNativeText(reset: boolean = false): void {
|
||||
//
|
||||
}
|
||||
_setNativeText(reset: boolean = false): void {
|
||||
//
|
||||
}
|
||||
}
|
||||
|
||||
TextBaseCommon.prototype._isSingleLine = false;
|
||||
|
||||
export function isBold(fontWeight: FontWeight): boolean {
|
||||
return (
|
||||
fontWeight === "bold" ||
|
||||
fontWeight === "700" ||
|
||||
fontWeight === "800" ||
|
||||
fontWeight === "900"
|
||||
);
|
||||
return fontWeight === 'bold' || fontWeight === '700' || fontWeight === '800' || fontWeight === '900';
|
||||
}
|
||||
|
||||
export const textProperty = new Property<TextBaseCommon, string>({
|
||||
name: "text",
|
||||
defaultValue: "",
|
||||
affectsLayout: isAndroid,
|
||||
name: 'text',
|
||||
defaultValue: '',
|
||||
affectsLayout: isAndroid,
|
||||
});
|
||||
textProperty.register(TextBaseCommon);
|
||||
|
||||
export const formattedTextProperty = new Property<
|
||||
TextBaseCommon,
|
||||
FormattedString
|
||||
>({
|
||||
name: "formattedText",
|
||||
affectsLayout: true,
|
||||
valueChanged: onFormattedTextPropertyChanged,
|
||||
export const formattedTextProperty = new Property<TextBaseCommon, FormattedString>({
|
||||
name: 'formattedText',
|
||||
affectsLayout: true,
|
||||
valueChanged: onFormattedTextPropertyChanged,
|
||||
});
|
||||
formattedTextProperty.register(TextBaseCommon);
|
||||
|
||||
function onFormattedTextPropertyChanged(
|
||||
textBase: TextBaseCommon,
|
||||
oldValue: FormattedString,
|
||||
newValue: FormattedString
|
||||
) {
|
||||
if (oldValue) {
|
||||
oldValue.off(
|
||||
Observable.propertyChangeEvent,
|
||||
textBase._onFormattedTextContentsChanged,
|
||||
textBase
|
||||
);
|
||||
textBase._removeView(oldValue);
|
||||
}
|
||||
function onFormattedTextPropertyChanged(textBase: TextBaseCommon, oldValue: FormattedString, newValue: FormattedString) {
|
||||
if (oldValue) {
|
||||
oldValue.off(Observable.propertyChangeEvent, textBase._onFormattedTextContentsChanged, textBase);
|
||||
textBase._removeView(oldValue);
|
||||
}
|
||||
|
||||
if (newValue) {
|
||||
const oldParent = newValue.parent;
|
||||
// In case formattedString is attached to new TextBase
|
||||
if (oldParent) {
|
||||
oldParent._removeView(newValue);
|
||||
}
|
||||
textBase._addView(newValue);
|
||||
newValue.on(
|
||||
Observable.propertyChangeEvent,
|
||||
textBase._onFormattedTextContentsChanged,
|
||||
textBase
|
||||
);
|
||||
}
|
||||
if (newValue) {
|
||||
const oldParent = newValue.parent;
|
||||
// In case formattedString is attached to new TextBase
|
||||
if (oldParent) {
|
||||
oldParent._removeView(newValue);
|
||||
}
|
||||
textBase._addView(newValue);
|
||||
newValue.on(Observable.propertyChangeEvent, textBase._onFormattedTextContentsChanged, textBase);
|
||||
}
|
||||
}
|
||||
|
||||
export function getClosestPropertyValue<T>(
|
||||
property: CssProperty<any, T>,
|
||||
span: Span
|
||||
): T {
|
||||
if (property.isSet(span.style)) {
|
||||
return span.style[property.name];
|
||||
} else if (property.isSet(span.parent.style)) {
|
||||
// parent is FormattedString
|
||||
return span.parent.style[property.name];
|
||||
} else if (property.isSet(span.parent.parent.style)) {
|
||||
// parent.parent is TextBase
|
||||
return span.parent.parent.style[property.name];
|
||||
}
|
||||
export function getClosestPropertyValue<T>(property: CssProperty<any, T>, span: Span): T {
|
||||
if (property.isSet(span.style)) {
|
||||
return span.style[property.name];
|
||||
} else if (property.isSet(span.parent.style)) {
|
||||
// parent is FormattedString
|
||||
return span.parent.style[property.name];
|
||||
} else if (property.isSet(span.parent.parent.style)) {
|
||||
// parent.parent is TextBase
|
||||
return span.parent.parent.style[property.name];
|
||||
}
|
||||
}
|
||||
|
||||
const textAlignmentConverter = makeParser<TextAlignment>(
|
||||
makeValidator<TextAlignment>("initial", "left", "center", "right")
|
||||
);
|
||||
export const textAlignmentProperty = new InheritedCssProperty<
|
||||
Style,
|
||||
TextAlignment
|
||||
>({
|
||||
name: "textAlignment",
|
||||
cssName: "text-align",
|
||||
defaultValue: "initial",
|
||||
valueConverter: textAlignmentConverter,
|
||||
const textAlignmentConverter = makeParser<TextAlignment>(makeValidator<TextAlignment>('initial', 'left', 'center', 'right'));
|
||||
export const textAlignmentProperty = new InheritedCssProperty<Style, TextAlignment>({
|
||||
name: 'textAlignment',
|
||||
cssName: 'text-align',
|
||||
defaultValue: 'initial',
|
||||
valueConverter: textAlignmentConverter,
|
||||
});
|
||||
textAlignmentProperty.register(Style);
|
||||
|
||||
const textTransformConverter = makeParser<TextTransform>(
|
||||
makeValidator<TextTransform>(
|
||||
"initial",
|
||||
"none",
|
||||
"capitalize",
|
||||
"uppercase",
|
||||
"lowercase"
|
||||
)
|
||||
);
|
||||
const textTransformConverter = makeParser<TextTransform>(makeValidator<TextTransform>('initial', 'none', 'capitalize', 'uppercase', 'lowercase'));
|
||||
export const textTransformProperty = new CssProperty<Style, TextTransform>({
|
||||
name: "textTransform",
|
||||
cssName: "text-transform",
|
||||
defaultValue: "initial",
|
||||
valueConverter: textTransformConverter,
|
||||
name: 'textTransform',
|
||||
cssName: 'text-transform',
|
||||
defaultValue: 'initial',
|
||||
valueConverter: textTransformConverter,
|
||||
});
|
||||
textTransformProperty.register(Style);
|
||||
|
||||
const whiteSpaceConverter = makeParser<WhiteSpace>(
|
||||
makeValidator<WhiteSpace>("initial", "normal", "nowrap")
|
||||
);
|
||||
const whiteSpaceConverter = makeParser<WhiteSpace>(makeValidator<WhiteSpace>('initial', 'normal', 'nowrap'));
|
||||
export const whiteSpaceProperty = new CssProperty<Style, WhiteSpace>({
|
||||
name: "whiteSpace",
|
||||
cssName: "white-space",
|
||||
defaultValue: "initial",
|
||||
affectsLayout: isIOS,
|
||||
valueConverter: whiteSpaceConverter,
|
||||
name: 'whiteSpace',
|
||||
cssName: 'white-space',
|
||||
defaultValue: 'initial',
|
||||
affectsLayout: isIOS,
|
||||
valueConverter: whiteSpaceConverter,
|
||||
});
|
||||
whiteSpaceProperty.register(Style);
|
||||
|
||||
const textDecorationConverter = makeParser<TextDecoration>(
|
||||
makeValidator<TextDecoration>(
|
||||
"none",
|
||||
"underline",
|
||||
"line-through",
|
||||
"underline line-through"
|
||||
)
|
||||
);
|
||||
const textDecorationConverter = makeParser<TextDecoration>(makeValidator<TextDecoration>('none', 'underline', 'line-through', 'underline line-through'));
|
||||
export const textDecorationProperty = new CssProperty<Style, TextDecoration>({
|
||||
name: "textDecoration",
|
||||
cssName: "text-decoration",
|
||||
defaultValue: "none",
|
||||
valueConverter: textDecorationConverter,
|
||||
name: 'textDecoration',
|
||||
cssName: 'text-decoration',
|
||||
defaultValue: 'none',
|
||||
valueConverter: textDecorationConverter,
|
||||
});
|
||||
textDecorationProperty.register(Style);
|
||||
|
||||
export const letterSpacingProperty = new InheritedCssProperty<Style, number>({
|
||||
name: "letterSpacing",
|
||||
cssName: "letter-spacing",
|
||||
defaultValue: 0,
|
||||
affectsLayout: isIOS,
|
||||
valueConverter: (v) => parseFloat(v),
|
||||
name: 'letterSpacing',
|
||||
cssName: 'letter-spacing',
|
||||
defaultValue: 0,
|
||||
affectsLayout: isIOS,
|
||||
valueConverter: (v) => parseFloat(v),
|
||||
});
|
||||
letterSpacingProperty.register(Style);
|
||||
|
||||
export const lineHeightProperty = new InheritedCssProperty<Style, number>({
|
||||
name: "lineHeight",
|
||||
cssName: "line-height",
|
||||
affectsLayout: isIOS,
|
||||
valueConverter: (v) => parseFloat(v),
|
||||
name: 'lineHeight',
|
||||
cssName: 'line-height',
|
||||
affectsLayout: isIOS,
|
||||
valueConverter: (v) => parseFloat(v),
|
||||
});
|
||||
lineHeightProperty.register(Style);
|
||||
|
||||
export const resetSymbol = Symbol("textPropertyDefault");
|
||||
export const resetSymbol = Symbol('textPropertyDefault');
|
||||
|
||||
Reference in New Issue
Block a user