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.

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

refactor: use blueprint classnames safely #847

Merged
merged 1 commit into from
Jan 3, 2025
Merged

refactor: use blueprint classnames safely #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/components/activity_bar/activity_bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ const ActivityButton = styled(Button)`
color: ${Colors.DARK_GRAY3};
}

.bp5-icon {
.${Classes.ICON} {
width: 20px;
height: 20px;
font-size: 14px;
}

.bp5-tag {
.${Classes.TAG} {
font-size: 12px;
line-height: 14px;
min-width: 18px;
Expand Down Expand Up @@ -83,8 +83,8 @@ export function ActivityBarItem(props: ActivityBarItemProps) {
? icon
: cloneElement(icon, {
className: icon.props.className
? `${icon.props.className} bp5-icon`
: 'bp5-icon',
? `${icon.props.className} ${Classes.ICON}`
: Classes.ICON,
});

return (
Expand Down
15 changes: 8 additions & 7 deletions src/components/button/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
import type {
AnchorButtonProps as BlueprintAnchorButtonProps,
ButtonProps as BlueprintButtonProps,
TagProps,
TooltipProps,
} from '@blueprintjs/core';
import {
AnchorButton,
Button as BlueprintButton,
Classes,
Icon,
Tag,
Tooltip,
} from '@blueprintjs/core';
import type {
AnchorButtonProps as BlueprintAnchorButtonProps,
ButtonProps as BlueprintButtonProps,
TagProps,
TooltipProps,
} from '@blueprintjs/core';
import type { CSSObject } from '@emotion/styled';
import styled from '@emotion/styled';
import type { ReactNode } from 'react';
Expand Down Expand Up @@ -51,7 +52,7 @@ function getStyledCss(
return {
lineHeight: 1.15,
position: 'relative',
'.bp5-icon': !buttonProps.children && { marginRight: 0 },
[`.${Classes.ICON}`]: !buttonProps.children && { marginRight: 0 },
};
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/dialog/ConfirmDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Classes, Dialog, DialogBody, DialogFooter } from '@blueprintjs/core';
import type { DialogProps } from '@blueprintjs/core';
import { Dialog, DialogBody, DialogFooter } from '@blueprintjs/core';
import styled from '@emotion/styled';

import { Button } from '../button/index.js';
Expand All @@ -15,7 +15,7 @@ interface ConfirmDialogProps extends Omit<DialogProps, 'isCloseButtonShown'> {
const DialogWithHeaderColor = styled(Dialog, {
shouldForwardProp: (prop) => prop !== 'headerColor',
})<{ headerColor: string }>`
.bp5-dialog-header {
.${Classes.DIALOG_HEADER} {
background-color: ${(props) => props.headerColor};
min-height: 0;
}
Expand Down
10 changes: 4 additions & 6 deletions src/components/toolbar/Toolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,12 @@ const border = '1px solid rgb(247, 247, 247)';
const ToolbarButton = styled(Button)`
.${Classes.ICON} {
color: ${Colors.DARK_GRAY3};
}

.bp5-icon {
width: 16px;
height: 16px;
font-size: 12px;
}

.bp5-tag {
.${Classes.TAG} {
font-size: 10px;
line-height: 12px;
min-width: 12px;
Expand Down Expand Up @@ -164,13 +161,14 @@ function ToolbarItemInternal(props: ToolbarItemInternalProps) {
} = useToolbarContext();
const intent = itemIntent ?? toolbarIntent;
const disabled = itemDisabled ?? toolbarDisabled;

const resizedIcon =
!icon || typeof icon === 'string'
? icon
: cloneElement(icon, {
className: icon.props.className
? `${icon.props.className} bp5-icon`
: 'bp5-icon',
? `${icon.props.className} ${Classes.ICON}`
: Classes.ICON,
});

return (
Expand Down
Loading