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

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

View File

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

View File

@ -25,7 +25,7 @@ export function BottomSheetModal({
leaveFrom="translate-y-0 opacity-100"
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}
</Dialog>
</Transition>