jsbox-cview 1.6.6 → 1.6.7

package/dist/controller/base-controller.js

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

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

@@ -0,0 +1,48 @@
+import { BaseController } from "./base-controller";
+/**
+ * 控制器的路由器，用于管理控制器的集合和操作。
+ *
+ * ## 属性
+ * - `root`：根控制器。
+ * - `appeared`：状态为appeared的控制器列表。
+ * - `controllerSet`：控制器集合。
+ *
+ * ## 方法
+ * - `add(controller: BaseController)`：添加控制器到路由器中。
+ * - `delete(controller: BaseController)`：从路由器中删除控制器。
+ * - `get(id: string)`：根据控制器的ID获取控制器。
+ *
+ */
+declare class Router {
+    private _set;
+    root?: BaseController;
+    constructor();
+    /**
+     * 添加控制器到路由器中。
+     * @param controller 要添加的控制器。
+     */
+    add(controller: BaseController): void;
+    /**
+     * 从路由器中删除控制器。
+     * @param controller 要删除的控制器。
+     */
+    delete(controller: BaseController): void;
+    /**
+     * 根据控制器的ID获取控制器。
+     * @param id 控制器的ID。
+     * @returns 匹配的控制器，如果找不到则返回undefined。
+     */
+    get(id: string): BaseController | undefined;
+    /**
+     * 获取状态为appeared的控制器集合。
+     * @returns 控制器集合。
+     */
+    get appeared(): BaseController[];
+    /**
+     * 获取控制器集合。
+     * @returns 控制器集合。
+     */
+    get controllerSet(): Set<BaseController>;
+}
+export declare const router: Router;
+export {};

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

@@ -0,0 +1,38 @@
+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";
+interface PageViewerControllerProps extends BaseControllerProps {
+    items: {
+        controller: BaseController;
+        title: string;
+    }[];
+    navBarProps?: Partial<NavigationBarProps>;
+    index?: number;
+}
+/**
+ * # CView PageViewer Controller
+ *
+ * 一个可以左右滑动翻页的控制器。
+ *
+ * Props:
+ *
+ * - items: { controller: Controller, title: string }[]
+ * - navBarProps: {} 可用于 navBar 的其他属性，不包括 title 和 titleView
+ */
+export declare class PageViewerController extends BaseController {
+    protected _props: PageViewerControllerProps;
+    cviews: {
+        pageviewer: PageViewer;
+        titlebar: PageViewerTitleBar;
+        navbar: CustomNavigationBar;
+    };
+    constructor({ props, layout, events, }: {
+        props: PageViewerControllerProps;
+        layout?: (make: MASConstraintMaker, view: UIView) => void;
+        events?: BaseControllerEvents;
+    });
+    get index(): number;
+    set index(num: number);
+}
+export {};

package/dist/controller/presented-page-controller.d.ts

@@ -0,0 +1,41 @@
+import { BaseController, BaseControllerProps, BaseControllerEvents } from "./base-controller";
+interface PresentedPageControllerProps extends BaseControllerProps {
+    presentMode?: number;
+    animated?: boolean;
+    interactiveDismissalDisabled?: boolean;
+}
+interface PresentedPageControllerEvents extends BaseControllerEvents {
+    dismissed?: (controller: PresentedPageController) => void;
+}
+/** # CView PresentedPageController
+ *
+ * ## Props
+ *
+ * - presentMode?: number = 1
+ * - animated?: boolean = true
+ * - interactiveDismissalDisabled?: boolean = false
+ * - bgcolor?: UIColor = $color("secondarySurface")
+ *
+ * ## 专用事件
+ *
+ * - dismissed: function  退出时的回调
+ *
+ * ## 专用方法
+ *
+ * - present() 在 `sheet.present()` 之后会先后执行 `load()` 和 `appear()`
+ * - dismiss()
+ *
+ * ## 布局
+ * 此控制器的 layout 必定为 `$layout.fill`，无需自行设定
+ */
+export declare class PresentedPageController extends BaseController {
+    private _sheet;
+    constructor({ props, layout, events, }?: {
+        props?: Partial<PresentedPageControllerProps>;
+        layout?: (make: MASConstraintMaker, view: UIView) => void;
+        events?: PresentedPageControllerEvents;
+    });
+    present(): void;
+    dismiss(): void;
+}
+export {};

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

