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

js:adjust hook timing for nested situation

Browse Source
This commit is contained in:
pengfei.zhou 2019-12-26 11:23:56 +08:00 committed by osborn
parent 48e6066e75
commit 7c88eebeb8
5 changed files with 81 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doric-android/doric/src/main/java/pub/doric/shader/slider/NestedSliderNode.java
View File

@ -73,7 +73,7 @@ public class NestedSliderNode extends GroupNode<ViewPager> implements ViewPager.
@NotNull
@Override
public Object instantiateItem(@NotNull ViewGroup container, int position) {
container.addView(slideItems.get(position), 0);
container.addView(slideItems.get(position));
return slideItems.get(position);
}
});

2
doric-demo/src/StickDemo.ts
View File

@ -77,7 +77,7 @@ class StickDemo extends Panel {
return new FlowLayoutItem().apply({
backgroundColor: colors[itemIdx % colors.length],
height: 50,
layoutConfig: layoutConfig().configWidth(LayoutSpec.JUST),
layoutConfig: layoutConfig().configWidth(LayoutSpec.MOST),
}).also(it => {
it.addChild(text({
text: `In Page ${idx},${itemIdx}`,

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

@ -736,9 +736,29 @@ class Panel {
this.context.shader.render(model);
}
hookBeforeNativeCall() {
if (Environment.platform !== 'h5') {
this.__root__.clean();
for (let v of this.headviews.values()) {
v.clean();
}
}
}
hookAfterNativeCall() {
if (Environment.platform !== 'h5') {
//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);
}
for (let v of this.headviews.values()) {
if (v.isDirty()) {
const model = v.toModel();
this.nativeRender(model);
}
}
}
else {
Promise.resolve().then(() => {
if (this.__root__.isDirty()) {
const model = this.__root__.toModel();
@ -754,6 +774,7 @@ class Panel {
}
});
}
}
}
__decorate$2([
NativeCall,

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

@ -2184,9 +2184,29 @@ class Panel {
this.context.shader.render(model);
}
hookBeforeNativeCall() {
if (Environment.platform !== 'h5') {
this.__root__.clean();
for (let v of this.headviews.values()) {
v.clean();
}
}
}
hookAfterNativeCall() {
if (Environment.platform !== 'h5') {
//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);
}
for (let v of this.headviews.values()) {
if (v.isDirty()) {
const model = v.toModel();
this.nativeRender(model);
}
}
}
else {
Promise.resolve().then(() => {
if (this.__root__.isDirty()) {
const model = this.__root__.toModel();
@ -2202,6 +2222,7 @@ class Panel {
}
});
}
}
}
__decorate$2([
NativeCall,

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

@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import '../runtime/global'
import { View, Group } from "./view"
import { loge } from '../util/log'
import { Model } from '../util/types'
@ -31,6 +30,8 @@ export function NativeCall(target: Panel, propertyKey: string, descriptor: Prope
type Frame = { width: number, height: number }
declare function nativeEmpty(): void
export abstract class Panel {
context!: BridgeContext
onCreate() { }
@ -141,10 +142,29 @@ export abstract class Panel {
}
private hookBeforeNativeCall() {
if (Environment.platform !== 'h5') {
this.__root__.clean()
for (let v of this.headviews.values()) {
v.clean()
}
}
}
private hookAfterNativeCall() {
if (Environment.platform !== 'h5') {
//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)
}
for (let v of this.headviews.values()) {
if (v.isDirty()) {
const model = v.toModel()
this.nativeRender(model)
}
}
} else {
Promise.resolve().then(() => {
if (this.__root__.isDirty()) {
const model = this.__root__.toModel()
@ -160,5 +180,5 @@ export abstract class Panel {
}
})
}
}
}