Compare commits

...

3 Commits

Author SHA1 Message Date
000de60c42
0.11.3 2021-09-05 14:06:02 +02:00
60b7e187fe
Readonly select will be basic readonly inputs
Signed-off-by: Avior <florian.bouillon@delta-wings.net>
2021-09-05 14:03:58 +02:00
1d0108ac80
Fixed button not sending to external link
Signed-off-by: Avior <florian.bouillon@delta-wings.net>
2021-09-05 14:02:46 +02:00
6 changed files with 88 additions and 72 deletions

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "@dzeio/components",
"version": "0.11.2",
"version": "0.11.3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@dzeio/components",
"version": "0.11.2",
"version": "0.11.3",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {

View File

@ -1,6 +1,6 @@
{
"name": "@dzeio/components",
"version": "0.11.2",
"version": "0.11.3",
"license": "MIT",
"main": "./index.js",
"types": "./types/index.d.ts",

View File

@ -25,3 +25,10 @@ WithImg.args = {
href: '/pouet',
block: true
}
export const ExternalLinkButton = (args: any) => <Component {...args}>Button</Component>
ExternalLinkButton.args = {
nomargintop: true,
href: 'https://example.com',
block: true
}

View File

@ -1,5 +1,5 @@
import React, { FC } from 'react'
import Link from 'next/link'
import Link from '../Link'
import { ColorType, IconProps } from '../interfaces'
import { buildClassName } from '../Util'
import Image from '../Image'
@ -57,8 +57,8 @@ export default class Button extends React.Component<Props> {
if (this.props.href) {
return (
<Link href={this.props.href} as={this.props.as}>
<a onClick={this.props.onClick} className={buildClassName([classes], [css.disabled, this.props.disabled])}>{inner}</a>
<Link linkProps={{onClick: this.props.onClick}} hideIcon noStyle href={this.props.href} className={buildClassName([classes], [css.disabled, this.props.disabled])}>
{inner}
</Link>
)
}

View File

@ -97,7 +97,7 @@ export default class Input extends React.Component<Props, States> {
baseProps.onWheel = (ev: React.WheelEvent<HTMLInputElement>) => ev.currentTarget.blur()
}
if (this.props.type === 'select') {
if (this.props.type === 'select' && !this.props.readOnly) {
input = (
<select
ref={this.props.selectRef || this.inputRef}
@ -112,6 +112,15 @@ export default class Input extends React.Component<Props, States> {
{this.props.children}
</select>
)
// select is readonly
} else if (this.props.type === 'select') {
input = (
<input
{...props}
{...baseProps}
type="text"
/>
)
} else if (this.props.type === 'textarea') {
delete baseProps.ref
input = (

View File

@ -1,65 +1,65 @@
import React from 'react'
import NextLink from 'next/link'
import { ExternalLink } from 'lucide-react'
import css from './Link.module.styl'
import { buildClassName } from '../Util'
interface Props {
linkProps?: React.DetailedHTMLProps<React.AnchorHTMLAttributes<HTMLAnchorElement>, HTMLAnchorElement>
href: string
children?: React.ReactNode
className?: string
/**
* Remove styling
*/
noStyle?: boolean
/**
* Override external detection system
*/
external?: boolean
/**
* force hiding the icon
*/
hideIcon?: boolean
}
export default class Link extends React.Component<Props> {
public render() {
const isExternal = this.props.href.startsWith('http')
const externalProps = this.props.external ? {
rel: 'noreferrer nofollow',
target: '_blank'
} : {}
if (isExternal) {
// external link
return (
<a
{...this.props.linkProps}
className={buildClassName(this.props.className, [css.link, !this.props.noStyle])}
href={this.props.href}
{...externalProps}
>
{this.props.children}
{(this.props.external !== false && !this.props.hideIcon) && (
<ExternalLink size={16} className={css.icon} />
)}
</a>
)
}
return (
<NextLink href={this.props.href}>
<a
{...this.props.linkProps}
{...externalProps}
className={buildClassName(this.props.className, [css.link, !this.props.noStyle])}
>{this.props.children}</a>
</NextLink>
)
}
}
import React from 'react'
import NextLink from 'next/link'
import { ExternalLink } from 'lucide-react'
import css from './Link.module.styl'
import { buildClassName } from '../Util'
interface Props {
linkProps?: React.DetailedHTMLProps<React.AnchorHTMLAttributes<HTMLAnchorElement>, HTMLAnchorElement>
href: string
children?: React.ReactNode
className?: string
/**
* Remove styling
*/
noStyle?: boolean
/**
* Override external detection system
*/
external?: boolean
/**
* force hiding the icon
*/
hideIcon?: boolean
}
export default class Link extends React.Component<Props> {
public render() {
const isExternal = this.props.href.startsWith('http')
const externalProps = this.props.external ?? isExternal ? {
rel: 'noreferrer nofollow',
target: '_blank'
} : {}
if (isExternal) {
// external link
return (
<a
{...this.props.linkProps}
className={buildClassName(this.props.className, [css.link, !this.props.noStyle])}
href={this.props.href}
{...externalProps}
>
{this.props.children}
{(this.props.external !== false && !this.props.hideIcon) && (
<ExternalLink size={16} className={css.icon} />
)}
</a>
)
}
return (
<NextLink href={this.props.href}>
<a
{...this.props.linkProps}
{...externalProps}
className={buildClassName(this.props.className, [css.link, !this.props.noStyle])}
>{this.props.children}</a>
</NextLink>
)
}
}