From 1f36949d57f177a4fed2d21330b1083a01c12a40 Mon Sep 17 00:00:00 2001
From: JuMiSanAr <jumisan134@gmail.com>
Date: Mon, 6 Nov 2023 10:24:06 +0100
Subject: [PATCH] shopfloor_mobile: ensure searchbar focus doesn't remove user
 popups

---
 .../static/wms/src/scenario/cluster_picking.js    |  1 +
 .../wms/src/scenario/location_content_transfer.js |  1 +
 .../wms/src/scenario/single_pack_transfer.js      | 15 +++++++++++++--
 .../static/wms/src/scenario/zone_picking.js       |  1 +
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/shopfloor_mobile/static/wms/src/scenario/cluster_picking.js b/shopfloor_mobile/static/wms/src/scenario/cluster_picking.js
index b85426a68a3..9156eacab06 100644
--- a/shopfloor_mobile/static/wms/src/scenario/cluster_picking.js
+++ b/shopfloor_mobile/static/wms/src/scenario/cluster_picking.js
@@ -18,6 +18,7 @@ const ClusterPicking = {
                 v-if="state.on_scan"
                 v-on:found="on_scan"
                 :input_placeholder="search_input_placeholder"
+                :autofocus="!screen_info.user_popup"
                 />
             <get-work
                 v-if="state_is('start')"
diff --git a/shopfloor_mobile/static/wms/src/scenario/location_content_transfer.js b/shopfloor_mobile/static/wms/src/scenario/location_content_transfer.js
index 371d6152c0d..5c9de47ee88 100644
--- a/shopfloor_mobile/static/wms/src/scenario/location_content_transfer.js
+++ b/shopfloor_mobile/static/wms/src/scenario/location_content_transfer.js
@@ -18,6 +18,7 @@ const LocationContentTransfer = {
                 v-if="state.on_scan"
                 v-on:found="on_scan"
                 :input_placeholder="search_input_placeholder"
+                :autofocus="!screen_info.user_popup"
                 />
             <template v-if="state_in(['scan_location']) && state.data.location">
                 <item-detail-card
diff --git a/shopfloor_mobile/static/wms/src/scenario/single_pack_transfer.js b/shopfloor_mobile/static/wms/src/scenario/single_pack_transfer.js
index 86117fea66c..6cbb0b6c061 100644
--- a/shopfloor_mobile/static/wms/src/scenario/single_pack_transfer.js
+++ b/shopfloor_mobile/static/wms/src/scenario/single_pack_transfer.js
@@ -67,8 +67,19 @@ const SinglePackTransfer = {
             <template v-slot:header>
                 <state-display-info :info="state.display_info" v-if="state.display_info"/>
             </template>
-            <searchbar v-if="state_is(initial_state_key)" v-on:found="on_scan" :input_placeholder="search_input_placeholder"></searchbar>
-            <searchbar v-if="state_is('scan_location')" v-on:found="on_scan" :input_placeholder="search_input_placeholder" :input_data_type="'location'"></searchbar>
+            <searchbar
+                v-if="state_is(initial_state_key)"
+                v-on:found="on_scan"
+                :autofocus="!screen_info.user_popup"
+                :input_placeholder="search_input_placeholder"
+            ></searchbar>
+            <searchbar
+                v-if="state_is('scan_location')"
+                v-on:found="on_scan"
+                :autofocus="!screen_info.user_popup"
+                :input_placeholder="search_input_placeholder"
+                :input_data_type="'location'"
+            ></searchbar>
             <div v-if="state.key != 'show_completion_info' && _.result(state, 'data.picking')">
                 <item-detail-card
                     :key="make_state_component_key(['package', state.data.id])"
diff --git a/shopfloor_mobile/static/wms/src/scenario/zone_picking.js b/shopfloor_mobile/static/wms/src/scenario/zone_picking.js
index 9b6030c4a1f..d6340c46c15 100644
--- a/shopfloor_mobile/static/wms/src/scenario/zone_picking.js
+++ b/shopfloor_mobile/static/wms/src/scenario/zone_picking.js
@@ -16,6 +16,7 @@ const template_mobile = `
             v-if="state.on_scan"
             v-on:found="on_scan"
             :input_placeholder="search_input_placeholder"
+            :autofocus="!screen_info.user_popup"
             />
 
         <div v-if="state_is('scan_location')">