jsbox-cview 1.5.1 → 1.5.2

package/components/dialogs/dialog-sheet.ts

@@ -19,7 +19,7 @@ export class DialogSheet extends Sheet<ContentView, UIView, UiTypes.ViewOptions>
   _props: {
     title: string;
     cview: Base<any, any>;
-    doneHandler?: () => void;
+    doneHandler?: () => any;
     presentMode?: number;
     bgcolor?: UIColor;
     doneButtonHidden?: boolean;

package/components/symbol-button.ts

@@ -1,11 +1,13 @@
 import { Base } from "./base";
 
-interface SymbolButtonProps extends UiTypes.ButtonProps {
-  insets: JBInsets
-}
-
-interface SymbolButtonPropsOptional extends UiTypes.ButtonProps {
-  insets?: JBInsets
+interface SymbolButtonProps {
+  symbol?: string;
+  image?: UIImage;
+  src?: string;
+  tintColor: UIColor;
+  contentMode: number;
+  insets: JBInsets;
+  menu?: UiTypes.ContextMenuOptions
 }
 
 /**
@@ -26,12 +28,13 @@ export class SymbolButton extends Base<UIButtonView, UiTypes.ButtonOptions> {
     layout,
     events = {}
   }: {
-    props: SymbolButtonPropsOptional;
+    props: Partial<SymbolButtonProps>;
     layout?: (make: MASConstraintMaker, view: UIButtonView) => void;
     events?: UiTypes.BaseViewEvents<UIButtonView>;
   }) {
     super();
     this._props = {
+      contentMode: 1,
       insets: $insets(12.5, 12.5, 12.5, 12.5),
       tintColor: $color("primaryText"),
       ...props
@@ -61,7 +64,7 @@ export class SymbolButton extends Base<UIButtonView, UiTypes.ButtonOptions> {
               image: this._props.image,
               src: this._props.src,
               tintColor: this._props.tintColor,
-              contentMode: 1
+              contentMode: this._props.contentMode
             },
             layout: (make, view: UIImageView) => {
               make.edges.insets(this._props.insets);
@@ -77,17 +80,18 @@ export class SymbolButton extends Base<UIButtonView, UiTypes.ButtonOptions> {
   }
 
   set tintColor(tintColor: UIColor) {
-    const image = this.view.get("image") as UIImageView;
-    image.tintColor = tintColor;
+    (this.view.get("image") as UIImageView).tintColor = tintColor;
+  }
+
+  set image(image: UIImage) {
+    (this.view.get("image") as UIImageView).image = image;
   }
 
-  set symbol(symbol) {
-    this._props.symbol = symbol;
-    const image = this.view.get("image") as UIImageView;
-    image.symbol = symbol;
+  set symbol(symbol: string) {
+    (this.view.get("image") as UIImageView).symbol = symbol;
   }
 
-  get symbol() {
-    return this._props.symbol;
+  set src(src: string) {
+    (this.view.get("image") as UIImageView).src = src;
   }
 }

package/dist/components/symbol-button.js

@@ -15,7 +15,7 @@ const base_1 = require("./base");
 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._props = Object.assign({ contentMode: 1, insets: $insets(12.5, 12.5, 12.5, 12.5), tintColor: $color("primaryText") }, props);
         this._layout = layout;
         this._defineView = () => {
             const props = this._props.menu
@@ -41,7 +41,7 @@ class SymbolButton extends base_1.Base {
                             image: this._props.image,
                             src: this._props.src,
                             tintColor: this._props.tintColor,
-                            contentMode: 1
+                            contentMode: this._props.contentMode
                         },
                         layout: (make, view) => {
                             make.edges.insets(this._props.insets);
@@ -56,16 +56,16 @@ class SymbolButton extends base_1.Base {
         };
     }
     set tintColor(tintColor) {
-        const image = this.view.get("image");
-        image.tintColor = tintColor;
+        this.view.get("image").tintColor = tintColor;
+    }
+    set image(image) {
+        this.view.get("image").image = image;
     }
     set symbol(symbol) {
-        this._props.symbol = symbol;
-        const image = this.view.get("image");
-        image.symbol = symbol;
+        this.view.get("image").symbol = symbol;
     }
-    get symbol() {
-        return this._props.symbol;
+    set src(src) {
+        this.view.get("image").src = src;
     }
 }
 exports.SymbolButton = SymbolButton;

package/package.json

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