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

tsx:support array in children

Browse Source
This commit is contained in:
pengfei.zhou 2021-09-02 14:31:24 +08:00 committed by osborn
parent 03633a7bea
commit 266d20782a
8 changed files with 100 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doric-demo/src/TSXDemo.tsx
View File

@ -21,7 +21,7 @@ function createFragment() {
@Entry
class Counter extends Panel {
build(root: Group) {
const fragmnets = createFragment();
const fragments = createFragment();
const ref = makeRef<Text>();
let count = 0;
<VLayout
@ -42,7 +42,13 @@ class Counter extends Panel {
ref.current.text = `${count}`;
}}
/>
{fragmnets}
{fragments}
{[0, 1, 2, 3].map((i) => (
<>
<Text text={`Index ${i}`} />
<Text text={`Subtitle ${i}`} textSize={10} />
</>
))}
</VLayout>;
}
}

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

@ -2699,6 +2699,20 @@ var __extends$7 = (undefined && undefined.__extends) || (function () {
})();
exports.jsx = void 0;
(function (jsx) {
function addElement(group, v) {
if (v instanceof Array) {
v.forEach(function (e) { return addElement(group, e); });
}
else if (v instanceof Fragment) {
v.children.forEach(function (e) { return addElement(group, e); });
}
else if (v instanceof View) {
group.addChild(v);
}
else {
throw new Error("Can only use view as child");
}
}
function createElement(constructor, config) {
var arguments$1 = arguments;
@ -2714,12 +2728,7 @@ exports.jsx = void 0;
if (children && children.length > 0) {
if (e instanceof Group) {
children.forEach(function (child) {
if (child instanceof Fragment) {
child.children.forEach(function (c) { return e.addChild(c); });
}
else {
e.addChild(child);
}
addElement(e, child);
});
}
else {

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

@ -2062,6 +2062,20 @@ exports.Display = void 0;
exports.jsx = void 0;
(function (jsx) {
function addElement(group, v) {
if (v instanceof Array) {
v.forEach(e => addElement(group, e));
}
else if (v instanceof Fragment) {
v.children.forEach(e => addElement(group, e));
}
else if (v instanceof View) {
group.addChild(v);
}
else {
throw new Error(`Can only use view as child`);
}
}
function createElement(constructor, config, ...children) {
const e = new constructor();
e.layoutConfig = layoutConfig().fit();
@ -2071,12 +2085,7 @@ exports.jsx = void 0;
if (children && children.length > 0) {
if (e instanceof Group) {
children.forEach((child) => {
if (child instanceof Fragment) {
child.children.forEach(c => e.addChild(c));
}
else {
e.addChild(child);
}
addElement(e, child);
});
}
else {

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

@ -3586,6 +3586,20 @@ exports.Display = void 0;
exports.jsx = void 0;
(function (jsx) {
function addElement(group, v) {
if (v instanceof Array) {
v.forEach(e => addElement(group, e));
}
else if (v instanceof Fragment) {
v.children.forEach(e => addElement(group, e));
}
else if (v instanceof View) {
group.addChild(v);
}
else {
throw new Error(`Can only use view as child`);
}
}
function createElement(constructor, config, ...children) {
const e = new constructor();
e.layoutConfig = layoutConfig().fit();
@ -3595,12 +3609,7 @@ exports.jsx = void 0;
if (children && children.length > 0) {
if (e instanceof Group) {
children.forEach((child) => {
if (child instanceof Fragment) {
child.children.forEach(c => e.addChild(c));
}
else {
e.addChild(child);
}
addElement(e, child);
});
}
else {

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

@ -1,7 +1,21 @@
import { Group } from "../ui/view";
import { Group, View } from "../ui/view";
import { layoutConfig } from "./layoutconfig";
export var jsx;
(function (jsx) {
function addElement(group, v) {
if (v instanceof Array) {
v.forEach(e => addElement(group, e));
}
else if (v instanceof Fragment) {
v.children.forEach(e => addElement(group, e));
}
else if (v instanceof View) {
group.addChild(v);
}
else {
throw new Error(`Can only use view as child`);
}
}
function createElement(constructor, config, ...children) {
const e = new constructor();
e.layoutConfig = layoutConfig().fit();
@ -11,12 +25,7 @@ export var jsx;
if (children && children.length > 0) {
if (e instanceof Group) {
children.forEach((child) => {
if (child instanceof Fragment) {
child.children.forEach(c => e.addChild(c));
}
else {
e.addChild(child);
}
addElement(e, child);
});
}
else {

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

@ -3,6 +3,20 @@ import { layoutConfig } from "./layoutconfig";
import { ClassType } from "./types";
export namespace jsx {
function addElement(group: Group, v: any) {
if (v instanceof Array) {
v.forEach(e => addElement(group, e))
} else if (v instanceof Fragment) {
v.children.forEach(e => addElement(group, e))
} else if (v instanceof View) {
group.addChild(v)
} else {
throw new Error(
`Can only use view as child`
);
}
}
export function createElement<T extends View>(
constructor: ClassType<T>,
config: Partial<T> | null,
@ -16,11 +30,7 @@ export namespace jsx {
if (children && children.length > 0) {
if (e instanceof Group) {
children.forEach((child) => {
if (child instanceof Fragment) {
child.children.forEach(c => e.addChild(c))
} else {
e.addChild(child)
}
addElement(e, child)
});
} else {
throw new Error(

21
doric-web/dist/index.js vendored
View File

@ -3640,6 +3640,20 @@ exports.Display = void 0;
exports.jsx = void 0;
(function (jsx) {
function addElement(group, v) {
if (v instanceof Array) {
v.forEach(e => addElement(group, e));
}
else if (v instanceof Fragment) {
v.children.forEach(e => addElement(group, e));
}
else if (v instanceof View) {
group.addChild(v);
}
else {
throw new Error(`Can only use view as child`);
}
}
function createElement(constructor, config, ...children) {
const e = new constructor();
e.layoutConfig = layoutConfig().fit();
@ -3649,12 +3663,7 @@ exports.jsx = void 0;
if (children && children.length > 0) {
if (e instanceof Group) {
children.forEach((child) => {
if (child instanceof Fragment) {
child.children.forEach(c => e.addChild(c));
}
else {
e.addChild(child);
}
addElement(e, child);
});
}
else {

2
doric-web/dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long