The personal finance app for everyone
Fix and improve chat title edit (#2285)
Alex Hatzenbuhler5c82af0e8c0a
diff --git a/app/components/menu_item_component.rb b/app/components/menu_item_component.rbindex c029afa7..9270de11 100644--- a/app/components/menu_item_component.rb+++ b/app/components/menu_item_component.rb@@ -1,25 +1,26 @@class MenuItemComponent < ViewComponent::BaseVARIANTS = %i[link button divider].freeze- attr_reader :variant, :text, :icon, :href, :method, :destructive, :confirm, :opts+ attr_reader :variant, :text, :icon, :href, :method, :destructive, :confirm, :frame, :opts- def initialize(variant:, text: nil, icon: nil, href: nil, method: :post, destructive: false, confirm: nil, **opts)+ def initialize(variant:, text: nil, icon: nil, href: nil, method: :post, destructive: false, confirm: nil, frame: nil, **opts)@variant = variant.to_sym@text = text@icon = icon@href = href@method = method.to_sym@destructive = destructive- @opts = opts@confirm = confirm+ @frame = frame+ @opts = optsraise ArgumentError, "Invalid variant: #{@variant}" unless VARIANTS.include?(@variant)enddef wrapper(&block)if variant == :button- button_to href, method: method, class: container_classes, **merged_button_opts, &block+ button_to href, method: method, class: container_classes, **merged_opts, &blockelsif variant == :link- link_to href, class: container_classes, **opts, &block+ link_to href, class: container_classes, **merged_opts, &blockelsenilend@@ -44,7 +45,7 @@ class MenuItemComponent < ViewComponent::Base].join(" ")end- def merged_button_opts+ def merged_optsmerged_opts = opts.dup || {}data = merged_opts.delete(:data) || {}@@ -52,6 +53,10 @@ class MenuItemComponent < ViewComponent::Basedata = data.merge(turbo_confirm: confirm.to_data_attribute)end+ if frame.present?+ data = data.merge(turbo_frame: frame)+ end+merged_opts.merge(data: data)endenddiff --git a/app/views/chats/_chat.html.erb b/app/views/chats/_chat.html.erbindex fd904de1..c61c5a04 100644--- a/app/views/chats/_chat.html.erb+++ b/app/views/chats/_chat.html.erb@@ -2,7 +2,9 @@<%= tag.div class: "flex items-center justify-between px-4 py-3 bg-container shadow-border-xs rounded-lg" do %><div class="grow">- <%= render "chats/chat_title", chat: chat, ctx: "list" %>+ <%= turbo_frame_tag dom_id(chat, :title) do %>+ <%= render "chats/chat_title", chat: chat, ctx: "list" %>+ <% end %><p class="text-sm text-secondary"><%= time_ago_in_words(chat.updated_at) %> ago@@ -10,7 +12,13 @@</div><%= render MenuComponent.new(icon_vertical: true) do |menu| %>- <% menu.with_item(variant: "link", text: "Edit chat", href: edit_chat_path(chat), icon: "pencil", frame: dom_id(chat, "title")) %>+ <% menu.with_item(+ variant: "link",+ text: "Edit chat title",+ href: edit_chat_path(chat, ctx: "list"),+ icon: "pencil",+ frame: dom_id(chat, "title")) %>+<% menu.with_item(variant: "button",text: "Delete chat",diff --git a/app/views/chats/edit.html.erb b/app/views/chats/edit.html.erbindex a7fa70ae..5789efe5 100644--- a/app/views/chats/edit.html.erb+++ b/app/views/chats/edit.html.erb@@ -1,8 +1,9 @@<%= turbo_frame_tag dom_id(@chat, :title), class: "block" do %>- <% bg_class = params[:ctx] == "chat" ? "bg-container" : "bg-container-inset" %>- <%= styled_form_with model: @chat,- class: class_names("p-1 rounded-md font-medium text-primary w-full", bg_class),- data: { controller: "auto-submit-form", auto_submit_form_trigger_event_value: "blur" } do |f| %>- <%= f.text_field :title, data: { auto_submit_form_target: "auto" }, inline: true %>+ <%= styled_form_with model: @chat, data: { controller: "auto-submit-form", auto_submit_form_trigger_event_value: "blur" } do |f| %>+ <%= f.text_field :title,+ data: { auto_submit_form_target: "auto" },+ autofocus: true,+ inline: true,+ class: "w-full rounded-md px-2 py-1 text-sm font-medium bg-transparent" %><% end %><% end %>