js: font style for input

This commit is contained in:
王劲鹏 2023-01-12 11:09:22 +08:00 committed by osborn
parent 956cf7583e
commit 81c519dcdf
20 changed files with 1129 additions and 836 deletions

View File

@ -3412,6 +3412,10 @@ var Input = /** @class */ (function (_super) {
Property, Property,
__metadata$6("design:type", Gravity) __metadata$6("design:type", Gravity)
], Input.prototype, "textAlignment", void 0); ], Input.prototype, "textAlignment", void 0);
__decorate$6([
Property,
__metadata$6("design:type", String)
], Input.prototype, "fontStyle", void 0);
__decorate$6([ __decorate$6([
Property, Property,
__metadata$6("design:type", Function) __metadata$6("design:type", Function)
@ -4356,7 +4360,7 @@ var __generator$1 = (undefined && undefined.__generator) || function (thisArg, b
function verb(n) { return function (v) { return step([n, v]); }; } function verb(n) { return function (v) { return step([n, v]); }; }
function step(op) { function step(op) {
if (f) { throw new TypeError("Generator is already executing."); } if (f) { throw new TypeError("Generator is already executing."); }
while (_) { try { while (g && (g = 0, op[0] && (_ = 0)), _) { try {
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) { return t; } if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) { return t; }
if (y = 0, t) { op = [op[0] & 2, t.value]; } if (y = 0, t) { op = [op[0] & 2, t.value]; }
switch (op[0]) { switch (op[0]) {
@ -4585,7 +4589,7 @@ var __generator = (undefined && undefined.__generator) || function (thisArg, bod
function verb(n) { return function (v) { return step([n, v]); }; } function verb(n) { return function (v) { return step([n, v]); }; }
function step(op) { function step(op) {
if (f) { throw new TypeError("Generator is already executing."); } if (f) { throw new TypeError("Generator is already executing."); }
while (_) { try { while (g && (g = 0, op[0] && (_ = 0)), _) { try {
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) { return t; } if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) { return t; }
if (y = 0, t) { op = [op[0] & 2, t.value]; } if (y = 0, t) { op = [op[0] & 2, t.value]; }
switch (op[0]) { switch (op[0]) {

View File

@ -161,6 +161,24 @@ function createRef() {
return new Ref; return new Ref;
} }
class View { class View {
callback2Id(f) {
const id = uniqueId('Function');
this.callbacks.set(id, f);
return id;
}
id2Callback(id) {
let f = this.callbacks.get(id);
if (f === undefined) {
f = Reflect.get(this, id);
}
return f;
}
findViewByTag(tag) {
if (tag === this.tag) {
return this;
}
return undefined;
}
constructor() { constructor() {
this.width = 0; this.width = 0;
this.height = 0; this.height = 0;
@ -192,24 +210,6 @@ class View {
} }
}); });
} }
callback2Id(f) {
const id = uniqueId('Function');
this.callbacks.set(id, f);
return id;
}
id2Callback(id) {
let f = this.callbacks.get(id);
if (f === undefined) {
f = Reflect.get(this, id);
}
return f;
}
findViewByTag(tag) {
if (tag === this.tag) {
return this;
}
return undefined;
}
/** Anchor start*/ /** Anchor start*/
get left() { get left() {
return this.x; return this.x;
@ -2628,6 +2628,10 @@ __decorate$6([
Property, Property,
__metadata$6("design:type", Gravity) __metadata$6("design:type", Gravity)
], Input.prototype, "textAlignment", void 0); ], Input.prototype, "textAlignment", void 0);
__decorate$6([
Property,
__metadata$6("design:type", String)
], Input.prototype, "fontStyle", void 0);
__decorate$6([ __decorate$6([
Property, Property,
__metadata$6("design:type", Function) __metadata$6("design:type", Function)

File diff suppressed because it is too large Load Diff

View File

@ -1273,6 +1273,16 @@ var doric = (function (exports) {
} }
} }
class Context { class Context {
hookBeforeNativeCall() {
if (this.entity && Reflect.has(this.entity, 'hookBeforeNativeCall')) {
Reflect.apply(Reflect.get(this.entity, 'hookBeforeNativeCall'), this.entity, []);
}
}
hookAfterNativeCall() {
if (this.entity && Reflect.has(this.entity, 'hookAfterNativeCall')) {
Reflect.apply(Reflect.get(this.entity, 'hookAfterNativeCall'), this.entity, []);
}
}
constructor(id) { constructor(id) {
this.callbacks = new Map; this.callbacks = new Map;
this.classes = new Map; this.classes = new Map;
@ -1307,16 +1317,6 @@ var doric = (function (exports) {
} }
}); });
} }
hookBeforeNativeCall() {
if (this.entity && Reflect.has(this.entity, 'hookBeforeNativeCall')) {
Reflect.apply(Reflect.get(this.entity, 'hookBeforeNativeCall'), this.entity, []);
}
}
hookAfterNativeCall() {
if (this.entity && Reflect.has(this.entity, 'hookAfterNativeCall')) {
Reflect.apply(Reflect.get(this.entity, 'hookAfterNativeCall'), this.entity, []);
}
}
callNative(namespace, method, args) { callNative(namespace, method, args) {
const callbackId = uniqueId('callback'); const callbackId = uniqueId('callback');
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {

View File

@ -1284,6 +1284,16 @@ function jsCallReject(contextId, callbackId, args) {
} }
} }
class Context { class Context {
hookBeforeNativeCall() {
if (this.entity && Reflect.has(this.entity, 'hookBeforeNativeCall')) {
Reflect.apply(Reflect.get(this.entity, 'hookBeforeNativeCall'), this.entity, []);
}
}
hookAfterNativeCall() {
if (this.entity && Reflect.has(this.entity, 'hookAfterNativeCall')) {
Reflect.apply(Reflect.get(this.entity, 'hookAfterNativeCall'), this.entity, []);
}
}
constructor(id) { constructor(id) {
this.callbacks = new Map; this.callbacks = new Map;
this.classes = new Map; this.classes = new Map;
@ -1318,16 +1328,6 @@ class Context {
} }
}); });
} }
hookBeforeNativeCall() {
if (this.entity && Reflect.has(this.entity, 'hookBeforeNativeCall')) {
Reflect.apply(Reflect.get(this.entity, 'hookBeforeNativeCall'), this.entity, []);
}
}
hookAfterNativeCall() {
if (this.entity && Reflect.has(this.entity, 'hookAfterNativeCall')) {
Reflect.apply(Reflect.get(this.entity, 'hookAfterNativeCall'), this.entity, []);
}
}
callNative(namespace, method, args) { callNative(namespace, method, args) {
const callbackId = uniqueId('callback'); const callbackId = uniqueId('callback');
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@ -1701,6 +1701,24 @@ function createRef() {
return new Ref; return new Ref;
} }
class View { class View {
callback2Id(f) {
const id = uniqueId('Function');
this.callbacks.set(id, f);
return id;
}
id2Callback(id) {
let f = this.callbacks.get(id);
if (f === undefined) {
f = Reflect.get(this, id);
}
return f;
}
findViewByTag(tag) {
if (tag === this.tag) {
return this;
}
return undefined;
}
constructor() { constructor() {
this.width = 0; this.width = 0;
this.height = 0; this.height = 0;
@ -1732,24 +1750,6 @@ class View {
} }
}); });
} }
callback2Id(f) {
const id = uniqueId('Function');
this.callbacks.set(id, f);
return id;
}
id2Callback(id) {
let f = this.callbacks.get(id);
if (f === undefined) {
f = Reflect.get(this, id);
}
return f;
}
findViewByTag(tag) {
if (tag === this.tag) {
return this;
}
return undefined;
}
/** Anchor start*/ /** Anchor start*/
get left() { get left() {
return this.x; return this.x;
@ -4168,6 +4168,10 @@ __decorate$6([
Property, Property,
__metadata$6("design:type", Gravity) __metadata$6("design:type", Gravity)
], Input.prototype, "textAlignment", void 0); ], Input.prototype, "textAlignment", void 0);
__decorate$6([
Property,
__metadata$6("design:type", String)
], Input.prototype, "fontStyle", void 0);
__decorate$6([ __decorate$6([
Property, Property,
__metadata$6("design:type", Function) __metadata$6("design:type", Function)

3
doric-js/index.d.ts vendored
View File

@ -1,5 +1,5 @@
declare module "doric" { declare module "doric" {
// Generated by dts-bundle-generator v6.12.0 // Generated by dts-bundle-generator v6.13.0
export interface Modeling { export interface Modeling {
toModel(): Model; toModel(): Model;
@ -1255,6 +1255,7 @@ declare module "doric" {
hintTextColor?: Color; hintTextColor?: Color;
multiline?: boolean; multiline?: boolean;
textAlignment?: Gravity; textAlignment?: Gravity;
fontStyle?: "normal" | "bold" | "italic" | "bold_italic";
onTextChange?: (text?: string) => void; onTextChange?: (text?: string) => void;
onFocusChange?: (focused: boolean) => void; onFocusChange?: (focused: boolean) => void;
maxLength?: number; maxLength?: number;

View File

@ -4,8 +4,8 @@ declare module NativeClient {
function callNative(name: string, args: string): string; function callNative(name: string, args: string): string;
function fetchArrayBuffer(id: string): string; function fetchArrayBuffer(id: string): string;
} }
declare type RawValue = number | string | boolean | object | undefined | ArrayBuffer; type RawValue = number | string | boolean | object | undefined | ArrayBuffer;
declare type WrappedValue = { type WrappedValue = {
type: "number" | "string" | "boolean" | "object" | "array" | "null" | "arrayBuffer"; type: "number" | "string" | "boolean" | "object" | "array" | "null" | "arrayBuffer";
value: RawValue; value: RawValue;
}; };

View File

@ -5,7 +5,7 @@ import { ClassType } from "../util/types";
export declare abstract class ViewHolder { export declare abstract class ViewHolder {
abstract build(root: Group): void; abstract build(root: Group): void;
} }
export declare type Setter<M> = (state: M) => void; export type Setter<M> = (state: M) => void;
export declare abstract class ViewModel<M extends Object, V extends ViewHolder> { export declare abstract class ViewModel<M extends Object, V extends ViewHolder> {
context: BridgeContext; context: BridgeContext;
private state; private state;

View File

@ -1,5 +1,5 @@
export declare type Observer<T> = (v: T) => void; export type Observer<T> = (v: T) => void;
export declare type Updater<T> = (v: T) => T; export type Updater<T> = (v: T) => T;
export interface IObservable<T> { export interface IObservable<T> {
addObserver(observer: Observer<T | undefined>): void; addObserver(observer: Observer<T | undefined>): void;
removeObserver(observer: Observer<T | undefined>): void; removeObserver(observer: Observer<T | undefined>): void;

View File

@ -1,6 +1,6 @@
import { Panel } from "../ui/panel"; import { Panel } from "../ui/panel";
import { ClassType } from "../util/types"; import { ClassType } from "../util/types";
export declare type BridgeContext = { export type BridgeContext = {
/** /**
* The identify of current context * The identify of current context
*/ */

View File

@ -23,9 +23,9 @@ export declare function jsObtainContext(id: string): Context | undefined;
export declare function jsReleaseContext(id: string): void; export declare function jsReleaseContext(id: string): void;
export declare function __require__(name: string): any; export declare function __require__(name: string): any;
export declare function jsRegisterModule(name: string, moduleObject: any): void; export declare function jsRegisterModule(name: string, moduleObject: any): void;
export declare function jsCallEntityMethod(contextId: string, methodName: string, args?: any): any; export declare function jsCallEntityMethod(contextId: string, methodName: string, args?: any): unknown;
export declare function pureCallEntityMethod(contextId: string, methodName: string, args?: any): any; export declare function pureCallEntityMethod(contextId: string, methodName: string, args?: any): unknown;
declare type ClassType<T> = new (...args: any) => T; type ClassType<T> = new (...args: any) => T;
export declare function jsObtainEntry(contextId: string): () => ClassType<object> | ((constructor: ClassType<object>) => ClassType<object>); export declare function jsObtainEntry(contextId: string): () => ClassType<object> | ((constructor: ClassType<object>) => ClassType<object>);
export declare function jsCallbackTimer(timerId: number): void; export declare function jsCallbackTimer(timerId: number): void;
export declare function jsHookAfterNativeCall(): void; export declare function jsHookAfterNativeCall(): void;

View File

@ -71,6 +71,16 @@ export function jsCallReject(contextId, callbackId, args) {
} }
} }
export class Context { export class Context {
hookBeforeNativeCall() {
if (this.entity && Reflect.has(this.entity, 'hookBeforeNativeCall')) {
Reflect.apply(Reflect.get(this.entity, 'hookBeforeNativeCall'), this.entity, []);
}
}
hookAfterNativeCall() {
if (this.entity && Reflect.has(this.entity, 'hookAfterNativeCall')) {
Reflect.apply(Reflect.get(this.entity, 'hookAfterNativeCall'), this.entity, []);
}
}
constructor(id) { constructor(id) {
this.callbacks = new Map; this.callbacks = new Map;
this.classes = new Map; this.classes = new Map;
@ -105,16 +115,6 @@ export class Context {
} }
}); });
} }
hookBeforeNativeCall() {
if (this.entity && Reflect.has(this.entity, 'hookBeforeNativeCall')) {
Reflect.apply(Reflect.get(this.entity, 'hookBeforeNativeCall'), this.entity, []);
}
}
hookAfterNativeCall() {
if (this.entity && Reflect.has(this.entity, 'hookAfterNativeCall')) {
Reflect.apply(Reflect.get(this.entity, 'hookAfterNativeCall'), this.entity, []);
}
}
callNative(namespace, method, args) { callNative(namespace, method, args) {
const callbackId = uniqueId('callback'); const callbackId = uniqueId('callback');
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {

View File

@ -1,6 +1,6 @@
import { Color } from "../util/color"; import { Color } from "../util/color";
import { Modeling, Model } from "../util/types"; import { Modeling, Model } from "../util/types";
export declare type AnimatedKey = "translationX" | "translationY" | "scaleX" | "scaleY" | "rotation" | "pivotX" | "pivotY" | "rotationX" | "rotationY" | "backgroundColor" | "alpha"; export type AnimatedKey = "translationX" | "translationY" | "scaleX" | "scaleY" | "rotation" | "pivotX" | "pivotY" | "rotationX" | "rotationY" | "backgroundColor" | "alpha";
export declare enum RepeatMode { export declare enum RepeatMode {
RESTART = 1, RESTART = 1,
REVERSE = 2 REVERSE = 2

View File

@ -7,14 +7,14 @@ import { FlexConfig } from "../util/flexbox";
export declare function Property(target: Object, propKey: string): void; export declare function Property(target: Object, propKey: string): void;
export declare function InconsistProperty(target: Object, propKey: string): void; export declare function InconsistProperty(target: Object, propKey: string): void;
export declare function ViewComponent(constructor: ClassType<any>): void; export declare function ViewComponent(constructor: ClassType<any>): void;
export declare type NativeViewModel = { export type NativeViewModel = {
id: string; id: string;
type: string; type: string;
props: { props: {
[index: string]: Model; [index: string]: Model;
}; };
}; };
declare type RefType<T> = T extends Ref<infer R> ? R : never; type RefType<T> = T extends Ref<infer R> ? R : never;
export declare class Ref<T extends View> { export declare class Ref<T extends View> {
private view?; private view?;
set current(v: T); set current(v: T);
@ -151,8 +151,8 @@ export declare abstract class Superview extends View {
clean(): void; clean(): void;
toModel(): NativeViewModel; toModel(): NativeViewModel;
} }
export declare type ViewArray = View[]; export type ViewArray = View[];
export declare type ViewFragment = View | ViewArray | undefined | null; export type ViewFragment = View | ViewArray | undefined | null;
export declare abstract class Group extends Superview implements JSX.ElementChildrenAttribute { export declare abstract class Group extends Superview implements JSX.ElementChildrenAttribute {
padding?: { padding?: {
left?: number; left?: number;

View File

@ -43,6 +43,24 @@ export function createRef() {
return new Ref; return new Ref;
} }
export class View { export class View {
callback2Id(f) {
const id = uniqueId('Function');
this.callbacks.set(id, f);
return id;
}
id2Callback(id) {
let f = this.callbacks.get(id);
if (f === undefined) {
f = Reflect.get(this, id);
}
return f;
}
findViewByTag(tag) {
if (tag === this.tag) {
return this;
}
return undefined;
}
constructor() { constructor() {
this.width = 0; this.width = 0;
this.height = 0; this.height = 0;
@ -74,24 +92,6 @@ export class View {
} }
}); });
} }
callback2Id(f) {
const id = uniqueId('Function');
this.callbacks.set(id, f);
return id;
}
id2Callback(id) {
let f = this.callbacks.get(id);
if (f === undefined) {
f = Reflect.get(this, id);
}
return f;
}
findViewByTag(tag) {
if (tag === this.tag) {
return this;
}
return undefined;
}
/** Anchor start*/ /** Anchor start*/
get left() { get left() {
return this.x; return this.x;

View File

@ -64,7 +64,7 @@ export declare enum Display {
FLEX = 0, FLEX = 0,
NONE = 1 NONE = 1
} }
export declare type FlexValue = FlexTypedValue | number; export type FlexValue = FlexTypedValue | number;
export interface FlexConfig { export interface FlexConfig {
direction?: Direction; direction?: Direction;
flexDirection?: FlexDirection; flexDirection?: FlexDirection;

View File

@ -2,11 +2,11 @@ export interface Modeling {
toModel(): Model; toModel(): Model;
} }
export declare function obj2Model(obj: Model, convertor: (v: Function) => string): Model; export declare function obj2Model(obj: Model, convertor: (v: Function) => string): Model;
declare type _M = string | number | boolean | Modeling | { type _M = string | number | boolean | Modeling | {
[index: string]: Model; [index: string]: Model;
} | undefined; } | undefined;
export declare type Model = _M | Array<_M>; export type Model = _M | Array<_M>;
export declare type Binder<T> = (v: T) => void; export type Binder<T> = (v: T) => void;
export declare class Mutable<T> { export declare class Mutable<T> {
private val; private val;
private binders; private binders;
@ -16,5 +16,5 @@ export declare class Mutable<T> {
bind(binder: Binder<T>): void; bind(binder: Binder<T>): void;
static of<E>(v: E): Mutable<E>; static of<E>(v: E): Mutable<E>;
} }
export declare type ClassType<T> = new (...args: any) => T; export type ClassType<T> = new (...args: any) => T;
export {}; export {};

View File

@ -21,6 +21,7 @@ export declare class Input extends View {
hintTextColor?: Color; hintTextColor?: Color;
multiline?: boolean; multiline?: boolean;
textAlignment?: Gravity; textAlignment?: Gravity;
fontStyle?: "normal" | "bold" | "italic" | "bold_italic";
onTextChange?: (text?: string) => void; onTextChange?: (text?: string) => void;
onFocusChange?: (focused: boolean) => void; onFocusChange?: (focused: boolean) => void;
maxLength?: number; maxLength?: number;

View File

@ -95,6 +95,10 @@ __decorate([
Property, Property,
__metadata("design:type", Gravity) __metadata("design:type", Gravity)
], Input.prototype, "textAlignment", void 0); ], Input.prototype, "textAlignment", void 0);
__decorate([
Property,
__metadata("design:type", String)
], Input.prototype, "fontStyle", void 0);
__decorate([ __decorate([
Property, Property,
__metadata("design:type", Function) __metadata("design:type", Function)

View File

@ -60,6 +60,9 @@ export class Input extends View {
@Property @Property
textAlignment?: Gravity textAlignment?: Gravity
@Property
fontStyle?: "normal" | "bold" | "italic" | "bold_italic"
@Property @Property
onTextChange?: (text?: string) => void onTextChange?: (text?: string) => void