Skip to content
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.

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

feat: apply ButtonIcon component #2679

Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14.x, 15.x]
node-version: [12.x, 14.x]

steps:
- uses: actions/checkout@v2
Expand Down
25 changes: 2 additions & 23 deletions src/components/CopyLink.jsx
Original file line number Diff line number Diff line change
@@ -1,34 +1,13 @@
import React from "react";
import {
getThemeProperty,
useHover,
useTheme,
DEFAULT_DARK_THEME_NAME
} from "pi-ui";
import { ButtonIcon } from "pi-ui";
import PropTypes from "prop-types";
import IconButton from "src/components/IconButton";
import CopyToClipboard from "src/components/CopyToClipboard";

const CopyLink = ({ url, className }) => {
const { theme, themeName } = useTheme();
const isDarkTheme = themeName === DEFAULT_DARK_THEME_NAME;
const hoverColor = getThemeProperty(theme, "icon-hover-color");
const darkIconColor = getThemeProperty(theme, "text-color");
const [ref, isHovered] = useHover();
const iconColor = isHovered
? hoverColor
: isDarkTheme
? darkIconColor
: undefined;
return (
<CopyToClipboard value={url} tooltipText="Copy link" className={className}>
{({ onCopyToClipboard }) => (
<IconButton
ref={ref}
iconColor={iconColor}
type="link"
onClick={onCopyToClipboard}
/>
<ButtonIcon type="link" onClick={onCopyToClipboard} />
)}
</CopyToClipboard>
);
Expand Down
17 changes: 2 additions & 15 deletions src/components/Proposal/VotesCount.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
import React from "react";
import PropTypes from "prop-types";
import {
Text,
Icon,
useTheme,
classNames,
getThemeProperty,
DEFAULT_DARK_THEME_NAME
} from "pi-ui";
import { Text, ButtonIcon, classNames } from "pi-ui";
import styles from "./Proposal.module.css";

const VotesCount = ({
Expand All @@ -18,20 +11,14 @@ const VotesCount = ({
isVoteActive
}) => {
const votesLeft = quorumVotes - votesReceived;
const { theme, themeName } = useTheme();
const color = getThemeProperty(theme, "icon-color");
const darkColor = getThemeProperty(theme, "color-dark");
const isDarkTheme = themeName === DEFAULT_DARK_THEME_NAME;

return (
<div className={styles.voteCount}>
{isVoteActive && (
<>
{onSearchVotes && votesReceived > 0 && (
<div>
<Icon
<ButtonIcon
type="search"
iconColor={isDarkTheme ? darkColor : color}
onClick={onSearchVotes}
className={styles.voteCountSearch}
/>
Expand Down
43 changes: 13 additions & 30 deletions src/components/RecordWrapper/RecordWrapper.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,17 @@ import DownloadJSON from "../DownloadJSON";
import {
Card,
H2,
Icon,
Link as UILink,
Icon,
Text,
classNames,
useHover,
useTheme,
getThemeProperty,
Tooltip,
CopyableText,
useMediaQuery,
DEFAULT_DARK_THEME_NAME,
Dropdown,
ButtonIcon,
DropdownItem
} from "pi-ui";
import { Row } from "../layout";
Expand Down Expand Up @@ -130,9 +129,13 @@ export const JoinTitle = ({ children, className, separatorSymbol = "•" }) => (
</Join>
);

export const Edit = ({ url, tabIndex }) => (
<Link to={url || ""} tabIndex={tabIndex} data-testid="record-edit-button">
<Icon type="edit" className={styles.editButton} />
export const Edit = ({ url, tabIndex, disabled }) => (
<Link
to={url || ""}
tabIndex={tabIndex}
data-testid="record-edit-button"
className={styles.editButton}>
<ButtonIcon type="edit" disabled={disabled} />
</Link>
);

Expand Down Expand Up @@ -205,12 +208,7 @@ export const Header = React.memo(function Header({

export const ChartsLink = ({ token }) => {
const { apiInfo } = useLoader();
const { theme, themeName } = useTheme();
const bgColor = getThemeProperty(theme, "icon-color");
const color = getThemeProperty(theme, "icon-background-color");
const hoverColor = getThemeProperty(theme, "icon-hover-color");
const [ref, isHovered] = useHover();
const iconColor = isHovered ? hoverColor : color;
const { themeName } = useTheme();
const hostName = apiInfo.testnet
? "testnet.decred.org"
: "dcrdata.decred.org";
Expand All @@ -225,28 +223,18 @@ export const ChartsLink = ({ token }) => {
placement="bottom"
content="Voting Charts">
<UILink
ref={ref}
target="_blank"
rel="nofollow noopener noreferrer"
href={`https://${hostName}/proposal/${token}`}>
<Icon type="chart" iconColor={iconColor} backgroundColor={bgColor} />
<ButtonIcon type="chart" />
</UILink>
</Tooltip>
);
};

export const MarkdownLink = ({ to, active = false, onClick }) => {
const { theme, themeName } = useTheme();
const color = getThemeProperty(theme, "icon-color");
const hoverColor = getThemeProperty(theme, "icon-hover-color");
const darkIconColor = getThemeProperty(theme, "text-color");
const [ref, isHovered] = useHover();
const { themeName } = useTheme();
const isDarkTheme = themeName === DEFAULT_DARK_THEME_NAME;
const iconColor = isHovered
? hoverColor
: isDarkTheme
? darkIconColor
: color;
return (
<Tooltip
className={classNames(
Expand All @@ -260,12 +248,7 @@ export const MarkdownLink = ({ to, active = false, onClick }) => {
rel="nofollow noopener noreferrer"
href={to}
onClick={onClick}>
<Icon
ref={ref}
type="markdown"
viewBox="0 0 208 128"
iconColor={iconColor}
/>
<ButtonIcon type="markdown" viewBox="0 0 208 128" />
</UILink>
</Tooltip>
);
Expand Down
1 change: 0 additions & 1 deletion src/components/RecordWrapper/RecordWrapper.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
}

.editButton {
margin-top: 0.7rem;
margin-left: 1rem;
}

Expand Down
Loading