Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[14.0][FIX] shopfloor_mobile_base: fix searchbar focus #767

Merged
merged 2 commits into from
Nov 20, 2023
Merged

[14.0][FIX] shopfloor_mobile_base: fix searchbar focus #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dfd980
shopfloor_mobile_base: fix searchbar focus
JuMiSanAr Oct 16, 2023
3ae9b87
shopfloor_mobile: ensure searchbar focus doesn't remove user popups
JuMiSanAr Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions shopfloor_mobile/static/wms/src/scenario/cluster_picking.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import {ScenarioBaseMixin} from "/shopfloor_mobile_base/static/wms/src/scenario/mixins.js";
import {process_registry} from "/shopfloor_mobile_base/static/wms/src/services/process_registry.js";

// TODO: consider replacing the dynamic "autofocus" in the searchbar by an event.
// At the moment, we need autofocus to be disabled if there's a user popup.
const ClusterPicking = {
mixins: [ScenarioBaseMixin],
template: `
Expand All @@ -18,6 +20,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')"
Expand Down
3 changes: 3 additions & 0 deletions shopfloor_mobile/static/wms/src/scenario/location_content_transfer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import {ScenarioBaseMixin} from "/shopfloor_mobile_base/static/wms/src/scenario/mixins.js";
import {process_registry} from "/shopfloor_mobile_base/static/wms/src/services/process_registry.js";

// TODO: consider replacing the dynamic "autofocus" in the searchbar by an event.
// At the moment, we need autofocus to be disabled if there's a user popup.
const LocationContentTransfer = {
mixins: [ScenarioBaseMixin],
template: `
Expand All @@ -18,6 +20,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
Expand Down
17 changes: 15 additions & 2 deletions shopfloor_mobile/static/wms/src/scenario/single_pack_transfer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,28 @@ export var SinglePackStatesMixin = {
},
};

// TODO: consider replacing the dynamic "autofocus" in the searchbar by an event.
// At the moment, we need autofocus to be disabled if there's a user popup.
const SinglePackTransfer = {
mixins: [ScenarioBaseMixin, SinglePackStatesMixin],
template: `
<Screen :screen_info="screen_info">
<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])"
Expand Down
3 changes: 3 additions & 0 deletions shopfloor_mobile/static/wms/src/scenario/zone_picking.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import {ScenarioBaseMixin} from "/shopfloor_mobile_base/static/wms/src/scenario/mixins.js";
import {process_registry} from "/shopfloor_mobile_base/static/wms/src/services/process_registry.js";

// TODO: consider replacing the dynamic "autofocus" in the searchbar by an event.
// At the moment, we need autofocus to be disabled if there's a user popup.
const template_mobile = `
<Screen :screen_info="screen_info">
<template v-slot:header>
Expand All @@ -16,6 +18,7 @@ const template_mobile = `
v-if="state.on_scan"
v-on:found="on_scan"
:input_placeholder="search_input_placeholder"
:autofocus="!screen_info.user_popup"
JuMiSanAr marked this conversation as resolved.
Show resolved Hide resolved
/>

<div v-if="state_is('scan_location')">
Expand Down
10 changes: 9 additions & 1 deletion shopfloor_mobile_base/static/wms/src/components/searchbar/searchbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,15 @@ export var Searchbar = Vue.component("searchbar", {
},
methods: {
capture_focus: function () {
if (this.autofocus) this.$refs.searchbar.focus();
if (this.autofocus && this.$refs.searchbar) {
// We need to use both "focus" and "click" in combination
// to make sure that the searchbar is fully focused and ready for scanning
// without having to manually tap on it.
// Using simply one or the other is not enough
// to always be able to input any scanned text.
this.$refs.searchbar.focus();
this.$refs.searchbar.click();
}
},
show_virtual_keyboard: function (elem) {
elem.inputMode = this.input_inputmode;
Expand Down
Loading