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

Fix warnings #166

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix warnings #166

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
3246e13
fix: styled-component non-DOM prop warnings
mjaquiery Oct 22, 2024
2caae14
fix: rollup-safe TS types
mjaquiery Oct 22, 2024
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: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ packages/**/dist
.npmrc
.vercel
demo/build
.netlify
.netlify
.idea/
2 changes: 1 addition & 1 deletion packages/react-code-blocks/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
],
"author": "rajinwonderland",
"maintainers": [],
"version": "0.1.6",
"version": "0.1.7",
"homepage": "https://react-code-blocks.rajinwonderland.vercel.app",
"license": "MIT",
"main": "dist/index.js",
Expand Down
26 changes: 16 additions & 10 deletions packages/react-code-blocks/src/components/CopyBlock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,26 @@ export interface CopyBlockProps extends CodeBlockProps {
onCopy?: (event: React.MouseEvent<HTMLButtonElement>) => void;
}

type CascadedProps = Partial<CopyBlockProps> & { theme: Theme };

const Button = styled.button<CascadedProps>`
type ButtonStyledProps = {
$copied?: boolean
theme: Theme
};
const Button = styled.button<ButtonStyledProps>`
position: absolute;
top: 0.5em;
right: 0.75em;
display: flex;
flex-wrap: wrap;
justify-content: center;
align-items: center;
background: ${(p: CascadedProps) => p.theme.backgroundColor as string};
background: ${(p: ButtonStyledProps) => p.theme.backgroundColor as string};
margin-top: 0.15rem;
border-radius: 0.25rem;
max-height: 2rem;
max-width: 2rem;
padding: 0.25rem;
&:hover {
opacity: ${(p: CascadedProps) => (p.copied ? 1 : 0.5)};
opacity: ${(p: ButtonStyledProps) => (p.$copied ? 1 : 0.5)};
}
&:focus {
outline: none;
Expand All @@ -44,11 +46,15 @@ const Button = styled.button<CascadedProps>`
}
`;

const Snippet = styled.div<CascadedProps>`
type SnippetStyledProps = {
$codeBlock?: boolean
theme: Theme
};
const Snippet = styled.div<SnippetStyledProps>`
position: relative;
background: ${(p: CascadedProps) => p.theme.backgroundColor as string};
background: ${(p: SnippetStyledProps) => p.theme.backgroundColor as string};
border-radius: 0.25rem;
padding: ${(p: CascadedProps) => (p.codeBlock ? `0.25rem 0.5rem 0.25rem 0.25rem` : `0.25rem`)};
padding: ${(p: SnippetStyledProps) => (p.$codeBlock ? `0.25rem 0.5rem 0.25rem 0.25rem` : `0.25rem`)};
`;

export default function CopyBlock({
Expand All @@ -68,15 +74,15 @@ export default function CopyBlock({
};

return (
<Snippet {...{ codeBlock }} style={customStyle} theme={theme}>
<Snippet {...{ $codeBlock: codeBlock }} style={customStyle} theme={theme}>
{codeBlock ? (
// @ts-ignore
<CodeBlock text={text} theme={theme} {...rest} />
) : (
// @ts-ignore
<Code text={text} theme={theme} {...rest} />
)}
<Button aria-label="Copy Code" type="button" onClick={handler} {...{ theme, copied }}>
<Button aria-label="Copy Code" type="button" onClick={handler} {...{ theme, $copied: copied }}>
<Copy
color={copied ? theme?.stringColor : theme?.textColor}
copied={copied}
Expand Down
12 changes: 2 additions & 10 deletions packages/react-code-blocks/src/components/CopyIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,23 @@ export interface IconProps {
color: any;
[x: string]: any;
}
const ClipboardListIcon = ({ size, color, ...props }: IconProps) => (
const ClipboardListIcon = ({ size = '16pt', color = 'currentcolor', ...props }: IconProps) => (
<svg {...props} viewBox="0 0 384 512" width={size} height={size} fill={color}>
<path d="M280 240H168c-4.4 0-8 3.6-8 8v16c0 4.4 3.6 8 8 8h112c4.4 0 8-3.6 8-8v-16c0-4.4-3.6-8-8-8zm0 96H168c-4.4 0-8 3.6-8 8v16c0 4.4 3.6 8 8 8h112c4.4 0 8-3.6 8-8v-16c0-4.4-3.6-8-8-8zM112 232c-13.3 0-24 10.7-24 24s10.7 24 24 24 24-10.7 24-24-10.7-24-24-24zm0 96c-13.3 0-24 10.7-24 24s10.7 24 24 24 24-10.7 24-24-10.7-24-24-24zM336 64h-80c0-35.3-28.7-64-64-64s-64 28.7-64 64H48C21.5 64 0 85.5 0 112v352c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48V112c0-26.5-21.5-48-48-48zM192 48c8.8 0 16 7.2 16 16s-7.2 16-16 16-16-7.2-16-16 7.2-16 16-16zm144 408c0 4.4-3.6 8-8 8H56c-4.4 0-8-3.6-8-8V120c0-4.4 3.6-8 8-8h40v32c0 8.8 7.2 16 16 16h160c8.8 0 16-7.2 16-16v-32h40c4.4 0 8 3.6 8 8v336z" />
</svg>
);

ClipboardListIcon.displayName = `ClipboardListIcon`;

ClipboardListIcon.defaultProps = {
size: '16pt',
color: `currentcolor`,
};

const ClipboardCheckIcon = ({ size, color, ...props }: IconProps) => (
const ClipboardCheckIcon = ({ size = '16pt', color = 'currentcolor', ...props }: IconProps) => (
<svg {...props} viewBox="0 0 384 512" width={size} height={size} fill={color}>
<path d="M336 64h-80c0-35.3-28.7-64-64-64s-64 28.7-64 64H48C21.5 64 0 85.5 0 112v352c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48V112c0-26.5-21.5-48-48-48zM192 40c13.3 0 24 10.7 24 24s-10.7 24-24 24-24-10.7-24-24 10.7-24 24-24zm121.2 231.8l-143 141.8c-4.7 4.7-12.3 4.6-17-.1l-82.6-83.3c-4.7-4.7-4.6-12.3.1-17L99.1 285c4.7-4.7 12.3-4.6 17 .1l46 46.4 106-105.2c4.7-4.7 12.3-4.6 17 .1l28.2 28.4c4.7 4.8 4.6 12.3-.1 17z" />
</svg>
);

ClipboardCheckIcon.displayName = `ClipboardCheckIcon`;

ClipboardCheckIcon.defaultProps = {
size: '16pt',
color: `currentcolor`,
};
export default function({
size,
color,
Expand Down