jsbox-cview 1.5.21 → 1.5.23

package/controller/pageviewer-controller.ts

@@ -1,21 +1,28 @@
-import { BaseController, BaseControllerProps, BaseControllerEvents, ControllerRootView } from "./base-controller";
+import {
+  BaseController,
+  BaseControllerProps,
+  BaseControllerEvents,
+} from "./base-controller";
 import { PageViewer } from "../components/pageviewer";
 import { PageViewerTitleBar } from "../components/pageviewer-titlebar";
-import { CustomNavigationBar, NavigationBarProps } from "../components/custom-navigation-bar";
+import {
+  CustomNavigationBar,
+  NavigationBarProps,
+} from "../components/custom-navigation-bar";
 
 interface PageViewerControllerProps extends BaseControllerProps {
-  items: { controller: BaseController, title: string }[];
+  items: { controller: BaseController; title: string }[];
   navBarProps?: Partial<NavigationBarProps>;
   index?: number;
 }
 
-/** 
+/**
  * # CView PageViewer Controller
- * 
+ *
  * 一个可以左右滑动翻页的控制器。
- * 
+ *
  * Props:
- * 
+ *
  * - items: { controller: Controller, title: string }[]
  * - navBarProps: {} 可用于 navBar 的其他属性，不包括 title 和 titleView
  */
@@ -25,8 +32,12 @@ export class PageViewerController extends BaseController {
     pageviewer: PageViewer;
     titlebar: PageViewerTitleBar;
     navbar: CustomNavigationBar;
-  }
-  constructor({ props, layout, events = {} }: {
+  };
+  constructor({
+    props,
+    layout,
+    events = {},
+  }: {
     props: PageViewerControllerProps;
     layout?: (make: MASConstraintMaker, view: UIView) => void;
     events?: BaseControllerEvents;
@@ -34,8 +45,10 @@ export class PageViewerController extends BaseController {
     super({
       props: {
         id: props.id,
-        bgcolor: props.bgcolor
-      }, layout, events
+        bgcolor: props.bgcolor,
+      },
+      layout,
+      events,
     });
     this._props = props;
     this.cviews = {} as {
@@ -46,42 +59,43 @@ export class PageViewerController extends BaseController {
     this.cviews.pageviewer = new PageViewer({
       props: {
         page: this._props.index || 0,
-        cviews: this._props.items.map(n => n.controller.rootView)
+        cviews: this._props.items.map((n) => n.controller.rootView),
       },
       layout: (make, view) => {
-        make.left.right.bottom.inset(0)
-        make.top.equalTo(view.prev.bottom)
+        make.left.right.bottom.inset(0);
+        make.top.equalTo(view.prev.bottom);
       },
       events: {
-        floatPageChanged: (cview, floatPage) => (this.cviews.titlebar.floatedIndex = floatPage)
-      }
+        floatPageChanged: (cview, floatPage) =>
+          (this.cviews.titlebar.floatedIndex = floatPage),
+      },
     });
     this.cviews.titlebar = new PageViewerTitleBar({
       props: {
-        items: this._props.items.map(n => n.title),
-        index: this._props.index || 0
+        items: this._props.items.map((n) => n.title),
+        index: this._props.index || 0,
       },
       layout: $layout.fill,
       events: {
-        changed: (cview, index) => this.cviews.pageviewer.scrollToPage(index)
-      }
+        changed: (cview, index) => this.cviews.pageviewer.scrollToPage(index),
+      },
     });
     this.cviews.navbar = new CustomNavigationBar({
       props: {
         ...this._props.navBarProps,
-        titleView: this.cviews.titlebar
-      }
+        titleView: this.cviews.titlebar,
+      },
     });
-    this.rootView.views = [this.cviews.navbar, this.cviews.pageviewer]
+    this.rootView.views = [this.cviews.navbar, this.cviews.pageviewer];
   }
 
   get index() {
-    return this._props.index || 0
+    return this._props.index || 0;
   }
 
   set index(num) {
-    this.cviews.titlebar.index = num
-    this.cviews.pageviewer.page = num
-    this._props.index = num
+    this.cviews.titlebar.index = num;
+    this.cviews.pageviewer.page = num;
+    this._props.index = num;
   }
 }

