jsbox-cview 1.6.7 → 1.6.8

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

@@ -20,7 +20,7 @@ const single_views_1 = require("../single-views");
 class DialogSheet extends sheet_1.Sheet {
     constructor(props) {
         super({
-            presentMode: props.presentMode || ($device.isIpad ? 2 : 1),
+            presentMode: props.presentMode ?? ($device.isIpad ? 2 : 1),
             bgcolor: props.bgcolor,
         });
         this._props = props;

package/dist/components/pageviewer.js

@@ -89,13 +89,22 @@ class PageViewer extends base_1.Base {
         return this._props.page;
     }
     set page(page) {
-        this._props.page = page;
-        if (this.scroll.view.contentOffset.x !== page * this._pageWidth)
+        if (this.scroll.view.contentOffset.x !== page * this._pageWidth) {
             this.scroll.view.contentOffset = $point(page * this._pageWidth, 0);
+        }
+        if (this._props.page !== page) {
+            this._props.page = page;
+            if (this._events.changed)
+                this._events.changed(this, page);
+        }
     }
     scrollToPage(page) {
         this.scroll.view.scrollToOffset($point(page * this._pageWidth, 0));
-        this._props.page = page;
+        if (this._props.page !== page) {
+            this._props.page = page;
+            if (this._events.changed)
+                this._events.changed(this, page);
+        }
     }
 }
 exports.PageViewer = PageViewer;

package/dist/controller/base-controller.d.ts

@@ -1,21 +1,5 @@
 import { Base } from "../components/base";
 import { ContentView } from "../components/single-views";
-/**
- * status
- *   - created = 0 被创建，未被加载
- *   - loaded = 1 被加载，显示状态未知
- *   - appeared= 2 处于可显示状态
- *   - disappeared = 3 处于不显示状态
- *   - removed = 4 根视图被移除
- * 其中只有 2 和 3 可以相互转化，其他不可以
- */
-export declare const controllerStatus: {
-    created: number;
-    loaded: number;
-    appeared: number;
-    disappeared: number;
-    removed: number;
-};
 export declare class ControllerRootView extends ContentView {
     constructor({ props, layout, events, }: {
         props: {
@@ -33,7 +17,6 @@ export interface BaseControllerProps {
     bgcolor?: UIColor;
 }
 export interface BaseControllerEvents {
-    didCreate?: (controller: BaseController) => void;
     didLoad?: (controller: BaseController) => void;
     didAppear?: (controller: BaseController) => void;
     didDisappear?: (controller: BaseController) => void;

package/dist/controller/base-controller.js

@@ -1,26 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseController = exports.ControllerRootView = exports.controllerStatus = void 0;
+exports.BaseController = exports.ControllerRootView = void 0;
 const base_1 = require("../components/base");
 const single_views_1 = require("../components/single-views");
 const cvid_1 = require("../utils/cvid");
 const controller_router_1 = require("./controller-router");
-/**
- * status
- *   - created = 0 被创建，未被加载
- *   - loaded = 1 被加载，显示状态未知
- *   - appeared= 2 处于可显示状态
- *   - disappeared = 3 处于不显示状态
- *   - removed = 4 根视图被移除
- * 其中只有 2 和 3 可以相互转化，其他不可以
- */
-exports.controllerStatus = {
-    created: 0,
-    loaded: 1,
-    appeared: 2,
-    disappeared: 3,
-    removed: 4,
-};
+const controller_status_1 = require("./controller-status");
 class ControllerRootView extends single_views_1.ContentView {
     constructor({ props, layout, events, }) {
         super({ props, layout, events });
@@ -102,7 +87,7 @@ class BaseController {
         this._props = props || {};
         this._events = events;
         this.id = this._props.id || cvid_1.cvid.newId;
-        this._status = exports.controllerStatus.created; // status使用额外的get来使其只读
+        this._status = controller_status_1.controllerStatus.created; // status使用额外的get来使其只读
         this.rootView = new ControllerRootView({
             props: {
                 bgcolor: this._props.bgcolor || $color("primarySurface"),
@@ -116,38 +101,38 @@ class BaseController {
     }
     load() {
         // 只有status为created才可以运行
-        if (this._status !== exports.controllerStatus.created)
+        if (this._status !== controller_status_1.controllerStatus.created)
             return;
-        this._status = exports.controllerStatus.loaded;
+        this._status = controller_status_1.controllerStatus.loaded;
         if (this._events.didLoad)
             this._events.didLoad(this);
         controller_router_1.router.add(this);
     }
     appear() {
         // 只有status为loaded或者disappeared，才可以运行
-        if (this._status !== exports.controllerStatus.loaded && this._status !== exports.controllerStatus.disappeared)
+        if (this._status !== controller_status_1.controllerStatus.loaded && this._status !== controller_status_1.controllerStatus.disappeared)
             return;
         if (this._events.didAppear)
             this._events.didAppear(this);
-        this._status = exports.controllerStatus.appeared;
+        this._status = controller_status_1.controllerStatus.appeared;
     }
     disappear() {
         // 只有status为loaded或者appeared，才可以运行
-        if (this._status !== exports.controllerStatus.loaded && this._status !== exports.controllerStatus.appeared)
+        if (this._status !== controller_status_1.controllerStatus.loaded && this._status !== controller_status_1.controllerStatus.appeared)
             return;
         if (this._events.didDisappear)
             this._events.didDisappear(this);
-        this._status = exports.controllerStatus.disappeared;
+        this._status = controller_status_1.controllerStatus.disappeared;
     }
     // 此方法不能用于移除rootView，其作用是将控制器从Router中移除，并触发didRemove事件
     remove() {
         // 如果已经移除，不可以再次运行
-        if (this._status === exports.controllerStatus.removed)
+        if (this._status === controller_status_1.controllerStatus.removed)
             return;
         if (this._events.didRemove)
             this._events.didRemove(this);
         controller_router_1.router.delete(this);
-        this._status = exports.controllerStatus.removed;
+        this._status = controller_status_1.controllerStatus.removed;
     }
     uirender(props) {
         controller_router_1.router.root = this;

package/dist/controller/controller-router.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.router = void 0;
+const controller_status_1 = require("./controller-status");
 /**
  * 控制器的路由器，用于管理控制器的集合和操作。
  *
@@ -52,7 +53,7 @@ class Router {
     get appeared() {
         const appearedControllers = [];
         for (const c of this._set) {
-            if (c.status === 2)
+            if (c.status === controller_status_1.controllerStatus.appeared)
                 appearedControllers.push(c);
         }
         return appearedControllers;

package/dist/controller/controller-status.d.ts

@@ -0,0 +1,16 @@
+/**
+ * status
+ *   - created = 0 被创建，未被加载
+ *   - loaded = 1 被加载，显示状态未知
+ *   - appeared= 2 处于可显示状态
+ *   - disappeared = 3 处于不显示状态
+ *   - removed = 4 根视图被移除
+ * 其中只有 2 和 3 可以相互转化，其他不可以
+ */
+export declare const controllerStatus: {
+    readonly created: 0;
+    readonly loaded: 1;
+    readonly appeared: 2;
+    readonly disappeared: 3;
+    readonly removed: 4;
+};

package/dist/controller/controller-status.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.controllerStatus = void 0;
+/**
+ * status
+ *   - created = 0 被创建，未被加载
+ *   - loaded = 1 被加载，显示状态未知
+ *   - appeared= 2 处于可显示状态
+ *   - disappeared = 3 处于不显示状态
+ *   - removed = 4 根视图被移除
+ * 其中只有 2 和 3 可以相互转化，其他不可以
+ */
+exports.controllerStatus = {
+    created: 0,
+    loaded: 1,
+    appeared: 2,
+    disappeared: 3,
+    removed: 4,
+};

package/dist/controller/pageviewer-controller.js

@@ -5,6 +5,7 @@ const base_controller_1 = require("./base-controller");
 const pageviewer_1 = require("../components/pageviewer");
 const pageviewer_titlebar_1 = require("../components/pageviewer-titlebar");
 const custom_navigation_bar_1 = require("../components/custom-navigation-bar");
+const controller_status_1 = require("./controller-status");
 /**
  * # CView PageViewer Controller
  *
@@ -23,7 +24,20 @@ class PageViewerController extends base_controller_1.BaseController {
                 bgcolor: props.bgcolor,
             },
             layout,
-            events,
+            events: {
+                didLoad: events.didLoad,
+                didAppear: (controller) => {
+                    props.items[this.index].controller.appear();
+                    events.didAppear?.(controller);
+                },
+                didDisappear: (controller) => {
+                    props.items.forEach((item) => item.controller.disappear());
+                    events.didDisappear?.(controller);
+                },
+                didRemove: (controller) => {
+                    events.didRemove?.(controller);
+                },
+            },
         });
         this._props = props;
         this.cviews = {};
@@ -37,13 +51,28 @@ class PageViewerController extends base_controller_1.BaseController {
                 make.top.equalTo(view.prev.bottom);
             },
             events: {
-                floatPageChanged: (cview, floatPage) => (this.cviews.titlebar.floatedIndex = floatPage),
+                floatPageChanged: (cview, floatPage) => {
+                    this.cviews.titlebar.floatedIndex = floatPage;
+                },
+                changed: (cview, page) => {
+                    this._props.index = page;
+                    if (this.status !== controller_status_1.controllerStatus.appeared)
+                        return;
+                    this._props.items.forEach((item, i) => {
+                        if (i === page) {
+                            item.controller.appear();
+                        }
+                        else {
+                            item.controller.disappear();
+                        }
+                    });
+                },
             },
         });
         this.cviews.titlebar = new pageviewer_titlebar_1.PageViewerTitleBar({
             props: {
                 items: this._props.items.map((n) => n.title),
-                index: this._props.index || 0,
+                index: this._props.index ?? 0,
             },
             layout: $layout.fill,
             events: {

package/dist/controller/splitview-controller.js

@@ -5,6 +5,7 @@ const base_controller_1 = require("./base-controller");
 const base_1 = require("../components/base");
 const single_views_1 = require("../components/single-views");
 const cvid_1 = require("../utils/cvid");
+const controller_status_1 = require("./controller-status");
 class SecondaryView extends base_1.Base {
     constructor({ props, layout, views = [], }) {
         super();
@@ -207,13 +208,13 @@ class SplitViewController extends base_controller_1.BaseController {
         this.rootView.views = [this.cviews.secondaryView, this.cviews.primaryView];
     }
     load() {
-        if (this.status !== base_controller_1.controllerStatus.created)
+        if (this.status !== controller_status_1.controllerStatus.created)
             return;
         super.load();
         this._renewScreenEdgePanGesture();
     }
     remove() {
-        if (this.status === base_controller_1.controllerStatus.removed)
+        if (this.status === controller_status_1.controllerStatus.removed)
             return;
         $objc_release(this._screenEdgePanGestureObject);
         this.cviews.maskView.releaseGestureObject();

package/dist/controller/tabbar-controller.js

@@ -4,6 +4,7 @@ exports.TabBarController = void 0;
 const base_controller_1 = require("./base-controller");
 const single_views_1 = require("../components/single-views");
 const tabbar_1 = require("../components/tabbar");
+const controller_status_1 = require("./controller-status");
 /**
  * # CView TabBar Controller
  *
@@ -86,7 +87,7 @@ class TabBarController extends base_controller_1.BaseController {
             n.view.hidden = i !== num;
         });
         this._props.index = num;
-        this._props.items.find((item) => item.controller.status === 2)?.controller.disappear();
+        this._props.items.find((item) => item.controller.status === controller_status_1.controllerStatus.appeared)?.controller.disappear();
         this._props.items[num].controller.appear();
     }
     get index() {

package/dist/index.d.ts

@@ -21,6 +21,7 @@ export * from "./components/single-views";
 export * from "./components/static-preference-listview";
 export * from "./components/symbol-button";
 export * from "./components/tabbar";
+export * from "./controller/controller-status";
 export * from "./controller/base-controller";
 export * from "./controller/controller-router";
 export * from "./controller/pageviewer-controller";

package/dist/index.js

@@ -37,6 +37,7 @@ __exportStar(require("./components/single-views"), exports);
 __exportStar(require("./components/static-preference-listview"), exports);
 __exportStar(require("./components/symbol-button"), exports);
 __exportStar(require("./components/tabbar"), exports);
+__exportStar(require("./controller/controller-status"), exports);
 __exportStar(require("./controller/base-controller"), exports);
 __exportStar(require("./controller/controller-router"), exports);
 __exportStar(require("./controller/pageviewer-controller"), exports);

package/package.json

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