sard 1.0.8 → 1.0.9

package/components/back-top/back-top.d.ts

@@ -5,9 +5,9 @@ declare const __VLS_base: import("vue").DefineComponent<BackTopProps, {}, {}, {}
 }, string, import("vue").PublicProps, Readonly<BackTopProps> & Readonly<{
     onClick?: ((event: MouseEvent) => any) | undefined;
 }>, {
+    scrollTop: number;
     right: string;
     bottom: string;
-    scrollTop: number;
     visibleHeight: number;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/components/infinite-list/index.css

@@ -1 +1 @@
-.s-infinite-list{display:flex;flex-direction:column;overflow-x:hidden;overflow-y:auto}.s-infinite-list .s-pull-down-refresh{display:flex;flex-direction:column;min-height:100%}.s-infinite-list__load-more:is(.is-hidden){height:1px;overflow:hidden;visibility:hidden;pointer-events:none}
+.s-infinite-list .s-pull-down-refresh{min-height:100%}.s-infinite-list__load-more:is(.is-hidden){height:0;overflow:hidden;visibility:hidden;pointer-events:none}

package/components/infinite-list/infinite-list.js

@@ -2,6 +2,7 @@ import { createBem } from "../../utils/bem.js";
 import loading_default from "../loading/loading.js";
 import { useTranslateWithPrefix } from "../../locale/index.js";
 import { defaultInfiniteListProps } from "./common.js";
+import { useScrollParent } from "../../use/useScrollParent.js";
 import pull_down_refresh_default from "../pull-down-refresh/pull-down-refresh.js";
 import load_more_default from "../load-more/load-more.js";
 import { useLoadMore } from "../load-more/useLoadMore.js";
@@ -38,11 +39,6 @@ var infinite_list_default = /*@__PURE__*/ defineComponent({
 		const bem = createBem("infinite-list");
 		const { t } = useTranslateWithPrefix("pullDownRefresh");
 		const doneText = ref("");
-		const scrollRef = useTemplateRef("scroll");
-		const pullDownRefresh = useTemplateRef("pull-down-refresh");
-		const onScroll = () => {
-			pullDownRefresh.value?.enableToRefresh(scrollRef.value.scrollTop === 0);
-		};
 		const onRefresh = () => {
 			refresh().then(() => {
 				doneText.value = t("doneSuccess");
@@ -53,7 +49,7 @@ var infinite_list_default = /*@__PURE__*/ defineComponent({
 			});
 		};
 		const { status, isLoading, isRefreshing, onLoadMore, onReload, refresh } = useLoadMore({
-			root: scrollRef,
+			root: useScrollParent(useTemplateRef("scroll")),
 			target: useTemplateRef("load-more"),
 			rootMargin: () => props.rootMargin,
 			request: async (page, isRefresh) => {
@@ -64,10 +60,8 @@ var infinite_list_default = /*@__PURE__*/ defineComponent({
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock("div", {
 				ref: "scroll",
-				class: normalizeClass(unref(bem).b()),
-				onScroll
+				class: normalizeClass(unref(bem).b())
 			}, [createVNode(pull_down_refresh_default, {
-				ref: "pull-down-refresh",
 				loading: unref(isRefreshing),
 				disabled: !__props.refreshable || unref(isLoading),
 				"done-duration": __props.doneDuration,
@@ -118,7 +112,7 @@ var infinite_list_default = /*@__PURE__*/ defineComponent({
 				"loading",
 				"disabled",
 				"done-duration"
-			])], 34);
+			])], 2);
 		};
 	}
 });

package/components/load-more/useLoadMore.d.ts

@@ -6,7 +6,7 @@ import type { LoadMoreStatus } from './common';
 export interface UseLoadMoreOptions {
     request: (page: number, isRefresh: boolean) => Promise<boolean>;
     rootMargin?: MaybeRefOrGetter<string>;
-    root?: MaybeRefOrGetter<Element | Document | null>;
+    root?: MaybeRefOrGetter<Element | Document | Window | null | undefined>;
     target?: MaybeRefOrGetter<Element | null>;
     disabled?: MaybeRefOrGetter<boolean>;
 }

package/components/pull-down-refresh/common.d.ts

@@ -22,5 +22,4 @@ export interface PullDownRefreshEmits {
     (e: 'refresh'): void;
 }
 export interface PullDownRefreshExpose {
-    enableToRefresh: (canRefresh: boolean) => void;
 }

package/components/pull-down-refresh/index.css

@@ -1 +1 @@
-:root{--s-pull-down-refresh-header-font-size:var(--s-font-size-sm);--s-pull-down-refresh-header-color:var(--s-text-color-tertiary);--s-pull-down-refresh-loading-font-size:18px}.s-pull-down-refresh{transition-property:transform}.s-pull-down-refresh__header{position:absolute;top:0;left:0;width:100%;display:flex;justify-content:center;align-items:center;transform:translateY(-100%);font-size:var(--s-pull-down-refresh-header-font-size);color:var(--s-pull-down-refresh-header-color)}.s-pull-down-refresh__loading{font-size:var(--s-pull-down-refresh-loading-font-size)}
+:root{--s-pull-down-refresh-header-font-size:var(--s-font-size-sm);--s-pull-down-refresh-header-color:var(--s-text-color-tertiary);--s-pull-down-refresh-loading-font-size:18px}.s-pull-down-refresh{display:flex;flex-direction:column;overflow:hidden}.s-pull-down-refresh__gesture{min-height:100%;flex-grow:1;transition-property:transform}.s-pull-down-refresh__header{position:absolute;top:0;left:0;width:100%;display:flex;justify-content:center;align-items:center;transform:translateY(-100%);font-size:var(--s-pull-down-refresh-header-font-size);color:var(--s-pull-down-refresh-header-color)}.s-pull-down-refresh__loading{font-size:var(--s-pull-down-refresh-loading-font-size)}

package/components/pull-down-refresh/pull-down-refresh.js

@@ -1,9 +1,11 @@
 import { createBem } from "../../utils/bem.js";
+import { getScrollTop } from "../../utils/dom.js";
 import { useTimeout } from "../../use/useTimeout.js";
 import { usePointerDown } from "../../use/usePointerDown.js";
 import loading_default from "../loading/loading.js";
 import { defaultPullDownRefreshProps } from "./common.js";
-import { computed, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, mergeDefaults, normalizeClass, normalizeStyle, onMounted, openBlock, ref, renderSlot, unref, watch } from "vue";
+import { useScrollParent } from "../../use/useScrollParent.js";
+import { computed, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, mergeDefaults, normalizeClass, normalizeStyle, onMounted, openBlock, ref, renderSlot, unref, useTemplateRef, watch } from "vue";
 //#region packages/sard/components/pull-down-refresh/pull-down-refresh.vue
 var pull_down_refresh_default = /*@__PURE__*/ defineComponent({
 	__name: "pull-down-refresh",
@@ -38,6 +40,7 @@ var pull_down_refresh_default = /*@__PURE__*/ defineComponent({
 		const props = __props;
 		const emit = __emit;
 		const bem = createBem("pull-down-refresh");
+		const scrollParent = useScrollParent(useTemplateRef("root"));
 		const status = ref("initial");
 		const translateY = ref(0);
 		const progress = computed(() => {
@@ -76,8 +79,11 @@ var pull_down_refresh_default = /*@__PURE__*/ defineComponent({
 		let movable = false;
 		let lockDirection = "";
 		const isDragging = ref(false);
+		const checkScrollTop = () => {
+			return getScrollTop(scrollParent.value) === 0;
+		};
 		const onTouchStart = (event) => {
-			if (props.disabled || status.value !== "initial" || !canRefresh.value) return;
+			if (props.disabled || status.value !== "initial" || !checkScrollTop()) return;
 			startX = event.touches[0].clientX;
 			startY = event.touches[0].clientY;
 			movable = true;
@@ -111,10 +117,6 @@ var pull_down_refresh_default = /*@__PURE__*/ defineComponent({
 			}
 		};
 		const onPointerDown = usePointerDown(onTouchStart, onTouchMove, onTouchEnd);
-		const canRefresh = ref(true);
-		const enableToRefresh = (can) => {
-			canRefresh.value = can;
-		};
 		const pullDownRefreshStyle = computed(() => {
 			return {
 				transform: `translate3d(0,${translateY.value}px,0)`,
@@ -124,10 +126,13 @@ var pull_down_refresh_default = /*@__PURE__*/ defineComponent({
 		const headerStyle = computed(() => {
 			return { height: props.headerHeight + "px" };
 		});
-		__expose({ enableToRefresh });
+		__expose({});
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock("div", {
-				class: normalizeClass(unref(bem).b()),
+				ref: "root",
+				class: normalizeClass(unref(bem).b())
+			}, [createElementVNode("div", {
+				class: normalizeClass(unref(bem).e("gesture")),
 				style: normalizeStyle(pullDownRefreshStyle.value),
 				onTouchstart: onTouchStart,
 				onTouchmove: onTouchMove,
@@ -152,7 +157,7 @@ var pull_down_refresh_default = /*@__PURE__*/ defineComponent({
 			}, null, 8, ["class"])]) : status.value === "loading" ? renderSlot(_ctx.$slots, "loading", { key: 2 }, () => [createVNode(loading_default, {
 				type: "clock",
 				class: normalizeClass(unref(bem).e("loading"))
-			}, null, 8, ["class"])]) : status.value === "done" ? renderSlot(_ctx.$slots, "done", { key: 3 }) : createCommentVNode("v-if", true)], 6), renderSlot(_ctx.$slots, "default")], 38);
+			}, null, 8, ["class"])]) : status.value === "done" ? renderSlot(_ctx.$slots, "done", { key: 3 }) : createCommentVNode("v-if", true)], 6), renderSlot(_ctx.$slots, "default")], 38)], 2);
 		};
 	}
 });