@bifrostui/react 1.4.6 → 1.4.7-beta.0

package/dist/Picker/Picker.types.d.ts

@@ -10,6 +10,10 @@ export interface IPickerOptionItem {
      * 选项对应唯一的值
      */
     value: string | number;
+    /**
+     * 是否禁用
+     */
+    disabled?: boolean;
 }
 export type ICascadePickerChildOptionItem = IPickerOptionItem & {
     /**
@@ -34,6 +38,14 @@ export type PickerProps<D extends React.ElementType = 'div', P = DrawerProps> =
          * 标题
          */
         title?: string;
+        /**
+         * 确认文本内容
+         */
+        confirmText?: string;
+        /**
+         * 取消文本内容
+         */
+        cancelText?: string;
         /**
          * 列表数据
          * @default []
@@ -61,6 +73,7 @@ export type PickerProps<D extends React.ElementType = 'div', P = DrawerProps> =
             value: (string | number)[];
             options: ICascadePickerChildOptionItem[][];
             currentOption: ICascadePickerChildOptionItem;
+            columnIndex: number;
         }) => void;
         /**
          * 点击取消按钮时候回调
@@ -85,9 +98,9 @@ export type PickerPanelProps<D extends React.ElementType = 'div', P = {}> = Over
          */
         options?: ICascadePickerChildOptionItem[];
         /**
-         * 默认值
+         * 选中值
          */
-        defaultValue?: string | number;
+        value?: string | number;
         /**
          * 列索引
          */

package/dist/Picker/PickerPanel.css

@@ -1,4 +1,5 @@
 .bui-picker-panel {
+  --bui-picker-option-disabled-opacity: 0.38;
   flex: 1;
   flex-shrink: 0;
   position: relative;
@@ -56,6 +57,9 @@
   white-space: nowrap;
   width: 100%;
 }
+.bui-picker-panel-option-disabled {
+  opacity: var(--bui-picker-option-disabled-opacity);
+}
 .bui-picker-panel-option-hidden {
   visibility: hidden;
   opacity: 0;

package/dist/Picker/PickerPanel.js

@@ -66,13 +66,13 @@ const PickerPanel = /* @__PURE__ */ import_react.default.forwardRef(
     var _b;
     const _a = props, {
       options = [],
-      defaultValue,
+      value,
       onSelect,
       columnIndex,
       pickerStyle
     } = _a, others = __objRest(_a, [
       "options",
-      "defaultValue",
+      "value",
       "onSelect",
       "columnIndex",
       "pickerStyle"
@@ -102,9 +102,9 @@ const PickerPanel = /* @__PURE__ */ import_react.default.forwardRef(
     (0, import_utils.useTouchEmulator)(PickerPanelRef.current);
     const updateSelect = () => {
       let index = -1;
-      if (defaultValue) {
+      if (value) {
         options.some((item, idx) => {
-          if (item.value === defaultValue) {
+          if (item.value === value) {
             index = idx;
             return true;
           }
@@ -122,7 +122,7 @@ const PickerPanel = /* @__PURE__ */ import_react.default.forwardRef(
       return () => {
         clearTimeout(timer);
       };
-    }, [options]);
+    }, [options, value]);
     const setTransform = (type, deg, time = DEFAULT_DURATION, translateY = 0) => {
       let nTime = time;
       if (type !== TOUCH_END) {
@@ -255,7 +255,8 @@ const PickerPanel = /* @__PURE__ */ import_react.default.forwardRef(
           "div",
           {
             className: (0, import_clsx.default)(`${prefixCls}-option`, {
-              [`${prefixCls}-option-hidden`]: i + 1 <= currIndex - 8 || i + 1 >= currIndex + 8
+              [`${prefixCls}-option-hidden`]: i + 1 <= currIndex - 8 || i + 1 >= currIndex + 8,
+              [`${prefixCls}-option-disabled`]: item == null ? void 0 : item.disabled
             }),
             key: `${item == null ? void 0 : item.value}-${i}`,
             style: {

package/dist/Popover/Popover.js

@@ -51,6 +51,26 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 var Popover_exports = {};
 __export(Popover_exports, {
   default: () => Popover_default
@@ -73,9 +93,9 @@ const Popover = /* @__PURE__ */ import_react.default.forwardRef((props, ref) =>
     offsetSpacing = 0,
     placement = "top",
     trigger = "click",
-    onOpenChange,
     open,
-    hideArrow
+    hideArrow,
+    onOpenChange
   } = _a, others = __objRest(_a, [
     "className",
     "style",
@@ -86,9 +106,9 @@ const Popover = /* @__PURE__ */ import_react.default.forwardRef((props, ref) =>
     "offsetSpacing",
     "placement",
     "trigger",
-    "onOpenChange",
     "open",
-    "hideArrow"
+    "hideArrow",
+    "onOpenChange"
   ]);
   const controlByUser = typeof open !== "undefined";
   const { direction, location = "center" } = (0, import_utils.parsePlacement)(placement);
@@ -96,11 +116,18 @@ const Popover = /* @__PURE__ */ import_react.default.forwardRef((props, ref) =>
   const [openStatus, setOpenStatus] = (0, import_react.useState)(defaultOpen);
   const [arrowDirection, setArrowDirection] = (0, import_react.useState)(direction);
   const [arrowLocation, setArrowLocation] = (0, import_react.useState)(location);
-  const [tooltyles, setTooltyles] = (0, import_react.useState)({});
-  const ttId = (0, import_utils.useUniqueId)();
+  const [toolStyles, setToolStyles] = (0, import_react.useState)({});
+  const tipRef = (0, import_react.useRef)(null);
+  const nodeRef = (0, import_utils.useForkRef)(ref, tipRef);
+  const clearRef = (status) => {
+    if (status === false) {
+      tipRef.current = null;
+    }
+  };
   const changeOpenStatus = (event, status) => {
     if (controlByUser)
       return;
+    clearRef(status);
     setOpenStatus(status);
     onOpenChange == null ? void 0 : onOpenChange(event, { open: status });
   };
@@ -119,23 +146,33 @@ const Popover = /* @__PURE__ */ import_react.default.forwardRef((props, ref) =>
     if (!controlByUser)
       return;
     setOpenStatus(open);
+    clearRef(open);
   }, [open]);
+  (0, import_react.useEffect)(() => {
+    if (!openStatus) {
+      setToolStyles({
+        visibility: "hidden"
+      });
+    }
+  }, [openStatus]);
   const clickEventHandler = (event) => {
     if (trigger === "hover" || (trigger == null ? void 0 : trigger.length) === 1 && (trigger == null ? void 0 : trigger[0]) === "hover")
       return;
     hidePopover(event);
   };
-  const onRootElementMouted = (0, import_utils.throttle)(() => {
+  const onRootElementMouted = (0, import_utils.throttle)(() => __async(void 0, null, function* () {
+    if (!tipRef.current)
+      return;
     const {
       direction: newParsedDirection,
       location: newParsedLocation = "center"
     } = (0, import_utils.parsePlacement)(placement);
-    const result = (0, import_utils.getStylesAndLocation)({
+    const result = yield (0, import_utils.getStylesAndLocation)({
       childrenRef,
       arrowDirection: newParsedDirection,
       arrowLocation: newParsedLocation,
       offsetSpacing,
-      selector: `[data-id="tt_${ttId}"]`
+      tipRef
     });
     if (!result)
       return;
@@ -146,26 +183,32 @@ const Popover = /* @__PURE__ */ import_react.default.forwardRef((props, ref) =>
     if (newArrowLocation !== arrowLocation) {
       setArrowLocation(newArrowLocation);
     }
-    setTooltyles(styles);
-  }, 100);
-  const bindEvent = () => {
-    if (!controlByUser) {
-      document.addEventListener("click", clickEventHandler);
-    }
-    window.addEventListener("resize", onRootElementMouted);
-  };
-  const unbindEvent = () => {
-    if (!controlByUser) {
-      document.removeEventListener("click", clickEventHandler);
-    }
-    window.removeEventListener("resize", onRootElementMouted);
-  };
+    setToolStyles(styles);
+  }), 100);
   (0, import_react.useEffect)(() => {
+    const bindEvent = () => {
+      if (!tipRef.current)
+        return;
+      if (!controlByUser) {
+        document.addEventListener("click", clickEventHandler);
+      }
+      if (!import_utils.isMini) {
+        window.addEventListener("resize", onRootElementMouted);
+      }
+    };
+    const unbindEvent = () => {
+      if (!controlByUser) {
+        document.removeEventListener("click", clickEventHandler);
+      }
+      if (!import_utils.isMini) {
+        window.removeEventListener("resize", onRootElementMouted);
+      }
+    };
     bindEvent();
     return () => {
       unbindEvent();
     };
-  }, []);
+  }, [openStatus]);
   if (!title && !content)
     return null;
   let triggerEventOption;
@@ -180,14 +223,14 @@ const Popover = /* @__PURE__ */ import_react.default.forwardRef((props, ref) =>
   const childrenOptions = __spreadValues({
     ref: childrenRef
   }, triggerEventOption);
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, open || openStatus ? /* @__PURE__ */ import_react.default.createElement(import_Portal.default, { onRootElementMouted, ref }, /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, open || openStatus ? /* @__PURE__ */ import_react.default.createElement(import_Portal.default, { onRootElementMouted }, /* @__PURE__ */ import_react.default.createElement(
     "div",
     __spreadValues({
       className: (0, import_clsx.default)(prefixCls, className, `popover-${arrowDirection}`, {
         "bui-popover-arrow-hide": hideArrow
       }),
-      "data-id": `tt_${ttId}`,
-      style: __spreadValues(__spreadValues({}, style), tooltyles)
+      style: __spreadValues(__spreadValues({}, style), toolStyles),
+      ref: nodeRef
     }, others),
     !hideArrow ? /* @__PURE__ */ import_react.default.createElement(
       "div",

package/dist/Portal/Portal.miniapp.js

@@ -53,7 +53,9 @@ var import_react = __toESM(require("react"));
 var import_PortalCore = __toESM(require("./PortalCore"));
 const Portal = (0, import_react.forwardRef)((props, ref) => {
   const { disablePortal } = props;
-  const rootWrapperElement = (0, import_react.useMemo)(() => {
+  const [rootWrapperElement, setRootWrapperElement] = (0, import_react.useState)();
+  (0, import_react.useEffect)(() => {
+    let root;
     if (!disablePortal) {
       const currentPages = import_taro.default.getCurrentPages() || [];
       const currentPage = currentPages[currentPages.length - 1];
@@ -65,11 +67,12 @@ const Portal = (0, import_react.forwardRef)((props, ref) => {
         const view = document.createElement("view");
         view.id = portalId;
         rootElement == null ? void 0 : rootElement.appendChild(view);
-        return view;
+        root = view;
+      } else {
+        root = portalWrapperElement;
       }
-      return portalWrapperElement;
     }
-    return void 0;
+    setRootWrapperElement(root);
   }, []);
   return /* @__PURE__ */ import_react.default.createElement(import_PortalCore.default, __spreadProps(__spreadValues({}, props), { ref, rootElement: rootWrapperElement }));
 });

package/dist/ScrollView/ScrollView.js

@@ -34,12 +34,14 @@ var import_utils = require("@bifrostui/utils");
 var import_clsx = __toESM(require("clsx"));
 var import_react = __toESM(require("react"));
 var import_ScrollView = require("./ScrollView.css");
-function easeOutScroll(from, to, callback) {
+function easeOutScroll(from, to, callback, dur) {
+  if (dur <= 0) {
+    dur = 500;
+  }
   if (from === to || typeof from !== "number") {
     return;
   }
   const change = to - from;
-  const dur = 500;
   const sTime = +/* @__PURE__ */ new Date();
   function linear(t, b, c, d) {
     return c * t / d + b;
@@ -74,7 +76,8 @@ const ScrollView = (0, import_react.forwardRef)(
       scrollIntoView,
       onTouchMove: propsOnTouchMove,
       scrollIntoViewAlignment,
-      children
+      children,
+      scrollAnimationDuration = 500
     } = props;
     const container = (0, import_react.useRef)(null);
     const handleRef = (0, import_utils.useForkRef)(ref, container);
@@ -84,10 +87,15 @@ const ScrollView = (0, import_react.forwardRef)(
       if (top === void 0)
         return;
       if (isAnimation) {
-        easeOutScroll(container.current.scrollTop, top, (pos) => {
-          if (container.current)
-            container.current.scrollTop = pos;
-        });
+        easeOutScroll(
+          container.current.scrollTop,
+          top,
+          (pos) => {
+            if (container.current)
+              container.current.scrollTop = pos;
+          },
+          scrollAnimationDuration
+        );
       } else if (container.current)
         container.current.scrollTop = top;
     }, []);
@@ -95,10 +103,15 @@ const ScrollView = (0, import_react.forwardRef)(
       if (left === void 0)
         return;
       if (isAnimation) {
-        easeOutScroll(container.current.scrollLeft, left, (pos) => {
-          if (container.current)
-            container.current.scrollLeft = pos;
-        });
+        easeOutScroll(
+          container.current.scrollLeft,
+          left,
+          (pos) => {
+            if (container.current)
+              container.current.scrollLeft = pos;
+          },
+          scrollAnimationDuration
+        );
       } else if (container.current)
         container.current.scrollLeft = left;
     }, []);

package/dist/ScrollView/ScrollView.types.d.ts

@@ -138,7 +138,6 @@ export type ScrollViewProps<D extends React.ElementType = 'div', P = {}> = Overr
          */
         fastDeceleration?: boolean;
         /** 当 scroll-with-animation设置为 true 时，可以设置 scroll-animation-duration 来控制动画的执行时间，单位 ms。
-         * 仅小程序可用
          */
         scrollAnimationDuration?: number;
         /** 纵向滚动时，当滚动到顶部或底部时，强制禁止触发页面滚动，仍然只触发 scroll-view 自身的滚动。

package/dist/Select/Select.css

@@ -48,13 +48,9 @@
 .bui-select-option-container {
   position: absolute;
   box-sizing: border-box;
-  top: 100%;
-  left: 0;
-  width: 100%;
   font-size: var(--bui-select-font-size, var(--bui-title-size-3));
   z-index: var(--bui-z-index-tooltip);
   border-radius: 3px;
-  background-color: var(--bui-color-bg-view);
   padding: 2px;
   overflow: hidden;
 }
@@ -71,6 +67,7 @@
   border-radius: 3px;
   padding: var(--bui-select-option-container-padding, 3px 0);
   box-shadow: 0 0 0 2px var(--bui-color-bg-default);
+  background-color: var(--bui-color-bg-view);
   overflow: hidden;
 }
 .bui-select-option {

package/dist/Select/Select.js

@@ -54,6 +54,26 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 var Select_exports = {};
 __export(Select_exports, {
   default: () => Select_default
@@ -121,38 +141,36 @@ const Select = /* @__PURE__ */ import_react.default.forwardRef((props, ref) => {
   const isOpen = open !== void 0 ? open : internalOpen;
   const locatorRef = (0, import_react.useRef)(null);
   const rootRef = (0, import_utils.useForkRef)(ref, locatorRef);
-  const ttId = (0, import_utils.useUniqueId)();
-  const dataId = `${prefixCls}-tt-${ttId}`;
-  const updateOptionStyle = (0, import_utils.throttle)(() => {
+  const optionContainerRef = (0, import_react.useRef)(null);
+  const optionMainRef = (0, import_react.useRef)(null);
+  const updateOptionStyle = () => __async(void 0, null, function* () {
     const curScrollRoot = scrollContainer();
-    if (!import_utils.isMini && curScrollRoot) {
-      const result = (0, import_utils.getStylesAndLocation)({
-        scrollRoot: curScrollRoot,
-        childrenRef: locatorRef,
-        arrowDirection: defaultPlacement,
-        arrowLocation: "none",
-        selector: `[data-id="${dataId}"]`,
-        offsetSpacing: 0
-      });
-      if (!result)
-        return;
-      const { styles, childrenStyle, newArrowDirection } = result;
-      setPlacement(newArrowDirection);
-      setOptionStyle(__spreadProps(__spreadValues({}, styles), { width: childrenStyle.width }));
-    }
-  }, 100);
-  const changeOpen = (newOpen) => {
+    const result = yield (0, import_utils.getStylesAndLocation)({
+      scrollRoot: curScrollRoot,
+      childrenRef: locatorRef,
+      tipRef: optionContainerRef,
+      arrowDirection: defaultPlacement,
+      arrowLocation: "none",
+      offsetSpacing: 0
+    });
+    if (!result)
+      return;
+    const { styles, childrenStyle, newArrowDirection } = result;
+    optionMainRef.current.style.transition = "none";
+    optionMainRef.current.style.transform = `translateY(${newArrowDirection === "bottom" ? "-100%" : "100%"})`;
+    setPlacement(newArrowDirection);
+    setOptionStyle(__spreadProps(__spreadValues({}, styles), { width: childrenStyle == null ? void 0 : childrenStyle.width }));
+  });
+  const changeOpen = (newOpen) => __async(void 0, null, function* () {
     if (newOpen) {
-      updateOptionStyle();
-      setTimeout(() => {
-        setInternalOpen(newOpen);
-        onOpen == null ? void 0 : onOpen();
-      }, 100);
+      yield updateOptionStyle();
+      setInternalOpen(newOpen);
+      onOpen == null ? void 0 : onOpen();
     } else {
       onClose == null ? void 0 : onClose();
       setInternalOpen(newOpen);
     }
-  };
+  });
   const handleSelectClick = (e) => {
     if (disabled)
       return;
@@ -177,10 +195,11 @@ const Select = /* @__PURE__ */ import_react.default.forwardRef((props, ref) => {
     [selectValue, onChange, setRenderValue]
   );
   (0, import_react.useEffect)(() => {
+    const resizeCb = (0, import_utils.throttle)(updateOptionStyle, 100);
     if (!import_utils.isMini) {
-      window.addEventListener("resize", updateOptionStyle);
+      window.addEventListener("resize", resizeCb);
       return () => {
-        window.removeEventListener("resize", updateOptionStyle);
+        window.removeEventListener("resize", resizeCb);
       };
     }
   }, []);
@@ -198,8 +217,8 @@ const Select = /* @__PURE__ */ import_react.default.forwardRef((props, ref) => {
       {
         in: isOpen,
         timeout: {
-          enter: 150,
-          exit: 150
+          enter: 167,
+          exit: 167
         }
       },
       /* @__PURE__ */ import_react.default.createElement(
@@ -213,7 +232,7 @@ const Select = /* @__PURE__ */ import_react.default.forwardRef((props, ref) => {
               [`${prefixCls}-option-container-hide`]: !isOpen
             }
           ),
-          "data-id": dataId,
+          ref: optionContainerRef,
           style: optionStyle
         },
         /* @__PURE__ */ import_react.default.createElement(
@@ -222,11 +241,18 @@ const Select = /* @__PURE__ */ import_react.default.forwardRef((props, ref) => {
             in: isOpen,
             direction: placement === "bottom" ? "down" : "up",
             timeout: {
-              enter: 150,
-              exit: 150
+              enter: 167,
+              exit: 167
             }
           },
-          /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_clsx.default)(`${prefixCls}-option-main`) }, children)
+          /* @__PURE__ */ import_react.default.createElement(
+            "div",
+            {
+              className: (0, import_clsx.default)(`${prefixCls}-option-main`),
+              ref: optionMainRef
+            },
+            children
+          )
         )
       )
     );
@@ -254,9 +280,8 @@ const Select = /* @__PURE__ */ import_react.default.forwardRef((props, ref) => {
           [inputProps == null ? void 0 : inputProps.className]: inputProps == null ? void 0 : inputProps.className
         })
       })
-    ), icon || defaultIcon),
-    import_utils.isMini && renderOptions()
-  ), !import_utils.isMini && /* @__PURE__ */ import_react.default.createElement(import_Portal.default, { onRootElementMouted: updateOptionStyle }, renderOptions()), /* @__PURE__ */ import_react.default.createElement(
+    ), icon || defaultIcon)
+  ), /* @__PURE__ */ import_react.default.createElement(import_Portal.default, { onRootElementMouted: updateOptionStyle }, renderOptions()), /* @__PURE__ */ import_react.default.createElement(
     import_Backdrop.default,
     __spreadProps(__spreadValues({
       open: isOpen,
@@ -273,8 +298,6 @@ const Select = /* @__PURE__ */ import_react.default.forwardRef((props, ref) => {
 Select.displayName = "BuiSelect";
 Select.defaultProps = {
   defaultValue: "",
-  scrollContainer: () => {
-    return import_utils.isMini ? null : document.body;
-  }
+  scrollContainer: () => null
 };
 var Select_default = Select;

package/dist/Slider/Slider.js

@@ -128,7 +128,6 @@ const Slider = /* @__PURE__ */ import_react.default.forwardRef((props, ref) => {
   const value = shouldProtection ? latestVal.current : valueProp;
   const [rootRef, setRootRef] = (0, import_react.useState)(null);
   const handleRef = (0, import_utils.useForkRef)(ref, setRootRef);
-  (0, import_utils.useTouchEmulator)(rootRef);
   const sliderRect = (0, import_react.useRef)();
   const touchStartPageX = (0, import_react.useRef)();
   const touchStartLeft = (0, import_react.useRef)();
@@ -199,9 +198,7 @@ const Slider = /* @__PURE__ */ import_react.default.forwardRef((props, ref) => {
       return;
     beforeMoveValue.current = internalValue;
     tooltipRef.current = internalValue;
-    if (!sliderRect.current.width) {
-      getLineWidth();
-    }
+    getLineWidth();
     const currentTarget = import_utils.isMini ? e.mpEvent.currentTarget : e.currentTarget;
     touchStartPageX.current = e.touches[0].pageX;
     touchStartLeft.current = currentTarget == null ? void 0 : currentTarget.offsetLeft;
@@ -260,6 +257,16 @@ const Slider = /* @__PURE__ */ import_react.default.forwardRef((props, ref) => {
     setFrontTooltipVisible(false);
     setEndTooltipVisible(false);
   };
+  const onMouseUp = (e) => {
+    (0, import_utils.emulateTouchEnd)(e);
+    document.removeEventListener("mousemove", import_utils.emulateTouchMove);
+    document.removeEventListener("mouseup", onMouseUp);
+  };
+  const onMouseDown = (e) => {
+    (0, import_utils.emulateTouchStart)(e);
+    document.addEventListener("mousemove", import_utils.emulateTouchMove);
+    document.addEventListener("mouseup", onMouseUp);
+  };
   const renderButton = (index) => {
     const valuenow = internalValue[index];
     return /* @__PURE__ */ import_react.default.createElement(
@@ -282,7 +289,8 @@ const Slider = /* @__PURE__ */ import_react.default.forwardRef((props, ref) => {
         },
         onTouchMove,
         onTouchEnd,
-        onTouchCancel: onTouchEnd
+        onTouchCancel: onTouchEnd,
+        onMouseDown
       },
       index === SLIDER_BUTTON.FRONT ? startIcon || defaultIcon : endIcon || defaultIcon
     );