From b706d8acd67cc75badd79dfcffecc77eb78065c8 Mon Sep 17 00:00:00 2001 From: Faton Ramadani Date: Mon, 27 Feb 2023 09:50:39 +0100 Subject: [PATCH] fix(frontend): Disable move in nested subgrid (#1238) * fix(frontend): Disable move in nested subgrid * fix(frontend): Disable move in nested subgrid --- .../apps/editor/settingsPanel/MoveToOtherGrid.svelte | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/MoveToOtherGrid.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/MoveToOtherGrid.svelte index 25f739af79..e9dda837b2 100644 --- a/frontend/src/lib/components/apps/editor/settingsPanel/MoveToOtherGrid.svelte +++ b/frontend/src/lib/components/apps/editor/settingsPanel/MoveToOtherGrid.svelte @@ -4,7 +4,13 @@ import { faCopy } from '@fortawesome/free-solid-svg-icons' import { getContext } from 'svelte' import type { App, AppEditorContext } from '../../types' - import { createNewGridItem, deleteGridItem, findGridItem, insertNewGridItem } from '../appUtils' + import { + createNewGridItem, + deleteGridItem, + findGridItem, + getAllSubgridsAndComponentIds, + insertNewGridItem + } from '../appUtils' import type { AppComponent } from '../component' export let component: AppComponent | undefined @@ -73,6 +79,8 @@ value: 'main-grid', disabled: parent === undefined } + + $: [subgrids] = component ? getAllSubgridsAndComponentIds($app, component) : [[], []] $: availableGrids = listAllSubGrids($app) $: options = availableGrids ? [ @@ -80,7 +88,7 @@ ...availableGrids?.map((grid) => ({ label: grid, value: grid, - disabled: grid === parent || (component && grid.startsWith(component.id)) + disabled: grid === parent || subgrids.includes(grid) })) ] : [defaultOption]