From 2244e83b9da803a4cf46ab0825d7cb6cb0e24872 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Mon, 27 Feb 2023 18:38:22 +0100
Subject: [PATCH] fix(frontend): invisible subgrids have h-0 + app policies fix

---
 .../lib/components/apps/components/layout/AppTabs.svelte | 9 +++++++++
 .../lib/components/apps/editor/AppEditorHeader.svelte    | 4 ++--
 .../src/lib/components/apps/editor/SubGridEditor.svelte  | 5 ++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/frontend/src/lib/components/apps/components/layout/AppTabs.svelte b/frontend/src/lib/components/apps/components/layout/AppTabs.svelte
index 13acc43025..9e655495ca 100644
--- a/frontend/src/lib/components/apps/components/layout/AppTabs.svelte
+++ b/frontend/src/lib/components/apps/components/layout/AppTabs.svelte
@@ -31,6 +31,15 @@
 
 	function handleTabSelection() {
 		outputs?.selectedTabIndex.set(selectedIndex)
+		if ($selectedComponent != id) {
+			$selectedComponent = id
+		}
+		if ($focusedGrid?.parentComponentId != id || $focusedGrid?.subGridIndex != selectedIndex) {
+			$focusedGrid = {
+				parentComponentId: id,
+				subGridIndex: selectedIndex
+			}
+		}
 	}
 
 	$: selectedIndex >= 0 && handleTabSelection()
diff --git a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
index 6403b020a1..53fb75a41d 100644
--- a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
+++ b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
@@ -51,7 +51,7 @@
 		UserAppInput
 	} from '../inputType'
 	import type { AppEditorContext } from '../types'
-	import { toStatic } from '../utils'
+	import { allItems, toStatic } from '../utils'
 	import AppExportButton from './AppExportButton.svelte'
 	import AppInputs from './AppInputs.svelte'
 	import type { AppComponent } from './component/components'
@@ -124,7 +124,7 @@
 	}
 	async function computeTriggerables() {
 		const allTriggers = await Promise.all(
-			$app.grid
+			allItems($app.grid, $app.subgrids)
 				.flatMap((x) => {
 					let c = x.data as AppComponent
 					let r: (AppInput | undefined)[] = [c.componentInput]
diff --git a/frontend/src/lib/components/apps/editor/SubGridEditor.svelte b/frontend/src/lib/components/apps/editor/SubGridEditor.svelte
index 2343802c5a..f542af2238 100644
--- a/frontend/src/lib/components/apps/editor/SubGridEditor.svelte
+++ b/frontend/src/lib/components/apps/editor/SubGridEditor.svelte
@@ -59,7 +59,10 @@
 	let container
 </script>
 
-<div class="relative w-full subgrid {visible ? 'visible' : 'invisible h-0 '}" bind:this={container}>
+<div
+	class="relative w-full subgrid {visible ? 'visible' : 'invisible h-0 overflow-hidden'}"
+	bind:this={container}
+>
 	<div
 		class:px-2={!noPadding}
 		class="py-2 overflow-auto  {$connectingInput?.opened ? '' : ''}"