[improvement] Functional components be just functions (#2735)

2019-02-14 11:56:02 +08:00
parent 166397dad4
commit 5a9143c736
21 changed files with 704 additions and 674 deletions
@@ -4,40 +4,37 @@ import isSrc from '../utils/validate/src';

 const [sfc] = use('icon');

-export default sfc({
-  functional: true,
+function Icon(h, props, slots, ctx) {
+  const urlIcon = isSrc(props.name);

-  props: {
-    name: String,
-    size: String,
-    color: String,
-    info: [String, Number],
-    classPrefix: {
-      type: String,
-      default: 'van-icon'
-    }
-  },
+  return (
+    <i
+      class={[
+        props.classPrefix,
+        urlIcon ? 'van-icon--image' : `${props.classPrefix}-${props.name}`
+      ]}
+      style={{
+        color: props.color,
+        fontSize: props.size
+      }}
+      {...ctx.data}
+    >
+      {ctx.default && ctx.default()}
+      {urlIcon && <img src={props.name} />}
+      <Info info={props.info} />
+    </i>
+  );
+}

-  render(h, context) {
-    const { props } = context;
-    const urlIcon = isSrc(props.name);
-
-    return (
-      <i
-        class={[
-          props.classPrefix,
-          urlIcon ? 'van-icon--image' : `${props.classPrefix}-${props.name}`
-        ]}
-        style={{
-          color: props.color,
-          fontSize: props.size
-        }}
-        {...context.data}
-      >
-        {context.children}
-        {urlIcon && <img src={props.name} />}
-        <Info info={props.info} />
-      </i>
-    );
+Icon.props = {
+  name: String,
+  size: String,
+  color: String,
+  info: [String, Number],
+  classPrefix: {
+    type: String,
+    default: 'van-icon'
  }
-});
+};
+
+export default sfc(Icon);