The personal finance app for everyone
Fix Turbo bug with tabs (#506)
Zach Gollwitzer89ea12e9a188
diff --git a/app/javascript/controllers/tabs_controller.js b/app/javascript/controllers/tabs_controller.jsindex 75902361..5dc674a4 100644--- a/app/javascript/controllers/tabs_controller.js+++ b/app/javascript/controllers/tabs_controller.js@@ -7,27 +7,38 @@ export default class extends Controller {static values = { defaultTab: String };connect() {- const defaultTab = this.defaultTabValue;- this.tabTargets.forEach((tab) => {- if (tab.id === defaultTab) {- tab.hidden = false;- this.btnTargets- .find((btn) => btn.dataset.id === defaultTab)- .classList.add(...this.activeClasses);- } else {- tab.hidden = true;- }- });+ this.updateClasses(this.defaultTabValue);+ document.addEventListener(+ "turbo:load",+ this.updateClasses.bind(this, this.defaultTabValue)+ );}- select(event) {- const selectedTabId = event.currentTarget.dataset.id;- this.tabTargets.forEach((tab) => (tab.hidden = tab.id !== selectedTabId));- this.btnTargets.forEach((btn) =>- btn.classList.toggle(- ...this.activeClasses,- btn.dataset.id === selectedTabId- )+ disconnect() {+ document.removeEventListener(+ "turbo:load",+ this.updateClasses.bind(this, this.defaultTabValue));}++ select(event) {+ this.updateClasses(event.target.dataset.id);+ }++ updateClasses(selectedId) {+ this.btnTargets.forEach((btn) => btn.classList.remove(this.activeClass));+ this.tabTargets.forEach((tab) => tab.classList.add("hidden"));++ this.btnTargets.forEach((btn) => {+ if (btn.dataset.id === selectedId) {+ btn.classList.add(this.activeClass);+ }+ });++ this.tabTargets.forEach((tab) => {+ if (tab.id === selectedId) {+ tab.classList.remove("hidden");+ }+ });+ }}diff --git a/app/views/accounts/show.html.erb b/app/views/accounts/show.html.erbindex a759f15e..5db0879f 100644--- a/app/views/accounts/show.html.erb+++ b/app/views/accounts/show.html.erb@@ -70,7 +70,7 @@<div data-tabs-target="tab" id="account-history-tab"><%= render partial: "accounts/account_history", locals: { account: @account, valuation_series: @valuation_series } %></div>- <div data-tabs-target="tab" id="account-transactions-tab">+ <div data-tabs-target="tab" id="account-transactions-tab" class="hidden"><%= render partial: "accounts/transactions", locals: { transactions: @account.transactions.order(date: :desc) } %></div></div>