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,54 @@
+// Utils
+import { addUnit, createNamespace } from '../utils';
+
+// Components
+import Info from '../info';
+
+const [createComponent, bem] = createNamespace('icon');
+
+function isImage(name) {
+  return name ? name.indexOf('/') !== -1 : false;
+}
+
+export default createComponent({
+  props: {
+    dot: Boolean,
+    name: String,
+    size: [Number, String],
+    badge: [Number, String],
+    color: String,
+    tag: {
+      type: String,
+      default: 'i',
+    },
+    classPrefix: {
+      type: String,
+      default: bem(),
+    },
+  },
+
+  render() {
+    const { name } = this;
+    const imageIcon = isImage(name);
+  
+    return (
+      <this.tag
+        class={[
+          this.classPrefix,
+          imageIcon ? '' : `${this.classPrefix}-${name}`,
+        ]}
+        style={{
+          color: this.color,
+          fontSize: addUnit(this.size),
+        }}
+      >
+        {this.$slots.default?.()}
+        {imageIcon && <img class={bem('image')} src={name} />}
+        <Info
+          dot={this.dot}
+          info={this.badge}
+        />
+      </this.tag>
+    );
+  }
+});
@@ -1,93 +0,0 @@
-// Utils
-import { createNamespace, addUnit, isDef } from '../utils';
-import { inherit } from '../utils/functional';
-
-// Components
-import Info from '../info';
-
-// Types
-import { CreateElement, RenderContext } from 'vue/types';
-import { DefaultSlots } from '../utils/types';
-
-export type IconProps = {
-  dot?: boolean;
-  tag: keyof HTMLElementTagNameMap | string;
-  name?: string;
-  size?: string | number;
-  info?: string | number;
-  badge?: string | number;
-  color?: string;
-  classPrefix: string;
-};
-
-export type IconEvents = {
-  onClick?(event: Event): void;
-};
-
-const [createComponent, bem] = createNamespace('icon');
-
-function isImage(name?: string): boolean {
-  return name ? name.indexOf('/') !== -1 : false;
-}
-
-// compatible with legacy usage, should be removed in next major version
-const LEGACY_MAP: Record<string, string> = {
-  medel: 'medal',
-  'medel-o': 'medal-o',
-};
-
-function correctName(name?: string) {
-  return (name && LEGACY_MAP[name]) || name;
-}
-
-function Icon(
-  h: CreateElement,
-  props: IconProps,
-  slots: DefaultSlots,
-  ctx: RenderContext<IconProps>
-) {
-  const name = correctName(props.name);
-  const imageIcon = isImage(name);
-
-  return (
-    <props.tag
-      class={[
-        props.classPrefix,
-        imageIcon ? '' : `${props.classPrefix}-${name}`,
-      ]}
-      style={{
-        color: props.color,
-        fontSize: addUnit(props.size),
-      }}
-      {...inherit(ctx, true)}
-    >
-      {slots.default && slots.default()}
-      {imageIcon && <img class={bem('image')} src={name} />}
-      <Info
-        dot={props.dot}
-        info={isDef(props.badge) ? props.badge : props.info}
-      />
-    </props.tag>
-  );
-}
-
-Icon.props = {
-  dot: Boolean,
-  name: String,
-  size: [Number, String],
-  // @deprecated
-  // should be removed in next major version
-  info: [Number, String],
-  badge: [Number, String],
-  color: String,
-  tag: {
-    type: String,
-    default: 'i',
-  },
-  classPrefix: {
-    type: String,
-    default: bem(),
-  },
-};
-
-export default createComponent<IconProps, IconEvents>(Icon);