package/controller/presented-page-controller.ts

@@ -1,4 +1,9 @@
-import { BaseController, BaseControllerProps, BaseControllerEvents, ControllerRootView } from "./base-controller";
+import {
+  BaseController,
+  BaseControllerProps,
+  BaseControllerEvents,
+  ControllerRootView,
+} from "./base-controller";
 import { Sheet } from "../components/sheet";
 
 interface PresentedPageControllerProps extends BaseControllerProps {
@@ -8,25 +13,29 @@ interface PresentedPageControllerProps extends BaseControllerProps {
 }
 
 /** # CView PresentedPageController
- * 
+ *
  * ## Props
- * 
+ *
  * - presentMode?: number = 1
  * - animated?: boolean = true
  * - interactiveDismissalDisabled?: boolean = false
  * - bgcolor?: UIColor = $color("secondarySurface")
- * 
+ *
  * ## 专用方法
- * 
+ *
  * - present() 在 `sheet.present()` 之后会先后执行 `load()` 和 `appear()`
  * - dismiss()
- * 
+ *
  * ## 布局
  * 此控制器的 layout 必定为 `$layout.fill`，无需自行设定
  */
 export class PresentedPageController extends BaseController {
   private _sheet: Sheet<ControllerRootView, UIView, UiTypes.ViewOptions>;
-  constructor({ props, layout, events }: {
+  constructor({
+    props,
+    layout,
+    events,
+  }: {
     props?: Partial<PresentedPageControllerProps>;
     layout?: (make: MASConstraintMaker, view: UIView) => void;
     events?: BaseControllerEvents;
@@ -34,26 +43,29 @@ export class PresentedPageController extends BaseController {
     super({
       props: {
         id: props?.id,
-        bgcolor: props?.bgcolor
-      }, layout, events
+        bgcolor: props?.bgcolor,
+      },
+      layout,
+      events,
     });
     this._sheet = new Sheet<ControllerRootView, UIView, UiTypes.ViewOptions>({
       presentMode: props?.presentMode ?? 1,
       animated: props?.animated ?? true,
-      interactiveDismissalDisabled: props?.interactiveDismissalDisabled || false,
+      interactiveDismissalDisabled:
+        props?.interactiveDismissalDisabled || false,
       bgcolor: props?.bgcolor || $color("secondarySurface"),
       cview: this.rootView,
-      dismissalHandler: () => this.remove()
+      dismissalHandler: () => this.remove(),
     });
   }
 
   present() {
-    if (this._sheet) this._sheet.present()
-    this.load()
-    this.appear()
+    if (this._sheet) this._sheet.present();
+    this.load();
+    this.appear();
   }
 
   dismiss() {
-    if (this._sheet) this._sheet.dismiss()
+    if (this._sheet) this._sheet.dismiss();
   }
 }

package/controller/splitview-controller.ts

@@ -1,4 +1,8 @@
-import { BaseController, BaseControllerProps, BaseControllerEvents } from "./base-controller";
+import {
+  BaseController,
+  BaseControllerProps,
+  BaseControllerEvents,
+} from "./base-controller";
 import { Base } from "../components/base";
 import { ContentView } from "../components/single-views";
 import { cvid } from "../utils/cvid";
@@ -8,10 +12,14 @@ class SecondaryView extends Base<UIView, UiTypes.ViewOptions> {
   _layouts: {
     hidden: (make: MASConstraintMaker, view: AllUIView) => void;
     shown: (make: MASConstraintMaker, view: AllUIView) => void;
-  }
+  };
   line: ContentView;
   _defineView: () => UiTypes.ViewOptions;
-  constructor({ props, layout, views = [] }: {
+  constructor({
+    props,
+    layout,
+    views = [],
+  }: {
     props?: UiTypes.BaseViewProps;
     layout?: (make: MASConstraintMaker, view: UIView) => void;
     views?: UiTypes.AllViewOptions[];
@@ -19,7 +27,7 @@ class SecondaryView extends Base<UIView, UiTypes.ViewOptions> {
     super();
     this._props = {
       bgcolor: $color("groupedBackground", "secondarySurface"),
-      ...props
+      ...props,
     };
     this._layouts = {
       hidden: (make, view) => {
@@ -35,28 +43,28 @@ class SecondaryView extends Base<UIView, UiTypes.ViewOptions> {
         make.width.greaterThanOrEqualTo(250);
         make.width.lessThanOrEqualTo(350);
         make.width.equalTo(view.super).dividedBy(2.5).priority(999);
-      }
+      },
     };
     this.line = new ContentView({
       props: {
-        bgcolor: $color("separatorColor")
+        bgcolor: $color("separatorColor"),
       },
       layout: (make, view) => {
         make.top.bottom.right.inset(0);
         make.width.equalTo(0.5);
-      }
+      },
     });
     this._defineView = () => {
       return {
         type: "view",
         props: {
           ...this._props,
-          id: this.id
+          id: this.id,
         },
         layout,
-        views: [...views, this.line.definition]
+        views: [...views, this.line.definition],
       };
-    }
+    };
   }
 
   add(view: UiTypes.AllViewOptions | Base<any, any>) {
@@ -68,7 +76,7 @@ class SecondaryView extends Base<UIView, UiTypes.ViewOptions> {
     this.view.remakeLayout(this._layouts.shown);
     $ui.animate({
       duration: 0.3,
-      animation: () => this.view.relayout()
+      animation: () => this.view.relayout(),
     });
   }
 
@@ -76,7 +84,7 @@ class SecondaryView extends Base<UIView, UiTypes.ViewOptions> {
     this.view.remakeLayout(this._layouts.hidden);
     $ui.animate({
       duration: 0.3,
-      animation: () => this.view.relayout()
+      animation: () => this.view.relayout(),
     });
   }
 }
@@ -90,7 +98,10 @@ class MaskView extends Base<UIView, UiTypes.ViewOptions> {
   _dismissEvent: () => void;
   _gestureObject: any;
   _defineView: () => UiTypes.ViewOptions;
-  constructor({ props, layout = $layout.fill }: {
+  constructor({
+    props,
+    layout = $layout.fill,
+  }: {
     props: {
       bgcolor?: UIColor;
       dismissHandler?: () => void;
@@ -110,14 +121,14 @@ class MaskView extends Base<UIView, UiTypes.ViewOptions> {
         props: {
           ...this._props,
           hidden: true,
-          id: this.id
+          id: this.id,
         },
         layout,
         events: {
-          ready: sender => this._addGesture(sender, this._dismissEvent)
-        }
+          ready: (sender) => this._addGesture(sender, this._dismissEvent),
+        },
       };
-    }
+    };
   }
 
   _addGesture(view: UIView, event: () => void) {
@@ -126,11 +137,12 @@ class MaskView extends Base<UIView, UiTypes.ViewOptions> {
       type: objectId + ": NSObject",
       events: {
         swipeEvent: event,
-        tapEvent: event
-      }
+        tapEvent: event,
+      },
     });
     const object = $objc(objectId).$new();
-    $objc_retain(object); // 此步骤是必须的，否则将很快被系统释放掉，但是必须在关闭时手动释放掉，否则再次启动可能会有问题
+    $objc_retain(object); // 此步骤是必须的，否则将很快被系统释放掉，
+    // 但是必须在关闭时手动释放掉，否则再次启动可能会有问题
     this._gestureObject = object;
     const swipeGestureRecognizer = $objc("UISwipeGestureRecognizer")
       .$alloc()
@@ -160,19 +172,21 @@ class MaskView extends Base<UIView, UiTypes.ViewOptions> {
 }
 
 interface SplitViewControllerProps extends BaseControllerProps {
-  items: { controller: BaseController, bgcolor: UIColor }[];
+  items: { controller: BaseController; bgcolor: UIColor }[];
 }
 
 /** # CView SplitView Controller
- * 
+ *
  * 实现左右分栏布局的控制器, 本身不提供除了分割线以外的视觉效果
- * 
+ *
  * 此控制器加载后，会禁用原本的ScreenEdgePanGesture，此控制器应该作为根控制器使用
- * 
- * @param options.props.items: { controller: Controller, bgcolor: UIColor }[] 其中第一个放在主视图上, 第二个放在次视图上
- * 
+ *
+ * @param options.props.items: { controller: Controller, bgcolor: UIColor }[]
+ *  其中第一个放在主视图上, 第二个放在次视图上
+ *
  * @property sideBarShown: boolean = false 侧栏是否显示
- * @property canShowSidebar: boolean = true 是否启动显示侧栏的动作（若为false，依然可以用sideBarShown来控制侧栏的显示）
+ * @property canShowSidebar: boolean = true 是否启动显示侧栏的动作
+ *  （若为false，依然可以用sideBarShown来控制侧栏的显示）
  */
 export class SplitViewController extends BaseController {
   private _screenEdgePanGestureObject: any;
@@ -185,7 +199,11 @@ export class SplitViewController extends BaseController {
     secondaryView: SecondaryView;
     maskView: MaskView;
   };
-  constructor({ props, layout, events }: {
+  constructor({
+    props,
+    layout,
+    events,
+  }: {
     props: SplitViewControllerProps;
     layout?: (make: MASConstraintMaker, view: UIView) => void;
     events?: BaseControllerEvents;
@@ -193,8 +211,25 @@ export class SplitViewController extends BaseController {
     super({
       props: {
         id: props.id,
-        bgcolor: props.bgcolor
-      }, layout, events
+        bgcolor: props.bgcolor,
+      },
+      layout,
+      events: {
+        ...events,
+        didAppear: (sender) => {
+          if (this._sideBarShown) {
+            this._secondaryController.appear();
+          } else {
+            this._primaryController.appear();
+          }
+          events?.didAppear?.(this);
+        },
+        didDisappear: () => {
+          this._primaryController.disappear();
+          this._secondaryController.disappear();
+          events?.didDisappear?.(this);
+        },
+      },
     });
     this._sideBarShown = false;
     this._canShowSidebar = true;
@@ -207,25 +242,23 @@ export class SplitViewController extends BaseController {
     };
     this.cviews.secondaryView = new SecondaryView({
       props: {
-        bgcolor: props.items[1].bgcolor || $color("clear")
+        bgcolor: props.items[1].bgcolor || $color("clear"),
       },
       layout: (make, view) => {
         make.top.bottom.inset(0);
         make.right.equalTo(view.super.left);
         make.width.equalTo(view.super).dividedBy(3);
       },
-      views: [
-        props.items[1].controller.rootView.definition
-      ]
+      views: [props.items[1].controller.rootView.definition],
     });
     this.cviews.maskView = new MaskView({
       props: {
-        dismissHandler: () => (this.sideBarShown = false)
-      }
+        dismissHandler: () => (this.sideBarShown = false),
+      },
     });
     this.cviews.primaryView = new ContentView({
       props: {
-        bgcolor: props.items[0].bgcolor || $color("clear")
+        bgcolor: props.items[0].bgcolor || $color("clear"),
       },
       layout: (make, view) => {
         make.top.bottom.inset(0);
@@ -234,8 +267,8 @@ export class SplitViewController extends BaseController {
       },
       views: [
         props.items[0].controller.rootView.definition,
-        this.cviews.maskView.definition
-      ]
+        this.cviews.maskView.definition,
+      ],
     });
     this._screenEdgePanGestureObject = this._defineGestureObject(() => {
       if (!this.sideBarShown && this._canShowSidebar) this.sideBarShown = true;
@@ -257,7 +290,7 @@ export class SplitViewController extends BaseController {
   uirender() {
     const props: UiTypes.RootViewPrefs = {
       navBarHidden: true,
-      statusBarStyle: 0
+      statusBarStyle: 0,
     };
     super.uirender(props);
   }
@@ -265,7 +298,7 @@ export class SplitViewController extends BaseController {
   uipush() {
     const props: UiTypes.RootViewPrefs = {
       navBarHidden: true,
-      statusBarStyle: 0
+      statusBarStyle: 0,
     };
     super.uipush(props);
   }
@@ -275,8 +308,8 @@ export class SplitViewController extends BaseController {
     $define({
       type: objectId + ": NSObject",
       events: {
-        screenEdgePanEvent: event
-      }
+        screenEdgePanEvent: event,
+      },
     });
     const object = $objc(objectId).$new();
     $objc_retain(object);
@@ -342,4 +375,4 @@ export class SplitViewController extends BaseController {
   set canShowSidebar(bool: boolean) {
     this._canShowSidebar = bool;
   }
-}
+}

package/controller/tabbar-controller.ts

@@ -1,4 +1,8 @@
-import { BaseController, BaseControllerProps, BaseControllerEvents } from "./base-controller";
+import {
+  BaseController,
+  BaseControllerProps,
+  BaseControllerEvents,
+} from "./base-controller";
 import { ContentView } from "../components/single-views";
 import { TabBar } from "../components/tabbar";
 
@@ -19,18 +23,18 @@ interface TabBarControllerEvents extends BaseControllerEvents {
   doubleTapped?: (controller: TabBarController, index: number) => void;
 }
 
-/** 
+/**
  * # CView TabBar Controller
  *
  * TabBarController 是一个 PagingController
  *
  * ## 属性
- * 
- * - items: {title?: string, 
- *           symbol?: string, 
- *           image?: UIImage, 
- *           tintColor?: UIColor, 
- *           bgcolor?: UIColor, 
+ *
+ * - items: {title?: string,
+ *           symbol?: string,
+ *           image?: UIImage,
+ *           tintColor?: UIColor,
+ *           bgcolor?: UIColor,
  *           controller: Controller}[]
  * - index: number = 0
  */
@@ -39,9 +43,13 @@ export class TabBarController extends BaseController {
   cviews: {
     tabbar: TabBar;
     pageContentView: ContentView;
-  }
+  };
   pages: ContentView[];
-  constructor({ props, layout, events = {} }: {
+  constructor({
+    props,
+    layout,
+    events = {},
+  }: {
     props: TabBarControllerProps;
     layout?: (make: MASConstraintMaker, view: UIView) => void;
     events?: TabBarControllerEvents;
@@ -49,7 +57,7 @@ export class TabBarController extends BaseController {
     super({
       props: {
         id: props.id,
-        bgcolor: props.bgcolor
+        bgcolor: props.bgcolor,
       },
       layout,
       events: {
@@ -61,12 +69,12 @@ export class TabBarController extends BaseController {
         didDisappear: () => {
           this._props.items[this.index].controller.disappear();
           events.didDisappear?.(this);
-        }
-      }
+        },
+      },
     });
     this._props = {
       items: props.items,
-      index: props.index || 0
+      index: props.index || 0,
     };
     this.cviews = {} as {
       tabbar: TabBar;
@@ -75,39 +83,41 @@ export class TabBarController extends BaseController {
     this.cviews.tabbar = new TabBar({
       props: {
         items: this._props.items,
-        index: this._props.index
+        index: this._props.index,
       },
       events: {
         changed: (cview, index) => {
           this.index = index;
-          this._props.items.find(item => item.controller.status === 2)?.controller.disappear();
+          this._props.items
+            .find((item) => item.controller.status === 2)
+            ?.controller.disappear();
           this._props.items[index].controller.appear();
           events.changed?.(this, index);
         },
         doubleTapped: (cview, index) => {
           events.doubleTapped?.(this, index);
-        }
-      }
+        },
+      },
     });
 
     this.pages = this._props.items.map((n, i) => {
       return new ContentView({
         props: {
           bgcolor: n.bgcolor || this._props.bgcolor,
-          hidden: i !== this._props.index
+          hidden: i !== this._props.index,
         },
         layout: $layout.fill,
-        views: [n.controller.rootView.definition]
+        views: [n.controller.rootView.definition],
       });
     });
     this.cviews.pageContentView = new ContentView({
       props: {
-        bgcolor: $color("clear")
+        bgcolor: $color("clear"),
       },
       layout: $layout.fill,
-      views: this.pages.map(n => n.definition)
+      views: this.pages.map((n) => n.definition),
     });
-    this.rootView.views = [this.cviews.pageContentView, this.cviews.tabbar]
+    this.rootView.views = [this.cviews.pageContentView, this.cviews.tabbar];
   }
 
   set index(num) {

package/dist/components/alert/input-alert.js

@@ -15,7 +15,7 @@ const l10n_1 = require("../../utils/l10n");
  * @param cancelText 取消按钮文字
  * @param confirmText 确认按钮文字
  */
-function inputAlert({ title = "", message = "", text = "", placeholder, type = 0, secure = false, cancelText = (0, l10n_1.l10n)("CANCEL"), confirmText = (0, l10n_1.l10n)("OK") }) {
+function inputAlert({ title = "", message = "", text = "", placeholder, type = 0, secure = false, cancelText = (0, l10n_1.l10n)("CANCEL"), confirmText = (0, l10n_1.l10n)("OK"), }) {
     return new Promise((resolve, reject) => {
         const alertVC = new uialert_1.UIAlertController(title, message, uialert_1.UIAlertControllerStyle.Alert);
         alertVC.addTextField({
@@ -28,8 +28,8 @@ function inputAlert({ title = "", message = "", text = "", placeholder, type = 0
                     const input = alertVC.getText(0);
                     const isValid = input.length > 0;
                     return isValid;
-                }
-            }
+                },
+            },
         });
         alertVC.addAction(new uialert_1.UIAlertAction(cancelText, uialert_1.UIAlertActionStyle.Destructive, cancelEvent));
         alertVC.addAction(new uialert_1.UIAlertAction(confirmText, uialert_1.UIAlertActionStyle.Default, confirmEvent));

package/dist/components/alert/login-alert.js

@@ -13,11 +13,11 @@ const l10n_1 = require("../../utils/l10n");
  * @param cancelText 取消按钮文字
  * @param confirmText 确认按钮文字
  */
-function loginAlert({ title = "", message = "", placeholder1 = "", placeholder2 = "", cancelText = (0, l10n_1.l10n)("CANCEL"), confirmText = (0, l10n_1.l10n)("OK") } = {}) {
+function loginAlert({ title = "", message = "", placeholder1 = "", placeholder2 = "", cancelText = (0, l10n_1.l10n)("CANCEL"), confirmText = (0, l10n_1.l10n)("OK"), } = {}) {
     return new Promise((resolve, reject) => {
         const alertVC = new uialert_1.UIAlertController(title, message, uialert_1.UIAlertControllerStyle.Alert);
         alertVC.addTextField({
-            placeholder: placeholder1
+            placeholder: placeholder1,
         });
         alertVC.addTextField({
             placeholder: placeholder2,
@@ -28,8 +28,8 @@ function loginAlert({ title = "", message = "", placeholder1 = "", placeholder2
                     const password = alertVC.getText(1);
                     const isValid = username.length > 0 && password.length > 0;
                     return isValid;
-                }
-            }
+                },
+            },
         });
         alertVC.addAction(new uialert_1.UIAlertAction(cancelText, uialert_1.UIAlertActionStyle.Destructive, cancelEvent));
         alertVC.addAction(new uialert_1.UIAlertAction(confirmText, uialert_1.UIAlertActionStyle.Default, confirmEvent));
@@ -39,7 +39,7 @@ function loginAlert({ title = "", message = "", placeholder1 = "", placeholder2
             const password = alertVC.getText(1);
             resolve({
                 username,
-                password
+                password,
             });
         }
         function cancelEvent() {

package/dist/components/alert/plain-alert.js

@@ -12,7 +12,7 @@ const l10n_1 = require("../../utils/l10n");
  * @param confirmText 确认按钮文字
  * @returns Promise
  */
-function plainAlert({ title = "", message = "", cancelText = (0, l10n_1.l10n)("CANCEL"), confirmText = (0, l10n_1.l10n)("OK") } = {}) {
+function plainAlert({ title = "", message = "", cancelText = (0, l10n_1.l10n)("CANCEL"), confirmText = (0, l10n_1.l10n)("OK"), } = {}) {
     return new Promise((resolve, reject) => {
         const alertVC = new uialert_1.UIAlertController(title, message, uialert_1.UIAlertControllerStyle.Alert);
         alertVC.addAction(new uialert_1.UIAlertAction(cancelText, uialert_1.UIAlertActionStyle.Destructive, cancelEvent));