jsbox-cview 1.6.0 → 1.6.2

package/components/static-preference-listview.ts

@@ -161,13 +161,7 @@ export const selectableTypes = [
   "action",
 ];
 
-export const excludedTypes = [
-  "info",
-  "interactive-info",
-  "link",
-  "symbol-action",
-  "action",
-];
+export const excludedTypes = ["info", "interactive-info", "link", "symbol-action", "action"];
 
 type PreferenceValues = { [key: string]: any };
 
@@ -210,7 +204,7 @@ abstract class Cell extends Base<UIView, UiTypes.ViewOptions> {
       titleColor?: UIColor;
       changedEvent?: () => void;
     },
-    values: PreferenceValues
+    values: PreferenceValues,
   ) {
     super();
     this._key = key;
@@ -276,10 +270,7 @@ abstract class BaseStringCell extends Cell {
   abstract _type: string;
   _placeholder?: string;
   _textColor?: UIColor;
-  constructor(
-    props: PrefsRowString | PrefsRowNumber | PrefsRowInteger,
-    values: PreferenceValues
-  ) {
+  constructor(props: PrefsRowString | PrefsRowNumber | PrefsRowInteger, values: PreferenceValues) {
     super(props, values);
     const { placeholder, textColor } = props;
     this._placeholder = placeholder;
@@ -514,14 +505,7 @@ class SliderCell extends Cell {
   _thumbColor?: UIColor;
   constructor(props: PrefsRowSlider, values: PreferenceValues) {
     super(props, values);
-    const {
-      decimal = 1,
-      min = 0,
-      max = 1,
-      minColor = $color("systemLink"),
-      maxColor,
-      thumbColor,
-    } = props;
+    const { decimal = 1, min = 0, max = 1, minColor = $color("systemLink"), maxColor, thumbColor } = props;
     this._decimal = decimal;
     this._min = min;
     this._max = max;
@@ -565,9 +549,7 @@ class SliderCell extends Cell {
           },
           events: {
             changed: (sender) => {
-              const adjustedValue = parseFloat(
-                sender.value.toFixed(this._decimal)
-              );
+              const adjustedValue = parseFloat(sender.value.toFixed(this._decimal));
               const label = sender.prev as UILabelView;
               label.text = adjustedValue.toString();
               if (this._key) {
@@ -576,9 +558,7 @@ class SliderCell extends Cell {
               }
             },
             touchesEnded: (sender) => {
-              const adjustedValue = parseFloat(
-                sender.value.toFixed(this._decimal)
-              );
+              const adjustedValue = parseFloat(sender.value.toFixed(this._decimal));
               this.value = adjustedValue;
               if (this._changedEvent) this._changedEvent();
             },

package/components/tabbar.ts

@@ -94,9 +94,7 @@ class ImageLabelCell extends Base<UIView, UiTypes.ViewOptions> {
 
   set selected(selected) {
     this._props.selected = selected;
-    const color = selected
-      ? this._props.selectedSegmentTintColor
-      : this._props.defaultSegmentTintColor;
+    const color = selected ? this._props.selectedSegmentTintColor : this._props.defaultSegmentTintColor;
     this.view.get("image").tintColor = color;
     const label = this.view.get("label") as UILabelView;
     label.textColor = color;
@@ -192,9 +190,7 @@ class ImageCell extends Base<UIView, UiTypes.ViewOptions> {
 
   set selected(selected) {
     this._props.selected = selected;
-    const color = selected
-      ? this._props.selectedSegmentTintColor
-      : this._props.defaultSegmentTintColor;
+    const color = selected ? this._props.selectedSegmentTintColor : this._props.defaultSegmentTintColor;
     this.view.get("image").tintColor = color;
   }
 
@@ -235,10 +231,7 @@ class ImageCell extends Base<UIView, UiTypes.ViewOptions> {
  * - hide(animated=true) 隐藏
  * - show(animated=true) 显示
  */
-export class TabBar extends Base<
-  UIView | UIBlurView,
-  UiTypes.ViewOptions | UiTypes.BlurOptions
-> {
+export class TabBar extends Base<UIView | UIBlurView, UiTypes.ViewOptions | UiTypes.BlurOptions> {
   _props: {
     height: number;
     items: { symbol?: string; image?: UIImage; title?: string }[];
@@ -319,9 +312,7 @@ export class TabBar extends Base<
           },
           layout: (make, view) => {
             make.left.right.bottom.inset(0);
-            make.top
-              .equalTo(view.super.safeAreaBottom)
-              .inset(-this._props.height);
+            make.top.equalTo(view.super.safeAreaBottom).inset(-this._props.height);
           },
           views: [line, stack],
           events: {
@@ -345,9 +336,7 @@ export class TabBar extends Base<
           },
           layout: (make, view) => {
             make.left.right.bottom.inset(0);
-            make.top
-              .equalTo(view.super.safeAreaBottom)
-              .inset(-this._props.height);
+            make.top.equalTo(view.super.safeAreaBottom).inset(-this._props.height);
           },
           views: [line, stack],
           events: {
@@ -384,8 +373,7 @@ export class TabBar extends Base<
                 this.index = index;
                 if (this._events.changed) this._events.changed(this, index);
               } else {
-                if (this._events.doubleTapped)
-                  this._events.doubleTapped(this, index);
+                if (this._events.doubleTapped) this._events.doubleTapped(this, index);
               }
             },
           },
@@ -405,8 +393,7 @@ export class TabBar extends Base<
                 this.index = index;
                 if (this._events.changed) this._events.changed(this, index);
               } else {
-                if (this._events.doubleTapped)
-                  this._events.doubleTapped(this, index);
+                if (this._events.doubleTapped) this._events.doubleTapped(this, index);
               }
             },
           },

package/controller/base-controller.ts

@@ -162,22 +162,14 @@ export class BaseController {
 
   appear() {
     // 只有status为loaded或者disappeared，才可以运行
-    if (
-      this._status !== controllerStatus.loaded &&
-      this._status !== controllerStatus.disappeared
-    )
-      return;
+    if (this._status !== controllerStatus.loaded && this._status !== controllerStatus.disappeared) return;
     if (this._events.didAppear) this._events.didAppear(this);
     this._status = controllerStatus.appeared;
   }
 
   disappear() {
     // 只有status为loaded或者appeared，才可以运行
-    if (
-      this._status !== controllerStatus.loaded &&
-      this._status !== controllerStatus.appeared
-    )
-      return;
+    if (this._status !== controllerStatus.loaded && this._status !== controllerStatus.appeared) return;
     if (this._events.didDisappear) this._events.didDisappear(this);
     this._status = controllerStatus.disappeared;
   }

package/controller/pageviewer-controller.ts

@@ -1,14 +1,7 @@
-import {
-  BaseController,
-  BaseControllerProps,
-  BaseControllerEvents,
-} 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 }[];
@@ -66,8 +59,7 @@ export class PageViewerController extends BaseController {
         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({

package/controller/presented-page-controller.ts

@@ -1,9 +1,4 @@
-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 {
@@ -59,8 +54,7 @@ export class PresentedPageController extends BaseController {
     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: () => {

package/controller/splitview-controller.ts

@@ -1,8 +1,4 @@
-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";
@@ -148,9 +144,7 @@ class MaskView extends Base<UIView, UiTypes.ViewOptions> {
       .$alloc()
       .$initWithTarget_action(object, "swipeEvent");
     swipeGestureRecognizer.$setDirection(1 << 1); // 从右向左划动
-    const tapGestureRecognizer = $objc("UITapGestureRecognizer")
-      .$alloc()
-      .$initWithTarget_action(object, "tapEvent");
+    const tapGestureRecognizer = $objc("UITapGestureRecognizer").$alloc().$initWithTarget_action(object, "tapEvent");
     view.ocValue().$addGestureRecognizer(tapGestureRecognizer);
     view.ocValue().$addGestureRecognizer(swipeGestureRecognizer);
   }
@@ -265,10 +259,7 @@ export class SplitViewController extends BaseController {
         make.left.equalTo(view.prev.right);
         make.width.equalTo(view.super);
       },
-      views: [
-        props.items[0].controller.rootView.definition,
-        this.cviews.maskView.definition,
-      ],
+      views: [props.items[0].controller.rootView.definition, this.cviews.maskView.definition],
     });
     this._screenEdgePanGestureObject = this._defineGestureObject(() => {
       if (!this.sideBarShown && this._canShowSidebar) this.sideBarShown = true;
@@ -317,24 +308,14 @@ export class SplitViewController extends BaseController {
   }
 
   _renewScreenEdgePanGesture() {
-    const UIScreenEdgePanGestureRecognizer = $ui.controller.view
-      .ocValue()
-      .$gestureRecognizers()
-      .$firstObject();
+    const UIScreenEdgePanGestureRecognizer = $ui.controller.view.ocValue().$gestureRecognizers().$firstObject();
 
     UIScreenEdgePanGestureRecognizer.invoke("removeTarget:action:", null, null);
-    const NewUIScreenEdgePanGestureRecognizer = $objc(
-      "UIScreenEdgePanGestureRecognizer"
-    )
+    const NewUIScreenEdgePanGestureRecognizer = $objc("UIScreenEdgePanGestureRecognizer")
       .$alloc()
-      .$initWithTarget_action(
-        this._screenEdgePanGestureObject,
-        "screenEdgePanEvent"
-      );
+      .$initWithTarget_action(this._screenEdgePanGestureObject, "screenEdgePanEvent");
     NewUIScreenEdgePanGestureRecognizer.$setEdges(1 << 1);
-    this.rootView.view
-      .ocValue()
-      .$addGestureRecognizer(NewUIScreenEdgePanGestureRecognizer);
+    this.rootView.view.ocValue().$addGestureRecognizer(NewUIScreenEdgePanGestureRecognizer);
   }
 
   _showSideBar() {

package/controller/tabbar-controller.ts

@@ -1,8 +1,4 @@
-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";
 
@@ -88,9 +84,7 @@ export class TabBarController extends BaseController {
       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);
         },
@@ -127,9 +121,7 @@ export class TabBarController extends 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 === 2)?.controller.disappear();
     this._props.items[num].controller.appear();
   }
 

package/dist/index.js

@@ -23,6 +23,7 @@ __exportStar(require("./components/dynamic-rowheight-list"), exports);
 __exportStar(require("./components/enhanced-imageview"), exports);
 __exportStar(require("./components/flowlayout"), exports);
 __exportStar(require("./components/image-pager"), exports);
+__exportStar(require("./components/oc-webview"), exports);
 __exportStar(require("./components/page-control"), exports);
 __exportStar(require("./components/pageviewer-titlebar"), exports);
 __exportStar(require("./components/pageviewer"), exports);

package/index.ts

@@ -7,6 +7,7 @@ export * from "./components/dynamic-rowheight-list";
 export * from "./components/enhanced-imageview";
 export * from "./components/flowlayout";
 export * from "./components/image-pager";
+export * from "./components/oc-webview";
 export * from "./components/page-control";
 export * from "./components/pageviewer-titlebar";
 export * from "./components/pageviewer";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsbox-cview",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "为 JSBox 设计的微型框架",
   "repository": {
     "type": "git",
@@ -19,6 +19,7 @@
   "devDependencies": {
     "@types/node": "^20.11.17",
     "browserify": "^17.0.1",
-    "jsbox-types": "^1.0.46"
+    "jsbox-types": "^2.0.0",
+    "prettier": "^3.8.1"
   }
 }

package/test/dynamic-itemsize-matrix.ts

@@ -55,13 +55,8 @@ const matrix = new DynamicItemSizeMatrix({
     didScroll: (sender) => {
       matrix.columns;
       console.log(sender.contentOffset.y);
-      console.log(
-        Math.ceil(sender.contentOffset.y / (matrix.itemSize.height + 5))
-      );
-      console.log(
-        Math.ceil(sender.contentOffset.y / (matrix.itemSize.height + 5)) *
-          matrix.columns
-      );
+      console.log(Math.ceil(sender.contentOffset.y / (matrix.itemSize.height + 5)));
+      console.log(Math.ceil(sender.contentOffset.y / (matrix.itemSize.height + 5)) * matrix.columns);
     },
   },
 });

package/test/flowlayout.ts

@@ -21,11 +21,7 @@ class FlowlayoutItem extends Label {
 
 const flowlayout = new Flowlayout({
   props: {
-    items: [
-      new FlowlayoutItem("Hello"),
-      new FlowlayoutItem("World"),
-      new FlowlayoutItem("Flowlayout"),
-    ],
+    items: [new FlowlayoutItem("Hello"), new FlowlayoutItem("World"), new FlowlayoutItem("Flowlayout")],
     spacing: 10,
     itemHeight: 30,
     fixedRows: 2,
@@ -68,15 +64,11 @@ $ui.render({
             new FlowlayoutItem("New Item"),
             new FlowlayoutItem("Hello"),
             new FlowlayoutItem("World"),
-            new FlowlayoutItem(
-              "FlowlayoutFlowlayoutFlowlayoutFlowlayoutFlowlayoutFlowlayout"
-            ),
+            new FlowlayoutItem("FlowlayoutFlowlayoutFlowlayoutFlowlayoutFlowlayoutFlowlayout"),
             new FlowlayoutItem("New Item"),
             new FlowlayoutItem("Hello"),
             new FlowlayoutItem("World"),
-            new FlowlayoutItem(
-              "FlowlayoutFlowlayoutFlowlayoutFlowlayoutFlowlayoutFlowlayoutFlowlayoutFlowlayout"
-            ),
+            new FlowlayoutItem("FlowlayoutFlowlayoutFlowlayoutFlowlayoutFlowlayoutFlowlayoutFlowlayoutFlowlayout"),
             new FlowlayoutItem("New Item"),
           ];
         },

package/test/static-preference-listview.ts

@@ -1,7 +1,4 @@
-import {
-  PreferenceListView,
-  PreferenceSection,
-} from "../components/static-preference-listview";
+import { PreferenceListView, PreferenceSection } from "../components/static-preference-listview";
 const sections: PreferenceSection[] = [
   {
     title: "Section 1",

package/tsconfig.json

@@ -107,8 +107,7 @@
     "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
   },
   "include": [
-    "node_modules/jsbox-types/*.d.ts",
-    "node_modules/jsbox-types/*/*.d.ts",
+    "node_modules/jsbox-types/index.d.ts",
     "test.ts",
     "index.ts",
     "utils/*.ts",

package/utils/cvid.ts

@@ -5,8 +5,7 @@
  */
 function makeid(length: number) {
   let result = "";
-  const characters =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+  const characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
   var charactersLength = characters.length;
   for (let i = 0; i < length; i++) {
     result += characters.charAt(Math.floor(Math.random() * charactersLength));

package/utils/path.ts

@@ -29,10 +29,7 @@ export function split(path: string): [string, string] {
   } else if (lastIndex === 0) {
     return [protocol + "/", remainingPath.slice(1)];
   } else {
-    return [
-      protocol + remainingPath.slice(0, lastIndex),
-      remainingPath.slice(lastIndex + 1),
-    ];
+    return [protocol + remainingPath.slice(0, lastIndex), remainingPath.slice(lastIndex + 1)];
   }
 }
 

package/utils/uitools.ts

@@ -12,10 +12,7 @@ export function getWindowSize(): JBSize {
  * 获取单行字符串应有的宽度
  * 默认额外添加3 inset
  */
-export function getTextWidth(
-  text: string,
-  { font = $font(17), inset = 3 } = {}
-): number {
+export function getTextWidth(text: string, { font = $font(17), inset = 3 } = {}): number {
   return (
     Math.ceil(
       $text.sizeThatFits({
@@ -23,7 +20,7 @@ export function getTextWidth(
         width: 10000,
         font,
         lineSpacing: 0,
-      }).width
+      }).width,
     ) + inset
   );
 }
@@ -34,7 +31,7 @@ export function getTextWidth(
  */
 export function getTextHeight(
   text: string,
-  { width = 300, font = $font(17), inset = 3, lineSpacing = 0 } = {}
+  { width = 300, font = $font(17), inset = 3, lineSpacing = 0 } = {},
 ): number {
   return (
     Math.ceil(
@@ -43,7 +40,7 @@ export function getTextHeight(
         width,
         font,
         lineSpacing,
-      }).height
+      }).height,
     ) + inset
   );
 }
@@ -114,7 +111,7 @@ export function setLayer(
     shadowOpacity = 0,
     shadowOffset = $size(0, 0),
     shadowColor = $color("clear"),
-  } = {}
+  } = {},
 ): void {
   const layer = view.ocValue().invoke("layer");
   layer.invoke("setCornerRadius", cornerRadius);