refactor(publish-button): publish button route (#1200)

* refactor(publish-button): re-org & unify publish needs

* refactor(publish-button): target path adjust

Author: mydearxym

src/containers/content/WorksContent/RightSidebar/index.tsx

@@ -1,9 +1,8 @@
 import { FC, memo } from 'react'
 
-import { ICON, ICON_CMD } from '@/config'
-
+import { THREAD } from '@/constant'
 import { Br } from '@/widgets/Common'
-import DropdownButton from '@/widgets/Buttons/DropdownButton'
+import PublishButton from '@/widgets/Buttons/PublishButton'
 import SubTitle from '@/widgets/SubTitle'
 import EmailSubscriber from '@/widgets/EmailSubscriber'
 
@@ -15,28 +14,12 @@ import {
   Wrapper,
   SubDesc,
   Divider,
-  PublishIcon,
   PublishBtnWrapper,
   InterviewsWrapper,
   SubscribeWrapper,
   Footer,
 } from '../styles/right_sidebar/index'
 
-const options = [
-  {
-    key: '0',
-    icon: `${ICON_CMD}/common_check.svg`,
-    title: '发布作品',
-    desc: '像世界分享你的创意 ..',
-  },
-  {
-    key: '1',
-    icon: `${ICON_CMD}/common_link.svg`,
-    title: '发布限制',
-    desc: '原则上不欢迎此类内容',
-  },
-]
-
 type TProps = {
   testid?: string
   showSidebar: boolean
@@ -52,15 +35,10 @@ const RightSidebar: FC<TProps> = ({
       {/* <Linkers /> */}
       {/* <Divider top={18} bottom={22} /> */}
       <PublishBtnWrapper>
-        <DropdownButton
-          options={options}
-          onClick={(key) => {
-            console.log('key: ', key)
-          }}
-        >
-          <PublishIcon src={`${ICON}/edit/publish-rocket.svg`} />
-          {showSidebar ? '发 布' : '发布新作品'}
-        </DropdownButton>
+        <PublishButton
+          thread={THREAD.WORKS}
+          text={showSidebar ? '发 布' : '发布新作品'}
+        />
       </PublishBtnWrapper>
       <Br top={16} bottom={20} />
       <InterviewsWrapper>

src/containers/content/WorksContent/styles/right_sidebar/index.ts

@@ -1,7 +1,7 @@
 import styled from 'styled-components'
 
 import type { TTestable, TSpace } from '@/spec'
-import Img from '@/Img'
+// import Img from '@/Img'
 import { theme } from '@/utils/themes'
 import css from '@/utils/css'
 
@@ -33,11 +33,7 @@ export const Divider = styled.div<TSpace>`
   margin-bottom: ${({ bottom }) => `${bottom}px` || '15px'};
   opacity: 0.6;
 `
-export const PublishIcon = styled(Img)`
-  fill: ${theme('button.fg')};
-  ${css.size(16)};
-  margin-right: 10px;
-`
+
 export const PublishBtnWrapper = styled.div`
   margin-left: 2px;
   margin-right: 2px;

src/containers/thread/ThreadSidebar/ClassicLayout/DynamicPart.tsx

@@ -8,38 +8,43 @@
 
 import { FC, memo } from 'react'
 
+import type { TThread, TCommunity } from '@/spec'
+
 import { buildLog } from '@/utils/logger'
 import { send } from '@/utils/helper'
 import { EVENT } from '@/constant'
 
-import type { TThread } from '@/spec'
-
 import Sticky from '@/widgets/Sticky'
 // import FiltersMenu from '@/widgets/FiltersMenu'
 import PublishButton from '@/widgets/Buttons/PublishButton'
 import CommunityJoinBadge from '@/containers/tool/CommunityJoinBadge'
 import TagsBar from '@/containers/unit/TagsBar'
 // import PromotionList from '@/widgets/PromotionList'
 
-import type { TBaseProps } from '../index'
-
 import {
   BadgeWrapper,
   TagsBarWrapper,
   PublishWrapper,
 } from '../styles/classic_layout'
-import { onCreate } from '../logic'
 
 /* eslint-disable-next-line */
 const log = buildLog('c:ClassicSidebar')
 
-type TProps = { showCommunityBadge: boolean; thread: TThread } & TBaseProps
+export type TProps = {
+  showCommunityBadge: boolean
+  thread: TThread
+  community: TCommunity
+}
 
-const ClassicLayout: FC<TProps> = ({ showCommunityBadge, thread }) => {
+const ClassicLayout: FC<TProps> = ({
+  community,
+  thread,
+  showCommunityBadge,
+}) => {
   return (
     <Sticky offsetTop={50}>
       <PublishWrapper show={showCommunityBadge}>
-        <PublishButton thread={thread} onCreate={onCreate} />
+        <PublishButton thread={thread} community={community.raw} />
       </PublishWrapper>
       <BadgeWrapper show={!showCommunityBadge}>
         <CommunityJoinBadge />

src/containers/thread/ThreadSidebar/ClassicLayout/index.tsx

@@ -9,7 +9,7 @@
 import { FC, memo } from 'react'
 import dynamic from 'next/dynamic'
 
-import type { TThread } from '@/spec'
+import type { TThread, TCommunity } from '@/spec'
 import { buildLog } from '@/utils/logger'
 
 import { LavaLampLoading } from '@/widgets/dynamic'
@@ -33,12 +33,24 @@ export const DynamicPart = dynamic(() => import('./DynamicPart'), {
   ssr: false,
 })
 
-type TProps = { showCommunityBadge: boolean; thread: TThread } & TBaseProps
-
-const ClassicLayout: FC<TProps> = ({ showCommunityBadge, thread }) => {
+export type TProps = {
+  showCommunityBadge: boolean
+  thread: TThread
+  community: TCommunity
+} & TBaseProps
+
+const ClassicLayout: FC<TProps> = ({
+  showCommunityBadge,
+  thread,
+  community,
+}) => {
   return (
     <Wrapper testid="thread-sidebar">
-      <DynamicPart thread={thread} showCommunityBadge={showCommunityBadge} />
+      <DynamicPart
+        community={community}
+        thread={thread}
+        showCommunityBadge={showCommunityBadge}
+      />
     </Wrapper>
   )
 }

src/containers/thread/ThreadSidebar/HolyGrailLayout/DynamicPart.tsx

@@ -8,16 +8,17 @@ import Sticky from '@/widgets/Sticky'
 import TagsBar from '@/containers/unit/TagsBar'
 import PublishButton from '@/widgets/Buttons/PublishButton'
 
+import type { TProps } from './index'
 import ExtraInfo from './ExtraInfo'
 
 // 没有各种外链接，打赏信息等的官方社区
 
-const DynamicPart: FC = () => {
+const DynamicPart: FC<TProps> = ({ thread, community }) => {
   return (
     <Fragment>
       <ExtraInfo />
       <Br bottom={20} />
-      <PublishButton />
+      <PublishButton thread={thread} community={community.raw} />
       <Br bottom={25} />
       <Sticky offsetTop={80}>
         <TagsBar onSelect={() => send(EVENT.REFRESH_ARTICLES)} />

src/containers/thread/ThreadSidebar/HolyGrailLayout/index.tsx

@@ -1,7 +1,7 @@
 import { FC, memo } from 'react'
 import dynamic from 'next/dynamic'
 
-import type { TCommunity } from '@/spec'
+import type { TCommunity, TThread } from '@/spec'
 
 import CommunityBrief from './CommunityBrief'
 import { LavaLampLoading } from '@/widgets/dynamic'
@@ -16,16 +16,17 @@ export const DynamicPart = dynamic(() => import('./DynamicPart'), {
   ssr: false,
 })
 
-type TProps = {
+export type TProps = {
+  thread: TThread
   community: TCommunity
 }
 
-const HolyGrailLayout: FC<TProps> = ({ community }) => {
+const HolyGrailLayout: FC<TProps> = ({ community, thread }) => {
   return (
     <Wrapper testid="community-digest">
       <CommunityBrief community={community} />
       <Divider />
-      <DynamicPart />
+      <DynamicPart community={community} thread={thread} />
     </Wrapper>
   )
 }

src/containers/thread/ThreadSidebar/index.tsx

@@ -38,9 +38,10 @@ const ThreadSidebarContainer: FC<TProps> = ({ threadSidebar: store }) => {
         <ClassicLayout
           showCommunityBadge={isCommunityDigestInViewport}
           thread={curThread}
+          community={curCommunity}
         />
       ) : (
-        <HolyGrailLayout community={curCommunity} />
+        <HolyGrailLayout community={curCommunity} thread={curThread} />
       )}
     </Fragment>
   )

src/containers/thread/ThreadSidebar/logic.ts

@@ -1,8 +1,6 @@
 import { useEffect } from 'react'
 // import { } from 'ramda'
 
-import { TYPE, EVENT } from '@/constant'
-import { send } from '@/utils/helper'
 import { buildLog } from '@/utils/logger'
 
 // import S from './service'
@@ -13,13 +11,7 @@ let store: TStore | undefined
 /* eslint-disable-next-line */
 const log = buildLog('L:ThreadSidebar')
 
-export const onCreate = (): void => {
-  const { isLogin, curThread, authWarning } = store
-  if (!isLogin) return authWarning()
-  const cmd = `${curThread.toUpperCase()}_CREATE`
-
-  send(EVENT.DRAWER.OPEN, { type: TYPE.DRAWER[cmd] })
-}
+export const holder = 1
 
 // ###############################
 // init & uninit handlers

src/containers/tool/CommunityTagSetter/CommunitySetter/Body.tsx

@@ -45,7 +45,7 @@ const Body: FC<TProps> = ({
       <InnerWrapper>
         <SearchBox searchValue={searchValue} texts={texts} />
         {texts.notice ? (
-          <NoticeBar type="notice" content={texts.notice} bottom={20} noBg />
+          <NoticeBar type="notice" content={texts.notice} bottom={5} noBg />
         ) : (
           <Br bottom={0}>&nbsp;</Br>
         )}

src/containers/tool/CommunityTagSetter/store.ts

@@ -171,7 +171,7 @@ const CommunityTagSetter = T.model('CommunityTagSetter', {
             header: '请选择子社区',
             searchPlaceholder: '// 搜索目标社区',
             notice:
-              '内测阶段所有人均可发布内容到首页。若测试请发布到「黑洞」。发布恶俗/恶意内容到社区，账号本身将进入「黑洞」，谢谢理解。',
+              '内测阶段所有人均可发布内容到首页。若测试请发布到「黑洞」。发布恶俗 / 恶意内容到社区，账号本身将进入「黑洞」，谢谢理解。',
             commonUsedHint: '常用子社区',
             notFoundHint:
               '抱歉，未找到相关子社区，请在该评论区或子社区 /feedback 中反馈。',