tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

tsx:add ref and parent support

Browse Source
This commit is contained in:
pengfei.zhou
2021-09-02 11:39:51 +08:00
committed by osborn
parent c1f39de8e3
commit aeff0a06dc
13 changed files with 265 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
doric-js/bundle/doric-lib.es5.js
View File

@@ -205,6 +205,27 @@ function ViewComponent(constructor) {
var name = Reflect.get(constructor, PROP_KEY_VIEW_TYPE) || Object.getPrototypeOf(constructor).name;
Reflect.set(constructor, PROP_KEY_VIEW_TYPE, name);
}
var Ref = /** @class */ (function () {
function Ref() {
}
Object.defineProperty(Ref.prototype, "current", {
get: function () {
if (!!!this.view) {
throw new Error("Ref is empty");
}
return this.view;
},
set: function (v) {
this.view = v;
},
enumerable: false,
configurable: true
});
return Ref;
}());
function makeRef() {
return new Ref;
}
var View = /** @class */ (function () {
function View() {
this.width = 0;
@@ -402,6 +423,27 @@ var View = /** @class */ (function () {
View.prototype.getLocationOnScreen = function (context) {
return this.nativeChannel(context, "getLocationOnScreen")();
};
Object.defineProperty(View.prototype, "props", {
set: function (props) {
this.apply(props);
},
enumerable: false,
configurable: true
});
Object.defineProperty(View.prototype, "parent", {
set: function (v) {
this.in(v);
},
enumerable: false,
configurable: true
});
Object.defineProperty(View.prototype, "ref", {
set: function (ref) {
ref.current = this;
},
enumerable: false,
configurable: true
});
View.prototype.doAnimation = function (context, animation) {
var _this = this;
return this.nativeChannel(context, "doAnimation")(animation.toModel()).then(function (args) {
@@ -2649,10 +2691,9 @@ var jsx = {
children[_i - 2] = arguments$1[_i];
}
var e = new constructor();
e.layoutConfig = layoutConfig().fit();
if (config) {
for (var key in config) {
Reflect.set(e, key, Reflect.get(config, key, config), e);
}
e.apply(config);
}
if (children && children.length > 0) {
if (e instanceof Group) {
@@ -3999,6 +4040,7 @@ exports.Panel = Panel;
exports.Property = Property;
exports.Provider = Provider;
exports.RIGHT = RIGHT;
exports.Ref = Ref;
exports.Refreshable = Refreshable;
exports.Root = Root;
exports.RotationAnimation = RotationAnimation;
@@ -4040,6 +4082,7 @@ exports.listItem = listItem;
exports.log = log;
exports.loge = loge;
exports.logw = logw;
exports.makeRef = makeRef;
exports.modal = modal;
exports.navbar = navbar;
exports.navigator = navigator;

27
doric-js/bundle/doric-lib.js
View File

@@ -141,6 +141,20 @@ function ViewComponent(constructor) {
const name = Reflect.getMetadata(PROP_KEY_VIEW_TYPE, constructor) || Object.getPrototypeOf(constructor).name;
Reflect.defineMetadata(PROP_KEY_VIEW_TYPE, name, constructor);
}
class Ref {
set current(v) {
this.view = v;
}
get current() {
if (!!!this.view) {
throw new Error("Ref is empty");
}
return this.view;
}
}
function makeRef() {
return new Ref;
}
class View {
constructor() {
this.width = 0;
@@ -321,6 +335,12 @@ class View {
set props(props) {
this.apply(props);
}
set parent(v) {
this.in(v);
}
set ref(ref) {
ref.current = this;
}
doAnimation(context, animation) {
return this.nativeChannel(context, "doAnimation")(animation.toModel()).then((args) => {
for (let key in args) {
@@ -2043,10 +2063,9 @@ exports.Display = void 0;
const jsx = {
createElement: function (constructor, config, ...children) {
const e = new constructor();
e.layoutConfig = layoutConfig().fit();
if (config) {
for (let key in config) {
Reflect.set(e, key, Reflect.get(config, key, config), e);
}
e.apply(config);
}
if (children && children.length > 0) {
if (e instanceof Group) {
@@ -3107,6 +3126,7 @@ exports.Panel = Panel;
exports.Property = Property;
exports.Provider = Provider;
exports.RIGHT = RIGHT;
exports.Ref = Ref;
exports.Refreshable = Refreshable;
exports.Root = Root;
exports.RotationAnimation = RotationAnimation;
@@ -3148,6 +3168,7 @@ exports.listItem = listItem;
exports.log = log;
exports.loge = loge;
exports.logw = logw;
exports.makeRef = makeRef;
exports.modal = modal;
exports.navbar = navbar;
exports.navigator = navigator;

27
doric-js/bundle/doric-vm.js
View File

@@ -1665,6 +1665,20 @@ function ViewComponent(constructor) {
const name = Reflect.getMetadata(PROP_KEY_VIEW_TYPE, constructor) || Object.getPrototypeOf(constructor).name;
Reflect.defineMetadata(PROP_KEY_VIEW_TYPE, name, constructor);
}
class Ref {
set current(v) {
this.view = v;
}
get current() {
if (!!!this.view) {
throw new Error("Ref is empty");
}
return this.view;
}
}
function makeRef() {
return new Ref;
}
class View {
constructor() {
this.width = 0;
@@ -1845,6 +1859,12 @@ class View {
set props(props) {
this.apply(props);
}
set parent(v) {
this.in(v);
}
set ref(ref) {
ref.current = this;
}
doAnimation(context, animation) {
return this.nativeChannel(context, "doAnimation")(animation.toModel()).then((args) => {
for (let key in args) {
@@ -3567,10 +3587,9 @@ exports.Display = void 0;
const jsx = {
createElement: function (constructor, config, ...children) {
const e = new constructor();
e.layoutConfig = layoutConfig().fit();
if (config) {
for (let key in config) {
Reflect.set(e, key, Reflect.get(config, key, config), e);
}
e.apply(config);
}
if (children && children.length > 0) {
if (e instanceof Group) {
@@ -4872,6 +4891,7 @@ exports.Panel = Panel;
exports.Property = Property;
exports.Provider = Provider;
exports.RIGHT = RIGHT;
exports.Ref = Ref;
exports.Refreshable = Refreshable;
exports.Root = Root;
exports.RotationAnimation = RotationAnimation;
@@ -4913,6 +4933,7 @@ exports.listItem = listItem;
exports.log = log;
exports.loge = loge;
exports.logw = logw;
exports.makeRef = makeRef;
exports.modal = modal;
exports.navbar = navbar;
exports.navigator = navigator;

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

@@ -191,6 +191,11 @@ declare module 'doric/lib/src/ui/view' {
[index: string]: Model;
};
};
export class Ref<T extends View> {
set current(v: T);
get current(): T;
}
export function makeRef<T extends View>(): Ref<T>;
export abstract class View implements Modeling {
width: number;
height: number;
@@ -304,6 +309,8 @@ declare module 'doric/lib/src/ui/view' {
*/
flexConfig?: FlexConfig;
set props(props: Partial<this>);
set parent(v: Group);
set ref(ref: Ref<this>);
doAnimation(context: BridgeContext, animation: IAnimation): Promise<void>;
clearAnimation(context: BridgeContext, animation: IAnimation): Promise<void>;
cancelAnimation(context: BridgeContext, animation: IAnimation): Promise<void>;

8
doric-js/lib/src/ui/view.d.ts vendored
View File

@@ -14,6 +14,12 @@ export declare type NativeViewModel = {
[index: string]: Model;
};
};
export declare class Ref<T extends View> {
private view?;
set current(v: T);
get current(): T;
}
export declare function makeRef<T extends View>(): Ref<T>;
export declare abstract class View implements Modeling {
width: number;
height: number;
@@ -132,6 +138,8 @@ export declare abstract class View implements Modeling {
*/
flexConfig?: FlexConfig;
set props(props: Partial<this>);
set parent(v: Group);
set ref(ref: Ref<this>);
doAnimation(context: BridgeContext, animation: IAnimation): Promise<void>;
clearAnimation(context: BridgeContext, animation: IAnimation): Promise<void>;
cancelAnimation(context: BridgeContext, animation: IAnimation): Promise<void>;

20
doric-js/lib/src/ui/view.js
View File

@@ -23,6 +23,20 @@ export function ViewComponent(constructor) {
const name = Reflect.getMetadata(PROP_KEY_VIEW_TYPE, constructor) || Object.getPrototypeOf(constructor).name;
Reflect.defineMetadata(PROP_KEY_VIEW_TYPE, name, constructor);
}
export class Ref {
set current(v) {
this.view = v;
}
get current() {
if (!!!this.view) {
throw new Error("Ref is empty");
}
return this.view;
}
}
export function makeRef() {
return new Ref;
}
export class View {
constructor() {
this.width = 0;
@@ -203,6 +217,12 @@ export class View {
set props(props) {
this.apply(props);
}
set parent(v) {
this.in(v);
}
set ref(ref) {
ref.current = this;
}
doAnimation(context, animation) {
return this.nativeChannel(context, "doAnimation")(animation.toModel()).then((args) => {
for (let key in args) {

6
doric-js/lib/src/util/jsx.js
View File

@@ -1,11 +1,11 @@
import { Group } from "../ui/view";
import { layoutConfig } from "./layoutconfig";
export const jsx = {
createElement: function (constructor, config, ...children) {
const e = new constructor();
e.layoutConfig = layoutConfig().fit();
if (config) {
for (let key in config) {
Reflect.set(e, key, Reflect.get(config, key, config), e);
}
e.apply(config);
}
if (children && children.length > 0) {
if (e instanceof Group) {

31
doric-js/src/ui/view.es5.ts
View File

@@ -65,6 +65,25 @@ export type NativeViewModel = {
};
}
export class Ref<T extends View> {
private view?: T;
set current(v: T) {
this.view = v
}
get current() {
if (!!!this.view) {
throw new Error("Ref is empty")
}
return this.view
}
}
export function makeRef() {
return new Ref
}
export abstract class View implements Modeling {
private __dirty_props__!: { [index: string]: Model | undefined }
@@ -345,6 +364,18 @@ export abstract class View implements Modeling {
@Property
flexConfig?: FlexConfig
set props(props: Partial<this>) {
this.apply(props)
}
set parent(v: Group) {
this.in(v)
}
set ref(ref: Ref<this>) {
ref.current = this
}
doAnimation(context: BridgeContext, animation: IAnimation) {
return this.nativeChannel(context, "doAnimation")(animation.toModel()).then((args) => {
for (let key in args) {

27
doric-js/src/ui/view.ts
View File

@@ -47,6 +47,25 @@ export type NativeViewModel = {
};
}
export class Ref<T extends View> {
private view?: T;
set current(v: T) {
this.view = v
}
get current() {
if (!!!this.view) {
throw new Error("Ref is empty")
}
return this.view
}
}
export function makeRef<T extends View>(): Ref<T> {
return new Ref
}
export abstract class View implements Modeling {
@Property
width: number = 0
@@ -358,6 +377,14 @@ export abstract class View implements Modeling {
this.apply(props)
}
set parent(v: Group) {
this.in(v)
}
set ref(ref: Ref<this>) {
ref.current = this
}
doAnimation(context: BridgeContext, animation: IAnimation) {
return this.nativeChannel(context, "doAnimation")(animation.toModel()).then((args) => {
for (let key in args) {

6
doric-js/src/util/jsx.ts
View File

@@ -1,4 +1,5 @@
import { Group, View } from "../ui/view";
import { layoutConfig } from "./layoutconfig";
import { ClassType } from "./types";
export const jsx = {
@@ -8,10 +9,9 @@ export const jsx = {
...children: View[]
): T {
const e = new constructor();
e.layoutConfig = layoutConfig().fit()
if (config) {
for (let key in config) {
Reflect.set(e, key, Reflect.get(config, key, config), e);
}
e.apply(config)
}
if (children && children.length > 0) {
if (e instanceof Group) {