add navbar custom left & right view api

doric-js/bundle/doric-lib.js

@@ -752,7 +752,12 @@ class Panel {
                 if (cur === this.__root__.viewId) {
                     return this.__root__;
                 }
-                return this.headviews.get(cur);
+                for (let map of this.headviews.values()) {
+                    if (map.has(cur)) {
+                        return map.get(cur);
+                    }
+                }
+                return undefined;
             }
             else {
                 if (Reflect.has(acc, "subviewById")) {
@@ -1837,6 +1842,10 @@ function modal(context) {
 
 function navbar(context) {
     const entity = context.entity;
+    let panel = undefined;
+    if (entity instanceof Panel) {
+        panel = entity;
+    }
     return {
         isHidden: () => {
             return context.navbar.isHidden();
@@ -1856,6 +1865,20 @@ function navbar(context) {
                 color: color.toModel(),
             });
         },
+        setLeft: (view) => {
+            if (panel) {
+                panel.clearHeadViews("navbar_left");
+                panel.addHeadView("navbar_left", view);
+            }
+            return context.navbar.setLeft(view.toModel());
+        },
+        setRight: (view) => {
+            if (panel) {
+                panel.clearHeadViews("navbar_right");
+                panel.addHeadView("navbar_right", view);
+            }
+            return context.navbar.setRight(view.toModel());
+        }
     };
 }
 

doric-js/bundle/doric-vm.js

@@ -2211,7 +2211,12 @@ class Panel {
                 if (cur === this.__root__.viewId) {
                     return this.__root__;
                 }
-                return this.headviews.get(cur);
+                for (let map of this.headviews.values()) {
+                    if (map.has(cur)) {
+                        return map.get(cur);
+                    }
+                }
+                return undefined;
             }
             else {
                 if (Reflect.has(acc, "subviewById")) {
@@ -3296,6 +3301,10 @@ function modal(context) {
 
 function navbar(context) {
     const entity = context.entity;
+    let panel = undefined;
+    if (entity instanceof Panel) {
+        panel = entity;
+    }
     return {
         isHidden: () => {
             return context.navbar.isHidden();
@@ -3315,6 +3324,20 @@ function navbar(context) {
                 color: color.toModel(),
             });
         },
+        setLeft: (view) => {
+            if (panel) {
+                panel.clearHeadViews("navbar_left");
+                panel.addHeadView("navbar_left", view);
+            }
+            return context.navbar.setLeft(view.toModel());
+        },
+        setRight: (view) => {
+            if (panel) {
+                panel.clearHeadViews("navbar_right");
+                panel.addHeadView("navbar_right", view);
+            }
+            return context.navbar.setRight(view.toModel());
+        }
     };
 }
 

doric-js/index.d.ts

@@ -713,11 +713,14 @@ declare module 'doric/lib/src/native/modal' {
 declare module 'doric/lib/src/native/navbar' {
     import { BridgeContext } from "doric/lib/src/runtime/global";
     import { Color } from "doric/lib/src/util/color";
+    import { View } from "doric/lib/src/ui/view";
     export function navbar(context: BridgeContext): {
         isHidden: () => Promise<boolean>;
         setHidden: (hidden: boolean) => Promise<any>;
         setTitle: (title: string) => Promise<any>;
         setBgColor: (color: Color) => Promise<any>;
+        setLeft: (view: View) => Promise<any>;
+        setRight: (view: View) => Promise<any>;
     };
 }
 

doric-js/lib/src/native/navbar.d.ts

@@ -1,8 +1,11 @@
 import { BridgeContext } from "../runtime/global";
 import { Color } from "../util/color";
+import { View } from "../ui/view";
 export declare function navbar(context: BridgeContext): {
     isHidden: () => Promise<boolean>;
     setHidden: (hidden: boolean) => Promise<any>;
     setTitle: (title: string) => Promise<any>;
     setBgColor: (color: Color) => Promise<any>;
+    setLeft: (view: View) => Promise<any>;
+    setRight: (view: View) => Promise<any>;
 };

doric-js/lib/src/native/navbar.js

@@ -24,5 +24,19 @@ export function navbar(context) {
                 color: color.toModel(),
             });
         },
+        setLeft: (view) => {
+            if (panel) {
+                panel.clearHeadViews("navbar_left");
+                panel.addHeadView("navbar_left", view);
+            }
+            return context.navbar.setLeft(view.toModel());
+        },
+        setRight: (view) => {
+            if (panel) {
+                panel.clearHeadViews("navbar_right");
+                panel.addHeadView("navbar_right", view);
+            }
+            return context.navbar.setRight(view.toModel());
+        }
     };
 }

doric-js/lib/src/ui/panel.js

@@ -123,7 +123,12 @@ export class Panel {
                 if (cur === this.__root__.viewId) {
                     return this.__root__;
                 }
-                return this.headviews.get(cur);
+                for (let map of this.headviews.values()) {
+                    if (map.has(cur)) {
+                        return map.get(cur);
+                    }
+                }
+                return undefined;
             }
             else {
                 if (Reflect.has(acc, "subviewById")) {

doric-js/src/native/navbar.ts

@@ -16,6 +16,7 @@
 import { BridgeContext } from "../runtime/global"
 import { Panel } from "../ui/panel"
 import { Color } from "../util/color"
+import { View } from "../ui/view"
 
 export function navbar(context: BridgeContext) {
     const entity = context.entity
@@ -43,5 +44,19 @@ export function navbar(context: BridgeContext) {
                 color: color.toModel(),
             })
         },
+        setLeft: (view: View) => {
+            if (panel) {
+                panel.clearHeadViews("navbar_left")
+                panel.addHeadView("navbar_left", view)
+            }
+            return context.navbar.setLeft(view.toModel())
+        },
+        setRight: (view: View) => {
+            if (panel) {
+                panel.clearHeadViews("navbar_right")
+                panel.addHeadView("navbar_right", view)
+            }
+            return context.navbar.setRight(view.toModel())
+        }
     }
 }

doric-js/src/ui/panel.ts

@@ -141,7 +141,12 @@ export abstract class Panel {
                 if (cur === this.__root__.viewId) {
                     return this.__root__
                 }
-                return this.headviews.get(cur)
+                for (let map of this.headviews.values()) {
+                    if (map.has(cur)) {
+                        return map.get(cur)
+                    }
+                }
+                return undefined
             } else {
                 if (Reflect.has(acc, "subviewById")) {
                     return Reflect.apply(Reflect.get(acc, "subviewById"), acc, [cur])