mirror of
https://github.com/dzeiocom/components.git
synced 2025-05-11 20:07:51 +00:00
Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
000de60c42 | |||
60b7e187fe | |||
1d0108ac80 |
4
package-lock.json
generated
4
package-lock.json
generated
@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "@dzeio/components",
|
"name": "@dzeio/components",
|
||||||
"version": "0.11.2",
|
"version": "0.11.3",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "@dzeio/components",
|
"name": "@dzeio/components",
|
||||||
"version": "0.11.2",
|
"version": "0.11.3",
|
||||||
"hasInstallScript": true,
|
"hasInstallScript": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@dzeio/components",
|
"name": "@dzeio/components",
|
||||||
"version": "0.11.2",
|
"version": "0.11.3",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"main": "./index.js",
|
"main": "./index.js",
|
||||||
"types": "./types/index.d.ts",
|
"types": "./types/index.d.ts",
|
||||||
|
@ -25,3 +25,10 @@ WithImg.args = {
|
|||||||
href: '/pouet',
|
href: '/pouet',
|
||||||
block: true
|
block: true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const ExternalLinkButton = (args: any) => <Component {...args}>Button</Component>
|
||||||
|
ExternalLinkButton.args = {
|
||||||
|
nomargintop: true,
|
||||||
|
href: 'https://example.com',
|
||||||
|
block: true
|
||||||
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import React, { FC } from 'react'
|
import React, { FC } from 'react'
|
||||||
import Link from 'next/link'
|
import Link from '../Link'
|
||||||
import { ColorType, IconProps } from '../interfaces'
|
import { ColorType, IconProps } from '../interfaces'
|
||||||
import { buildClassName } from '../Util'
|
import { buildClassName } from '../Util'
|
||||||
import Image from '../Image'
|
import Image from '../Image'
|
||||||
@ -57,8 +57,8 @@ export default class Button extends React.Component<Props> {
|
|||||||
|
|
||||||
if (this.props.href) {
|
if (this.props.href) {
|
||||||
return (
|
return (
|
||||||
<Link href={this.props.href} as={this.props.as}>
|
<Link linkProps={{onClick: this.props.onClick}} hideIcon noStyle href={this.props.href} className={buildClassName([classes], [css.disabled, this.props.disabled])}>
|
||||||
<a onClick={this.props.onClick} className={buildClassName([classes], [css.disabled, this.props.disabled])}>{inner}</a>
|
{inner}
|
||||||
</Link>
|
</Link>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -97,7 +97,7 @@ export default class Input extends React.Component<Props, States> {
|
|||||||
baseProps.onWheel = (ev: React.WheelEvent<HTMLInputElement>) => ev.currentTarget.blur()
|
baseProps.onWheel = (ev: React.WheelEvent<HTMLInputElement>) => ev.currentTarget.blur()
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.props.type === 'select') {
|
if (this.props.type === 'select' && !this.props.readOnly) {
|
||||||
input = (
|
input = (
|
||||||
<select
|
<select
|
||||||
ref={this.props.selectRef || this.inputRef}
|
ref={this.props.selectRef || this.inputRef}
|
||||||
@ -112,6 +112,15 @@ export default class Input extends React.Component<Props, States> {
|
|||||||
{this.props.children}
|
{this.props.children}
|
||||||
</select>
|
</select>
|
||||||
)
|
)
|
||||||
|
// select is readonly
|
||||||
|
} else if (this.props.type === 'select') {
|
||||||
|
input = (
|
||||||
|
<input
|
||||||
|
{...props}
|
||||||
|
{...baseProps}
|
||||||
|
type="text"
|
||||||
|
/>
|
||||||
|
)
|
||||||
} else if (this.props.type === 'textarea') {
|
} else if (this.props.type === 'textarea') {
|
||||||
delete baseProps.ref
|
delete baseProps.ref
|
||||||
input = (
|
input = (
|
||||||
|
@ -30,7 +30,7 @@ export default class Link extends React.Component<Props> {
|
|||||||
|
|
||||||
public render() {
|
public render() {
|
||||||
const isExternal = this.props.href.startsWith('http')
|
const isExternal = this.props.href.startsWith('http')
|
||||||
const externalProps = this.props.external ? {
|
const externalProps = this.props.external ?? isExternal ? {
|
||||||
rel: 'noreferrer nofollow',
|
rel: 'noreferrer nofollow',
|
||||||
target: '_blank'
|
target: '_blank'
|
||||||
} : {}
|
} : {}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user