Fix review issues

This commit is contained in:
Jorik Schellekens 2020-07-23 17:01:19 +01:00
parent 7d9a9904f5
commit 36899dad55
7 changed files with 81 additions and 18 deletions

33
bundle.js Normal file

File diff suppressed because one or more lines are too long

1
bundle.js.map Normal file

File diff suppressed because one or more lines are too long

View File

@ -3,21 +3,11 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^7.1.2",
"@types/classnames": "^2.2.10",
"@types/jest": "^24.0.0",
"@types/node": "^12.0.0",
"@types/react": "^16.9.0",
"@types/react-dom": "^16.9.0",
"@types/yup": "^0.29.3",
"classnames": "^2.2.6",
"formik": "^2.1.4",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-scripts": "3.4.1",
"typescript": "~3.7.2",
"yup": "^0.29.1"
},
"scripts": {
@ -56,10 +46,20 @@
]
},
"devDependencies": {
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^7.1.2",
"@types/classnames": "^2.2.10",
"@types/jest": "^24.0.0",
"@types/node": "^12.0.0",
"@types/react": "^16.9.0",
"@types/react-dom": "^16.9.0",
"@types/yup": "^0.29.3",
"eslint-config-matrix-org": "^0.1.0",
"husky": "^4.2.5",
"lint-staged": "^10.2.7",
"node-sass": "^4.14.1",
"prettier": "^2.0.5"
"prettier": "^2.0.5",
"typescript": "~3.7.2"
}
}

View File

@ -1,3 +1,19 @@
/*
Copyright 2020 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
$app-background: #f4f4f4;
$background: #ffffff;
$foreground: #000000;

View File

@ -1,3 +1,19 @@
/*
Copyright 2020 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
@mixin error {
color: $error;
border-color: $error;

View File

@ -31,7 +31,7 @@ const Button: React.FC<
IProps & React.RefAttributes<HTMLButtonElement>
> = React.forwardRef(
(
{ onClick, children, flashChildren, className, ...restProps }: IProps,
{ onClick, children, flashChildren, className, ...props }: IProps,
ref: React.Ref<HTMLButtonElement>
) => {
const [wasClicked, setWasClicked] = React.useState(false);
@ -58,7 +58,7 @@ const Button: React.FC<
className={classNames}
onClick={wrappedOnClick}
ref={ref}
{...restProps}
{...props}
>
{content}
</button>

View File

@ -21,13 +21,10 @@ import "./TextButton.scss";
const TextButton: React.FC<React.ButtonHTMLAttributes<Element>> = ({
className,
...restProps
...props
}) => {
return (
<button
className={classnames("textButton", className)}
{...restProps}
/>
<button className={classnames("textButton", className)} {...props} />
);
};
export default TextButton;