js:pass the es5 runtime

doric-js/src/runtime/sandbox.es5.ts

@@ -132,33 +132,6 @@ export class Context {
 
     constructor(id: string) {
         this.id = id
-        return new Proxy(this, {
-            get: (target, p: any) => {
-                if (Reflect.has(target, p)) {
-                    return Reflect.get(target, p)
-                } else {
-                    const namespace = p
-                    return new Proxy({}, {
-                        get: (target, p: any) => {
-                            if (Reflect.has(target, p)) {
-                                return Reflect.get(target, p)
-                            } else {
-                                const context = this
-                                return function () {
-                                    const args = []
-                                    args.push(namespace)
-                                    args.push(p)
-                                    for (let arg of arguments) {
-                                        args.push(arg)
-                                    }
-                                    return Reflect.apply(context.callNative, context, args)
-                                }
-                            }
-                        }
-                    })
-                }
-            }
-        })
     }
     callNative(namespace: string, method: string, args?: any): Promise<any> {
         const callbackId = uniqueId('callback')

doric-js/src/ui/index.ui.es5.ts

@@ -1,18 +0,0 @@
-/*
- * Copyright [2019] [Doric.Pub]
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-export * from './view.es5'
-export * from './panel'
-export * from './animation'

doric-js/src/ui/panel.ts

@@ -43,7 +43,7 @@ export abstract class Panel {
 
     private __data__?: object
     private __root__ = new Root
-    private headviews: Map<string,  Map<string, View>> = new Map
+    private headviews: Map<string, Map<string, View>> = new Map
 
     addHeadView(type: string, v: View) {
         let map = this.headviews.get(type)
@@ -157,7 +157,7 @@ export abstract class Panel {
     }
 
     private nativeRender(model: Model) {
-        this.context.shader.render(model)
+        (this.context as any).callNative("shader", "render", model)
     }
 
     private hookBeforeNativeCall() {

doric-js/src/ui/view.es5.ts

@@ -21,8 +21,19 @@ import { BridgeContext } from "../runtime/global";
 import { LayoutConfig } from '../util/layoutconfig'
 import { IAnimation } from "./animation";
 
-export function Property(target: Object, propKey: string) {
-    Reflect.defineMetadata(propKey, true, target)
+export function Property(target: View, propKey: string) {
+    Object.defineProperty(target, propKey, {
+        get: function () {
+            return Reflect.get(this, `__prop__${propKey}`, this)
+        },
+        set: function (v) {
+            const oldV = Reflect.get(this, `__prop__${propKey}`, this)
+            Reflect.set(this, `__prop__${propKey}`, v, this)
+            if (oldV !== v) {
+                Reflect.apply(this.onPropertyChanged, this, [propKey, oldV, v])
+            }
+        },
+    })
 }
 
 export interface IView {
@@ -79,6 +90,8 @@ export type NativeViewModel = {
 }
 
 export abstract class View implements Modeling, IView {
+    private __dirty_props__!: { [index: string]: Model | undefined }
+
     @Property
     width: number = 0
 
@@ -128,9 +141,11 @@ export abstract class View implements Modeling, IView {
 
     superview?: Superview
 
-    callbacks: Map<String, Function> = new Map
-
+    callbacks!: Map<String, Function>
     private callback2Id(f: Function) {
+        if (this.callbacks === undefined) {
+            this.callbacks = new Map
+        }
         const id = uniqueId('Function')
         this.callbacks.set(id, f)
         return id
@@ -144,21 +159,6 @@ export abstract class View implements Modeling, IView {
         return f
     }
 
-    constructor() {
-        return new Proxy(this, {
-            get: (target, p, receiver) => {
-                return Reflect.get(target, p, receiver)
-            },
-            set: (target, p, v, receiver) => {
-                const oldV = Reflect.get(target, p, receiver)
-                const ret = Reflect.set(target, p, v, receiver)
-                if (Reflect.getMetadata(p, target) && oldV !== v) {
-                    receiver.onPropertyChanged(p.toString(), oldV, v)
-                }
-                return ret
-            }
-        })
-    }
     /** Anchor start*/
     get left() {
         return this.x
@@ -207,7 +207,6 @@ export abstract class View implements Modeling, IView {
     }
     /** Anchor end*/
 
-    private __dirty_props__: { [index: string]: Model | undefined } = {}
 
     get dirtyProps() {
         return this.__dirty_props__
@@ -225,6 +224,9 @@ export abstract class View implements Modeling, IView {
         } else {
             newV = obj2Model(newV)
         }
+        if (this.__dirty_props__ === undefined) {
+            this.__dirty_props__ = {}
+        }
         this.__dirty_props__[propKey] = newV
     }
 
@@ -388,14 +390,7 @@ export abstract class Superview extends View {
 
 export abstract class Group extends Superview {
 
-    readonly children: View[] = new Proxy([], {
-        set: (target, index, value) => {
-            const ret = Reflect.set(target, index, value)
-            // Let getDirty return true
-            this.dirtyProps.children = this.children.map(e => e.viewId)
-            return ret
-        }
-    })
+    readonly children: View[] = []
 
     allSubviews() {
         return this.children
@@ -403,6 +398,7 @@ export abstract class Group extends Superview {
 
     addChild(view: View) {
         this.children.push(view)
+        this.dirtyProps.children = this.children.map(e => e.viewId)
     }
 }