fluekit 2.7.0 → 2.7.1

package/dist/Fixed.d.ts

@@ -1,4 +1,4 @@
-import { Props } from './usePosition';
+import { PositionProps } from './usePosition';
 declare function __VLS_template(): {
     attrs: Partial<{}>;
     slots: {
@@ -8,7 +8,7 @@ declare function __VLS_template(): {
     rootEl: any;
 };
 type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
-declare const __VLS_component: import('vue').DefineComponent<Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<Props> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>;
+declare const __VLS_component: import('vue').DefineComponent<PositionProps, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<PositionProps> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
 export default _default;
 type __VLS_WithTemplateSlots<T, S> = T & {

package/dist/Modal.d.ts

@@ -1,12 +1,15 @@
 import { Alignment } from './Alignment';
 interface Props {
-    visible: boolean;
     barrierDismissible?: boolean;
     barrierColor?: string;
     alignment?: Alignment;
     zIndex?: number;
-    transition?: string;
 }
+declare const visible: import('vue').ModelRef<boolean, string, boolean, boolean>;
+type __VLS_Props = Props;
+type __VLS_PublicProps = {
+    "visible"?: typeof visible['value'];
+} & __VLS_Props;
 declare function __VLS_template(): {
     attrs: Partial<{}>;
     slots: {
@@ -16,16 +19,15 @@ declare function __VLS_template(): {
     rootEl: any;
 };
 type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
-declare const __VLS_component: import('vue').DefineComponent<Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {} & {
-    close: () => any;
+declare const __VLS_component: import('vue').DefineComponent<__VLS_PublicProps, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     "update:visible": (value: boolean) => any;
-}, string, import('vue').PublicProps, Readonly<Props> & Readonly<{
+} & {
+    close: () => any;
+}, string, import('vue').PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
     onClose?: (() => any) | undefined;
     "onUpdate:visible"?: ((value: boolean) => any) | undefined;
 }>, {
     alignment: Alignment;
-    visible: boolean;
-    transition: string;
     zIndex: number;
     barrierDismissible: boolean;
     barrierColor: string;

package/dist/Positioned.d.ts

@@ -1,4 +1,4 @@
-import { Props } from './usePosition';
+import { PositionProps } from './usePosition';
 declare function __VLS_template(): {
     attrs: Partial<{}>;
     slots: {
@@ -8,7 +8,7 @@ declare function __VLS_template(): {
     rootEl: any;
 };
 type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
-declare const __VLS_component: import('vue').DefineComponent<Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<Props> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>;
+declare const __VLS_component: import('vue').DefineComponent<PositionProps, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<PositionProps> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
 export default _default;
 type __VLS_WithTemplateSlots<T, S> = T & {

package/dist/Sticky.d.ts

@@ -1,4 +1,4 @@
-import { Props } from './usePosition';
+import { PositionProps } from './usePosition';
 declare function __VLS_template(): {
     attrs: Partial<{}>;
     slots: {
@@ -8,7 +8,7 @@ declare function __VLS_template(): {
     rootEl: any;
 };
 type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
-declare const __VLS_component: import('vue').DefineComponent<Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<Props> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>;
+declare const __VLS_component: import('vue').DefineComponent<PositionProps, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<PositionProps> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
 export default _default;
 type __VLS_WithTemplateSlots<T, S> = T & {

package/dist/index.js

@@ -2451,45 +2451,46 @@ var CupertinoActivityIndicator_default = /* @__PURE__ */ defineComponent({
 }), Modal_default = /* @__PURE__ */ defineComponent({
 	inheritAttrs: !1,
 	__name: "Modal",
-	props: {
-		visible: {
-			type: Boolean,
-			default: !1
-		},
+	props: /* @__PURE__ */ mergeModels({
 		barrierDismissible: {
 			type: Boolean,
 			default: !0
 		},
 		barrierColor: { default: "rgba(0, 0, 0, 0.5)" },
 		alignment: { default: Alignment.center },
-		zIndex: { default: 1e3 },
-		transition: { default: "fluekit-modal-fade" }
-	},
-	emits: ["update:visible", "close"],
+		zIndex: { default: () => useZIndex() }
+	}, {
+		visible: {
+			type: Boolean,
+			default: !1
+		},
+		visibleModifiers: {}
+	}),
+	emits: /* @__PURE__ */ mergeModels(["close"], ["update:visible"]),
 	setup(e, { emit: i }) {
-		let a = e, s = i, c = () => {
-			s("update:visible", !1), s("close");
-		}, l = () => {
-			a.barrierDismissible && c();
-		}, u = (e, r) => {
-			let i = e;
-			i.animate([{ opacity: 0 }, { opacity: 1 }], {
+		let a = useModel(e, "visible"), s = e, c = i, l = () => {
+			a.value = !1, c("close");
+		}, u = () => {
+			s.barrierDismissible && l();
+		}, m = (e, r) => {
+			let i = e.animate([{ opacity: 0 }, { opacity: 1 }], {
 				duration: 300,
 				easing: "ease"
-			}).onfinish = r;
-		}, m = (e, r) => {
-			let i = e;
-			i.animate([{ opacity: 1 }, { opacity: 0 }], {
+			});
+			i.onfinish = r;
+		}, g = (e, r) => {
+			let i = e.animate([{ opacity: 1 }, { opacity: 0 }], {
 				duration: 300,
 				easing: "ease"
-			}).onfinish = r;
+			});
+			i.onfinish = r;
 		};
-		return (i, a) => (openBlock(), createElementBlock(Fragment, null, [createVNode(Transition, {
+		return (i, s) => (openBlock(), createElementBlock(Fragment, null, [createVNode(Transition, {
 			css: !1,
-			onEnter: u,
-			onLeave: m
+			onEnter: m,
+			onLeave: g
 		}, {
-			default: withCtx(() => [e.visible ? (openBlock(), createBlock(Fixed_default, {
+			default: withCtx(() => [a.value ? (openBlock(), createBlock(Fixed_default, {
 				key: 0,
 				"z-index": e.zIndex,
 				top: 0,
@@ -2509,9 +2510,9 @@ var CupertinoActivityIndicator_default = /* @__PURE__ */ defineComponent({
 			}, 8, ["z-index"])) : createCommentVNode("", !0)]),
 			_: 3
 		}), createVNode(Overlay_default, {
-			visible: e.visible,
+			visible: a.value,
 			position: "fixed",
-			onTap: l,
+			onTap: u,
 			"z-index": e.zIndex - 1
 		}, null, 8, ["visible", "z-index"])], 64));
 	}
@@ -3337,8 +3338,10 @@ var _hoisted_1$8 = { style: {
 	],
 	setup(e, { expose: a, emit: s }) {
 		let c = e, u = computed(() => c.actions.length == 2 ? "row" : "column"), g = computed(() => {
+			if (isMacOS) return "16px";
+			if (isIPad || isIOS) return "12px";
 			let e = C.size.width;
-			return isMacOS ? "16PX" : isIPad ? "12PX" : isIOS ? "8PX" : e >= 1024 ? "16PX" : e >= 600 ? "12PX" : "8PX";
+			return e >= 1024 || e >= 600 ? "12px" : "8px";
 		}), y = s, b = () => {
 			y("update:modelValue", !1), y("close");
 		};
@@ -3372,10 +3375,10 @@ var _hoisted_1$8 = { style: {
 			});
 		}), T = computed(() => {
 			let e = C.size.width, r;
-			return r = isMacOS || isIOS || isIPad ? 13 : e >= 1024 ? 16 : e >= 600 ? 15 : 13, TextStyle({
+			return r = isMacOS || isIOS || isIPad ? 14 : e >= 1024 ? 16 : e >= 600 ? 15 : 13, TextStyle({
 				fontSize: r + "PX",
 				fontWeight: 600,
-				height: `${1.35 * r}PX`,
+				height: `${1.35 * r}px`,
 				letterSpacing: "-0.4PX",
 				color: C.platformBrightness === "dark" ? "#a1a1a6" : "#6b6b6b"
 			});
@@ -3392,8 +3395,8 @@ var _hoisted_1$8 = { style: {
 			}
 			let a = C.size.width, o, s = "12PX", c = "16PX";
 			if (isMacOS) o = 14, s = "10PX", c = "14PX";
-			else if (isIPad) o = 17, s = "14PX", c = "20PX";
-			else if (isIOS) o = 17, s = "12PX", c = "16PX";
+			else if (isIPad) o = 15, s = "14PX", c = "20PX";
+			else if (isIOS) o = 15, s = "12PX", c = "16PX";
 			else {
 				let e = u.value == "row" ? 15 : 16;
 				o = a >= 1024 ? e + 3 : a >= 600 ? e + 2 : e, s = a >= 1024 ? "14PX" : a >= 600 ? "13PX" : "12PX", c = a >= 1024 ? "20PX" : a >= 600 ? "18PX" : "16PX";
@@ -3409,7 +3412,7 @@ var _hoisted_1$8 = { style: {
 				}),
 				textStyle: TextStyle({
 					fontSize: o + "PX",
-					height: `${1.4 * o}PX`,
+					height: `${1.35 * o}PX`,
 					color: i,
 					fontWeight: l
 				}),
@@ -3457,8 +3460,26 @@ var _hoisted_1$8 = { style: {
 			}
 		});
 		let O = useZIndex(), k = computed(() => {
-			let e = C.size.width, r = "40px 20px";
-			return isIOS ? r = "40px 20px" : isIPad ? r = "80px 32px" : isMacOS ? r = "64px 32px" : e >= 600 && e < 1024 ? r = "64px 24px" : e >= 1024 && (r = "80px 32px"), {
+			let e = C.size.width, r = {};
+			return r = paddingToStyle(isIOS ? {
+				vertical: 40,
+				horizontal: 20
+			} : isIPad ? {
+				vertical: 80,
+				horizontal: 32
+			} : isMacOS ? {
+				vertical: 64,
+				horizontal: 32
+			} : e >= 600 && e < 1024 ? {
+				vertical: 64,
+				horizontal: 24
+			} : e >= 1024 ? {
+				vertical: 80,
+				horizontal: 32
+			} : {
+				vertical: 40,
+				horizontal: 20
+			}), {
 				position: "fixed",
 				inset: 0,
 				zIndex: O,
@@ -3469,16 +3490,16 @@ var _hoisted_1$8 = { style: {
 				justifyContent: "center",
 				background: "rgba(0, 0, 0, 0.25)",
 				backdropFilter: "blur(3px)",
-				padding: r,
+				...r,
 				width: "100%",
 				height: "100%"
 			};
 		}), A = computed(() => {
 			let e = C.size.width, r = "400px", i = "32px";
-			return isIOS ? (r = "400px", i = "32px") : isIPad ? (r = "560px", i = "36px") : isMacOS ? (r = "520px", i = "24px") : e >= 600 && e < 1024 ? (r = "560px", i = "32px") : e >= 1024 && (r = "640px", i = "28px"), {
+			return isIOS ? (r = "400px", i = "32px") : isIPad ? (r = "560px", i = "36px") : isMacOS ? (r = "520px", i = "24px") : e >= 600 && e < 1024 ? (r = "560px", i = "32px") : e >= 1024 ? (r = "640px", i = "28px") : (r = "400px", i = "32px"), {
 				position: "relative",
-				maxWidth: r,
-				borderRadius: i,
+				maxWidth: px2vw$1(r),
+				borderRadius: px2vw$1(i),
 				overflow: "hidden",
 				width: "100%",
 				animation: "liquid-glass-dialog-enter 0.35s cubic-bezier(0.32, 0.72, 0, 1)"

package/dist/usePosition.d.ts

@@ -1,7 +1,7 @@
 import { CSSProperties } from 'vue';
 import { SizeType } from './Size';
 export declare function useZIndex(): number;
-export interface Props {
+export interface PositionProps {
     /** 距离顶部的距离 */
     top?: number | string;
     /** 距离底部的距离 */
@@ -20,4 +20,4 @@ export interface Props {
     inset?: number | string;
     size?: SizeType;
 }
-export declare function usePositionStyle(props: Props, position?: "absolute" | "fixed" | "sticky" | "relative"): import('vue').ComputedRef<CSSProperties>;
+export declare function usePositionStyle(props: PositionProps, position?: "absolute" | "fixed" | "sticky" | "relative"): import('vue').ComputedRef<CSSProperties>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fluekit",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "description": "A Flutter-style Layout UI kit for Vue",
   "homepage": "https://fi2zz.github.io/fluekit/",
   "repository": {