diff --git a/packages/web/components/patterns/ShareArticleView.tsx b/packages/web/components/patterns/ShareArticleView.tsx deleted file mode 100644 index c6c121492..000000000 --- a/packages/web/components/patterns/ShareArticleView.tsx +++ /dev/null @@ -1,54 +0,0 @@ -import { Box, VStack, HStack } from '../elements/LayoutPrimitives' -import { StyledText } from '../elements/StyledText' -import { CoverImage } from '../elements/CoverImage' -import { ArticleSubtitle } from './ArticleSubtitle' - - -type ShareArticleViewProps = { - url: string - title: string - imageURL?: string - author?: string - description?: string - originalArticleUrl: string - publishedAt: string -} - -export function ShareArticleView(props: ShareArticleViewProps): JSX.Element { - return ( - - {props.imageURL && ( - { - (e.target as HTMLElement).style.display = 'none' - }} - /> - )} - - - {props.title} - - - - - ) -} diff --git a/packages/web/components/templates/article/ArticleContainer.tsx b/packages/web/components/templates/article/ArticleContainer.tsx index cc086a232..4cbf59703 100644 --- a/packages/web/components/templates/article/ArticleContainer.tsx +++ b/packages/web/components/templates/article/ArticleContainer.tsx @@ -404,18 +404,6 @@ export function ArticleContainer(props: ArticleContainerProps): JSX.Element { onOpenChange={(open: boolean) => setShowReportIssuesModal(open)} /> ) : null} - {/* {showShareModal && ( - setShowShareModal(open)} - /> - )} */} ) } diff --git a/packages/web/components/templates/article/ArticleHeaderToolbar.tsx b/packages/web/components/templates/article/ArticleHeaderToolbar.tsx index f7ca4cf51..ea92b6677 100644 --- a/packages/web/components/templates/article/ArticleHeaderToolbar.tsx +++ b/packages/web/components/templates/article/ArticleHeaderToolbar.tsx @@ -15,34 +15,11 @@ type ArticleHeaderToolbarProps = { articleShareURL: string hasHighlights: boolean setShowHighlightsModal: React.Dispatch> - setShowShareArticleModal: (showShareModal: boolean) => void } export function ArticleHeaderToolbar( props: ArticleHeaderToolbarProps ): JSX.Element { - const enablePostAction = false // disable for now - const { copyLink, isLinkCopied } = useCopyLink(props.articleShareURL, 'link') - const canShareNative = useCanShareNative() - - const shareAction = useCallback(() => { - if (canShareNative) { - navigator - ?.share({ - title: props.articleTitle, - url: props.articleShareURL, - }) - .then(() => { - return - }) - .catch(() => { - return - }) - } else { - props.setShowShareArticleModal(true) - } - }, [props, canShareNative]) - return ( {props.hasHighlights && ( diff --git a/packages/web/components/templates/article/ShareArticleModal.tsx b/packages/web/components/templates/article/ShareArticleModal.tsx deleted file mode 100644 index 6481540ea..000000000 --- a/packages/web/components/templates/article/ShareArticleModal.tsx +++ /dev/null @@ -1,39 +0,0 @@ -import { ShareModalLayout } from './ShareModal' -import { ShareArticleView } from '../../patterns/ShareArticleView' - -type ShareArticleModalProps = { - url: string - title: string - imageURL?: string - author?: string - site?: string - description?: string - publishedAt: string - originalArticleUrl: string - onOpenChange: (open: boolean) => void -} - -export function ShareArticleModal( - props: ShareArticleModalProps -): JSX.Element { - return ( - - - - ) -} diff --git a/packages/web/components/templates/article/SnoozeLinkModal.tsx b/packages/web/components/templates/article/SnoozeLinkModal.tsx index 68167820e..0ddec2e0a 100644 --- a/packages/web/components/templates/article/SnoozeLinkModal.tsx +++ b/packages/web/components/templates/article/SnoozeLinkModal.tsx @@ -1,4 +1,8 @@ -import { ModalContent, ModalOverlay, ModalRoot } from '../../elements/ModalPrimitives' +import { + ModalContent, + ModalOverlay, + ModalRoot, +} from '../../elements/ModalPrimitives' import { Box, HStack, SpanBox, VStack } from '../../elements/LayoutPrimitives' import { Button } from '../../elements/Button' import { StyledText } from '../../elements/StyledText' @@ -6,11 +10,6 @@ import { X, Check } from 'phosphor-react' import { useState } from 'react' import { showErrorToast } from '../../../lib/toastHelpers' -type ShareArticleModalProps = { - onOpenChange: (open: boolean) => void - submit: (option: string, reminder: boolean, msg: string) => void -} - enum ButtonPosition { Top, Middle, @@ -49,32 +48,40 @@ function SnoozeOptionButton(props: SnoozeOptionButtonProps): JSX.Element { } return ( - ) + + ) } -export function SnoozeLinkModal( - props: ShareArticleModalProps -): JSX.Element { +export function SnoozeLinkModal(props: ShareArticleModalProps): JSX.Element { const [sendReminder, setSendReminder] = useState(false) - const [snoozeOption, setSnoozeOption] = useState(undefined) + const [snoozeOption, setSnoozeOption] = useState( + undefined + ) const setOption = (option: string) => { setSnoozeOption(option) setSendReminder(true) - }; + } return ( @@ -89,12 +96,20 @@ export function SnoozeLinkModal( width: '375px', height: '388px', overflow: 'auto', - background: 'white' + background: 'white', }} > - - Snooze + + + Snooze + - - setOption('tonight')} /> - setOption('tomorrow')} /> - setOption('weekend')} /> + + setOption('tonight')} + /> + setOption('tomorrow')} + /> + setOption('weekend')} + /> - - + { setSendReminder(!sendReminder) }} /> - + + > + Cancel + + > + Save + diff --git a/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx b/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx index e4661397a..e0a1fadb8 100644 --- a/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx +++ b/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx @@ -26,8 +26,6 @@ import { searchBarCommands, } from '../../../lib/keyboardShortcuts/navigationShortcuts' import { useKeyboardShortcuts } from '../../../lib/keyboardShortcuts/useKeyboardShortcuts' -import { ShareArticleModal } from '../article/ShareArticleModal' -import { webBaseURL } from '../../../lib/appConfig' import { Toaster } from 'react-hot-toast' import { SnoozeLinkModal } from '../article/SnoozeLinkModal' import { @@ -106,10 +104,6 @@ export function HomeFeedContainer(): JSX.Element { const gridContainerRef = useRef(null) - const [shareTarget, setShareTarget] = useState( - undefined - ) - const [snoozeTarget, setSnoozeTarget] = useState( undefined ) @@ -365,19 +359,11 @@ export function HomeFeedContainer(): JSX.Element { return ( labelsTarget || snoozeTarget || - shareTarget || linkToEdit || linkToRemove || linkToUnsubscribe ) - }, [ - labelsTarget, - snoozeTarget, - shareTarget, - linkToEdit, - linkToRemove, - linkToUnsubscribe, - ]) + }, [labelsTarget, snoozeTarget, linkToEdit, linkToRemove, linkToUnsubscribe]) useKeyboardShortcuts( libraryListCommands((action) => { @@ -603,8 +589,6 @@ export function HomeFeedContainer(): JSX.Element { hasData={!!itemsPages} totalItems={itemsPages?.[0].search.pageInfo.totalCount || 0} isValidating={isValidating} - shareTarget={shareTarget} - setShareTarget={setShareTarget} snoozeTarget={snoozeTarget} setSnoozeTarget={setSnoozeTarget} labelsTarget={labelsTarget} @@ -637,8 +621,6 @@ type HomeFeedContentProps = { totalItems: number isValidating: boolean loadMore: () => void - shareTarget: LibraryItem | undefined - setShareTarget: (target: LibraryItem | undefined) => void snoozeTarget: LibraryItem | undefined setSnoozeTarget: (target: LibraryItem | undefined) => void labelsTarget: LibraryItem | undefined @@ -1037,29 +1019,6 @@ function HomeFeedGrid(props: HomeFeedContentProps): JSX.Element { item={props.linkToEdit as LibraryItem} /> )} - {props.shareTarget && viewerData?.me?.profile.username && ( - { - if (props.shareTarget) { - const item = document.getElementById(props.shareTarget.node.id) - if (item) { - item.focus() - } - props.setShareTarget(undefined) - } - }} - /> - )} {props.snoozeTarget && ( {