jsbox-cview 1.1.0 → 1.1.2

package/components/custom-navigation-bar.ts

@@ -97,7 +97,7 @@ export interface NavigationBarProps {
 }
 
 interface BarButtonItem {
-  cview?: Base<AllUIView, UiTypes.AllViewOptions>;
+  cview?: Base<any, any>;
   width?: number;
   title?: string;
   symbol?: string;

package/components/dialogs/dialog-sheet.ts

@@ -28,6 +28,7 @@ export class DialogSheet extends Sheet<ContentView, UIView, UiTypes.ViewOptions>
     bgcolor?: UIColor;
   }
   _done: boolean;
+  private _navbar?: CustomNavigationBar;
   resolve?: (value: any) => void;
   reject?: (reason: any) => void;
 
@@ -55,7 +56,7 @@ export class DialogSheet extends Sheet<ContentView, UIView, UiTypes.ViewOptions>
     this._dismissalHandler = () => {
       if (!this._done && this.reject) this.reject("cancel");
     };
-    const _navbar = new CustomNavigationBar({
+    this._navbar = new CustomNavigationBar({
       props: {
         title: this._props.title,
         leftBarButtonItems: [
@@ -73,7 +74,7 @@ export class DialogSheet extends Sheet<ContentView, UIView, UiTypes.ViewOptions>
     };
     this._cview = new ContentView({
       props: { bgcolor: $color("clear") },
-      views: [_navbar.definition, this._props.cview.definition]
+      views: [this._navbar.definition, this._props.cview.definition]
     });
     super.present();
   }
@@ -84,4 +85,13 @@ export class DialogSheet extends Sheet<ContentView, UIView, UiTypes.ViewOptions>
       this.resolve(this._props.doneHandler());
     this.dismiss();
   }
+
+  get title() {
+    return this._props.title;
+  }
+
+  set title(title: string) {
+    this._props.title = title;
+    if (this._navbar) this._navbar.title = title;
+  }
 }

package/components/symbol-button.ts

@@ -15,11 +15,11 @@
 
 import { Base } from "./base";
 
-interface CunstomProps extends UiTypes.ButtonProps {
+interface SymbolButtonProps extends UiTypes.ButtonProps {
   insets: JBInsets
 }
 
-interface CunstomPropsOptional extends UiTypes.ButtonProps {
+interface SymbolButtonPropsOptional extends UiTypes.ButtonProps {
   insets?: JBInsets
 }
 /**
@@ -33,17 +33,15 @@ interface CunstomPropsOptional extends UiTypes.ButtonProps {
  *   - tapped
  */
 export class SymbolButton extends Base<UIButtonView, UiTypes.ButtonOptions> {
-  _props: CunstomProps
-  _layout: (make: MASConstraintMaker, view: UIButtonView) => void
-  _events: UiTypes.BaseViewEvents<UIButtonView>
+  _props: SymbolButtonProps
   _defineView: () => UiTypes.ButtonOptions;
   constructor({ 
     props, 
     layout, 
     events = {} 
   }: {
-    props: CunstomPropsOptional;
-    layout: (make: MASConstraintMaker, view: UIButtonView) => void;
+    props: SymbolButtonPropsOptional;
+    layout?: (make: MASConstraintMaker, view: UIButtonView) => void;
     events?: UiTypes.BaseViewEvents<UIButtonView>;
   }) {
     super();
@@ -52,8 +50,6 @@ export class SymbolButton extends Base<UIButtonView, UiTypes.ButtonOptions> {
       tintColor: $color("primaryText"),
       ...props
     };
-    this._layout = layout;
-    this._events = events;
     this._defineView = () => {
       return {
         type: "button",
@@ -80,10 +76,8 @@ export class SymbolButton extends Base<UIButtonView, UiTypes.ButtonOptions> {
             }
           }
         ],
-        layout: this._layout,
-        events: {
-          ...this._events
-        }
+        layout,
+        events
       };
     }
   }

package/dist/components/dialogs/dialog-sheet.js

@@ -35,7 +35,7 @@ class DialogSheet extends sheet_1.Sheet {
             if (!this._done && this.reject)
                 this.reject("cancel");
         };
-        const _navbar = new custom_navigation_bar_1.CustomNavigationBar({
+        this._navbar = new custom_navigation_bar_1.CustomNavigationBar({
             props: {
                 title: this._props.title,
                 leftBarButtonItems: [
@@ -53,7 +53,7 @@ class DialogSheet extends sheet_1.Sheet {
         };
         this._cview = new single_views_1.ContentView({
             props: { bgcolor: $color("clear") },
-            views: [_navbar.definition, this._props.cview.definition]
+            views: [this._navbar.definition, this._props.cview.definition]
         });
         super.present();
     }
@@ -63,5 +63,13 @@ class DialogSheet extends sheet_1.Sheet {
             this.resolve(this._props.doneHandler());
         this.dismiss();
     }
+    get title() {
+        return this._props.title;
+    }
+    set title(title) {
+        this._props.title = title;
+        if (this._navbar)
+            this._navbar.title = title;
+    }
 }
 exports.DialogSheet = DialogSheet;

package/dist/components/symbol-button.js

@@ -30,8 +30,6 @@ class SymbolButton extends base_1.Base {
     constructor({ props, layout, events = {} }) {
         super();
         this._props = Object.assign({ insets: $insets(12.5, 12.5, 12.5, 12.5), tintColor: $color("primaryText") }, props);
-        this._layout = layout;
-        this._events = events;
         this._defineView = () => {
             return {
                 type: "button",
@@ -58,8 +56,8 @@ class SymbolButton extends base_1.Base {
                         }
                     }
                 ],
-                layout: this._layout,
-                events: Object.assign({}, this._events)
+                layout,
+                events
             };
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsbox-cview",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "为 JSBox 设计的微型框架",
   "repository": {
     "type": "git",