Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
chezhe committed Mar 22, 2022
2 parents 09d0441 + bb2c216 commit 8b98db9
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 27 deletions.
26 changes: 1 addition & 25 deletions src/components/EpisodeList.tsx
Original file line number Diff line number Diff line change
@@ -1,34 +1,13 @@
import dayjs from 'dayjs'
import {
Box,
Button,
Markdown,
Text,
Image,
ThemeContext,
Anchor,
} from 'grommet'
import { Box, Button, Text, Image, ThemeContext } from 'grommet'
import { Episode, Feed } from '../types'
import TurndownService from 'turndown'
import { Ascend, Descend, Checkmark } from 'grommet-icons'
import Launch from '../assets/launch.png'
import { useEffect, useRef, useState } from 'react'
import _ from 'lodash'
import { useAppDispatch } from '../store/hooks'
import { PAGE_SIZE } from '../store/constants'

const turndownService = new TurndownService()

function MarkAnchor(props: any) {
let label = props.title
if (!label) {
if (props.children && typeof props.children[0] === 'string') {
label = props.children[0]
}
}
return <Anchor label={label} />
}

export default function EpisodeList({
episodes,
activeFeed,
Expand Down Expand Up @@ -138,9 +117,6 @@ export default function EpisodeList({
ref={listContainer}
>
{_eposides.map((item, idx) => {
const digest = turndownService.turndown(
item?.description || ''
)
let isActive = false
if (item.guid) {
isActive = item.guid === activeItem?.guid
Expand Down
2 changes: 1 addition & 1 deletion src/components/Layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useEffect, useState } from 'react'
import { useAppDispatch, useAppSelector } from '../store/hooks'
import { Episode, Feed } from '../types'
import { fetchFeed } from '../utils/network'
import { allEpisodes, allFeeds, clearStorage, connect } from '../utils/storage'
import { allEpisodes, allFeeds, connect } from '../utils/storage'
import EpisodeList from './EpisodeList'
import PodPlayer from './PodPlayer'
import Reader from './Reader'
Expand Down
1 change: 0 additions & 1 deletion src/components/PodPlayer.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Box, Button, Image } from 'grommet'
import { Close } from 'grommet-icons'
import ReactAudioPlayer from 'react-audio-player'
import { Episode } from '../types'
import { stripURL } from '../utils/format'
Expand Down

0 comments on commit 8b98db9

Please sign in to comment.