From 05ea37c779c9b9e80bc6b2fc0a5a480b7b595ae8 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 17 Jun 2022 16:16:58 +0530
Subject: [PATCH] fix: Set first visible tab as active

---
 frappe/public/js/frappe/form/form.js   |  2 --
 frappe/public/js/frappe/form/layout.js | 10 ++++++----
 frappe/public/js/frappe/form/tab.js    |  3 +--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index eefc629b4d..98a02850c1 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -575,8 +575,6 @@ frappe.ui.form.Form = class FrappeForm {
 
 		this.$wrapper.trigger('render_complete');
 
-		this.layout.set_first_tab_as_active(switched || this.cscript.is_onload);
-
 		if(!this.hidden) {
 			this.layout.show_empty_form_message();
 		}
diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js
index 080f8e0180..b808bdc7dc 100644
--- a/frappe/public/js/frappe/form/layout.js
+++ b/frappe/public/js/frappe/form/layout.js
@@ -123,7 +123,7 @@ frappe.ui.form.Layout = class Layout {
 
 		if (this.is_tabbed_layout()) {
 			// add a tab without `fieldname` to avoid conflicts
-			let default_tab = {label: __('Details'), fieldtype: "Tab Break"};
+			let default_tab = {label: __('Details'), fieldtype: "Tab Break", fieldname: "__details"};
 			let first_tab = this.fields[1].fieldtype === "Tab Break" ? this.fields[1] : null;
 			if (!first_tab) {
 				this.fields.splice(1, 0, default_tab);
@@ -336,12 +336,14 @@ frappe.ui.form.Layout = class Layout {
 		if (visible_tabs && visible_tabs.length == 1) {
 			visible_tabs[0].parent.toggleClass('hide show');
 		}
+		this.set_first_tab_as_active();
 	}
 
-	set_first_tab_as_active(switched) {
-		if (this.tabs.length && (switched || !this.frm.active_tab)) {
+	set_first_tab_as_active() {
+		if (this.tabs.length && !this.frm.active_tab) {
 			// set first tab as active when opening for first time, or new doc
-			this.tabs[0].set_active();
+			let first_visible_tab = this.tabs.find(tab => !tab.is_hidden());
+			first_visible_tab.set_active();
 		}
 	}
 
diff --git a/frappe/public/js/frappe/form/tab.js b/frappe/public/js/frappe/form/tab.js
index 69c573186b..5c95fad582 100644
--- a/frappe/public/js/frappe/form/tab.js
+++ b/frappe/public/js/frappe/form/tab.js
@@ -87,7 +87,6 @@ export default class Tab {
 	}
 
 	is_hidden() {
-		this.wrapper.hasClass('hide')
-			&& this.parent.hasClass('hide');
+		return this.wrapper.hasClass('hide');
 	}
 }