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

packages/button/index.js

@@ -4,10 +4,50 @@ import Loading from '../loading';
 
 const [sfc, bem] = use('button');
 
-export default sfc({
-  functional: true,
+function Button(h, props, slots, ctx) {
+  const { type, disabled, loading, loadingText } = props;
 
-  props: {
+  const onClick = event => {
+    if (!loading && !disabled) {
+      emit(ctx, 'click', event);
+    }
+  };
+
+  return (
+    <props.tag
+      type={props.nativeType}
+      disabled={disabled}
+      class={bem([
+        type,
+        props.size,
+        {
+          loading,
+          disabled,
+          block: props.block,
+          plain: props.plain,
+          round: props.round,
+          square: props.square,
+          'bottom-action': props.bottomAction
+        }
+      ])}
+      onClick={onClick}
+      {...inherit(ctx)}
+    >
+      {loading ? (
+        [
+          <Loading size="20px" color={type === 'default' ? undefined : ''} />,
+          loadingText && <span class={bem('loading-text')}>{loadingText}</span>
+        ]
+      ) : (
+        <span class={bem('text')}>
+          {slots.default ? slots.default() : props.text}
+        </span>
+      )}
+    </props.tag>
+  );
+}
+
+Button.props = {
   text: String,
   block: Boolean,
   plain: Boolean,
@@ -30,49 +70,6 @@ export default sfc({
     type: String,
     default: 'normal'
   }
-  },
+};
 
-  render(h, context) {
-    const { props } = context;
-    const { type, disabled, loading, loadingText } = props;
-
-    const onClick = event => {
-      if (!loading && !disabled) {
-        emit(context, 'click', event);
-      }
-    };
-
-    return (
-      <props.tag
-        type={props.nativeType}
-        disabled={disabled}
-        class={bem([
-          type,
-          props.size,
-          {
-            loading,
-            disabled,
-            block: props.block,
-            plain: props.plain,
-            round: props.round,
-            square: props.square,
-            'bottom-action': props.bottomAction
-          }
-        ])}
-        onClick={onClick}
-        {...inherit(context)}
-      >
-        {loading ? (
-          [
-            <Loading size="20px" color={type === 'default' ? undefined : ''} />,
-            loadingText && (
-              <span class={bem('loading-text')}>{loadingText}</span>
-            )
-          ]
-        ) : (
-          <span class={bem('text')}>{context.children || props.text}</span>
-        )}
-      </props.tag>
-    );
-  }
-});
+export default sfc(Button);

packages/cell-group/index.js

@@ -2,21 +2,22 @@ import { use } from '../utils';
 
 const [sfc, bem] = use('cell-group');
 
-export default sfc({
-  functional: true,
+function CellGroup(h, props, slots, ctx) {
+  return (
+    <div
+      class={[bem(), { 'van-hairline--top-bottom': props.border }]}
+      {...ctx.data}
+    >
+      {slots.default && slots.default()}
+    </div>
+  );
+}
 
-  props: {
+CellGroup.props = {
   border: {
     type: Boolean,
     default: true
   }
-  },
+};
 
-  render(h, context) {
-    return (
-      <div class={[bem(), { 'van-hairline--top-bottom': context.props.border }]} {...context.data}>
-        {context.children}
-      </div>
-    );
-  }
-});
+export default sfc(CellGroup);

packages/cell/index.js

@@ -1,25 +1,12 @@
 import { use, isDef } from '../utils';
 import { cellProps } from './shared';
-import { emit, inherit, unifySlots } from '../utils/functional';
+import { emit, inherit } from '../utils/functional';
 import { routeProps, functionalRoute } from '../mixins/router';
 import Icon from '../icon';
 
 const [sfc, bem] = use('cell');
 
-export default sfc({
-  functional: true,
-
-  props: {
-    ...cellProps,
-    ...routeProps,
-    size: String,
-    clickable: Boolean,
-    arrowDirection: String
-  },
-
-  render(h, context) {
-    const slots = unifySlots(context);
-    const { props } = context;
+function Cell(h, props, slots, ctx) {
   const { icon, size, title, label, value, isLink, arrowDirection } = props;
 
   const showTitle = slots.title || isDef(title);
@@ -57,8 +44,8 @@ export default sfc({
     );
 
   const onClick = event => {
-      emit(context, 'click', event);
-      functionalRoute(context);
+    emit(ctx, 'click', event);
+    functionalRoute(ctx);
   };
 
   return (
@@ -71,7 +58,7 @@ export default sfc({
         [size]: size
       })}
       onClick={onClick}
-        {...inherit(context)}
+      {...inherit(ctx)}
     >
       {LeftIcon}
       {Title}
@@ -80,5 +67,14 @@ export default sfc({
       {slots.extra && slots.extra()}
     </div>
   );
-  }
-});
+}
+
+Cell.props = {
+  ...cellProps,
+  ...routeProps,
+  size: String,
+  clickable: Boolean,
+  arrowDirection: String
+};
+
+export default sfc(Cell);

packages/contact-card/index.js

@@ -4,25 +4,7 @@ import Cell from '../cell';
 
 const [sfc, bem, t] = use('contact-card');
 
-export default sfc({
-  functional: true,
-
-  props: {
-    tel: String,
-    name: String,
-    addText: String,
-    editable: {
-      type: Boolean,
-      default: true
-    },
-    type: {
-      type: String,
-      default: 'add'
-    }
-  },
-
-  render(h, context) {
-    const { props } = context;
+function ContactCard(h, props, slots, ctx) {
   const { type, editable } = props;
 
   return (
@@ -35,15 +17,33 @@ export default sfc({
       icon={type === 'edit' ? 'contact' : 'add-square'}
       onClick={event => {
         if (editable) {
-            emit(context, 'click', event);
+          emit(ctx, 'click', event);
         }
       }}
-        {...inherit(context)}
+      {...inherit(ctx)}
     >
       {type === 'add'
         ? props.addText || t('addText')
-          : [<div>{`${t('name')}：${props.name}`}</div>, <div>{`${t('tel')}：${props.tel}`}</div>]}
+        : [
+            <div>{`${t('name')}：${props.name}`}</div>,
+            <div>{`${t('tel')}：${props.tel}`}</div>
+        ]}
     </Cell>
   );
+}
+
+ContactCard.props = {
+  tel: String,
+  name: String,
+  addText: String,
+  editable: {
+    type: Boolean,
+    default: true
+  },
+  type: {
+    type: String,
+    default: 'add'
   }
-});
+};
+
+export default sfc(ContactCard);

packages/contact-list/index.js

@@ -8,18 +8,7 @@ import RadioGroup from '../radio-group';
 
 const [sfc, bem, t] = use('contact-list');
 
-export default sfc({
-  functional: true,
-
-  props: {
-    value: null,
-    list: Array,
-    addText: String
-  },
-
-  render(h, context) {
-    const { props, listeners } = context;
-
+function ContactList(h, props, slots, ctx) {
   const List = props.list.map((item, index) => (
     <Cell
       key={item.id}
@@ -38,20 +27,20 @@ export default sfc({
             class={bem('edit')}
             onClick={event => {
               event.stopPropagation();
-                emit(context, 'edit', item, index);
+              emit(ctx, 'edit', item, index);
             }}
           />
         )
       }}
       onClick={() => {
-          emit(context, 'input', item.id);
-          emit(context, 'select', item, index);
+        emit(ctx, 'input', item.id);
+        emit(ctx, 'select', item, index);
       }}
     />
   ));
 
   return (
-      <div class={bem()} {...inherit(context)}>
+    <div class={bem()} {...inherit(ctx)}>
       <RadioGroup value={props.value} class={bem('group')}>
         {List}
       </RadioGroup>
@@ -61,9 +50,16 @@ export default sfc({
         type="danger"
         class={bem('add')}
         text={props.addText || t('addText')}
-          onClick={listeners.add || noop}
+        onClick={ctx.listeners.add || noop}
       />
     </div>
   );
-  }
-});
+}
+
+ContactList.props = {
+  value: null,
+  list: Array,
+  addText: String
+};
+
+export default sfc(ContactList);

packages/goods-action-big-btn/index.js

@@ -1,28 +1,14 @@
 import { use } from '../utils';
 import Button from '../button';
-import { emit, inherit, unifySlots } from '../utils/functional';
+import { emit, inherit } from '../utils/functional';
 import { functionalRoute, routeProps } from '../mixins/router';
 
 const [sfc, bem] = use('goods-action-big-btn');
 
-export default sfc({
-  functional: true,
-
-  props: {
-    ...routeProps,
-    text: String,
-    primary: Boolean,
-    loading: Boolean,
-    disabled: Boolean
-  },
-
-  render(h, context) {
-    const { props } = context;
-    const slots = unifySlots(context);
-
+function GoodsActionBigBtn(h, props, slots, ctx) {
   const onClick = event => {
-      emit(context, 'click', event);
-      functionalRoute(context);
+    emit(ctx, 'click', event);
+    functionalRoute(ctx);
   };
 
   return (
@@ -34,10 +20,19 @@ export default sfc({
       disabled={props.disabled}
       type={props.primary ? 'danger' : 'warning'}
       onClick={onClick}
-        {...inherit(context)}
+      {...inherit(ctx)}
     >
       {slots.default ? slots.default() : props.text}
     </Button>
   );
-  }
-});
+}
+
+GoodsActionBigBtn.props = {
+  ...routeProps,
+  text: String,
+  primary: Boolean,
+  loading: Boolean,
+  disabled: Boolean
+};
+
+export default sfc(GoodsActionBigBtn);

packages/goods-action-mini-btn/index.js

@@ -1,35 +1,21 @@
 import { use } from '../utils';
 import Icon from '../icon';
-import { emit, inherit, unifySlots } from '../utils/functional';
+import { emit, inherit } from '../utils/functional';
 import { functionalRoute, routeProps } from '../mixins/router';
 
 const [sfc, bem] = use('goods-action-mini-btn');
 
-export default sfc({
-  functional: true,
-
-  props: {
-    ...routeProps,
-    text: String,
-    icon: String,
-    info: [String, Number],
-    iconClass: String
-  },
-
-  render(h, context) {
-    const { props } = context;
-    const slots = unifySlots(context);
-
+function GoodsActionMiniBtn(h, props, slots, ctx) {
   const onClick = event => {
-      emit(context, 'click', event);
-      functionalRoute(context);
+    emit(ctx, 'click', event);
+    functionalRoute(ctx);
   };
 
   return (
     <div
       class={[bem(), 'van-hairline']}
       onClick={onClick}
-        {...inherit(context)}
+      {...inherit(ctx)}
     >
       <Icon
         class={[bem('icon'), props.iconClass]}
@@ -39,5 +25,14 @@ export default sfc({
       {slots.default ? slots.default() : props.text}
     </div>
   );
-  }
-});
+}
+
+GoodsActionMiniBtn.props = {
+  ...routeProps,
+  text: String,
+  icon: String,
+  info: [String, Number],
+  iconClass: String
+};
+
+export default sfc(GoodsActionMiniBtn);

packages/goods-action/index.js

@@ -2,14 +2,12 @@ import { use } from '../utils';
 
 const [sfc, bem] = use('goods-action');
 
-export default sfc({
-  functional: true,
-
-  render(h, context) {
+function GoodsAction(h, props, slots, ctx) {
   return (
-      <div class={bem()} {...context.data}>
-        {context.children}
+    <div class={bem()} {...ctx.data}>
+      {slots.default && slots.default()}
     </div>
   );
-  }
-});
+}
+
+export default sfc(GoodsAction);

packages/icon/index.js

@@ -4,22 +4,7 @@ import isSrc from '../utils/validate/src';
 
 const [sfc] = use('icon');
 
-export default sfc({
-  functional: true,
-
-  props: {
-    name: String,
-    size: String,
-    color: String,
-    info: [String, Number],
-    classPrefix: {
-      type: String,
-      default: 'van-icon'
-    }
-  },
-
-  render(h, context) {
-    const { props } = context;
+function Icon(h, props, slots, ctx) {
   const urlIcon = isSrc(props.name);
 
   return (
@@ -32,12 +17,24 @@ export default sfc({
         color: props.color,
         fontSize: props.size
       }}
-        {...context.data}
+      {...ctx.data}
     >
-        {context.children}
+      {ctx.default && ctx.default()}
       {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);

packages/info/index.js

@@ -2,20 +2,18 @@ import { use, isDef } from '../utils';
 
 const [sfc, bem] = use('info');
 
-export default sfc({
-  functional: true,
-
-  props: {
-    info: [String, Number]
-  },
-
-  render(h, { props, data }) {
+function Info(h, props, slots, ctx) {
   return (
     isDef(props.info) && (
-        <div class={bem()} {...data}>
+      <div class={bem()} {...ctx.data}>
         {props.info}
       </div>
     )
   );
-  }
-});
+}
+
+Info.props = {
+  info: [String, Number]
+};
+
+export default sfc(Info);

packages/loading/index.js

@@ -3,23 +3,8 @@ import { use } from '../utils';
 const [sfc, bem] = use('loading');
 const DEFAULT_COLOR = '#c9c9c9';
 
-export default sfc({
-  functional: true,
-
-  props: {
-    size: String,
-    type: {
-      type: String,
-      default: 'circular'
-    },
-    color: {
-      type: String,
-      default: DEFAULT_COLOR
-    }
-  },
-
-  render(h, context) {
-    const { color, size, type } = context.props;
+function Loading(h, props, slots, ctx) {
+  const { color, size, type } = props;
 
   const colorType = color === 'white' || color === 'black' ? color : '';
 
@@ -43,12 +28,25 @@ export default sfc({
   );
 
   return (
-      <div class={bem([type, colorType])} style={style} {...context.data}>
+    <div class={bem([type, colorType])} style={style} {...ctx.data}>
       <span class={bem('spinner', type)}>
         {Spin}
         {Circular}
       </span>
     </div>
   );
+}
+
+Loading.props = {
+  size: String,
+  type: {
+    type: String,
+    default: 'circular'
+  },
+  color: {
+    type: String,
+    default: DEFAULT_COLOR
   }
-});
+};
+
+export default sfc(Loading);

packages/nav-bar/index.js

@@ -4,10 +4,43 @@ import Icon from '../icon';
 
 const [sfc, bem] = use('nav-bar');
 
-export default sfc({
-  functional: true,
+function NavBar(h, props, slots, ctx) {
+  return (
+    <div
+      class={[
+        bem({ fixed: props.fixed }),
+        { 'van-hairline--bottom': props.border }
+      ]}
+      style={{ zIndex: props.zIndex }}
+      {...inherit(ctx)}
+    >
+      <div class={bem('left')} onClick={ctx.listeners['click-left'] || noop}>
+        {slots.left
+          ? slots.left()
+          : [
+            props.leftArrow && (
+              <Icon class={bem('arrow')} name="arrow-left" />
+            ),
+            props.leftText && (
+              <span class={bem('text')}>{props.leftText}</span>
+            )
+          ]}
+      </div>
+      <div class={[bem('title'), 'van-ellipsis']}>
+        {slots.title ? slots.title() : props.title}
+      </div>
+      <div class={bem('right')} onClick={ctx.listeners['click-right'] || noop}>
+        {slots.right
+          ? slots.right()
+          : props.rightText && (
+              <span class={bem('text')}>{props.rightText}</span>
+          )}
+      </div>
+    </div>
+  );
+}
 
-  props: {
+NavBar.props = {
   title: String,
   fixed: Boolean,
   leftText: String,
@@ -21,29 +54,6 @@ export default sfc({
     type: Number,
     default: 1
   }
-  },
+};
 
-  render(h, context) {
-    const { props, listeners } = context;
-    const slots = context.slots();
-
-    return (
-      <div
-        class={[bem({ fixed: props.fixed }), { 'van-hairline--bottom': props.border }]}
-        style={{ zIndex: props.zIndex }}
-        {...inherit(context)}
-      >
-        <div class={bem('left')} onClick={listeners['click-left'] || noop}>
-          {slots.left || [
-            props.leftArrow && <Icon class={bem('arrow')} name="arrow-left" />,
-            props.leftText && <span class={bem('text')}>{props.leftText}</span>
-          ]}
-        </div>
-        <div class={[bem('title'), 'van-ellipsis']}>{slots.title || props.title}</div>
-        <div class={bem('right')} onClick={listeners['click-right'] || noop}>
-          {slots.right || (props.rightText && <span class={bem('text')}>{props.rightText}</span>)}
-        </div>
-      </div>
-    );
-  }
-});
+export default sfc(NavBar);

packages/panel/index.js

@@ -4,23 +4,12 @@ import CellGroup from '../cell-group';
 
 const [sfc, bem] = use('panel');
 
-export default sfc({
-  functional: true,
-
-  props: {
-    icon: String,
-    desc: String,
-    title: String,
-    status: String
-  },
-
-  render(h, context) {
-    const { props } = context;
-    const slots = context.slots();
-
+function Panel(h, props, slots, ctx) {
   return (
-      <CellGroup class={bem()} {...context.data}>
-        {slots.header || (
+    <CellGroup class={bem()} {...ctx.data}>
+      {slots.header ? (
+        slots.header()
+      ) : (
         <Cell
           icon={props.icon}
           label={props.desc}
@@ -30,9 +19,19 @@ export default sfc({
           valueClass={bem('header-value')}
         />
       )}
-        <div class={bem('content')}>{slots.default}</div>
-        {slots.footer && <div class={[bem('footer'), 'van-hairline--top']}>{slots.footer}</div>}
+      <div class={bem('content')}>{slots.default && slots.default()}</div>
+      {slots.footer && (
+        <div class={[bem('footer'), 'van-hairline--top']}>{slots.footer()}</div>
+      )}
     </CellGroup>
   );
-  }
-});
+}
+
+Panel.props = {
+  icon: String,
+  desc: String,
+  title: String,
+  status: String
+};
+
+export default sfc(Panel);

packages/password-input/index.js

@@ -3,24 +3,7 @@ import { emit } from '../utils/functional';
 
 const [sfc, bem] = use('password-input');
 
-export default sfc({
-  functional: true,
-
-  props: {
-    info: String,
-    errorInfo: String,
-    value: {
-      type: String,
-      default: ''
-    },
-    length: {
-      type: Number,
-      default: 6
-    }
-  },
-
-  render(h, context) {
-    const { props } = context;
+function PasswordInput(h, props, slots, ctx) {
   const info = props.errorInfo || props.info;
 
   const Points = [];
@@ -38,14 +21,30 @@ export default sfc({
         class={[bem('security'), 'van-hairline--surround']}
         onTouchstart={event => {
           event.stopPropagation();
-            emit(context, 'focus', event);
+          emit(ctx, 'focus', event);
         }}
-          {...context.data}
+        {...ctx.data}
       >
         {Points}
       </ul>
-        {info && <div class={bem(props.errorInfo ? 'error-info' : 'info')}>{info}</div>}
+      {info && (
+        <div class={bem(props.errorInfo ? 'error-info' : 'info')}>{info}</div>
+      )}
     </div>
   );
+}
+
+PasswordInput.props = {
+  info: String,
+  errorInfo: String,
+  value: {
+    type: String,
+    default: ''
+  },
+  length: {
+    type: Number,
+    default: 6
   }
-});
+};
+
+export default sfc(PasswordInput);

packages/submit-bar/index.js

@@ -4,10 +4,44 @@ import Button from '../button';
 
 const [sfc, bem, t] = use('submit-bar');
 
-export default sfc({
-  functional: true,
+function SubmitBar(h, props, slots, ctx) {
+  const { tip, price } = props;
+  const hasPrice = typeof price === 'number';
 
-  props: {
+  return (
+    <div class={bem()} {...inherit(ctx)}>
+      {slots.top && slots.top()}
+      {(slots.tip || tip) && (
+        <div class={bem('tip')}>
+          {tip}
+          {slots.tip && slots.tip()}
+        </div>
+      )}
+      <div class={bem('bar')}>
+        {slots.default && slots.default()}
+        <div class={bem('text')}>
+          {hasPrice && [
+            <span>{props.label || t('label')}</span>,
+            <span class={bem('price')}>{`${props.currency} ${(
+              price / 100
+            ).toFixed(2)}`}</span>
+          ]}
+        </div>
+        <Button
+          square
+          size="large"
+          type={props.buttonType}
+          loading={props.loading}
+          disabled={props.disabled}
+          text={props.loading ? '' : props.buttonText}
+          onClick={ctx.listeners.submit || noop}
+        />
+      </div>
+    </div>
+  );
+}
+
+SubmitBar.props = {
   tip: String,
   label: String,
   loading: Boolean,
@@ -25,42 +59,6 @@ export default sfc({
     type: String,
     default: 'danger'
   }
-  },
+};
 
-  render(h, context) {
-    const { props, listeners } = context;
-    const { tip, price } = props;
-    const slots = context.slots();
-    const hasPrice = typeof price === 'number';
-
-    return (
-      <div class={bem()} {...inherit(context)}>
-        {slots.top}
-        {(slots.tip || tip) && (
-          <div class={bem('tip')}>
-            {tip}
-            {slots.tip}
-          </div>
-        )}
-        <div class={bem('bar')}>
-          {slots.default}
-          <div class={bem('text')}>
-            {hasPrice && [
-              <span>{props.label || t('label')}</span>,
-              <span class={bem('price')}>{`${props.currency} ${(price / 100).toFixed(2)}`}</span>
-            ]}
-          </div>
-          <Button
-            square
-            size="large"
-            type={props.buttonType}
-            loading={props.loading}
-            disabled={props.disabled}
-            text={props.loading ? '' : props.buttonText}
-            onClick={listeners.submit || noop}
-          />
-        </div>
-      </div>
-    );
-  }
-});
+export default sfc(SubmitBar);

packages/switch-cell/index.js

@@ -2,31 +2,32 @@ import { use } from '../utils';
 import { inherit } from '../utils/functional';
 import Cell from '../cell';
 import Switch from '../switch';
-import SwitchMixin from '../mixins/switch';
+import { switchProps } from '../switch/shared';
 
 const [sfc, bem] = use('switch-cell');
 
-export default sfc({
-  functional: true,
+function SwitchCell(h, props, slots, ctx) {
+  return (
+    <Cell
+      center
+      title={props.title}
+      border={props.border}
+      class={bem()}
+      {...inherit(ctx)}
+    >
+      <Switch {...{ props, on: ctx.listeners }} />
+    </Cell>
+  );
+}
 
-  mixins: [SwitchMixin],
-
-  props: {
+SwitchCell.props = {
+  ...switchProps,
   title: String,
   border: Boolean,
   size: {
     type: String,
     default: '24px'
   }
-  },
+};
 
-  render(h, context) {
-    const { props } = context;
-
-    return (
-      <Cell center title={props.title} border={props.border} class={bem()} {...inherit(context)}>
-        <Switch {...{ props, on: context.listeners }} />
-      </Cell>
-    );
-  }
-});
+export default sfc(SwitchCell);

packages/switch/index.js

@@ -1,11 +1,11 @@
 import { use } from '../utils';
 import Loading from '../loading';
-import SwitchMixin from '../mixins/switch';
+import { switchProps } from './shared';
 
 const [sfc, bem] = use('switch');
 
 export default sfc({
-  mixins: [SwitchMixin],
+  props: switchProps,
 
   methods: {
     onClick() {

packages/switch/shared.ts

@@ -0,0 +1,23 @@
+/**
+ * Common Switch Props
+ */
+
+export const switchProps = {
+  value: null,
+  loading: Boolean,
+  disabled: Boolean,
+  activeColor: String,
+  inactiveColor: String,
+  activeValue: {
+    type: null,
+    default: true
+  },
+  inactiveValue: {
+    type: null,
+    default: false
+  },
+  size: {
+    type: String,
+    default: '30px'
+  }
+};

packages/tag/index.js

@@ -9,22 +9,8 @@ const COLOR_MAP = {
   success: GREEN
 };
 
-export default sfc({
-  functional: true,
-
-  props: {
-    size: String,
-    type: String,
-    mark: Boolean,
-    color: String,
-    plain: Boolean,
-    round: Boolean,
-    textColor: String
-  },
-
-  render(h, context) {
-    const { props } = context;
-    const { mark, plain, round, size } = context.props;
+function Tag(h, props, slots, ctx) {
+  const { mark, plain, round, size } = ctx.props;
 
   const color = props.color || COLOR_MAP[props.type] || GRAY_DARK;
   const key = plain ? 'color' : 'backgroundColor';
@@ -43,10 +29,21 @@ export default sfc({
           'van-hairline--surround': plain
         }
       ]}
-        {...context.data}
+      {...ctx.data}
     >
-        {context.children}
+      {slots.default && slots.default()}
     </span>
   );
-  }
-});
+}
+
+Tag.props = {
+  size: String,
+  type: String,
+  mark: Boolean,
+  color: String,
+  plain: Boolean,
+  round: Boolean,
+  textColor: String
+};
+
+export default sfc(Tag);

packages/utils/functional.ts

@@ -1,5 +1,4 @@
 import { RenderContext, VNodeData } from 'vue/types';
-import { ScopedSlot } from 'vue/types/vnode';
 
 type ObjectIndex = {
   [key: string]: any;
@@ -47,17 +46,3 @@ export function emit(context: Context, eventName: string, ...args: any[]) {
     }
   }
 }
-
-// unify slots & scopedSlots
-export function unifySlots(context: Context) {
-  const { scopedSlots } = context;
-  const slots = context.slots();
-
-  Object.keys(slots).forEach(key => {
-    if (!scopedSlots[key]) {
-      scopedSlots[key] = () => slots[key];
-    }
-  });
-
-  return scopedSlots;
-}

packages/utils/use/sfc.ts

@@ -4,13 +4,29 @@
 import '../../locale';
 import { camelize } from '..';
 import SlotsMixin from '../../mixins/slots';
-import Vue, { VueConstructor, ComponentOptions } from 'vue';
+import Vue, {
+  VueConstructor,
+  ComponentOptions,
+  CreateElement,
+  RenderContext
+} from 'vue/types';
+import { VNode, ScopedSlot } from 'vue/types/vnode';
 
 type VantComponentOptions = ComponentOptions<Vue> & {
   functional?: boolean;
   install?: (Vue: VueConstructor) => void;
 };
 
+type VantPureComponent = {
+  (
+    h: CreateElement,
+    props: { [key: string]: any },
+    slots: { [key: string]: ScopedSlot | undefined },
+    context: RenderContext
+  ): VNode;
+  props: any;
+};
+
 const arrayProp = {
   type: Array,
   default: () => []
@@ -39,15 +55,46 @@ function install(this: ComponentOptions<Vue>, Vue: VueConstructor) {
   }
 }
 
-export default (name: string) => (sfc: VantComponentOptions) => {
-  sfc.name = name;
-  sfc.install = install;
+// unify slots & scopedSlots
+export function unifySlots(context: RenderContext) {
+  const { scopedSlots } = context;
+  const slots = context.slots();
+
+  Object.keys(slots).forEach(key => {
+    if (!scopedSlots[key]) {
+      scopedSlots[key] = () => slots[key];
+    }
+  });
+
+  return scopedSlots;
+}
+
+function transformPureComponent(pure: VantPureComponent): VantComponentOptions {
+  return {
+    functional: true,
+    props: pure.props,
+    render: (h, context) => pure(h, context.props, unifySlots(context), context)
+  };
+}
+
+export default (name: string) => (
+  sfc: VantComponentOptions | VantPureComponent
+) => {
+  if (typeof sfc === 'function') {
+    sfc = transformPureComponent(sfc);
+  }
+
+  if (!sfc.functional) {
     sfc.mixins = sfc.mixins || [];
     sfc.mixins.push(SlotsMixin);
+  }
 
   if (sfc.props) {
     defaultProps(sfc.props);
   }
 
+  sfc.name = name;
+  sfc.install = install;
+
   return sfc;
 };