Scipaper/Frontend
5
0
Fork 0
Code Issues 15 Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into fix/bottom-sheet-modal

Browse Source
This commit is contained in:
decamel 2022-08-23 13:43:03 +03:00
commit 159913fe97
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/BaseLayout.tsx
View File

@ -1,5 +1,5 @@
import React from "react"; import React from "react";
// import { Footer } from "./parts/Footer"; import { Footer } from "./parts/Footer";
import Header from "./parts/Header"; import Header from "./parts/Header";
type Props = { type Props = {
header?: React.ReactElement; header?: React.ReactElement;

7
src/components/Button/Button.tsx
View File

@ -38,9 +38,6 @@ export const Button: React.FC<ButtonProps> & ButtonExtentions = ({
children, children,
...props ...props
}) => { }) => {
console.log(
React.isValidElement(children) && React.Children.only(children).type
);
const isOnlyIcon = const isOnlyIcon =
children && children &&
React.isValidElement(children) && React.isValidElement(children) &&
@ -51,11 +48,11 @@ export const Button: React.FC<ButtonProps> & ButtonExtentions = ({
return ( return (
<button <button
//TODO change on click event //TODO change on click event
onClick={!disabled ? () => alert("Click") : undefined} onClick={!disabled ? () => {} : undefined}
className={classNames([ className={classNames([
"flex content-center justify-between", "flex content-center justify-between",
"text-center", "text-center",
{ padding: defaultStyle }, padding,
"rounded", "rounded",
{ {
"!cursor-default": disabled, "!cursor-default": disabled,