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

add panel.onRederFinished to be invoked after shader.render make sure coordinatorPlugin affected

Browse Source
This commit is contained in:
pengfei.zhou
2020-03-10 18:51:53 +08:00
committed by osborn
parent 01d736c5a6
commit f3f28c55f8
17 changed files with 290 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doric-js/lib/src/native/coordinator.d.ts vendored
View File

@@ -17,5 +17,5 @@ export declare function coordinator(context: BridgeContext): {
start: number | Color;
end: number | Color;
};
}) => Promise<any>;
}) => void;
};

40
doric-js/lib/src/native/coordinator.js
View File

@@ -1,14 +1,6 @@
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
import { View } from "../ui/view";
import { Color } from "../util/color";
import { Panel } from "../ui/panel";
function viewIdChains(view) {
const viewIds = [];
let thisView = view;
@@ -20,19 +12,23 @@ function viewIdChains(view) {
}
export function coordinator(context) {
return {
verticalScrolling: (argument) => __awaiter(this, void 0, void 0, function* () {
yield context.callNative("coordinator", "ready");
argument.scrollable = viewIdChains(argument.scrollable);
if (argument.target instanceof View) {
argument.target = viewIdChains(argument.target);
verticalScrolling: (argument) => {
if (context.entity instanceof Panel) {
const panel = context.entity;
panel.onRenderFinished = () => {
argument.scrollable = viewIdChains(argument.scrollable);
if (argument.target instanceof View) {
argument.target = viewIdChains(argument.target);
}
if (argument.changing.start instanceof Color) {
argument.changing.start = argument.changing.start.toModel();
}
if (argument.changing.end instanceof Color) {
argument.changing.end = argument.changing.end.toModel();
}
return context.callNative("coordinator", "verticalScrolling", argument);
};
}
if (argument.changing.start instanceof Color) {
argument.changing.start = argument.changing.start.toModel();
}
if (argument.changing.end instanceof Color) {
argument.changing.end = argument.changing.end.toModel();
}
return context.callNative("coordinator", "verticalScrolling", argument);
})
}
};
}

1
doric-js/lib/src/ui/panel.d.ts vendored
View File

@@ -12,6 +12,7 @@ export declare abstract class Panel {
private __data__?;
private __root__;
private headviews;
onRenderFinished?: () => void;
addHeadView(type: string, v: View): void;
allHeadViews(): IterableIterator<Map<string, View>>;
removeHeadView(type: string, v: View | string): void;

16
doric-js/lib/src/ui/panel.js
View File

@@ -139,7 +139,7 @@ export class Panel {
}, undefined);
}
nativeRender(model) {
this.context.callNative("shader", "render", model);
return this.context.callNative("shader", "render", model);
}
hookBeforeNativeCall() {
if (Environment.platform !== 'web') {
@@ -152,18 +152,19 @@ export class Panel {
}
}
hookAfterNativeCall() {
const promises = [];
if (Environment.platform !== 'web') {
//Here insert a native call to ensure the promise is resolved done.
nativeEmpty();
if (this.__root__.isDirty()) {
const model = this.__root__.toModel();
this.nativeRender(model);
promises.push(this.nativeRender(model));
}
for (let map of this.headviews.values()) {
for (let v of map.values()) {
if (v.isDirty()) {
const model = v.toModel();
this.nativeRender(model);
promises.push(this.nativeRender(model));
}
}
}
@@ -172,20 +173,25 @@ export class Panel {
Promise.resolve().then(() => {
if (this.__root__.isDirty()) {
const model = this.__root__.toModel();
this.nativeRender(model);
promises.push(this.nativeRender(model));
this.__root__.clean();
}
for (let map of this.headviews.values()) {
for (let v of map.values()) {
if (v.isDirty()) {
const model = v.toModel();
this.nativeRender(model);
promises.push(this.nativeRender(model));
v.clean();
}
}
}
});
}
Promise.all(promises).then(_ => {
if (this.onRenderFinished) {
this.onRenderFinished();
}
});
}
}
__decorate([