jsbox-cview 1.5.28 → 1.5.30

package/components/dynamic-contextmenu-view.ts

@@ -47,7 +47,7 @@ export class DynamicContextMenuView extends Base<
       title?: string;
       items: MenuItem[];
     };
-    props: UiTypes.BaseViewProps;
+    props: UiTypes.ViewProps;
     layout?: (make: MASConstraintMaker, view: UIView) => void;
     events?: UiTypes.BaseViewEvents;
     views?: UiTypes.AllViewOptions[];

package/components/flowlayout.ts

@@ -41,7 +41,7 @@ export class Flowlayout<T extends FlowlayoutItem> extends Base<
     itemHeight: number;
     fixedRows?: number;
     fixedHeight?: boolean;
-    menu?: UiTypes.ContextMenuOptions;
+    menu?: UiTypes.ContextMenuOptions<UIView>;
     bgcolor?: UIColor;
   };
   private _wrappers: WrapperView<T>[];
@@ -62,7 +62,7 @@ export class Flowlayout<T extends FlowlayoutItem> extends Base<
       itemHeight: number;
       fixedRows?: number;
       fixedHeight?: boolean;
-      menu?: UiTypes.ContextMenuOptions;
+      menu?: UiTypes.ContextMenuOptions<UIView>;
       bgcolor?: UIColor;
     };
     layout: (make: MASConstraintMaker, view: UIView) => void;
@@ -207,7 +207,7 @@ class WrapperView<T extends FlowlayoutItem> extends Base<
     index,
   }: {
     item: T;
-    menu?: UiTypes.ContextMenuOptions;
+    menu?: UiTypes.ContextMenuOptions<UIView>;
     didSelect?: (sender: Flowlayout<T>, index: number, item: T) => void;
     didLongPress?: (sender: Flowlayout<T>, index: number, item: T) => void;
     flowlayout: Flowlayout<T>;
@@ -215,7 +215,7 @@ class WrapperView<T extends FlowlayoutItem> extends Base<
   }) {
     super();
     this.item = item;
-    const props: UiTypes.BaseViewProps = {
+    const props: UiTypes.ViewProps = {
       id: this.id,
       frame: $rect(0, 0, 0, 0),
       userInteractionEnabled: true,

package/components/single-views.ts

@@ -54,7 +54,7 @@ export class SingleView<
 export class ClearView extends SingleView<
   "view",
   UIView,
-  UiTypes.BaseViewProps,
+  UiTypes.ViewProps,
   UiTypes.BaseViewEvents<UIView>,
   UiTypes.ViewOptions
 > {
@@ -64,7 +64,7 @@ export class ClearView extends SingleView<
     events,
     views,
   }: {
-    props?: UiTypes.BaseViewProps;
+    props?: UiTypes.ViewProps;
     layout?: (make: MASConstraintMaker, view: UIView) => void;
     events?: UiTypes.BaseViewEvents<UIView>;
     views?: UiTypes.AllViewOptions[];
@@ -82,7 +82,7 @@ export class ClearView extends SingleView<
 export class ContentView extends SingleView<
   "view",
   UIView,
-  UiTypes.BaseViewProps,
+  UiTypes.ViewProps,
   UiTypes.BaseViewEvents<UIView>,
   UiTypes.ViewOptions
 > {
@@ -92,7 +92,7 @@ export class ContentView extends SingleView<
     events = {},
     views,
   }: {
-    props?: UiTypes.BaseViewProps;
+    props?: UiTypes.ViewProps;
     layout?: (make: MASConstraintMaker, view: UIView) => void;
     events?: UiTypes.BaseViewEvents;
     views?: UiTypes.AllViewOptions[];
@@ -116,7 +116,7 @@ export class ContentView extends SingleView<
 export class MaskView extends SingleView<
   "view",
   UIView,
-  UiTypes.BaseViewProps,
+  UiTypes.ViewProps,
   UiTypes.BaseViewEvents<UIView>,
   UiTypes.ViewOptions
 > {
@@ -126,7 +126,7 @@ export class MaskView extends SingleView<
     events,
     views,
   }: {
-    props?: UiTypes.BaseViewProps;
+    props?: UiTypes.ViewProps;
     layout?: (make: MASConstraintMaker, view: UIView) => void;
     events?: UiTypes.BaseViewEvents;
     views?: UiTypes.AllViewOptions[];
@@ -820,7 +820,7 @@ export class Picker extends SingleView<
 export class Canvas extends SingleView<
   "canvas",
   UICanvasView,
-  UiTypes.BaseViewProps,
+  UiTypes.CanvasProps,
   UiTypes.CanvasEvents,
   UiTypes.CanvasOptions
 > {
@@ -830,7 +830,7 @@ export class Canvas extends SingleView<
     events,
     views,
   }: {
-    props?: UiTypes.BaseViewProps;
+    props?: UiTypes.CanvasProps;
     layout?: (make: MASConstraintMaker, view: UICanvasView) => void;
     events?: UiTypes.CanvasEvents;
     views?: UiTypes.AllViewOptions[];

package/components/symbol-button.ts

@@ -8,7 +8,7 @@ interface SymbolButtonProps {
   tintColor: UIColor;
   contentMode: number;
   insets: JBInsets;
-  menu?: UiTypes.ContextMenuOptions;
+  menu?: UiTypes.ContextMenuOptions<UIButtonView>;
   hidden: boolean;
 }
 

package/controller/splitview-controller.ts

@@ -8,7 +8,7 @@ import { ContentView } from "../components/single-views";
 import { cvid } from "../utils/cvid";
 
 class SecondaryView extends Base<UIView, UiTypes.ViewOptions> {
-  _props: UiTypes.BaseViewProps;
+  _props: UiTypes.ViewProps;
   _layouts: {
     hidden: (make: MASConstraintMaker, view: AllUIView) => void;
     shown: (make: MASConstraintMaker, view: AllUIView) => void;
@@ -20,7 +20,7 @@ class SecondaryView extends Base<UIView, UiTypes.ViewOptions> {
     layout,
     views = [],
   }: {
-    props?: UiTypes.BaseViewProps;
+    props?: UiTypes.ViewProps;
     layout?: (make: MASConstraintMaker, view: UIView) => void;
     views?: UiTypes.AllViewOptions[];
   }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsbox-cview",
-  "version": "1.5.28",
+  "version": "1.5.30",
   "description": "为 JSBox 设计的微型框架",
   "repository": {
     "type": "git",
@@ -19,6 +19,6 @@
   "devDependencies": {
     "@types/node": "^20.11.17",
     "browserify": "^17.0.0",
-    "jsbox-types": "^1.0.42"
+    "jsbox-types": "^1.0.46"
   }
 }