Skip to content

refactor: let SearchIcon inherit color from style context #3735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UncleBill merged 2 commits into from
Jul 23, 2021
Merged

refactor: let SearchIcon inherit color from style context #3735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f76f20d
refactor: let SearchIcon inherit color from style context
UncleBill Jul 22, 2021
44c2ee3
fixup! refactor: let SearchIcon inherit color from style context
UncleBill Jul 22, 2021
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
3 changes: 1 addition & 2 deletions packages/icons/general/Search.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { createIcon } from '../utils'
import { MaskColorVar } from '@masknet/theme/constants'

export const SearchIcon = createIcon(
'Search',
Expand All @@ -8,7 +7,7 @@ export const SearchIcon = createIcon(
fillRule="evenodd"
clipRule="evenodd"
d="M4.271 9.41a4.93 4.93 0 118.478 3.424.617.617 0 00-.122.123A4.93 4.93 0 014.272 9.41zm8.837 4.79a6.18 6.18 0 11.884-.884l2.596 2.596a.625.625 0 11-.884.884L13.108 14.2z"
fill={MaskColorVar.textPrimary}
fill="currentColor"
/>
</>,
'0 0 20 20',
Expand Down
3 changes: 0 additions & 3 deletions packages/icons/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
"start": "snowpack dev",
"build": "node --es-module-specifier-resolution=node ./dist/utils/ssr.js"
},
"dependencies": {
"@masknet/theme": "workspace:*"

@Jack-Works Jack-Works Jul 22, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you remove this, please also remove it from tsconfig file.

@UncleBill UncleBill Jul 23, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see any reference to @masknet/theme in packages/icon/tsconfig.json. What I miss?

@Jack-Works Jack-Works Jul 23, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh so that was a mistake when adding that dependency

},
"devDependencies": {
"snowpack": "^3.8.1"
}
Expand Down
3 changes: 2 additions & 1 deletion packages/maskbook/src/extension/options-page/DashboardRouters/Contacts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { useState, useCallback, useEffect } from 'react'
import { MaskColorVar } from '@masknet/theme'
import DashboardRouterContainer from './Container'
import { TextField, IconButton, Typography } from '@material-ui/core'
import { makeStyles } from '@material-ui/core/styles'
Expand Down Expand Up @@ -127,7 +128,7 @@ export default function DashboardContactsRouter() {
InputProps={{
endAdornment: (
<IconButton size="small" onClick={() => setSearch('')}>
{search ? <ClearIcon /> : <SearchIcon />}
{search ? <ClearIcon /> : <SearchIcon htmlColor={MaskColorVar.textPrimary} />}
</IconButton>
),
}}
Expand Down
Loading