refactor(uid): rm more uid & refactor code

Author: mydearxym

components/ContentFilter/SelectedTags.js

@@ -3,7 +3,7 @@ import R from 'ramda'
 import { Tag } from 'antd'
 
 import { Wrapper, TagWrapper } from './styles/selected_tags'
-import { uid, isEmptyValue } from '../../utils'
+import { isEmptyValue } from '../../utils'
 
 const filterDict = {
   TODAY: '今天',
@@ -38,7 +38,7 @@ const SelectedTags = ({ onSelect, activeFilter }) => (
   <Wrapper>
     {R.keys(activeFilter).map(filterKey => (
       <FilterTag
-        key={uid.gen()}
+        key={filterKey}
         onSelect={onSelect}
         active={activeFilter[filterKey]}
         type={filterKey}

components/InlineTags/index.js

@@ -10,7 +10,7 @@ import PropTypes from 'prop-types'
 import Maybe from '../Maybe'
 import { Wrapper, Tag, Dot, Title } from './styles'
 
-import { makeDebugger, uid, sortByColor, Trans } from '../../utils'
+import { makeDebugger, sortByColor, Trans } from '../../utils'
 /* eslint-disable no-unused-vars */
 const debug = makeDebugger('c:InlineTags:index')
 /* eslint-enable no-unused-vars */
@@ -19,7 +19,7 @@ const InlineTags = ({ data }) => (
   <Maybe test={data}>
     <Wrapper>
       {sortByColor(data).map(tag => (
-        <Tag key={uid.gen()}>
+        <Tag key={tag.title}>
           <Dot color={tag.color} />
           <Title>{Trans(tag.title)}</Title>
         </Tag>

components/LoadingEffects/ArticleContentLoading.js

@@ -29,15 +29,12 @@ const LoadingItem = ({ theme }) => (
   </ContentLoader>
 )
 
-const ArticleContentLoading = ({ num, theme }) => {
-  // const ukey = uid.gen()
-  const range = R.range(0, num)
-  return range.map(() => (
+const ArticleContentLoading = ({ num, theme }) =>
+  R.range(0, num).map(() => (
     <LoadingWrapper key={uid.gen()}>
       <LoadingItem uniquekey={uid.gen()} theme={theme} />
     </LoadingWrapper>
   ))
-}
 
 ArticleContentLoading.propTypes = {
   num: PropTypes.number,

components/LoadingEffects/CommentLoading.js

@@ -8,26 +8,23 @@ const LoadingWrapper = styled.div`
   overflow: hidden;
 `
 
-const CommentLoading = ({ theme }) => {
-  // const ukey = uid.gen()
-  return (
-    <LoadingWrapper>
-      <ContentLoader
-        height={60}
-        width={400}
-        speed={2}
-        primaryColor={theme.loading.basic}
-        secondaryColor={theme.loading.animate}
-      >
-        <rect x="35" y="6" rx="4" ry="4" width="117" height="5.25" />
-        <rect x="37" y="20" rx="3" ry="3" width="85" height="5.25" />
-        <rect x="37" y="37.68" rx="3" ry="3" width="318.5" height="4.6" />
-        <rect x="37" y="51" rx="3" ry="3" width="319.2" height="5.11" />
-        <rect x="71" y="104" rx="3" ry="3" width="201" height="6.4" />
-        <circle cx="14.0" cy="14.0" r="14.0" />
-      </ContentLoader>
-    </LoadingWrapper>
-  )
-}
+const CommentLoading = ({ theme }) => (
+  <LoadingWrapper>
+    <ContentLoader
+      height={60}
+      width={400}
+      speed={2}
+      primaryColor={theme.loading.basic}
+      secondaryColor={theme.loading.animate}
+    >
+      <rect x="35" y="6" rx="4" ry="4" width="117" height="5.25" />
+      <rect x="37" y="20" rx="3" ry="3" width="85" height="5.25" />
+      <rect x="37" y="37.68" rx="3" ry="3" width="318.5" height="4.6" />
+      <rect x="37" y="51" rx="3" ry="3" width="319.2" height="5.11" />
+      <rect x="71" y="104" rx="3" ry="3" width="201" height="6.4" />
+      <circle cx="14.0" cy="14.0" r="14.0" />
+    </ContentLoader>
+  </LoadingWrapper>
+)
 
 export default withTheme(CommentLoading)

components/LoadingEffects/JobItemLoading.js

@@ -34,15 +34,12 @@ const LoadingItem = ({ theme }) => (
   </ContentLoader>
 )
 
-const JobItemLoading = ({ num, theme }) => {
-  // const ukey = uid.gen()
-  const range = R.range(0, num)
-  return range.map(() => (
+const JobItemLoading = ({ num, theme }) =>
+  R.range(0, num).map(() => (
     <LoadingWrapper key={uid.gen()}>
       <LoadingItem uniquekey={uid.gen()} theme={theme} />
     </LoadingWrapper>
   ))
-}
 
 JobItemLoading.propTypes = {
   num: PropTypes.number,

components/LoadingEffects/PostItemLoading.js

@@ -33,15 +33,12 @@ const LoadingItem = ({ theme }) => (
   </ContentLoader>
 )
 
-const PostItemLoading = ({ num, theme }) => {
-  // const ukey = uid.gen()
-  const range = R.range(0, num)
-  return range.map(() => (
+const PostItemLoading = ({ num, theme }) =>
+  R.range(0, num).map(() => (
     <LoadingWrapper key={uid.gen()}>
       <LoadingItem uniquekey={uid.gen()} theme={theme} />
     </LoadingWrapper>
   ))
-}
 
 PostItemLoading.propTypes = {
   num: PropTypes.number,

components/LoadingEffects/RepoItemLoading.js

@@ -29,15 +29,12 @@ const LoadingItem = ({ theme }) => (
   </ContentLoader>
 )
 
-const RepoItemLoading = ({ num, theme }) => {
-  // const ukey = uid.gen()
-  const range = R.range(0, num)
-  return range.map(() => (
+const RepoItemLoading = ({ num, theme }) =>
+  R.range(0, num).map(() => (
     <LoadingWrapper key={uid.gen()}>
       <LoadingItem uniquekey={uid.gen()} theme={theme} />
     </LoadingWrapper>
   ))
-}
 
 RepoItemLoading.propTypes = {
   num: PropTypes.number,

components/LoadingEffects/TypeWriterLoading.js

@@ -30,15 +30,12 @@ const Loading = ({ theme }) => (
   </ContentLoader>
 )
 
-const TypeWriterLoading = ({ num, theme }) => {
-  // const ukey = uid.gen()
-  const range = R.range(0, num)
-  return range.map(() => (
+const TypeWriterLoading = ({ num, theme }) =>
+  R.range(0, num).map(() => (
     <LoadingWrapper key={uid.gen()}>
       <Loading uniquekey={uid.gen()} theme={theme} />
     </LoadingWrapper>
   ))
-}
 
 TypeWriterLoading.propTypes = {
   num: PropTypes.number,

components/LoadingEffects/VideoItemLoading.js

@@ -30,15 +30,12 @@ const LoadingItem = ({ theme }) => (
   </ContentLoader>
 )
 
-const VideoItemLoading = ({ num, theme }) => {
-  // const ukey = uid.gen()
-  const range = R.range(0, num)
-  return range.map(() => (
+const VideoItemLoading = ({ num, theme }) =>
+  R.range(0, num).map(() => (
     <LoadingWrapper key={uid.gen()}>
       <LoadingItem uniquekey={uid.gen()} theme={theme} />
     </LoadingWrapper>
   ))
-}
 
 VideoItemLoading.propTypes = {
   num: PropTypes.number,

components/UserBrief/SocialIcons.js

@@ -5,7 +5,7 @@ import { ICON_CMD } from '../../config'
 import Popover from '../Popover'
 
 import { Wrapper, Linker, SocialIcon, PopInfo } from './styles/social_icons'
-import { nilOrEmpty, SOCIAL_LISTS, uid } from '../../utils'
+import { nilOrEmpty, SOCIAL_LISTS } from '../../utils'
 
 const DisplayIcon = ({ user, social }) => {
   if (social.siteUrl) {
@@ -46,7 +46,7 @@ const DisplayIcon = ({ user, social }) => {
 const SocialIcons = ({ user }) => (
   <Wrapper>
     {SOCIAL_LISTS.map(social => (
-      <DisplayIcon key={uid.gen()} user={user} social={social} />
+      <DisplayIcon key={social.key} user={user} social={social} />
     ))}
   </Wrapper>
 )