@bifrostui/react 1.3.1-beta.0 → 1.3.1-beta.1

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

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

package/dist/Popover/Popover.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 import './Popover.less';
 import { PopoverProps } from './Popover.types';
-declare const Popover: React.ForwardRefExoticComponent<Omit<PopoverProps<"div", {}>, "ref"> & React.RefAttributes<HTMLElement>>;
+declare const Popover: React.ForwardRefExoticComponent<Omit<PopoverProps<"div", {}>, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export default Popover;

package/dist/Popover/Popover.js

@@ -107,7 +107,7 @@ const Popover = /* @__PURE__ */ import_react.default.forwardRef((props, ref) =>
   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_react.useId)();
+  const ttId = (0, import_utils.useUniqueId)();
   const onRootElementMouted = () => {
     const result = (0, import_utils.getStylesAndLocation)({
       childrenRef,
@@ -142,7 +142,7 @@ const Popover = /* @__PURE__ */ import_react.default.forwardRef((props, ref) =>
   const showPopover = (event) => {
     changeOpenStatus(event, true);
   };
-  if (!children || !(title || content))
+  if (!title && !content)
     return null;
   const triggerEventOption = (0, import_utils.triggerEventTransform)({
     trigger,
@@ -153,7 +153,7 @@ 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) && title ? /* @__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,
     __spreadProps(__spreadValues({
       onRootElementMouted
@@ -180,7 +180,7 @@ const Popover = /* @__PURE__ */ import_react.default.forwardRef((props, ref) =>
       ) : null,
       /* @__PURE__ */ import_react.default.createElement("div", { className: "bui-popover-content" }, title ? /* @__PURE__ */ import_react.default.createElement("div", { className: "bui-popover-title" }, title) : null, content ? /* @__PURE__ */ import_react.default.createElement("div", { className: "bui-popover-inner-content" }, content) : null)
     )
-  ) : null, import_react.default.cloneElement(children, childrenOptions));
+  ) : null, import_react.default.isValidElement(children) ? import_react.default.cloneElement(children, childrenOptions) : children);
 });
 Popover.displayName = "BuiPopover";
 var Popover_default = Popover;

package/dist/Popover/Popover.types.d.ts

