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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doric-android/doric/src/main/java/pub/doric/plugin/CoordinatorPlugin.java
View File

@ -48,9 +48,6 @@ public class CoordinatorPlugin extends DoricJavaPlugin {
@DoricMethod @DoricMethod
public void ready(final DoricPromise doricPromise) { public void ready(final DoricPromise doricPromise) {
getDoricContext().getDriver().asyncCall(new Callable<Object>() {
@Override
public Object call() {
getDoricContext().getDriver().asyncCall(new Callable<Object>() { getDoricContext().getDriver().asyncCall(new Callable<Object>() {
@Override @Override
public Object call() { public Object call() {
@ -58,13 +55,10 @@ public class CoordinatorPlugin extends DoricJavaPlugin {
return null; return null;
} }
}, ThreadMode.UI); }, ThreadMode.UI);
return null;
}
}, ThreadMode.UI);
} }
@DoricMethod @DoricMethod(thread = ThreadMode.UI)
public void verticalScrolling(final JSObject argument, final DoricPromise doricPromise) { public void verticalScrolling(final JSObject argument, final DoricPromise doricPromise) {
getDoricContext().getDriver().asyncCall(new Callable<Object>() { getDoricContext().getDriver().asyncCall(new Callable<Object>() {
@Override @Override

25
doric-android/doric/src/main/java/pub/doric/plugin/ShaderPlugin.java
View File

@ -30,8 +30,6 @@ import pub.doric.utils.DoricUtils;
import pub.doric.utils.ThreadMode; import pub.doric.utils.ThreadMode;
import pub.doric.shader.RootNode; import pub.doric.shader.RootNode;
import com.github.pengfeizhou.jscore.ArchiveException;
import com.github.pengfeizhou.jscore.JSDecoder;
import com.github.pengfeizhou.jscore.JSObject; import com.github.pengfeizhou.jscore.JSObject;
import com.github.pengfeizhou.jscore.JSValue; import com.github.pengfeizhou.jscore.JSValue;
import com.github.pengfeizhou.jscore.JavaValue; import com.github.pengfeizhou.jscore.JavaValue;
@ -51,9 +49,7 @@ public class ShaderPlugin extends DoricJavaPlugin {
} }
@DoricMethod @DoricMethod
public void render(JSDecoder jsDecoder) { public void render(final JSObject jsObject, final DoricPromise promise) {
try {
final JSObject jsObject = jsDecoder.decode().asObject();
getDoricContext().getDriver().asyncCall(new Callable<Object>() { getDoricContext().getDriver().asyncCall(new Callable<Object>() {
@Override @Override
public Object call() throws Exception { public Object call() throws Exception {
@ -88,22 +84,13 @@ public class ShaderPlugin extends DoricJavaPlugin {
@Override @Override
public void onFinish() { public void onFinish() {
promise.resolve();
} }
}); });
} catch (Exception e) {
getDoricContext().getDriver().getRegistry().onException(getDoricContext(), e);
getDoricContext().getDriver().getRegistry().onLog(
Log.ERROR,
String.format("Shader.render:error%s", e.getLocalizedMessage())
);
}
} }
@DoricMethod @DoricMethod
public JavaValue command(JSDecoder jsDecoder, final DoricPromise doricPromise) { public void command(JSObject jsObject, final DoricPromise doricPromise) {
try {
final JSObject jsObject = jsDecoder.decode().asObject();
final JSValue[] viewIds = jsObject.getProperty("viewIds").asArray().toArray(); final JSValue[] viewIds = jsObject.getProperty("viewIds").asArray().toArray();
final String name = jsObject.getProperty("name").asString().value(); final String name = jsObject.getProperty("name").asString().value();
final JSValue args = jsObject.getProperty("args"); final JSValue args = jsObject.getProperty("args");
@ -162,6 +149,8 @@ public class ShaderPlugin extends DoricJavaPlugin {
@Override @Override
public void onError(Throwable t) { public void onError(Throwable t) {
doricPromise.resolve(new JavaValue(t.getLocalizedMessage())); doricPromise.resolve(new JavaValue(t.getLocalizedMessage()));
getDoricContext().getDriver().getRegistry().onException(getDoricContext(),
t instanceof Exception ? (Exception) t : new RuntimeException(t));
} }
@Override @Override
@ -172,10 +161,6 @@ public class ShaderPlugin extends DoricJavaPlugin {
} }
} }
} }
} catch (ArchiveException e) {
getDoricContext().getDriver().getRegistry().onException(getDoricContext(), e);
}
return new JavaValue(true);
} }

4
doric-iOS/Pod/Classes/DoricMonitorProtocol.h
View File

@ -15,8 +15,8 @@ typedef NS_ENUM(NSInteger, DoricLogType) {
/** /**
* Called when native or js exception occurred in doric * Called when native or js exception occurred in doric
* *
* @param source Which source file * @param exception exception which is thrown within doric sdk
* @param e exception which is thrown within doric sdk * @param context Which Context
*/ */
- (void)onException:(NSException *)exception inContext:(DoricContext *)context; - (void)onException:(NSException *)exception inContext:(DoricContext *)context;

13
doric-iOS/Pod/Classes/Plugin/DoricCoordinatorPlugin.m
View File

@ -23,13 +23,6 @@
#import "DoricUtil.h" #import "DoricUtil.h"
@implementation DoricCoordinatorPlugin @implementation DoricCoordinatorPlugin
- (void)ready:(id)param withPromise:(DoricPromise *)promise {
dispatch_async(dispatch_get_main_queue(), ^{
dispatch_async(dispatch_get_main_queue(), ^{
[promise resolve:nil];
});
});
}
- (void)verticalScrolling:(NSDictionary *)params withPromise:(DoricPromise *)promise { - (void)verticalScrolling:(NSDictionary *)params withPromise:(DoricPromise *)promise {
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
@ -75,7 +68,9 @@ - (void)verticalScrolling:(NSDictionary *)params withPromise:(DoricPromise *)pro
NSNumber *changingStart = changing[@"start"]; NSNumber *changingStart = changing[@"start"];
NSNumber *changingEnd = changing[@"end"]; NSNumber *changingEnd = changing[@"end"];
if ([scrollNode conformsToProtocol:@protocol(DoricScrollableProtocol)]) { if ([scrollNode conformsToProtocol:@protocol(DoricScrollableProtocol)]) {
((id <DoricScrollableProtocol>) scrollNode).didScrollListener = ^(UIScrollView *scrollView) { __weak typeof(self) __self = self;
[(id <DoricScrollableProtocol>) scrollNode addDidScrollBlock:^(UIScrollView *scrollView) {
__strong typeof(__self) self = __self;
CGFloat scrollY = scrollView.contentOffset.y; CGFloat scrollY = scrollView.contentOffset.y;
if (scrollY <= startAnchor) { if (scrollY <= startAnchor) {
[self setValue:targetNode isNavBar:isNavBar name:name value:changingStart]; [self setValue:targetNode isNavBar:isNavBar name:name value:changingStart];
@ -102,7 +97,7 @@ - (void)verticalScrolling:(NSDictionary *)params withPromise:(DoricPromise *)pro
} }
[self setValue:targetNode isNavBar:isNavBar name:name value:value]; [self setValue:targetNode isNavBar:isNavBar name:name value:value];
} }
}; }];
} else { } else {
[promise reject:@"Scroller type error"]; [promise reject:@"Scroller type error"];
} }

15
doric-iOS/Pod/Classes/Plugin/DoricShaderPlugin.m
View File

@ -28,7 +28,7 @@
@implementation DoricShaderPlugin @implementation DoricShaderPlugin
- (void)render:(NSDictionary *)argument { - (void)render:(NSDictionary *)argument withPromise:(DoricPromise *)promise {
if (!argument) { if (!argument) {
return; return;
} }
@ -45,10 +45,11 @@ - (void)render:(NSDictionary *)argument {
DoricViewNode *viewNode = [self.doricContext targetViewNode:viewId]; DoricViewNode *viewNode = [self.doricContext targetViewNode:viewId];
[viewNode blend:argument[@"props"]]; [viewNode blend:argument[@"props"]];
} }
[promise resolve:nil];
}); });
} }
- (id)command:(NSDictionary *)argument withPromise:(DoricPromise *)promise { - (void)command:(NSDictionary *)argument withPromise:(DoricPromise *)promise {
NSArray *viewIds = argument[@"viewIds"]; NSArray *viewIds = argument[@"viewIds"];
id args = argument[@"args"]; id args = argument[@"args"];
NSString *name = argument[@"name"]; NSString *name = argument[@"name"];
@ -64,9 +65,8 @@ - (id)command:(NSDictionary *)argument withPromise:(DoricPromise *)promise {
} }
if (!viewNode) { if (!viewNode) {
[promise reject:@"Cannot find opposite view"]; [promise reject:@"Cannot find opposite view"];
return nil;
} else { } else {
return [self findClass:[viewNode class] target:viewNode method:name promise:promise argument:args]; [self findClass:[viewNode class] target:viewNode method:name promise:promise argument:args];
} }
} }
@ -77,9 +77,8 @@ - (id)createParamWithMethodName:(NSString *)method promise:(DoricPromise *)promi
return argument; return argument;
} }
- (id)findClass:(Class)clz target:(id)target method:(NSString *)name promise:(DoricPromise *)promise argument:(id)argument { - (void)findClass:(Class)clz target:(id)target method:(NSString *)name promise:(DoricPromise *)promise argument:(id)argument {
unsigned int count; unsigned int count;
id ret = nil;
Method *methods = class_copyMethodList(clz, &count); Method *methods = class_copyMethodList(clz, &count);
BOOL isFound = NO; BOOL isFound = NO;
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
@ -122,7 +121,6 @@ - (id)findClass:(Class)clz target:(id)target method:(NSString *)name promise:(Do
[promise resolve:returnValue]; [promise resolve:returnValue];
} }
}); });
return ret;
} }
break; break;
} }
@ -135,10 +133,9 @@ - (id)findClass:(Class)clz target:(id)target method:(NSString *)name promise:(Do
if (!isFound) { if (!isFound) {
Class superclass = class_getSuperclass(clz); Class superclass = class_getSuperclass(clz);
if (superclass && superclass != [NSObject class]) { if (superclass && superclass != [NSObject class]) {
return [self findClass:superclass target:target method:name promise:promise argument:argument]; [self findClass:superclass target:target method:name promise:promise argument:argument];
} }
} }
return ret;
} }
@end @end

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

