Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(connect-modal): pass through custom class names #122

Merged
merged 1 commit into from
Nov 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/react/stories/ConnectModal.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ function convert(ws: typeof wallets) {
badge: wallet.extends ? WalletPluginSystem[wallet.extends].text : undefined,
btmLogo: wallet.extends ? wallet.logo : undefined,
}));
// .slice(0, 2);
}

export const Primary: Story = {
Expand Down
2 changes: 0 additions & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,11 @@ export type { AssetListProps } from "./ui/asset-list/asset-list.types";
export { default as CrossChain } from "./ui/cross-chain";
export type {
CrossChainProps,
CrossChainHeaderProps,
CrossChainListItemProps,
} from "./ui/cross-chain/cross-chain.types";
export { default as SingleChain } from "./ui/single-chain";
export type {
SingleChainProps,
SingleChainHeaderProps,
SingleChainListItemProps,
} from "./ui/single-chain/single-chain.types";
export { default as OverviewTransfer } from "./ui/overview-transfer";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ export const walletList = style({
width: "100%",
overflow: "auto",
scrollbarWidth: "none",
paddingBottom: themeVars.space[8],
paddingTop: themeVars.space[1],
selectors: {
"&::-webkit-scrollbar": {
display: "none" /* Safari and Chrome */,
},
"&[data-has-list-wallets='true']": {
paddingBottom: themeVars.space[8],
}
},
});

Expand All @@ -30,7 +32,6 @@ export const squareWallets = style({
});

export const listWallets = style({
display: "grid",
rowGap: themeVars.space[2],
gridTemplateColumns: "repeat(1, minmax(0, 1fr))",
paddingBottom: themeVars.space[4],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
import anime from "animejs";
import type { AnimeInstance } from "animejs";
import clx from "clsx";
import Box from "../box";
import WalletButton from "../connect-modal-wallet-button";
import {
walletList,
Expand Down Expand Up @@ -44,6 +45,9 @@ export default function ConnectModalWalletList(
await exec();
})();
},
getListShapeWallets() {
return props.wallets.filter((w) => w.shape === "list");
},
});

onMount(() => {
Expand Down Expand Up @@ -115,7 +119,11 @@ export default function ConnectModalWalletList(

return (
<div className={clx(container, props.className)}>
<div ref={measureRef} className={walletList}>
<div
ref={measureRef}
className={walletList}
data-has-list-wallets={state.getListShapeWallets().length > 0}
>
<Show
when={props.wallets
.slice(0, 2)
Expand All @@ -126,7 +134,7 @@ export default function ConnectModalWalletList(
<For each={props.wallets.slice(0, 2)}>
{(wallet, index) => (
<WalletButton
key={wallet.name}
key={`${wallet.name}-${index}`}
variant="square"
name={wallet.prettyName ?? wallet.name}
logo={wallet.logo}
Expand All @@ -141,11 +149,14 @@ export default function ConnectModalWalletList(
</div>
</Show>

<div className={listWallets}>
<For each={props.wallets.filter((w) => w.shape === "list")}>
<Box
display={state.getListShapeWallets().length === 0 ? "none" : "grid"}
className={listWallets}
>
<For each={state.getListShapeWallets()}>
{(wallet, index) => (
<WalletButton
key={wallet.name}
key={`${wallet.name}-${index}`}
variant="list"
name={wallet.prettyName ?? wallet.name}
logo={wallet.logo}
Expand All @@ -158,7 +169,7 @@ export default function ConnectModalWalletList(
/>
)}
</For>
</div>
</Box>
</div>

<div ref={shadowRef} className={bottomShadow[state.theme]} />
Expand Down
2 changes: 1 addition & 1 deletion src/ui/connect-modal/connect-modal.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const modalContent = styleVariants({
});

export const modalAnimateContainer = style({
minHeight: themeVars.space[30],
minHeight: `clamp(100%, ${themeVars.space[30]}px, ${themeVars.space[30]}px)`,
});

export const modalChildren = style({
Expand Down
13 changes: 9 additions & 4 deletions src/ui/connect-modal/connect-modal.lite.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
useMetadata,
useRef,
} from "@builder.io/mitosis";
import clx from "clsx";
import AnimateLayout from "../animate-layout";
import { store } from "../../models/store";
import type { ThemeVariant } from "../../models/system.model";
Expand Down Expand Up @@ -58,11 +59,15 @@ export default function ConnectModal(props: ConnectModalProps) {
onClose={() => props.onClose?.()}
header={props.header}
className={props.modalContainerClassName}
contentClassName={modalContent[state.theme]}
contentStyles={state.overrideManager?.applyOverrides(
connectModalOverrides.name
contentClassName={clx(
modalContent[state.theme],
props.modalContentClassName
)}
childrenClassName={modalChildren}
contentStyles={{
...state.overrideManager?.applyOverrides(connectModalOverrides.name),
...props.modalContentStyles,
}}
childrenClassName={clx(modalChildren, props.modalChildrenClassName)}
>
<AnimateLayout className={modalAnimateContainer}>
{props.children}
Expand Down
3 changes: 3 additions & 0 deletions src/ui/connect-modal/connect-modal.types.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@ export interface ConnectModalProps extends BaseComponentProps {
children?: BaseComponentProps["children"];
className?: string;
modalContainerClassName?: string;
modalContentClassName?: string;
modalChildrenClassName?: string;
modalContentStyles?: any;
}