Scipaper/front-end
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/triple-column-layout

Browse Source
This commit is contained in:
Maximus 2022-08-24 23:39:55 +03:00
commit 3b2c3c5e9c
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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,

2
src/components/containers/modal/BottomSheetModal.tsx
View File

@ -25,7 +25,7 @@ export function BottomSheetModal({
leaveFrom="translate-y-0 opacity-100" leaveFrom="translate-y-0 opacity-100"
leaveTo="translate-y-full opacity-0" leaveTo="translate-y-full opacity-0"
> >
<Dialog className="fixed bottom-0" as="div" onClose={() => {}}> <Dialog className="fixed bottom-0 w-full" as="div" onClose={() => {}}>
{children} {children}
</Dialog> </Dialog>
</Transition> </Transition>