diff --git a/apps/nextjs/src/app/[locale]/widgets/[kind]/_content.tsx b/apps/nextjs/src/app/[locale]/widgets/[kind]/_content.tsx index 15deba72f..0e23b728d 100644 --- a/apps/nextjs/src/app/[locale]/widgets/[kind]/_content.tsx +++ b/apps/nextjs/src/app/[locale]/widgets/[kind]/_content.tsx @@ -1,6 +1,6 @@ "use client"; -import { use, useCallback, useState } from "react"; +import { use, useCallback, useId, useState } from "react"; import { ActionIcon, Affix, Card } from "@mantine/core"; import { IconDimensions, IconPencil, IconToggleLeft, IconToggleRight } from "@tabler/icons-react"; import { QueryErrorResetBoundary } from "@tanstack/react-query"; @@ -32,6 +32,7 @@ export const WidgetPreviewPageContent = ({ kind }: WidgetPreviewPageContentProps const { openModal: openWidgetEditModal } = useModalAction(LazyWidgetEditModal); const { openModal: openPreviewDimensionsModal } = useModalAction(PreviewDimensionsModal); const { definition: currentDefinition, Component } = use(loadWidgetResources(kind)); + const previewId = useId(); const [editMode, setEditMode] = useState(false); const [isEditorLoading, setIsEditorLoading] = useState(false); const [dimensions, setDimensions] = useState({ @@ -71,6 +72,7 @@ export const WidgetPreviewPageContent = ({ kind }: WidgetPreviewPageContentProps ), integrationSupport: hasIntegrationSupport, settings, + focusTargetId: previewId, }, { title(translate) { @@ -86,7 +88,7 @@ export const WidgetPreviewPageContent = ({ kind }: WidgetPreviewPageContentProps } finally { setIsEditorLoading(false); } - }, [currentDefinition, kind, openWidgetEditModal, settings, state, t, utils]); + }, [currentDefinition, kind, openWidgetEditModal, previewId, settings, state, t, utils]); const toggleEditMode = useCallback(() => { setEditMode((editMode) => !editMode); @@ -110,7 +112,7 @@ export const WidgetPreviewPageContent = ({ kind }: WidgetPreviewPageContentProps return ( <> - = 96 ? undefined : 4}> + = 96 ? undefined : 4}> {({ reset }) => ( { ); }; -export const useWidgetEditFocus = (itemId: string | undefined) => { +export const useWidgetEditFocus = (itemId: string | undefined, focusTargetId: string | undefined) => { const [focusRect, setFocusRect] = useState(null); useIsomorphicEffect(() => { - if (!itemId) { - setFocusRect(null); - return; + let element: HTMLElement | null = null; + if (focusTargetId) { + element = document.getElementById(focusTargetId); + } else if (itemId) { + element = document.querySelector(`[data-advanced-focus-item-id="${CSS.escape(itemId)}"]`); + element ??= document.querySelector(`[data-item-id="${CSS.escape(itemId)}"]`); } - const element = document.querySelector(`[data-item-id="${CSS.escape(itemId)}"]`); if (!element) { setFocusRect(null); return; @@ -84,7 +86,7 @@ export const useWidgetEditFocus = (itemId: string | undefined) => { window.removeEventListener("scroll", scheduleUpdate, true); window.cancelAnimationFrame(animationFrame); }; - }, [itemId]); + }, [focusTargetId, itemId]); const inspectorSide: WidgetInspectorSide = focusRect && focusRect.left + focusRect.width / 2 > window.innerWidth / 2 ? "left" : "right"; @@ -95,17 +97,20 @@ export const useWidgetEditFocus = (itemId: string | undefined) => { export const WidgetEditFocusOverlay = ({ focusRect }: { focusRect: FocusRect | null }) => ( {focusRect ? ( - + <> + + + ) : ( )} diff --git a/packages/widgets/src/modals/widget-edit-modal.module.css b/packages/widgets/src/modals/widget-edit-modal.module.css index 65f0bf333..97becd478 100644 --- a/packages/widgets/src/modals/widget-edit-modal.module.css +++ b/packages/widgets/src/modals/widget-edit-modal.module.css @@ -4,14 +4,19 @@ .settings { min-width: 0; + container-type: inline-size; } .switchGrid { + display: grid; + grid-template-columns: minmax(0, 1fr); align-items: stretch; + gap: var(--mantine-spacing-sm); } .switchOption { display: flex; + height: 100%; min-height: 4.25rem; align-items: center; padding: 0.625rem 0.75rem; @@ -41,7 +46,7 @@ .footer { position: sticky; z-index: 2; - bottom: calc(var(--mantine-spacing-md) * -1); + bottom: 0; margin-inline: calc(var(--mantine-spacing-md) * -1); margin-bottom: calc(var(--mantine-spacing-md) * -1); padding: var(--mantine-spacing-sm) var(--mantine-spacing-md); @@ -50,6 +55,17 @@ backdrop-filter: blur(10px); } +.footerActions { + margin-inline-start: auto; +} + +@container (min-width: 30rem) { + .switchGrid { + grid-template-columns: repeat(2, minmax(0, 1fr)); + grid-auto-rows: 1fr; + } +} + .focusFrame { position: fixed; pointer-events: none; diff --git a/packages/widgets/src/modals/widget-edit-modal.tsx b/packages/widgets/src/modals/widget-edit-modal.tsx index 0833612fb..f52fe2a4f 100644 --- a/packages/widgets/src/modals/widget-edit-modal.tsx +++ b/packages/widgets/src/modals/widget-edit-modal.tsx @@ -2,7 +2,7 @@ import { useEffect, useId, useRef, useState } from "react"; import type { ComponentType, FormEvent } from "react"; -import { Box, Button, Group, SimpleGrid, Stack, Tabs, Text } from "@mantine/core"; +import { Box, Button, Group, Stack, Tabs, Text } from "@mantine/core"; import { schemaResolver } from "@mantine/form"; import { IconArrowLeft, IconPencil } from "@tabler/icons-react"; import { z } from "zod/v4"; @@ -57,6 +57,7 @@ export interface WidgetEditModalProps { settings: SettingsContextProps; itemId?: string; boardId?: string; + focusTargetId?: string; appId?: string; integrationEditForm?: ComponentType; onIntegrationSaved?: () => void; @@ -84,7 +85,7 @@ export const WidgetEditModal = createModal>(({ const [activeIntegrationId, setActiveIntegrationId] = useState(null); const [isSubmitting, setIsSubmitting] = useState(false); const widgetFormId = useId(); - const { focusRect, inspectorSide } = useWidgetEditFocus(innerProps.itemId); + const { focusRect, inspectorSide } = useWidgetEditFocus(innerProps.itemId, innerProps.focusTargetId); z.config({ customError: zodErrorMap(t), @@ -260,7 +261,7 @@ export const WidgetEditModal = createModal>(({ /> )} {canConfigureWidget && switchOptions.length > 0 && ( - + {switchOptions.map(([key, value]) => { const Input = getInputForType(value.type); if (!Input) return null; @@ -278,7 +279,7 @@ export const WidgetEditModal = createModal>(({ ); })} - + )} {canConfigureWidget && otherOptions.map(([key, value]) => { @@ -395,7 +396,7 @@ export const WidgetEditModal = createModal>(({ widgetFormContent )} - + - +