Web: Common: fix props rectangle

web/ASC.Web.Common/src/components/Loaders/RectangleLoader.js

@@ -3,29 +3,28 @@ import ContentLoader from "react-content-loader";
 import PropTypes from "prop-types";
 import { LoaderStyle } from "../../constants/index";
 
-const RectangleLoader = (props) => (
+const RectangleLoader = ({
-  <ContentLoader
+  x,
-    speed={props.speed}
+  y,
-    width={"100%"}
+  borderRadius,
-    height={32}
+  width,
-    backgroundColor={props.backgroundColor}
+  height,
-    foregroundColor={props.foregroundColor}
+  animation,
-    backgroundOpacity={props.backgroundOpacity}
+  ...rest
-    foregroundOpacity={props.foregroundOpacity}
+}) => (
-    {...props}
+  <ContentLoader width={width} height={height} {...rest}>
-  >
     <rect
-      x={props.x}
+      x={x}
-      y={props.y}
+      y={y}
-      rx={props.borderRadius}
+      rx={borderRadius}
-      ry={props.borderRadius}
+      ry={borderRadius}
-      width={props.width}
+      width={width}
-      height={props.height}
+      height={height}
     />
   </ContentLoader>
 );
 
-RectangleLoader.PropTypes = {
+RectangleLoader.propTypes = {
   x: PropTypes.string,
   y: PropTypes.string,
   width: PropTypes.string,
@@ -36,6 +35,7 @@ RectangleLoader.PropTypes = {
   backgroundOpacity: PropTypes.number,
   foregroundOpacity: PropTypes.number,
   speed: PropTypes.number,
+  animate: PropTypes.bool,
 };
 
 RectangleLoader.defaultProps = {
@@ -49,6 +49,7 @@ RectangleLoader.defaultProps = {
   backgroundOpacity: LoaderStyle.backgroundOpacity,
   foregroundOpacity: LoaderStyle.foregroundOpacity,
   speed: LoaderStyle.speed,
+  animate: LoaderStyle.animate,
 };
 
 export default RectangleLoader;