Merge branch '2.x' into dev

src/skeleton/index.less

@@ -6,6 +6,8 @@
 
   &__avatar {
     flex-shrink: 0;
+    width: @skeleton-avatar-size;
+    height: @skeleton-avatar-size;
     margin-right: @padding-md;
     background-color: @skeleton-avatar-background-color;
 
@@ -29,6 +31,7 @@
   }
 
   &__title {
+    width: @skeleton-title-width;
     margin: 0;
   }
 

src/skeleton/index.tsx

@@ -10,6 +10,8 @@ export default createComponent({
     title: Boolean,
     round: Boolean,
     avatar: Boolean,
+    avatarSize: [Number, String],
+    titleWidth: [Number, String],
     row: {
       type: [Number, String],
       default: 0,
@@ -22,18 +24,10 @@ export default createComponent({
       type: Boolean,
       default: true,
     },
-    avatarSize: {
-      type: String,
-      default: '32px',
-    },
     avatarShape: {
       type: String as PropType<'square' | 'round'>,
       default: 'round',
     },
-    titleWidth: {
-      type: [Number, String],
-      default: '40%',
-    },
     rowWidth: {
       type: [Number, String, Array] as PropType<
         number | string | (number | string)[]