@pisell/materials 1.0.987 → 1.0.988

package/lib/components/PisellScrollView/hooks/useScrollState.js

@@ -23,84 +23,183 @@ __export(useScrollState_exports, {
 });
 module.exports = __toCommonJS(useScrollState_exports);
 var import_react = require("react");
-var useScrollState = ({ containerRef, overflow }) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
-  const [scrollState, setScrollState] = (0, import_react.useState)({
+var debounce = (fn, delay) => {
+  let timeoutId = null;
+  return (...args) => {
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+    }
+    timeoutId = setTimeout(() => {
+      fn(...args);
+      timeoutId = null;
+    }, delay);
+  };
+};
+var useScrollState = ({
+  containerRef,
+  overflow
+}) => {
+  const [scrollState, setScrollState] = (0, import_react.useState)(() => ({
     scrollTop: 0,
     scrollLeft: 0,
     percentY: 0,
     percentX: 0,
-    scrollHeight: ((_a = containerRef.current) == null ? void 0 : _a.scrollHeight) || 0,
-    scrollWidth: ((_b = containerRef.current) == null ? void 0 : _b.scrollWidth) || 0,
-    clientHeight: ((_c = containerRef.current) == null ? void 0 : _c.clientHeight) || 0,
-    clientWidth: ((_d = containerRef.current) == null ? void 0 : _d.clientWidth) || 0,
+    scrollHeight: 0,
+    scrollWidth: 0,
+    clientHeight: 0,
+    clientWidth: 0,
     direction: null,
-    isScrollToTop: overflow === "y" ? true : false,
+    isScrollToTop: overflow === "y" || overflow === "both",
     isScrollToBottom: false,
-    isScrollToLeft: overflow === "x" ? true : false,
+    isScrollToLeft: overflow === "x" || overflow === "both",
     isScrollToRight: false,
     isOverflows: false
-  });
-  (0, import_react.useEffect)(() => {
-    if (!containerRef.current) {
-      return;
-    }
-    const { scrollHeight, clientHeight, scrollWidth, clientWidth } = containerRef.current;
-    const isOverflows = scrollHeight > clientHeight || scrollWidth > clientWidth;
+  }));
+  const isMountedRef = (0, import_react.useRef)(true);
+  const resizeObserverRef = (0, import_react.useRef)(null);
+  const calculateScrollState = (0, import_react.useCallback)(
+    (prevState = null) => {
+      const container = containerRef.current;
+      if (!container) return null;
+      try {
+        const {
+          scrollTop,
+          scrollLeft,
+          scrollHeight,
+          scrollWidth,
+          clientHeight,
+          clientWidth
+        } = container;
+        const isOverflows = scrollHeight > clientHeight || scrollWidth > clientWidth;
+        const isScrollToTop = scrollTop <= 0;
+        const isScrollToBottom = scrollTop + clientHeight >= scrollHeight - 1;
+        const isScrollToLeft = scrollLeft <= 0;
+        const isScrollToRight = scrollLeft + clientWidth >= scrollWidth - 1;
+        let direction = null;
+        if (prevState) {
+          const deltaY = Math.abs(scrollTop - prevState.scrollTop);
+          const deltaX = Math.abs(scrollLeft - prevState.scrollLeft);
+          if (deltaY > deltaX && deltaY > 0) {
+            direction = scrollTop > prevState.scrollTop ? "down" : "up";
+          } else if (deltaX > 0) {
+            direction = scrollLeft > prevState.scrollLeft ? "right" : "left";
+          } else {
+            direction = prevState.direction;
+          }
+        }
+        const maxScrollTop = Math.max(0, scrollHeight - clientHeight);
+        const maxScrollLeft = Math.max(0, scrollWidth - clientWidth);
+        const percentY = maxScrollTop > 0 ? scrollTop / maxScrollTop * 100 : 0;
+        const percentX = maxScrollLeft > 0 ? scrollLeft / maxScrollLeft * 100 : 0;
+        return {
+          scrollTop,
+          scrollLeft,
+          scrollHeight,
+          scrollWidth,
+          clientHeight,
+          clientWidth,
+          percentY,
+          percentX,
+          direction,
+          isScrollToTop,
+          isScrollToBottom,
+          isScrollToLeft,
+          isScrollToRight,
+          isOverflows
+        };
+      } catch (error) {
+        console.warn("[useScrollState] 计算滚动状态时出错:", error);
+        return null;
+      }
+    },
+    [containerRef]
+  );
+  const updateScrollState = (0, import_react.useCallback)(() => {
+    if (!isMountedRef.current) return;
     setScrollState((prev) => {
-      return {
-        ...prev,
-        isOverflows
-      };
+      const newState = calculateScrollState(prev);
+      return newState || prev;
     });
-  }, [(_e = containerRef.current) == null ? void 0 : _e.scrollWidth, (_f = containerRef.current) == null ? void 0 : _f.scrollHeight, (_g = containerRef.current) == null ? void 0 : _g.clientHeight, (_h = containerRef.current) == null ? void 0 : _h.clientWidth]);
-  const updateScrollState = (0, import_react.useCallback)(() => {
+  }, [calculateScrollState]);
+  const updateOverflowState = (0, import_react.useCallback)(() => {
+    if (!isMountedRef.current) return;
+    const newState = calculateScrollState(null);
+    if (newState) {
+      setScrollState((prev) => ({
+        ...prev,
+        scrollHeight: newState.scrollHeight,
+        scrollWidth: newState.scrollWidth,
+        clientHeight: newState.clientHeight,
+        clientWidth: newState.clientWidth,
+        isOverflows: newState.isOverflows,
+        isScrollToTop: newState.isScrollToTop,
+        isScrollToBottom: newState.isScrollToBottom,
+        isScrollToLeft: newState.isScrollToLeft,
+        isScrollToRight: newState.isScrollToRight
+      }));
+    }
+  }, [calculateScrollState]);
+  (0, import_react.useEffect)(() => {
+    isMountedRef.current = true;
     const container = containerRef.current;
     if (!container) return;
-    const {
-      scrollTop,
-      scrollLeft,
-      scrollHeight,
-      scrollWidth,
-      clientHeight,
-      clientWidth
-    } = container;
-    const isScrollToTop = scrollTop <= 0;
-    const isScrollToBottom = scrollTop + clientHeight >= scrollHeight;
-    const isScrollToLeft = scrollLeft <= 0;
-    const isScrollToRight = scrollLeft + clientWidth >= scrollWidth;
-    setScrollState((prev) => {
-      let direction = null;
-      if (Math.abs(scrollTop - prev.scrollTop) > Math.abs(scrollLeft - prev.scrollLeft)) {
-        direction = scrollTop > prev.scrollTop ? "down" : "up";
-      } else if (scrollLeft !== prev.scrollLeft) {
-        direction = scrollLeft > prev.scrollLeft ? "right" : "left";
-      } else {
-        direction = prev.direction;
+    const debouncedUpdateOverflow = debounce(updateOverflowState, 50);
+    updateOverflowState();
+    if (typeof ResizeObserver === "undefined") {
+      const handleResize = () => debouncedUpdateOverflow();
+      window.addEventListener("resize", handleResize);
+      return () => {
+        isMountedRef.current = false;
+        window.removeEventListener("resize", handleResize);
+      };
+    }
+    try {
+      resizeObserverRef.current = new ResizeObserver((entries) => {
+        if (entries.length > 0 && isMountedRef.current) {
+          debouncedUpdateOverflow();
+        }
+      });
+      resizeObserverRef.current.observe(container);
+      const children = container.children;
+      for (let i = 0; i < children.length; i++) {
+        resizeObserverRef.current.observe(children[i]);
       }
-      const maxScrollTop = scrollHeight - clientHeight;
-      const maxScrollLeft = scrollWidth - clientWidth;
-      const percentY = maxScrollTop > 0 ? scrollTop / maxScrollTop * 100 : 0;
-      const percentX = maxScrollLeft > 0 ? scrollLeft / maxScrollLeft * 100 : 0;
-      const isOverflows = scrollHeight > clientHeight || scrollWidth > clientWidth;
-      return {
-        scrollTop,
-        scrollLeft,
-        scrollHeight,
-        scrollWidth,
-        clientHeight,
-        clientWidth,
-        percentY,
-        percentX,
-        direction,
-        isScrollToTop,
-        isScrollToBottom,
-        isScrollToLeft,
-        isScrollToRight,
-        isOverflows
+      const mutationObserver = new MutationObserver((mutations) => {
+        if (!isMountedRef.current || !resizeObserverRef.current) return;
+        mutations.forEach((mutation) => {
+          mutation.addedNodes.forEach((node) => {
+            var _a;
+            if (node instanceof Element) {
+              (_a = resizeObserverRef.current) == null ? void 0 : _a.observe(node);
+            }
+          });
+        });
+        debouncedUpdateOverflow();
+      });
+      mutationObserver.observe(container, {
+        childList: true,
+        subtree: false
+      });
+      const handleWindowResize = () => debouncedUpdateOverflow();
+      window.addEventListener("resize", handleWindowResize);
+      return () => {
+        var _a;
+        isMountedRef.current = false;
+        (_a = resizeObserverRef.current) == null ? void 0 : _a.disconnect();
+        resizeObserverRef.current = null;
+        mutationObserver.disconnect();
+        window.removeEventListener("resize", handleWindowResize);
       };
-    });
-  }, [containerRef]);
+    } catch (error) {
+      console.warn("[useScrollState] 初始化 ResizeObserver 失败:", error);
+      const handleResize = () => debouncedUpdateOverflow();
+      window.addEventListener("resize", handleResize);
+      return () => {
+        isMountedRef.current = false;
+        window.removeEventListener("resize", handleResize);
+      };
+    }
+  }, [containerRef, updateOverflowState]);
   return { scrollState, updateScrollState };
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/components/PisellSteps/PisellSteps.js

@@ -37,6 +37,7 @@ var import_react = __toESM(require("react"));
 var import_PisellSteps = require("./PisellSteps.less");
 var import_hooks = require("./hooks");
 var import_utils = require("./utils");
+var import_PisellScrollView = require("../PisellScrollView");
 var PisellSteps = ({
   // 基础属性
   type = "default",
@@ -47,7 +48,6 @@ var PisellSteps = ({
   status = "process",
   initial = 0,
   items = [],
-  percent,
   labelPlacement = "horizontal",
   responsive = true,
   onChange,
@@ -57,20 +57,16 @@ var PisellSteps = ({
   // 扩展功能属性
   clickable = false,
   allowClickFinished = true,
-  showProgressPercent = false,
-  iconSize,
-  iconColor,
-  connectorStyle,
-  connectorPosition = "center",
-  animated = true,
   gridLayout = false,
   gridColumns,
-  itemLayout = "horizontal",
   itemGap,
   enableAnchor = false,
   anchorContainer,
   mobileMode = "full",
   mobileBreakpoint = 744,
+  // 滚动模式属性
+  enableScrollMode = false,
+  scrollActionsConfig,
   // 低代码属性
   __designMode,
   __id,
@@ -95,12 +91,21 @@ var PisellSteps = ({
     if (mobileMode === "auto" && isMobile) return true;
     return false;
   }, [mobileMode, isMobile]);
+  const safeItems = (0, import_react.useMemo)(() => {
+    if (!items) return [];
+    if (!Array.isArray(items)) return [];
+    return items;
+  }, [items]);
   const currentStepItem = (0, import_react.useMemo)(() => {
-    const visibleItems = items.filter((item) => !item.hidden);
-    return visibleItems[currentStep - initial] || null;
-  }, [items, currentStep, initial]);
+    const visibleItems = safeItems.filter((item) => !item.hidden);
+    const adjustedIndex = currentStep - initial;
+    if (adjustedIndex < 0 || adjustedIndex >= visibleItems.length) {
+      return null;
+    }
+    return visibleItems[adjustedIndex] || null;
+  }, [safeItems, currentStep, initial]);
   const processedItems = (0, import_react.useMemo)(() => {
-    const visibleItems = items.filter((item) => !item.hidden);
+    const visibleItems = safeItems.filter((item) => !item.hidden);
     if (__designMode === "design" && visibleItems.length === 0) {
       return [
         {
@@ -120,7 +125,7 @@ var PisellSteps = ({
         }
       ];
     }
-    return visibleItems.map((item, index) => {
+    return visibleItems.filter((item) => item != null).map((item, index) => {
       const adjustedIndex = index + initial;
       let stepStatus;
       if (item.status) {
@@ -150,7 +155,7 @@ var PisellSteps = ({
       };
     });
   }, [
-    items,
+    safeItems,
     currentStep,
     initial,
     status,
@@ -161,47 +166,77 @@ var PisellSteps = ({
   const wrapperClassName = (0, import_react.useMemo)(() => {
     const classes = ["pisell-steps"];
     if (className) classes.push(className);
-    if (type !== "default") classes.push(`pisell-steps-${type}`);
+    if (type === "navigation") classes.push("pisell-steps-navigation");
+    if (progressDot) classes.push("pisell-steps-dot");
     if (size !== "default") classes.push(`pisell-steps-${size}`);
     if (direction === "vertical") classes.push("pisell-steps-vertical");
     if (responsive) classes.push("pisell-steps-responsive");
-    if (animated) classes.push("pisell-steps-animated");
     if (clickable) classes.push("pisell-steps-clickable");
     if (gridLayout) classes.push("pisell-steps-grid-layout");
-    if (connectorPosition !== "center")
-      classes.push(`pisell-steps-connector-${connectorPosition}`);
-    if (itemLayout === "vertical") classes.push("pisell-steps-item-vertical");
+    if (itemGap !== void 0 && itemGap !== null) {
+      classes.push("pisell-steps-has-item-gap");
+    }
     return classes.join(" ");
   }, [
     className,
     type,
+    progressDot,
     size,
     direction,
     responsive,
-    animated,
     clickable,
     gridLayout,
-    connectorPosition,
-    itemLayout
+    itemGap
   ]);
   const wrapperStyle = (0, import_react.useMemo)(() => {
     const customStyle = { ...style };
-    if (iconSize) {
-      customStyle["--pisell-steps-icon-size"] = `${iconSize}px`;
-    }
-    if (iconColor) {
-      customStyle["--pisell-steps-icon-color"] = iconColor;
-    }
-    if (itemGap) {
+    if (itemGap !== void 0 && itemGap !== null) {
       customStyle["--pisell-steps-item-gap"] = `${itemGap}px`;
+      customStyle["--pisell-steps-has-item-gap"] = "1";
     }
     if (gridColumns && gridLayout) {
       customStyle["--pisell-steps-grid-columns"] = gridColumns;
     }
     return customStyle;
-  }, [style, iconSize, iconColor, itemGap, gridColumns, gridLayout]);
-  const effectivePercent = showProgressPercent ? percent : void 0;
-  const antdType = type === "dot" ? "inline" : type === "navigation" ? "navigation" : "default";
+  }, [style, itemGap, gridColumns, gridLayout]);
+  const defaultScrollActionsConfig = (0, import_react.useMemo)(() => ({
+    show: true,
+    type: "lrArrows",
+    scrollDistance: 200,
+    ...scrollActionsConfig
+  }), [scrollActionsConfig]);
+  const renderStepsContent = (forceHorizontal = false) => /* @__PURE__ */ import_react.default.createElement(
+    import_antd.Steps,
+    {
+      current: Math.max(0, currentStep - initial),
+      direction: forceHorizontal ? "horizontal" : direction,
+      size: size === "large" ? "default" : size,
+      status,
+      items: processedItems,
+      labelPlacement,
+      type,
+      progressDot,
+      responsive: forceHorizontal ? false : responsive,
+      ...restProps,
+      ...other || {}
+    }
+  );
+  const renderDesktopSteps = () => {
+    if (enableScrollMode) {
+      return /* @__PURE__ */ import_react.default.createElement(
+        import_PisellScrollView.PisellScrollView,
+        {
+          className: "pisell-steps-scroll-view",
+          overflow: "x",
+          scrollbarStyle: "none",
+          scrollActionsConfig: defaultScrollActionsConfig,
+          snapScroll: { enabled: false }
+        },
+        /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-steps-scroll-content" }, renderStepsContent(true))
+      );
+    }
+    return renderStepsContent(false);
+  };
   return /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -210,22 +245,7 @@ var PisellSteps = ({
       "data-component": "pisell-steps",
       "data-id": __id
     },
-    showMobileCurrentView ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-steps-mobile-current__info" }, (currentStepItem == null ? void 0 : currentStepItem.title) && /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-steps-mobile-current__number" }, currentStepItem.title), (currentStepItem == null ? void 0 : currentStepItem.description) && /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-steps-mobile-current__title" }, currentStepItem.description)) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Steps,
-      {
-        current: currentStep - initial,
-        direction,
-        size: size === "large" ? "default" : size,
-        status,
-        items: processedItems,
-        percent: effectivePercent,
-        labelPlacement,
-        type: antdType,
-        progressDot: type === "dot" ? progressDot : false,
-        ...restProps,
-        ...other
-      }
-    ), showProgressPercent && percent !== void 0 && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-steps-progress-info" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-steps-progress-percent" }, percent, "%")))
+    showMobileCurrentView ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-steps-mobile-current__info" }, (currentStepItem == null ? void 0 : currentStepItem.title) && /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-steps-mobile-current__number" }, currentStepItem.title), (currentStepItem == null ? void 0 : currentStepItem.description) && /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-steps-mobile-current__title" }, currentStepItem.description)) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, renderDesktopSteps())
   );
 };
 PisellSteps.displayName = "PisellSteps";