feat: dark theme support #148
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,4 @@ | ||
| import type { FC } from 'react'; | ||
| import styled from 'styled-components'; | ||
|
|
||
| import ReplayIcon from '@mui/icons-material/Replay'; | ||
|
|
@@ -13,15 +11,38 @@ import { useCallback, useEffect, useState } from "react"; | |
| import { useSocketStore } from "../../context/socket"; | ||
| import { getCurrentUrl } from "../../api/recording"; | ||
| import { useGlobalInfoStore } from '../../context/globalInfo'; | ||
| import { useThemeMode } from '../../context/theme-provider'; | ||
|
|
||
| // const StyledNavBar = styled.div<{ browserWidth: number; isDarkMode: boolean }>` | ||
| // display: flex; | ||
| // align-items: center; | ||
| // padding: 10px 20px; | ||
| // background-color: ${({ isDarkMode }) => (isDarkMode ? '#2C2F33' : '#F5F5F5')}; | ||
| // width: ${({ browserWidth }) => `${browserWidth}px`}; | ||
| // border-radius: 0px 0px 8px 8px; | ||
| // box-shadow: ${({ isDarkMode }) => (isDarkMode ? '0px 2px 10px rgba(0, 0, 0, 0.2)' : '0px 2px 10px rgba(0, 0, 0, 0.1)')}; | ||
| // transition: background-color 0.3s ease, box-shadow 0.3s ease; | ||
| // margin-bottom: 15px; | ||
| // `; | ||
|
|
||
| const StyledNavBar = styled.div<{ browserWidth: number; isDarkMode: boolean }>` | ||
| display: flex; | ||
| padding: 12px 0px; | ||
| background-color: ${({ isDarkMode }) => (isDarkMode ? '#2C2F33' : '#f6f6f6')}; | ||
| width: ${({ browserWidth }) => browserWidth}px; | ||
| border-radius: 0px 5px 0px 0px; | ||
| `; | ||
|
|
||
| const IconButton = styled(NavBarButton)<{ mode: string }>` | ||
| background-color: ${({ mode }) => (mode === 'dark' ? '#2C2F33' : '#f6f6f6')}; | ||
| transition: background-color 0.3s ease, transform 0.1s ease; | ||
| color: ${({ mode }) => (mode === 'dark' ? '#FFFFFF' : '#333')}; | ||
| cursor: pointer; | ||
| &:hover { | ||
| background-color: ${({ mode }) => (mode === 'dark' ? '#586069' : '#D0D0D0')}; | ||
| } | ||
| `; | ||
|
|
||
| interface NavBarProps { | ||
| browserWidth: number; | ||
| handleUrlChanged: (url: string) => void; | ||
|
|
@@ -31,6 +52,7 @@ const BrowserNavBar: FC<NavBarProps> = ({ | |
| browserWidth, | ||
| handleUrlChanged, | ||
| }) => { | ||
| const isDarkMode = useThemeMode().darkMode; | ||
|
|
||
| const { socket } = useSocketStore(); | ||
| const { recordingUrl, setRecordingUrl } = useGlobalInfoStore(); | ||
|
|
@@ -67,7 +89,7 @@ const BrowserNavBar: FC<NavBarProps> = ({ | |
| socket.off('urlChanged', handleCurrentUrlChange); | ||
| } | ||
| } | ||
| }, [socket, handleCurrentUrlChange]); | ||
|
|
||
| const addAddress = (address: string) => { | ||
| if (socket) { | ||
|
|
@@ -78,38 +100,41 @@ const BrowserNavBar: FC<NavBarProps> = ({ | |
| }; | ||
|
|
||
| return ( | ||
| <StyledNavBar browserWidth={browserWidth} isDarkMode={isDarkMode}> | ||
| <IconButton | ||
| type="button" | ||
| onClick={() => { | ||
| socket?.emit('input:back'); | ||
| }} | ||
| disabled={false} | ||
| mode={isDarkMode ? 'dark' : 'light'} | ||
| > | ||
| <ArrowBackIcon /> | ||
| </IconButton> | ||
|
|
||
| <IconButton | ||
| type="button" | ||
| onClick={() => { | ||
| socket?.emit('input:forward'); | ||
| }} | ||
| disabled={false} | ||
| mode={isDarkMode ? 'dark' : 'light'} | ||
| > | ||
| <ArrowForwardIcon /> | ||
| </IconButton> | ||
|
|
||
| <IconButton | ||
| type="button" | ||
| onClick={() => { | ||
| if (socket) { | ||
| handleRefresh(); | ||
| } | ||
| }} | ||
| disabled={false} | ||
| mode={isDarkMode ? 'dark' : 'light'} | ||
| > | ||
| <ReplayIcon /> | ||
| </IconButton> | ||
|
|
||
| <UrlForm | ||
| currentAddress={recordingUrl} | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix style functions to correctly access the
modepropIn the styled component, the template literals should access the
modeprop correctly. Currently,background-color: ${mode => mode ? ...}does not access themodeprop as intended.Apply this diff to fix the issue:
export const NavBarButton = styled.button<{ disabled: boolean, mode: 'light' | 'dark' }>` margin-left: 10px; margin-right: 5px; padding: 0; border: none; - background-color: ${mode => mode ? '#333' : '#ffffff'}; + background-color: ${({ mode }) => mode === 'dark' ? '#333' : '#ffffff'}; cursor: ${({ disabled }) => disabled ? 'default' : 'pointer'}; width: 24px; height: 24px; border-radius: 12px; outline: none; - color: ${mode => mode ? '#ffffff' : '#333333'}; + color: ${({ mode }) => mode === 'dark' ? '#ffffff' : '#333333'}; `;📝 Committable suggestion