fix: TopicItem

src/components/TopicList/TopicList.tsx

@@ -3,7 +3,7 @@ import { css } from 'emotion'
 
 import { List } from '@material-ui/core'
 
-import TopicListItem from './TopicListItem'
+import TopicListItem, { Place } from './TopicListItem'
 
 import { ITopic } from '@cc98/api'
 
@@ -13,7 +13,7 @@ const list = css`
 
 interface Props {
   topics: ITopic[]
-  place?: 'inboard' | 'newtopic' | 'usercenter' | 'follow' | 'search'
+  place: Place
 }
 
 const TopicList: React.FunctionComponent<Props> = ({ topics, place }) => (

src/components/TopicList/TopicListItem.tsx

@@ -13,10 +13,12 @@ const Item = styled(ListItem)`
   display: flex;
   justify-content: space-between;
   align-items: flex-end;
+  width: 100%;
 `
 
 const TitleArea = styled.div`
   max-width: 80%;
+  flex-grow: 1;
 `
 
 const InfoArea = styled.div`
@@ -42,6 +44,7 @@ const SubTitle = styled(Typography)`
 const Info = SubTitle
 
 /**
+ * 布局：
  * title           info1
  * subtitle        info2
  */
@@ -73,9 +76,11 @@ export const TopicItem: React.FunctionComponent<ItemProps> = ({
   </Item>
 )
 
+export type Place = 'inboard' | 'newtopic' | 'usercenter' | 'follow' | 'search' | 'hot'
+
 interface Props {
   data: ITopic
-  place?: 'inboard' | 'newtopic' | 'usercenter' | 'follow' | 'search'
+  place: Place
 }
 
 export default ({ data, place }: Props) => {
@@ -98,9 +103,15 @@ export default ({ data, place }: Props) => {
       subtitle = boardName
       break
 
+    case 'hot':
+      if (!boardName) {
+        getBoardName()
+      }
+      info1 = boardName
+      break
+
     case 'newtopic':
       info1 = dayjs(data.time).fromNow()
-
     case 'follow':
     case 'search':
       if (!boardName) {
@@ -110,7 +121,6 @@ export default ({ data, place }: Props) => {
       break
 
     // case 'inboard':
-    // case undefined:
   }
 
   return (

src/components/TopicList/index.tsx

@@ -4,6 +4,7 @@ import useInfList, { Service as InfService } from '@/hooks/useInfList'
 import useFetcher, { Service as FinService } from '@/hooks/useFetcher'
 
 import TopicList from './TopicList'
+import { Place } from './TopicListItem'
 
 import InfiniteList from '@/components/InfiniteList'
 import LoadingCircle from '@/components/LoadingCircle'
@@ -12,8 +13,7 @@ import { ITopic } from '@cc98/api'
 
 interface InfProps {
   service: InfService<ITopic[]>
-  // TODO: remove
-  place?: 'inboard' | 'newtopic' | 'usercenter' | 'follow' | 'search'
+  place: Place
 }
 
 const InfTopicList: React.FunctionComponent<InfProps> = ({ service, place }) => {
@@ -30,7 +30,7 @@ const InfTopicList: React.FunctionComponent<InfProps> = ({ service, place }) =>
 interface FinProps {
   service: FinService<ITopic[]>
   noLoading?: boolean
-  place?: 'inboard' | 'newtopic' | 'usercenter' | 'follow' | 'search'
+  place: Place
 }
 
 const FinTopicList: React.FunctionComponent<FinProps> = ({ service, noLoading, place }) => {

src/pages/Board/index.tsx

@@ -60,7 +60,7 @@ export default ({ id }: Props) => {
 
       <Tags boardTags={boardTags} onChange={onTagChange} />
 
-      <FinTopicList service={() => getTopTopics(id)} place="inboard" />
+      <FinTopicList service={() => getTopTopics(id)} place="inboard" noLoading />
 
       <InfTopicList
         key={`${tagIDs[0]}-${tagIDs[1]}`}

src/pages/HotTopic/index.tsx

@@ -59,9 +59,9 @@ export default () => {
 
       {current === 'day' && <HotTopicList service={getHotTopics} />}
 
-      {current === 'week' && <FinTopicList service={getWeeklyHotTopics} />}
-      {current === 'month' && <FinTopicList service={getMonthlyHotTopics} />}
-      {current === 'history' && <FinTopicList service={getHistoryHotTopics} />}
+      {current === 'week' && <FinTopicList service={getWeeklyHotTopics} place="hot" />}
+      {current === 'month' && <FinTopicList service={getMonthlyHotTopics} place="hot" />}
+      {current === 'history' && <FinTopicList service={getHistoryHotTopics} place="hot" />}
     </>
   )
 }

src/version.ts

@@ -2,4 +2,4 @@
  * 版本号
  */
 
-export default 'v0.14.11-alpha'
+export default 'v0.14.12-alpha'

tsconfig.json

@@ -5,6 +5,7 @@
     "allowJs": false,
     "target": "es6",
     "jsx": "preserve",
+    "noEmitOnError": true,
     "sourceMap": false,
     "baseUrl": "./",
     "rootDir": "src",