https://github.com/bonfire-networks/bonfire-app/issues/901

bonfire-networks · Mar 11, 2024 · 5bc1694 · 5bc1694
1 parent 76970e5
commit 5bc1694
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/lib/components/nav/back/back_button_live.ex b/lib/components/nav/back/back_button_live.ex
@@ -1,6 +1,6 @@
 defmodule Bonfire.UI.Common.BackButtonLive do
   use Bonfire.UI.Common.Web, :stateless_component
 
-  prop showing_within, :atom, default: nil
+  prop close_preview, :any, default: nil
   prop back, :any, default: true
 end
diff --git a/lib/components/nav/back/back_button_live.sface b/lib/components/nav/back/back_button_live.sface
@@ -1,14 +1,15 @@
-{!-- {#if @showing_within == :preview}
+{!-- {#if @showing_within == :preview} --}
+{#if @close_preview}
   <button
     id="close_preview"
     phx-click="Bonfire.UI.Common.OpenPreviewLive:close"
     :hook={"ClosePreview", from: Bonfire.UI.Common.PreviewContentLive}
     label={l("Go back to the previous page")}
     class="btn font-normal normal-case btn-ghost btn-sm btn-circle !inline-flex"
   >
-    <#Icon iconfiy="ion:chevron-back" class="w-5 h-5 text-base-content/70" />
-  </button> --}
-{#if is_binary(@back) and @back != current_url(@__context__)}
+    <#Icon iconify="ion:chevron-back" class="w-5 h-5 text-base-content/70" />
+  </button>
+{#elseif is_binary(@back) and @back != current_url(@__context__)}
   <LinkLive
     to={@back}
     label={l("Go back to the previous page")}

diff --git a/lib/components/nav/tabs/tabs_live.ex b/lib/components/nav/tabs/tabs_live.ex
@@ -7,6 +7,7 @@ defmodule Bonfire.UI.Common.TabsLive do
   prop selected_name, :string, default: nil
   prop path_prefix, :string, default: "?tab="
   prop path_suffix, :string, default: nil
+  prop show_back_button, :boolean, default: false
 
   prop link_component, :atom, default: LinkPatchLive
 

diff --git a/lib/components/nav/tabs/tabs_live.sface b/lib/components/nav/tabs/tabs_live.sface
@@ -37,6 +37,10 @@
   {#elseif @type == :header_only}
     <div class="flex justify-between items-center w-full px-6">
       <div class="text-lg font-bold w-full flex-1">
+        {#if @show_back_button}
+          <Bonfire.UI.Common.BackButtonLive close_preview />
+        {/if}
+
         {@selected_name}
       </div>
       <#slot />

diff --git a/lib/layout/persistent_live.sface b/lib/layout/persistent_live.sface
@@ -45,6 +45,7 @@
             module={maybe_component(Bonfire.UI.Social.FeedLive, @__context__)}
             id={:persistent_feed}
             feed_name={:default}
+            show_back_button
             tab_path_prefix="/feed/"
           />
         </div>