Skip to content
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
8 changes: 2 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,13 @@
"@lerna-lite/cli": "latest",
"@lerna-lite/publish": "latest",
"eslint": "8",
"eslint-config-next": "latest",
"eslint-config-next": "14",
"finepack": "latest",
"git-authors-cli": "latest",
"nano-staged": "latest",
"next": "latest",
"simple-git-hooks": "latest",
"standard": "latest",
"standard-markdown": "latest",
"standard-version": "latest"
},
"engines": {
Expand All @@ -55,7 +54,7 @@
"clean:build": "pnpm -r exec -- rm -rf dist",
"clean:node": "pnpm -r exec -- rm -rf node_modules",
"contributors": "(npx git-authors-cli && npx finepack && git add package.json && git commit -m 'build: contributors' --no-verify) || true",
"lint": "eslint \"packages/*/src/**/*\" && standard-markdown README.md --fix && standard --fix",
"lint": "eslint \"packages/*/src/**/*\" && standard --fix",
"prepublishOnly": "pnpm run build",
"pretest": "pnpm run lint",
"release": "lerna publish --sort --conventional-commits -m \"chore(release): %s\" --create-release github",
Expand Down Expand Up @@ -84,9 +83,6 @@
"prettier-standard",
"standard --fix"
],
"*.md": [
"standard-markdown"
],
"package.json": [
"finepack"
]
Expand Down
2 changes: 1 addition & 1 deletion packages/hover-react/stories/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const setData = () => ({
url: 'https://microlink.io',
date: '2020-05-07T15:10:41.692Z',
logo: {
url: 'https://cdn.microlink.io/logo/trim.png',
url: 'https://cdn.microlink.io/logo/logo.png',
type: 'png',
size: 5050,
height: 500,
Expand Down
26 changes: 6 additions & 20 deletions packages/hover-vanilla/docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,11 @@
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@100;200;400;500;600&display=swap" rel="stylesheet">

<!-- Favicon -->
<link rel="apple-touch-icon-precomposed" sizes="57x57" href="https://cdn.microlink.io/logo/apple-touch-icon-57x57.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="https://cdn.microlink.io/logo/apple-touch-icon-114x114.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="https://cdn.microlink.io/logo/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="https://cdn.microlink.io/logo/apple-touch-icon-144x144.png">
<link rel="apple-touch-icon-precomposed" sizes="60x60" href="https://cdn.microlink.io/logo/apple-touch-icon-60x60.png">
<link rel="apple-touch-icon-precomposed" sizes="120x120" href="https://cdn.microlink.io/logo/apple-touch-icon-120x120.png">
<link rel="apple-touch-icon-precomposed" sizes="76x76" href="https://cdn.microlink.io/logo/apple-touch-icon-76x76.png">
<link rel="apple-touch-icon-precomposed" sizes="152x152" href="https://cdn.microlink.io/logo/apple-touch-icon-152x152.png">
<link rel="icon" type="image/png" href="https://cdn.microlink.io/logo/favicon-196x196.png" sizes="196x196">
<link rel="icon" type="image/png" href="https://cdn.microlink.io/logo/favicon-96x96.png" sizes="96x96">
<link rel="icon" type="image/png" href="https://cdn.microlink.io/logo/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="https://cdn.microlink.io/logo/favicon-16x16.png" sizes="16x16">
<link rel="icon" type="image/png" href="https://cdn.microlink.io/logo/favicon-128.png" sizes="128x128">
<meta name="msapplication-TileColor" content="#FFFFFF">
<meta name="msapplication-TileImage" content="https://cdn.microlink.io/logo/mstile-144x144.png">
<meta name="msapplication-square70x70logo" content="https://cdn.microlink.io/logo/mstile-70x70.png">
<meta name="msapplication-square150x150logo" content="https://cdn.microlink.io/logo/mstile-150x150.png">
<meta name="msapplication-wide310x150logo" content="https://cdn.microlink.io/logo/mstile-310x150.png">
<meta name="msapplication-square310x310logo" content="https://cdn.microlink.io/logo/mstile-310x310.png">
<link rel="icon" type="image/png" href="https://cdn.microlink.io/logo/favicon-96x96.png" sizes="96x96" />
<link rel="icon" type="image/svg+xml" href="https://cdn.microlink.io/logo/favicon.svg" />
<link rel="shortcut icon" href="https://cdn.microlink.io/logo/favicon.ico" />
<link rel="apple-touch-icon" sizes="180x180" href="https://cdn.microlink.io/logo/apple-touch-icon.png" />
<link rel="manifest" href="https://cdn.microlink.io/site.webmanifest" />

<!-- Meta -->
<title>@microlink/hover-vanilla</title>
Expand All @@ -53,7 +39,7 @@
<meta property="og:description" content="Turns any URL into instant hover preview ✨">
<meta property="og:image" content="https://cdn.microlink.io/logo/banner.png">
<meta property="og:video:secure_url" content="https://hover-vanilla.microlink.io/assets/video/demo.mp4">
<meta property="og:logo" content="https://cdn.microlink.io/logo/trim.png">
<meta property="og:logo" content="https://cdn.microlink.io/logo/logo.png">
<meta property="og:site_name" content="Microlink">
<meta property="og:type" content="website">

Expand Down
4 changes: 2 additions & 2 deletions packages/react/src/components/Card/CardMedia/Image.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ import { classNames, imageProxy } from '../../../utils'
const ImageWrap = styled(Wrap).attrs({
className: `${classNames.media} ${classNames.image}`
})`
background-image: ${({ url }) => (url ? `url('${imageProxy(url)}')` : '')};
background-image: ${({ $url }) => ($url ? `url('${imageProxy($url)}')` : '')};
`

const ImageComponent = props => {
const {
state: { imageUrl }
} = useContext(GlobalContext)

return <ImageWrap url={imageUrl} {...props} />
return <ImageWrap $url={imageUrl} {...props} />
}

export default ImageComponent
6 changes: 3 additions & 3 deletions packages/react/src/components/Card/CardText.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ const StyledClamp = styled(Clamp)`
}
`

const CardText = ({ useNanoClamp = true, children, ...props }) => {
const textProps = useNanoClamp
const CardText = ({ $useNanoClamp = true, children, ...props }) => {
const textProps = $useNanoClamp
? props
: { ...props, as: 'p', title: children }

return (
<StyledClamp $useNanoClamp={useNanoClamp} {...textProps}>
<StyledClamp $useNanoClamp={$useNanoClamp} {...textProps}>
{children}
</StyledClamp>
)
Expand Down
28 changes: 16 additions & 12 deletions packages/react/src/components/Card/CardWrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import { media, isLarge } from '../../utils'

const HEIGHT = '382px'

const contrastStyle = ({ $backgroundColor, color }) => css`
const contrastStyle = ({ $backgroundColor, $color }) => css`
background-color: ${$backgroundColor};
border-color: ${color};
border-color: ${$color};
transition-property: filter;
will-change: filter;

&&& {
color: ${color};
color: ${$color};
}

&:hover {
Expand Down Expand Up @@ -69,13 +69,13 @@ const baseStyle = css(

const Element = styled('a')(
baseStyle,
({ $isLoading, contrast }) => !$isLoading && !contrast && hoverStyle,
({ $isLoading, $contrast }) => !$isLoading && !$contrast && hoverStyle,
({ $cardSize }) => isLarge($cardSize) && largeStyle,
({ direction }) => direction === 'rtl' && rtlStyle,
({ $backgroundColor, color, contrast }) =>
contrast && color && $backgroundColor && contrastStyle,
({ $backgroundColor, color, contrast }) =>
contrast && (!color || !$backgroundColor) && hoverStyle
({ $direction }) => $direction === 'rtl' && rtlStyle,
({ $backgroundColor, $color, $contrast }) =>
$contrast && $color && $backgroundColor && contrastStyle,
({ $backgroundColor, $color, $contrast }) =>
$contrast && (!$color || !$backgroundColor) && hoverStyle
)

const CardWrap = forwardRef(
Expand All @@ -90,16 +90,20 @@ const CardWrap = forwardRef(
ref
) => {
const {
state: { $backgroundColor, color, title },
state: { $backgroundColor, color: $color, title },
props: { size: $cardSize }
} = useContext(GlobalContext)

const { contrast: $contrast, direction: $direction, ...props } = restProps

return createElement(Element, {
...(as === 'a' ? { href, rel, target } : undefined),
...restProps,
...props,
$backgroundColor,
$cardSize,
color,
$color,
$contrast,
$direction,
ref,
title
})
Expand Down
Loading
Loading