Skip to content

Commit

Permalink
Fixed button attribute types
Browse files Browse the repository at this point in the history
  • Loading branch information
TFM-LSW committed Feb 4, 2021
1 parent a9babd1 commit 377bef9
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 15 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@hoarelea/de-common-ui-react",
"version": "0.0.4",
"version": "0.0.5",
"main": "build/index.js",
"module": "build/index.esm.js",
"files": [
Expand Down
12 changes: 6 additions & 6 deletions src/Button/Button.test.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
// Generated with util/create-component.js
import React from "react";
import React, { ButtonHTMLAttributes, ReactNode } from "react";
import { render } from "@testing-library/react";
import Button from "./Button";
import { ButtonProps } from "./Button.types";
import { BoxComponent, ButtonOwnProps } from "evergreen-ui";

describe("Test Component", () => {
let props: any;
let props: ButtonProps;

beforeEach(() => {
props = {

};

});

const handleClick = (sayWhat: string) => console.log(sayWhat);

const renderComponent = () => render(<Button onClick={() => handleClick('hey')} {...props}>Some button</Button>);
const renderComponent = () => render(<Button onClick={() => handleClick('hey')}>HL Button</Button>);

it("should render correctly", () => {
const { getByTestId } = renderComponent();
Expand Down
8 changes: 4 additions & 4 deletions src/Button/Button.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import React from 'react';
import { Button as EgButton } from 'evergreen-ui';
import { BoxComponent, Button as EgButton } from 'evergreen-ui';
import { ButtonProps } from "./Button.types";
import { getSize } from "../utils";
import "./Button.scss";

const Button: React.FC<ButtonProps> = (props) => {
const { children, otherText, size, ...rest } = props;
const { children, size, ...rest } = props;
const height = size ? getSize(size) : getSize('md');

const restProps = rest as BoxComponent;
return (
<EgButton data-testid="Button" height={ height } { ...rest }>{ children } { otherText }</EgButton>
<EgButton data-testid="Button" height={ height } { ...restProps }>{ children }</EgButton>
)
};

Expand Down
10 changes: 6 additions & 4 deletions src/Button/Button.types.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { ButtonHTMLAttributes } from 'react';
import { CommonComponent, Appearance, Intention, Size } from '../common.models';
export interface ButtonProps extends CommonComponent{
import { ButtonHTMLAttributes, HtmlHTMLAttributes } from 'react';
import { CommonComponent, Intention, Size } from '../common.models';
import { BoxComponent, ButtonOwnProps } from 'evergreen-ui';
// React.HTMLProps<HTMLButtonElement>
// React.ButtonHTMLAttributes<HTMLButtonElement>
export interface ButtonProps extends CommonComponent, ButtonHTMLAttributes<ButtonOwnProps>{
size?: Size;
intent?: Intention;
otherText?: string;
}

0 comments on commit 377bef9

Please sign in to comment.