fix: diplay components may have error attr

yehuozhili · Jun 26, 2020 · 0dfc316 · 0dfc316
1 parent 33144a2
commit 0dfc316
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 21 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bigbear-ui",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Neumorphic component library for React;基于React制作的拟物风格组件库",
   "keywords": [
     "component",

diff --git a/src/components/Alert/alert.tsx b/src/components/Alert/alert.tsx
@@ -67,6 +67,8 @@ export const Alert: FC<AlertProps> = function(props: AlertProps) {
 		initiativeCloseCallback,
 		children,
 		style,
+		icon,
+		close,
 		...restProps
 	} = props;
 	const classes = classNames(
@@ -98,12 +100,12 @@ export const Alert: FC<AlertProps> = function(props: AlertProps) {
 		>
 			<div className={classes} style={style} {...restProps}>
 				<span>
-					{props.icon && props.icon}
+					{icon && icon}
 					{title}
 				</span>
 				{description && <span>{description}</span>}
 				{children}
-				{props.close && (
+				{close && (
 					<Button
 						btnType={type}
 						onClick={(e) => {

diff --git a/src/components/Badge/badge.tsx b/src/components/Badge/badge.tsx
@@ -26,7 +26,7 @@ export interface BadgeProps extends DOMAttributes<HTMLDivElement> {
 }
 
 export const Badge: FC<BadgeProps> = (props) => {
-	const { refCallback, className, type, count, visible, dot, ...restProps } = props;
+	const { refCallback, className, type, count, visible, dot, children, ...restProps } = props;
 	const classes = classNames("bigbear-badge", `bigbear-type-${type}`, className);
 	const divref = useRef<HTMLDivElement>(null);
 	useEffect(() => {
@@ -39,14 +39,14 @@ export const Badge: FC<BadgeProps> = (props) => {
 			{count || dot ? (
 				<div
 					className={`bigbear-badge-count bigbear-count-${type}
-            ${props.children ? "" : "nochildren"} ${visible ? "" : "badge-hide"} ${
+            ${children ? "" : "nochildren"} ${visible ? "" : "badge-hide"} ${
 						dot ? "badge-dot" : ""
 					}`}
 				>
 					<span>{count}</span>
 				</div>
 			) : null}
-			{props.children ? props.children : null}
+			{children ? children : null}
 		</div>
 	);
 };

diff --git a/src/components/Grid/grid.tsx b/src/components/Grid/grid.tsx
@@ -21,7 +21,7 @@ interface ColProps extends DOMAttributes<HTMLDivElement> {
 }
 
 function Col(props: PropsWithChildren<ColProps>) {
-	const { className, style, xxl, xs, sm, md, lg, xl, ...restProps } = props;
+	const { className, style, xxl, xs, sm, md, lg, xl, children, ...restProps } = props;
 	const classes = classnames("bigbear-grid-col", className, {
 		[`bigbear-col-xs-${xs}`]: typeof xs === "number",
 		[`bigbear-col-sm-${sm}`]: typeof sm === "number",
@@ -32,7 +32,7 @@ function Col(props: PropsWithChildren<ColProps>) {
 	});
 	return (
 		<div className={classes} style={style} {...restProps}>
-			{props.children}
+			{children}
 		</div>
 	);
 }
@@ -45,11 +45,11 @@ interface RowProps extends DOMAttributes<HTMLDivElement> {
 }
 
 function Row(props: PropsWithChildren<RowProps>) {
-	const { className, style, ...restProps } = props;
+	const { className, style, children, ...restProps } = props;
 	const classes = classnames("bigbear-grid-row", className);
 	return (
 		<div className={classes} style={style} {...restProps}>
-			{props.children}
+			{children}
 		</div>
 	);
 }

diff --git a/src/components/Layout/layout.tsx b/src/components/Layout/layout.tsx
@@ -14,53 +14,53 @@ export interface LayoutProps extends LayoutItemProps {
 }
 
 function Layout(props: PropsWithChildren<LayoutProps>) {
-	const { style, className, row, ...restProps } = props;
+	const { style, className, row, children, ...restProps } = props;
 	const classes = classnames("bigbear-layout", className, {
 		"bigbear-layout-row": row
 	});
 	return (
 		<section className={classes} style={style} {...restProps}>
-			{props.children}
+			{children}
 		</section>
 	);
 }
 
 function Header(props: PropsWithChildren<LayoutItemProps>) {
-	const { style, className, ...restProps } = props;
+	const { style, className, children, ...restProps } = props;
 	const classes = classnames("bigbear-layout-header", className);
 	return (
 		<header className={classes} style={style} {...restProps}>
-			{props.children}
+			{children}
 		</header>
 	);
 }
 
 function Content(props: PropsWithChildren<LayoutItemProps>) {
-	const { style, className } = props;
+	const { style, className, children, ...restProps } = props;
 	const classes = classnames("bigbear-layout-content", className);
 	return (
-		<main className={classes} style={style}>
-			{props.children}
+		<main className={classes} style={style} {...restProps}>
+			{children}
 		</main>
 	);
 }
 
 function Sider(props: PropsWithChildren<LayoutItemProps>) {
-	const { style, className, ...restProps } = props;
+	const { style, className, children, ...restProps } = props;
 	const classes = classnames("bigbear-layout-sider", className);
 	return (
 		<aside className={classes} style={style} {...restProps}>
-			{props.children}
+			{children}
 		</aside>
 	);
 }
 
 function Footer(props: PropsWithChildren<LayoutItemProps>) {
-	const { style, className, ...restProps } = props;
+	const { style, className, children, ...restProps } = props;
 	const classes = classnames("bigbear-layout-footer", className);
 	return (
 		<footer className={classes} style={style} {...restProps}>
-			{props.children}
+			{children}
 		</footer>
 	);
 }