Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions src/components/gridItems/ChatItem/ChatItem.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useMemo } from 'react';
import { memo } from 'react';
import GridItem from '../GridItem/GridItem';
import ChatItemHeader from './ChatItemHeader/ChatItemHeader';

Expand All @@ -7,20 +7,21 @@ interface ChatItemProps {
isDarkThemePreferred?: boolean;
}

const ChatItem = ({ streamName, isDarkThemePreferred = false }: ChatItemProps) => {
const title = `Chat: ${streamName}`;
const ChatItem = memo(
({ streamName, isDarkThemePreferred = false }: ChatItemProps) => {
const title = `Chat: ${streamName}`;
const iframeSrc = `https://www.twitch.tv/embed/${streamName}/chat?parent=${window.location.hostname}${isDarkThemePreferred ? '&darkpopout' : ''}`;

const iframeSrc = useMemo(() => {
const darkParam = isDarkThemePreferred ? '&darkpopout' : '';
return `https://www.twitch.tv/embed/${streamName}/chat?parent=${window.location.hostname}${darkParam}`;
}, [streamName, isDarkThemePreferred]);

return (
<GridItem title={title} iframeSrc={iframeSrc} streamName={streamName}>
<ChatItemHeader streamName={streamName} />
</GridItem>
);
};
return (
<GridItem title={title} iframeSrc={iframeSrc} streamName={streamName}>
<ChatItemHeader streamName={streamName} />
</GridItem>
);
},
(prev, next) =>
prev.isDarkThemePreferred === next.isDarkThemePreferred &&
prev.streamName.toLowerCase() === next.streamName.toLowerCase()
);

ChatItem.displayName = 'ChatItem';

Expand Down
1 change: 1 addition & 0 deletions src/components/gridItems/GridItem/GridItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const GridItem = memo(
</GridItemHeader>
<iframe
ref={iframeRef}
key={iframeSrc}
title={title}
src={iframeSrc}
height="100%"
Expand Down
31 changes: 17 additions & 14 deletions src/components/gridItems/StreamItem/StreamItem.tsx
Original file line number Diff line number Diff line change
@@ -1,28 +1,31 @@
import { useCallback, useRef } from 'react';
import { memo, useCallback, useRef } from 'react';
import GridItem, { type GridItemRef } from '../GridItem/GridItem';
import StreamItemHeader from './StreamItemHeader/StreamItemHeader';

interface StreamItemProps {
streamName: string;
}

const StreamItem = ({ streamName }: StreamItemProps) => {
const gridItemRef = useRef<GridItemRef>(null);
const StreamItem = memo(
({ streamName }: StreamItemProps) => {
const gridItemRef = useRef<GridItemRef>(null);

const title = `Stream: ${streamName}`;
const title = `Stream: ${streamName}`;

const iframeSrc = `https://player.twitch.tv/?channel=${streamName}&parent=${window.location.hostname}`;
const iframeSrc = `https://player.twitch.tv/?channel=${streamName}&parent=${window.location.hostname}`;

const handleRefresh = useCallback(() => {
gridItemRef.current?.refreshIframe();
}, []);
const handleRefresh = useCallback(() => {
gridItemRef.current?.refreshIframe();
}, []);

return (
<GridItem ref={gridItemRef} title={title} iframeSrc={iframeSrc} allowFullScreen streamName={streamName}>
<StreamItemHeader streamName={streamName} handleRefresh={handleRefresh} />
</GridItem>
);
};
return (
<GridItem ref={gridItemRef} title={title} iframeSrc={iframeSrc} allowFullScreen streamName={streamName}>
<StreamItemHeader streamName={streamName} handleRefresh={handleRefresh} />
</GridItem>
);
},
(prev, next) => prev.streamName.toLowerCase() === next.streamName.toLowerCase()
);

StreamItem.displayName = 'StreamItem';

Expand Down