mirror of
https://github.com/zebrajr/ollama-webui.git
synced 2025-12-06 12:19:46 +01:00
Merge pull request #18310 from silentoplayz/fix-integrations-menu-closing-outside-click
fix: prevent integrations menu from closing when valves modal is open
This commit is contained in:
commit
2b3b2e4aa6
|
|
@ -117,6 +117,11 @@
|
||||||
let showValvesModal = false;
|
let showValvesModal = false;
|
||||||
let selectedValvesType = 'tool'; // 'tool' or 'function'
|
let selectedValvesType = 'tool'; // 'tool' or 'function'
|
||||||
let selectedValvesItemId = null;
|
let selectedValvesItemId = null;
|
||||||
|
let integrationsMenuCloseOnOutsideClick = true;
|
||||||
|
|
||||||
|
$: if (!showValvesModal) {
|
||||||
|
integrationsMenuCloseOnOutsideClick = true;
|
||||||
|
}
|
||||||
|
|
||||||
$: onChange({
|
$: onChange({
|
||||||
prompt,
|
prompt,
|
||||||
|
|
@ -944,6 +949,9 @@
|
||||||
on:save={async () => {
|
on:save={async () => {
|
||||||
await tick();
|
await tick();
|
||||||
}}
|
}}
|
||||||
|
on:close={() => {
|
||||||
|
integrationsMenuCloseOnOutsideClick = true;
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{#if loaded}
|
{#if loaded}
|
||||||
|
|
@ -1463,11 +1471,13 @@
|
||||||
bind:webSearchEnabled
|
bind:webSearchEnabled
|
||||||
bind:imageGenerationEnabled
|
bind:imageGenerationEnabled
|
||||||
bind:codeInterpreterEnabled
|
bind:codeInterpreterEnabled
|
||||||
|
closeOnOutsideClick={integrationsMenuCloseOnOutsideClick}
|
||||||
onShowValves={(e) => {
|
onShowValves={(e) => {
|
||||||
const { type, id } = e;
|
const { type, id } = e;
|
||||||
selectedValvesType = type;
|
selectedValvesType = type;
|
||||||
selectedValvesItemId = id;
|
selectedValvesItemId = id;
|
||||||
showValvesModal = true;
|
showValvesModal = true;
|
||||||
|
integrationsMenuCloseOnOutsideClick = false;
|
||||||
}}
|
}}
|
||||||
onClose={async () => {
|
onClose={async () => {
|
||||||
await tick();
|
await tick();
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,7 @@
|
||||||
|
|
||||||
export let onShowValves: Function;
|
export let onShowValves: Function;
|
||||||
export let onClose: Function;
|
export let onClose: Function;
|
||||||
|
export let closeOnOutsideClick = true;
|
||||||
|
|
||||||
let show = false;
|
let show = false;
|
||||||
let tab = '';
|
let tab = '';
|
||||||
|
|
@ -93,6 +94,7 @@
|
||||||
|
|
||||||
<Dropdown
|
<Dropdown
|
||||||
bind:show
|
bind:show
|
||||||
|
{closeOnOutsideClick}
|
||||||
on:change={(e) => {
|
on:change={(e) => {
|
||||||
if (e.detail === false) {
|
if (e.detail === false) {
|
||||||
onClose();
|
onClose();
|
||||||
|
|
|
||||||
|
|
@ -9,12 +9,15 @@
|
||||||
export let show = false;
|
export let show = false;
|
||||||
export let side = 'bottom';
|
export let side = 'bottom';
|
||||||
export let align = 'start';
|
export let align = 'start';
|
||||||
|
export let closeOnOutsideClick = true;
|
||||||
|
|
||||||
const dispatch = createEventDispatcher();
|
const dispatch = createEventDispatcher();
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<DropdownMenu.Root
|
<DropdownMenu.Root
|
||||||
bind:open={show}
|
bind:open={show}
|
||||||
closeFocus={false}
|
closeFocus={false}
|
||||||
|
{closeOnOutsideClick}
|
||||||
onOpenChange={(state) => {
|
onOpenChange={(state) => {
|
||||||
dispatch('change', state);
|
dispatch('change', state);
|
||||||
}}
|
}}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user