Merge branch 'dev' of github.com:uiwjs/react-native-uiw into rls

Author: rulishu

packages/core/src/Loader/index.tsx

@@ -50,53 +50,45 @@ export interface LoaderProps extends ViewProps {
   tip?: React.ReactNode;
 }
 
-export default class Loader extends Component<LoaderProps> {
-  static defaultProps: LoaderProps = {
-    maskColor: 'rgba(255, 255, 255, 0.85)',
-    loading: true,
-    color: 'gray',
-    size: 'small',
-  };
-  render() {
-    const {
-      children,
-      color: loaderColor,
-      maskColor,
-      rounded,
-      loading,
-      tip,
-      size,
-      vertical,
-      ...otherProps
-    } = this.props;
-    let styleProps: ActivityIndicatorProps['style'] = {};
-    if (maskColor) {
-      styleProps.backgroundColor = maskColor;
-    }
-    if (rounded) {
-      styleProps.borderRadius = rounded;
-    }
-    if (vertical) {
-      styleProps.flexDirection = 'column';
-    }
-    if (!children && !tip) {
-      return <ActivityIndicator animating={loading} size={size} color={loaderColor} />;
-    }
-    const tips =
-      tip || loading ? (
-        <View style={[styles[loading ? 'defalut' : 'stopActivity'], styleProps]}>
-          <ActivityIndicator animating={loading} size={size} color={loaderColor} />
-          {tip && (typeof tip === 'string' ? <Text style={{ color: loaderColor }}>{tip}</Text> : <View>{tip}</View>)}
-        </View>
-      ) : null;
-    if (!children && tip) {
-      return tips;
-    }
-    return (
-      <View {...otherProps}>
-        {tips}
-        {children}
+export default function Loader(props: LoaderProps) {
+  const {
+    children,
+    color: loaderColor = 'gray',
+    maskColor = 'rgba(255, 255, 255, 0.85)',
+    rounded,
+    loading = true,
+    tip,
+    size = 'small',
+    vertical,
+    ...otherProps
+  } = props;
+  let styleProps: ActivityIndicatorProps['style'] = {};
+  if (maskColor) {
+    styleProps.backgroundColor = maskColor;
+  }
+  if (rounded) {
+    styleProps.borderRadius = rounded;
+  }
+  if (vertical) {
+    styleProps.flexDirection = 'column';
+  }
+  if (!children && !tip) {
+    return <ActivityIndicator animating={loading} size={size} color={loaderColor} />;
+  }
+  const tips =
+    tip || loading ? (
+      <View style={[styles[loading ? 'defalut' : 'stopActivity'], styleProps]}>
+        <ActivityIndicator animating={loading} size={size} color={loaderColor} />
+        {tip && (typeof tip === 'string' ? <Text style={{ color: loaderColor }}>{tip}</Text> : <View>{tip}</View>)}
       </View>
-    );
+    ) : null;
+  if (!children && tip) {
+    return tips;
   }
+  return (
+    <View {...otherProps}>
+      {tips}
+      {children}
+    </View>
+  );
 }

website/src/component/Header/index.tsx

@@ -36,6 +36,9 @@ export default function Header(props: HeaderProps) {
           <NavLink to="/home">首页</NavLink>
           <NavLink to="/docs">文档</NavLink>
           <NavLink to="/components">RN组件</NavLink>
+          <a target="__blank" href="https://pushy.reactnative.cn/">
+            热更新
+          </a>
           <a target="__blank" href="https://github.com/uiwjs/react-native-uiw/issues">
             问题反馈
           </a>