@@ -0,0 +1,90 @@
+import { BaseController, BaseControllerProps, BaseControllerEvents } from "./base-controller";
+import { Base } from "../components/base";
+import { ContentView } from "../components/single-views";
+declare class SecondaryView extends Base<UIView, UiTypes.ViewOptions> {
+    _props: UiTypes.ViewProps;
+    _layouts: {
+        hidden: (make: MASConstraintMaker, view: AllUIView) => void;
+        shown: (make: MASConstraintMaker, view: AllUIView) => void;
+    };
+    line: ContentView;
+    _defineView: () => UiTypes.ViewOptions;
+    constructor({ props, layout, views, }: {
+        props?: UiTypes.ViewProps;
+        layout?: (make: MASConstraintMaker, view: UIView) => void;
+        views?: UiTypes.AllViewOptions[];
+    });
+    add(view: UiTypes.AllViewOptions | Base<any, any>): void;
+    show(): void;
+    hide(): void;
+}
+declare class MaskView extends Base<UIView, UiTypes.ViewOptions> {
+    _props: {
+        bgcolor: UIColor;
+        dismissHandler?: () => void;
+    };
+    _shown: boolean;
+    _dismissEvent: () => void;
+    _gestureObject: any;
+    _defineView: () => UiTypes.ViewOptions;
+    constructor({ props, layout, }: {
+        props: {
+            bgcolor?: UIColor;
+            dismissHandler?: () => void;
+        };
+        layout?: (make: MASConstraintMaker, view: UIView) => void;
+    });
+    _addGesture(view: UIView, event: () => void): void;
+    releaseGestureObject(): void;
+    show(): void;
+    hide(): void;
+}
+interface SplitViewControllerProps extends BaseControllerProps {
+    items: {
+        controller: BaseController;
+        bgcolor: UIColor;
+    }[];
+}
+/** # CView SplitView Controller
+ *
+ * 实现左右分栏布局的控制器, 本身不提供除了分割线以外的视觉效果
+ *
+ * 此控制器加载后，会禁用原本的ScreenEdgePanGesture，此控制器应该作为根控制器使用
+ *
+ * @param options.props.items: { controller: Controller, bgcolor: UIColor }[]
+ *  其中第一个放在主视图上, 第二个放在次视图上
+ *
+ * @property sideBarShown: boolean = false 侧栏是否显示
+ * @property canShowSidebar: boolean = true 是否启动显示侧栏的动作
+ *  （若为false，依然可以用sideBarShown来控制侧栏的显示）
+ */
+export declare class SplitViewController extends BaseController {
+    private _screenEdgePanGestureObject;
+    private _sideBarShown;
+    private _canShowSidebar;
+    private _primaryController;
+    private _secondaryController;
+    cviews: {
+        primaryView: ContentView;
+        secondaryView: SecondaryView;
+        maskView: MaskView;
+    };
+    constructor({ props, layout, events, }: {
+        props: SplitViewControllerProps;
+        layout?: (make: MASConstraintMaker, view: UIView) => void;
+        events?: BaseControllerEvents;
+    });
+    load(): void;
+    remove(): void;
+    uirender(): void;
+    uipush(): void;
+    _defineGestureObject(event: () => void): any;
+    _renewScreenEdgePanGesture(): void;
+    _showSideBar(): void;
+    _hideSideBar(): void;
+    get sideBarShown(): boolean;
+    set sideBarShown(bool: boolean);
+    get canShowSidebar(): boolean;
+    set canShowSidebar(bool: boolean);
+}
+export {};

package/dist/controller/splitview-controller.js

