Compare commits
8 Commits
feat/remem
...
fix/tab-na
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cb25986d72 | ||
|
|
309ad57173 | ||
|
|
25c5b9c015 | ||
|
|
407e3946ce | ||
|
|
dc5b0d71eb | ||
|
|
3fd6c3f50e | ||
|
|
ec8bfc5eee | ||
|
|
b4a0bcb90d |
@@ -116,9 +116,16 @@ export const AccountDialog = ({
|
||||
<Text
|
||||
css={{
|
||||
fontFamily: "$monospace",
|
||||
a: { "&:hover": { textDecoration: "underline" } },
|
||||
}}
|
||||
>
|
||||
{activeAccount?.address}
|
||||
<a
|
||||
href={`https://${process.env.NEXT_PUBLIC_EXPLORER_URL}/${activeAccount?.address}`}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
>
|
||||
{activeAccount?.address}
|
||||
</a>
|
||||
</Text>
|
||||
</Flex>
|
||||
<Flex css={{ marginLeft: "auto", color: "$mauve12" }}>
|
||||
@@ -215,7 +222,11 @@ export const AccountDialog = ({
|
||||
</Button>
|
||||
</Text>
|
||||
</Flex>
|
||||
<Flex css={{ marginLeft: "auto" }}>
|
||||
<Flex
|
||||
css={{
|
||||
marginLeft: "auto",
|
||||
}}
|
||||
>
|
||||
<a
|
||||
href={`https://${process.env.NEXT_PUBLIC_EXPLORER_URL}/${activeAccount?.address}`}
|
||||
target="_blank"
|
||||
@@ -237,10 +248,22 @@ export const AccountDialog = ({
|
||||
<Text
|
||||
css={{
|
||||
fontFamily: "$monospace",
|
||||
a: { "&:hover": { textDecoration: "underline" } },
|
||||
}}
|
||||
>
|
||||
{activeAccount && activeAccount.hooks.length > 0
|
||||
? activeAccount.hooks.map((i) => truncate(i, 12)).join(",")
|
||||
? activeAccount.hooks.map((i) => {
|
||||
return (
|
||||
<a
|
||||
key={i}
|
||||
href={`https://${process.env.NEXT_PUBLIC_EXPLORER_URL}/${i}`}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
>
|
||||
{truncate(i, 12)}
|
||||
</a>
|
||||
);
|
||||
})
|
||||
: "–"}
|
||||
</Text>
|
||||
</Flex>
|
||||
|
||||
@@ -31,13 +31,15 @@ interface TabProps {
|
||||
|
||||
// TODO customise messages shown
|
||||
interface Props {
|
||||
label?: string;
|
||||
activeIndex?: number;
|
||||
activeHeader?: string;
|
||||
headless?: boolean;
|
||||
children: ReactElement<TabProps>[];
|
||||
keepAllAlive?: boolean;
|
||||
defaultExtension?: string;
|
||||
forceDefaultExtension?: boolean;
|
||||
appendDefaultExtension?: boolean;
|
||||
allowedExtensions?: string[];
|
||||
onCreateNewTab?: (name: string) => any;
|
||||
onCloseTab?: (index: number, header?: string) => any;
|
||||
onChangeActive?: (index: number, header?: string) => any;
|
||||
@@ -46,6 +48,7 @@ interface Props {
|
||||
export const Tab = (props: TabProps) => null;
|
||||
|
||||
export const Tabs = ({
|
||||
label = "Tab",
|
||||
children,
|
||||
activeIndex,
|
||||
activeHeader,
|
||||
@@ -55,7 +58,8 @@ export const Tabs = ({
|
||||
onCloseTab,
|
||||
onChangeActive,
|
||||
defaultExtension = "",
|
||||
forceDefaultExtension,
|
||||
appendDefaultExtension = false,
|
||||
allowedExtensions,
|
||||
}: Props) => {
|
||||
const [active, setActive] = useState(activeIndex || 0);
|
||||
const tabs: TabProps[] = children.map(elem => elem.props);
|
||||
@@ -86,9 +90,13 @@ export const Tabs = ({
|
||||
if (tabs.find(tab => tab.header === tabname)) {
|
||||
return { error: "Name already exists." };
|
||||
}
|
||||
const ext = tabname.split(".").pop() || "";
|
||||
if (allowedExtensions && !allowedExtensions.includes(ext)) {
|
||||
return { error: "This file extension is not allowed!" };
|
||||
}
|
||||
return { error: null };
|
||||
},
|
||||
[tabs]
|
||||
[allowedExtensions, tabs]
|
||||
);
|
||||
|
||||
const handleActiveChange = useCallback(
|
||||
@@ -101,9 +109,11 @@ export const Tabs = ({
|
||||
|
||||
const handleCreateTab = useCallback(() => {
|
||||
// add default extension in case omitted
|
||||
let _tabname = tabname.includes(".") ? tabname : tabname + defaultExtension;
|
||||
if (forceDefaultExtension && !_tabname.endsWith(defaultExtension)) {
|
||||
_tabname = _tabname + defaultExtension;
|
||||
let _tabname = tabname.includes(".")
|
||||
? tabname
|
||||
: `${tabname}.${defaultExtension}`;
|
||||
if (appendDefaultExtension && !_tabname.endsWith(defaultExtension)) {
|
||||
_tabname = `${_tabname}.${defaultExtension}`;
|
||||
}
|
||||
|
||||
const chk = validateTabname(_tabname);
|
||||
@@ -122,7 +132,7 @@ export const Tabs = ({
|
||||
}, [
|
||||
tabname,
|
||||
defaultExtension,
|
||||
forceDefaultExtension,
|
||||
appendDefaultExtension,
|
||||
validateTabname,
|
||||
onCreateNewTab,
|
||||
handleActiveChange,
|
||||
@@ -206,13 +216,13 @@ export const Tabs = ({
|
||||
size="sm"
|
||||
css={{ alignItems: "center", px: "$2", mr: "$3" }}
|
||||
>
|
||||
<Plus size="16px" /> {tabs.length === 0 && "Add new tab"}
|
||||
<Plus size="16px" /> {tabs.length === 0 && `Add new ${label.toLocaleLowerCase()}`}
|
||||
</Button>
|
||||
</DialogTrigger>
|
||||
<DialogContent>
|
||||
<DialogTitle>Create new tab</DialogTitle>
|
||||
<DialogTitle>Create new {label.toLocaleLowerCase()}</DialogTitle>
|
||||
<DialogDescription>
|
||||
<Label>Tabname</Label>
|
||||
<Label>{label} name</Label>
|
||||
<Input
|
||||
value={tabname}
|
||||
onChange={e => setTabname(e.target.value)}
|
||||
|
||||
@@ -76,14 +76,15 @@ const Test = () => {
|
||||
>
|
||||
<Box css={{ width: "55%", px: "$2" }}>
|
||||
<Tabs
|
||||
label='Transaction'
|
||||
activeHeader={activeHeader}
|
||||
// TODO make header a required field
|
||||
onChangeActive={(idx, header) => {
|
||||
if (header) transactionsState.activeHeader = header;
|
||||
}}
|
||||
keepAllAlive
|
||||
forceDefaultExtension
|
||||
defaultExtension=".json"
|
||||
defaultExtension="json"
|
||||
allowedExtensions={['json']}
|
||||
onCreateNewTab={(header) => modifyTransaction(header, {})}
|
||||
onCloseTab={(idx, header) =>
|
||||
header && modifyTransaction(header, undefined)
|
||||
|
||||
Reference in New Issue
Block a user