@@ -4,7 +4,6 @@ import { PortalCoreProps } from '../Portal/Portal.types';
 type triggerType = 'click' | 'hover';
 export type PopoverProps<D extends React.ElementType = 'div', P = {}> = OverrideProps<{
     props: P & {
-        children: React.ReactElement;
         /**
          * 默认是否显隐
          * @default false

package/dist/ThemeProvider/ThemeProvider.js

@@ -31,6 +31,7 @@ __export(ThemeProvider_exports, {
 });
 module.exports = __toCommonJS(ThemeProvider_exports);
 var import_react = __toESM(require("react"));
+var import_utils = require("@bifrostui/utils");
 var import_hooks = require("./hooks");
 var import_constants = require("./utils/constants");
 var import_mountTokens = require("./utils/mountTokens");
@@ -48,13 +49,13 @@ const ThemeProvider = /* @__PURE__ */ import_react.default.forwardRef(
       token,
       children
     } = props;
-    let containerId = ((0, import_react.useId)() || "").replace(/:/g, "");
+    let containerId = (0, import_utils.useUniqueId)();
     containerId = `${import_constants.BUI_VAR_PREFIX}${containerId}`;
     const theme = (0, import_react.useMemo)(() => {
       return { locale };
     }, [locale]);
     let childrenNode = children;
-    if (import_react.default.isValidElement(children)) {
+    if (!isRoot && import_react.default.isValidElement(children)) {
       childrenNode = import_react.default.cloneElement(children, {
         className: `${containerId} ${((_a = children == null ? void 0 : children.props) == null ? void 0 : _a.className) || ""}`.trim()
       });

package/dist/Tooltip/Tooltip.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import './Tooltip.less';
 import { TooltipProps } from './Tooltip.types';
+import './Tooltip.less';
 declare const Tooltip: React.ForwardRefExoticComponent<Omit<TooltipProps<"div", {}>, "ref"> & React.RefAttributes<HTMLElement>>;
 export default Tooltip;

package/dist/Tooltip/Tooltip.js

@@ -63,7 +63,7 @@ var import_clsx = __toESM(require("clsx"));
 var import_react = __toESM(require("react"));
 var import_utils = require("@bifrostui/utils");
 var import_Portal = __toESM(require("../Portal"));
-var import_Tooltip = require("./Tooltip.css");
+var import_Tooltip2 = require("./Tooltip.css");
 const prefixCls = "bui-tooltip";
 const Tooltip = /* @__PURE__ */ import_react.default.forwardRef((props, ref) => {
   const _a = props, {
@@ -103,7 +103,7 @@ const Tooltip = /* @__PURE__ */ import_react.default.forwardRef((props, ref) =>
   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_react.useId)();
+  const ttId = (0, import_utils.useUniqueId)();
   const onRootElementMouted = () => {
     const result = (0, import_utils.getStylesAndLocation)({
       childrenRef,
@@ -147,8 +147,6 @@ const Tooltip = /* @__PURE__ */ import_react.default.forwardRef((props, ref) =>
   const childrenOptions = __spreadValues({
     ref: childrenRef
   }, triggerEventOption);
-  if (!children || !title)
-    return null;
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, (open || openStatus) && title ? /* @__PURE__ */ import_react.default.createElement(
     import_Portal.default,
     __spreadProps(__spreadValues({
@@ -171,7 +169,7 @@ const Tooltip = /* @__PURE__ */ import_react.default.forwardRef((props, ref) =>
       ),
       /* @__PURE__ */ import_react.default.createElement("div", { className: "bui-tooltip-content" }, title)
     )
-  ) : null, import_react.default.cloneElement(children, childrenOptions));
+  ) : null, import_react.default.isValidElement(children) ? import_react.default.cloneElement(children, childrenOptions) : children);
 });
 Tooltip.displayName = "BuiTooltip";
 var Tooltip_default = Tooltip;

package/dist/Tooltip/Tooltip.types.d.ts

@@ -4,7 +4,6 @@ import { PortalCoreProps } from '../Portal/Portal.types';
 type triggerType = 'click' | 'hover';
 export type TooltipProps<D extends React.ElementType = 'div', P = {}> = OverrideProps<{
     props: P & {
-        children: React.ReactElement;
         /**
          * 气泡浮层显示内容
          */

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

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

package/es/Popover/Popover.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 import './Popover.less';
 import { PopoverProps } from './Popover.types';
-declare const Popover: React.ForwardRefExoticComponent<Omit<PopoverProps<"div", {}>, "ref"> & React.RefAttributes<HTMLElement>>;
+declare const Popover: React.ForwardRefExoticComponent<Omit<PopoverProps<"div", {}>, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export default Popover;

package/es/Popover/Popover.js

@@ -30,8 +30,12 @@ var __objRest = (source, exclude) => {
   return target;
 };
 import clsx from "clsx";
-import React, { useState, useRef, useId } from "react";
-import { getStylesAndLocation, triggerEventTransform } from "@bifrostui/utils";
+import React, { useState, useRef } from "react";
+import {
+  getStylesAndLocation,
+  triggerEventTransform,
+  useUniqueId
+} from "@bifrostui/utils";
 import Portal from "../Portal";
 import "./Popover.css";
 const prefixCls = "bui-popover";
@@ -77,7 +81,7 @@ const Popover = /* @__PURE__ */ React.forwardRef((props, ref) => {
   const [arrowDirection, setArrowDirection] = useState(direction);
   const [arrowLocation, setArrowLocation] = useState(location);
   const [tooltyles, setTooltyles] = useState({});
-  const ttId = useId();
+  const ttId = useUniqueId();
   const onRootElementMouted = () => {
     const result = getStylesAndLocation({
       childrenRef,
@@ -112,7 +116,7 @@ const Popover = /* @__PURE__ */ React.forwardRef((props, ref) => {
   const showPopover = (event) => {
     changeOpenStatus(event, true);
   };
-  if (!children || !(title || content))
+  if (!title && !content)
     return null;
   const triggerEventOption = triggerEventTransform({
     trigger,
@@ -123,7 +127,7 @@ const Popover = /* @__PURE__ */ React.forwardRef((props, ref) => {
   const childrenOptions = __spreadValues({
     ref: childrenRef
   }, triggerEventOption);
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, (open || openStatus) && title ? /* @__PURE__ */ React.createElement(
+  return /* @__PURE__ */ React.createElement(React.Fragment, null, open || openStatus ? /* @__PURE__ */ React.createElement(
     Portal,
     __spreadProps(__spreadValues({
       onRootElementMouted
@@ -150,7 +154,7 @@ const Popover = /* @__PURE__ */ React.forwardRef((props, ref) => {
       ) : null,
       /* @__PURE__ */ React.createElement("div", { className: "bui-popover-content" }, title ? /* @__PURE__ */ React.createElement("div", { className: "bui-popover-title" }, title) : null, content ? /* @__PURE__ */ React.createElement("div", { className: "bui-popover-inner-content" }, content) : null)
     )
-  ) : null, React.cloneElement(children, childrenOptions));
+  ) : null, React.isValidElement(children) ? React.cloneElement(children, childrenOptions) : children);
 });
 Popover.displayName = "BuiPopover";
 var Popover_default = Popover;

package/es/Popover/Popover.types.d.ts

@@ -4,7 +4,6 @@ import { PortalCoreProps } from '../Portal/Portal.types';
 type triggerType = 'click' | 'hover';
 export type PopoverProps<D extends React.ElementType = 'div', P = {}> = OverrideProps<{
     props: P & {
-        children: React.ReactElement;
         /**
          * 默认是否显隐
          * @default false

package/es/ThemeProvider/ThemeProvider.js

@@ -1,4 +1,5 @@
-import React, { useMemo, useId, useEffect } from "react";
+import React, { useMemo, useEffect } from "react";
+import { useUniqueId } from "@bifrostui/utils";
 import { ThemeContext } from "./hooks";
 import { BUI_VAR_PREFIX } from "./utils/constants";
 import { mountTokens } from "./utils/mountTokens";
@@ -16,13 +17,13 @@ const ThemeProvider = /* @__PURE__ */ React.forwardRef(
       token,
       children
     } = props;
-    let containerId = (useId() || "").replace(/:/g, "");
+    let containerId = useUniqueId();
     containerId = `${BUI_VAR_PREFIX}${containerId}`;
     const theme = useMemo(() => {
       return { locale };
     }, [locale]);
     let childrenNode = children;
-    if (React.isValidElement(children)) {
+    if (!isRoot && React.isValidElement(children)) {
       childrenNode = React.cloneElement(children, {
         className: `${containerId} ${((_a = children == null ? void 0 : children.props) == null ? void 0 : _a.className) || ""}`.trim()
       });

package/es/Tooltip/Tooltip.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import './Tooltip.less';
 import { TooltipProps } from './Tooltip.types';
+import './Tooltip.less';
 declare const Tooltip: React.ForwardRefExoticComponent<Omit<TooltipProps<"div", {}>, "ref"> & React.RefAttributes<HTMLElement>>;
 export default Tooltip;

package/es/Tooltip/Tooltip.js

@@ -30,8 +30,12 @@ var __objRest = (source, exclude) => {
   return target;
 };
 import clsx from "clsx";
-import React, { useState, useRef, useId } from "react";
-import { getStylesAndLocation, triggerEventTransform } from "@bifrostui/utils";
+import React, { useState, useRef } from "react";
+import {
+  getStylesAndLocation,
+  triggerEventTransform,
+  useUniqueId
+} from "@bifrostui/utils";
 import Portal from "../Portal";
 import "./Tooltip.css";
 const prefixCls = "bui-tooltip";
@@ -73,7 +77,7 @@ const Tooltip = /* @__PURE__ */ React.forwardRef((props, ref) => {
   const [arrowDirection, setArrowDirection] = useState(direction);
   const [arrowLocation, setArrowLocation] = useState(location);
   const [tooltyles, setTooltyles] = useState({});
-  const ttId = useId();
+  const ttId = useUniqueId();
   const onRootElementMouted = () => {
     const result = getStylesAndLocation({
       childrenRef,
@@ -117,8 +121,6 @@ const Tooltip = /* @__PURE__ */ React.forwardRef((props, ref) => {
   const childrenOptions = __spreadValues({
     ref: childrenRef
   }, triggerEventOption);
-  if (!children || !title)
-    return null;
   return /* @__PURE__ */ React.createElement(React.Fragment, null, (open || openStatus) && title ? /* @__PURE__ */ React.createElement(
     Portal,
     __spreadProps(__spreadValues({
@@ -141,7 +143,7 @@ const Tooltip = /* @__PURE__ */ React.forwardRef((props, ref) => {
       ),
       /* @__PURE__ */ React.createElement("div", { className: "bui-tooltip-content" }, title)
     )
-  ) : null, React.cloneElement(children, childrenOptions));
+  ) : null, React.isValidElement(children) ? React.cloneElement(children, childrenOptions) : children);
 });
 Tooltip.displayName = "BuiTooltip";
 var Tooltip_default = Tooltip;

package/es/Tooltip/Tooltip.types.d.ts

@@ -4,7 +4,6 @@ import { PortalCoreProps } from '../Portal/Portal.types';
 type triggerType = 'click' | 'hover';
 export type TooltipProps<D extends React.ElementType = 'div', P = {}> = OverrideProps<{
     props: P & {
-        children: React.ReactElement;
         /**
          * 气泡浮层显示内容
          */

package/package.json

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