@@ -207,10 +207,14 @@ 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)
+            return;
         super.load();
         this._renewScreenEdgePanGesture();
     }
     remove() {
+        if (this.status === base_controller_1.controllerStatus.removed)
+            return;
         $objc_release(this._screenEdgePanGestureObject);
         this.cviews.maskView.releaseGestureObject();
         super.remove();

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

@@ -0,0 +1,49 @@
+import { BaseController, BaseControllerProps, BaseControllerEvents } from "./base-controller";
+import { ContentView } from "../components/single-views";
+import { TabBar } from "../components/tabbar";
+interface TabBarControllerProps extends BaseControllerProps {
+    items: {
+        title?: string;
+        symbol?: string;
+        image?: UIImage;
+        tintColor?: UIColor;
+        bgcolor?: UIColor;
+        controller: BaseController;
+    }[];
+    index?: number;
+}
+interface TabBarControllerEvents extends BaseControllerEvents {
+    changed?: (controller: TabBarController, index: number) => void;
+    doubleTapped?: (controller: TabBarController, index: number) => void;
+}
+/**
+ * # CView TabBar Controller
+ *
+ * TabBarController 是一个 PagingController
+ *
+ * ## 属性
+ *
+ * - items: {title?: string,
+ *           symbol?: string,
+ *           image?: UIImage,
+ *           tintColor?: UIColor,
+ *           bgcolor?: UIColor,
+ *           controller: Controller}[]
+ * - index: number = 0
+ */
+export declare class TabBarController extends BaseController {
+    _props: TabBarControllerProps;
+    cviews: {
+        tabbar: TabBar;
+        pageContentView: ContentView;
+    };
+    pages: ContentView[];
+    constructor({ props, layout, events, }: {
+        props: TabBarControllerProps;
+        layout?: (make: MASConstraintMaker, view: UIView) => void;
+        events?: TabBarControllerEvents;
+    });
+    set index(num: number);
+    get index(): number;
+}
+export {};

package/dist/controller/tabbar-controller.js

@@ -52,8 +52,6 @@ class TabBarController extends base_controller_1.BaseController {
             events: {
                 changed: (cview, index) => {
                     this.index = index;
-                    this._props.items.find((item) => item.controller.status === 2)?.controller.disappear();
-                    this._props.items[index].controller.appear();
                     events.changed?.(this, index);
                 },
                 doubleTapped: (cview, index) => {

package/{index.ts → dist/index.d.ts}

@@ -1,3 +1,4 @@
+/// <reference types="jsbox-types" preserve="true" />
 export * from "./components/base";
 export * from "./components/custom-navigation-bar";
 export * from "./components/dynamic-contextmenu-view";

package/dist/index.js

@@ -1,4 +1,5 @@
 "use strict";
+/// <reference types="jsbox-types" preserve="true" />
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);

package/dist/utils/colors.d.ts

@@ -0,0 +1,7 @@
+export declare const sheetNavBarColor: UIColor;
+export declare const footBarDefaultSegmentColor: UIColor;
+export declare const searchBarSymbolColor: UIColor;
+export declare const searchBarBgcolor: UIColor;
+export declare const gold: UIColor;
+export declare const sectionHeaderColor: UIColor;
+export declare const sliderMaxColor: UIColor;

package/dist/utils/cvid.d.ts

@@ -0,0 +1,11 @@
+declare class CVID {
+    _prefix: string;
+    _index: number;
+    constructor({ prefix, startIndex }?: {
+        prefix?: string | undefined;
+        startIndex?: number | undefined;
+    });
+    get newId(): string;
+}
+export declare const cvid: CVID;
+export {};

package/dist/utils/l10n.d.ts

@@ -0,0 +1 @@
+export declare function l10n(key: string): string;

package/dist/utils/path.d.ts

@@ -0,0 +1,8 @@
+export declare function split(path: string): [string, string];
+export declare function dirname(path: string): string;
+export declare function basename(path: string): string;
+export declare function extname(path: string): string;
+export declare function join(...args: string[]): string;
+export declare function getCreationDate(path: string): number;
+export declare function getModificationDate(path: string): number;
+export declare function getFileSize(path: string): number;

package/dist/utils/rect.d.ts

@@ -0,0 +1,38 @@
+/**
+ * When called without arguments, return the center of the rectangle.
+ * When a Point is passed as an argument, the rectangle’s x and y values
+ * are adjusted, so that the new center of the rectangle is p.
+ */
+export declare function center(rect: JBRect, point?: JBPoint): JBPoint;
+/**
+ * Return true if the given point lies within the bounds of the rectangle,
+ * false otherwise.
+ */
+export declare function containsPoint(rect: JBRect, point: JBPoint): boolean;
+/**
+ * Return true if the given rectangle lies entirely within the bounds of
+ * this rectangle, false otherwise.
+ */
+export declare function containsRect(rect: JBRect, otherRect: JBRect): boolean;
+/**
+ * Return true if this rectangle intersects with the other rectangle,
+ * false otherwise.
+ */
+export declare function intersects(rect: JBRect, otherRect: JBRect): boolean;
+/**
+ * Return a $rect that corresponds to the intersection of this rectangle with
+ * the other one.
+ */
+export declare function intersection(rect: JBRect, otherRect: JBRect): JBRect;
+/**
+ * Return the smallest $rect that encloses both rectangles.
+ */
+export declare function union(rect: JBRect, otherRect: JBRect): JBRect;
+/**
+ * Equivalent to $rect(r.x + x, r.y + y, r.w, r.h)
+ */
+export declare function translate(rect: JBRect, point: JBPoint): JBRect;
+/**
+ * Return a $rect that is adjusted by the given edge insets.
+ */
+export declare function inset(rect: JBRect, insets: JBInsets): JBRect;

package/dist/utils/uitools.d.ts

@@ -0,0 +1,75 @@
+/**
+ * 立即获得window size
+ */
+export declare function getWindowSize(): JBSize;
+/**
+ * 获取单行字符串应有的宽度
+ * 默认额外添加3 inset
+ */
+export declare function getTextWidth(text: string, { font, inset }?: {
+    font?: UIFont | undefined;
+    inset?: number | undefined;
+}): number;
+/**
+ * 获取字符串指定宽度后应有的高度
+ * 默认额外添加3 inset
+ */
+export declare function getTextHeight(text: string, { width, font, inset, lineSpacing }?: {
+    width?: number | undefined;
+    font?: UIFont | undefined;
+    inset?: number | undefined;
+    lineSpacing?: number | undefined;
+}): number;
+/**
+ * 计算某个view在某个上级view（若不指定则为UIWindow）上的绝对frame
+ * 此方法不考虑旋转变形等特殊情况
+ */
+export declare function absoluteFrame(view: AllUIView, endView?: AllUIView): JBRect;
+export declare const layerCommonOptions: {
+    none: {
+        cornerRadius: number;
+        shadowRadius: number;
+        shadowOpacity: number;
+        shadowOffset: JBSize;
+        shadowColor: UIColor;
+    };
+    roundedShadow: {
+        cornerRadius: number;
+        shadowRadius: number;
+        shadowOpacity: number;
+        shadowOffset: JBSize;
+        shadowColor: UIColor;
+    };
+    textShadow: {
+        cornerRadius: number;
+        shadowRadius: number;
+        shadowOpacity: number;
+        shadowOffset: JBSize;
+        shadowColor: UIColor;
+    };
+    circleViewShadow: {
+        cornerRadius: number;
+        shadowRadius: number;
+        shadowOpacity: number;
+        shadowOffset: JBSize;
+        shadowColor: UIColor;
+    };
+    toastShadows: {
+        cornerRadius: number;
+        shadowRadius: number;
+        shadowOpacity: number;
+        shadowOffset: JBSize;
+        shadowColor: UIColor;
+    };
+};
+/**
+ * 在layout中使用
+ * 所应用的view不可以指定radius和clipTobounds，否则无效
+ */
+export declare function setLayer(view: AllUIView, { cornerRadius, shadowRadius, shadowOpacity, shadowOffset, shadowColor, }?: {
+    cornerRadius?: number | undefined;
+    shadowRadius?: number | undefined;
+    shadowOpacity?: number | undefined;
+    shadowOffset?: JBSize | undefined;
+    shadowColor?: UIColor | undefined;
+}): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsbox-cview",
-  "version": "1.6.6",
+  "version": "1.6.7",
   "description": "为 JSBox 设计的微型框架",
   "repository": {
     "type": "git",
@@ -9,18 +9,32 @@
   "homepage": "https://github.com/Gandum2077/JSBox-CView",
   "bugs": "https://github.com/Gandum2077/JSBox-CView/issues",
   "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist/index.js",
+    "dist/index.d.ts",
+    "dist/components",
+    "dist/controller",
+    "dist/utils",
+    "README.md",
+    "LICENSE"
+  ],
   "scripts": {
-    "build:debug": "tsc && npx browserify ${npm_config_entry:-./dist/index.js} > test.js",
-    "build": "tsc",
-    "format": "prettier --write ."
+    "build:debug": "tsc --outDir ./dist-debug && npx browserify ${npm_config_entry:-./dist-debug/index.js} > test.js",
+    "build": "tsc -p tsconfig.build.json",
+    "format": "prettier --write .",
+    "prepack": "npm run build"
   },
   "keywords": [],
   "author": "Gandum2077",
   "license": "MIT",
+  "dependencies": {
+    "jsbox-types": "^2.0.3"
+  },
   "devDependencies": {
     "@types/node": "^20.11.17",
     "browserify": "^17.0.1",
-    "jsbox-types": "^2.0.3",
-    "prettier": "^3.8.1"
+    "prettier": "^3.8.1",
+    "typescript": "^6.0.3"
   }
 }

package/.prettierignore

@@ -1,6 +0,0 @@
-node_modules
-dist
-build
-coverage
-package-lock.json
-tsconfig.json

package/.prettierrc

@@ -1,3 +0,0 @@
-{
-  "printWidth": 120
-}

package/components/alert/input-alert.ts

@@ -1,64 +0,0 @@
-import { UIAlertActionStyle, UIAlertControllerStyle, UIAlertAction, UIAlertController } from "./uialert";
-
-import { l10n } from "../../utils/l10n";
-
-/**
- * 显示一个输入框提示
- *
- * @param title 标题
- * @param message 内容
- * @param text 输入框默认文字
- * @param placeholder 输入框占位符
- * @param type 输入框类型
- * @param secure 是否安全输入
- * @param cancelText 取消按钮文字
- * @param confirmText 确认按钮文字
- */
-export function inputAlert({
-  title = "",
-  message = "",
-  text = "",
-  placeholder,
-  type = 0,
-  secure = false,
-  cancelText = l10n("CANCEL"),
-  confirmText = l10n("OK"),
-}: {
-  title?: string;
-  message?: string;
-  text?: string;
-  placeholder?: string;
-  type?: number;
-  secure?: boolean;
-  cancelText?: string;
-  confirmText?: string;
-}): Promise<string> {
-  return new Promise((resolve, reject) => {
-    const alertVC = new UIAlertController(title, message, UIAlertControllerStyle.Alert);
-    alertVC.addTextField({
-      placeholder,
-      text,
-      type,
-      secure,
-      events: {
-        shouldReturn: () => {
-          const input = alertVC.getText(0);
-          const isValid = input.length > 0;
-          return isValid;
-        },
-      },
-    });
-
-    alertVC.addAction(new UIAlertAction(cancelText, UIAlertActionStyle.Destructive, cancelEvent));
-    alertVC.addAction(new UIAlertAction(confirmText, UIAlertActionStyle.Default, confirmEvent));
-    alertVC.present();
-
-    function confirmEvent() {
-      const input: string = alertVC.getText(0);
-      resolve(input);
-    }
-    function cancelEvent() {
-      reject("cancel");
-    }
-  });
-}