Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 10 additions & 18 deletions app/gui/src/project-view/components/GraphEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import { useGraphEditorToasts } from '@/components/GraphEditor/toasts'
import { uploadedExpression, Uploader } from '@/components/GraphEditor/upload'
import GraphMissingView from '@/components/GraphMissingView.vue'
import GraphMouse from '@/components/GraphMouse.vue'
import PopoverRootProvider from '@/components/PopoverRootProvider.vue'
import SceneScroller from '@/components/SceneScroller.vue'
import TopBar from '@/components/TopBar.vue'
import { builtinWidgets } from '@/components/widgets'
Expand All @@ -49,7 +50,6 @@ import { provideGraphSelection } from '@/providers/graphSelection'
import { provideStackNavigator } from '@/providers/graphStackNavigator'
import { injectKeyboard } from '@/providers/keyboard'
import { provideLanguageSupportExtensions } from '@/providers/languageSupportExtensions'
import { providePopoverRoot } from '@/providers/popoverRoot'
import { providePersisted } from '@/stores/persisted'
import { provideVisualizationStore } from '@/stores/visualization'
import { assert, bail } from '@/util/assert'
Expand Down Expand Up @@ -111,8 +111,6 @@ const graphNavigator: GraphNavigator = provideGraphNavigator(viewportNode, keybo
predicate: (e) => (e instanceof KeyboardEvent ? nodeSelection.selected.size === 0 : true),
})

providePopoverRoot(viewportElem)

// === Client saved state ===

providePersisted(
Expand Down Expand Up @@ -647,12 +645,12 @@ const contextMenuActions: DisplayableActionName[] = [
<template>
<div
ref="root"
class="GraphEditor"
class="GraphEditor vertical"
:class="{ draggingEdge: graphStore.mouseEditedEdge != null }"
@dragover.prevent
@drop.prevent="handleFileDrop($event)"
>
<div class="vertical">
<PopoverRootProvider class="viewportPanel">
<ContextMenuTrigger
ref="viewportNode"
class="viewport"
Expand Down Expand Up @@ -696,10 +694,12 @@ const contextMenuActions: DisplayableActionName[] = [
<SceneScroller :navigator="graphNavigator" :scrollableArea="scrollBounds" />
<GraphMouse />
</ContextMenuTrigger>
</PopoverRootProvider>
<PopoverRootProvider class="bottomPanel">
<BottomPanel v-model:show="showCodeEditor">
<CodeEditor />
</BottomPanel>
</div>
</PopoverRootProvider>
</div>
</template>

Expand All @@ -711,25 +711,15 @@ const contextMenuActions: DisplayableActionName[] = [
user-select: none;
/* Prevent touchpad back gesture, which can be triggered while panning. */
overscroll-behavior-x: none;

display: flex;
flex-direction: row;
& .DockPanel {
flex: none;
}
& .vertical {
flex: auto;
overflow-x: hidden;
}
}

.vertical {
display: flex;
flex-direction: column;
& .BottomPanel {
& .bottomPanel {
flex: none;
}
& .viewport {
& .viewportPanel {
flex: auto;
min-height: 0;
}
Expand All @@ -741,6 +731,8 @@ const contextMenuActions: DisplayableActionName[] = [
contain: layout;
overflow: clip;
touch-action: none;
width: 100%;
height: 100%;
--node-color-no-type: #596b81;
--output-node-color: #006b8a;
}
Expand Down
13 changes: 13 additions & 0 deletions app/gui/src/project-view/components/PopoverRootProvider.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<script setup lang="ts">
import { providePopoverRoot } from '@/providers/popoverRoot'
import { useTemplateRef } from 'vue'

const root = useTemplateRef('root')
providePopoverRoot(root)
</script>

<template>
<div ref="root" class="PopoverRootProvider">
<slot />
</div>
</template>
Loading