@bifrostui/react 2.0.0-alpha.25 → 2.0.0-alpha.27

package/dist/DatePicker/DatePicker.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import { DatePickerProps } from './DatePicker.types';
-declare const DatePicker: React.ForwardRefExoticComponent<Omit<DatePickerProps<"div", Omit<import("../Picker").PickerProps<"div", import("..").DrawerProps>, "value" | "defaultValue" | "onChange" | "onClose" | "onConfirm">>, "ref"> & React.RefAttributes<HTMLDivElement>>;
+declare const DatePicker: React.ForwardRefExoticComponent<Omit<DatePickerProps<"div", Omit<import("../Picker").PickerProps<"div", import("..").DrawerProps>, "defaultValue" | "value" | "onChange" | "onClose" | "onConfirm">>, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export default DatePicker;

package/dist/Modal/Modal.js

@@ -75,8 +75,6 @@ const Modal = /* @__PURE__ */ React.forwardRef((props, ref) => {
     container,
     disablePortal = false,
     disableScrollLock = false,
-    disableAutoFocus = false,
-    disableRestoreFocus = false,
     hideBackdrop = false,
     onClose,
     keepMounted = false
@@ -88,8 +86,6 @@ const Modal = /* @__PURE__ */ React.forwardRef((props, ref) => {
     "container",
     "disablePortal",
     "disableScrollLock",
-    "disableAutoFocus",
-    "disableRestoreFocus",
     "hideBackdrop",
     "onClose",
     "keepMounted"
@@ -104,9 +100,7 @@ const Modal = /* @__PURE__ */ React.forwardRef((props, ref) => {
   } = (0, import_useModal.useModal)(__spreadProps(__spreadValues({}, props), {
     container,
     disableScrollLock,
-    disableAutoFocus,
-    disableRestoreFocus,
-    children,
+    children: React.isValidElement(children) ? children : void 0,
     open,
     onClose,
     rootRef: ref

package/dist/Modal/Modal.miniapp.d.ts

@@ -10,9 +10,7 @@ declare const Modal: React.ForwardRefExoticComponent<Omit<ViewProps & {
     disableScrollLock?: boolean;
     disablePortal?: boolean;
     keepMounted?: boolean;
-    disableAutoFocus?: boolean;
-    disableRestoreFocus?: boolean;
 } & import("@bifrostui/types").ICommonProps & Omit<Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "ref"> & {
     ref?: React.Ref<HTMLDivElement>;
-}, "open" | "container" | keyof import("@bifrostui/types").ICommonProps | "disablePortal" | "hideBackdrop" | "BackdropProps" | "onClose" | "disableScrollLock" | "keepMounted" | "disableAutoFocus" | "disableRestoreFocus">, "ref"> & React.RefAttributes<HTMLDivElement>>;
+}, keyof import("@bifrostui/types").ICommonProps | "open" | "container" | "BackdropProps" | "onClose" | "keepMounted" | "disablePortal" | "hideBackdrop" | "disableScrollLock">, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export default Modal;

package/dist/Modal/Modal.types.d.ts

@@ -39,19 +39,6 @@ export type ModalProps<D extends React.ElementType = 'div', P = {}> = OverridePr
          * 是否保持挂载状态
          */
         keepMounted?: boolean;
-        /**
-         * 是否禁用自动焦点管理
-         * 仅web端生效
-         * @default false
-         *
-         */
-        disableAutoFocus?: boolean;
-        /**
-         * 是否禁用在关闭时恢复焦点到触发元素
-         * 仅web端生效
-         * @default false
-         */
-        disableRestoreFocus?: boolean;
     };
     defaultComponent: D;
 }, D>;

package/dist/Modal/useModal.d.ts

@@ -2,8 +2,6 @@ import React from 'react';
 export interface UseModalParameters {
     container?: Element | (() => Element | null) | null;
     disableScrollLock?: boolean;
-    disableAutoFocus?: boolean;
-    disableRestoreFocus?: boolean;
     onClose?: (event: React.SyntheticEvent<Element, Event>, detail?: {
         from: 'backdropClick' | 'escapeKeyDown';
     }) => void;

package/dist/Modal/useModal.js

@@ -53,8 +53,6 @@ function useModal(parameters) {
   const {
     container,
     disableScrollLock = false,
-    disableAutoFocus = false,
-    disableRestoreFocus = false,
     onClose,
     open,
     rootRef,
@@ -69,7 +67,6 @@ function useModal(parameters) {
   const handleRef = (0, import_utils.useForkRef)(modalRef, rootRef);
   const [exited, setExited] = (0, import_react.useState)(!open);
   const hasTransition = getHasTransition(children);
-  const lastFocusedElement = (0, import_react.useRef)(null);
   let ariaHiddenProp = true;
   if (parameters["aria-hidden"] === "false" || parameters["aria-hidden"] === false) {
     ariaHiddenProp = false;
@@ -123,38 +120,6 @@ function useModal(parameters) {
       handleClose();
     }
   }, [open, handleClose, hasTransition, handleOpen]);
-  (0, import_react.useEffect)(() => {
-    if (open && modalRef.current) {
-      const doc = modalRef.current.ownerDocument || document;
-      if (!lastFocusedElement.current) {
-        lastFocusedElement.current = doc.activeElement;
-      }
-      if (!disableAutoFocus) {
-        if (!modalRef.current.contains(doc.activeElement)) {
-          if (!modalRef.current.hasAttribute("tabIndex")) {
-            modalRef.current.setAttribute("tabIndex", "-1");
-          }
-          const autoFocusElement = modalRef.current.querySelector(
-            '[autofocus], [tabindex="-1"]'
-          );
-          if (autoFocusElement) {
-            autoFocusElement.focus();
-          } else {
-            modalRef.current.focus();
-          }
-        }
-      }
-      return () => {
-        if (!disableRestoreFocus && lastFocusedElement.current) {
-          if (lastFocusedElement.current && typeof lastFocusedElement.current.focus === "function") {
-            lastFocusedElement.current.focus();
-          }
-          lastFocusedElement.current = null;
-        }
-      };
-    }
-    return void 0;
-  }, [open, disableAutoFocus, disableRestoreFocus]);
   const createHandleBackdropClick = (backdropHandlers = {}) => (event) => {
     var _a;
     (_a = backdropHandlers.onClick) == null ? void 0 : _a.call(backdropHandlers, event);

package/dist/Tabs/Tabs.css

@@ -39,6 +39,7 @@ xhs-page {
 .bui-tabs-scroll-wrapper {
   height: 100%;
   display: flex;
+  flex-direction: row;
   flex-wrap: nowrap;
   justify-content: flex-start;
   align-items: center;

package/dist/Tabs/index.css

@@ -39,6 +39,7 @@ xhs-page {
 .bui-tabs-scroll-wrapper {
   height: 100%;
   display: flex;
+  flex-direction: row;
   flex-wrap: nowrap;
   justify-content: flex-start;
   align-items: center;

package/dist/Tabs/miniapp/Tabs.js

@@ -232,8 +232,7 @@ const Tabs = /* @__PURE__ */ import_react.default.forwardRef((props, ref) => {
       onScroll: handleScroll,
       enhanced: true,
       showScrollbar: false,
-      enablePassive: true,
-      enableFlex: true
+      enablePassive: true
     },
     /* @__PURE__ */ import_react.default.createElement("div", { id: wrapperId, className: import_classes.tabsScrollWrapperClass }, /* @__PURE__ */ import_react.default.createElement(
       import_TabIndicator.default,

package/dist/Toast/FunctionalToast.js

@@ -86,8 +86,7 @@ const Toast = (props) => {
   };
   const _a = options, { container } = _a, restOptions = __objRest(_a, ["container"]);
   const rootWrapper = document.createElement("div");
-  const rootElement = (0, import_utils.getRootContainer)(container);
-  rootElement == null ? void 0 : rootElement.appendChild(rootWrapper);
+  document.body.appendChild(rootWrapper);
   const ToastComponent = () => {
     const _a2 = restOptions, { duration, multiple, onClose, onExited } = _a2, others = __objRest(_a2, ["duration", "multiple", "onClose", "onExited"]);
     const [open, setOpen] = (0, import_react.useState)(true);
@@ -125,7 +124,7 @@ const Toast = (props) => {
       }
     };
     instance.close = close;
-    return /* @__PURE__ */ import_react.default.createElement(import_Toast.default, __spreadProps(__spreadValues({}, others), { open, onExited: onProxyExited }));
+    return /* @__PURE__ */ import_react.default.createElement(import_Portal.default, { container }, /* @__PURE__ */ import_react.default.createElement(import_Toast.default, __spreadProps(__spreadValues({}, others), { open, onExited: onProxyExited })));
   };
   (0, import_utils.render)(/* @__PURE__ */ import_react.default.createElement(ToastComponent, null), rootWrapper);
   return instance;

package/es/Modal/Modal.js

@@ -45,8 +45,6 @@ const Modal = /* @__PURE__ */ React.forwardRef((props, ref) => {
     container,
     disablePortal = false,
     disableScrollLock = false,
-    disableAutoFocus = false,
-    disableRestoreFocus = false,
     hideBackdrop = false,
     onClose,
     keepMounted = false
@@ -58,8 +56,6 @@ const Modal = /* @__PURE__ */ React.forwardRef((props, ref) => {
     "container",
     "disablePortal",
     "disableScrollLock",
-    "disableAutoFocus",
-    "disableRestoreFocus",
     "hideBackdrop",
     "onClose",
     "keepMounted"
@@ -74,9 +70,7 @@ const Modal = /* @__PURE__ */ React.forwardRef((props, ref) => {
   } = useModal(__spreadProps(__spreadValues({}, props), {
     container,
     disableScrollLock,
-    disableAutoFocus,
-    disableRestoreFocus,
-    children,
+    children: React.isValidElement(children) ? children : void 0,
     open,
     onClose,
     rootRef: ref

package/es/Modal/Modal.miniapp.d.ts

@@ -10,9 +10,7 @@ declare const Modal: React.ForwardRefExoticComponent<Omit<ViewProps & {
     disableScrollLock?: boolean;
     disablePortal?: boolean;
     keepMounted?: boolean;
-    disableAutoFocus?: boolean;
-    disableRestoreFocus?: boolean;
 } & import("@bifrostui/types").ICommonProps & Omit<Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "ref"> & {
     ref?: React.Ref<HTMLDivElement>;
-}, keyof import("@bifrostui/types").ICommonProps | "open" | "container" | "disablePortal" | "hideBackdrop" | "BackdropProps" | "onClose" | "disableScrollLock" | "keepMounted" | "disableAutoFocus" | "disableRestoreFocus">, "ref"> & React.RefAttributes<HTMLDivElement>>;
+}, "open" | "container" | "disableScrollLock" | "onClose" | keyof import("@bifrostui/types").ICommonProps | "BackdropProps" | "disablePortal" | "keepMounted" | "hideBackdrop">, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export default Modal;

package/es/Modal/Modal.types.d.ts

@@ -39,19 +39,6 @@ export type ModalProps<D extends React.ElementType = 'div', P = {}> = OverridePr
          * 是否保持挂载状态
          */
         keepMounted?: boolean;
-        /**
-         * 是否禁用自动焦点管理
-         * 仅web端生效
-         * @default false
-         *
-         */
-        disableAutoFocus?: boolean;
-        /**
-         * 是否禁用在关闭时恢复焦点到触发元素
-         * 仅web端生效
-         * @default false
-         */
-        disableRestoreFocus?: boolean;
     };
     defaultComponent: D;
 }, D>;

package/es/Modal/useModal.d.ts

@@ -2,8 +2,6 @@ import React from 'react';
 export interface UseModalParameters {
     container?: Element | (() => Element | null) | null;
     disableScrollLock?: boolean;
-    disableAutoFocus?: boolean;
-    disableRestoreFocus?: boolean;
     onClose?: (event: React.SyntheticEvent<Element, Event>, detail?: {
         from: 'backdropClick' | 'escapeKeyDown';
     }) => void;

package/es/Modal/useModal.js

@@ -33,8 +33,6 @@ function useModal(parameters) {
   const {
     container,
     disableScrollLock = false,
-    disableAutoFocus = false,
-    disableRestoreFocus = false,
     onClose,
     open,
     rootRef,
@@ -49,7 +47,6 @@ function useModal(parameters) {
   const handleRef = useForkRef(modalRef, rootRef);
   const [exited, setExited] = useState(!open);
   const hasTransition = getHasTransition(children);
-  const lastFocusedElement = useRef(null);
   let ariaHiddenProp = true;
   if (parameters["aria-hidden"] === "false" || parameters["aria-hidden"] === false) {
     ariaHiddenProp = false;
@@ -103,38 +100,6 @@ function useModal(parameters) {
       handleClose();
     }
   }, [open, handleClose, hasTransition, handleOpen]);
-  useEffect(() => {
-    if (open && modalRef.current) {
-      const doc = modalRef.current.ownerDocument || document;
-      if (!lastFocusedElement.current) {
-        lastFocusedElement.current = doc.activeElement;
-      }
-      if (!disableAutoFocus) {
-        if (!modalRef.current.contains(doc.activeElement)) {
-          if (!modalRef.current.hasAttribute("tabIndex")) {
-            modalRef.current.setAttribute("tabIndex", "-1");
-          }
-          const autoFocusElement = modalRef.current.querySelector(
-            '[autofocus], [tabindex="-1"]'
-          );
-          if (autoFocusElement) {
-            autoFocusElement.focus();
-          } else {
-            modalRef.current.focus();
-          }
-        }
-      }
-      return () => {
-        if (!disableRestoreFocus && lastFocusedElement.current) {
-          if (lastFocusedElement.current && typeof lastFocusedElement.current.focus === "function") {
-            lastFocusedElement.current.focus();
-          }
-          lastFocusedElement.current = null;
-        }
-      };
-    }
-    return void 0;
-  }, [open, disableAutoFocus, disableRestoreFocus]);
   const createHandleBackdropClick = (backdropHandlers = {}) => (event) => {
     var _a;
     (_a = backdropHandlers.onClick) == null ? void 0 : _a.call(backdropHandlers, event);

package/es/Tabs/Tabs.css

@@ -39,6 +39,7 @@ xhs-page {
 .bui-tabs-scroll-wrapper {
   height: 100%;
   display: flex;
+  flex-direction: row;
   flex-wrap: nowrap;
   justify-content: flex-start;
   align-items: center;

package/es/Tabs/index.css

@@ -39,6 +39,7 @@ xhs-page {
 .bui-tabs-scroll-wrapper {
   height: 100%;
   display: flex;
+  flex-direction: row;
   flex-wrap: nowrap;
   justify-content: flex-start;
   align-items: center;

package/es/Tabs/miniapp/Tabs.js

@@ -207,8 +207,7 @@ const Tabs = /* @__PURE__ */ React.forwardRef((props, ref) => {
       onScroll: handleScroll,
       enhanced: true,
       showScrollbar: false,
-      enablePassive: true,
-      enableFlex: true
+      enablePassive: true
     },
     /* @__PURE__ */ React.createElement("div", { id: wrapperId, className: tabsScrollWrapperClass }, /* @__PURE__ */ React.createElement(
       TabIndicator,

package/es/Toast/FunctionalToast.js

@@ -35,7 +35,7 @@ import React, {
   useState,
   useRef
 } from "react";
-import { render, unmount, getRootContainer } from "@bifrostui/utils";
+import { render, unmount } from "@bifrostui/utils";
 import Portal from "../Portal";
 import ToastView from "./Toast";
 const defaultProps = {
@@ -61,8 +61,7 @@ const Toast = (props) => {
   };
   const _a = options, { container } = _a, restOptions = __objRest(_a, ["container"]);
   const rootWrapper = document.createElement("div");
-  const rootElement = getRootContainer(container);
-  rootElement == null ? void 0 : rootElement.appendChild(rootWrapper);
+  document.body.appendChild(rootWrapper);
   const ToastComponent = () => {
     const _a2 = restOptions, { duration, multiple, onClose, onExited } = _a2, others = __objRest(_a2, ["duration", "multiple", "onClose", "onExited"]);
     const [open, setOpen] = useState(true);
@@ -100,7 +99,7 @@ const Toast = (props) => {
       }
     };
     instance.close = close;
-    return /* @__PURE__ */ React.createElement(ToastView, __spreadProps(__spreadValues({}, others), { open, onExited: onProxyExited }));
+    return /* @__PURE__ */ React.createElement(Portal, { container }, /* @__PURE__ */ React.createElement(ToastView, __spreadProps(__spreadValues({}, others), { open, onExited: onProxyExited })));
   };
   render(/* @__PURE__ */ React.createElement(ToastComponent, null), rootWrapper);
   return instance;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bifrostui/react",
-  "version": "2.0.0-alpha.25",
+  "version": "2.0.0-alpha.27",
   "description": "React components for building mobile application",
   "homepage": "http://bui.taopiaopiao.com",
   "license": "MIT",
@@ -43,10 +43,10 @@
     "clsx": "^2.1.1",
     "dayjs": "^1.11.7",
     "swiper": "^8.1.5",
-    "@bifrostui/icons": "2.0.0-alpha.25",
-    "@bifrostui/types": "2.0.0-alpha.25",
-    "@bifrostui/styles": "2.0.0-alpha.25",
-    "@bifrostui/utils": "2.0.0-alpha.25"
+    "@bifrostui/styles": "2.0.0-alpha.27",
+    "@bifrostui/icons": "2.0.0-alpha.27",
+    "@bifrostui/types": "2.0.0-alpha.27",
+    "@bifrostui/utils": "2.0.0-alpha.27"
   },
   "peerDependencies": {
     "@tarojs/components": "^3.0.0",