From 856100415ea6cf1e4e4418d92cdb0759ad070aa8 Mon Sep 17 00:00:00 2001
From: Ejaaz Khan <ejaazrkhan@gmail.com>
Date: Wed, 27 Nov 2024 01:27:11 +0530
Subject: [PATCH] fix: scroll issue on pick column

---
 frappe/public/js/frappe/form/grid_row.js | 23 ++++++++++++++---------
 frappe/public/scss/common/grid.scss      |  2 ++
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js
index 59c9a932d6..ce2c01218d 100644
--- a/frappe/public/js/frappe/form/grid_row.js
+++ b/frappe/public/js/frappe/form/grid_row.js
@@ -711,8 +711,21 @@ export default class GridRow {
 			}
 		});
 
+		let current_grid = $(
+			`div[data-fieldname="${this.grid.df.fieldname}"] .form-grid-container`
+		);
 		if (total_colsize > 10) {
-			$(".form-grid-container").addClass("column-limit-reached");
+			current_grid.addClass("column-limit-reached");
+		} else if (current_grid.hasClass("column-limit-reached")) {
+			if (Number($(current_grid).children(".form-grid").css("left")) != 0) {
+				$(current_grid).children(".form-grid").css("left", 0);
+				$(current_grid).children().find(".grid-scroll-bar").css({
+					width: "auto",
+					"margin-left": "0px",
+				});
+				$(current_grid).children().find(".grid-scroll-bar-rows").css("width", "auto");
+			}
+			current_grid.removeClass("column-limit-reached");
 		}
 
 		if (this.show_search) {
@@ -865,16 +878,8 @@ export default class GridRow {
 
 		let grid;
 		let grid_container;
-
-		let inital_position_x = 0;
-		let start_x = 0;
-		let start_y = 0;
-
 		let input_in_focus = false;
 
-		let vertical = false;
-		let horizontal = false;
-
 		// prevent random layout shifts caused by widgets and on click position elements inside view (UX).
 		function on_input_focus(el) {
 			input_in_focus = true;
diff --git a/frappe/public/scss/common/grid.scss b/frappe/public/scss/common/grid.scss
index dd39cf1fef..256b90e99e 100644
--- a/frappe/public/scss/common/grid.scss
+++ b/frappe/public/scss/common/grid.scss
@@ -196,6 +196,8 @@
 	.col:last-child {
 		border-right: none;
 		min-width: 0;
+		display: flex;
+		justify-content: center;
 	}
 
 	.col {