chore: merge src and src-next

2020-07-15 20:02:00 +08:00
parent 6672b34618
commit 0304fcb6fa
382 changed files with 464 additions and 24746 deletions
@@ -0,0 +1,68 @@
+// Utils
+import { createNamespace } from '../utils';
+import { BORDER_SURROUND } from '../utils/constant';
+
+// Components
+import Icon from '../icon';
+
+const [createComponent, bem] = createNamespace('tag');
+
+export default createComponent({
+  props: {
+    size: String,
+    mark: Boolean,
+    color: String,
+    plain: Boolean,
+    round: Boolean,
+    textColor: String,
+    closeable: Boolean,
+    type: {
+      type: String,
+      default: 'default',
+    },
+  },
+
+  emits: ['close'],
+
+  setup(props, { slots, emit }) {
+    return function () {
+      const { type, mark, plain, color, round, size } = props;
+
+      const key = plain ? 'color' : 'backgroundColor';
+      const style = { [key]: color };
+
+      if (props.textColor) {
+        style.color = props.textColor;
+      }
+
+      const classes = { mark, plain, round };
+      if (size) {
+        classes[size] = size;
+      }
+
+      const CloseIcon = props.closeable && (
+        <Icon
+          name="cross"
+          class={bem('close')}
+          onClick={(event) => {
+            event.stopPropagation();
+            emit('close');
+          }}
+        />
+      );
+
+      return (
+        <transition name={props.closeable ? 'van-fade' : null}>
+          <span
+            key="content"
+            style={style}
+            class={[bem([classes, type]), { [BORDER_SURROUND]: plain }]}
+          >
+            {slots.default?.()}
+            {CloseIcon}
+          </span>
+        </transition>
+      );
+    };
+  },
+});
@@ -1,90 +0,0 @@
-// Utils
-import { createNamespace } from '../utils';
-import { inherit, emit } from '../utils/functional';
-import { BORDER_SURROUND } from '../utils/constant';
-
-// Components
-import Icon from '../icon';
-
-// Types
-import { CreateElement, RenderContext } from 'vue/types';
-import { DefaultSlots } from '../utils/types';
-
-export type TagType = 'default' | 'primary' | 'success' | 'danger';
-
-export type TagSize = 'large' | 'medium';
-
-export type TagProps = {
-  type: TagType;
-  size?: TagSize;
-  mark?: boolean;
-  color?: string;
-  plain?: boolean;
-  round?: boolean;
-  textColor?: string;
-  closeable?: boolean;
-};
-
-const [createComponent, bem] = createNamespace('tag');
-
-function Tag(
-  h: CreateElement,
-  props: TagProps,
-  slots: DefaultSlots,
-  ctx: RenderContext<TagProps>
-) {
-  const { type, mark, plain, color, round, size } = props;
-
-  const key = plain ? 'color' : 'backgroundColor';
-  const style = { [key]: color };
-
-  if (props.textColor) {
-    style.color = props.textColor;
-  }
-
-  const classes: { [key: string]: any } = { mark, plain, round };
-  if (size) {
-    classes[size] = size;
-  }
-
-  const CloseIcon = props.closeable && (
-    <Icon
-      name="cross"
-      class={bem('close')}
-      onClick={(event: PointerEvent) => {
-        event.stopPropagation();
-        emit(ctx, 'close');
-      }}
-    />
-  );
-
-  return (
-    <transition name={props.closeable ? 'van-fade' : null}>
-      <span
-        key="content"
-        style={style}
-        class={[bem([classes, type]), { [BORDER_SURROUND]: plain }]}
-        {...inherit(ctx, true)}
-      >
-        {slots.default?.()}
-        {CloseIcon}
-      </span>
-    </transition>
-  );
-}
-
-Tag.props = {
-  size: String,
-  mark: Boolean,
-  color: String,
-  plain: Boolean,
-  round: Boolean,
-  textColor: String,
-  closeable: Boolean,
-  type: {
-    type: String,
-    default: 'default',
-  },
-};
-
-export default createComponent<TagProps>(Tag);