@ -1014,7 +1014,7 @@ var Panel = /** @class */ (function () {
}, undefined); }, undefined);
}; };
Panel.prototype.nativeRender = function (model) { Panel.prototype.nativeRender = function (model) {
this.context.callNative("shader", "render", model); return this.context.callNative("shader", "render", model);
}; };
Panel.prototype.hookBeforeNativeCall = function () { Panel.prototype.hookBeforeNativeCall = function () {
var e_2, _a, e_3, _b; var e_2, _a, e_3, _b;
@ -1050,12 +1050,13 @@ var Panel = /** @class */ (function () {
Panel.prototype.hookAfterNativeCall = function () { Panel.prototype.hookAfterNativeCall = function () {
var e_4, _a, e_5, _b; var e_4, _a, e_5, _b;
var _this = this; var _this = this;
var promises = [];
if (Environment.platform !== 'web') { if (Environment.platform !== 'web') {
//Here insert a native call to ensure the promise is resolved done. //Here insert a native call to ensure the promise is resolved done.
nativeEmpty(); nativeEmpty();
if (this.__root__.isDirty()) { if (this.__root__.isDirty()) {
var model = this.__root__.toModel(); var model = this.__root__.toModel();
this.nativeRender(model); promises.push(this.nativeRender(model));
} }
try { try {
for (var _c = __values$2(this.headviews.values()), _d = _c.next(); !_d.done; _d = _c.next()) { for (var _c = __values$2(this.headviews.values()), _d = _c.next(); !_d.done; _d = _c.next()) {
@ -1065,7 +1066,7 @@ var Panel = /** @class */ (function () {
var v = _f.value; var v = _f.value;
if (v.isDirty()) { if (v.isDirty()) {
var model = v.toModel(); var model = v.toModel();
this.nativeRender(model); promises.push(this.nativeRender(model));
} }
} }
} }
@ -1091,7 +1092,7 @@ var Panel = /** @class */ (function () {
var e_6, _a, e_7, _b; var e_6, _a, e_7, _b;
if (_this.__root__.isDirty()) { if (_this.__root__.isDirty()) {
var model = _this.__root__.toModel(); var model = _this.__root__.toModel();
_this.nativeRender(model); promises.push(_this.nativeRender(model));
_this.__root__.clean(); _this.__root__.clean();
} }
try { try {
@ -1102,7 +1103,7 @@ var Panel = /** @class */ (function () {
var v = _f.value; var v = _f.value;
if (v.isDirty()) { if (v.isDirty()) {
var model = v.toModel(); var model = v.toModel();
_this.nativeRender(model); promises.push(_this.nativeRender(model));
v.clean(); v.clean();
} }
} }
@ -1125,6 +1126,11 @@ var Panel = /** @class */ (function () {
} }
}); });
} }
Promise.all(promises).then(function (_) {
if (_this.onRenderFinished) {
_this.onRenderFinished();
}
});
}; };
__decorate$2([ __decorate$2([
NativeCall, NativeCall,
@ -2897,42 +2903,6 @@ function statusbar(context) {
}; };
} }
var __awaiter$1 = (undefined && undefined.__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());
});
};
var __generator$1 = (undefined && undefined.__generator) || function (thisArg, body) {
var _ = { label: 0, sent: function() { if (t[0] & 1) { throw t[1]; } return t[1]; }, trys: [], ops: [] }, f, y, t, g;
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
function verb(n) { return function (v) { return step([n, v]); }; }
function step(op) {
if (f) { throw new TypeError("Generator is already executing."); }
while (_) { 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 (y = 0, t) { op = [op[0] & 2, t.value]; }
switch (op[0]) {
case 0: case 1: t = op; break;
case 4: _.label++; return { value: op[1], done: false };
case 5: _.label++; y = op[1]; op = [0]; continue;
case 7: op = _.ops.pop(); _.trys.pop(); continue;
default:
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
if (t[2]) { _.ops.pop(); }
_.trys.pop(); continue;
}
op = body.call(thisArg, _);
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } }
if (op[0] & 5) { throw op[1]; } return { value: op[0] ? op[1] : void 0, done: true };
}
};
function viewIdChains(view) { function viewIdChains(view) {
var viewIds = []; var viewIds = [];
var thisView = view; var thisView = view;
@ -2943,14 +2913,11 @@ function viewIdChains(view) {
return viewIds.reverse(); return viewIds.reverse();
} }
function coordinator(context) { function coordinator(context) {
var _this = this;
return { return {
verticalScrolling: function (argument) { return __awaiter$1(_this, void 0, void 0, function () { verticalScrolling: function (argument) {
return __generator$1(this, function (_a) { if (context.entity instanceof Panel) {
switch (_a.label) { var panel = context.entity;
case 0: return [4 /*yield*/, context.callNative("coordinator", "ready")]; panel.onRenderFinished = function () {
case 1:
_a.sent();
argument.scrollable = viewIdChains(argument.scrollable); argument.scrollable = viewIdChains(argument.scrollable);
if (argument.target instanceof View) { if (argument.target instanceof View) {
argument.target = viewIdChains(argument.target); argument.target = viewIdChains(argument.target);
@ -2961,10 +2928,10 @@ function coordinator(context) {
if (argument.changing.end instanceof Color) { if (argument.changing.end instanceof Color) {
argument.changing.end = argument.changing.end.toModel(); argument.changing.end = argument.changing.end.toModel();
} }
return [2 /*return*/, context.callNative("coordinator", "verticalScrolling", argument)]; return context.callNative("coordinator", "verticalScrolling", argument);
};
}
} }
});
}); }
}; };
} }

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

@ -771,7 +771,7 @@ class Panel {
}, undefined); }, undefined);
} }
nativeRender(model) { nativeRender(model) {
this.context.callNative("shader", "render", model); return this.context.callNative("shader", "render", model);
} }
hookBeforeNativeCall() { hookBeforeNativeCall() {
if (Environment.platform !== 'web') { if (Environment.platform !== 'web') {
@ -784,18 +784,19 @@ class Panel {
} }
} }
hookAfterNativeCall() { hookAfterNativeCall() {
const promises = [];
if (Environment.platform !== 'web') { if (Environment.platform !== 'web') {
//Here insert a native call to ensure the promise is resolved done. //Here insert a native call to ensure the promise is resolved done.
nativeEmpty(); nativeEmpty();
if (this.__root__.isDirty()) { if (this.__root__.isDirty()) {
const model = this.__root__.toModel(); const model = this.__root__.toModel();
this.nativeRender(model); promises.push(this.nativeRender(model));
} }
for (let map of this.headviews.values()) { for (let map of this.headviews.values()) {
for (let v of map.values()) { for (let v of map.values()) {
if (v.isDirty()) { if (v.isDirty()) {
const model = v.toModel(); const model = v.toModel();
this.nativeRender(model); promises.push(this.nativeRender(model));
} }
} }
} }
@ -804,20 +805,25 @@ class Panel {
Promise.resolve().then(() => { Promise.resolve().then(() => {
if (this.__root__.isDirty()) { if (this.__root__.isDirty()) {
const model = this.__root__.toModel(); const model = this.__root__.toModel();
this.nativeRender(model); promises.push(this.nativeRender(model));
this.__root__.clean(); this.__root__.clean();
} }
for (let map of this.headviews.values()) { for (let map of this.headviews.values()) {
for (let v of map.values()) { for (let v of map.values()) {
if (v.isDirty()) { if (v.isDirty()) {
const model = v.toModel(); const model = v.toModel();
this.nativeRender(model); promises.push(this.nativeRender(model));
v.clean(); v.clean();
} }
} }
} }
}); });
} }
Promise.all(promises).then(_ => {
if (this.onRenderFinished) {
this.onRenderFinished();
}
});
} }
} }
__decorate$2([ __decorate$2([
@ -2189,15 +2195,6 @@ function statusbar(context) {
}; };
} }
var __awaiter$1 = (undefined && undefined.__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());
});
};
function viewIdChains(view) { function viewIdChains(view) {
const viewIds = []; const viewIds = [];
let thisView = view; let thisView = view;
@ -2209,8 +2206,10 @@ function viewIdChains(view) {
} }
function coordinator(context) { function coordinator(context) {
return { return {
verticalScrolling: (argument) => __awaiter$1(this, void 0, void 0, function* () { verticalScrolling: (argument) => {
yield context.callNative("coordinator", "ready"); if (context.entity instanceof Panel) {
const panel = context.entity;
panel.onRenderFinished = () => {
argument.scrollable = viewIdChains(argument.scrollable); argument.scrollable = viewIdChains(argument.scrollable);
if (argument.target instanceof View) { if (argument.target instanceof View) {
argument.target = viewIdChains(argument.target); argument.target = viewIdChains(argument.target);
@ -2222,7 +2221,9 @@ function coordinator(context) {
argument.changing.end = argument.changing.end.toModel(); argument.changing.end = argument.changing.end.toModel();
} }
return context.callNative("coordinator", "verticalScrolling", argument); return context.callNative("coordinator", "verticalScrolling", argument);
}) };
}
}
}; };
} }

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

@ -2230,7 +2230,7 @@ class Panel {
}, undefined); }, undefined);
} }
nativeRender(model) { nativeRender(model) {
this.context.callNative("shader", "render", model); return this.context.callNative("shader", "render", model);
} }
hookBeforeNativeCall() { hookBeforeNativeCall() {
if (Environment.platform !== 'web') { if (Environment.platform !== 'web') {
@ -2243,18 +2243,19 @@ class Panel {
} }
} }
hookAfterNativeCall() { hookAfterNativeCall() {
const promises = [];
if (Environment.platform !== 'web') { if (Environment.platform !== 'web') {
//Here insert a native call to ensure the promise is resolved done. //Here insert a native call to ensure the promise is resolved done.
nativeEmpty(); nativeEmpty();
if (this.__root__.isDirty()) { if (this.__root__.isDirty()) {
const model = this.__root__.toModel(); const model = this.__root__.toModel();
this.nativeRender(model); promises.push(this.nativeRender(model));
} }
for (let map of this.headviews.values()) { for (let map of this.headviews.values()) {
for (let v of map.values()) { for (let v of map.values()) {
if (v.isDirty()) { if (v.isDirty()) {
const model = v.toModel(); const model = v.toModel();
this.nativeRender(model); promises.push(this.nativeRender(model));
} }
} }
} }
@ -2263,20 +2264,25 @@ class Panel {
Promise.resolve().then(() => { Promise.resolve().then(() => {
if (this.__root__.isDirty()) { if (this.__root__.isDirty()) {
const model = this.__root__.toModel(); const model = this.__root__.toModel();
this.nativeRender(model); promises.push(this.nativeRender(model));
this.__root__.clean(); this.__root__.clean();
} }
for (let map of this.headviews.values()) { for (let map of this.headviews.values()) {
for (let v of map.values()) { for (let v of map.values()) {
if (v.isDirty()) { if (v.isDirty()) {
const model = v.toModel(); const model = v.toModel();
this.nativeRender(model); promises.push(this.nativeRender(model));
v.clean(); v.clean();
} }
} }
} }
}); });
} }
Promise.all(promises).then(_ => {
if (this.onRenderFinished) {
this.onRenderFinished();
}
});
} }
} }
__decorate$2([ __decorate$2([
@ -3648,15 +3654,6 @@ function statusbar(context) {
}; };
} }
var __awaiter$1 = (undefined && undefined.__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());
});
};
function viewIdChains(view) { function viewIdChains(view) {
const viewIds = []; const viewIds = [];
let thisView = view; let thisView = view;
@ -3668,8 +3665,10 @@ function viewIdChains(view) {
} }
function coordinator(context) { function coordinator(context) {
return { return {
verticalScrolling: (argument) => __awaiter$1(this, void 0, void 0, function* () { verticalScrolling: (argument) => {
yield context.callNative("coordinator", "ready"); if (context.entity instanceof Panel) {
const panel = context.entity;
panel.onRenderFinished = () => {
argument.scrollable = viewIdChains(argument.scrollable); argument.scrollable = viewIdChains(argument.scrollable);
if (argument.target instanceof View) { if (argument.target instanceof View) {
argument.target = viewIdChains(argument.target); argument.target = viewIdChains(argument.target);
@ -3681,7 +3680,9 @@ function coordinator(context) {
argument.changing.end = argument.changing.end.toModel(); argument.changing.end = argument.changing.end.toModel();
} }
return context.callNative("coordinator", "verticalScrolling", argument); return context.callNative("coordinator", "verticalScrolling", argument);
}) };
}
}
}; };
} }

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

@ -284,6 +284,7 @@ declare module 'doric/lib/src/ui/panel' {
onShow(): void; onShow(): void;
onHidden(): void; onHidden(): void;
abstract build(rootView: Group): void; abstract build(rootView: Group): void;
onRenderFinished?: () => void;
addHeadView(type: string, v: View): void; addHeadView(type: string, v: View): void;
allHeadViews(): IterableIterator<Map<string, View>>; allHeadViews(): IterableIterator<Map<string, View>>;
removeHeadView(type: string, v: View | string): void; removeHeadView(type: string, v: View | string): void;
@ -931,7 +932,7 @@ declare module 'doric/lib/src/native/coordinator' {
start: number | Color; start: number | Color;
end: number | Color; end: number | Color;
}; };
}) => Promise<any>; }) => void;
}; };
} }

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; start: number | Color;
end: number | Color; end: number | Color;
}; };
}) => Promise<any>; }) => void;
}; };

