jsbox-cview 1.5.30 → 1.5.32

package/components/dialogs/form-dialog.ts

@@ -23,11 +23,11 @@ class DialogSheetForm extends DialogSheet {
   }
 
   done() {
-    this._done = true;
     if (this.resolve && this._props.doneHandler) {
       const values = this._props.doneHandler();
       const success = this._checkHandler(values);
       if (success) {
+        this._done = true;
         this.resolve(values);
         this.dismiss();
       }

package/controller/presented-page-controller.ts

@@ -12,6 +12,10 @@ interface PresentedPageControllerProps extends BaseControllerProps {
   interactiveDismissalDisabled?: boolean;
 }
 
+interface PresentedPageControllerEvents extends BaseControllerEvents {
+  dismissed?: (controller: PresentedPageController) => void;
+}
+
 /** # CView PresentedPageController
  *
  * ## Props
@@ -21,6 +25,10 @@ interface PresentedPageControllerProps extends BaseControllerProps {
  * - interactiveDismissalDisabled?: boolean = false
  * - bgcolor?: UIColor = $color("secondarySurface")
  *
+ * ## 专用事件
+ *
+ * - dismissed: function  退出时的回调
+ *
  * ## 专用方法
  *
  * - present() 在 `sheet.present()` 之后会先后执行 `load()` 和 `appear()`
@@ -38,7 +46,7 @@ export class PresentedPageController extends BaseController {
   }: {
     props?: Partial<PresentedPageControllerProps>;
     layout?: (make: MASConstraintMaker, view: UIView) => void;
-    events?: BaseControllerEvents;
+    events?: PresentedPageControllerEvents;
   } = {}) {
     super({
       props: {
@@ -55,7 +63,10 @@ export class PresentedPageController extends BaseController {
         props?.interactiveDismissalDisabled || false,
       bgcolor: props?.bgcolor || $color("secondarySurface"),
       cview: this.rootView,
-      dismissalHandler: () => this.remove(),
+      dismissalHandler: () => {
+        events?.dismissed?.(this);
+        this.remove();
+      },
     });
   }
 

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

@@ -9,11 +9,11 @@ class DialogSheetForm extends dialog_sheet_1.DialogSheet {
         this._checkHandler = checkHandler;
     }
     done() {
-        this._done = true;
         if (this.resolve && this._props.doneHandler) {
             const values = this._props.doneHandler();
             const success = this._checkHandler(values);
             if (success) {
+                this._done = true;
                 this.resolve(values);
                 this.dismiss();
             }

package/dist/controller/presented-page-controller.js

@@ -12,6 +12,10 @@ const sheet_1 = require("../components/sheet");
  * - interactiveDismissalDisabled?: boolean = false
  * - bgcolor?: UIColor = $color("secondarySurface")
  *
+ * ## 专用事件
+ *
+ * - dismissed: function  退出时的回调
+ *
  * ## 专用方法
  *
  * - present() 在 `sheet.present()` 之后会先后执行 `load()` 和 `appear()`
@@ -37,7 +41,11 @@ class PresentedPageController extends base_controller_1.BaseController {
             interactiveDismissalDisabled: (props === null || props === void 0 ? void 0 : props.interactiveDismissalDisabled) || false,
             bgcolor: (props === null || props === void 0 ? void 0 : props.bgcolor) || $color("secondarySurface"),
             cview: this.rootView,
-            dismissalHandler: () => this.remove(),
+            dismissalHandler: () => {
+                var _a;
+                (_a = events === null || events === void 0 ? void 0 : events.dismissed) === null || _a === void 0 ? void 0 : _a.call(events, this);
+                this.remove();
+            },
         });
     }
     present() {

package/package.json

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