diff --git a/packages/bbui/src/Tabs/Tab.svelte b/packages/bbui/src/Tabs/Tab.svelte index 627d7e525ac..3ae6adfac45 100644 --- a/packages/bbui/src/Tabs/Tab.svelte +++ b/packages/bbui/src/Tabs/Tab.svelte @@ -1,11 +1,14 @@ - - - -
- {#if icon} - - {/if} - {title} -
+{#if link} + + {#if icon} + + {/if} + {title} + +{:else} + + + +
+ {#if icon} + + {/if} + {title} +
+{/if} {#if isSelected} @@ -94,4 +134,7 @@ .spectrum-Tabs-item:hover { color: var(--spectrum-global-color-gray-900); } + .link { + user-select: none; + } diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte index 6094c93a262..cd62a973409 100644 --- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte @@ -21,7 +21,7 @@ } from "@budibase/bbui" import AppActions from "components/deploy/AppActions.svelte" import { API } from "api" - import { isActive, goto, layout, redirect } from "@roxi/routify" + import { isActive, url, goto, layout, redirect } from "@roxi/routify" import { capitalise } from "helpers" import { onMount, onDestroy } from "svelte" import VerificationPromptBanner from "components/common/VerificationPromptBanner.svelte" @@ -69,7 +69,7 @@ // e.g. if one of your screens is selected on front end, then // you browse to backend, when you click frontend, you will be // brought back to the same screen. - const topItemNavigate = path => () => { + const topItemNavigate = path => { const activeTopNav = $layout.children.find(c => $isActive(c.path)) if (activeTopNav) { builderStore.setPreviousTopNavPath( @@ -136,21 +136,18 @@
{#if $appStore.initialised}
- - $goto("../../portal/apps")} - /> - + + + {#each $layout.children as { path, title }} topItemNavigate(path)} title={capitalise(title)} id={`builder-${title}-tab`} /> @@ -201,6 +198,11 @@