20
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 { View } from "../ui/view";
import { Color } from "../util/color"; import { Color } from "../util/color";
import { Panel } from "../ui/panel";
function viewIdChains(view) { function viewIdChains(view) {
const viewIds = []; const viewIds = [];
let thisView = view; let thisView = view;
@ -20,8 +12,10 @@ function viewIdChains(view) {
} }
export function coordinator(context) { export function coordinator(context) {
return { return {
verticalScrolling: (argument) => __awaiter(this, void 0, void 0, function* () { verticalScrolling: (argument) => {
yield context.callNative("coordinator", "ready"); if (context.entity instanceof Panel) {
const panel = context.entity;
panel.onRenderFinished = () => {
argument.scrollable = viewIdChains(argument.scrollable); argument.scrollable = viewIdChains(argument.scrollable);
if (argument.target instanceof View) { if (argument.target instanceof View) {
argument.target = viewIdChains(argument.target); argument.target = viewIdChains(argument.target);
@ -33,6 +27,8 @@ export function coordinator(context) {
argument.changing.end = argument.changing.end.toModel(); argument.changing.end = argument.changing.end.toModel();
} }
return context.callNative("coordinator", "verticalScrolling", argument); 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 __data__?;
private __root__; private __root__;
private headviews; private headviews;
onRenderFinished?: () => void;
addHeadView(type: string, v: View): void; addHeadView(type: string, v: View): void;
allHeadViews(): IterableIterator<Map<string, View>>; allHeadViews(): IterableIterator<Map<string, View>>;
removeHeadView(type: string, v: View | string): void; 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); }, undefined);
} }
nativeRender(model) { nativeRender(model) {
this.context.callNative("shader", "render", model); return this.context.callNative("shader", "render", model);
} }
hookBeforeNativeCall() { hookBeforeNativeCall() {
if (Environment.platform !== 'web') { if (Environment.platform !== 'web') {
@ -152,18 +152,19 @@ export class Panel {
} }
} }
hookAfterNativeCall() { hookAfterNativeCall() {
const promises = [];
if (Environment.platform !== 'web') { if (Environment.platform !== 'web') {
//Here insert a native call to ensure the promise is resolved done. //Here insert a native call to ensure the promise is resolved done.
nativeEmpty(); nativeEmpty();
if (this.__root__.isDirty()) { if (this.__root__.isDirty()) {
const model = this.__root__.toModel(); const model = this.__root__.toModel();
this.nativeRender(model); promises.push(this.nativeRender(model));
} }
for (let map of this.headviews.values()) { for (let map of this.headviews.values()) {
for (let v of map.values()) { for (let v of map.values()) {
if (v.isDirty()) { if (v.isDirty()) {
const model = v.toModel(); const model = v.toModel();
this.nativeRender(model); promises.push(this.nativeRender(model));
} }
} }
} }
@ -172,20 +173,25 @@ export class Panel {
Promise.resolve().then(() => { Promise.resolve().then(() => {
if (this.__root__.isDirty()) { if (this.__root__.isDirty()) {
const model = this.__root__.toModel(); const model = this.__root__.toModel();
this.nativeRender(model); promises.push(this.nativeRender(model));
this.__root__.clean(); this.__root__.clean();
} }
for (let map of this.headviews.values()) { for (let map of this.headviews.values()) {
for (let v of map.values()) { for (let v of map.values()) {
if (v.isDirty()) { if (v.isDirty()) {
const model = v.toModel(); const model = v.toModel();
this.nativeRender(model); promises.push(this.nativeRender(model));
v.clean(); v.clean();
} }
} }
} }
}); });
} }
Promise.all(promises).then(_ => {
if (this.onRenderFinished) {
this.onRenderFinished();
}
});
} }
} }
__decorate([ __decorate([

9
doric-js/src/native/coordinator.ts
View File

@ -19,6 +19,7 @@ import { List } from "../widget/list"
import { FlowLayout } from "../widget/flowlayout" import { FlowLayout } from "../widget/flowlayout"
import { View } from "../ui/view" import { View } from "../ui/view"
import { Color } from "../util/color" import { Color } from "../util/color"
import { Panel } from "../ui/panel"
function viewIdChains(view: View) { function viewIdChains(view: View) {
const viewIds = [] const viewIds = []
@ -32,7 +33,7 @@ function viewIdChains(view: View) {
export function coordinator(context: BridgeContext) { export function coordinator(context: BridgeContext) {
return { return {
verticalScrolling: async ( verticalScrolling: (
argument: { argument: {
scrollable: Scroller | List | FlowLayout, scrollable: Scroller | List | FlowLayout,
scrollRange: { scrollRange: {
@ -46,7 +47,9 @@ export function coordinator(context: BridgeContext) {
end: number | Color end: number | Color
}, },
}) => { }) => {
await context.callNative("coordinator", "ready"); if (context.entity instanceof Panel) {
const panel = context.entity
panel.onRenderFinished = () => {
(argument as any).scrollable = viewIdChains(argument.scrollable) (argument as any).scrollable = viewIdChains(argument.scrollable)
if (argument.target instanceof View) { if (argument.target instanceof View) {
(argument as any).target = viewIdChains(argument.target) (argument as any).target = viewIdChains(argument.target)
@ -61,3 +64,5 @@ export function coordinator(context: BridgeContext) {
} }
} }
} }
}
}

18
doric-js/src/ui/panel.ts
View File

@ -45,6 +45,8 @@ export abstract class Panel {
private __root__ = new Root private __root__ = new Root
private headviews: Map<string, Map<string, View>> = new Map private headviews: Map<string, Map<string, View>> = new Map
onRenderFinished?: () => void
addHeadView(type: string, v: View) { addHeadView(type: string, v: View) {
let map = this.headviews.get(type) let map = this.headviews.get(type)
if (map) { if (map) {
@ -157,7 +159,7 @@ export abstract class Panel {
} }
private nativeRender(model: Model) { private nativeRender(model: Model) {
this.context.callNative("shader", "render", model) return this.context.callNative("shader", "render", model)
} }
private hookBeforeNativeCall() { private hookBeforeNativeCall() {
@ -172,18 +174,19 @@ export abstract class Panel {
} }
private hookAfterNativeCall() { private hookAfterNativeCall() {
const promises: Promise<any>[] = []
if (Environment.platform !== 'web') { if (Environment.platform !== 'web') {
//Here insert a native call to ensure the promise is resolved done. //Here insert a native call to ensure the promise is resolved done.
nativeEmpty() nativeEmpty()
if (this.__root__.isDirty()) { if (this.__root__.isDirty()) {
const model = this.__root__.toModel() const model = this.__root__.toModel()
this.nativeRender(model) promises.push(this.nativeRender(model))
} }
for (let map of this.headviews.values()) { for (let map of this.headviews.values()) {
for (let v of map.values()) { for (let v of map.values()) {
if (v.isDirty()) { if (v.isDirty()) {
const model = v.toModel() const model = v.toModel()
this.nativeRender(model) promises.push(this.nativeRender(model))
} }
} }
} }
@ -191,19 +194,24 @@ export abstract class Panel {
Promise.resolve().then(() => { Promise.resolve().then(() => {
if (this.__root__.isDirty()) { if (this.__root__.isDirty()) {
const model = this.__root__.toModel() const model = this.__root__.toModel()
this.nativeRender(model) promises.push(this.nativeRender(model))
this.__root__.clean() this.__root__.clean()
} }
for (let map of this.headviews.values()) { for (let map of this.headviews.values()) {
for (let v of map.values()) { for (let v of map.values()) {
if (v.isDirty()) { if (v.isDirty()) {
const model = v.toModel() const model = v.toModel()
this.nativeRender(model) promises.push(this.nativeRender(model))
v.clean() v.clean()
} }
} }
} }
}) })
} }
Promise.all(promises).then(_ => {
if (this.onRenderFinished) {
this.onRenderFinished()
}
})
} }
} }

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

@ -2288,7 +2288,7 @@ class Panel {
}, undefined); }, undefined);
} }
nativeRender(model) { nativeRender(model) {
this.context.callNative("shader", "render", model); return this.context.callNative("shader", "render", model);
} }
hookBeforeNativeCall() { hookBeforeNativeCall() {
if (Environment.platform !== 'web') { if (Environment.platform !== 'web') {
@ -2301,18 +2301,19 @@ class Panel {
} }
} }
hookAfterNativeCall() { hookAfterNativeCall() {
const promises = [];
if (Environment.platform !== 'web') { if (Environment.platform !== 'web') {
//Here insert a native call to ensure the promise is resolved done. //Here insert a native call to ensure the promise is resolved done.
nativeEmpty(); nativeEmpty();
if (this.__root__.isDirty()) { if (this.__root__.isDirty()) {
const model = this.__root__.toModel(); const model = this.__root__.toModel();
this.nativeRender(model); promises.push(this.nativeRender(model));
} }
for (let map of this.headviews.values()) { for (let map of this.headviews.values()) {
for (let v of map.values()) { for (let v of map.values()) {
if (v.isDirty()) { if (v.isDirty()) {
const model = v.toModel(); const model = v.toModel();
this.nativeRender(model); promises.push(this.nativeRender(model));
} }
} }
} }
@ -2321,20 +2322,25 @@ class Panel {
Promise.resolve().then(() => { Promise.resolve().then(() => {
if (this.__root__.isDirty()) { if (this.__root__.isDirty()) {
const model = this.__root__.toModel(); const model = this.__root__.toModel();
this.nativeRender(model); promises.push(this.nativeRender(model));
this.__root__.clean(); this.__root__.clean();
} }
for (let map of this.headviews.values()) { for (let map of this.headviews.values()) {
for (let v of map.values()) { for (let v of map.values()) {
if (v.isDirty()) { if (v.isDirty()) {
const model = v.toModel(); const model = v.toModel();
this.nativeRender(model); promises.push(this.nativeRender(model));
v.clean(); v.clean();
} }
} }
} }
}); });
} }
Promise.all(promises).then(_ => {
if (this.onRenderFinished) {
this.onRenderFinished();
}
});
} }
} }
__decorate$2([ __decorate$2([
@ -3706,15 +3712,6 @@ function statusbar(context) {
}; };
} }
var __awaiter$1 = (undefined && undefined.__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());
});
};
function viewIdChains(view) { function viewIdChains(view) {
const viewIds = []; const viewIds = [];
let thisView = view; let thisView = view;
@ -3726,8 +3723,10 @@ function viewIdChains(view) {
} }
function coordinator(context) { function coordinator(context) {
return { return {
verticalScrolling: (argument) => __awaiter$1(this, void 0, void 0, function* () { verticalScrolling: (argument) => {
yield context.callNative("coordinator", "ready"); if (context.entity instanceof Panel) {
const panel = context.entity;
panel.onRenderFinished = () => {
argument.scrollable = viewIdChains(argument.scrollable); argument.scrollable = viewIdChains(argument.scrollable);
if (argument.target instanceof View) { if (argument.target instanceof View) {
argument.target = viewIdChains(argument.target); argument.target = viewIdChains(argument.target);
@ -3739,7 +3738,9 @@ function coordinator(context) {
argument.changing.end = argument.changing.end.toModel(); argument.changing.end = argument.changing.end.toModel();
} }
return context.callNative("coordinator", "verticalScrolling", argument); return context.callNative("coordinator", "verticalScrolling", argument);
}) };
}
}
}; };
} }

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

File diff suppressed because one or more lines are too long