fix widget polling manifest

docs(helm): update chart installation page

.dockerignore

@@ -17,7 +17,8 @@ coverage
 dev
 .build
 e2e
-apps/docs
+apps/docs/*
+!apps/docs/package.json
 apps/nextjs/.next
 .env
 .env.*

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -33,6 +33,7 @@ body:
       options:
         # The below comment is used to insert a new version with on-release.yml
         #NEXT_VERSION#
+        - 1.73.0
         - 1.72.0
         - 1.71.0
         - 1.70.0

.github/workflows/ci.yml

@@ -82,7 +82,7 @@ jobs:
         run: cp .env.example .env
 
       - name: Lint, typecheck, and build affected workspaces
-        run: pnpm turbo run lint typecheck build --affected --continue=dependencies-successful
+        run: pnpm turbo run lint typecheck build --affected --continue=dependencies-successful --concurrency=2
 
       - name: Validate workspace configuration
         run: pnpm lint:ws

.gitignore

@@ -78,3 +78,4 @@ skills-lock.json
 apps/docs/.docusaurus
 apps/docs/build
 .pnpm-store
+benchmark-results

AGENTS.md

@@ -46,6 +46,8 @@ homarr/
 ├── tooling/
 │   ├── typescript/      # Base tsconfig
 │   └── github/          # CI setup action
+├── tools/
+│   └── homarr-dev/      # Go CLI for local and PR Docker images
 ├── development/         # Dev docker-compose (Redis, MySQL, PostgreSQL)
 ├── e2e/                 # E2E test specs
 └── Dockerfile           # Multi-stage production build
@@ -68,6 +70,9 @@ When modifying user-facing code, you MUST also update the corresponding document
 ## Monorepo Commands
 
 - `pnpm dev` — Next.js app only
+- `pnpm dev:cli -- dev` — run the developer CLI without installing a global binary
+- `pnpm db:seed` — seed default database data explicitly
+- `pnpm docker:dev:up` — start the Redis development service in the background
 - `pnpm dev:docs` — Docusaurus docs site only
 - `pnpm turbo build` — build all packages
 - `pnpm turbo build --filter=@homarr/docs` — build docs only
@@ -81,3 +86,7 @@ When modifying user-facing code, you MUST also update the corresponding document
 - UI: Mantine (not Tailwind) — Tailwind is only used in docs app
 - Icons: @tabler/icons-react
 - Docs app can import from `@homarr/definitions` for shared types
+- Run `pnpm dev:cli -- dev` to browse local `homarr:*` images and remote PR images.
+- Run `pnpm dev:cli -- build <name>` from a Homarr checkout to build `homarr:<name>` with rebuild provenance.
+- Run `pnpm dev:cli -- build --pr <number>` to build a PR locally from a temporary checkout.
+- Run Go checks from `tools/homarr-dev` with `go test ./...` and `go vet ./...`.

Dockerfile

@@ -3,12 +3,18 @@
 FROM node:24.18.0-alpine AS base
 
 FROM base AS builder
+ARG TARGETPLATFORM
 WORKDIR /app
-RUN apk add --no-cache libc6-compat curl bash && apk update
+# Native dependencies normally use prebuilds, but the build must remain
+# reproducible when a prebuild download times out and compilation is required.
+RUN apk add --no-cache libc6-compat curl bash python3 make g++
 
 RUN corepack enable pnpm
-COPY pnpm-lock.yaml pnpm-workspace.yaml package.json ./
+COPY .npmrc pnpm-lock.yaml pnpm-workspace.yaml package.json ./
 COPY patches ./patches
+COPY --parents ./apps/*/package.json ./packages/*/package.json ./tooling/*/package.json ./
+# @homarr/definitions generates documentation types during install.
+COPY --parents ./packages/definitions/src ./
 # Workaround for pnpm/pnpm#5268: pnpm fetch crashes when patchedDependencies
 # are configured with nodeLinker: hoisted. The applyPatchToDir function tries
 # to chdir into node_modules/<pkg> which doesn't exist during fetch (only the
@@ -19,14 +25,16 @@ COPY patches ./patches
 RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store \
     pnpm config set store-dir /pnpm/store && \
     sed -i 's/nodeLinker: hoisted/nodeLinker: isolated/' pnpm-workspace.yaml && \
-    pnpm fetch && \
+    pnpm fetch --ignore-scripts && \
     sed -i 's/nodeLinker: isolated/nodeLinker: hoisted/' pnpm-workspace.yaml
 
-COPY . .
-# Follow the pnpm fetch pattern from https://pnpm.io/cli/fetch
-# --frozen-lockfile is omitted as recommended by the pnpm fetch docs
+# Install only from the fetched, committed lockfile so local and Docker builds
+# resolve the same dependency graph. Serial lifecycle builds avoid esbuild's
+# atomic binary replacement racing across the hoisted workspace (pnpm/pnpm#8200).
 RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store \
-    pnpm install --recursive
+    npm_config_nodedir=/usr/local pnpm install --recursive --offline --frozen-lockfile --child-concurrency=1
+
+COPY . .
 
 ARG SKIP_ENV_VALIDATION='true'
 ARG CI='true'
@@ -37,7 +45,9 @@ RUN --mount=type=secret,id=TURBO_API,env=TURBO_API \
     --mount=type=secret,id=TURBO_TEAM,env=TURBO_TEAM \
     --mount=type=secret,id=TURBO_TOKEN,env=TURBO_TOKEN \
     --mount=type=secret,id=TURBO_REMOTE_CACHE_SIGNATURE_KEY,env=TURBO_REMOTE_CACHE_SIGNATURE_KEY \
-    TURBO_PLATFORM="${TARGETPLATFORM:-linux/amd64}" pnpm build
+    --mount=type=cache,id=homarr-next-build-${TARGETPLATFORM},target=/app/apps/nextjs/.next/cache,sharing=locked \
+    TURBO_PLATFORM="${TARGETPLATFORM:-linux/amd64}" \
+    pnpm turbo build --filter=@homarr/nextjs... --filter=@homarr/cli
 
 FROM base AS runner
 WORKDIR /app

PRODUCT.md

@@ -1,29 +0,0 @@
-# Product
-
-## Users
-
-Homarr serves people and teams who run self-hosted applications and want one dependable dashboard for launching apps, monitoring services, and viewing live operational data. They use it across wall displays, desktops, tablets, and smaller devices, often returning to the same board many times per day.
-
-## Product Purpose
-
-Homarr makes self-hosted services easy to find, understand, and operate without hand-editing configuration files. A successful board loads immediately, stays visually stable, keeps widgets legible across screen sizes, and makes editing feel direct and forgiving.
-
-## Brand Personality
-
-Fast, capable, and approachable. Homarr should feel like a mature productivity tool: dense when useful, calm in view mode, and explicit about state during editing.
-
-## Anti-references
-
-Avoid cramped tile spacing, undersized text, layout shifts, decorative motion, hidden drag targets, modal-heavy positioning controls, and dashboards that require users to understand grid internals. Editing must not make the read-only experience heavier or slower.
-
-## Design Principles
-
-- Preserve the board: viewing is the primary workflow and must render before editor code is needed.
-- Make spatial actions direct: moving, resizing, nesting, and using fixed sidebars should happen on the canvas with immediate feedback.
-- Keep content predictable: fixed logical tile sizes preserve widget composition, typography, and controls at every viewport.
-- Recover gracefully: collision handling, reflow, loading states, and persistence failures must never lose or obscure content.
-- Use familiar controls: Mantine patterns, clear labels, keyboard support, and visible focus states take priority over novel decoration.
-
-## Accessibility & Inclusion
-
-Target WCAG 2.2 AA. Maintain keyboard equivalents for drag and resize operations, useful landmarks and announcements, sufficient contrast, readable control sizes, reduced-motion support, and horizontal scrolling before scaling content below an accessible minimum.

apps/docs/docs/advanced/command-line/development/index.mdx

@@ -0,0 +1,41 @@
+# Developer Docker CLI
+
+The host-side developer CLI builds and runs local Homarr images and pull-request previews. Run it directly from a checkout with `pnpm dev:cli -- ...`; no shell-specific setup script is required. It is separate from the recovery CLI included in production images.
+
+To install an optional `homarr` binary, run `pnpm dev:cli:install` and make your Go bin directory available on `PATH`. GitHub CLI authentication is only needed for pull-request features.
+
+## Browse development images
+
+```bash
+pnpm dev:cli --
+```
+
+The main screen combines local `homarr:*` images with open pull requests and their GHCR preview status. Select an image to start or stop it, use `R` to build a remote pull request locally in the background or rebuild a local image, or use `p` to force a remote preview pull. Press `d` to switch to the instance dashboard and `d` again to return without losing the browser state. The explicit `dev` and `dash` subcommands start on either screen.
+
+A locally built PR image is folded into its remote PR row only when its recorded revision exactly matches the current GitHub head SHA. The row is marked `◆ local`, and starting it prefers that local image without a registry pull. Outdated local builds remain separate rows. Navigation and dashboard switching remain available during background builds.
+
+## Build images
+
+```bash
+pnpm dev:cli -- build <name>
+pnpm dev:cli -- build --pr <number> [name]
+```
+
+The first command builds the current checkout as `homarr:<name>`. The pull-request form uses a depth-one clone in a temporary directory and defaults to `homarr:pr-<number>` when `name` is omitted.
+
+## Rebuild images
+
+```bash
+pnpm dev:cli -- rebuild <name>
+```
+
+Images built by this CLI record their source checkout, revision, and optional pull-request number. Rebuild uses that provenance to select the original checkout or create a fresh temporary pull-request checkout.
+
+## Run images
+
+```bash
+homarr run <name>
+homarr run --pr <number>
+```
+
+Add `--detach` to run in the background, `--demo` to enable demo data, or repeat `--env KEY=VALUE` to provide additional environment variables.

apps/docs/docs/advanced/development/getting-started.mdx

@@ -14,11 +14,12 @@ This guide will help you set up your development environment to start contributi
 
 ### Prerequisites
 
-- **Node.js (lts)**: You can download it from the [official website](https://nodejs.org/).
-- **pnpm (latest)**: You can install it by running `npm install -g pnpm`.
+- **Node.js 24.18 or newer**: You can download it from the [official website](https://nodejs.org/).
+- **Corepack**: Run `corepack enable` so the repository selects its pinned pnpm version.
 - **Git**: You can download it from the [official website](https://git-scm.com/).
-- **Docker or Docker Desktop**: You can download it from the [official website](https://www.docker.com/).
-- **A GitHub account**: You can create one on the [official website](https://github.com/).
+- **Docker or Docker Desktop**: Required for the Redis service and the developer Docker CLI.
+- **Go 1.25+**: Required only for the developer Docker CLI. You can download it from the [official website](https://go.dev/).
+- **GitHub CLI**: Required only for pull-request image features. Install it from the [official website](https://cli.github.com/), then authenticate with `gh auth login`.
 
 ### Setting up the project
 
@@ -34,11 +35,11 @@ This guide will help you set up your development environment to start contributi
 
 4. Install the dependencies with `pnpm install`.
 
-5. Start redis by running `pnpm run docker:dev`. This will run a docker-compose file with a redis service.
+5. Create `.env` from `.env.example`. In a POSIX shell, run `cp .env.example .env`; in PowerShell, run `Copy-Item .env.example .env`. Set `DB_URL` to an absolute path for your SQLite file.
 
-6. Copy the `.env.example` file to `.env` and replace `DB_URL` with the full path you want to use for the sqlite database file. For example `DB_URL='C:\\Dev\\homarr\\packages\\db\\db.sqlite'`
+6. Start Redis in the background with `pnpm docker:dev:up` if your development workflow needs it.
 
-7. Run the migrations to create the sqlite db file with `pnpm run db:migration:sqlite:run`.
+7. Create or update the database with `pnpm db:migration:sqlite:run`. This also seeds the default data. To run the seed explicitly later, use `pnpm db:seed`.
 
 8. Start the development server with `pnpm dev` and wait for a message that says `✓ Ready in 10.7s`
 
@@ -48,9 +49,19 @@ This guide will help you set up your development environment to start contributi
 
 #### During development
 
-- `pnpm dev`: Start the development server.
+- `pnpm dev`: Start the Next.js development server.
+- `pnpm dev:benchmark`: Run the local authenticated-board benchmark. Set `DEV_BENCHMARK_BOARD_URL` and
+  `DEV_BENCHMARK_STORAGE_STATE`; readiness-only measurements require the explicit `--smoke` flag and are not
+  suitable for performance claims.
+- `pnpm dev:cli -- dev`: Browse and run local images and remote pull-request images.
+- `pnpm dev:cli -- build <name>`: Build the current checkout as `homarr:<name>`.
+- `pnpm dev:cli -- build --pr <number>`: Build a pull request locally from a temporary checkout.
+- `pnpm dev:cli -- rebuild <name>`: Rebuild a local image from its recorded checkout or pull request.
+- `pnpm dev:cli:install`: Optionally install the developer CLI as a `homarr` binary.
 - `pnpm cli`: Run cli commands.
 - `pnpm db:migration:sqlite:run`: Run the migrations to create or update the sqlite db file.
+- `pnpm db:seed`: Explicitly seed the default database data.
+- `pnpm docker:dev:up`: Start the Redis development service in the background.
 - `pnpm db:migration:sqlite:generate`: Generate a new migration file for the sqlite db. Also works with `mysql`.
 - `pnpm db:studio`: Open a visual studio for the database.
 - `pnpm package:new`: Create a new package in the monorepo.
@@ -63,6 +74,8 @@ This guide will help you set up your development environment to start contributi
 - `pnpm typecheck`: Run the typescript type checker.
 
 #### Building the project
+
 - `pnpm build`: Build the project for production.
+- `pnpm dev:cli -- build <name>`: Build a `homarr:<name>` image and record its checkout for later rebuilds.
 - `docker build -t homarr .`: Build a docker image for the project.
-- `docker run -p 7575:7575 -e SECRET_ENCRYPTION_KEY='your_64_character_hex_string' homarr:latest`: Run the created docker image.
+- `docker run -p 7575:7575 -e SECRET_ENCRYPTION_KEY='your_64_character_hex_string' homarr:<name>`: Run the created docker image.

apps/docs/docs/advanced/environment-variables/index.mdx

@@ -25,15 +25,13 @@ This is especially useful for [docker secrets](https://docs.docker.com/engine/sw
 Using the `PUID` and `PGID` will require you to set the correct permissions on the mounted volumes and if used the docker socket. See more in the [Running as a different user](/docs/advanced/running-as-different-user) documentation.
 :::
 
-| Environment Variable     | Description | Possible values | Default |
-| ------------------------ | ----------- | --------------- | ------- |
-| ``PUID``                 | User ID to run the container as | Any valid user ID | ``0`` |
-| ``PGID``                 | Group ID to run the container as | Any valid group ID | ``0`` |
-| ``LOG_LEVEL``           | Log level to use | ``debug`` / ``info`` / ``warn`` / ``error`` | ``info`` |
-| ``NO_EXTERNAL_CONNECTION`` | Disables some requests that need internet connection | `true` or `false` | `false` |
-| ``ENABLE_DNS_CACHING`` | Enables dns caching. Enabled by default, but if you experience issues with IPv6 or static IPs, see [#4006](https://github.com/homarr-labs/homarr/issues/4006) or disable this flag | `true` or `false` | `true` |
-
-
+| Environment Variable     | Description                                                                                                                                                                        | Possible values                     | Default |
+| ------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------- | ------- |
+| `PUID`                   | User ID to run the container as                                                                                                                                                    | Any valid user ID                   | `0`     |
+| `PGID`                   | Group ID to run the container as                                                                                                                                                   | Any valid group ID                  | `0`     |
+| `LOG_LEVEL`              | Log level to use                                                                                                                                                                   | `debug` / `info` / `warn` / `error` | `info`  |
+| `NO_EXTERNAL_CONNECTION` | Disables Homarr's internet-backed requests, including update checks, weather, and RSS feeds                                                                                        | `true` or `false`                   | `false` |
+| `ENABLE_DNS_CACHING`     | Enables dns caching. Enabled by default, but if you experience issues with IPv6 or static IPs, see [#4006](https://github.com/homarr-labs/homarr/issues/4006) or disable this flag | `true` or `false`                   | `true`  |
 
 ## Authentication
 
@@ -43,9 +41,9 @@ See [Single Sign-On](/docs/advanced/single-sign-on) for more informations.
 
 The `SECRET_ENCRYPTION_KEY` is required. If none is specified before starting the container, a random key will be shown in the error message and the container will exit.
 
-| Environment Variable     | Description | Possible values | Default |
-| ------------------------ | ----------- | --------------- | ------- |
-| ``SECRET_ENCRYPTION_KEY``  | Secret used to encrypt secrets in database. | 64 character hex string | - |
+| Environment Variable    | Description                                 | Possible values         | Default |
+| ----------------------- | ------------------------------------------- | ----------------------- | ------- |
+| `SECRET_ENCRYPTION_KEY` | Secret used to encrypt secrets in database. | 64 character hex string | -       |
 
 :::info
 A random secret can be generated by using the following command: `openssl rand -hex 32`
@@ -53,27 +51,27 @@ A random secret can be generated by using the following command: `openssl rand -
 
 ## Docker
 
-| Environment Variable     | Description | Possible values | Default |
-| ------------------------ | ----------- | --------------- | ------- |
-| ``DOCKER_HOSTNAMES``          | Comma-separated list of hostnames to connect to | For example `localhost,docker.example.com` | - |
-| ``DOCKER_PORTS``             | Comma-separated list of ports to connect to | For example `2375,2376` | - |
-| ``DOCKER_SOCKET_PATHS``             | Comma-separated list of mounted Docker-compatible socket paths. See the [Docker and Podman integration guide](/docs/integrations/docker) | For example `/var/run/docker.sock,/var/run/podman.sock` | - |
+| Environment Variable  | Description                                                                                                                              | Possible values                                         | Default |
+| --------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------- | ------- |
+| `DOCKER_HOSTNAMES`    | Comma-separated list of hostnames to connect to                                                                                          | For example `localhost,docker.example.com`              | -       |
+| `DOCKER_PORTS`        | Comma-separated list of ports to connect to                                                                                              | For example `2375,2376`                                 | -       |
+| `DOCKER_SOCKET_PATHS` | Comma-separated list of mounted Docker-compatible socket paths. See the [Docker and Podman integration guide](/docs/integrations/docker) | For example `/var/run/docker.sock,/var/run/podman.sock` | -       |
 
 ## Database
-| Environment Variable     | Description | Possible values | Default |
-| ------------------------ | ----------- | --------------- | ------- |
-| ``DB_DRIVER``            | Database driver to use. Currently `better-sqlite3` is used for sqlite, `mysql2` for mysql and `node-postgres` for postgresql | ``better-sqlite3`` / ``mysql2`` /  ``node-postgres`` | ``better-sqlite3`` |
-| ``DB_DIALECT``           | Database dialect to use. | ``sqlite`` / ``mysql`` / ``postgresql``  | ``sqlite`` |
-| ``DB_URL`` | Database URL to connect to. | Any valid database URL | ``/appdata/db/db.sqlite`` | 
-| ``DB_HOST`` | Database host to connect to. | Any valid database host | - |
-| ``DB_PORT`` | Database port to connect to. | Any valid database port | - |
-| ``DB_NAME`` | Database name to connect to. | Any valid database name | - |
-| ``DB_USER`` | Database user to connect with. | Any valid database user | - |
-| ``DB_PASSWORD`` | Database password to connect with. | Any valid database password | - |
+
+| Environment Variable | Description                                                                                                                  | Possible values                               | Default                 |
+| -------------------- | ---------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------- | ----------------------- |
+| `DB_DRIVER`          | Database driver to use. Currently `better-sqlite3` is used for sqlite, `mysql2` for mysql and `node-postgres` for postgresql | `better-sqlite3` / `mysql2` / `node-postgres` | `better-sqlite3`        |
+| `DB_DIALECT`         | Database dialect to use.                                                                                                     | `sqlite` / `mysql` / `postgresql`             | `sqlite`                |
+| `DB_URL`             | Database URL to connect to.                                                                                                  | Any valid database URL                        | `/appdata/db/db.sqlite` |
+| `DB_HOST`            | Database host to connect to.                                                                                                 | Any valid database host                       | -                       |
+| `DB_PORT`            | Database port to connect to.                                                                                                 | Any valid database port                       | -                       |
+| `DB_NAME`            | Database name to connect to.                                                                                                 | Any valid database name                       | -                       |
+| `DB_USER`            | Database user to connect with.                                                                                               | Any valid database user                       | -                       |
+| `DB_PASSWORD`        | Database password to connect with.                                                                                           | Any valid database password                   | -                       |
 
 You can either use the url or host, port, name and credentials combined. The URL will be prioritized over the other values.
 
-
 ## Redis
 
 By default Redis is running within the installation. (for example in Docker).
@@ -83,25 +81,23 @@ However for example for K8s it can be useful to use an external Redis instance.
 External redis is currently not supported with Proxmox Community Scripts
 :::
 
-| Environment Variable     | Description | Possible values | Default |
-| ------------------------ | ----------- | --------------- | ------- |
-| `REDIS_IS_EXTERNAL`     | Whether Redis is running externally. | `true` / `false` | `false` |
-| `REDIS_HOST`            | Hostname of the Redis instance. | Any valid hostname | - |
-| `REDIS_PORT`            | Port of the Redis instance. | Any valid port | `6379` |
-| `REDIS_USERNAME`        | Username to connect to the Redis instance. | Any valid username | - |
-| `REDIS_PASSWORD`        | Password to connect to the Redis instance. | Any valid password | - |
-| `REDIS_DATABASE_INDEX`  | Select which database of your redis instance should be used. | Any numeric index | - |
-| `REDIS_TLS_CA`         | CA certificate for Redis TLS connections. If a certificate is specified the connection will use TLS. | Any valid CA certificate | - |
-
+| Environment Variable   | Description                                                                                          | Possible values          | Default |
+| ---------------------- | ---------------------------------------------------------------------------------------------------- | ------------------------ | ------- |
+| `REDIS_IS_EXTERNAL`    | Whether Redis is running externally.                                                                 | `true` / `false`         | `false` |
+| `REDIS_HOST`           | Hostname of the Redis instance.                                                                      | Any valid hostname       | -       |
+| `REDIS_PORT`           | Port of the Redis instance.                                                                          | Any valid port           | `6379`  |
+| `REDIS_USERNAME`       | Username to connect to the Redis instance.                                                           | Any valid username       | -       |
+| `REDIS_PASSWORD`       | Password to connect to the Redis instance.                                                           | Any valid password       | -       |
+| `REDIS_DATABASE_INDEX` | Select which database of your redis instance should be used.                                         | Any numeric index        | -       |
+| `REDIS_TLS_CA`         | CA certificate for Redis TLS connections. If a certificate is specified the connection will use TLS. | Any valid CA certificate | -       |
 
 ## Proxy
 
-| Environment Variable     | Description | Possible values | Default |
-| ------------------------ | ----------- | --------------- | ------- |
-| ``HTTP_PROXY``           | HTTP proxy to use | Any valid HTTP proxy URL | - |
-| ``HTTPS_PROXY``          | HTTPS proxy to use | Any valid HTTPS proxy URL | - |
-| ``NO_PROXY``             | Comma separated list of hosts that should be excluded from proxying | Any valid hostnames | - |
-
+| Environment Variable | Description                                                         | Possible values           | Default |
+| -------------------- | ------------------------------------------------------------------- | ------------------------- | ------- |
+| `HTTP_PROXY`         | HTTP proxy to use                                                   | Any valid HTTP proxy URL  | -       |
+| `HTTPS_PROXY`        | HTTPS proxy to use                                                  | Any valid HTTPS proxy URL | -       |
+| `NO_PROXY`           | Comma separated list of hosts that should be excluded from proxying | Any valid hostnames       | -       |
 
 ## Advanced deployments
 
@@ -109,6 +105,6 @@ External redis is currently not supported with Proxmox Community Scripts
 The advanced deployments environment variables should only be used if you know what you are doing.
 :::
 
-| Environment Variable     | Description |
-| ------------------------ | ----------- |
-| ``DB_MIGRATIONS_DISABLED`` | Disable db migrations. For example for helm charts |
+| Environment Variable     | Description                                        |
+| ------------------------ | -------------------------------------------------- |
+| `DB_MIGRATIONS_DISABLED` | Disable db migrations. For example for helm charts |

apps/docs/docs/advanced/icons/index.mdx

@@ -31,4 +31,4 @@ Icons that are high quality and printable ([SVG](https://wikipedia.org/wiki/Scal
 
 ### Using external icons
 If you don't find the icon you're looking for on Dashboard Icons or wish to use a different source, you can simply enter a URL that points to an icon.
-It is important that the URL directly points to the file without any advertisements or elements around it.
+Direct HTTP(S) image URLs are used as entered instead of being searched in the built-in repositories. It is important that the URL directly points to the file without any advertisements or elements around it.

apps/docs/docs/getting-started/after-the-installation.mdx

@@ -54,7 +54,11 @@ You must choose a username and password (both can later be changed).
 We enforce strict password requirements when you enter your password to protect your instance if you accidentally
 expose it to the internet.
 
-<img src={imageStartFromScratchStepAdminUser} alt={"Screenshot form to create admin user"} width={300} />
+<img
+  src={imageStartFromScratchStepAdminUser}
+  alt={"Screenshot form to create admin user"}
+  width={300}
+/>
 
 If you selected external providers (such as LDAP or OIDC), you'll be prompted to create an admin group.
 This group will be used to synchronize users from your provider to Homarr.
@@ -112,14 +116,22 @@ The onboarding can no longer be started again.
 From here you can click on one of the provided links to continue your journey.
 We recommend you to continue with the section [creating your first board on this page](#creating-your-first-board).
 
-<img src={imageStartFromScratchStepFinish} alt={"Screenshot of the finish onboarding process with links"} width={300} />
+<img
+  src={imageStartFromScratchStepFinish}
+  alt={"Screenshot of the finish onboarding process with links"}
+  width={300}
+/>
 
 ### Importing a ZIP from version before 1.0.0
 
 This is recommended when you used Homarr before and want to re-import your data.
 It is important that you first migrate correctly using [the list of breaking changes for 1.0](/blog/2024/09/23/version-1.0).
 
-<img src={manageExportOldHomarr} alt="Export from old Homarr" style={{ maxWidth: 500 }} />
+<img
+  src={manageExportOldHomarr}
+  alt="Export from old Homarr"
+  style={{ maxWidth: 500 }}
+/>
 
 **How to export and import data**
 
@@ -137,8 +149,7 @@ It is important that you first migrate correctly using [the list of breaking cha
 ## Creating your first board
 
 In Homarr, you organize your apps and widgets on boards.
-Boards use fixed-size tiles so the same widget keeps the same proportions on every screen.
-Drag, resize, and section controls are available in edit mode.
+Boards can be organized using the interactive drag and drop.
 Let's create your first board by navigating here: `Manage` > `Boards` > `New board`:
 ![](./img/manage-create-board-button.png)
 
@@ -186,23 +197,38 @@ Here you have the following options in the header:
 
 When entering the edit mode, you'll get some additional buttons to work with:
 
-<img src={manageBoardHeaderEditMode} alt={"Screenshot of buttons in the edit mode"} width={200} />
+<img
+  src={manageBoardHeaderEditMode}
+  alt={"Screenshot of buttons in the edit mode"}
+  width={200}
+/>
 
 - **Add item**: Click this button to add new elements to your page.
-- **Exit edit mode**: Click this button to save your changes and exit edit mode.
+- **Exit edit mode**: Click this btuton to save your changes and exit edit mode.
 
 To continue, click the option "New Item":
 
-<img src={manageBoardHeaderAddItem} alt={"Screenshot of the add item menu"} width={200} />
+<img
+  src={manageBoardHeaderAddItem}
+  alt={"Screenshot of the add item menu"}
+  width={200}
+/>
 
 Next, you can choose what item you'd like to add.
 We will discuss the other options in the following sections - for now choose "App" to continue.
 
-<img src={manageBoardHeaderChooseItem} alt={"Screenshot of choosing the app item in the modal"} width={300} />
+<img
+  src={manageBoardHeaderChooseItem}
+  alt={"Screenshot of choosing the app item in the modal"}
+  width={300}
+/>
 
 As soon as you chose the app, the modal will close and you'll get the following item on your board:
 
-<img src={manageBoardNoApp} alt="Screenshot of the No app element on the board" />
+<img
+  src={manageBoardNoApp}
+  alt="Screenshot of the No app element on the board"
+/>
 
 This is expected, because you haven't told Homarr what app it should show in this item.
 To configure this, click on the small 3 dots at the top of the item in the edit mode and choose "Edit item" in the menu.
@@ -214,28 +240,21 @@ In the modal you can edit the app that you want to display:
 ![](./img/manage-board-choose-app.png)
 
 As soon as you save your changes, the tile on the board will refresh and display your app.
-Use the resize handle at the bottom right to resize the tile.
-Press and hold the handle, move the pointer, and release it when the tile has the size you want.
+Using the small bidirectional arrow at the bottom right you can resize the element.
+Start pressing with your mouse button down, move your mouse to resize and release your finger as soon your you're happy with the size.
 
 ![](./img/resize-item.gif)
 
-To move a tile in edit mode, press and hold its content, move it to the desired position, and release it.
-Widget content is disabled while editing so its controls do not intercept the drag; use the tile's settings button for edit actions.
-The tile snaps to the grid. Equally-sized tiles swap when one is dropped into the other's slot, while other neighboring tiles move out of the way automatically.
+To move your item to a different position on the board, simply hold the mouse button anywhere on the item and move with the mouse to the desired position.
+As soon as you release your finger, the item will snap in place in the grid.
 
 ![](./img/move-item.gif)
 
-Every `1 × 1` tile has a logical content size of `200 × 200` pixels.
-Larger tiles use multiples of that fixed unit, with a consistent gap between cells.
-Homarr scales the complete board uniformly, like zooming a page.
-It stops shrinking at 75% and lets you scroll horizontally instead of making text and controls too small.
-It does not squeeze or reflow the content of individual widgets, so a widget keeps the same design and proportions across screen sizes.
-
 :::note
 
-Viewing a board initially uses the lightweight, non-interactive layout.
-For users with edit access, Homarr prepares drag-and-drop and resize controls in the background after the board becomes interactive.
-If you enter edit mode before that finishes, the existing board stays visible until the editor is ready.
+You cannot move items freely on the vertical axis.
+We always align all items to the top of the page to simply organization.
+To move items to the bottom, you must add more items or resize items.
 
 :::
 
@@ -246,10 +265,8 @@ This helps you to explore the capabilities of Homarr before you build your board
 
 :::
 
-Keyboard users can focus a tile, press Enter or Space, then use arrow keys to move and Shift plus arrow keys to resize.
-Press Escape to stop.
-For precise numeric controls or touch input, choose **Move / resize item** from the tile's edit menu.
-The dialog can also move the tile to another section or fixed sidebar:
+Users on touch or mobile devices may not be able to drag and drop or move items.
+They can use the "Move / resize item" option in the edit menu of items instead:
 
 ![](./img/manage-board-move-resize-item-menu.png)
 
@@ -321,39 +338,43 @@ As with every change, don't forget to save your changes using the exit edit mode
 
 ![](./img/exit-edit-mode.png)
 
-## Organizing items with sections
+## Grouping your items
 
-Sections are resizable containers for apps, widgets, and other sections.
-The same section works on the main canvas and inside a fixed sidebar.
-Each section can configure:
+As the last step, let's organize your freshly created items using two different options.
+You can choose either or both of them on your boards.
 
-- Show or hide its label.
-- Allow or disable collapsing.
-- Show or hide **Open all in new tabs**.
-- Change its border color and custom CSS classes.
+### Using dynamic sections
+
+Dynamic sections are a simple, resizable visual group to group items.
 
 ![](./img/create-dynamic-section.png)
 
-After adding a section, drag and resize it like any other tile, then drag items into it:
+After adding a dynamic section, you can simply drag and drop items into the section:
 
 ![](./img/dynamic-section.gif)
 
-### Labeled and collapsible sections
+### Using categories
 
-Open the add-content menu and choose **New section**.
-Use its settings menu to add a label and enable the behavior you want.
-In edit mode, move items into or out of the section directly.
-In view mode, each user can collapse eligible sections without changing the saved board layout.
-If **Open all in new tabs** is enabled, the section menu can open every app link it contains.
+Categories are more advanced and complicated than dynamic sections.
+To create a category, open the add item modal and choose "new category":
 
-### Fixed sidebars
+![](./img/add-category.png)
 
-Open the board's **Layout** settings to enable the left or right sidebar for each responsive layout.
-Choose one, two, or three columns with the slider and use the preview to check the remaining canvas width.
-The sidebar reserves those columns from the dashboard, so Homarr moves canvas items into the next available positions.
-Sidebar content stays visible while the page scrolls and remains editable.
+Every category must have a name. After you click "Add category", you will get a new item on your board:
 
-Existing categories become sections automatically, and category rails become fixed sidebars.
+![](./img/category.gif)
+
+You can drag and drop items in to this category in the edit mode.
+Categories will have a big space before and after them in the edit mode to
+enable you to drag and drop items outside the category.
+You can also collapse or open categories in edit mode to facilitate your editing process.
+
+:::note
+
+A current limitation of categories is, that they will always have a width of 100%.
+You cannot reduce their horizontal width.
+
+:::
 
 ## Guided tours
 

apps/docs/docs/getting-started/installation/helm.md

@@ -2,9 +2,9 @@
 
 <img src="https://raw.githubusercontent.com/homarr-labs/charts/refs/heads/main/charts/homarr/icon.svg" align="right" width="92" alt="homarr logo">
 
-![Version: 8.24.0](https://img.shields.io/badge/Version-8.24.0-informational?style=flat)
+![Version: 8.25.0](https://img.shields.io/badge/Version-8.25.0-informational?style=flat)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat)
-![AppVersion: v1.72.0](https://img.shields.io/badge/AppVersion-v1.72.0-informational?style=flat)
+![AppVersion: v1.73.0](https://img.shields.io/badge/AppVersion-v1.73.0-informational?style=flat)
 
 A Helm chart to deploy homarr for Kubernetes
 
@@ -429,7 +429,7 @@ All available values are listed on the [artifacthub](https://artifacthub.io/pack
 | httproute.rules[0].matches[0].path.value | string | `"/"` | Path value to match |
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
 | image.repository | string | `"ghcr.io/homarr-labs/homarr"` | Image repository |
-| image.tag | string | `"v1.72.0"` | Overrides the image tag whose default is the chart appVersion |
+| image.tag | string | `"v1.73.0"` | Overrides the image tag whose default is the chart appVersion |
 | imagePullSecrets | list | `[]` | Secrets for Docker registry |
 | ingress.annotations | object | `{}` | Ingress annotations |
 | ingress.enabled | bool | `false` | Enable ingress |

apps/docs/docs/management/api/index.mdx

@@ -83,10 +83,3 @@ The OpenAPI and MCP APIs include board management endpoints for common automatio
 - Configure global board defaults such as public home boards and status behavior
 
 Use the interactive API reference to inspect the exact request body for each endpoint under the `boards` and `settings` tags.
-
-### Saving dashboard layouts
-
-The dashboard editor saves item positions and sections as one board update.
-Canvas height follows its content automatically and does not require a separate API setting.
-Responsive layouts store optional left and right gutter widths from zero to three columns.
-Gutter columns are reserved from the layout's total column count, and changing them reflows affected items.

apps/docs/docs/management/apps/index.mdx

@@ -28,7 +28,7 @@ The name must be at least one character long and can be chosen freely.
 ### Icon URL
 
 This is the URL to the icon that will be displayed on the app widget. 
-It can be a url to an image in the internet, one from the included icon repositories or a local file uploaded through the upload button.
+You can paste a direct HTTP(S) URL to an image, search the included icon repositories by name, or upload a local file through the upload button. Direct image URLs are used as entered and are not searched in the icon repositories.
 
 ![Icon URL](./img/app-icon-url.png)
 
@@ -50,4 +50,4 @@ It's useful when you want to ping the service internally for example with a cust
 
 On the apps management page you find all apps that exist in your Homarr instance. You can edit and delete them.
 
-![Apps list](./img/app-list.png)
+![Apps list](./img/app-list.png)

apps/docs/docs/management/boards/index.mdx

@@ -9,11 +9,11 @@ tags:
   - Layout
 ---
 
-import iconColorImage from "./img/icon-color.png";
-import itemRadiusImage from "./img/item-radius.png";
-import layoutLargeImage from "./img/layout-large.png";
-import layoutMediumImage from "./img/layout-medium.png";
-import layoutSmallImage from "./img/layout-small.png";
+import iconColorImage from './img/icon-color.png'
+import itemRadiusImage from './img/item-radius.png'
+import layoutLargeImage from './img/layout-large.png'
+import layoutMediumImage from './img/layout-medium.png'
+import layoutSmallImage from './img/layout-small.png'
 
 Each dashboard is called a "board".
 You can create as many boards as you want.
@@ -24,30 +24,24 @@ Other boards can be viewed by direct links (e.g. my-homarr.com/board/smart-home)
 Names of boards must be unique because this will be used in the URL to load the desired board.
 
 ## Create a new board
-
 When creating a board, the availability of the board name will be checked for you.
 
 ![](./img/create-board-modal.png)
 
 ### Name
-
 The name must not include any special characters and must be at least one character long.
 Underscores and hyphen-minus are allowed.
 
 ### Column count
-
-The column count defines how many fixed-width cells are available in each row.
-One cell contains a `200 × 200` logical-pixel tile.
-Homarr scales the whole board uniformly instead of changing widget proportions, with horizontal scrolling when further shrinking would make controls too small.
+Homarr has a complex drag and drop system that can be used from the browser.
+The column count defines how many horizontal columns are available to drag and drop elements to.
 
 ### Public
-
 This will enable public access for everyone - regardless of whether they are logged in or not.
-This can be really useful if you want to have public boards in your company or for family and friends.
+This can be really useful if you want to have public boards in your company or for family and fiends.
 Modifications for public boards must be allowed explicitly using user groups and their permissions.
 
 ## Board settings
-
 You navigate to the board settings by clicking on these three dots:
 
 ![](./img/navigate-to-settings.png)
@@ -57,9 +51,7 @@ Alternatively, you can also navigate from the board page itself using the cog ic
 ![](./img/navigate-to-settings-2.png)
 
 ### General
-
 #### Page title
-
 This is the title that will be visible at the top left in the navigation bar:
 
 ![](./img/page-title.png)
@@ -67,7 +59,6 @@ This is the title that will be visible at the top left in the navigation bar:
 This field is optional and Homarr will fall back to "Homarr" if nothing is set.
 
 #### Meta title
-
 This is the secondary title of the page that is not directly visible in the page itself.
 Browser will use it to set the title of tabs:
 
@@ -76,156 +67,78 @@ Browser will use it to set the title of tabs:
 Homarr will fall back to the board name and a suffix if nothing is set.
 
 #### Logo image URL
-
 This is the URL that is used for the image at the top left.
 Homarr will fall back to the Homarr logo if nothing is set.
 
 #### Favicon image URL
-
 This is the URL that is used for the favicon in the tab title.
 Homarr will fall back to the Homarr logo if nothing is set.
 
 ### Layout
 
-In this section you can configure the different responsive layouts.
-Homarr selects a layout from the screen width, then scales its complete fixed-size canvas uniformly.
+In this section you can configure the different responsive layouts. Depending on your screens width the layout will change.
 
 ![](./img/layout-settings.png)
 
-Every `1 × 1` tile has a `200 × 200` logical-pixel content area.
-The `24` logical-pixel gap between tiles is separate from that size.
-A `2 × 1` tile therefore contains two fixed cell widths plus the gap between them.
-Widgets see their logical size, while the board's visual scale makes the complete layout larger or smaller.
-When fitting below 100%, Homarr keeps widget typography and control density at their normal readable size.
-On larger canvases, the complete board grows together like browser zoom.
-The scale never drops below 75%; on narrower screens the canvas scrolls horizontally instead of shrinking controls below an accessible size.
-
-The position and size of every item can be changed separately in each responsive layout.
+On each element the position and size of items can be changed seperately.
 When adding a new layout the position and sizes will automatically be generated depending on the column count.
-New items use their widget's default grid size, while a new inline section starts at a useful `4 × 3` size when the layout has enough columns.
-Both are placed in the first available position.
-
-Moving content downward in edit mode extends the canvas automatically, while view mode trims it back to the content.
-Nested sections keep their own resizable bounds.
+When adding a new item / dynamic section that will always be 1x1 on each layout and placed on the first available position.
 
 #### Name
 
-The name of the layout can be chosen freely. It is only used for management and will not be visible on the board.
+The name of the layout can be choosen freely. It is only used for the management and will not be visible on the board.
 
 #### Column count
 
-Total number of columns for this layout.
-When changed, Homarr moves items into the next available positions without overlap.
-
-#### Fixed sidebars
-
-Each responsive layout can enable a fixed left sidebar, a fixed right sidebar, or both.
-Set a sidebar width to zero to disable it for that layout.
-Choose a width from one to three columns with the three-step slider.
-The preview shows how much space remains for the main canvas.
-
-Sidebar columns are reserved from the layout's total column count.
-For example, a 12-column layout with a two-column left sidebar leaves ten columns for the canvas.
-Enabling or widening a sidebar reflows canvas items into the remaining columns.
-Disabling a sidebar moves its contents back into the next available canvas positions.
-
-Sidebars remain visible while the page scrolls.
-Apps, widgets, and sections inside them still use the same fixed `200 × 200` cells and can be rearranged in edit mode.
+Amount of columns for this layout. Defines how many items can be placed in a row. When changed it will automatically adjust the position and size of the items.
 
 #### Breakpoint
 
-Minimum width of the screen where the layout will be used.
-Once the minimum of the next layout is reached, the layout will change.
-
-#### View and edit modes
-
-View mode renders a static board without executing the drag-and-drop editor.
-After the board is interactive, Homarr prepares the editor in the background for users who can modify it.
-Entering edit mode keeps the static board visible until that preparation finishes, then enables collision-aware movement and resizing without changing the board geometry.
-Widget content is inert in edit mode, so dragging anywhere on the content moves the tile instead of activating the widget; the visible grip and tile outline indicate the active move surface, while the tile's settings button remains available.
-Dropping a tile into another tile's exact slot swaps their positions when both resulting placements fit without overlapping other content.
-For other collisions, or when a tile grows into occupied space, nearby tiles are compacted out of the way.
-The visible corner controls provide a 44-pixel resize target, and edge controls appear on hover for horizontal or vertical resizing.
-Resize handles stop at the tile's minimum allowed size while the pointer is still moving.
-Exit edit mode to save the resulting positions.
-
-Keyboard users can focus a tile, press Enter or Space, then use arrow keys to move and Shift plus arrow keys to resize.
-Press Escape to stop.
-The **Move / resize item** action in the edit menu remains available for precise numeric or touch input.
+Minimum width of the screen where the layout will be used. 
+Once the minmum of the next layout is reached the layout will change.
 
 #### Preview
 
-<img src={layoutSmallImage} height={256} />
-<img src={layoutMediumImage} height={256} />
-<img src={layoutLargeImage} height={256} />
-
-### Sections and sidebars
-
-Sections can contain apps, widgets, and nested sections.
-Every section uses the same model whether it is on the canvas or inside a sidebar.
-Sections can be moved and resized directly in edit mode.
-Expanding it creates space for its contents and pushes following items out of the way; collapsing it compacts the board.
-
-Each section can configure:
-
-- Whether its label is visible.
-- Whether users may collapse it.
-- Whether its menu shows **Open all in new tabs**.
-- Its label, border color, and custom CSS classes.
-
-Existing categories and dynamic sections are converted into this unified section model.
-Existing category rails become board sidebars automatically.
+<img src={layoutSmallImage}  height={256} />
+<img src={layoutMediumImage}  height={256} />
+<img src={layoutLargeImage}  height={256} />
 
 ### Background
-
 #### Background image URL
-
 Homarr can display a background image behind apps and widgets.
 This URL can be used to define what image should be shown.
 
 #### Background image attachment
-
 This defines whether the background should move when the user scrolls.
 
 #### Background image size
-
 This defines whether the background should cover the entire page (and possibly be cropped) or never be cropped but may not cover the entire page.
 
 #### Background image repeat
-
 This defines whether the background should be repeated if it cannot cover the entire page.
 This option can be useful if you have patterns that can be repeated easily (e.g. patterns):
 
 ![](./img/background-repeat.png)
 
 ### Appearance
-
 #### Primary color
-
 Color that can be chosen freely to give accents to active elements.
-
 #### Secondary color
-
 Color that can be chosen freely to give accents.
-
 #### Opacity
-
 Opacity of the colors.
-
 #### Icon color
-
 Change the color of your bookmark / app icons.
 
-<img src={iconColorImage} height={100} />
+<img src={iconColorImage}  height={100} />
 
 #### Item radius
-
 Change the radius of your items / categories.
 
-<img src={itemRadiusImage} height={100} />
+<img src={itemRadiusImage}  height={100} />
+
 
 ### Custom CSS
-
 This is the field where you can enter custom CSS.
 The styling will only be applied on the respective board page.
 
@@ -234,16 +147,14 @@ The styling will only be applied on the respective board page.
 ### Behaviour
 
 #### Disable app status
-
 This will disable the status check for apps.
 
 ### Access control
-
 With the access control, you can permit a single user or a group to your board.
 The users and groups can have one of these three levels of access:
 
 | **Permission Level** | View board | Edit mode | Settings | Danger zone (eg. delete) |
-| -------------------- | ---------- | --------- | -------- | ------------------------ |
+|----------------------|------------|-----------|----------|--------------------------|
 | View board           | X          |           |          |                          |
 | Modify board         | X          | X         | X        |                          |
 | Full access          | X          | X         | X        | X                        |
@@ -262,23 +173,18 @@ After editing permissions, the save button below the table must be pressed.
 Otherwise, all changes will be discarded.
 
 ### Danger zone
-
 #### Rename
-
 Renaming a board will break all existing links to it permanently with no redirect.
 
 #### Board visibility
-
 By default, boards will be private. This means only authenticated users that are authorized have access.
 Making a board public will expose it to everyone - including unauthenticated users.
 
 #### Delete
-
 This will permanently delete the board.
 This action is irreversible and cannot be undone.
 
 ## Delete boards
-
 The deletion of boards is permanent and cannot be undone.
 There are two ways to delete a board:
 
@@ -290,7 +196,7 @@ Both actions will execute the same deletion process.
 ## Duplicate boards
 
 :::note
-Duplicating a board will not copy the users and groups that have access to the board
+Duplicating a board will not copy the users and groups that have access to the board 
 nor the integrations the user does not have access to.
 :::
 
@@ -300,51 +206,47 @@ You can duplicate a board by clicking on the three dots in the list of boards an
 ![](./img/duplicate-board-modal.png)
 
 ## Setting boards as your home board
-
 The home board is the dashboard, that will be shown at the root path of Homarr or if no board name was passed in the URL.
 All the following paths will lead to the home board:
-
-- `my-homarr.com`
-- `my-homarr.com/boards`
+- ``my-homarr.com``
+- ``my-homarr.com/boards``
 
 Your home board will have a special small badge at the top right in the list of boards:
 
 ![](./img/home-board-flag.png)
 
 ### For yourself
-
 To set the home board yourself, the easiest option is to set it directly in the list of boards:
 
 ![](./img/set-as-home-board-menu.png)
 
 Alternatively, you can also define it via your user profile:
-
 1. Click on your user profile at the top right
-2. Click on `Your preferences`
-3. Change the home board in the `home board` dropdown and click on `Save`.
+2. Click on ``Your preferences``
+3. Change the home board in the ``home board`` dropdown and click on ``Save``.
 
 ### For other users
 
-1. Navigate to the users: `Management` > `Users` > `Manage`
+1. Navigate to the users: ``Management`` > ``Users`` > ``Manage``
 2. Click on the username of the user that you want to adjust
-3. Select the desired home board via the dropdown and click on `Save` \
-   ![](./img/set-home-board-other-user.png)
+3. Select the desired home board via the dropdown and click on ``Save`` \
+![](./img/set-home-board-other-user.png)
 
 ### For user groups
 
-1. Navigate to the user groups: `Management` > `Users` > `Groups` > `Manage`
-2. Go to tab `Settings`
-3. Select the desired home board via the dropdown and click on `Save` \
-   ![](./img/set-home-board-user-group.png)
+1. Navigate to the user groups: ``Management`` > ``Users`` > ``Groups`` > ``Manage``
+2. Go to tab ``Settings``
+3. Select the desired home board via the dropdown and click on ``Save`` \
+![](./img/set-home-board-user-group.png)
 
 ### For whole server
 
 You can also set a global home board that will be used for all users that have not set a home board themselves.
 It will also be used for anonymous users.
 
-1. Navigate to the settings: `Management` > `Settings` > `Boards`
-2. Select the desired home board via the dropdown and click on `Save` \
-   ![](./img/set-home-board-global.png)
+1. Navigate to the settings: ``Management`` > ``Settings`` > ``Boards``
+2. Select the desired home board via the dropdown and click on ``Save`` \
+![](./img/set-home-board-global.png)
 
 :::note
 For the global home board you can only select boards that are public.
@@ -353,4 +255,4 @@ For the global home board you can only select boards that are public.
 ### Mobile home board
 
 Same as the home board, you can also set a mobile home board.
-It will be used for devices that are detected as mobile devices. (Using User-Agent header)
+It will be used for devices that are detected as mobile devices. (Using User-Agent header)

apps/docs/docs/widgets/beszel-system-table/index.mdx

@@ -17,10 +17,17 @@ import { beszelIntegration } from '@site/docs/integrations/beszel';
   categories={['System Monitoring']}
 />
 
-This widget displays all your Beszel-monitored systems in a sortable data table. Each row shows system metrics like CPU, memory, disk, network, temperature, and more. Columns can be toggled on or off, and the table supports sorting by any column. When Beszel reports extra filesystems, the disk column adds a hover breakdown for each mount alongside the root disk.
+This widget displays all your Beszel-monitored systems in a sortable data table. Each row shows system metrics like CPU, memory, disk, network, temperature, and more. Columns can be toggled on or off, dragged into a different order, and resized from their headers. Column order and widths are saved automatically for each widget. When Beszel reports extra filesystems, the disk column adds a hover breakdown for each mount alongside the root disk.
 
 Select a system row to open the complete statistics view, including system, filesystem, Docker, historical, and realtime charts.
 
+### Interactions
+
+- **Reorder columns** by hovering a header to reveal its grab handle, then dragging it
+- **Resize columns** by dragging a header's right edge
+- **Sort systems** by selecting a sortable column header
+- **Open system statistics** by selecting a row
+
 ### Supported Integrations
 
 <WidgetIntegrations items={[{

apps/docs/docs/widgets/docker-containers/index.mdx

@@ -40,12 +40,19 @@ import dockerTable from './img/table.png';
 
 ### Interactions
 
-Each container row has an action menu (accessible via the three-dot icon) with the following options:
+Hover a column header to reveal its grab handle, then drag it to reorder the table or drag the header's edge to resize it. The layout is saved automatically for each widget instance and restored after a reload. These controls are disabled while the board is in edit mode.
+
+Each container row has an action menu, accessible via the three-dot icon or by right-clicking the row, with the following options:
+
 - **View logs** - opens a dedicated terminal page streaming the container's logs
 - **Start** / **Stop** / **Restart** - manage the container's state
-- **Remove** - remove the container
+- **Remove** - permanently remove the container after a second confirmation click
 - **Add to Homarr** - create a bookmark app from the container
 
 ### Adding the widget
 
 <AddingWidget />
+
+### Configuration
+
+<WidgetConfig configuration={dockerContainersWidget.configuration} />

apps/docs/docs/widgets/docker-containers/index.ts

@@ -8,6 +8,12 @@ export const dockerContainersWidget: WidgetDefinition = {
   path: "../../widgets/docker-containers",
   configuration: {
     items: [
+      {
+        name: "Columns to show",
+        description: "Select which columns are visible in the table",
+        values: "Name, State, Host, CPU usage, Memory usage, and Actions",
+        defaultValue: "All columns",
+      },
       {
         name: "Enable items sorting",
         description: "Allows to sort containers by clicking on the column headers",

apps/docs/docs/widgets/downloads/index.mdx

@@ -44,7 +44,7 @@ import contextMenuImg from './img/context-menu.png';
 
 - **Responsive table** — columns automatically adapt to widget width, hiding less important columns at smaller sizes
 - **Sortable columns** — click any column header to sort ascending/descending
-- **Column customization** — choose which columns to display via the widget options panel
+- **Column customization** — choose which columns to display, then hover a header to reveal its grab handle for reordering or drag its edge to resize it; layouts save automatically per widget
 - **Right-click context menu** — pause, resume, delete downloads, or copy download names directly from the context menu
 - **Row expansion** — click any row to see full details inline without opening a separate modal
 - **Hover tooltips** — hover a download name to see size, speeds, ETA, ratio, and category

apps/nextjs/next.config.ts

@@ -1,4 +1,6 @@
 // Importing env files here to validate on build
+import path from "node:path";
+
 import "@homarr/auth/env";
 import "@homarr/core/infrastructure/db/env";
 import "@homarr/common/env";
@@ -13,7 +15,21 @@ const withNextIntl = createNextIntlPlugin({
   requestConfig: "../../packages/translation/src/request.ts",
 });
 
+const getDevelopmentServiceAliases = () => {
+  if (process.env.NODE_ENV !== "development") {
+    return undefined;
+  }
+
+  return {
+    "@homarr/tasks": "./src/instrumentation-noop.ts",
+    "@homarr/websocket": "./src/instrumentation-noop.ts",
+  };
+};
+
 const nextConfig: NextConfig = {
+  // Next previews otherwise create agent instruction files in the application
+  // directory during development.
+  agentRules: false,
   env: {
     HOMARR_VERSION: process.env.HOMARR_VERSION ?? "unknown",
   },
@@ -30,19 +46,14 @@ const nextConfig: NextConfig = {
   serverExternalPackages: ["dockerode", "isomorphic-dompurify", "jsdom", "better-sqlite3"],
   experimental: {
     optimizePackageImports: ["@mantine/core", "@mantine/hooks", "@tabler/icons-react"],
-    turbopackFileSystemCacheForDev: true,
-    webpackMemoryOptimizations: true,
+    turbopackFileSystemCacheForBuild: true,
+    useTypeScriptCli: true,
   },
   turbopack: {
-    // ponytail: known Turbopack NFT warning from path.join(process.cwd(), …) in
-    // src/app/api/backup/{route,shared}.ts. No working placement in 16.2.x
-    // (see vercel/next.js#95125). Suppress until upstream fix lands.
-    ignoreIssue: [
-      {
-        path: "**/*",
-        title: "Encountered unexpected file in NFT list",
-      },
-    ],
+    root: path.resolve(import.meta.dirname, "../.."),
+    // Development runs tasks and WebSocket as separate processes. These aliases
+    // keep their production-only instrumentation imports out of the dev graph.
+    resolveAlias: getDevelopmentServiceAliases(),
   },
   transpilePackages: ["@homarr/ui", "@homarr/notifications", "@homarr/modals", "@homarr/spotlight", "@homarr/widgets"],
   images: {
@@ -68,10 +79,6 @@ const nextConfig: NextConfig = {
       {
         source: "/(.*)", // Apply CSP to all routes
         headers: [
-          {
-            key: "Accept-CH",
-            value: "Sec-CH-Viewport-Width",
-          },
           {
             key: "Content-Security-Policy",
             // worker-src / media-src with blob: is necessary for video.js, see https://github.com/homarr-labs/homarr/issues/3912 and https://stackoverflow.com/questions/65792855/problem-with-video-js-and-content-security-policy-csp

apps/nextjs/package.json

@@ -31,6 +31,7 @@
     "@homarr/docker": "workspace:^0.1.0",
     "@homarr/form": "workspace:^0.1.0",
     "@homarr/forms-collection": "workspace:^0.1.0",
+    "@homarr/gridstack": "catalog:",
     "@homarr/icons": "workspace:^0.1.0",
     "@homarr/image-proxy": "workspace:^0.1.0",
     "@homarr/integrations": "workspace:^0.1.0",
@@ -58,11 +59,10 @@
     "@modelcontextprotocol/sdk": "catalog:",
     "@scalar/api-reference-react": "catalog:",
     "@tabler/icons-react": "catalog:",
-    "@tanstack/query-async-storage-persister": "catalog:",
+    "@tanstack/react-devtools": "catalog:",
     "@tanstack/react-query": "catalog:",
     "@tanstack/react-query-devtools": "catalog:",
     "@tanstack/react-query-next-experimental": "catalog:",
-    "@tanstack/react-query-persist-client": "catalog:",
     "@trpc/client": "catalog:",
     "@trpc/next": "catalog:",
     "@trpc/react-query": "catalog:",
@@ -80,7 +80,6 @@
     "drizzle-orm": "catalog:",
     "flag-icons": "catalog:",
     "glob": "catalog:",
-    "gridstack": "catalog:",
     "isomorphic-dompurify": "catalog:",
     "jotai": "catalog:",
     "jszip": "catalog:",

apps/nextjs/src/app/[locale]/_client-providers/development-tools.tsx

@@ -0,0 +1,120 @@
+"use client";
+
+import { useEffect, useState } from "react";
+import { usePathname } from "next/navigation";
+import { TanStackDevtools } from "@tanstack/react-devtools";
+import type { TanStackDevtoolsReactPlugin } from "@tanstack/react-devtools";
+import type { QueryClient } from "@tanstack/react-query";
+import { useQueryClient } from "@tanstack/react-query";
+import { ReactQueryDevtoolsPanel } from "@tanstack/react-query-devtools";
+
+const valueStyle = { fontFamily: "monospace", overflowWrap: "anywhere" } as const;
+const metricStyle = {
+  background: "color-mix(in srgb, currentColor 4%, transparent)",
+  border: "1px solid color-mix(in srgb, currentColor 18%, transparent)",
+  borderRadius: 8,
+  padding: 12,
+} as const;
+
+const readDiagnostics = (queryClient: QueryClient) => {
+  const queries = queryClient.getQueryCache().getAll();
+  const mutations = queryClient.getMutationCache().getAll();
+  const board = document.querySelector("[data-homarr-dev-benchmark-board]");
+  const widgetItems = board?.querySelectorAll('[data-type="item"]').length ?? 0;
+  const readyWidgets = board?.querySelectorAll("[data-homarr-widget-ready]").length ?? 0;
+  const resources = performance.getEntriesByType("resource") as PerformanceResourceTiming[];
+
+  return {
+    active: queries.filter((query) => query.getObserversCount() > 0).length,
+    errors: queries.filter((query) => query.state.status === "error").length,
+    fetching: queries.filter((query) => query.state.fetchStatus === "fetching").length,
+    pendingMutations: mutations.filter((mutation) => mutation.state.status === "pending").length,
+    stale: queries.filter((query) => query.isStale()).length,
+    total: queries.length,
+    readyWidgets,
+    widgetItems,
+    scriptKiB: Math.round(
+      resources
+        .filter((resource) => resource.initiatorType === "script")
+        .reduce((total, resource) => total + resource.decodedBodySize, 0) / 1024,
+    ),
+  };
+};
+
+const Metric = ({ label, value }: { label: string; value: number | string }) => (
+  <div style={metricStyle}>
+    <div style={{ fontSize: 12, opacity: 0.7 }}>{label}</div>
+    <output style={{ ...valueStyle, display: "block", fontSize: 22, fontWeight: 600, marginTop: 4 }}>{value}</output>
+  </div>
+);
+
+const HomarrDevtoolsPanel = ({ active }: { active: boolean }) => {
+  const pathname = usePathname();
+  const queryClient = useQueryClient();
+  const [diagnostics, setDiagnostics] = useState(() => readDiagnostics(queryClient));
+
+  useEffect(() => {
+    if (!active) return;
+
+    const update = () => setDiagnostics(readDiagnostics(queryClient));
+    let frame: number | undefined;
+    const scheduleUpdate = () => {
+      if (frame !== undefined) return;
+      frame = window.requestAnimationFrame(() => {
+        frame = undefined;
+        update();
+      });
+    };
+    const unsubscribeQueries = queryClient.getQueryCache().subscribe(scheduleUpdate);
+    const unsubscribeMutations = queryClient.getMutationCache().subscribe(scheduleUpdate);
+    const observer = new MutationObserver(scheduleUpdate);
+    observer.observe(document.body, { childList: true, subtree: true });
+    update();
+
+    return () => {
+      unsubscribeQueries();
+      unsubscribeMutations();
+      observer.disconnect();
+      if (frame !== undefined) window.cancelAnimationFrame(frame);
+    };
+  }, [active, pathname, queryClient]);
+
+  if (!active) return null;
+
+  return (
+    <section data-homarr-devtools-panel style={{ fontFamily: "system-ui, sans-serif", padding: 16 }}>
+      <header style={{ marginBottom: 16 }}>
+        <h2 style={{ margin: 0 }}>Homarr performance</h2>
+        <p style={{ marginBlock: "4px 0", opacity: 0.7 }}>Live state for {pathname}</p>
+      </header>
+      <div style={{ display: "grid", gap: 8, gridTemplateColumns: "repeat(auto-fit, minmax(110px, 1fr))" }}>
+        <Metric label="Queries" value={diagnostics.total} />
+        <Metric label="Active" value={diagnostics.active} />
+        <Metric label="Fetching" value={diagnostics.fetching} />
+        <Metric label="Stale" value={diagnostics.stale} />
+        <Metric label="Errors" value={diagnostics.errors} />
+        <Metric label="Mutations" value={diagnostics.pendingMutations} />
+        <Metric label="Widgets ready" value={`${diagnostics.readyWidgets}/${diagnostics.widgetItems}`} />
+        <Metric label="Script KiB" value={diagnostics.scriptKiB} />
+      </div>
+    </section>
+  );
+};
+
+const developmentToolsPlugins = [
+  {
+    id: "tanstack-query",
+    name: "TanStack Query",
+    render: () => <ReactQueryDevtoolsPanel />,
+  },
+  {
+    id: "homarr-performance",
+    name: "Homarr",
+    defaultOpen: true,
+    render: (_element, { devtoolsOpen }) => <HomarrDevtoolsPanel active={devtoolsOpen} />,
+  },
+] satisfies TanStackDevtoolsReactPlugin[];
+
+export const DevelopmentTools = () => (
+  <TanStackDevtools config={{ position: "bottom-right", hideUntilHover: true }} plugins={developmentToolsPlugins} />
+);

apps/nextjs/src/app/[locale]/_client-providers/query-cache-persister.ts

@@ -1,32 +0,0 @@
-import { createAsyncStoragePersister } from "@tanstack/query-async-storage-persister";
-import superjson from "superjson";
-
-import { fetchApi } from "@homarr/api/client";
-import { getActiveQueryCacheBoardId, queryCacheStoragePrefix } from "@homarr/api/query-cache";
-
-const queryCacheStorage = {
-  getItem: (_key: string) => null as string | null,
-  async setItem(_key: string, value: string) {
-    const boardId = getActiveQueryCacheBoardId();
-    if (!boardId) return;
-    await fetchApi.queryCache.setItem.mutate({ boardId, value }).catch((error) => {
-      console.warn("[query-cache] persist failed", error);
-    });
-  },
-  async removeItem(_key: string) {
-    const boardId = getActiveQueryCacheBoardId();
-    if (!boardId) return;
-    await fetchApi.queryCache.removeItem.mutate({ boardId }).catch((error) => {
-      console.warn("[query-cache] remove failed", error);
-    });
-  },
-};
-
-export const createWidgetQueryPersister = () =>
-  createAsyncStoragePersister({
-    storage: typeof window === "undefined" ? undefined : queryCacheStorage,
-    key: queryCacheStoragePrefix,
-    throttleTime: 2000,
-    serialize: (data) => superjson.stringify(data),
-    deserialize: (data) => superjson.parse(data),
-  });

apps/nextjs/src/app/[locale]/_client-providers/query-retry.spec.ts

@@ -0,0 +1,27 @@
+import { describe, expect, it } from "vitest";
+import { TRPCClientError } from "@trpc/client";
+
+import { createQueryRetry } from "./query-retry";
+
+const createTrpcError = (code: string) => {
+  const error = Object.assign(new Error(code), { data: { code } });
+  Object.setPrototypeOf(error, TRPCClientError.prototype);
+  return error;
+};
+
+describe("createQueryRetry", () => {
+  it.each(["BAD_REQUEST", "UNAUTHORIZED", "FORBIDDEN", "NOT_FOUND", "UNPROCESSABLE_CONTENT"])(
+    "does not retry the permanent %s response",
+    (code) => {
+      expect(createQueryRetry(3)(0, createTrpcError(code))).toBe(false);
+    },
+  );
+
+  it("retries transient and network failures only up to the configured limit", () => {
+    const retry = createQueryRetry(3);
+
+    expect(retry(0, createTrpcError("INTERNAL_SERVER_ERROR"))).toBe(true);
+    expect(retry(2, new Error("connection reset"))).toBe(true);
+    expect(retry(3, new Error("connection reset"))).toBe(false);
+  });
+});

apps/nextjs/src/app/[locale]/_client-providers/query-retry.ts

@@ -0,0 +1,20 @@
+import { TRPCClientError } from "@trpc/client";
+
+const nonRetryableTrpcCodes = new Set([
+  "PARSE_ERROR",
+  "BAD_REQUEST",
+  "UNAUTHORIZED",
+  "FORBIDDEN",
+  "NOT_FOUND",
+  "METHOD_NOT_SUPPORTED",
+  "CONFLICT",
+  "PRECONDITION_FAILED",
+  "PAYLOAD_TOO_LARGE",
+  "UNPROCESSABLE_CONTENT",
+]);
+
+export const createQueryRetry = (maxRetries: number) => (failureCount: number, error: unknown) => {
+  if (failureCount >= maxRetries) return false;
+  if (error instanceof TRPCClientError && error.data?.code && nonRetryableTrpcCodes.has(error.data.code)) return false;
+  return true;
+};

apps/nextjs/src/app/[locale]/_client-providers/session-query-scope.spec.ts

@@ -0,0 +1,52 @@
+// @vitest-environment jsdom
+
+import { act, createElement } from "react";
+import { createRoot } from "react-dom/client";
+import { describe, expect, it, vi } from "vitest";
+
+import { getSessionQueryScope, SessionQueryScopeGuard } from "./session-query-scope";
+
+describe("getSessionQueryScope", () => {
+  it("is stable when permission order changes", () => {
+    expect(getSessionQueryScope({ user: { id: "user-a", permissions: ["board-view", "integration-use"] } })).toBe(
+      getSessionQueryScope({ user: { id: "user-a", permissions: ["integration-use", "board-view"] } }),
+    );
+  });
+
+  it("changes for a different user or permission set", () => {
+    const original = getSessionQueryScope({ user: { id: "user-a", permissions: ["board-view"] } });
+
+    expect(getSessionQueryScope({ user: { id: "user-b", permissions: ["board-view"] } })).not.toBe(original);
+    expect(getSessionQueryScope({ user: { id: "user-a", permissions: [] } })).not.toBe(original);
+    expect(getSessionQueryScope(null)).toBeNull();
+  });
+
+  it("removes the previous session subtree before requesting a document reload", async () => {
+    const host = document.createElement("div");
+    const root = createRoot(host);
+    const onScopeChange = vi.fn();
+    const renderScope = async (currentScope: string) => {
+      await act(async () => {
+        root.render(
+          createElement(
+            SessionQueryScopeGuard,
+            { currentScope, initialScope: "a", onScopeChange },
+            createElement("span", null, "session-a-secret"),
+          ),
+        );
+      });
+    };
+
+    try {
+      await renderScope("a");
+      expect(host.textContent).toBe("session-a-secret");
+
+      await renderScope("b");
+      expect(host.textContent).not.toContain("session-a-secret");
+      expect(host.querySelector('[role="status"]')?.getAttribute("aria-busy")).toBe("true");
+      expect(onScopeChange).toHaveBeenCalledOnce();
+    } finally {
+      await act(async () => root.unmount());
+    }
+  });
+});

apps/nextjs/src/app/[locale]/_client-providers/session-query-scope.ts

@@ -0,0 +1,39 @@
+import type { PropsWithChildren } from "react";
+import { createElement, useEffect } from "react";
+
+interface QuerySession {
+  user: {
+    id: string;
+    permissions: string[];
+  };
+}
+
+export const getSessionQueryScope = (session: QuerySession | null | undefined) =>
+  session ? JSON.stringify([session.user.id, session.user.permissions.toSorted()]) : null;
+
+interface SessionQueryScopeGuardProps {
+  initialScope: string | null;
+  currentScope: string | null;
+  onScopeChange: () => void;
+}
+
+export const SessionQueryScopeGuard = ({
+  initialScope,
+  currentScope,
+  onScopeChange,
+  children,
+}: PropsWithChildren<SessionQueryScopeGuardProps>) => {
+  const hasScopeChanged = initialScope !== currentScope;
+  useEffect(() => {
+    if (hasScopeChanged) onScopeChange();
+  }, [hasScopeChanged, onScopeChange]);
+
+  if (!hasScopeChanged) return children;
+
+  return createElement("div", {
+    "aria-busy": true,
+    "aria-label": "Refreshing session",
+    role: "status",
+    style: { minHeight: "100dvh" },
+  });
+};

apps/nextjs/src/app/[locale]/_client-providers/trpc.tsx

@@ -1,12 +1,10 @@
 "use client";
 
 import type { PropsWithChildren } from "react";
-import { useState } from "react";
-import type { QueryKey } from "@tanstack/react-query";
-import { QueryClient } from "@tanstack/react-query";
-import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
+import { useEffect, useMemo, useState } from "react";
+import dynamic from "next/dynamic";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { ReactQueryStreamedHydration } from "@tanstack/react-query-next-experimental";
-import { PersistQueryClientProvider } from "@tanstack/react-query-persist-client";
 import {
   createWSClient,
   httpBatchStreamLink,
@@ -25,18 +23,24 @@ import { TRPCClientError } from "@trpc/client";
 import type { AppRouter } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
 import {
-  isPersistableWidgetQueryKey,
-  queryCacheBuster,
+  dashboardSupportingQueryPolicies,
   queryCacheDefaultGcTimeMs,
   queryCacheDefaultRefetchIntervalMs,
   queryCacheDefaultStaleTimeMs,
 } from "@homarr/api/query-cache";
 import { createHeadersCallbackForSource, getTrpcUrl } from "@homarr/api/shared";
+import { useSession } from "@homarr/auth/client";
 import { env } from "@homarr/common/env";
 import { showWarningNotification } from "@homarr/notifications";
-import { widgetImports } from "@homarr/widgets";
+import { widgetQueryRefetchIntervals } from "@homarr/widgets/refetch-intervals";
 
-import { createWidgetQueryPersister } from "./query-cache-persister";
+import { getSessionQueryScope, SessionQueryScopeGuard } from "./session-query-scope";
+import { createQueryRetry } from "./query-retry";
+
+const DevelopmentTools =
+  process.env.NODE_ENV === "development"
+    ? dynamic(() => import("./development-tools").then(({ DevelopmentTools: Tools }) => Tools), { ssr: false })
+    : () => null;
 
 const getWebSocketProtocol = () => {
   if (typeof window === "undefined") {
@@ -59,21 +63,46 @@ const constructWebsocketUrl = () => {
   return `${getWebSocketProtocol()}://${window.location.hostname}:${window.location.port}/websockets`;
 };
 
-const wsClient = createWSClient({
-  url: constructWebsocketUrl(),
-});
+export function TRPCReactProvider({ children }: PropsWithChildren) {
+  const { data: session } = useSession();
+  const sessionQueryScope = getSessionQueryScope(session);
+  const [initialSessionQueryScope] = useState(() => sessionQueryScope);
 
-export function TRPCReactProvider(props: PropsWithChildren) {
-  const [persister] = useState(() => createWidgetQueryPersister());
+  return (
+    <SessionQueryScopeGuard
+      initialScope={initialSessionQueryScope}
+      currentScope={sessionQueryScope}
+      onScopeChange={reloadPage}
+    >
+      <ScopedTRPCReactProvider>{children}</ScopedTRPCReactProvider>
+    </SessionQueryScopeGuard>
+  );
+}
+
+const reloadPage = () => window.location.reload();
+
+const ScopedTRPCReactProvider = ({ children }: PropsWithChildren) => {
+  const wsClient = useMemo(
+    () =>
+      createWSClient({
+        url: constructWebsocketUrl(),
+        lazy: { enabled: true, closeMs: 30_000 },
+      }),
+    [],
+  );
+  useEffect(
+    () => () => {
+      void wsClient.close();
+    },
+    [wsClient],
+  );
   const [queryClient] = useState(() => {
     const client = new QueryClient({
       defaultOptions: {
         queries: {
           staleTime: queryCacheDefaultStaleTimeMs,
           gcTime: queryCacheDefaultGcTimeMs,
-          refetchOnWindowFocus: false,
-          refetchOnReconnect: false,
-          retry: 3,
+          retry: createQueryRetry(env.NODE_ENV === "development" ? 1 : 3),
         },
         mutations: {
           onError(error) {
@@ -91,23 +120,29 @@ export function TRPCReactProvider(props: PropsWithChildren) {
         },
       },
     });
-    client.setQueryDefaults([["widget"]], { refetchInterval: queryCacheDefaultRefetchIntervalMs });
-    for (const { definition } of Object.values(widgetImports)) {
-      const def = definition as { refetchInterval?: number | null; queryKey?: QueryKey; kind: string };
-      if (def.refetchInterval === undefined) continue;
-      const key = def.queryKey ?? [["widget", def.kind]];
-      const interval = def.refetchInterval === null ? false : def.refetchInterval * 1000;
-      client.setQueryDefaults(key, { refetchInterval: interval });
+    client.setQueryDefaults([["widget"]], {
+      refetchInterval: queryCacheDefaultRefetchIntervalMs,
+      refetchOnWindowFocus: false,
+      refetchOnReconnect: false,
+    });
+    for (const { queryKey, intervalSeconds } of widgetQueryRefetchIntervals) {
+      client.setQueryDefaults(queryKey, {
+        refetchInterval: intervalSeconds === null ? false : intervalSeconds * 1000,
+      });
+    }
+    for (const { queryKey, ...policy } of dashboardSupportingQueryPolicies) {
+      client.setQueryDefaults(queryKey, policy);
     }
     return client;
   });
 
-  const [trpcClient] = useState(() => {
+  useEffect(() => () => queryClient.clear(), [queryClient]);
+
+  const trpcClient = useMemo(() => {
     return clientApi.createClient({
       links: [
         loggerLink({
-          enabled: (opts) =>
-            env.NODE_ENV === "development" || (opts.direction === "down" && opts.result instanceof Error),
+          enabled: (opts) => opts.direction === "down" && opts.result instanceof Error,
         }),
         splitLink({
           condition: ({ type }) => type === "subscription",
@@ -147,25 +182,14 @@ export function TRPCReactProvider(props: PropsWithChildren) {
         }),
       ],
     });
-  });
+  }, [wsClient]);
 
   return (
     <clientApi.Provider client={trpcClient} queryClient={queryClient}>
-      <PersistQueryClientProvider
-        client={queryClient}
-        persistOptions={{
-          persister,
-          buster: queryCacheBuster,
-          maxAge: queryCacheDefaultGcTimeMs,
-          dehydrateOptions: {
-            shouldDehydrateQuery: (query) =>
-              query.state.status === "success" && isPersistableWidgetQueryKey(query.queryKey),
-          },
-        }}
-      >
-        <ReactQueryStreamedHydration transformer={superjson}>{props.children}</ReactQueryStreamedHydration>
-        <ReactQueryDevtools initialIsOpen={false} />
-      </PersistQueryClientProvider>
+      <QueryClientProvider client={queryClient}>
+        <ReactQueryStreamedHydration transformer={superjson}>{children}</ReactQueryStreamedHydration>
+        {process.env.NODE_ENV === "development" && <DevelopmentTools />}
+      </QueryClientProvider>
     </clientApi.Provider>
   );
-}
+};

apps/nextjs/src/app/[locale]/boards/(content)/(home)/_definition.ts

@@ -1,13 +1,9 @@
-import { cache } from "react";
-
-import { api } from "@homarr/api/server";
+import { getHomeBoardAsync } from "@homarr/api/board-server";
 
 import { createBoardContentPage } from "../_creator";
 
-const getHomeBoardCachedAsync = cache(async () => await api.board.getHomeBoard());
-
 export default createBoardContentPage<{ locale: string }>({
   async getInitialBoardAsync() {
-    return await getHomeBoardCachedAsync();
+    return await getHomeBoardAsync();
   },
 });

apps/nextjs/src/app/[locale]/boards/(content)/[name]/(board)/_definition.tsx

@@ -1,13 +1,9 @@
-import { cache } from "react";
-
-import { api } from "@homarr/api/server";
+import { getBoardByNameAsync } from "@homarr/api/board-server";
 
 import { createBoardContentPage } from "../../_creator";
 
-const getBoardByNameCachedAsync = cache(async (name: string) => await api.board.getBoardByName({ name }));
-
 export default createBoardContentPage<{ locale: string; name: string }>({
   async getInitialBoardAsync({ name }) {
-    return await getBoardByNameCachedAsync(name);
+    return await getBoardByNameAsync(name);
   },
 });

apps/nextjs/src/app/[locale]/boards/(content)/_board-add-menu.tsx

@@ -1,7 +1,8 @@
 "use client";
 
+import { useCallback } from "react";
 import { Group, Menu } from "@mantine/core";
-import { IconBox, IconChevronDown, IconLayoutGridAdd, IconPlug, IconPlus, IconResize } from "@tabler/icons-react";
+import { IconBox, IconBoxAlignTop, IconChevronDown, IconPlug, IconPlus, IconResize } from "@tabler/icons-react";
 
 import { useSession } from "@homarr/auth/client";
 import { useModalAction } from "@homarr/modals";
@@ -10,47 +11,42 @@ import { useI18n } from "@homarr/translation/client";
 
 import { useItemActions } from "~/components/board/items/item-actions";
 import { ItemSelectModal } from "~/components/board/items/item-select-modal";
+import { useCategoryActions } from "~/components/board/sections/category/category-actions";
+import { CategoryEditModal } from "~/components/board/sections/category/category-edit-modal";
 import { useDynamicSectionActions } from "~/components/board/sections/dynamic/dynamic-actions";
 import { IntegrationSelectModal } from "~/components/integration/integration-select-modal";
 import { HeaderButton } from "~/components/layout/header/button";
 
-export default function BoardEditActions() {
-  return <AddMenu />;
-}
-
-const AddMenu = () => {
+export const BoardAddMenu = () => {
   const { data: session } = useSession();
+  const { openModal: openCategoryEditModal } = useModalAction(CategoryEditModal);
   const { openModal: openItemSelectModal } = useModalAction(ItemSelectModal);
   const { openModal: openAppSelectModal } = useModalAction(AppSelectModal);
   const { openModal: openIntegrationSelectModal } = useModalAction(IntegrationSelectModal);
+  const { addCategoryToEnd } = useCategoryActions();
   const { addDynamicSection } = useDynamicSectionActions();
   const { createItem } = useItemActions();
   const t = useI18n();
 
-  const handleSelectItem = () => {
-    openItemSelectModal();
-  };
-
-  const handleSelectApp = () => {
-    openAppSelectModal({
-      onSelect: (app) => {
-        createItem({
-          kind: "app",
-          options: { appId: app.id },
-        });
-      },
-      withCreate: session?.user.permissions.includes("app-create") ?? false,
-    });
-  };
-
-  const handleAddIntegration = () => {
-    openIntegrationSelectModal({});
-  };
+  const handleAddCategory = useCallback(
+    () =>
+      openCategoryEditModal(
+        {
+          category: { id: "new", name: "" },
+          onSuccess({ name }) {
+            addCategoryToEnd({ name });
+          },
+          submitLabel: t("section.category.create.submit"),
+        },
+        { title: (translate) => translate("section.category.create.title") },
+      ),
+    [addCategoryToEnd, openCategoryEditModal, t],
+  );
 
   return (
     <Menu position="bottom-end">
       <Menu.Target>
-        <HeaderButton w="auto" px={4} aria-label={t("board.action.addContent")}>
+        <HeaderButton w="auto" px={4}>
           <Group gap={4} wrap="nowrap">
             <IconPlus stroke={1.5} />
             <IconChevronDown color="gray" size={16} />
@@ -58,17 +54,28 @@ const AddMenu = () => {
         </HeaderButton>
       </Menu.Target>
       <Menu.Dropdown style={{ transform: "translate(-3px, 0)" }}>
-        <Menu.Item leftSection={<IconResize size={20} />} onClick={handleSelectItem}>
+        <Menu.Item leftSection={<IconResize size={20} />} onClick={() => openItemSelectModal()}>
           {t("item.action.create")}
         </Menu.Item>
-        <Menu.Item leftSection={<IconBox size={20} />} onClick={handleSelectApp}>
+        <Menu.Item
+          leftSection={<IconBox size={20} />}
+          onClick={() =>
+            openAppSelectModal({
+              onSelect: (app) => createItem({ kind: "app", options: { appId: app.id } }),
+              withCreate: session?.user.permissions.includes("app-create") ?? false,
+            })
+          }
+        >
           {t("app.action.add")}
         </Menu.Item>
-        <Menu.Item leftSection={<IconPlug size={20} />} onClick={handleAddIntegration}>
+        <Menu.Item leftSection={<IconPlug size={20} />} onClick={() => openIntegrationSelectModal({})}>
           {t("integration.action.create")}
         </Menu.Item>
         <Menu.Divider />
-        <Menu.Item leftSection={<IconLayoutGridAdd size={20} />} onClick={addDynamicSection}>
+        <Menu.Item leftSection={<IconBoxAlignTop size={20} />} onClick={handleAddCategory}>
+          {t("section.category.action.create")}
+        </Menu.Item>
+        <Menu.Item leftSection={<IconResize size={20} />} onClick={addDynamicSection}>
           {t("section.dynamic.action.create")}
         </Menu.Item>
       </Menu.Dropdown>

apps/nextjs/src/app/[locale]/boards/(content)/_client.module.css

@@ -1,20 +0,0 @@
-.columns {
-  display: grid;
-  align-items: start;
-  gap: 24px;
-}
-
-.lane {
-  min-width: 0;
-}
-
-.gutter {
-  position: sticky;
-  top: 0;
-  align-self: start;
-  max-height: calc(100dvh - var(--app-shell-header-offset, 0px) - var(--mantine-spacing-md));
-  overflow-y: auto;
-  overscroll-behavior: contain;
-  scrollbar-gutter: stable;
-  transform: translateY(var(--board-gutter-sticky-offset, 0px));
-}

apps/nextjs/src/app/[locale]/boards/(content)/_client.tsx

@@ -1,168 +1,33 @@
 "use client";
 
-import { useEffect, useRef } from "react";
-import { Box } from "@mantine/core";
+import { Box, Stack } from "@mantine/core";
 
-import { useCurrentLayout, useInitialViewportWidth, useRequiredBoard } from "@homarr/boards/context";
-import { useScopedI18n } from "@homarr/translation/client";
+import { useCurrentLayout, useRequiredBoard } from "@homarr/boards/context";
 
-import {
-  getBoardLaneColumnCount,
-  getInitialBoardLogicalHeight,
-  getLogicalTrackSize,
-  LOGICAL_GRID_GAP,
-  getRootSectionForLane,
-} from "~/components/board/layout";
-import { ScaledBoardCanvas } from "~/components/board/layout/scaled-board-canvas";
+import { BoardCategorySection } from "~/components/board/sections/category-section";
 import { BoardEmptySection } from "~/components/board/sections/empty-section";
-import { BoardGridPortalHost } from "~/components/board/sections/grid/grid-portal-host";
-import { BoardSectionCollapseProvider } from "~/components/board/sections/section-collapse";
 import { BoardBackgroundVideo } from "~/components/layout/background";
-import classes from "./_client.module.css";
-
-const APP_SHELL_INLINE_PADDING = 32;
-
-const useFixedBoardGutters = () => {
-  const columnsRef = useRef<HTMLDivElement>(null);
-
-  useEffect(() => {
-    const columns = columnsRef.current;
-    if (!columns) return;
-
-    let frame = 0;
-    const update = () => {
-      frame = 0;
-      const columnsRect = columns.getBoundingClientRect();
-      const headerBottom = document.querySelector("header")?.getBoundingClientRect().bottom ?? 0;
-      const stickyTop = Math.max(0, headerBottom + 16);
-
-      for (const gutter of columns.querySelectorAll<HTMLElement>("[data-board-gutter]")) {
-        const rect = gutter.getBoundingClientRect();
-        if (gutter.offsetWidth <= 0) continue;
-
-        const effectiveScale = rect.width / gutter.offsetWidth;
-        if (!Number.isFinite(effectiveScale) || effectiveScale <= 0) continue;
-
-        const previousOffset = Number(gutter.dataset.stickyOffset ?? 0);
-        const uncorrectedTop = rect.top - previousOffset * effectiveScale;
-        const maximumTop = columnsRect.bottom - rect.height;
-        const targetTop = Math.min(stickyTop, maximumTop);
-        const nextOffset = Math.max(0, targetTop - uncorrectedTop) / effectiveScale;
-
-        gutter.dataset.stickyOffset = String(nextOffset);
-        gutter.style.setProperty("--board-gutter-sticky-offset", `${nextOffset}px`);
-      }
-    };
-    const scheduleUpdate = () => {
-      if (frame !== 0) return;
-      frame = window.requestAnimationFrame(update);
-    };
-
-    const resizeObserver = new ResizeObserver(scheduleUpdate);
-    resizeObserver.observe(columns);
-    document.addEventListener("scroll", scheduleUpdate, { capture: true, passive: true });
-    window.addEventListener("resize", scheduleUpdate, { passive: true });
-    scheduleUpdate();
-
-    return () => {
-      window.cancelAnimationFrame(frame);
-      resizeObserver.disconnect();
-      document.removeEventListener("scroll", scheduleUpdate, { capture: true });
-      window.removeEventListener("resize", scheduleUpdate);
-    };
-  }, []);
-
-  return columnsRef;
-};
 
 export const ClientBoard = () => {
   const board = useRequiredBoard();
-  const t = useScopedI18n("board.landmark");
   const currentLayoutId = useCurrentLayout();
-  const initialViewportWidth = useInitialViewportWidth();
-  const columnsRef = useFixedBoardGutters();
-  const currentLayout = board.layouts.find((layout) => layout.id === currentLayoutId) ?? board.layouts.at(0);
-  if (!currentLayout) throw new Error("Expected the board to contain a layout");
 
-  const mainSection = getRootSectionForLane(board, "main");
-  const leftSection = getRootSectionForLane(board, "left");
-  const rightSection = getRootSectionForLane(board, "right");
-  if (!mainSection) throw new Error("Expected the board to contain a main canvas section");
-
-  const leftColumnCount = getBoardLaneColumnCount(currentLayout, "left");
-  const mainColumnCount = getBoardLaneColumnCount(currentLayout, "main");
-  const rightColumnCount = getBoardLaneColumnCount(currentLayout, "right");
-  const laneWidths = [leftColumnCount, mainColumnCount, rightColumnCount]
-    .filter((columnCount) => columnCount > 0)
-    .map(getLogicalTrackSize);
-  const logicalWidth =
-    laneWidths.reduce((total, width) => total + width, 0) + (laneWidths.length - 1) * LOGICAL_GRID_GAP;
-  const initialLogicalHeight = getInitialBoardLogicalHeight(board, currentLayoutId);
-  const initialAvailableWidth = Math.max(1, initialViewportWidth - APP_SHELL_INLINE_PADDING);
-  const gridTemplateColumns = [
-    leftColumnCount > 0 ? `${getLogicalTrackSize(leftColumnCount)}px` : null,
-    `${getLogicalTrackSize(mainColumnCount)}px`,
-    rightColumnCount > 0 ? `${getLogicalTrackSize(rightColumnCount)}px` : null,
-  ]
-    .filter((value) => value !== null)
-    .join(" ");
+  const fullWidthSortedSections = board.sections
+    .filter((section) => section.kind === "empty" || section.kind === "category")
+    .toSorted((sectionA, sectionB) => sectionA.yOffset - sectionB.yOffset);
 
   return (
-    <Box h="100%" pos="relative">
+    <Box h="100%" pos="relative" data-homarr-dev-benchmark-board>
       <BoardBackgroundVideo />
-      <BoardSectionCollapseProvider>
-        <BoardGridPortalHost>
-          <ScaledBoardCanvas
-            logicalWidth={logicalWidth}
-            initialLogicalHeight={initialLogicalHeight}
-            initialAvailableWidth={initialAvailableWidth}
-            label={board.name}
-          >
-            <div ref={columnsRef} className={classes.columns} style={{ gridTemplateColumns }}>
-              {leftColumnCount > 0 && leftSection && (
-                <aside
-                  className={`${classes.lane} ${classes.gutter}`}
-                  aria-label={t("leftRail")}
-                  data-board-gutter="left"
-                >
-                  <BoardEmptySection
-                    key={`${currentLayoutId}-${leftSection.id}`}
-                    section={leftSection}
-                    columnCount={leftColumnCount}
-                    requestedRowCount={0}
-                    railPlacement="left"
-                  />
-                </aside>
-              )}
-
-              <section className={classes.lane} aria-label={t("canvas")}>
-                <BoardEmptySection
-                  key={`${currentLayoutId}-${mainSection.id}`}
-                  section={mainSection}
-                  columnCount={mainColumnCount}
-                  requestedRowCount={0}
-                />
-              </section>
-
-              {rightColumnCount > 0 && rightSection && (
-                <aside
-                  className={`${classes.lane} ${classes.gutter}`}
-                  aria-label={t("rightRail")}
-                  data-board-gutter="right"
-                >
-                  <BoardEmptySection
-                    key={`${currentLayoutId}-${rightSection.id}`}
-                    section={rightSection}
-                    columnCount={rightColumnCount}
-                    requestedRowCount={0}
-                    railPlacement="right"
-                  />
-                </aside>
-              )}
-            </div>
-          </ScaledBoardCanvas>
-        </BoardGridPortalHost>
-      </BoardSectionCollapseProvider>
+      <Stack h="100%">
+        {fullWidthSortedSections.map((section) =>
+          section.kind === "empty" ? (
+            <BoardEmptySection key={`${currentLayoutId}-${section.id}`} section={section} />
+          ) : (
+            <BoardCategorySection key={`${currentLayoutId}-${section.id}`} section={section} />
+          ),
+        )}
+      </Stack>
     </Box>
   );
 };

apps/nextjs/src/app/[locale]/boards/(content)/_creator.tsx

@@ -1,19 +1,19 @@
 import type { Metadata } from "next";
-import { Suspense } from "react";
+import { cache } from "react";
 import { TRPCError } from "@trpc/server";
 
+// Placed here because gridstack styles are used for board content
+import "~/styles/gridstack.scss";
+
 import { dehydrate, HydrationBoundary } from "@tanstack/react-query";
-import type { PersistedClient } from "@tanstack/react-query-persist-client";
-import superjson from "superjson";
-import { queryCacheBuster } from "@homarr/api/query-cache";
-import { getQueryClient } from "@homarr/api/server";
+import { makeQueryClient } from "@homarr/api/shared";
+import { IntegrationProvider } from "@homarr/auth/client";
 import { auth } from "@homarr/auth/next";
 import { getIntegrationsWithPermissionsAsync } from "@homarr/auth/server";
 import { isNullOrWhitespace } from "@homarr/common";
 import { createLogger } from "@homarr/core/infrastructure/logs";
 import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
 import type { WidgetKind } from "@homarr/definitions";
-import { getQueryCacheAsync } from "@homarr/redis";
 import { getI18n } from "@homarr/translation/server";
 import { prefetchForKindAsync } from "@homarr/widgets/prefetch";
 
@@ -21,11 +21,11 @@ import { createMetaTitle } from "~/metadata";
 import { env } from "~/env";
 import { createBoardLayout } from "../_layout-creator";
 import type { Board, Item } from "../_types";
-import { ClientBoard } from "./_client";
+import { DynamicClientBoard } from "./_dynamic-client";
 import { BoardContentHeaderActions } from "./_header-actions";
-import { BoardIntegrationProvider } from "./_integration-provider";
 
 const logger = createLogger({ module: "createBoardContentPage" });
+const getQueryClient = cache(makeQueryClient);
 
 export type Params = Record<string, unknown>;
 
@@ -58,7 +58,6 @@ export const createBoardContentPage = <TParams extends Record<string, unknown>>(
         }
         return acc;
       }, new Map<WidgetKind, Item[]>());
-
       const [integrations] = await Promise.all([
         getIntegrationsWithPermissionsAsync(session),
         ...Array.from(itemsMap).map(([kind, items]) =>
@@ -74,19 +73,12 @@ export const createBoardContentPage = <TParams extends Record<string, unknown>>(
         ),
       ]);
 
-      const userId = session?.user.id ?? "anonymous";
-
       return (
-        <>
-          <Suspense>
-            <QueryCacheHydration userId={userId} boardId={board.id} />
-          </Suspense>
-          <HydrationBoundary state={dehydrate(queryClient)}>
-            <BoardIntegrationProvider initialIntegrations={integrations}>
-              <ClientBoard />
-            </BoardIntegrationProvider>
-          </HydrationBoundary>
-        </>
+        <HydrationBoundary state={dehydrate(queryClient)}>
+          <IntegrationProvider integrations={integrations}>
+            <DynamicClientBoard />
+          </IntegrationProvider>
+        </HydrationBoundary>
       );
     },
     generateMetadataAsync: async ({ params }: { params: Promise<TParams> }): Promise<Metadata> => {
@@ -117,19 +109,3 @@ export const createBoardContentPage = <TParams extends Record<string, unknown>>(
     },
   };
 };
-
-async function QueryCacheHydration({ userId, boardId }: { userId: string; boardId: string }) {
-  try {
-    const serialized = await getQueryCacheAsync(userId, boardId);
-    if (!serialized) return null;
-
-    const persisted = superjson.parse<PersistedClient | undefined>(serialized);
-    if (!persisted || persisted.buster !== queryCacheBuster) return null;
-    if (!persisted.clientState?.queries?.length) return null;
-
-    return <HydrationBoundary state={persisted.clientState} />;
-  } catch (error) {
-    logger.warn(new ErrorWithMetadata("Failed to hydrate query cache", { userId, boardId }, { cause: error }));
-    return null;
-  }
-}

apps/nextjs/src/app/[locale]/boards/(content)/_dynamic-client.tsx

@@ -0,0 +1,24 @@
+"use client";
+
+import dynamic from "next/dynamic";
+import { SimpleGrid, Skeleton, Stack } from "@mantine/core";
+
+const BoardLoadingShell = () => (
+  <Stack h="100%" p="md" aria-busy aria-label="Loading dashboard" role="status">
+    <SimpleGrid cols={{ base: 1, sm: 2, lg: 3 }} spacing="md">
+      {[2, 1, 2, 2, 1, 2].map((rows, index) => (
+        <Skeleton
+          key={index}
+          data-homarr-dev-benchmark-board-shell
+          height={rows * 96}
+          radius="var(--mantine-radius-default)"
+        />
+      ))}
+    </SimpleGrid>
+  </Stack>
+);
+
+export const DynamicClientBoard = dynamic(() => import("./_client").then((mod) => mod.ClientBoard), {
+  ssr: false,
+  loading: BoardLoadingShell,
+});

apps/nextjs/src/app/[locale]/boards/(content)/_header-actions.tsx

@@ -1,12 +1,11 @@
 "use client";
 
-import { startTransition, useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import dynamic from "next/dynamic";
 import { useRouter } from "next/navigation";
-import { OnboardingTour } from "@gfazioli/mantine-onboarding-tour";
-import { Box, Menu, ScrollArea } from "@mantine/core";
+import { Box, Center, Loader, Menu, ScrollArea } from "@mantine/core";
 import { useHotkeys } from "@mantine/hooks";
-import { IconLayoutBoard, IconPencil, IconPencilOff, IconReplace, IconSettings } from "@tabler/icons-react";
+import { IconLayoutBoard, IconPencil, IconPencilOff, IconPlus, IconReplace, IconSettings } from "@tabler/icons-react";
 
 import { clientApi } from "@homarr/api/client";
 import { useRequiredBoard } from "@homarr/boards/context";
@@ -20,31 +19,22 @@ import { useI18n, useScopedI18n } from "@homarr/translation/client";
 import { Link } from "@homarr/ui";
 
 import { useBoardPermissions } from "~/components/board/permissions/client";
-import { loadGridEditorAsync, scheduleGridEditorWarmup } from "~/components/board/sections/grid/grid-editor-loader";
 import { HeaderButton } from "~/components/layout/header/button";
-import type * as EditActionsModule from "./_edit-actions";
+import { TourTarget } from "~/components/layout/header/tour-target";
 
-let editActionsModulePromise: Promise<typeof EditActionsModule> | undefined;
-const loadEditActionsAsync = () => {
-  editActionsModulePromise ??= import("./_edit-actions").catch((error: unknown) => {
-    editActionsModulePromise = undefined;
-    throw error;
-  });
-  return editActionsModulePromise;
-};
-const loadBoardEditorAsync = async () =>
-  await Promise.all([
-    loadGridEditorAsync(),
-    loadEditActionsAsync(),
-    import("~/components/board/items/item-menu"),
-    import("~/components/board/sections/dynamic/dynamic-menu"),
-  ]);
-const BoardEditActions = dynamic(loadEditActionsAsync, { ssr: false });
+const loadBoardAddMenu = () => import("./_board-add-menu");
+const preloadBoardAddMenu = () => void loadBoardAddMenu().catch(() => undefined);
+const BoardAddMenu = dynamic(() => loadBoardAddMenu().then(({ BoardAddMenu: AddMenu }) => AddMenu), {
+  loading: () => (
+    <HeaderButton loading>
+      <IconPlus stroke={1.5} />
+    </HeaderButton>
+  ),
+});
 
 export const BoardContentHeaderActions = ({ demoReadOnly }: { demoReadOnly: boolean }) => {
   const [isEditMode] = useEditMode();
   const board = useRequiredBoard();
-  const t = useI18n();
   const { hasChangeAccess } = useBoardPermissions(board);
 
   if (!hasChangeAccess) {
@@ -53,16 +43,16 @@ export const BoardContentHeaderActions = ({ demoReadOnly }: { demoReadOnly: bool
 
   return (
     <>
-      {isEditMode && <BoardEditActions />}
+      {isEditMode && <BoardAddMenu />}
 
       <EditModeMenu demoReadOnly={demoReadOnly} />
 
       {!demoReadOnly && (
-        <OnboardingTour.Target id="board-settings">
-          <HeaderButton href={`/boards/${board.name}/settings`} aria-label={t("board.action.settings")}>
+        <TourTarget id="board-settings">
+          <HeaderButton href={`/boards/${board.name}/settings`}>
             <IconSettings stroke={1.5} />
           </HeaderButton>
-        </OnboardingTour.Target>
+        </TourTarget>
       )}
 
       <SelectBoardsMenu />
@@ -72,8 +62,6 @@ export const BoardContentHeaderActions = ({ demoReadOnly }: { demoReadOnly: bool
 
 const EditModeMenu = ({ demoReadOnly }: { demoReadOnly: boolean }) => {
   const [isEditMode, { open, close }] = useEditMode();
-  const [editorLoadState, setEditorLoadState] = useState<"scheduled" | "loading" | "ready" | "error">("scheduled");
-  const [isEnteringEditMode, setIsEnteringEditMode] = useState(false);
   const board = useRequiredBoard();
   const utils = clientApi.useUtils();
   const t = useScopedI18n("board.action.edit");
@@ -100,94 +88,53 @@ const EditModeMenu = ({ demoReadOnly }: { demoReadOnly: boolean }) => {
     close();
   }, [utils, board.name, close]);
 
-  const prepareEditorAsync = useCallback(async () => {
-    if (editorLoadState === "ready") return;
-
-    setEditorLoadState("loading");
-    try {
-      await loadBoardEditorAsync();
-      setEditorLoadState("ready");
-    } catch {
-      setEditorLoadState("error");
-      throw new Error("Unable to load the board editor");
-    }
-  }, [editorLoadState]);
-
-  useEffect(() => {
-    return scheduleGridEditorWarmup(async () => {
-      setEditorLoadState("loading");
-      try {
-        await loadBoardEditorAsync();
-        setEditorLoadState("ready");
-      } catch {
-        setEditorLoadState("error");
-      }
-    });
-  }, []);
-
-  const prewarmEditor = useCallback(() => {
-    void prepareEditorAsync().catch(() => {
-      // A click or hotkey retries and reports the error.
-    });
-  }, [prepareEditorAsync]);
-
-  const toggle = useCallback(async () => {
+  const toggle = useCallback(() => {
     if (isEditMode) {
       if (demoReadOnly) return discardDemoChanges();
       return saveBoard(board);
     }
+    open();
+  }, [board, isEditMode, demoReadOnly, saveBoard, open, discardDemoChanges]);
 
-    setIsEnteringEditMode(true);
-    try {
-      await prepareEditorAsync();
-      startTransition(open);
-    } catch {
-      showErrorNotification({
-        title: t("notification.loadError.title"),
-        message: t("notification.loadError.message"),
-      });
-    } finally {
-      setIsEnteringEditMode(false);
-    }
-  }, [board, demoReadOnly, discardDemoChanges, isEditMode, open, prepareEditorAsync, saveBoard, t]);
-
-  useHotkeys([[hotkeys.toggleBoardEdit, () => void toggle()]]);
+  useHotkeys([[hotkeys.toggleBoardEdit, toggle]]);
   usePreventLeaveWithDirty(isEditMode);
 
   return (
-    <OnboardingTour.Target id="board-edit-mode">
+    <TourTarget id="board-edit-mode">
       <HeaderButton
-        onClick={() => void toggle()}
-        onFocus={prewarmEditor}
-        onPointerEnter={prewarmEditor}
-        loading={isPending || isEnteringEditMode}
-        data-testid="board-edit-mode-toggle"
-        data-board-editor-preload-state={editorLoadState}
-        aria-busy={isPending || isEnteringEditMode}
-        aria-label={isEditMode ? (demoReadOnly ? t("exit") : t("save")) : t("enter")}
-        aria-pressed={isEditMode}
+        onClick={toggle}
+        loading={isPending}
+        onFocus={preloadBoardAddMenu}
+        onPointerEnter={preloadBoardAddMenu}
       >
         {isEditMode ? <IconPencilOff stroke={1.5} /> : <IconPencil stroke={1.5} />}
       </HeaderButton>
-    </OnboardingTour.Target>
+    </TourTarget>
   );
 };
 
 const SelectBoardsMenu = () => {
-  const { data: boards = [] } = clientApi.board.getAllBoards.useQuery();
-  const t = useI18n();
+  const [isOpen, setIsOpen] = useState(false);
+  const utils = clientApi.useUtils();
+  const { data: boards = [], isPending } = clientApi.board.getAllBoards.useQuery(undefined, { enabled: isOpen });
+  const preloadBoards = () => void utils.board.getAllBoards.prefetch();
 
   return (
-    <OnboardingTour.Target id="board-switcher">
-      <Box>
-        <Menu position="bottom-end">
+    <TourTarget id="board-switcher">
+      <Box onFocus={preloadBoards} onPointerEnter={preloadBoards}>
+        <Menu position="bottom-end" opened={isOpen} onChange={setIsOpen}>
           <Menu.Target>
-            <HeaderButton w="auto" px={4} aria-label={t("board.action.switch")}>
+            <HeaderButton w="auto" px={4}>
               <IconReplace stroke={1.5} />
             </HeaderButton>
           </Menu.Target>
           <Menu.Dropdown style={{ transform: "translate(-7px, 0)" }}>
             <ScrollArea.Autosize mah={300}>
+              {isPending && (
+                <Center p="xs">
+                  <Loader size="xs" />
+                </Center>
+              )}
               {boards.map((board) => (
                 <Menu.Item
                   key={board.id}
@@ -202,7 +149,7 @@ const SelectBoardsMenu = () => {
           </Menu.Dropdown>
         </Menu>
       </Box>
-    </OnboardingTour.Target>
+    </TourTarget>
   );
 };
 
@@ -215,15 +162,13 @@ const usePreventLeaveWithDirty = (isDirty: boolean) => {
   useEffect(() => {
     if (!isDirty) return;
 
-    const handleClick = (event: Event) => {
-      const target = (event.target as HTMLElement).closest("a");
-
-      if (!target) {
-        console.warn("No anchor element found for click event", event);
-        return;
-      }
+    const handleClick = (event: MouseEvent) => {
+      if (event.button !== 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return;
+      const target = event.target instanceof Element ? event.target.closest<HTMLAnchorElement>(anchorSelector) : null;
+      if (!target) return;
 
       event.preventDefault();
+      event.stopPropagation();
 
       openConfirmModal({
         title: t("board.action.edit.confirmLeave.title"),
@@ -249,17 +194,12 @@ const usePreventLeaveWithDirty = (isDirty: boolean) => {
       event.returnValue = true;
     };
 
-    const anchors = document.querySelectorAll(anchorSelector);
-    anchors.forEach((link) => {
-      link.addEventListener("click", handleClick);
-    });
+    document.addEventListener("click", handleClick, true);
     window.addEventListener("popstate", handlePopState);
     window.addEventListener("beforeunload", handleBeforeUnload);
 
     return () => {
-      anchors.forEach((link) => {
-        link.removeEventListener("click", handleClick);
-      });
+      document.removeEventListener("click", handleClick, true);
       window.removeEventListener("popstate", handlePopState);
       window.removeEventListener("beforeunload", handleBeforeUnload);
     };

apps/nextjs/src/app/[locale]/boards/(content)/_integration-provider.spec.ts

@@ -1,54 +0,0 @@
-import { createElement, act } from "react";
-import { createRoot } from "react-dom/client";
-import type { Root } from "react-dom/client";
-import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
-
-import { BoardIntegrationProvider } from "./_integration-provider";
-
-const mocks = vi.hoisted(() => ({
-  providedIntegrations: undefined as unknown,
-}));
-
-vi.mock("@homarr/auth/client", async () => {
-  const React = await import("react");
-
-  return {
-    IntegrationProvider: ({ children, integrations }: { children: React.ReactNode; integrations: unknown }) => {
-      mocks.providedIntegrations = integrations;
-      return React.createElement(React.Fragment, null, children);
-    },
-  };
-});
-
-describe("board integration provider", () => {
-  let container: HTMLDivElement;
-  let root: Root;
-
-  beforeEach(() => {
-    container = document.createElement("div");
-    document.body.append(container);
-    root = createRoot(container);
-    mocks.providedIntegrations = undefined;
-  });
-
-  afterEach(() => {
-    act(() => root.unmount());
-    container.remove();
-  });
-
-  test("provides the permission-filtered server result without a second client query", () => {
-    const initialIntegrations = [{ id: "initial" }];
-
-    act(() => {
-      root.render(
-        createElement(
-          BoardIntegrationProvider,
-          { initialIntegrations: initialIntegrations as never },
-          createElement("span", null, "board"),
-        ),
-      );
-    });
-
-    expect(mocks.providedIntegrations).toBe(initialIntegrations);
-  });
-});

apps/nextjs/src/app/[locale]/boards/(content)/_integration-provider.tsx

@@ -1,14 +0,0 @@
-"use client";
-
-import type { PropsWithChildren } from "react";
-
-import type { RouterOutputs } from "@homarr/api";
-import { IntegrationProvider } from "@homarr/auth/client";
-
-interface Props {
-  initialIntegrations: RouterOutputs["integration"]["all"];
-}
-
-export const BoardIntegrationProvider = ({ initialIntegrations, children }: PropsWithChildren<Props>) => {
-  return <IntegrationProvider integrations={initialIntegrations}>{children}</IntegrationProvider>;
-};

apps/nextjs/src/app/[locale]/boards/[name]/layout.tsx

@@ -1,4 +1,4 @@
-import { api } from "@homarr/api/server";
+import { getBoardByNameAsync } from "@homarr/api/board-server";
 
 import { BoardOtherHeaderActions } from "../_header-actions";
 import { createBoardLayout } from "../_layout-creator";
@@ -6,6 +6,6 @@ import { createBoardLayout } from "../_layout-creator";
 export default createBoardLayout<{ locale: string; name: string }>({
   headerActions: <BoardOtherHeaderActions />,
   async getInitialBoardAsync({ name }) {
-    return await api.board.getBoardByName({ name });
+    return await getBoardByNameAsync(name);
   },
 });

apps/nextjs/src/app/[locale]/boards/[name]/settings/_layout.module.css

@@ -1,47 +0,0 @@
-.gutterSettings {
-  background: color-mix(in srgb, var(--mantine-color-default) 55%, transparent);
-}
-
-.gutterPreview {
-  display: grid;
-  gap: 6px;
-  width: 100%;
-  min-height: 112px;
-  padding: 8px;
-  overflow: hidden;
-  background: var(--mantine-color-body);
-  border: 1px solid var(--mantine-color-default-border);
-  border-radius: var(--mantine-radius-md);
-  transition: grid-template-columns 180ms ease-out;
-}
-
-.previewCanvas {
-  display: grid;
-  grid-template-columns: repeat(2, minmax(0, 1fr));
-  gap: 6px;
-  min-width: 0;
-}
-
-.previewCanvas > div,
-.previewGutter {
-  background: var(--mantine-color-default);
-  border-radius: var(--mantine-radius-sm);
-}
-
-.previewCanvas > div:nth-child(1) {
-  grid-row: span 2;
-}
-
-.previewCanvas > div:nth-child(4) {
-  grid-column: span 2;
-}
-
-.previewGutter {
-  min-width: 12px;
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .gutterPreview {
-    transition: none;
-  }
-}

apps/nextjs/src/app/[locale]/boards/[name]/settings/_layout.tsx

@@ -1,20 +1,6 @@
 "use client";
 
-import {
-  Box,
-  Button,
-  Fieldset,
-  Grid,
-  Group,
-  Input,
-  NumberInput,
-  Paper,
-  Slider,
-  Stack,
-  Switch,
-  Text,
-  TextInput,
-} from "@mantine/core";
+import { Button, Fieldset, Grid, Group, Input, NumberInput, Slider, Stack, Text, TextInput } from "@mantine/core";
 
 import { clientApi } from "@homarr/api/client";
 import { createId } from "@homarr/common";
@@ -23,9 +9,6 @@ import { useI18n } from "@homarr/translation/client";
 import { boardSaveLayoutsSchema } from "@homarr/validation/board";
 
 import type { Board } from "../../_types";
-import classes from "./_layout.module.css";
-
-const layoutSettingsSchema = boardSaveLayoutsSchema.omit({ id: true });
 
 interface Props {
   board: Board;
@@ -39,7 +22,7 @@ export const LayoutSettingsContent = ({ board }: Props) => {
       void utils.board.getHomeBoard.invalidate();
     },
   });
-  const form = useZodForm(layoutSettingsSchema, {
+  const form = useZodForm(boardSaveLayoutsSchema.omit({ id: true }).required(), {
     initialValues: {
       layouts: board.layouts,
     },
@@ -50,7 +33,7 @@ export const LayoutSettingsContent = ({ board }: Props) => {
       onSubmit={form.onSubmit((values) => {
         saveLayouts({
           id: board.id,
-          layouts: values.layouts,
+          ...values,
         });
       })}
     >
@@ -68,8 +51,6 @@ export const LayoutSettingsContent = ({ board }: Props) => {
                       id: createId(),
                       name: "",
                       columnCount: 10,
-                      leftGutterColumnCount: 0,
-                      rightGutterColumnCount: 0,
                       breakpoint: 0,
                     },
                   ],
@@ -89,21 +70,7 @@ export const LayoutSettingsContent = ({ board }: Props) => {
 
                 <Grid.Col span={{ sm: 12, md: 6 }}>
                   <Input.Wrapper label={t("layout.field.columnCount.label")}>
-                    <Slider
-                      mt="xs"
-                      min={1}
-                      max={24}
-                      step={1}
-                      value={layout.columnCount}
-                      thumbLabel={t("layout.field.columnCount.label")}
-                      onChange={(columnCount) => {
-                        const left = Math.min(layout.leftGutterColumnCount, Math.max(0, columnCount - 1));
-                        const right = Math.min(layout.rightGutterColumnCount, Math.max(0, columnCount - left - 1));
-                        form.setFieldValue(`layouts.${index}.columnCount`, columnCount);
-                        form.setFieldValue(`layouts.${index}.leftGutterColumnCount`, left);
-                        form.setFieldValue(`layouts.${index}.rightGutterColumnCount`, right);
-                      }}
-                    />
+                    <Slider mt="xs" min={1} max={24} step={1} {...form.getInputProps(`layouts.${index}.columnCount`)} />
                   </Input.Wrapper>
                 </Grid.Col>
 
@@ -114,15 +81,6 @@ export const LayoutSettingsContent = ({ board }: Props) => {
                     description={t("layout.field.breakpoint.description")}
                   />
                 </Grid.Col>
-                <Grid.Col span={12}>
-                  <GutterSettings
-                    left={layout.leftGutterColumnCount}
-                    right={layout.rightGutterColumnCount}
-                    columnCount={layout.columnCount}
-                    onLeftChange={(value) => form.setFieldValue(`layouts.${index}.leftGutterColumnCount`, value)}
-                    onRightChange={(value) => form.setFieldValue(`layouts.${index}.rightGutterColumnCount`, value)}
-                  />
-                </Grid.Col>
               </Grid>
               {form.values.layouts.length >= 2 && (
                 <Group justify="end">
@@ -155,123 +113,3 @@ export const LayoutSettingsContent = ({ board }: Props) => {
     </form>
   );
 };
-
-interface GutterSettingsProps {
-  left: number;
-  right: number;
-  columnCount: number;
-  onLeftChange: (value: number) => void;
-  onRightChange: (value: number) => void;
-}
-
-const gutterMarks = [
-  { value: 1, label: "1" },
-  { value: 2, label: "2" },
-  { value: 3, label: "3" },
-];
-
-const GutterSettings = ({ left, right, columnCount, onLeftChange, onRightChange }: GutterSettingsProps) => {
-  const t = useI18n();
-  const maxGutterWidth = Math.min(3, Math.max(1, columnCount - 1));
-
-  return (
-    <Paper className={classes.gutterSettings} p="md">
-      <Stack gap="md">
-        <Box>
-          <Text fw={600}>{t("layout.field.gutters.label")}</Text>
-          <Text size="sm" c="dimmed">
-            {t("layout.field.gutters.description")}
-          </Text>
-        </Box>
-
-        <GutterPreview left={left} right={right} columnCount={columnCount} />
-
-        <Grid>
-          <Grid.Col span={{ base: 12, md: 6 }}>
-            <GutterControl
-              side="left"
-              value={left}
-              max={Math.min(maxGutterWidth, columnCount - right - 1)}
-              onChange={onLeftChange}
-            />
-          </Grid.Col>
-          <Grid.Col span={{ base: 12, md: 6 }}>
-            <GutterControl
-              side="right"
-              value={right}
-              max={Math.min(maxGutterWidth, columnCount - left - 1)}
-              onChange={onRightChange}
-            />
-          </Grid.Col>
-        </Grid>
-      </Stack>
-    </Paper>
-  );
-};
-
-const GutterControl = ({
-  side,
-  value,
-  max,
-  onChange,
-}: {
-  side: "left" | "right";
-  value: number;
-  max: number;
-  onChange: (value: number) => void;
-}) => {
-  const t = useI18n();
-  const enabled = value > 0;
-
-  return (
-    <Stack gap="sm">
-      <Switch
-        checked={enabled}
-        disabled={max < 1}
-        onChange={(event) => onChange(event.currentTarget.checked ? Math.min(2, max) : 0)}
-        label={t(`layout.field.gutters.${side}.label`)}
-        description={t(`layout.field.gutters.${side}.description`)}
-      />
-      {enabled && (
-        <Input.Wrapper label={t("layout.field.gutters.width.label")}>
-          <Slider
-            mt="xs"
-            min={1}
-            max={max}
-            value={Math.min(value, max)}
-            marks={gutterMarks.filter((mark) => mark.value <= max)}
-            restrictToMarks
-            thumbLabel={t(`layout.field.gutters.${side}.thumbLabel`)}
-            onChange={(nextValue) => onChange(Math.min(nextValue, max))}
-          />
-        </Input.Wrapper>
-      )}
-    </Stack>
-  );
-};
-
-const GutterPreview = ({ left, right, columnCount }: { left: number; right: number; columnCount: number }) => {
-  const t = useI18n();
-  const safeColumnCount = Math.max(1, columnCount);
-  const main = Math.max(1, safeColumnCount - left - right);
-  const tracks = [left > 0 ? `${left}fr` : null, `${main}fr`, right > 0 ? `${right}fr` : null]
-    .filter((track) => track !== null)
-    .join(" ");
-
-  return (
-    <Box
-      className={classes.gutterPreview}
-      aria-label={t("layout.field.gutters.preview.label")}
-      style={{ gridTemplateColumns: tracks }}
-    >
-      {left > 0 && <Box className={classes.previewGutter} data-side="left" />}
-      <Box className={classes.previewCanvas}>
-        <Box />
-        <Box />
-        <Box />
-        <Box />
-      </Box>
-      {right > 0 && <Box className={classes.previewGutter} data-side="right" />}
-    </Box>
-  );
-};

apps/nextjs/src/app/[locale]/boards/_layout-creator.tsx

@@ -1,19 +1,19 @@
 import type { JSX, PropsWithChildren } from "react";
-import { cookies, headers } from "next/headers";
 import { notFound, redirect } from "next/navigation";
 import { AppShellMain } from "@mantine/core";
 import { TRPCError } from "@trpc/server";
 
+import { getRscUserSettingsAsync } from "@homarr/api/user-server";
 import { auth } from "@homarr/auth/next";
 import { BoardProvider } from "@homarr/boards/context";
 import { EditModeProvider } from "@homarr/boards/edit-mode";
-import { boardViewportWidthCookieName, getLayoutIdForViewportWidth } from "@homarr/boards/layout-selection";
 import { createLogger } from "@homarr/core/infrastructure/logs";
 
 import { MainHeader } from "~/components/layout/header";
 import { BoardLogoWithTitle } from "~/components/layout/logo/board-logo";
 import { ClientShell } from "~/components/layout/shell";
-import { BoardTourProvider } from "~/components/onboarding/board-tour";
+import { BoardTourGate } from "~/components/onboarding/board-tour-gate";
+import { env } from "~/env";
 import { getCurrentColorSchemeAsync } from "~/theme/color-scheme";
 import type { Board } from "./_types";
 import type { Params } from "./(content)/_creator";
@@ -23,11 +23,6 @@ import { BoardMantineProvider } from "./(content)/_theme";
 
 const logger = createLogger({ module: "createBoardLayout" });
 
-const BoardTourWrapper = ({ hasSession, children }: PropsWithChildren<{ hasSession: boolean }>) => {
-  if (!hasSession) return <>{children}</>;
-  return <BoardTourProvider>{children}</BoardTourProvider>;
-};
-
 interface CreateBoardLayoutProps<TParams extends Params> {
   headerActions: JSX.Element;
   getInitialBoardAsync: (params: TParams) => Promise<Board>;
@@ -45,8 +40,32 @@ export const createBoardLayout = <TParams extends Params>({
   }: PropsWithChildren<{
     params: Promise<TParams>;
   }>) => {
-    const session = await auth();
-    const initialBoard = await getInitialBoard(await params).catch((error) => {
+    const resolvedParams = await params;
+    const sessionPromise = auth();
+    const initialBoardPromise = getInitialBoard(resolvedParams).then(
+      (board) => ({ status: "fulfilled", board }) as const,
+      (error: unknown) => ({ status: "rejected", error }) as const,
+    );
+    const colorSchemePromise = getCurrentColorSchemeAsync();
+    const shouldRunBoardTourPromise = sessionPromise.then(async (session) => {
+      if (!withTour || !session || env.DEMO_MODE) return false;
+
+      try {
+        const user = await getRscUserSettingsAsync(session.user.id);
+        return user !== undefined && !user.completedBoardTour;
+      } catch (error) {
+        logger.error(new Error("Failed to load the board tour status", { cause: error }));
+        return false;
+      }
+    });
+    const [session, initialBoardResult, colorScheme, shouldRunBoardTour] = await Promise.all([
+      sessionPromise,
+      initialBoardPromise,
+      colorSchemePromise,
+      shouldRunBoardTourPromise,
+    ]);
+    if (initialBoardResult.status === "rejected") {
+      const { error } = initialBoardResult;
       if (error instanceof TRPCError && error.code === "NOT_FOUND") {
         if (!session) {
           logger.debug("No home board found for anonymous user, redirecting to login");
@@ -62,22 +81,16 @@ export const createBoardLayout = <TParams extends Params>({
       }
 
       throw error;
-    });
-    const colorScheme = await getCurrentColorSchemeAsync();
-    const initialViewportWidth = await getInitialViewportWidthAsync();
-    const initialLayoutId = getLayoutIdForViewportWidth(initialBoard.layouts, initialViewportWidth);
+    }
+    const initialBoard = initialBoardResult.board;
 
     return (
-      <BoardProvider
-        initialBoard={initialBoard}
-        initialLayoutId={initialLayoutId}
-        initialViewportWidth={initialViewportWidth}
-      >
+      <BoardProvider initialBoard={initialBoard}>
         <BoardReadyProvider>
           <EditModeProvider>
             <BoardMantineProvider defaultColorScheme={colorScheme}>
               <CustomCss />
-              <BoardTourWrapper hasSession={withTour && !!session}>
+              <BoardTourGate enabled={shouldRunBoardTour}>
                 <ClientShell hasNavigation={false}>
                   <MainHeader
                     logo={<BoardLogoWithTitle size="md" hideTitleOnMobile />}
@@ -86,7 +99,7 @@ export const createBoardLayout = <TParams extends Params>({
                   />
                   <AppShellMain>{children}</AppShellMain>
                 </ClientShell>
-              </BoardTourWrapper>
+              </BoardTourGate>
             </BoardMantineProvider>
           </EditModeProvider>
         </BoardReadyProvider>
@@ -96,22 +109,3 @@ export const createBoardLayout = <TParams extends Params>({
 
   return Layout;
 };
-
-const getInitialViewportWidthAsync = async () => {
-  const cookieValue = (await cookies()).get(boardViewportWidthCookieName)?.value;
-  const cookieWidth = Number(cookieValue);
-  if (Number.isInteger(cookieWidth) && cookieWidth >= 200 && cookieWidth <= 10_000) {
-    return cookieWidth;
-  }
-
-  const requestHeaders = await headers();
-  const clientHintWidth = Number(requestHeaders.get("sec-ch-viewport-width"));
-  if (Number.isInteger(clientHintWidth) && clientHintWidth >= 200 && clientHintWidth <= 10_000) {
-    return clientHintWidth;
-  }
-
-  const userAgent = requestHeaders.get("user-agent") ?? "";
-  if (/iPad|Tablet|PlayBook|Silk/i.test(userAgent)) return 1024;
-  if (/Mobi|Android|iPhone|iPod|IEMobile|Opera Mini/i.test(userAgent)) return 390;
-  return 1440;
-};

apps/nextjs/src/app/[locale]/init/page.tsx

@@ -1,8 +1,8 @@
 import type { JSX } from "react";
 import { Box, Center, Stack, Text, Title } from "@mantine/core";
 
-import { api } from "@homarr/api/server";
 import type { MaybePromise } from "@homarr/common/types";
+import { db } from "@homarr/db";
 import type { OnboardingStep } from "@homarr/definitions";
 import { getScopedI18n } from "@homarr/translation/server";
 
@@ -29,9 +29,16 @@ const stepComponents: Record<OnboardingStep, null | (() => MaybePromise<JSX.Elem
   finish: InitFinish,
 };
 
+const getCurrentOnboardingStepAsync = async () => {
+  const value = await db.query.onboarding.findFirst();
+  if (!value) return { current: "start" as const, previous: null };
+
+  return { current: value.step, previous: value.previousStep };
+};
+
 export default async function InitPage() {
   const t = await getScopedI18n("init.step");
-  const currentStep = await api.onboard.currentStep();
+  const currentStep = await getCurrentOnboardingStepAsync();
 
   const CurrentComponent = stepComponents[currentStep.current];
 

apps/nextjs/src/app/[locale]/layout.tsx

@@ -13,11 +13,11 @@ import { notFound } from "next/navigation";
 import type { DayOfWeek } from "@mantine/dates";
 import { NextIntlClientProvider } from "next-intl";
 
-import { api } from "@homarr/api/server";
+import { getRscServerSettingsAsync } from "@homarr/api/server-settings-server";
+import { getRscUserSettingsAsync } from "@homarr/api/user-server";
 import { env } from "@homarr/auth/env";
 import { auth } from "@homarr/auth/next";
-import { db } from "@homarr/db";
-import { getServerSettingsAsync } from "@homarr/db/queries";
+import { createLogger } from "@homarr/core/infrastructure/logs";
 import { ModalProvider } from "@homarr/modals";
 import { Notifications } from "@homarr/notifications";
 import { SettingsProvider } from "@homarr/settings";
@@ -30,7 +30,6 @@ import { CrowdinLiveTranslation } from "~/components/layout/crowdin-live-transla
 
 import { SearchEngineOptimization } from "~/components/layout/search-engine-optimization";
 import { ServiceWorkerRegistration } from "~/components/layout/service-worker-registration";
-import { ViewportHint } from "~/components/layout/viewport-hint";
 import { getCurrentColorSchemeAsync } from "~/theme/color-scheme";
 import { DayJsLoader } from "./_client-providers/dayjs-loader";
 import { JotaiProvider } from "./_client-providers/jotai";
@@ -44,6 +43,8 @@ const fontSans = Inter({
   variable: "--font-sans",
 });
 
+const logger = createLogger({ module: "rootLayout" });
+
 // eslint-disable-next-line no-restricted-syntax
 export const generateMetadata = async (): Promise<Metadata> => ({
   title: "Homarr",
@@ -79,15 +80,27 @@ export default async function Layout(props: {
   children: React.ReactNode;
   params: Promise<{ locale: SupportedLanguage }>;
 }) {
-  if (!isLocaleSupported((await props.params).locale)) {
+  const { locale } = await props.params;
+  if (!isLocaleSupported(locale)) {
     notFound();
   }
 
-  const session = await auth();
-  const user = session ? await api.user.getById({ userId: session.user.id }).catch(() => null) : null;
-  const serverSettings = await getServerSettingsAsync(db);
-  const colorScheme = await getCurrentColorSchemeAsync();
-  const direction = isLocaleRTL((await props.params).locale) ? "rtl" : "ltr";
+  const sessionPromise = auth();
+  const userPromise = sessionPromise.then((session) =>
+    session
+      ? getRscUserSettingsAsync(session.user.id).catch((error: unknown) => {
+          logger.error(new Error("Failed to load the authenticated user in the root layout", { cause: error }));
+          return null;
+        })
+      : null,
+  );
+  const [session, user, serverSettings, colorScheme] = await Promise.all([
+    sessionPromise,
+    userPromise,
+    getRscServerSettingsAsync(),
+    getCurrentColorSchemeAsync(),
+  ]);
+  const direction = isLocaleRTL(locale) ? "rtl" : "ltr";
 
   const StackedProvider = composeWrappers([
     (innerProps) => {
@@ -126,8 +139,6 @@ export default async function Layout(props: {
     (innerProps) => <SpotlightProvider {...innerProps} />,
   ]);
 
-  const { locale } = await props.params;
-
   return (
     // Instead of ColorSchemScript we use data-mantine-color-scheme to prevent flickering
     <html
@@ -145,7 +156,6 @@ export default async function Layout(props: {
       </head>
       <body className={[fontSans.className, fontSans.variable].join(" ")} suppressHydrationWarning>
         <Analytics enabled={serverSettings.analytics.enableGeneral} />
-        <ViewportHint />
         <StackedProvider>
           <Notifications pauseResetOnHover="notification" />
           <ServiceWorkerRegistration />

apps/nextjs/src/app/[locale]/manage/layout.tsx

@@ -27,8 +27,10 @@ import {
   IconUsersGroup,
 } from "@tabler/icons-react";
 
+import { getRscUserSettingsAsync } from "@homarr/api/user-server";
 import { auth } from "@homarr/auth/next";
 import { isProviderEnabled } from "@homarr/auth/server";
+import { createLogger } from "@homarr/core/infrastructure/logs";
 import { createDocumentationLink } from "@homarr/definitions";
 import { dbEnv } from "@homarr/core/infrastructure/db/env";
 import { env } from "@homarr/docker/env";
@@ -39,11 +41,29 @@ import { homarrLogoPath } from "~/components/layout/logo/homarr-logo";
 import type { NavigationLink } from "~/components/layout/navigation";
 import { MainNavigation } from "~/components/layout/navigation";
 import { ClientShell } from "~/components/layout/shell";
-import { ManageTourProvider } from "~/components/onboarding/manage-tour";
+import { ManageTourGate } from "~/components/onboarding/manage-tour-gate";
+import { env as nextEnv } from "~/env";
+
+const logger = createLogger({ module: "manageLayout" });
 
 export default async function ManageLayout({ children }: PropsWithChildren) {
-  const t = await getScopedI18n("management.navbar");
-  const session = await auth();
+  const sessionPromise = auth();
+  const shouldRunManageTourPromise = sessionPromise.then(async (session) => {
+    if (!session || nextEnv.DEMO_MODE) return false;
+
+    try {
+      const user = await getRscUserSettingsAsync(session.user.id);
+      return user !== undefined && !user.completedManageTour;
+    } catch (error) {
+      logger.error(new Error("Failed to load the management tour status", { cause: error }));
+      return false;
+    }
+  });
+  const [t, session, shouldRunManageTour] = await Promise.all([
+    getScopedI18n("management.navbar"),
+    sessionPromise,
+    shouldRunManageTourPromise,
+  ]);
   const navigationLinks: NavigationLink[] = [
     {
       label: t("items.home"),
@@ -225,7 +245,9 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
     </ClientShell>
   );
 
-  if (!session) return shell;
-
-  return <ManageTourProvider isAdmin={isAdmin}>{shell}</ManageTourProvider>;
+  return (
+    <ManageTourGate enabled={shouldRunManageTour} isAdmin={isAdmin}>
+      {shell}
+    </ManageTourGate>
+  );
 }

apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_reset-tours.tsx

@@ -1,5 +1,6 @@
 "use client";
 
+import { useRouter } from "next/navigation";
 import { Badge, Button, Group, Stack, Text } from "@mantine/core";
 import { IconRefresh } from "@tabler/icons-react";
 
@@ -9,6 +10,7 @@ import { useScopedI18n } from "@homarr/translation/client";
 
 export const ResetTours = () => {
   const t = useScopedI18n("management.page.user.setting.general.item.onboardingTours");
+  const router = useRouter();
   const utils = clientApi.useUtils();
   const { data: tourStatus } = clientApi.user.getTourStatus.useQuery();
   const { mutate: resetTours, isPending } = clientApi.user.resetTours.useMutation({
@@ -18,6 +20,7 @@ export const ResetTours = () => {
         message: t("resetSuccess.message"),
       });
       void utils.user.getTourStatus.invalidate();
+      router.refresh();
     },
   });
 

apps/nextjs/src/app/[locale]/widgets/[kind]/_content.tsx

@@ -1,41 +1,38 @@
 "use client";
 
-import { useCallback, useMemo, useState } from "react";
+import { use, useCallback, 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";
 import { ErrorBoundary } from "react-error-boundary";
 
-import type { IntegrationKind, WidgetKind } from "@homarr/definitions";
+import { clientApi } from "@homarr/api/client";
+import type { WidgetKind } from "@homarr/definitions";
 import { useModalAction } from "@homarr/modals";
-import { showSuccessNotification } from "@homarr/notifications";
+import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useSettings } from "@homarr/settings";
 import { useI18n } from "@homarr/translation/client";
 import type { BoardItemAdvancedOptions } from "@homarr/validation/shared";
-import { loadWidgetDynamic, reduceWidgetOptionsWithDefaultValues, widgetImports } from "@homarr/widgets";
 import { WidgetError } from "@homarr/widgets/errors";
-import { WidgetEditModal } from "@homarr/widgets/modals";
+import { loadWidgetResources, reduceWidgetOptionsWithDefinition } from "@homarr/widgets/manifest";
 
+import { LazyWidgetEditModal, preloadWidgetEditModal } from "~/components/board/items/lazy-widget-edit-modal";
 import type { Dimensions } from "./_dimension-modal";
 import { PreviewDimensionsModal } from "./_dimension-modal";
 
 interface WidgetPreviewPageContentProps {
   kind: WidgetKind;
-  integrationData: {
-    id: string;
-    name: string;
-    url: string;
-    kind: IntegrationKind;
-  }[];
 }
 
-export const WidgetPreviewPageContent = ({ kind, integrationData }: WidgetPreviewPageContentProps) => {
+export const WidgetPreviewPageContent = ({ kind }: WidgetPreviewPageContentProps) => {
   const settings = useSettings();
   const t = useI18n();
-  const { openModal: openWidgetEditModal } = useModalAction(WidgetEditModal);
+  const utils = clientApi.useUtils();
+  const { openModal: openWidgetEditModal } = useModalAction(LazyWidgetEditModal);
   const { openModal: openPreviewDimensionsModal } = useModalAction(PreviewDimensionsModal);
-  const currentDefinition = useMemo(() => widgetImports[kind].definition, [kind]);
+  const { definition: currentDefinition, Component } = use(loadWidgetResources(kind));
   const [editMode, setEditMode] = useState(false);
+  const [isEditorLoading, setIsEditorLoading] = useState(false);
   const [dimensions, setDimensions] = useState<Dimensions>({
     width: 128,
     height: 128,
@@ -45,7 +42,7 @@ export const WidgetPreviewPageContent = ({ kind, integrationData }: WidgetPrevie
     integrationIds: string[];
     advancedOptions: BoardItemAdvancedOptions;
   }>({
-    options: reduceWidgetOptionsWithDefaultValues(kind, settings, {}),
+    options: reduceWidgetOptionsWithDefinition(currentDefinition, settings, {}),
     integrationIds: [],
     advancedOptions: {
       title: null,
@@ -54,31 +51,41 @@ export const WidgetPreviewPageContent = ({ kind, integrationData }: WidgetPrevie
     },
   });
 
-  const handleOpenEditWidgetModal = useCallback(() => {
-    openWidgetEditModal(
-      {
-        kind,
-        value: state,
-        onSuccessfulEdit: (value) => {
-          setState(value);
+  const handleOpenEditWidgetModal = useCallback(async () => {
+    const hasIntegrationSupport = "supportedIntegrations" in currentDefinition;
+    setIsEditorLoading(true);
+    preloadWidgetEditModal();
+    try {
+      const integrationData = hasIntegrationSupport ? await utils.integration.all.ensureData() : [];
+      openWidgetEditModal(
+        {
+          kind,
+          definition: currentDefinition,
+          value: state,
+          onSuccessfulEdit: (value) => {
+            setState(value);
+          },
+          integrationData: integrationData.filter((integration) =>
+            (currentDefinition.supportedIntegrations ?? []).includes(integration.kind),
+          ),
+          integrationSupport: hasIntegrationSupport,
+          settings,
         },
-        integrationData: integrationData.filter(
-          (integration) =>
-            "supportedIntegrations" in currentDefinition &&
-            (currentDefinition.supportedIntegrations as string[]).some((kind) => kind === integration.kind),
-        ),
-        integrationSupport: "supportedIntegrations" in currentDefinition,
-        settings,
-      },
-      {
-        title(t) {
-          return `${t("item.edit.title")} - ${t(`widget.${kind}.name`)}`;
+        {
+          title(translate) {
+            return `${translate("item.edit.title")} - ${translate(`widget.${kind}.name`)}`;
+          },
         },
-      },
-    );
-  }, [currentDefinition, integrationData, kind, openWidgetEditModal, settings, state]);
-
-  const Comp = loadWidgetDynamic(kind);
+      );
+    } catch (error) {
+      showErrorNotification({
+        title: t("common.error"),
+        message: error instanceof Error ? error.message : String(error),
+      });
+    } finally {
+      setIsEditorLoading(false);
+    }
+  }, [currentDefinition, kind, openWidgetEditModal, settings, state, t, utils]);
 
   const toggleEditMode = useCallback(() => {
     setEditMode((editMode) => !editMode);
@@ -94,8 +101,11 @@ export const WidgetPreviewPageContent = ({ kind, integrationData }: WidgetPrevie
     });
   }, [dimensions, openPreviewDimensionsModal]);
 
-  const updateOptions = ({ newOptions }: { newOptions: Record<string, unknown> }) =>
-    setState({ ...state, options: { ...state.options, newOptions } });
+  const updateOptions = useCallback(
+    ({ newOptions }: { newOptions: Record<string, unknown> }) =>
+      setState((current) => ({ ...current, options: { ...current.options, ...newOptions } })),
+    [],
+  );
 
   return (
     <>
@@ -105,10 +115,10 @@ export const WidgetPreviewPageContent = ({ kind, integrationData }: WidgetPrevie
             <ErrorBoundary
               onReset={reset}
               fallbackRender={({ resetErrorBoundary, error }) => (
-                <WidgetError kind={kind} error={error} resetErrorBoundary={resetErrorBoundary} />
+                <WidgetError definition={currentDefinition} error={error} resetErrorBoundary={resetErrorBoundary} />
               )}
             >
-              <Comp
+              <Component
                 options={state.options as never}
                 integrationIds={state.integrationIds}
                 width={dimensions.width}
@@ -127,7 +137,10 @@ export const WidgetPreviewPageContent = ({ kind, integrationData }: WidgetPrevie
           size={48}
           variant="default"
           radius="xl"
-          onClick={handleOpenEditWidgetModal}
+          onClick={() => void handleOpenEditWidgetModal()}
+          onFocus={preloadWidgetEditModal}
+          onPointerEnter={preloadWidgetEditModal}
+          loading={isEditorLoading}
           aria-label={t("common.action.edit")}
         >
           <IconPencil size={24} />

apps/nextjs/src/app/[locale]/widgets/[kind]/layout.tsx

@@ -1,23 +1,18 @@
 import type { PropsWithChildren } from "react";
 
-import { widgetImports } from "@homarr/widgets";
+import { widgetKinds } from "@homarr/definitions";
+import { widgetCatalogIcons } from "@homarr/widgets/catalog";
 
 import { MainNavigation } from "~/components/layout/navigation";
 import { ClientShell } from "~/components/layout/shell";
 
-const getLinks = () => {
-  return Object.entries(widgetImports).map(([key, value]) => {
-    return {
-      href: `/widgets/${key}`,
-      icon: value.definition.icon,
-      label: value.definition.kind,
-    };
-  });
-};
+const links = widgetKinds.map((kind) => ({
+  href: `/widgets/${kind}`,
+  icon: widgetCatalogIcons[kind],
+  label: kind,
+}));
 
 export default function WidgetPreviewLayout({ children }: PropsWithChildren) {
-  const links = getLinks();
-
   return (
     <ClientShell hasHeader={false}>
       <MainNavigation links={links} />

apps/nextjs/src/app/[locale]/widgets/[kind]/page.tsx

@@ -1,10 +1,9 @@
+import { Suspense } from "react";
 import { notFound } from "next/navigation";
-import { Center } from "@mantine/core";
+import { Center, Loader } from "@mantine/core";
 
-import { env } from "@homarr/common/env";
-import { db } from "@homarr/db";
 import type { WidgetKind } from "@homarr/definitions";
-import { widgetImports } from "@homarr/widgets";
+import { widgetKinds } from "@homarr/widgets/manifest";
 
 import { WidgetPreviewPageContent } from "./_content";
 
@@ -13,24 +12,16 @@ interface Props {
 }
 
 export default async function WidgetPreview(props: Props) {
-  if (!((await props.params).kind in widgetImports || env.NODE_ENV !== "development")) {
+  const { kind } = await props.params;
+  if (!widgetKinds.includes(kind as WidgetKind)) {
     notFound();
   }
 
-  const integrationData = await db.query.integrations.findMany({
-    columns: {
-      id: true,
-      name: true,
-      url: true,
-      kind: true,
-    },
-  });
-
-  const sort = (await props.params).kind as WidgetKind;
-
   return (
     <Center h="100vh">
-      <WidgetPreviewPageContent kind={sort} integrationData={integrationData} />
+      <Suspense fallback={<Loader size="sm" />}>
+        <WidgetPreviewPageContent key={kind} kind={kind as WidgetKind} />
+      </Suspense>
     </Center>
   );
 }

apps/nextjs/src/components/board/items/actions/create-item.ts

@@ -1,12 +1,10 @@
 import { getBoardLayouts } from "@homarr/boards/context";
 import { createId } from "@homarr/common";
 import type { Modify } from "@homarr/common/types";
-import { getRootSectionLane } from "@homarr/definitions";
 import type { WidgetKind } from "@homarr/definitions";
 import { widgetDefaultSizes } from "@homarr/definitions";
 
 import type { Board, EmptySection, Item, ItemLayout } from "~/app/[locale]/boards/_types";
-import { getBoardLaneColumnCount } from "~/components/board/layout";
 import { getFirstEmptyPosition } from "./empty-position";
 import { getSectionElements } from "./section-elements";
 
@@ -21,21 +19,17 @@ export const createItemCallback =
   ({ id, kind, options = {}, integrationIds = [] }: CreateItemInput) =>
   (previous: Board): Board => {
     const firstSection = previous.sections
-      .filter(
-        (section): section is EmptySection =>
-          section.kind === "empty" && getRootSectionLane(section.xOffset) === "main",
-      )
+      .filter((section): section is EmptySection => section.kind === "empty")
       .toSorted((sectionA, sectionB) => sectionA.yOffset - sectionB.yOffset)
       .at(0);
 
     if (!firstSection) return previous;
 
-    const itemLayouts = createItemLayouts(previous, firstSection, kind);
     const widget = {
       id: id ?? createId(),
       kind,
       options,
-      layouts: itemLayouts,
+      layouts: createItemLayouts(previous, firstSection, kind),
       integrationIds,
       advancedOptions: {
         title: null,
@@ -66,14 +60,9 @@ const createItemLayouts = (board: Board, currentSection: EmptySection, kind: Wid
   return layouts.map((layoutId) => {
     const boardLayout = board.layouts.find((layout) => layout.id === layoutId);
     const elements = getSectionElements(board, { sectionId: currentSection.id, layoutId });
-    const columnCount = boardLayout ? getBoardLaneColumnCount(boardLayout, "main") : itemSize.width;
-    const size = {
-      width: Math.min(itemSize.width, columnCount),
-      height: itemSize.height,
-    };
 
     const emptyPosition = boardLayout
-      ? getFirstEmptyPosition(elements, columnCount, undefined, size)
+      ? getFirstEmptyPosition(elements, boardLayout.columnCount, 9999, itemSize)
       : { xOffset: 0, yOffset: 0 };
 
     if (!emptyPosition) {
@@ -81,8 +70,8 @@ const createItemLayouts = (board: Board, currentSection: EmptySection, kind: Wid
     }
 
     return {
-      width: size.width,
-      height: size.height,
+      width: itemSize.width,
+      height: itemSize.height,
       ...emptyPosition,
       sectionId: currentSection.id,
       layoutId,

apps/nextjs/src/components/board/items/actions/duplicate-item.ts

@@ -1,8 +1,6 @@
 import { createId } from "@homarr/common";
-import { getRootSectionLane } from "@homarr/definitions";
 
 import type { Board, EmptySection, ItemLayout, Section } from "~/app/[locale]/boards/_types";
-import { getBoardLaneColumnCount } from "~/components/board/layout";
 import { getFirstEmptyPosition } from "./empty-position";
 import { getSectionElements } from "./section-elements";
 
@@ -17,17 +15,16 @@ export const duplicateItemCallback =
     if (!itemToDuplicate) return previous;
 
     const clonedItem = structuredClone(itemToDuplicate);
-    const clonedLayouts = clonedItem.layouts.map((layout) => ({
-      ...layout,
-      ...getNextPosition(previous, layout),
-    }));
 
     return {
       ...previous,
       items: previous.items.concat({
         ...clonedItem,
         id: createId(),
-        layouts: clonedLayouts,
+        layouts: clonedItem.layouts.map((layout) => ({
+          ...layout,
+          ...getNextPosition(previous, layout),
+        })),
       }),
     };
   };
@@ -45,10 +42,8 @@ const getNextPosition = (board: Board, layout: ItemLayout): { xOffset: number; y
   }
 
   const firstSection = board.sections
-    .filter(
-      (section): section is EmptySection => section.kind === "empty" && getRootSectionLane(section.xOffset) === "main",
-    )
-    .toSorted((sectionA, sectionB) => sectionA.yOffset - sectionB.yOffset)
+    .filter((section): section is EmptySection => section.kind === "empty")
+    .sort((sectionA, sectionB) => sectionA.yOffset - sectionB.yOffset)
     .at(0);
 
   if (!firstSection) {
@@ -72,24 +67,18 @@ const getEmptySectionPosition = (
   layout: ItemLayout,
   section: Section,
 ): { xOffset: number; yOffset: number } | undefined => {
-  const boardLayout = board.layouts.find((candidate) => candidate.id === layout.layoutId);
+  const boardLayout = board.layouts.find((boardLayout) => boardLayout.id === layout.layoutId);
   if (!boardLayout) return;
 
-  const sectionElements = getSectionElements(board, { sectionId: section.id, layoutId: layout.layoutId });
+  const sectionElements = getSectionElements(board, { sectionId: layout.sectionId, layoutId: layout.layoutId });
   if (section.kind !== "dynamic") {
-    const columnCount =
-      section.kind === "empty"
-        ? getBoardLaneColumnCount(boardLayout, getRootSectionLane(section.xOffset))
-        : boardLayout.columnCount;
-
-    const size = {
+    return getFirstEmptyPosition(sectionElements, boardLayout.columnCount, undefined, {
       width: layout.width,
       height: layout.height,
-    };
-    return getFirstEmptyPosition(sectionElements, columnCount, undefined, size);
+    });
   }
 
-  const sectionLayout = section.layouts.find((candidate) => candidate.layoutId === layout.layoutId);
+  const sectionLayout = section.layouts.find((sectionLayout) => sectionLayout.layoutId === layout.layoutId);
   if (!sectionLayout) return;
 
   return getFirstEmptyPosition(sectionElements, sectionLayout.width, sectionLayout.height, {

apps/nextjs/src/components/board/items/actions/empty-position.ts

@@ -7,7 +7,7 @@ export const getFirstEmptyPosition = (
   size: { width: number; height: number } = { width: 1, height: 1 },
 ) => {
   for (let yOffset = 0; yOffset < rowCount + 1 - size.height; yOffset++) {
-    for (let xOffset = 0; xOffset < columnCount + 1 - size.width; xOffset++) {
+    for (let xOffset = 0; xOffset < columnCount; xOffset++) {
       const isOccupied = elements.some(
         (element) =>
           element.yOffset < yOffset + size.height &&

apps/nextjs/src/components/board/items/actions/test/create-item.spec.ts

@@ -1,4 +1,4 @@
-import { afterEach, describe, expect, test, vi } from "vitest";
+import { describe, expect, test, vi } from "vitest";
 
 import * as boardContext from "@homarr/boards/context";
 
@@ -10,10 +10,6 @@ import { ItemMockBuilder } from "./mocks/item-mock";
 import { LayoutMockBuilder } from "./mocks/layout-mock";
 
 describe("item actions create-item", () => {
-  afterEach(() => {
-    vi.restoreAllMocks();
-  });
-
   test("should add it to first section", () => {
     // Arrange
     const itemKind = "clock";
@@ -56,7 +52,7 @@ describe("item actions create-item", () => {
         ],
       }),
     );
-    expect(emptyPositionSpy).toHaveBeenCalledWith([], layout.columnCount, undefined, { height: 1, width: 1 });
+    expect(emptyPositionSpy).toHaveBeenCalledWith([], layout.columnCount, 9999, { height: 1, width: 1 });
   });
   test("should correctly pass dynamic section and items to getFirstEmptyPosition", () => {
     // Arrange
@@ -98,10 +94,8 @@ describe("item actions create-item", () => {
 
     // Assert
     expect(result.items.length).toBe(3);
-    const createdItem = result.items.find(
-      (candidate) => candidate.id !== itemInFirstSection.id && candidate.id !== otherItem.id,
-    );
-    expect(createdItem).toEqual(
+    const item = result.items.find((item) => item.id !== itemInFirstSection.id && item.id !== otherItem.id);
+    expect(item).toEqual(
       expect.objectContaining({
         kind: itemKind,
         layouts: [{ ...emptyPosition, height: 1, width: 1, sectionId: firstSectionId, layoutId }],
@@ -110,35 +104,8 @@ describe("item actions create-item", () => {
     expect(spy).toHaveBeenCalledWith(
       [expect.objectContaining(itemAndSectionPosition), expect.objectContaining(itemAndSectionPosition)],
       layout.columnCount,
-      undefined,
+      9999,
       { height: 1, width: 1 },
     );
   });
-
-  test("clamps wide defaults and places below a full automatic canvas", () => {
-    const board = new BoardMockBuilder().addEmptySection({ id: "canvas", yOffset: 0 }).build();
-    const layout = board.layouts[0];
-    if (!layout) throw new Error("Expected a board layout");
-    layout.id = "layout";
-    layout.columnCount = 1;
-    board.items.push(
-      new ItemMockBuilder({ id: "existing" })
-        .addLayout({ layoutId: layout.id, sectionId: "canvas", width: 1, height: 1 })
-        .build(),
-    );
-
-    const result = createItemCallback({ id: "created", kind: "mediaMissing" })(board);
-    const created = result.items.find((item) => item.id === "created");
-
-    expect(created?.layouts).toEqual([
-      expect.objectContaining({
-        layoutId: layout.id,
-        sectionId: "canvas",
-        width: 1,
-        height: 3,
-        xOffset: 0,
-        yOffset: 1,
-      }),
-    ]);
-  });
 });

apps/nextjs/src/components/board/items/actions/test/duplicate-item.spec.ts

@@ -1,4 +1,4 @@
-import { afterEach, describe, expect, test, vi } from "vitest";
+import { describe, expect, test, vi } from "vitest";
 
 import { duplicateItemCallback } from "../duplicate-item";
 import * as emptyPositionModule from "../empty-position";
@@ -7,10 +7,6 @@ import { ItemMockBuilder } from "./mocks/item-mock";
 import { LayoutMockBuilder } from "./mocks/layout-mock";
 
 describe("item actions duplicate-item", () => {
-  afterEach(() => {
-    vi.restoreAllMocks();
-  });
-
   test("should copy it in the same section", () => {
     // Arrange
     const itemKind = "minecraftServerStatus";
@@ -65,28 +61,4 @@ describe("item actions duplicate-item", () => {
       }),
     );
   });
-
-  test("uses the next automatic canvas row when it is the first available space", () => {
-    const board = new BoardMockBuilder().addEmptySection({ id: "canvas", yOffset: 0 }).build();
-    const layout = board.layouts[0];
-    if (!layout) throw new Error("Expected a board layout");
-    layout.id = "layout";
-    layout.columnCount = 1;
-    const currentItem = new ItemMockBuilder({ id: "source" })
-      .addLayout({ layoutId: layout.id, sectionId: "canvas", width: 1, height: 1 })
-      .build();
-    board.items.push(currentItem);
-
-    const result = duplicateItemCallback({ itemId: currentItem.id })(board);
-    const duplicated = result.items.find((item) => item.id !== currentItem.id);
-
-    expect(duplicated?.layouts[0]).toEqual(
-      expect.objectContaining({
-        layoutId: layout.id,
-        sectionId: "canvas",
-        xOffset: 0,
-        yOffset: 1,
-      }),
-    );
-  });
 });

apps/nextjs/src/components/board/items/actions/test/item-move-targets.spec.ts

@@ -1,123 +0,0 @@
-import { describe, expect, test } from "vitest";
-
-import { getMoveTargets } from "../../item-move-modal";
-import { BoardMockBuilder } from "./mocks/board-mock";
-import { DynamicSectionMockBuilder } from "./mocks/dynamic-section-mock";
-import { EmptySectionMockBuilder } from "./mocks/empty-section-mock";
-import { ItemMockBuilder } from "./mocks/item-mock";
-
-describe("item move targets", () => {
-  test("offers the canvas, enabled gutters, and nested sections", () => {
-    const board = new BoardMockBuilder().build();
-    const layout = board.layouts[0];
-    if (!layout) throw new Error("Expected the board mock to contain a layout");
-    layout.id = "layout";
-    layout.columnCount = 6;
-    layout.leftGutterColumnCount = 1;
-    layout.rightGutterColumnCount = 1;
-
-    board.sections.push(
-      new EmptySectionMockBuilder({ id: "canvas", xOffset: 0 }).build(),
-      new EmptySectionMockBuilder({ id: "left-gutter", xOffset: -1 }).build(),
-      new EmptySectionMockBuilder({ id: "right-gutter", xOffset: 1 }).build(),
-      new DynamicSectionMockBuilder({
-        id: "dynamic",
-        options: {
-          title: "",
-          customCssClasses: [],
-          borderColor: "",
-          showLabel: true,
-          collapsible: false,
-          showOpenAll: false,
-        },
-      })
-        .addLayout({
-          layoutId: layout.id,
-          parentSectionId: "canvas",
-          width: 2,
-          height: 2,
-        })
-        .build(),
-    );
-
-    const targets = getMoveTargets(
-      board,
-      layout.id,
-      {
-        id: "weather",
-        type: "item",
-        xOffset: 0,
-        yOffset: 0,
-        width: 1,
-        height: 1,
-      },
-      {
-        canvas: "Dashboard canvas",
-        dynamicSection: "New section",
-        leftRail: "Left dashboard rail",
-        rightRail: "Right dashboard rail",
-        numbered: (name, index) => `${name}, destination ${index}`,
-        located: (name, location, index) => `${name}, ${location}, destination ${index}`,
-      },
-    );
-
-    expect(targets.map((target) => target.label)).toEqual([
-      "Dashboard canvas, destination 1",
-      "Left dashboard rail, destination 2",
-      "Right dashboard rail, destination 3",
-      "New section, destination 4",
-    ]);
-    expect(new Set(targets.map((target) => target.label))).toHaveLength(targets.length);
-  });
-
-  test("does not offer canvases that are narrower than a nested section's contents", () => {
-    const board = new BoardMockBuilder().build();
-    const layout = board.layouts[0];
-    if (!layout) throw new Error("Expected the board mock to contain a layout");
-    layout.id = "layout";
-    layout.columnCount = 5;
-    layout.leftGutterColumnCount = 2;
-
-    const section = new DynamicSectionMockBuilder({ id: "source" })
-      .addLayout({
-        layoutId: layout.id,
-        parentSectionId: "canvas",
-        width: 4,
-        height: 2,
-      })
-      .build();
-    board.sections.push(
-      new EmptySectionMockBuilder({ id: "canvas" }).build(),
-      new EmptySectionMockBuilder({ id: "left-gutter", xOffset: -1 }).build(),
-      section,
-    );
-    board.items.push(
-      new ItemMockBuilder({ id: "nested" })
-        .addLayout({
-          layoutId: layout.id,
-          sectionId: section.id,
-          xOffset: 2,
-          width: 2,
-        })
-        .build(),
-    );
-
-    const sourceLayout = section.layouts[0];
-    if (!sourceLayout) throw new Error("Expected the source section to contain a layout");
-    const targets = getMoveTargets(
-      board,
-      layout.id,
-      { ...sourceLayout, id: section.id, type: "section" },
-      {
-        canvas: "Canvas",
-        dynamicSection: "Section",
-        leftRail: "Left",
-        rightRail: "Right",
-        numbered: (name, index) => `${name} ${index}`,
-        located: (name, location, index) => `${name} ${location} ${index}`,
-      },
-    );
-
-    expect(targets).toEqual([]);
-  });
-});

apps/nextjs/src/components/board/items/actions/test/mocks/board-mock.ts

@@ -45,8 +45,6 @@ export class BoardMockBuilder {
           id: createId(),
           name: "Base",
           columnCount: 12,
-          leftGutterColumnCount: 0,
-          rightGutterColumnCount: 0,
           breakpoint: 0,
         },
       ],

apps/nextjs/src/components/board/items/actions/test/mocks/category-section-mock.ts

@@ -0,0 +1,23 @@
+import { createId } from "@homarr/common";
+
+import type { CategorySection } from "~/app/[locale]/boards/_types";
+
+export class CategorySectionMockBuilder {
+  private readonly section: CategorySection;
+
+  constructor(section?: Partial<CategorySection>) {
+    this.section = {
+      id: createId(),
+      kind: "category",
+      xOffset: 0,
+      yOffset: 0,
+      name: "Category",
+      collapsed: false,
+      ...section,
+    } satisfies CategorySection;
+  }
+
+  public build(): CategorySection {
+    return this.section;
+  }
+}

apps/nextjs/src/components/board/items/actions/test/mocks/dynamic-section-mock.ts

@@ -1,23 +1,21 @@
 import { createId } from "@homarr/common";
-import { dynamicSectionOptionsSchema } from "@homarr/validation/shared";
 
 import type { DynamicSection } from "~/app/[locale]/boards/_types";
 
-type DynamicSectionMock = Omit<Partial<DynamicSection>, "options"> & {
-  options?: Partial<DynamicSection["options"]>;
-};
-
 export class DynamicSectionMockBuilder {
   private readonly section: DynamicSection;
 
-  constructor(section?: DynamicSectionMock) {
+  constructor(section?: Partial<DynamicSection>) {
     this.section = {
       id: createId(),
       kind: "dynamic",
+      options: {
+        title: "",
+        borderColor: "",
+        customCssClasses: [],
+      },
       layouts: [],
       ...section,
-      collapsed: section?.collapsed ?? false,
-      options: dynamicSectionOptionsSchema.parse(section?.options),
     } satisfies DynamicSection;
   }
 

apps/nextjs/src/components/board/items/actions/test/mocks/layout-mock.ts

@@ -10,8 +10,6 @@ export class LayoutMockBuilder {
       id: createId(),
       name: "Base",
       columnCount: 12,
-      leftGutterColumnCount: 0,
-      rightGutterColumnCount: 0,
       breakpoint: 0,
       ...layout,
     } satisfies Board["layouts"][0];

apps/nextjs/src/components/board/items/item-content.module.css

@@ -10,14 +10,3 @@
   background-color: var(--background-color) !important;
   border-color: var(--border-color) !important;
 }
-
-.editModeInertContent {
-  display: contents;
-  pointer-events: none;
-  user-select: none;
-}
-
-.editModeInertContent * {
-  pointer-events: none !important;
-  user-select: none !important;
-}

apps/nextjs/src/components/board/items/item-content.tsx

@@ -1,29 +1,29 @@
-import type { MutableRefObject } from "react";
-import { useRef } from "react";
-import dynamic from "next/dynamic";
-import { Badge, Card } from "@mantine/core";
+import type { ComponentType, MutableRefObject } from "react";
+import { Suspense, use, useRef } from "react";
+import type { CardProps } from "@mantine/core";
+import { Badge, Card, Center, Loader } from "@mantine/core";
 import { useElementSize } from "@mantine/hooks";
 import { QueryErrorResetBoundary, useQueryClient } from "@tanstack/react-query";
 import combineClasses from "clsx";
 import { NoIntegrationSelectedError } from "@homarr/widgets/errors/classes";
+import type { FallbackProps } from "react-error-boundary";
 import { ErrorBoundary } from "react-error-boundary";
 
 import { useRequiredBoard } from "@homarr/boards/context";
 import { useEditMode } from "@homarr/boards/edit-mode";
 import { useSettings } from "@homarr/settings";
-import { loadWidgetDynamic, reduceWidgetOptionsWithDefaultValues, widgetImports } from "@homarr/widgets";
 import { WidgetError } from "@homarr/widgets/errors";
+import { getWidgetQueryKeys } from "@homarr/widgets/definition";
+import type { WidgetComponentProps, WidgetDefinition } from "@homarr/widgets/definition";
+import { loadWidgetResources, reduceWidgetOptionsWithDefinition } from "@homarr/widgets/manifest";
 
 import type { SectionItem } from "~/app/[locale]/boards/_types";
 import classes from "../sections/item.module.css";
 import { useItemActions } from "./item-actions";
 import itemContentClasses from "./item-content.module.css";
+import { BoardItemMenu } from "./item-menu";
 import { WidgetContextMenu } from "./widget-context-menu";
-import { removePersistedWidgetQueries } from "./widget-query-recovery";
-
-const BoardItemMenu = dynamic(() => import("./item-menu").then((module) => module.BoardItemMenu), {
-  ssr: false,
-});
+import { removeWidgetDataQueries } from "./widget-query-recovery";
 
 interface BoardItemContentProps {
   item: SectionItem;
@@ -35,6 +35,53 @@ const getOverflowFromKind = (kind: SectionItem["kind"]) => {
   return undefined;
 };
 
+type BoardItemCardProps = CardProps & {
+  item: SectionItem;
+  innerRef: (element: HTMLDivElement | null) => void;
+};
+
+const BoardItemCard = ({ item, innerRef, children, ...cardProps }: BoardItemCardProps) => {
+  const board = useRequiredBoard();
+
+  return (
+    <Card
+      {...cardProps}
+      ref={innerRef}
+      className={combineClasses(
+        classes.itemCard,
+        `${item.kind}-wrapper`,
+        "grid-stack-item-content",
+        item.advancedOptions.customCssClasses.join(" "),
+      )}
+      radius={board.itemRadius}
+      styles={{
+        root: {
+          "--opacity": board.opacity / 100,
+          containerType: "size",
+          overflow: getOverflowFromKind(item.kind),
+          "--border-color": item.advancedOptions.borderColor !== "" ? item.advancedOptions.borderColor : undefined,
+        },
+      }}
+      p={0}
+    >
+      {children}
+    </Card>
+  );
+};
+
+const WidgetDefinitionLoadError = ({
+  error,
+  resetErrorBoundary,
+  item,
+  innerRef,
+}: FallbackProps & Pick<BoardItemCardProps, "item" | "innerRef">) => (
+  <BoardItemCard item={item} innerRef={innerRef}>
+    <Center h="100%">
+      <WidgetError error={error} resetErrorBoundary={resetErrorBoundary} />
+    </Center>
+  </BoardItemCard>
+);
+
 export const BoardItemContent = ({ item }: BoardItemContentProps) => {
   const { ref, width, height } = useElementSize<HTMLDivElement>();
   const board = useRequiredBoard();
@@ -42,32 +89,28 @@ export const BoardItemContent = ({ item }: BoardItemContentProps) => {
 
   return (
     <>
-      <WidgetContextMenu item={item} widgetStateRef={widgetStateRef}>
-        <Card
-          ref={ref}
-          w="100%"
-          h="100%"
-          data-grid-item-content
-          className={combineClasses(
-            classes.itemCard,
-            `${item.kind}-wrapper`,
-            "grid-stack-item-content",
-            item.advancedOptions.customCssClasses.join(" "),
-          )}
-          radius={board.itemRadius}
-          styles={{
-            root: {
-              "--opacity": board.opacity / 100,
-              containerType: "size",
-              overflow: getOverflowFromKind(item.kind),
-              "--border-color": item.advancedOptions.borderColor !== "" ? item.advancedOptions.borderColor : undefined,
-            },
-          }}
-          p={0}
+      <ErrorBoundary
+        resetKeys={[item.kind]}
+        fallbackRender={(fallbackProps) => <WidgetDefinitionLoadError {...fallbackProps} item={item} innerRef={ref} />}
+      >
+        <Suspense
+          fallback={
+            <BoardItemCard item={item} innerRef={ref}>
+              <Center h="100%">
+                <Loader size="sm" />
+              </Center>
+            </BoardItemCard>
+          }
         >
-          <InnerContent item={item} width={width} height={height} widgetStateRef={widgetStateRef} />
-        </Card>
-      </WidgetContextMenu>
+          <LoadedBoardItemContent
+            item={item}
+            width={width}
+            height={height}
+            widgetStateRef={widgetStateRef}
+            innerRef={ref}
+          />
+        </Suspense>
+      </ErrorBoundary>
       {item.advancedOptions.title?.trim() && (
         <Badge
           pos="absolute"
@@ -93,46 +136,72 @@ export const BoardItemContent = ({ item }: BoardItemContentProps) => {
   );
 };
 
+interface LoadedBoardItemContentProps extends Omit<InnerContentProps, "definition" | "Component"> {
+  innerRef: (element: HTMLDivElement | null) => void;
+}
+
+const LoadedBoardItemContent = ({ item, innerRef, ...innerContentProps }: LoadedBoardItemContentProps) => {
+  const { definition, Component } = use(loadWidgetResources(item.kind));
+
+  return (
+    <WidgetContextMenu item={item} definition={definition} widgetStateRef={innerContentProps.widgetStateRef}>
+      <BoardItemCard item={item} innerRef={innerRef}>
+        <ErrorBoundary
+          resetKeys={[item.kind]}
+          fallbackRender={({ resetErrorBoundary, error }) => (
+            <>
+              <BoardItemMenu offset={4} item={item} definition={definition} resetErrorBoundary={resetErrorBoundary} />
+              <WidgetError definition={definition} error={error} resetErrorBoundary={resetErrorBoundary} />
+            </>
+          )}
+        >
+          <InnerContent item={item} definition={definition} Component={Component} {...innerContentProps} />
+        </ErrorBoundary>
+      </BoardItemCard>
+    </WidgetContextMenu>
+  );
+};
+
 interface InnerContentProps {
   item: SectionItem;
   width: number;
   height: number;
   widgetStateRef: MutableRefObject<Record<string, unknown> | null>;
+  definition: WidgetDefinition;
+  Component: ComponentType<WidgetComponentProps<SectionItem["kind"]>>;
 }
 
-const InnerContent = ({ item, ...dimensions }: InnerContentProps) => {
+const InnerContent = ({ item, definition, Component, ...dimensions }: InnerContentProps) => {
   const settings = useSettings();
   const board = useRequiredBoard();
   const [isEditMode] = useEditMode();
-  const Comp = loadWidgetDynamic(item.kind);
-  const { definition } = widgetImports[item.kind];
-  const options = reduceWidgetOptionsWithDefaultValues(item.kind, settings, item.options);
+  const options = reduceWidgetOptionsWithDefinition(definition, settings, item.options);
   const newItem = { ...item, options };
   const { updateItemOptions } = useItemActions();
   const updateOptions = ({ newOptions }: { newOptions: Record<string, unknown> }) =>
     updateItemOptions({ itemId: item.id, newOptions });
   const widgetSupportsIntegrations =
-    "supportedIntegrations" in definition && definition.supportedIntegrations.length >= 1;
+    "supportedIntegrations" in definition && (definition.supportedIntegrations?.length ?? 0) >= 1;
   const queryClient = useQueryClient();
+  const widgetQueryKeys = getWidgetQueryKeys(definition, item.kind);
 
   return (
     <QueryErrorResetBoundary>
       {({ reset }) => (
         <ErrorBoundary
           onReset={() => {
-            removePersistedWidgetQueries(queryClient);
+            removeWidgetDataQueries(queryClient, widgetQueryKeys);
             reset();
           }}
           fallbackRender={({ resetErrorBoundary, error }) => (
             <>
-              {isEditMode && <BoardItemMenu offset={4} item={newItem} resetErrorBoundary={resetErrorBoundary} />}
-              <div
-                className={itemContentClasses.editModeInertContent}
-                data-board-grid-inert-content={isEditMode ? "true" : undefined}
-                inert={isEditMode}
-              >
-                <WidgetError kind={item.kind} error={error} resetErrorBoundary={resetErrorBoundary} />
-              </div>
+              <BoardItemMenu
+                offset={4}
+                item={newItem}
+                definition={definition}
+                resetErrorBoundary={resetErrorBoundary}
+              />
+              <WidgetError definition={definition} error={error} resetErrorBoundary={resetErrorBoundary} />
             </>
           )}
         >
@@ -144,13 +213,9 @@ const InnerContent = ({ item, ...dimensions }: InnerContentProps) => {
               (!("integrationsRequired" in definition) || definition.integrationsRequired !== false)
             }
           />
-          {isEditMode && <BoardItemMenu offset={4} item={newItem} />}
-          <div
-            className={itemContentClasses.editModeInertContent}
-            data-board-grid-inert-content={isEditMode ? "true" : undefined}
-            inert={isEditMode}
-          >
-            <Comp
+          <BoardItemMenu offset={4} item={newItem} definition={definition} />
+          <div data-homarr-widget-ready={item.kind} style={{ display: "contents" }}>
+            <Component
               options={options as never}
               integrationIds={item.integrationIds}
               isEditMode={isEditMode}

apps/nextjs/src/components/board/items/item-menu.tsx

@@ -1,49 +1,53 @@
-import { useEffect, useMemo, useRef } from "react";
+import { useEffect, useRef, useState } from "react";
 import { ActionIcon, Menu } from "@mantine/core";
 import { IconCopy, IconDotsVertical, IconLayoutKanban, IconPencil, IconTrash } from "@tabler/icons-react";
 
-import { useIntegrations, useSession } from "@homarr/auth/client";
+import { clientApi } from "@homarr/api/client";
+import { useSession } from "@homarr/auth/client";
 import { useEditMode } from "@homarr/boards/edit-mode";
 import { useConfirmModal, useModalAction } from "@homarr/modals";
 import { useSettings } from "@homarr/settings";
 import { useI18n, useScopedI18n } from "@homarr/translation/client";
-import { widgetImports } from "@homarr/widgets";
-import { WidgetEditModal } from "@homarr/widgets/modals";
+import type { WidgetDefinition } from "@homarr/widgets/definition";
 
 import type { SectionItem } from "~/app/[locale]/boards/_types";
 import { useSectionContext } from "../sections/section-context";
 import { useItemActions } from "./item-actions";
-import { useOpenItemMoveModal } from "./item-move-modal";
+import { LazyItemMoveModal, preloadItemMoveModal } from "./lazy-item-move-modal";
+import { LazyWidgetEditModal, preloadWidgetEditModal } from "./lazy-widget-edit-modal";
 
 interface BoardItemMenuProps {
   offset: number;
   item: SectionItem;
+  definition: WidgetDefinition;
   resetErrorBoundary?: () => void;
 }
 
 export const BoardItemMenu = (props: BoardItemMenuProps) => {
   const { data: session } = useSession();
-  if (!session) return null;
+  const [isEditMode] = useEditMode();
+  if (!session || !isEditMode) return null;
 
   return <BoardItemMenuInner {...props} />;
 };
 
-const BoardItemMenuInner = ({ offset, item, resetErrorBoundary }: BoardItemMenuProps) => {
+const BoardItemMenuInner = ({ offset, item, definition, resetErrorBoundary }: BoardItemMenuProps) => {
   const refResetErrorBoundaryOnNextRender = useRef(false);
   const tItem = useScopedI18n("item");
   const t = useI18n();
-  const { openModal } = useModalAction(WidgetEditModal);
-  const openMoveModal = useOpenItemMoveModal();
+  const { openModal } = useModalAction(LazyWidgetEditModal);
+  const { openModal: openMoveModal } = useModalAction(LazyItemMoveModal);
   const { openConfirmModal } = useConfirmModal();
-  const [isEditMode] = useEditMode();
+  const [isMenuOpen, setIsMenuOpen] = useState(false);
+  const hasSupportedIntegrations =
+    "supportedIntegrations" in definition && (definition.supportedIntegrations?.length ?? 0) > 0;
   const { updateItemOptions, updateItemAdvancedOptions, updateItemIntegrations, duplicateItem, removeItem } =
     useItemActions();
-  const integrationData = useIntegrations();
-  const currentDefinition = useMemo(() => widgetImports[item.kind].definition, [item.kind]);
-  const { section } = useSectionContext();
+  const { data: integrationData, isPending } = clientApi.integration.all.useQuery(undefined, {
+    enabled: isMenuOpen && hasSupportedIntegrations,
+  });
+  const { gridstack } = useSectionContext().refs;
   const settings = useSettings();
-  const label = item.advancedOptions.title?.trim() || t(`widget.${item.kind}.name`);
-  const menuRightOffset = section.kind === "dynamic" ? offset + 40 : offset;
 
   // Reset error boundary on next render if item has been edited
   useEffect(() => {
@@ -53,12 +57,11 @@ const BoardItemMenuInner = ({ offset, item, resetErrorBoundary }: BoardItemMenuP
     }
   }, [item, resetErrorBoundary]);
 
-  if (!isEditMode) return null;
-
   const openEditModal = () => {
     openModal(
       {
         kind: item.kind,
+        definition,
         value: {
           advancedOptions: item.advancedOptions,
           options: item.options,
@@ -79,19 +82,19 @@ const BoardItemMenuInner = ({ offset, item, resetErrorBoundary }: BoardItemMenuP
           });
           refResetErrorBoundaryOnNextRender.current = true;
         },
-        integrationData: integrationData.filter(
+        integrationData: (integrationData ?? []).filter(
           (integration) =>
-            "supportedIntegrations" in currentDefinition &&
-            (currentDefinition.supportedIntegrations as string[]).some((kind) => kind === integration.kind),
+            "supportedIntegrations" in definition &&
+            (definition.supportedIntegrations as string[]).some((kind) => kind === integration.kind),
         ),
-        integrationSupport: "supportedIntegrations" in currentDefinition,
+        integrationSupport: "supportedIntegrations" in definition,
         settings,
         itemId: item.id,
         appId: item.kind === "app" ? (item.options.appId as string | undefined) : undefined,
       },
       {
-        title(translate) {
-          return `${translate("item.edit.title")} - ${translate(`widget.${item.kind}.name`)}`;
+        title(t) {
+          return `${t("item.edit.title")} - ${t(`widget.${item.kind}.name`)}`;
         },
       },
     );
@@ -108,32 +111,38 @@ const BoardItemMenuInner = ({ offset, item, resetErrorBoundary }: BoardItemMenuP
   };
 
   return (
-    <Menu withinPortal position="right-start" arrowPosition="center">
+    <Menu withinPortal position="right-start" arrowPosition="center" opened={isMenuOpen} onChange={setIsMenuOpen}>
       <Menu.Target>
         <ActionIcon
           variant="default"
           radius={"xl"}
           pos="absolute"
           top={offset}
-          right={menuRightOffset}
+          right={offset}
           style={{ zIndex: 10 }}
-          aria-label={tItem("menu.label.settingsFor", { name: label })}
+          aria-label={tItem("menu.label.settings")}
         >
           <IconDotsVertical size={"1rem"} />
         </ActionIcon>
       </Menu.Target>
       <Menu.Dropdown miw={128}>
         <Menu.Label>{tItem("menu.label.settings")}</Menu.Label>
-        <Menu.Item leftSection={<IconPencil size={16} />} onClick={openEditModal}>
+        <Menu.Item
+          leftSection={<IconPencil size={16} />}
+          onClick={openEditModal}
+          onFocus={preloadWidgetEditModal}
+          onPointerEnter={preloadWidgetEditModal}
+          disabled={hasSupportedIntegrations && isPending}
+        >
           {tItem("action.edit")}
         </Menu.Item>
         <Menu.Item
           leftSection={<IconLayoutKanban size={16} />}
+          onFocus={preloadItemMoveModal}
+          onPointerEnter={preloadItemMoveModal}
           onClick={() => {
-            openMoveModal({
-              entry: item,
-              sourceSectionId: section.id,
-            });
+            if (!gridstack.current) return;
+            openMoveModal({ item, columnCount: gridstack.current.getColumn(), gridStack: gridstack.current });
           }}
         >
           {tItem("action.moveResize")}

apps/nextjs/src/components/board/items/item-move-modal.tsx

@@ -1,209 +1,94 @@
-import { useCallback, useMemo } from "react";
-import { Grid, NumberInput, Select, Stack } from "@mantine/core";
+import { useCallback, useRef } from "react";
+import { Grid, NumberInput, Stack } from "@mantine/core";
 import { z } from "zod/v4";
 
-import { useCurrentLayout, useRequiredBoard } from "@homarr/boards/context";
-import { getRootSectionLane } from "@homarr/definitions";
 import { useZodForm } from "@homarr/form";
-import { createModal, ModalFormFooter, modalSizeForm, useModalAction } from "@homarr/modals";
+import type { GridStack } from "@homarr/gridstack";
+import { createModal, ModalFormFooter, modalSizeForm } from "@homarr/modals";
 import { useI18n } from "@homarr/translation/client";
 
-import type { Board, DynamicSectionItem, SectionItem } from "~/app/[locale]/boards/_types";
-import { getBoardLaneColumnCount, getLayoutRowCount, reflowVerticalLayout } from "../layout";
-import type { CommitSectionGridInput, SectionGridPlacement } from "../sections/grid/use-grid-layout-actions";
-import { useGridLayoutActions } from "../sections/grid/use-grid-layout-actions";
+import type { Item, SectionItem } from "~/app/[locale]/boards/_types";
 
-export type MovableEntry = Pick<
-  SectionItem | DynamicSectionItem,
-  "id" | "type" | "width" | "height" | "xOffset" | "yOffset"
->;
-
-export interface OpenItemMoveModalInput {
-  entry: MovableEntry;
-  sourceSectionId: string;
-}
-
-interface InnerProps extends OpenItemMoveModalInput {
-  board: Board;
-  currentLayoutId: string;
-  commitSectionGrids: (snapshots: readonly CommitSectionGridInput[]) => void;
-}
-
-interface MoveTarget {
-  id: string;
-  label: string;
+export interface ItemMoveModalProps {
+  gridStack: GridStack;
+  item: Pick<SectionItem, "id" | "width" | "height" | "xOffset" | "yOffset">;
   columnCount: number;
-  maxRowCount: number | null;
 }
 
-interface MoveTargetLabels {
-  canvas: string;
-  dynamicSection: string;
-  leftRail: string;
-  rightRail: string;
-  numbered: (name: string, index: number) => string;
-  located: (name: string, location: string, index: number) => string;
-}
-
-type MoveTargetCandidate = Omit<MoveTarget, "label"> & {
-  name: string;
-  location?: string;
-};
-
-export const ItemMoveModal = createModal<InnerProps>(({ actions, innerProps }) => {
+export const ItemMoveModal = createModal<ItemMoveModalProps>(({ actions, innerProps }) => {
   const t = useI18n();
-  const { board, commitSectionGrids, currentLayoutId, entry, sourceSectionId } = innerProps;
-  const minimumSize = useMemo(
-    () => getEntryMinimumSize(board, currentLayoutId, entry),
-    [board, currentLayoutId, entry],
-  );
-  const targets = useMemo(
-    () =>
-      getMoveTargets(board, currentLayoutId, entry, {
-        canvas: t("board.landmark.canvas"),
-        dynamicSection: t("section.dynamic.action.create"),
-        leftRail: t("board.landmark.leftRail"),
-        rightRail: t("board.landmark.rightRail"),
-        numbered: (name, index) => t("item.moveResize.target.numbered", { name, index: String(index) }),
-        located: (name, location, index) =>
-          t("item.moveResize.target.located", {
-            name,
-            location,
-            index: String(index),
-          }),
-      }),
-    [board, currentLayoutId, entry, t],
-  );
-  const targetById = useMemo(() => new Map(targets.map((target) => [target.id, target])), [targets]);
-  const initialTarget = targetById.get(sourceSectionId) ?? targets[0];
-
-  if (!initialTarget) {
-    throw new Error("No valid dashboard section is available for this item");
-  }
-
+  const maxWidthRef = useRef(innerProps.columnCount - innerProps.item.xOffset);
   const form = useZodForm(
     z.object({
-      sectionId: z.string().min(1),
-      xOffset: z.number().int().min(0).max(32767),
-      yOffset: z.number().int().min(0).max(32767),
-      width: z.number().int().min(1).max(32767),
-      height: z.number().int().min(1).max(32767),
+      xOffset: z
+        .number()
+        .min(0)
+        .max(innerProps.columnCount - 1),
+      yOffset: z.number().min(0),
+      width: z.number().min(1).max(maxWidthRef.current),
+      height: z.number().min(1),
     }),
     {
       initialValues: {
-        sectionId: initialTarget.id,
-        xOffset: entry.xOffset,
-        yOffset: entry.yOffset,
-        width: entry.width,
-        height: entry.height,
+        xOffset: innerProps.item.xOffset,
+        yOffset: innerProps.item.yOffset,
+        width: innerProps.item.width,
+        height: innerProps.item.height,
+      },
+      onValuesChange(values, previous) {
+        if (values.xOffset !== previous.xOffset) {
+          maxWidthRef.current = innerProps.columnCount - values.xOffset;
+        }
       },
     },
   );
-  const selectedTarget = targetById.get(form.values.sectionId) ?? initialTarget;
 
   const handleSubmit = useCallback(
-    (values: { sectionId: string; xOffset: number; yOffset: number; width: number; height: number }) => {
-      const target = targetById.get(values.sectionId);
-      if (!target) return;
-
-      const width = Math.max(minimumSize.width, Math.min(values.width, target.columnCount));
-      const height = Math.max(minimumSize.height, values.height);
-      const nextPlacement: SectionGridPlacement = {
-        id: entry.id,
-        type: entry.type,
-        x: Math.min(values.xOffset, target.columnCount - width),
+    (values: Pick<Item["layouts"][number], "height" | "width" | "xOffset" | "yOffset">) => {
+      const gridItem = innerProps.gridStack
+        .getGridItems()
+        .find((item) => item.getAttribute("data-id") === innerProps.item.id);
+      if (!gridItem) return;
+      innerProps.gridStack.update(gridItem, {
+        h: values.height,
+        w: values.width,
+        x: values.xOffset,
         y: values.yOffset,
-        w: width,
-        h: height,
-      };
-      const targetPlacements = getSectionPlacements(board, currentLayoutId, target.id).filter(
-        (placement) => placement.id !== entry.id,
-      );
-      const resolvedTarget = reflowVerticalLayout([...targetPlacements, nextPlacement], {
-        columnCount: target.columnCount,
-        pinnedItemId: entry.id,
       });
-      if (target.maxRowCount !== null && getLayoutRowCount(resolvedTarget) > target.maxRowCount) {
-        form.setFieldError("height", t("item.moveResize.keyboard.boundary"));
-        return;
-      }
-
-      const snapshots =
-        sourceSectionId === target.id
-          ? [{ layoutId: currentLayoutId, sectionId: target.id, placements: resolvedTarget }]
-          : [
-              {
-                layoutId: currentLayoutId,
-                sectionId: sourceSectionId,
-                placements: reflowVerticalLayout(
-                  getSectionPlacements(board, currentLayoutId, sourceSectionId).filter(
-                    (placement) => placement.id !== entry.id,
-                  ),
-                  {
-                    columnCount: getSectionColumnCount(board, currentLayoutId, sourceSectionId),
-                  },
-                ),
-              },
-              { layoutId: currentLayoutId, sectionId: target.id, placements: resolvedTarget },
-            ];
-
-      commitSectionGrids(snapshots);
       actions.closeModal();
-      focusMovedEntry(entry.id, target.id);
     },
-    [actions, board, commitSectionGrids, currentLayoutId, entry, form, minimumSize, sourceSectionId, t, targetById],
+    [actions, innerProps.gridStack, innerProps.item.id],
   );
 
   return (
     <form onSubmit={form.onSubmit(handleSubmit, console.error)}>
       <Stack>
-        <Select
-          data={targets.map((target) => ({ value: target.id, label: target.label }))}
-          label={t("item.moveResize.field.section.label")}
-          data-autofocus
-          allowDeselect={false}
-          searchable
-          {...form.getInputProps("sectionId")}
-        />
         <Grid>
           <Grid.Col span={{ base: 12, md: 6 }}>
             <NumberInput
               label={t("item.moveResize.field.xOffset.label")}
+              data-autofocus
               min={0}
-              max={selectedTarget.columnCount - 1}
+              max={innerProps.columnCount - 1}
               {...form.getInputProps("xOffset")}
             />
           </Grid.Col>
 
           <Grid.Col span={{ base: 12, md: 6 }}>
-            <NumberInput
-              label={t("item.moveResize.field.yOffset.label")}
-              min={0}
-              max={selectedTarget.maxRowCount === null ? undefined : selectedTarget.maxRowCount - 1}
-              {...form.getInputProps("yOffset")}
-            />
+            <NumberInput label={t("item.moveResize.field.yOffset.label")} min={0} {...form.getInputProps("yOffset")} />
           </Grid.Col>
 
           <Grid.Col span={{ base: 12, md: 6 }}>
             <NumberInput
               label={t("item.moveResize.field.width.label")}
-              min={minimumSize.width}
-              max={selectedTarget.columnCount - Math.min(form.values.xOffset, selectedTarget.columnCount - 1)}
+              min={1}
+              max={innerProps.columnCount - form.values.xOffset}
               {...form.getInputProps("width")}
             />
           </Grid.Col>
 
           <Grid.Col span={{ base: 12, md: 6 }}>
-            <NumberInput
-              label={t("item.moveResize.field.height.label")}
-              min={minimumSize.height}
-              max={
-                selectedTarget.maxRowCount === null
-                  ? undefined
-                  : selectedTarget.maxRowCount - Math.min(form.values.yOffset, selectedTarget.maxRowCount - 1)
-              }
-              {...form.getInputProps("height")}
-            />
+            <NumberInput label={t("item.moveResize.field.height.label")} min={1} {...form.getInputProps("height")} />
           </Grid.Col>
         </Grid>
         <ModalFormFooter onCancel={actions.closeModal} />
@@ -216,177 +101,3 @@ export const ItemMoveModal = createModal<InnerProps>(({ actions, innerProps }) =
   },
   size: modalSizeForm,
 });
-
-export const useOpenItemMoveModal = () => {
-  const board = useRequiredBoard();
-  const currentLayoutId = useCurrentLayout();
-  const { commitSectionGrids } = useGridLayoutActions();
-  const { openModal } = useModalAction(ItemMoveModal);
-
-  return useCallback(
-    (input: OpenItemMoveModalInput) => {
-      openModal({
-        ...input,
-        board,
-        currentLayoutId,
-        commitSectionGrids,
-      });
-    },
-    [board, commitSectionGrids, currentLayoutId, openModal],
-  );
-};
-
-export const getMoveTargets = (
-  board: Board,
-  layoutId: string,
-  entry: MovableEntry,
-  labels: MoveTargetLabels,
-): MoveTarget[] => {
-  const minimum = getEntryMinimumSize(board, layoutId, entry);
-
-  const candidates = board.sections.flatMap((section): MoveTargetCandidate[] => {
-    if (section.kind === "empty") {
-      const columnCount = getSectionColumnCount(board, layoutId, section.id);
-      const lane = getRootSectionLane(section.xOffset);
-      if (columnCount === 0) return [];
-      return minimum.width <= columnCount
-        ? [
-            {
-              id: section.id,
-              name: lane === "left" ? labels.leftRail : lane === "right" ? labels.rightRail : labels.canvas,
-              columnCount,
-              maxRowCount: getSectionMaxRowCount(board, layoutId, section.id),
-            },
-          ]
-        : [];
-    }
-
-    if (section.kind === "category") return [];
-
-    const layout = section.layouts.find((candidate) => candidate.layoutId === layoutId);
-    if (!layout) return [];
-    if (
-      (entry.type === "section" && isSameOrDescendant(board, layoutId, section.id, entry.id)) ||
-      minimum.width > layout.width ||
-      minimum.height > layout.height
-    ) {
-      return [];
-    }
-
-    return [
-      {
-        id: section.id,
-        name: section.options.title || labels.dynamicSection,
-        columnCount: layout.width,
-        maxRowCount: layout.height,
-      },
-    ];
-  });
-
-  return candidates.map(({ name, location, ...target }, index) => ({
-    ...target,
-    label: location ? labels.located(name, location, index + 1) : labels.numbered(name, index + 1),
-  }));
-};
-
-const getSectionPlacements = (board: Board, layoutId: string, sectionId: string): SectionGridPlacement[] => [
-  ...board.items.flatMap((item) => {
-    const layout = item.layouts.find((candidate) => candidate.layoutId === layoutId);
-    return layout?.sectionId === sectionId
-      ? [
-          {
-            id: item.id,
-            type: "item" as const,
-            x: layout.xOffset,
-            y: layout.yOffset,
-            w: layout.width,
-            h: layout.height,
-          },
-        ]
-      : [];
-  }),
-  ...board.sections.flatMap((section) => {
-    if (section.kind !== "dynamic") return [];
-    const layout = section.layouts.find((candidate) => candidate.layoutId === layoutId);
-    return layout?.parentSectionId === sectionId
-      ? [
-          {
-            id: section.id,
-            type: "section" as const,
-            x: layout.xOffset,
-            y: layout.yOffset,
-            w: layout.width,
-            h: layout.height,
-          },
-        ]
-      : [];
-  }),
-];
-
-const getSectionColumnCount = (board: Board, layoutId: string, sectionId: string) => {
-  const layout = board.layouts.find((candidate) => candidate.id === layoutId);
-  if (!layout) throw new Error(`Layout "${layoutId}" was not found`);
-  const section = board.sections.find((candidate) => candidate.id === sectionId);
-  if (!section) throw new Error(`Section "${sectionId}" was not found`);
-
-  if (section.kind === "dynamic") {
-    const sectionLayout = section.layouts.find((candidate) => candidate.layoutId === layoutId);
-    if (!sectionLayout) throw new Error(`Section "${sectionId}" has no current layout`);
-    return sectionLayout.width;
-  }
-  if (section.kind === "category") return layout.columnCount;
-  return getBoardLaneColumnCount(layout, getRootSectionLane(section.xOffset));
-};
-
-const getSectionMaxRowCount = (board: Board, layoutId: string, sectionId: string) => {
-  const section = board.sections.find((candidate) => candidate.id === sectionId);
-  if (!section) return null;
-  if (section.kind === "dynamic") {
-    return section.layouts.find((candidate) => candidate.layoutId === layoutId)?.height ?? null;
-  }
-  return null;
-};
-
-const getEntryMinimumSize = (board: Board, layoutId: string, entry: MovableEntry) => {
-  if (entry.type === "item") return { width: 1, height: 1 };
-  const children = getSectionPlacements(board, layoutId, entry.id);
-  return {
-    width: Math.max(1, ...children.map((child) => child.x + child.w)),
-    height: Math.max(1, ...children.map((child) => child.y + child.h)),
-  };
-};
-
-const isSameOrDescendant = (board: Board, layoutId: string, candidateId: string, ancestorId: string) => {
-  let current: string | undefined = candidateId;
-  const visited = new Set<string>();
-  while (current && !visited.has(current)) {
-    if (current === ancestorId) return true;
-    visited.add(current);
-    const section = board.sections.find((candidate) => candidate.id === current && candidate.kind === "dynamic");
-    if (!section || section.kind !== "dynamic") return false;
-    current = section.layouts.find((layout) => layout.layoutId === layoutId)?.parentSectionId;
-  }
-  return false;
-};
-
-const focusMovedEntry = (entryId: string, sectionId: string) => {
-  let attempts = 0;
-  const tryFocus = () => {
-    const section = Array.from(document.querySelectorAll<HTMLElement>("[data-grid-section-id]")).find(
-      (candidate) => candidate.dataset.gridSectionId === sectionId,
-    );
-    const entry = Array.from(section?.querySelectorAll<HTMLElement>(":scope > [data-grid-item-id]") ?? []).find(
-      (candidate) => candidate.dataset.gridItemId === entryId,
-    );
-    const editorEntry = entry?.querySelector<HTMLElement>("[data-editor-grid-entry]");
-    if (editorEntry) {
-      editorEntry.focus();
-      return;
-    }
-
-    attempts += 1;
-    if (attempts < 10) requestAnimationFrame(tryFocus);
-  };
-
-  requestAnimationFrame(tryFocus);
-};

apps/nextjs/src/components/board/items/item-select-data.spec.ts

@@ -0,0 +1,48 @@
+import { describe, expect, it, vi } from "vitest";
+
+import { resolveMatchingIntegrationsAsync, tryLockSelection, unlockSelection } from "./item-select-data";
+
+describe("widget selection lock", () => {
+  it("rejects repeated selection synchronously until the active selection finishes", () => {
+    const lock = { current: false };
+
+    expect(tryLockSelection(lock)).toBe(true);
+    expect(tryLockSelection(lock)).toBe(false);
+
+    unlockSelection(lock);
+    expect(tryLockSelection(lock)).toBe(true);
+  });
+});
+
+describe("resolveMatchingIntegrationsAsync", () => {
+  it("waits for the shared integration query before a cold integration-backed selection", async () => {
+    const ensureDataAsync = vi.fn(async () => [
+      { id: "matching", kind: "sonarr" as const },
+      { id: "other", kind: "radarr" as const },
+    ]);
+
+    await expect(
+      resolveMatchingIntegrationsAsync({
+        hasIntegrationSupport: true,
+        supportedIntegrations: ["sonarr"],
+        currentData: undefined,
+        ensureDataAsync,
+      }),
+    ).resolves.toEqual([{ id: "matching", kind: "sonarr" }]);
+    expect(ensureDataAsync).toHaveBeenCalledOnce();
+  });
+
+  it("does not wait for integrations when the widget has no integration support", async () => {
+    const ensureDataAsync = vi.fn(async () => [{ id: "unused", kind: "sonarr" as const }]);
+
+    await expect(
+      resolveMatchingIntegrationsAsync({
+        hasIntegrationSupport: false,
+        supportedIntegrations: [],
+        currentData: undefined,
+        ensureDataAsync,
+      }),
+    ).resolves.toEqual([]);
+    expect(ensureDataAsync).not.toHaveBeenCalled();
+  });
+});

apps/nextjs/src/components/board/items/item-select-data.ts

@@ -0,0 +1,28 @@
+import type { IntegrationKind } from "@homarr/definitions";
+
+export const tryLockSelection = (lock: { current: boolean }) => {
+  if (lock.current) return false;
+  lock.current = true;
+  return true;
+};
+
+export const unlockSelection = (lock: { current: boolean }) => {
+  lock.current = false;
+};
+
+export const resolveMatchingIntegrationsAsync = async <TIntegration extends { kind: IntegrationKind }>({
+  hasIntegrationSupport,
+  supportedIntegrations,
+  currentData,
+  ensureDataAsync,
+}: {
+  hasIntegrationSupport: boolean;
+  supportedIntegrations: readonly IntegrationKind[];
+  currentData: TIntegration[] | undefined;
+  ensureDataAsync: () => Promise<TIntegration[]>;
+}) => {
+  if (!hasIntegrationSupport) return [];
+
+  const integrations = currentData ?? (await ensureDataAsync());
+  return integrations.filter((integration) => supportedIntegrations.includes(integration.kind));
+};

apps/nextjs/src/components/board/items/item-select-modal.module.css

@@ -0,0 +1,21 @@
+.action {
+  opacity: 0;
+  transition: opacity 150ms ease;
+}
+
+.card:hover .action,
+.card:focus-within .action {
+  opacity: 1;
+}
+
+@media (hover: none), (pointer: coarse) {
+  .action {
+    opacity: 1;
+  }
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .action {
+    transition: none;
+  }
+}

apps/nextjs/src/components/board/items/item-select-modal.tsx

@@ -1,46 +1,65 @@
-import { useMemo, useState } from "react";
+import { useMemo, useRef, useState } from "react";
 import { Avatar, Box, Button, Card, Center, Divider, Group, Image, Stack, Text, Tooltip } from "@mantine/core";
 import { IconApi } from "@tabler/icons-react";
 
+import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
-import { createId, objectEntries } from "@homarr/common";
-import { getIconUrl, getIntegrationName } from "@homarr/definitions";
+import { createId } from "@homarr/common";
+import { getIconUrl, getIntegrationName, widgetIntegrationSupport, widgetKinds } from "@homarr/definitions";
 import type { IntegrationKind, WidgetKind } from "@homarr/definitions";
 import { createModal, modalSizeSelect, useModalAction } from "@homarr/modals";
+import { showErrorNotification } from "@homarr/notifications";
 import { useSettings } from "@homarr/settings";
 import { useI18n } from "@homarr/translation/client";
 import { SelectGridLayout, selectGridCardHeight } from "@homarr/ui";
 import type { TablerIcon } from "@homarr/ui";
-import { reduceWidgetOptionsWithDefaultValues, widgetImports } from "@homarr/widgets";
-import { WidgetEditModal } from "@homarr/widgets/modals";
+import { widgetCatalogIcons } from "@homarr/widgets/catalog";
+import { loadWidgetDefinition, reduceWidgetOptionsWithDefinition } from "@homarr/widgets/manifest";
 
 import { useItemActions } from "./item-actions";
+import { resolveMatchingIntegrationsAsync, tryLockSelection, unlockSelection } from "./item-select-data";
+import { LazyWidgetEditModal, preloadWidgetEditModal } from "./lazy-widget-edit-modal";
+import classes from "./item-select-modal.module.css";
 
-export const ItemSelectModal = createModal<void>(({ actions }) => {
+interface ItemSelectModalContentProps {
+  actions: { closeModal: () => void };
+  innerProps: void;
+  integrationData: RouterOutputs["integration"]["all"] | undefined;
+  customWidgetDefs: RouterOutputs["customWidget"]["all"] | undefined;
+  ensureIntegrationDataAsync: () => Promise<RouterOutputs["integration"]["all"]>;
+}
+
+const ItemSelectModalContent = ({
+  actions,
+  integrationData,
+  customWidgetDefs,
+  ensureIntegrationDataAsync,
+}: ItemSelectModalContentProps) => {
   const [search, setSearch] = useState("");
+  const [loadingSelection, setLoadingSelection] = useState<string | null>(null);
+  const selectionLock = useRef(false);
   const t = useI18n();
   const { createItem, updateItemOptions, updateItemAdvancedOptions, updateItemIntegrations } = useItemActions();
-  const { openModal: openEditModal } = useModalAction(WidgetEditModal);
-  const { data: integrationData = [] } = clientApi.integration.all.useQuery();
-  const { data: customWidgetDefs } = clientApi.customWidget.all.useQuery();
+  const { openModal: openEditModal } = useModalAction(LazyWidgetEditModal);
   const settings = useSettings();
 
-  const availableKinds = useMemo(() => new Set(integrationData.map((i) => i.kind)), [integrationData]);
+  const availableKinds = useMemo(() => new Set((integrationData ?? []).map((i) => i.kind)), [integrationData]);
 
   const items = useMemo(
     () =>
-      objectEntries(widgetImports)
-        .filter(([kind]) => kind !== "customApi")
-        .map(([kind, value]) => ({
-          kind,
-          supportedIntegrations:
-            "supportedIntegrations" in value.definition
-              ? value.definition.supportedIntegrations.filter((integration) => integration !== "mock")
-              : [],
-          icon: value.definition.icon,
-          name: t(`widget.${kind}.name`),
-          description: t(`widget.${kind}.description`),
-        }))
+      widgetKinds
+        .filter((kind) => kind !== "customApi")
+        .map((kind) => {
+          return {
+            kind,
+            supportedIntegrations: (widgetIntegrationSupport[kind] ?? []).filter(
+              (integration) => integration !== "mock",
+            ),
+            icon: widgetCatalogIcons[kind],
+            name: t(`widget.${kind}.name`),
+            description: t(`widget.${kind}.description`),
+          };
+        })
         .sort((itemA, itemB) => {
           if (itemA.kind === "app") return -1;
           if (itemB.kind === "app") return 1;
@@ -66,52 +85,81 @@ export const ItemSelectModal = createModal<void>(({ actions }) => {
     [customWidgetDefs, search],
   );
 
-  const handleAddCustomWidget = (definitionId: string) => {
-    const itemId = createId();
-    const defaultOptions = reduceWidgetOptionsWithDefaultValues("customApi", settings);
-    createItem({ id: itemId, kind: "customApi", integrationIds: [] });
-    updateItemOptions({ itemId, newOptions: { ...defaultOptions, definitionId } });
-    actions.closeModal();
+  const notifyDefinitionLoadError = (error: unknown) => {
+    showErrorNotification({
+      title: t("common.error"),
+      message: error instanceof Error ? error.message : String(error),
+    });
   };
 
-  const handleAdd = (kind: WidgetKind) => {
-    const definition = widgetImports[kind].definition;
-    const hasIntegrationSupport = "supportedIntegrations" in definition;
+  const handleAddCustomWidget = async (definitionId: string) => {
+    if (!tryLockSelection(selectionLock)) return;
+    setLoadingSelection(`custom:${definitionId}`);
+    try {
+      const definition = await loadWidgetDefinition("customApi");
+      const itemId = createId();
+      const defaultOptions = reduceWidgetOptionsWithDefinition(definition, settings);
+      createItem({ id: itemId, kind: "customApi", integrationIds: [] });
+      updateItemOptions({ itemId, newOptions: { ...defaultOptions, definitionId } });
+      actions.closeModal();
+    } catch (error) {
+      notifyDefinitionLoadError(error);
+    } finally {
+      unlockSelection(selectionLock);
+      setLoadingSelection(null);
+    }
+  };
 
-    const matchingIntegrations = hasIntegrationSupport
-      ? integrationData.filter((integration) =>
-          (definition.supportedIntegrations as string[]).includes(integration.kind),
-        )
-      : [];
+  const handleAdd = async (kind: WidgetKind) => {
+    if (!tryLockSelection(selectionLock)) return;
+    setLoadingSelection(kind);
+    preloadWidgetEditModal();
+    try {
+      const definition = await loadWidgetDefinition(kind);
+      const hasIntegrationSupport = "supportedIntegrations" in definition;
 
-    const integrationIds = matchingIntegrations.map((i) => i.id);
-    const itemId = createId();
-    const defaultOptions = reduceWidgetOptionsWithDefaultValues(kind, settings);
+      const matchingIntegrations = await resolveMatchingIntegrationsAsync({
+        hasIntegrationSupport,
+        supportedIntegrations: definition.supportedIntegrations ?? [],
+        currentData: integrationData,
+        ensureDataAsync: ensureIntegrationDataAsync,
+      });
 
-    createItem({ id: itemId, kind, integrationIds });
-    actions.closeModal();
+      const integrationIds = matchingIntegrations.map((i) => i.id);
+      const itemId = createId();
+      const defaultOptions = reduceWidgetOptionsWithDefinition(definition, settings);
 
-    openEditModal(
-      {
-        kind,
-        value: {
-          advancedOptions: { title: null, customCssClasses: [], borderColor: "" },
-          options: defaultOptions,
-          integrationIds,
+      createItem({ id: itemId, kind, integrationIds });
+      actions.closeModal();
+
+      openEditModal(
+        {
+          kind,
+          definition,
+          value: {
+            advancedOptions: { title: null, customCssClasses: [], borderColor: "" },
+            options: defaultOptions,
+            integrationIds,
+          },
+          onSuccessfulEdit: ({ options, integrationIds: newIntegrationIds, advancedOptions }) => {
+            updateItemOptions({ itemId, newOptions: options });
+            updateItemAdvancedOptions({ itemId, newAdvancedOptions: advancedOptions });
+            updateItemIntegrations({ itemId, newIntegrations: newIntegrationIds });
+          },
+          integrationData: matchingIntegrations,
+          integrationSupport: hasIntegrationSupport,
+          settings,
         },
-        onSuccessfulEdit: ({ options, integrationIds: newIntegrationIds, advancedOptions }) => {
-          updateItemOptions({ itemId, newOptions: options });
-          updateItemAdvancedOptions({ itemId, newAdvancedOptions: advancedOptions });
-          updateItemIntegrations({ itemId, newIntegrations: newIntegrationIds });
+        {
+          title: (titleT) => `${titleT("item.edit.title")} - ${titleT(`widget.${kind}.name`)}`,
         },
-        integrationData: matchingIntegrations,
-        integrationSupport: hasIntegrationSupport,
-        settings,
-      },
-      {
-        title: (titleT) => `${titleT("item.edit.title")} - ${titleT(`widget.${kind}.name`)}`,
-      },
-    );
+      );
+    } catch (error) {
+      notifyDefinitionLoadError(error);
+    } finally {
+      unlockSelection(selectionLock);
+      setLoadingSelection(null);
+    }
   };
 
   return (
@@ -120,9 +168,9 @@ export const ItemSelectModal = createModal<void>(({ actions }) => {
       onSearchChange={setSearch}
       placeholder={`${t("item.create.search")}...`}
       onSearchKeyDown={(event) => {
-        if (event.key === "Enter" && filteredItems.length === 1) {
-          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          handleAdd(filteredItems[0]!.kind);
+        if (event.key === "Enter" && loadingSelection === null && filteredItems.length === 1) {
+          const [item] = filteredItems;
+          if (item) void handleAdd(item.kind);
         }
       }}
     >
@@ -130,7 +178,13 @@ export const ItemSelectModal = createModal<void>(({ actions }) => {
         <WidgetItem
           key={item.kind}
           item={item}
-          onSelect={() => handleAdd(item.kind)}
+          onSelect={() => void handleAdd(item.kind)}
+          onIntent={() => {
+            void loadWidgetDefinition(item.kind).catch(() => undefined);
+            preloadWidgetEditModal();
+          }}
+          disabled={loadingSelection !== null}
+          loading={loadingSelection === item.kind}
           hasMatchingIntegration={item.supportedIntegrations.some((kind) => availableKinds.has(kind))}
         />
       ))}
@@ -146,12 +200,12 @@ export const ItemSelectModal = createModal<void>(({ actions }) => {
           {filteredCustomWidgets.map((def) => (
             <Card
               key={def.id}
+              className={classes.card}
               h={selectGridCardHeight}
               withBorder
               pos="relative"
-              style={{ overflow: "hidden", "--_hover-opacity": "0" }}
-              onMouseEnter={(e) => e.currentTarget.style.setProperty("--_hover-opacity", "1")}
-              onMouseLeave={(e) => e.currentTarget.style.setProperty("--_hover-opacity", "0")}
+              style={{ overflow: "hidden" }}
+              onPointerEnter={() => void loadWidgetDefinition("customApi").catch(() => undefined)}
             >
               <Stack h="100%" gap="xs">
                 <Group gap="sm" wrap="nowrap" align="flex-start">
@@ -169,18 +223,24 @@ export const ItemSelectModal = createModal<void>(({ actions }) => {
                 </Text>
               </Stack>
               <Box
+                className={classes.action}
                 pos="absolute"
                 bottom={0}
                 left={0}
                 right={0}
                 p="xs"
                 style={{
-                  opacity: "var(--_hover-opacity)",
-                  transition: "opacity 150ms ease",
                   background: "linear-gradient(transparent, var(--mantine-color-body) 30%)",
                 }}
               >
-                <Button onClick={() => handleAddCustomWidget(def.id)} variant="light" size="xs" fullWidth>
+                <Button
+                  onClick={() => void handleAddCustomWidget(def.id)}
+                  variant="light"
+                  size="xs"
+                  fullWidth
+                  disabled={loadingSelection !== null}
+                  loading={loadingSelection === `custom:${def.id}`}
+                >
                   {t("item.create.addToBoard")}
                 </Button>
               </Box>
@@ -196,7 +256,24 @@ export const ItemSelectModal = createModal<void>(({ actions }) => {
       )}
     </SelectGridLayout>
   );
-}).withOptions({
+};
+
+const ItemSelectModalFrame = (props: Pick<ItemSelectModalContentProps, "actions" | "innerProps">) => {
+  const utils = clientApi.useUtils();
+  const { data: integrationData } = clientApi.integration.all.useQuery();
+  const { data: customWidgetDefs } = clientApi.customWidget.all.useQuery();
+
+  return (
+    <ItemSelectModalContent
+      {...props}
+      integrationData={integrationData}
+      customWidgetDefs={customWidgetDefs}
+      ensureIntegrationDataAsync={() => utils.integration.all.ensureData()}
+    />
+  );
+};
+
+export const ItemSelectModal = createModal<void>((props) => <ItemSelectModalFrame {...props} />).withOptions({
   defaultTitle: (t) => t("item.create.title"),
   size: modalSizeSelect,
 });
@@ -204,6 +281,9 @@ export const ItemSelectModal = createModal<void>(({ actions }) => {
 const WidgetItem = ({
   item,
   onSelect,
+  onIntent,
+  disabled,
+  loading,
   hasMatchingIntegration,
 }: {
   item: {
@@ -214,23 +294,27 @@ const WidgetItem = ({
     icon: TablerIcon;
   };
   onSelect: () => void;
+  onIntent: () => void;
+  disabled: boolean;
+  loading: boolean;
   hasMatchingIntegration: boolean;
 }) => {
   const t = useI18n();
 
   return (
     <Card
+      className={classes.card}
       h={selectGridCardHeight}
       withBorder
       pos="relative"
       style={{
         overflow: "hidden",
-        "--_hover-opacity": "0",
         borderColor: hasMatchingIntegration ? "var(--mantine-color-blue-6)" : undefined,
         borderWidth: hasMatchingIntegration ? 2 : undefined,
       }}
-      onMouseEnter={(e) => e.currentTarget.style.setProperty("--_hover-opacity", "1")}
-      onMouseLeave={(e) => e.currentTarget.style.setProperty("--_hover-opacity", "0")}
+      onFocus={onIntent}
+      onPointerEnter={onIntent}
+      aria-busy={loading || undefined}
     >
       <Stack h="100%" gap="xs">
         <Group gap="sm" wrap="nowrap" align="flex-start">
@@ -247,18 +331,17 @@ const WidgetItem = ({
         <SupportedIntegrations integrations={item.supportedIntegrations} />
       </Stack>
       <Box
+        className={classes.action}
         pos="absolute"
         bottom={0}
         left={0}
         right={0}
         p="xs"
         style={{
-          opacity: "var(--_hover-opacity)",
-          transition: "opacity 150ms ease",
           background: "linear-gradient(transparent, var(--mantine-color-body) 30%)",
         }}
       >
-        <Button onClick={onSelect} variant="light" size="xs" fullWidth>
+        <Button onClick={onSelect} variant="light" size="xs" fullWidth disabled={disabled} loading={loading}>
           {t(`item.create.addToBoard`)}
         </Button>
       </Box>

apps/nextjs/src/components/board/items/lazy-item-move-modal.tsx

@@ -0,0 +1,67 @@
+"use client";
+
+import { Suspense, use } from "react";
+import { Center, Loader } from "@mantine/core";
+import { ErrorBoundary } from "react-error-boundary";
+
+import { createModal, modalSizeForm } from "@homarr/modals";
+import { WidgetError } from "@homarr/widgets/errors";
+
+import type { ItemMoveModalProps } from "./item-move-modal";
+
+let itemMoveModalPromise: Promise<typeof import("./item-move-modal")> | undefined;
+
+const loadItemMoveModal = () => {
+  if (itemMoveModalPromise) return itemMoveModalPromise;
+
+  const currentPromise = import("./item-move-modal");
+  itemMoveModalPromise = currentPromise;
+  void currentPromise.catch(() => {
+    if (itemMoveModalPromise === currentPromise) itemMoveModalPromise = undefined;
+  });
+  return currentPromise;
+};
+
+export const preloadItemMoveModal = () => void loadItemMoveModal().catch(() => undefined);
+
+interface LazyItemMoveModalContentProps {
+  actions: { closeModal: () => void };
+  innerProps: ItemMoveModalProps;
+}
+
+const LazyItemMoveModalContent = (props: LazyItemMoveModalContentProps) => {
+  const { ItemMoveModal } = use(loadItemMoveModal());
+  const Component = ItemMoveModal.component;
+  return <Component {...props} />;
+};
+
+export const LazyItemMoveModal = createModal<ItemMoveModalProps>((props) => (
+  <ErrorBoundary
+    fallbackRender={({ error, resetErrorBoundary }) => (
+      <Center py="xl">
+        <WidgetError
+          error={error}
+          resetErrorBoundary={() => {
+            itemMoveModalPromise = undefined;
+            resetErrorBoundary();
+          }}
+        />
+      </Center>
+    )}
+  >
+    <Suspense
+      fallback={
+        <Center py="xl">
+          <Loader size="sm" />
+        </Center>
+      }
+    >
+      <LazyItemMoveModalContent {...props} />
+    </Suspense>
+  </ErrorBoundary>
+)).withOptions({
+  defaultTitle(t) {
+    return t("item.moveResize.title");
+  },
+  size: modalSizeForm,
+});

apps/nextjs/src/components/board/items/lazy-widget-edit-modal.tsx

@@ -0,0 +1,68 @@
+"use client";
+
+import { Suspense, use } from "react";
+import { Center, Loader } from "@mantine/core";
+import { ErrorBoundary } from "react-error-boundary";
+
+import type { WidgetKind } from "@homarr/definitions";
+import { createModal, modalSizeForm } from "@homarr/modals";
+import { WidgetError } from "@homarr/widgets/errors";
+import type { WidgetEditModalProps } from "@homarr/widgets/modals";
+
+let widgetEditModalPromise: Promise<typeof import("@homarr/widgets/modals")> | undefined;
+
+export const loadWidgetEditModal = () => {
+  if (widgetEditModalPromise) return widgetEditModalPromise;
+
+  const currentPromise = import("@homarr/widgets/modals");
+  widgetEditModalPromise = currentPromise;
+  void currentPromise.catch(() => {
+    if (widgetEditModalPromise === currentPromise) widgetEditModalPromise = undefined;
+  });
+  return currentPromise;
+};
+
+export const preloadWidgetEditModal = () => void loadWidgetEditModal().catch(() => undefined);
+
+interface LazyWidgetEditModalContentProps {
+  actions: { closeModal: () => void };
+  innerProps: WidgetEditModalProps<WidgetKind>;
+}
+
+const LazyWidgetEditModalContent = (props: LazyWidgetEditModalContentProps) => {
+  const { WidgetEditModal } = use(loadWidgetEditModal());
+  const Component = WidgetEditModal.component;
+  return <Component {...props} />;
+};
+
+export const LazyWidgetEditModal = createModal<WidgetEditModalProps<WidgetKind>>((props) => (
+  <ErrorBoundary
+    fallbackRender={({ error, resetErrorBoundary }) => (
+      <Center py="xl">
+        <WidgetError
+          error={error}
+          resetErrorBoundary={() => {
+            widgetEditModalPromise = undefined;
+            resetErrorBoundary();
+          }}
+        />
+      </Center>
+    )}
+  >
+    <Suspense
+      fallback={
+        <Center py="xl">
+          <Loader size="sm" />
+        </Center>
+      }
+    >
+      <LazyWidgetEditModalContent {...props} />
+    </Suspense>
+  </ErrorBoundary>
+)).withOptions({
+  keepMounted: true,
+  defaultTitle(t) {
+    return t("item.edit.title");
+  },
+  size: modalSizeForm,
+});

apps/nextjs/src/components/board/items/widget-context-menu.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import type { MutableRefObject, ReactNode } from "react";
-import { useCallback, useMemo } from "react";
+import { useCallback, useMemo, useState } from "react";
 import { Group, Loader, Menu, Switch, Text, Tooltip } from "@mantine/core";
 import {
   IconAlertTriangle,
@@ -13,10 +13,10 @@ import {
   IconTrash,
 } from "@tabler/icons-react";
 import type { QueryClient, QueryKey } from "@tanstack/react-query";
-import { useIsFetching, useQueryClient } from "@tanstack/react-query";
+import { partialMatchKey, useIsFetching, useQueryClient } from "@tanstack/react-query";
 
 import { clientApi } from "@homarr/api/client";
-import { useIntegrations, useSession } from "@homarr/auth/client";
+import { useSession } from "@homarr/auth/client";
 import { useRequiredBoard } from "@homarr/boards/context";
 import { useEditMode } from "@homarr/boards/edit-mode";
 import { useTimeAgo } from "@homarr/common";
@@ -25,63 +25,116 @@ import { useSettings } from "@homarr/settings";
 import { translateIfNecessary } from "@homarr/translation";
 import { useI18n, useScopedI18n } from "@homarr/translation/client";
 import type { TranslationFunction } from "@homarr/translation";
-import type { WidgetContextMenuAction } from "@homarr/widgets";
-import { reduceWidgetOptionsWithDefaultValues, widgetImports } from "@homarr/widgets";
-import { WidgetEditModal } from "@homarr/widgets/modals";
+import type { WidgetContextMenuAction, WidgetDefinition } from "@homarr/widgets/definition";
+import { getWidgetQueryKeys } from "@homarr/widgets/definition";
+import { reduceWidgetOptionsWithDefinition } from "@homarr/widgets/manifest";
 
 import type { SectionItem } from "~/app/[locale]/boards/_types";
 import { useSectionContext } from "../sections/section-context";
 import { useItemActions } from "./item-actions";
-import { useOpenItemMoveModal } from "./item-move-modal";
+import { LazyItemMoveModal, preloadItemMoveModal } from "./lazy-item-move-modal";
+import { LazyWidgetEditModal, preloadWidgetEditModal } from "./lazy-widget-edit-modal";
 
 interface WidgetContextMenuProps {
   item: SectionItem;
+  definition: WidgetDefinition;
   widgetStateRef: MutableRefObject<Record<string, unknown> | null>;
   children: ReactNode;
 }
 
-export const WidgetContextMenu = ({ item, widgetStateRef, children }: WidgetContextMenuProps) => {
+export const WidgetContextMenu = ({ item, definition, widgetStateRef, children }: WidgetContextMenuProps) => {
   const { data: session } = useSession();
+  const settings = useSettings();
+
+  if (!session || !settings.enableRightClickOnWidgets) return <>{children}</>;
+
+  return (
+    <WidgetContextMenuInner item={item} definition={definition} widgetStateRef={widgetStateRef} settings={settings}>
+      {children}
+    </WidgetContextMenuInner>
+  );
+};
+
+const WidgetContextMenuInner = ({
+  item,
+  definition,
+  widgetStateRef,
+  children,
+  settings,
+}: WidgetContextMenuProps & { settings: ReturnType<typeof useSettings> }) => {
+  const [isMenuOpen, setIsMenuOpen] = useState(false);
+
+  return (
+    <Menu
+      shadow="md"
+      width={300}
+      closeOnItemClick={false}
+      position="right-start"
+      offset={4}
+      opened={isMenuOpen}
+      onChange={setIsMenuOpen}
+    >
+      <Menu.ContextMenu>{children}</Menu.ContextMenu>
+      <Menu.Dropdown>
+        {isMenuOpen && (
+          <WidgetContextMenuDropdown
+            item={item}
+            definition={definition}
+            widgetStateRef={widgetStateRef}
+            settings={settings}
+          />
+        )}
+      </Menu.Dropdown>
+    </Menu>
+  );
+};
+
+type WidgetContextMenuDropdownProps = Omit<WidgetContextMenuProps, "children"> & {
+  settings: ReturnType<typeof useSettings>;
+};
+
+const WidgetContextMenuDropdown = ({ item, definition, widgetStateRef, settings }: WidgetContextMenuDropdownProps) => {
   const [isEditMode] = useEditMode();
   const board = useRequiredBoard();
   const tItem = useScopedI18n("item");
   const tMenu = useScopedI18n("item.menu.label");
   const t = useI18n();
-  const settings = useSettings();
-  const isRightClickEnabled = settings.enableRightClickOnWidgets;
-  const { openModal } = useModalAction(WidgetEditModal);
-  const openMoveModal = useOpenItemMoveModal();
+  const hasSupportedIntegrations =
+    "supportedIntegrations" in definition && (definition.supportedIntegrations?.length ?? 0) > 0;
+  const { openModal } = useModalAction(LazyWidgetEditModal);
+  const { openModal: openMoveModal } = useModalAction(LazyItemMoveModal);
   const { openConfirmModal } = useConfirmModal();
   const { updateItemOptions, updateItemAdvancedOptions, updateItemIntegrations, duplicateItem, removeItem } =
     useItemActions();
-  const integrationData = useIntegrations();
+  const { data: integrationData, isPending } = clientApi.integration.all.useQuery(undefined, {
+    enabled: hasSupportedIntegrations,
+  });
   const { mutate: saveBoard } = clientApi.board.saveBoard.useMutation();
-  const currentDefinition = useMemo(() => widgetImports[item.kind].definition, [item.kind]);
-  const { section } = useSectionContext();
+  const { gridstack } = useSectionContext().refs;
   const queryClient = useQueryClient();
 
-  const widgetQueryKey = useMemo(
-    () => ("queryKey" in currentDefinition ? (currentDefinition.queryKey as QueryKey) : [["widget", item.kind]]),
-    [currentDefinition, item.kind],
-  );
-  const isWidgetFetching = useIsFetching({ queryKey: widgetQueryKey }) > 0;
+  const widgetQueryKeys = useMemo(() => getWidgetQueryKeys(definition, item.kind), [definition, item.kind]);
+  const isWidgetFetching =
+    useIsFetching({
+      predicate: (query) => widgetQueryKeys.some((queryKey) => partialMatchKey(query.queryKey, queryKey)),
+    }) > 0;
   const handleRefetch = useCallback(() => {
-    void queryClient.refetchQueries({ queryKey: widgetQueryKey, type: "all" });
-  }, [queryClient, widgetQueryKey]);
+    void Promise.all(widgetQueryKeys.map((queryKey) => queryClient.refetchQueries({ queryKey, type: "all" })));
+  }, [queryClient, widgetQueryKeys]);
 
   const options = useMemo(
-    () => reduceWidgetOptionsWithDefaultValues(item.kind, settings, item.options) as Record<string, unknown>,
-    [item.kind, settings, item.options],
+    () => reduceWidgetOptionsWithDefinition(definition, settings, item.options),
+    [definition, settings, item.options],
   );
 
   type OptionDef = { type: string; skipContextMenu?: boolean };
   const toggleOptions = useMemo(() => {
-    const rawOptions = currentDefinition.createOptions(settings) as unknown as Record<string, OptionDef>;
+    const rawOptions = definition.createOptions(settings) as unknown as Record<string, OptionDef>;
     return Object.entries(rawOptions).filter(([, def]) => def.type === "switch" && !def.skipContextMenu);
-  }, [currentDefinition, settings]);
+  }, [definition, settings]);
 
   const widgetContextActions = useMemo(() => {
-    const def = currentDefinition as Record<string, unknown>;
+    const def = definition as unknown as Record<string, unknown>;
     if (typeof def.contextActions !== "function") return [];
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const actions = (def.contextActions as any)({
@@ -94,7 +147,7 @@ export const WidgetContextMenu = ({ item, widgetStateRef, children }: WidgetCont
       widgetStateRef,
     });
     return (Array.isArray(actions) ? actions : []) as WidgetContextMenuAction[];
-  }, [currentDefinition, options, item, updateItemOptions, isEditMode, board.id, widgetStateRef]);
+  }, [definition, options, item, updateItemOptions, isEditMode, board.id, widgetStateRef]);
 
   const persistBoard = useCallback(
     (updatedItems: typeof board.items) => {
@@ -107,6 +160,7 @@ export const WidgetContextMenu = ({ item, widgetStateRef, children }: WidgetCont
     openModal(
       {
         kind: item.kind,
+        definition,
         value: {
           advancedOptions: item.advancedOptions,
           options: item.options,
@@ -131,12 +185,12 @@ export const WidgetContextMenu = ({ item, widgetStateRef, children }: WidgetCont
             );
           }
         },
-        integrationData: integrationData.filter(
+        integrationData: (integrationData ?? []).filter(
           (integration) =>
-            "supportedIntegrations" in currentDefinition &&
-            (currentDefinition.supportedIntegrations as string[]).some((kind) => kind === integration.kind),
+            "supportedIntegrations" in definition &&
+            (definition.supportedIntegrations as string[]).some((kind) => kind === integration.kind),
         ),
-        integrationSupport: "supportedIntegrations" in currentDefinition,
+        integrationSupport: "supportedIntegrations" in definition,
         settings,
         appId: item.kind === "app" ? (item.options.appId as string | undefined) : undefined,
       },
@@ -150,7 +204,7 @@ export const WidgetContextMenu = ({ item, widgetStateRef, children }: WidgetCont
     updateItemAdvancedOptions,
     updateItemIntegrations,
     integrationData,
-    currentDefinition,
+    definition,
     settings,
     isEditMode,
     persistBoard,
@@ -168,132 +222,133 @@ export const WidgetContextMenu = ({ item, widgetStateRef, children }: WidgetCont
     [options, item.id, updateItemOptions, persistBoard, board],
   );
 
-  if (!session) return <>{children}</>;
-  if (!isRightClickEnabled || isEditMode) return <>{children}</>;
-
   const visibleWidgetActions = widgetContextActions.filter((a) => !a.hidden);
 
   return (
-    <Menu shadow="md" width={300} closeOnItemClick={false} position="right-start" offset={4}>
-      <Menu.ContextMenu>{children}</Menu.ContextMenu>
-      <Menu.Dropdown>
-        {toggleOptions.length > 0 && (
-          <>
-            <Menu.Label>{tMenu("options")}</Menu.Label>
-            {toggleOptions.map(([key]) => (
-              <Menu.Item key={key} onClick={() => handleToggle(key)(!options[key])}>
-                {/* eslint-disable-next-line @typescript-eslint/no-explicit-any */}
-                <Group wrap="nowrap">
-                  {String(translateIfNecessary(t, ((fn: any) => fn(`widget.${item.kind}.option.${key}.label`)) as any))}
-                  <Switch size="xs" checked={Boolean(options[key])} readOnly tabIndex={-1} ml="auto" />
-                </Group>
-              </Menu.Item>
-            ))}
-          </>
-        )}
-
-        {visibleWidgetActions.length > 0 && (
-          <>
-            {toggleOptions.length > 0 && <Menu.Divider />}
-            <Menu.Label>{tMenu("actions")}</Menu.Label>
-            {visibleWidgetActions.map((action) => {
-              const Icon = action.icon;
-              return (
-                <Menu.Item
-                  key={action.key}
-                  closeMenuOnClick
-                  leftSection={Icon ? <Icon size={16} /> : undefined}
-                  onClick={action.onClick}
-                  disabled={action.disabled}
-                  color={action.color}
-                >
-                  {String(translateIfNecessary(t, action.label))}
-                </Menu.Item>
-              );
-            })}
-          </>
-        )}
-
-        {isEditMode && (
-          <>
-            {(toggleOptions.length > 0 || visibleWidgetActions.length > 0) && <Menu.Divider />}
-            <Menu.Item
-              closeMenuOnClick
-              leftSection={<IconLayoutKanban size={16} />}
-              onClick={() => {
-                openMoveModal({
-                  entry: item,
-                  sourceSectionId: section.id,
-                });
-              }}
-            >
-              {tItem("action.moveResize")}
-            </Menu.Item>
-            <Menu.Item
-              closeMenuOnClick
-              leftSection={<IconCopy size={16} />}
-              onClick={() => duplicateItem({ itemId: item.id })}
-            >
-              {tItem("action.duplicate")}
-            </Menu.Item>
-          </>
-        )}
-
+    <>
+      {toggleOptions.length > 0 && (
         <>
-          {(toggleOptions.length > 0 || visibleWidgetActions.length > 0 || isEditMode) && <Menu.Divider />}
+          <Menu.Label>{tMenu("options")}</Menu.Label>
+          {toggleOptions.map(([key]) => (
+            <Menu.Item key={key} onClick={() => handleToggle(key)(!options[key])}>
+              {/* eslint-disable-next-line @typescript-eslint/no-explicit-any */}
+              <Group wrap="nowrap">
+                {String(translateIfNecessary(t, ((fn: any) => fn(`widget.${item.kind}.option.${key}.label`)) as any))}
+                <Switch size="xs" checked={Boolean(options[key])} readOnly tabIndex={-1} ml="auto" />
+              </Group>
+            </Menu.Item>
+          ))}
+        </>
+      )}
+
+      {visibleWidgetActions.length > 0 && (
+        <>
+          {toggleOptions.length > 0 && <Menu.Divider />}
+          <Menu.Label>{tMenu("actions")}</Menu.Label>
+          {visibleWidgetActions.map((action) => {
+            const Icon = action.icon;
+            return (
+              <Menu.Item
+                key={action.key}
+                closeMenuOnClick
+                leftSection={Icon ? <Icon size={16} /> : undefined}
+                onClick={action.onClick}
+                disabled={action.disabled}
+                color={action.color}
+              >
+                {String(translateIfNecessary(t, action.label))}
+              </Menu.Item>
+            );
+          })}
+        </>
+      )}
+
+      {isEditMode && (
+        <>
+          {(toggleOptions.length > 0 || visibleWidgetActions.length > 0) && <Menu.Divider />}
           <Menu.Item
-            leftSection={isWidgetFetching ? <Loader size={16} /> : <IconRefresh size={16} />}
-            onClick={handleRefetch}
-            disabled={isWidgetFetching}
+            closeMenuOnClick
+            leftSection={<IconLayoutKanban size={16} />}
+            onFocus={preloadItemMoveModal}
+            onPointerEnter={preloadItemMoveModal}
+            onClick={() => {
+              if (!gridstack.current) return;
+              openMoveModal({ item, columnCount: gridstack.current.getColumn(), gridStack: gridstack.current });
+            }}
           >
-            <Group justify="space-between" wrap="nowrap" gap="sm">
-              {tMenu("refresh")}
-              <WidgetQueryStatus
-                queryClient={queryClient}
-                queryKey={widgetQueryKey}
-                isFetching={isWidgetFetching}
-                t={t}
-              />
-            </Group>
+            {tItem("action.moveResize")}
           </Menu.Item>
-          <Menu.Item closeMenuOnClick leftSection={<IconSettings size={16} />} onClick={openEditModal}>
-            {tMenu("settings")}
+          <Menu.Item
+            closeMenuOnClick
+            leftSection={<IconCopy size={16} />}
+            onClick={() => duplicateItem({ itemId: item.id })}
+          >
+            {tItem("action.duplicate")}
           </Menu.Item>
         </>
+      )}
 
-        {isEditMode && (
-          <>
-            <Menu.Divider />
-            <Menu.Item
-              closeMenuOnClick
-              color="red"
-              leftSection={<IconTrash size={16} />}
-              onClick={() => {
-                openConfirmModal({
-                  title: tItem("remove.title"),
-                  children: tItem("remove.message"),
-                  onConfirm: () => removeItem({ itemId: item.id }),
-                });
-              }}
-            >
-              {tItem("action.remove")}
-            </Menu.Item>
-          </>
-        )}
-      </Menu.Dropdown>
-    </Menu>
+      <>
+        {(toggleOptions.length > 0 || visibleWidgetActions.length > 0 || isEditMode) && <Menu.Divider />}
+        <Menu.Item
+          leftSection={isWidgetFetching ? <Loader size={16} /> : <IconRefresh size={16} />}
+          onClick={handleRefetch}
+          disabled={isWidgetFetching}
+        >
+          <Group justify="space-between" wrap="nowrap" gap="sm">
+            {tMenu("refresh")}
+            <WidgetQueryStatus
+              queryClient={queryClient}
+              queryKeys={widgetQueryKeys}
+              isFetching={isWidgetFetching}
+              t={t}
+            />
+          </Group>
+        </Menu.Item>
+        <Menu.Item
+          closeMenuOnClick
+          leftSection={<IconSettings size={16} />}
+          onClick={openEditModal}
+          onFocus={preloadWidgetEditModal}
+          onPointerEnter={preloadWidgetEditModal}
+          disabled={hasSupportedIntegrations && isPending}
+        >
+          {tMenu("settings")}
+        </Menu.Item>
+      </>
+
+      {isEditMode && (
+        <>
+          <Menu.Divider />
+          <Menu.Item
+            closeMenuOnClick
+            color="red"
+            leftSection={<IconTrash size={16} />}
+            onClick={() => {
+              openConfirmModal({
+                title: tItem("remove.title"),
+                children: tItem("remove.message"),
+                onConfirm: () => removeItem({ itemId: item.id }),
+              });
+            }}
+          >
+            {tItem("action.remove")}
+          </Menu.Item>
+        </>
+      )}
+    </>
   );
 };
 
 interface WidgetQueryStatusProps {
   queryClient: QueryClient;
-  queryKey: QueryKey;
+  queryKeys: QueryKey[];
   isFetching: boolean;
   t: TranslationFunction;
 }
 
-const WidgetQueryStatus = ({ queryClient, queryKey, isFetching, t }: WidgetQueryStatusProps) => {
-  const queries = queryClient.getQueryCache().findAll({ queryKey });
+const WidgetQueryStatus = ({ queryClient, queryKeys, isFetching, t }: WidgetQueryStatusProps) => {
+  const queries = [...new Set(queryKeys.flatMap((queryKey) => queryClient.getQueryCache().findAll({ queryKey })))];
   const timestamps = queries.map((query) => query.state.dataUpdatedAt).filter(Boolean);
   const latest = timestamps.length > 0 ? Math.max(...timestamps) : 0;
   const ageLabel = useTimeAgo(new Date(latest));
@@ -331,7 +386,8 @@ const WidgetQueryStatus = ({ queryClient, queryKey, isFetching, t }: WidgetQuery
         <Group gap={4} wrap="nowrap">
           <IconAlertTriangle size={12} color="var(--mantine-color-red-6)" />
           <Text size="xs" c="red.6">
-            {t("item.menu.status.error")} · {ageLabel}
+            {t("item.menu.status.error")}
+            {latest > 0 && ` · ${ageLabel}`}
           </Text>
         </Group>
       </Tooltip>
@@ -342,7 +398,8 @@ const WidgetQueryStatus = ({ queryClient, queryKey, isFetching, t }: WidgetQuery
     <Group gap={4} wrap="nowrap">
       <IconCircleCheck size={12} color="var(--mantine-color-green-6)" />
       <Text size="xs" c="dimmed">
-        {t("item.menu.status.success")} · {ageLabel}
+        {t("item.menu.status.success")}
+        {latest > 0 && ` · ${ageLabel}`}
       </Text>
     </Group>
   );

apps/nextjs/src/components/board/items/widget-hover-metadata.ts

@@ -1,155 +0,0 @@
-import { objectEntries } from "@homarr/common";
-import type { IntegrationKind, WidgetKind } from "@homarr/definitions";
-import type { SettingsContextProps } from "@homarr/settings/creator";
-import type { WidgetOptionDefinition, WidgetOptionType } from "@homarr/widgets";
-import { reduceWidgetOptionsWithDefaultValues, widgetImports } from "@homarr/widgets";
-
-import type { SectionItem } from "~/app/[locale]/boards/_types";
-
-export type Translator = {
-  (key: string): string;
-};
-
-export interface HoverMetadataItem {
-  label: string;
-  value: string;
-}
-
-const maxMetadataItems = 3;
-
-const skippedOptionTypes: Partial<Record<WidgetOptionType, true>> = {
-  app: true,
-  anchorNote: true,
-  dynamicSelect: true,
-  sortableItemList: true,
-  multiReleasesRepositories: true,
-  umamiEventName: true,
-  umamiEventNames: true,
-  umamiWebsite: true,
-};
-
-const isEqualValue = (left: unknown, right: unknown) => JSON.stringify(left) === JSON.stringify(right);
-
-type OptionDefinitionWithRules = WidgetOptionDefinition & {
-  shouldHide?: (options: never, integrationKinds: IntegrationKind[]) => boolean;
-  options?: readonly { value: unknown; label: unknown }[];
-};
-
-type OptionFormatter = (value: unknown, definition: OptionDefinitionWithRules, t: Translator) => string | null;
-
-const resolveSelectLabel = (value: unknown, definition: OptionDefinitionWithRules, t: Translator) => {
-  const match = definition.options?.find((option) => option.value === value);
-  const label = match?.label;
-  const fallbackLabel = () => String(value);
-  const labelResolvers: Record<string, () => string> = {
-    function: () => (label as (translator: Translator) => string)(t),
-    string: () => label as string,
-    missing: fallbackLabel,
-  };
-  const labelType = typeof label;
-  const resolveLabel: () => string = labelResolvers[labelType] ?? fallbackLabel;
-  return resolveLabel();
-};
-
-const optionTypeFormatters: Partial<Record<WidgetOptionType, OptionFormatter>> = {
-  switch: (value, _, t) => {
-    const switchLabels: Record<string, string> = {
-      true: t("common.action.show"),
-      false: t("common.action.hide"),
-    };
-    return switchLabels[String(Boolean(value))] ?? null;
-  },
-  text: (value) => {
-    const text = String(value).trim();
-    return text.length > 0 ? text : null;
-  },
-  number: (value) => String(value),
-  slider: (value) => String(value),
-  select: (value, definition, t) => resolveSelectLabel(value, definition, t),
-  multiSelect: (value) => {
-    const items = value as unknown[];
-    return items.length > 0 ? String(items.length) : null;
-  },
-  multiText: (value) => {
-    const items = (value as string[]).filter((entry) => entry.trim().length > 0);
-    return items.length > 0 ? items.join(", ") : null;
-  },
-  location: (value) => {
-    const location = value as { name?: string };
-    const name = location.name?.trim() ?? "";
-    return name.length > 0 ? name : null;
-  },
-};
-
-const formatOptionValue = (
-  type: WidgetOptionType,
-  value: unknown,
-  definition: OptionDefinitionWithRules,
-  t: Translator,
-) => {
-  const formatter = optionTypeFormatters[type];
-  return formatter?.(value, definition, t) ?? null;
-};
-
-const getOptionLabel = (kind: WidgetKind, key: string, t: Translator) => {
-  const labelKey = `widget.${kind}.option.${key}.label`;
-  const translated = t(labelKey);
-  return translated === labelKey ? key : translated;
-};
-
-export const collectWidgetHoverMetadata = (
-  item: SectionItem,
-  settings: Pick<SettingsContextProps, "enableStatusByDefault" | "forceDisableStatus">,
-  integrationKinds: IntegrationKind[],
-  t: Translator,
-): HoverMetadataItem[] => {
-  const { definition } = widgetImports[item.kind];
-  const optionDefinitions = definition.createOptions(settings) as Record<string, OptionDefinitionWithRules>;
-  const resolvedOptions = reduceWidgetOptionsWithDefaultValues(item.kind, settings, item.options);
-
-  return objectEntries(optionDefinitions)
-    .filter(([key, optionDefinition]) => {
-      const skip = skippedOptionTypes[optionDefinition.type];
-      const hidden = optionDefinition.shouldHide?.(resolvedOptions as never, integrationKinds);
-      const unchanged = isEqualValue(resolvedOptions[key], optionDefinition.defaultValue);
-      return !skip && !hidden && !unchanged;
-    })
-    .map(([key, optionDefinition]) => {
-      const formattedValue = formatOptionValue(optionDefinition.type, resolvedOptions[key], optionDefinition, t);
-      return {
-        label: getOptionLabel(item.kind, key, t),
-        value: formattedValue ?? "",
-      };
-    })
-    .filter((entry) => entry.value.length > 0)
-    .slice(0, maxMetadataItems);
-};
-
-interface DisplayNameSource {
-  matches: (item: SectionItem, options: Record<string, unknown>) => boolean;
-  resolve: (item: SectionItem, options: Record<string, unknown>) => string;
-}
-
-const displayNameSources: DisplayNameSource[] = [
-  {
-    matches: (item) => Boolean(item.advancedOptions.title?.trim()),
-    resolve: (item) => item.advancedOptions.title?.trim() ?? "",
-  },
-  {
-    matches: (item, options) =>
-      item.kind === "clock" &&
-      Boolean(options.customTitleToggle) &&
-      String(options.customTitle ?? "").trim().length > 0,
-    resolve: (_, options) => String(options.customTitle).trim(),
-  },
-];
-
-export const resolveWidgetDisplayName = (
-  item: SectionItem,
-  settings: Pick<SettingsContextProps, "enableStatusByDefault" | "forceDisableStatus">,
-  t: Translator,
-) => {
-  const resolvedOptions = reduceWidgetOptionsWithDefaultValues(item.kind, settings, item.options);
-  const source = displayNameSources.find((entry) => entry.matches(item, resolvedOptions));
-  return source?.resolve(item, resolvedOptions) ?? t(`widget.${item.kind}.name`);
-};

apps/nextjs/src/components/board/items/widget-hover-overlay.tsx

@@ -1,12 +1,13 @@
 "use client";
 
+import { Suspense, use } from "react";
 import { Avatar, Text, Tooltip } from "@mantine/core";
 
 import type { RouterOutputs } from "@homarr/api";
 import { useEditMode } from "@homarr/boards/edit-mode";
 import { getIconUrl } from "@homarr/definitions";
 import { useI18n } from "@homarr/translation/client";
-import { widgetImports } from "@homarr/widgets";
+import { loadWidgetDefinition } from "@homarr/widgets/manifest";
 
 import type { SectionItem } from "~/app/[locale]/boards/_types";
 import classes from "./widget-hover-overlay.module.css";
@@ -18,8 +19,19 @@ interface WidgetHoverOverlayProps {
 
 export const WidgetHoverOverlay = ({ item, integrations }: WidgetHoverOverlayProps) => {
   const [isEditMode] = useEditMode();
+
+  if (!isEditMode) return null;
+
+  return (
+    <Suspense fallback={null}>
+      <LoadedWidgetHoverOverlay item={item} integrations={integrations} />
+    </Suspense>
+  );
+};
+
+const LoadedWidgetHoverOverlay = ({ item, integrations }: WidgetHoverOverlayProps) => {
   const t = useI18n();
-  const { definition } = widgetImports[item.kind];
+  const definition = use(loadWidgetDefinition(item.kind));
   const WidgetIcon = definition.icon;
 
   const displayName = item.advancedOptions.title?.trim() || t(`widget.${item.kind}.name`);
@@ -28,10 +40,6 @@ export const WidgetHoverOverlay = ({ item, integrations }: WidgetHoverOverlayPro
     item.integrationIds.includes(integration.id),
   );
 
-  if (!isEditMode) {
-    return null;
-  }
-
   return (
     <div className={classes.wrapper}>
       <div className={classes.panel}>

apps/nextjs/src/components/board/items/widget-query-recovery.spec.ts

@@ -1,27 +1,36 @@
 import { QueryClient } from "@tanstack/react-query";
 import { describe, expect, test } from "vitest";
 
-import { removePersistedWidgetQueries } from "./widget-query-recovery";
+import { removeWidgetDataQueries } from "./widget-query-recovery";
 
-describe("removePersistedWidgetQueries", () => {
-  test("removes stale widget queries and allows fresh data to be fetched", async () => {
+describe("removeWidgetDataQueries", () => {
+  test("removes only the failed widget prefix and allows fresh data to be fetched", async () => {
     const queryClient = new QueryClient();
     const crashedWidgetQueryKey = [["widget", "mediaServer", "getCurrentStreams"], { input: {} }];
+    const sameWidgetQueryKey = [["widget", "mediaServer", "getLibraries"], { input: {} }];
+    const unrelatedWidgetQueryKey = [["widget", "calendar", "getEvents"], { input: {} }];
+    const appQueryKey = [["app", "byId"], { input: {} }];
     const unrelatedQueryKey = [["user", "me"], { input: {} }];
 
     queryClient.setQueryData(crashedWidgetQueryKey, "stale");
+    queryClient.setQueryData(sameWidgetQueryKey, "related");
+    queryClient.setQueryData(unrelatedWidgetQueryKey, "other-widget");
+    queryClient.setQueryData(appQueryKey, "app");
     queryClient.setQueryData(unrelatedQueryKey, "unrelated");
 
-    removePersistedWidgetQueries(queryClient);
+    removeWidgetDataQueries(queryClient, [[["widget", "mediaServer"]]]);
 
     expect(queryClient.getQueryData(crashedWidgetQueryKey)).toBeUndefined();
+    expect(queryClient.getQueryData(sameWidgetQueryKey)).toBeUndefined();
+    expect(queryClient.getQueryData(unrelatedWidgetQueryKey)).toBe("other-widget");
+    expect(queryClient.getQueryData(appQueryKey)).toBe("app");
     expect(queryClient.getQueryData(unrelatedQueryKey)).toBe("unrelated");
     await expect(
       queryClient.fetchQuery({ queryKey: crashedWidgetQueryKey, queryFn: () => Promise.resolve("fresh") }),
     ).resolves.toBe("fresh");
   });
 
-  test("removes persisted queries outside the widget router", () => {
+  test("uses an explicit supporting query prefix without purging other supporting data", () => {
     const queryClient = new QueryClient();
     const dockerQueryKey = [["docker", "getContainers"], { input: {} }];
     const appQueryKey = [["app", "byId"], { input: {} }];
@@ -31,14 +40,14 @@ describe("removePersistedWidgetQueries", () => {
     queryClient.setQueryData(appQueryKey, "stale");
     queryClient.setQueryData(unrelatedQueryKey, "unrelated");
 
-    removePersistedWidgetQueries(queryClient);
+    removeWidgetDataQueries(queryClient, [[["docker", "getContainers"]]]);
 
     expect(queryClient.getQueryData(dockerQueryKey)).toBeUndefined();
-    expect(queryClient.getQueryData(appQueryKey)).toBeUndefined();
+    expect(queryClient.getQueryData(appQueryKey)).toBe("stale");
     expect(queryClient.getQueryData(unrelatedQueryKey)).toBe("unrelated");
   });
 
-  test("removes persisted widget queries when the widget kind and query path differ", () => {
+  test("uses the definition query prefix when the widget kind and query path differ", () => {
     const queryClient = new QueryClient();
     const crashedWidgetQueryKey = [["widget", "anchorNotes", "getNote"], { input: {} }];
     const unrelatedQueryKey = [["user", "me"], { input: {} }];
@@ -46,7 +55,7 @@ describe("removePersistedWidgetQueries", () => {
     queryClient.setQueryData(crashedWidgetQueryKey, "stale");
     queryClient.setQueryData(unrelatedQueryKey, "unrelated");
 
-    removePersistedWidgetQueries(queryClient);
+    removeWidgetDataQueries(queryClient, [[["widget", "anchorNotes"]]]);
 
     expect(queryClient.getQueryData(crashedWidgetQueryKey)).toBeUndefined();
     expect(queryClient.getQueryData(unrelatedQueryKey)).toBe("unrelated");

apps/nextjs/src/components/board/items/widget-query-recovery.ts

@@ -1,7 +1,5 @@
-import type { QueryClient } from "@tanstack/react-query";
+import type { QueryClient, QueryKey } from "@tanstack/react-query";
 
-import { isPersistableWidgetQueryKey } from "@homarr/api/query-cache";
-
-export const removePersistedWidgetQueries = (queryClient: QueryClient) => {
-  queryClient.removeQueries({ predicate: (query) => isPersistableWidgetQueryKey(query.queryKey) });
+export const removeWidgetDataQueries = (queryClient: QueryClient, queryKeys: QueryKey[]) => {
+  queryKeys.forEach((queryKey) => queryClient.removeQueries({ queryKey }));
 };

apps/nextjs/src/components/board/layout/README.md

@@ -1,27 +0,0 @@
-# Fixed dashboard geometry
-
-The board uses fixed logical units:
-
-- one `1 × 1` item is exactly `200 × 200` logical pixels;
-- the gap is always `24` logical pixels, giving a `224` pixel track pitch;
-- multi-cell items include the gaps between their cells (`2 × 1` is `424 × 200`);
-- the canvas is transformed once with one uniform scale derived from its available width.
-
-Items keep the same logical dimensions at every viewport. The viewport reserves
-the painted size while the inner canvas remains at its logical dimensions, so a
-widget's `clientWidth`, `clientHeight`, and `ResizeObserver` measurements stay
-stable.
-
-The read-only renderer should:
-
-1. convert persisted `xOffset/yOffset/width/height` values to `x/y/w/h`;
-2. apply collapsed container heights and call `getCollapsedDisplayLayout`;
-3. render DOM children in `sortGridPlacementsForReadingOrder` order;
-4. position children with `getLogicalItemStyle`;
-5. wrap them with `getScaledCanvasStyles` and the read-only semantic helpers.
-
-Edit mode can use any interaction library, but its final coordinates should be
-normalized through this core. `placeGridItem` is the deterministic
-keyboard/numeric fallback: the active item is pinned while collisions move out
-of the way and all other items compact vertically. Pointer coordinates from a
-scaled editor can be converted with `toLogicalCanvasPoint`.

apps/nextjs/src/components/board/layout/board-lanes.ts

@@ -1,94 +0,0 @@
-import type { BoardLane } from "@homarr/definitions";
-import { getBoardLaneColumnCount, getRootSectionLane } from "@homarr/definitions";
-
-import type { Board, EmptySection } from "~/app/[locale]/boards/_types";
-import { getLogicalTrackSize, getLayoutRowCount, normalizeGridPlacement } from "./geometry";
-import { getCollapsedDisplayLayout } from "./reflow";
-import type { GridPlacement } from "./types";
-
-export { getBoardLaneColumnCount };
-
-export const getRootSectionForLane = (board: Board, lane: BoardLane): EmptySection | undefined => {
-  const roots = board.sections.filter(
-    (section): section is EmptySection => section.kind === "empty" && getRootSectionLane(section.xOffset) === lane,
-  );
-  if (roots.length > 1) {
-    throw new Error(`Board "${board.id}" has multiple ${lane} canvas roots`);
-  }
-
-  return roots[0];
-};
-
-export const getInitialBoardLogicalHeight = (board: Board, layoutId: string) => {
-  const layout = board.layouts.find((candidate) => candidate.id === layoutId);
-  if (!layout) return 0;
-
-  const rowCounts = (["left", "main", "right"] as const).flatMap((lane) => {
-    const columnCount = getBoardLaneColumnCount(layout, lane);
-    const root = getRootSectionForLane(board, lane);
-    if (columnCount === 0 || !root) return [];
-
-    const placements: GridPlacement[] = [
-      ...board.items.flatMap((item) => {
-        const itemLayout = item.layouts.find(
-          (candidate) => candidate.layoutId === layoutId && candidate.sectionId === root.id,
-        );
-        return itemLayout
-          ? [
-              normalizeGridPlacement(
-                {
-                  id: item.id,
-                  type: "item" as const,
-                  x: itemLayout.xOffset,
-                  y: itemLayout.yOffset,
-                  w: itemLayout.width,
-                  h: itemLayout.height,
-                },
-                columnCount,
-              ),
-            ]
-          : [];
-      }),
-      ...board.sections.flatMap((section) => {
-        if (section.kind !== "dynamic") return [];
-        const sectionLayout = section.layouts.find(
-          (candidate) => candidate.layoutId === layoutId && candidate.parentSectionId === root.id,
-        );
-        return sectionLayout
-          ? [
-              normalizeGridPlacement(
-                {
-                  id: section.id,
-                  type: "section" as const,
-                  x: sectionLayout.xOffset,
-                  y: sectionLayout.yOffset,
-                  w: sectionLayout.width,
-                  h: sectionLayout.height,
-                },
-                columnCount,
-              ),
-            ]
-          : [];
-      }),
-    ];
-    const collapsedSectionIds = new Set(
-      board.sections
-        .filter(
-          (section) =>
-            section.kind === "dynamic" &&
-            section.collapsed &&
-            section.options.collapsible &&
-            placements.some((placement) => placement.id === section.id),
-        )
-        .map((section) => section.id),
-    );
-    const displayPlacements =
-      collapsedSectionIds.size > 0
-        ? getCollapsedDisplayLayout(placements, { columnCount, collapsedItemIds: collapsedSectionIds })
-        : placements;
-
-    return [getLayoutRowCount(displayPlacements)];
-  });
-
-  return getLogicalTrackSize(Math.max(0, ...rowCounts));
-};

apps/nextjs/src/components/board/layout/constants.ts

@@ -1,10 +0,0 @@
-/**
- * A grid unit is a fixed logical size. The canvas is scaled as one surface;
- * individual cards never change their internal layout at different viewports.
- */
-export const LOGICAL_GRID_CELL_SIZE = 200;
-export const LOGICAL_GRID_GAP = 24;
-export const LOGICAL_GRID_PITCH = LOGICAL_GRID_CELL_SIZE + LOGICAL_GRID_GAP;
-export const MIN_ACCESSIBLE_CANVAS_SCALE = 0.75;
-
-export const COLLAPSED_SECTION_ROW_COUNT = 1;

apps/nextjs/src/components/board/layout/geometry.ts

@@ -1,54 +0,0 @@
-import type { CSSProperties } from "react";
-
-import { LOGICAL_GRID_CELL_SIZE, LOGICAL_GRID_GAP, LOGICAL_GRID_PITCH } from "./constants";
-import type { GridCoordinates, GridPlacement } from "./types";
-
-export const getLogicalTrackSize = (trackCount: number) => {
-  const normalizedTrackCount = toNonNegativeInteger(trackCount);
-  if (normalizedTrackCount === 0) return 0;
-
-  return normalizedTrackCount * LOGICAL_GRID_CELL_SIZE + (normalizedTrackCount - 1) * LOGICAL_GRID_GAP;
-};
-
-export const getLogicalItemStyle = ({ x, y, w, h }: GridCoordinates): CSSProperties => ({
-  position: "absolute",
-  left: x * LOGICAL_GRID_PITCH,
-  top: y * LOGICAL_GRID_PITCH,
-  width: getLogicalTrackSize(w),
-  height: getLogicalTrackSize(h),
-});
-
-export const getLayoutRowCount = (placements: readonly GridCoordinates[]) =>
-  placements.reduce((rowCount, placement) => Math.max(rowCount, placement.y + placement.h), 0);
-
-export const normalizeGridPlacement = <TPlacement extends GridPlacement>(
-  placement: TPlacement,
-  columnCount: number,
-): TPlacement => {
-  const normalizedColumnCount = toPositiveInteger(columnCount, "columnCount");
-  const width = Math.min(toPositiveInteger(placement.w, "placement.w"), normalizedColumnCount);
-  const x = Math.min(Math.max(0, toNonNegativeInteger(placement.x)), normalizedColumnCount - width);
-
-  return {
-    ...placement,
-    x,
-    y: toNonNegativeInteger(placement.y),
-    w: width,
-    h: toPositiveInteger(placement.h, "placement.h"),
-  };
-};
-
-const toNonNegativeInteger = (value: number) => Math.max(0, Math.trunc(toFiniteNumber(value, "value")));
-
-const toPositiveInteger = (value: number, name: string) => {
-  const integer = Math.trunc(toFiniteNumber(value, name));
-  if (integer < 1) throw new RangeError(`${name} must be at least 1`);
-
-  return integer;
-};
-
-const toFiniteNumber = (value: number, name: string) => {
-  if (!Number.isFinite(value)) throw new TypeError(`${name} must be finite`);
-
-  return value;
-};

apps/nextjs/src/components/board/layout/index.ts

@@ -1,6 +0,0 @@
-export * from "./constants";
-export * from "./board-lanes";
-export * from "./geometry";
-export * from "./reflow";
-export * from "./semantics";
-export * from "./types";

apps/nextjs/src/components/board/layout/reflow.ts

@@ -1,140 +0,0 @@
-import { COLLAPSED_SECTION_ROW_COUNT } from "./constants";
-import { normalizeGridPlacement } from "./geometry";
-import type { GridPlacement } from "./types";
-
-interface ReflowOptions {
-  columnCount: number;
-  /**
-   * A pinned item keeps its requested x/y while every other item compacts
-   * around it. Use this for the item currently being moved or resized.
-   */
-  pinnedItemId?: string;
-}
-
-interface CollapsedLayoutOptions {
-  columnCount: number;
-  collapsedItemIds: ReadonlySet<string>;
-  collapsedRowCount?: number;
-}
-
-export const doGridPlacementsOverlap = (first: GridPlacement, second: GridPlacement) =>
-  first.x < second.x + second.w &&
-  first.x + first.w > second.x &&
-  first.y < second.y + second.h &&
-  first.y + first.h > second.y;
-
-/**
- * Resolves overlaps and vertically compacts items. Ordering is based on the
- * persisted position and stable id, so the result does not depend on React or
- * database array order.
- */
-export const reflowVerticalLayout = <TPlacement extends GridPlacement>(
-  placements: readonly TPlacement[],
-  { columnCount, pinnedItemId }: ReflowOptions,
-): TPlacement[] => {
-  assertUniqueIds(placements);
-
-  const normalized = placements.map((placement) => normalizeGridPlacement(placement, columnCount));
-  const pinned = pinnedItemId ? normalized.find((placement) => placement.id === pinnedItemId) : undefined;
-
-  if (pinnedItemId && !pinned) {
-    throw new Error(`Pinned grid item "${pinnedItemId}" does not exist`);
-  }
-
-  const placed: TPlacement[] = pinned ? [pinned] : [];
-  const candidates = normalized.filter((placement) => placement.id !== pinnedItemId).toSorted(comparePlacements);
-
-  for (const candidate of candidates) {
-    placed.push({
-      ...candidate,
-      y: findFirstAvailableRow(candidate, placed),
-    });
-  }
-
-  const byId = new Map(placed.map((placement) => [placement.id, placement]));
-  return normalized.map((placement) => getRequiredPlacement(byId, placement.id));
-};
-
-/**
- * Produces the view-only layout after inline containers are collapsed. Only
- * display geometry changes; callers retain the persisted expanded height.
- */
-export const getCollapsedDisplayLayout = <TPlacement extends GridPlacement>(
-  placements: readonly TPlacement[],
-  { columnCount, collapsedItemIds, collapsedRowCount = COLLAPSED_SECTION_ROW_COUNT }: CollapsedLayoutOptions,
-): TPlacement[] => {
-  if (collapsedRowCount < 1 || !Number.isInteger(collapsedRowCount)) {
-    throw new RangeError("collapsedRowCount must be a positive integer");
-  }
-
-  return reflowVerticalLayout(
-    placements.map((placement) =>
-      collapsedItemIds.has(placement.id)
-        ? {
-            ...placement,
-            h: collapsedRowCount,
-          }
-        : placement,
-    ),
-    { columnCount },
-  );
-};
-
-/**
- * Applies the requested placement and pins it while neighbors compact into
- * free space or move down. This is the deterministic fallback used by
- * keyboard/numeric editing and can also validate a drag library result.
- */
-export const placeGridItem = <TPlacement extends GridPlacement>(
-  placements: readonly TPlacement[],
-  nextPlacement: TPlacement,
-  columnCount: number,
-) => {
-  if (!placements.some((placement) => placement.id === nextPlacement.id)) {
-    throw new Error(`Grid item "${nextPlacement.id}" does not exist`);
-  }
-
-  return reflowVerticalLayout(
-    placements.map((placement) => (placement.id === nextPlacement.id ? nextPlacement : placement)),
-    {
-      columnCount,
-      pinnedItemId: nextPlacement.id,
-    },
-  );
-};
-
-export const sortGridPlacementsForReadingOrder = <TPlacement extends GridPlacement>(
-  placements: readonly TPlacement[],
-) => placements.toSorted(comparePlacements);
-
-const findFirstAvailableRow = (candidate: GridPlacement, placed: readonly GridPlacement[]) => {
-  let y = 0;
-  for (;;) {
-    const atRow = { ...candidate, y };
-    const collisions = placed.filter((placement) => doGridPlacementsOverlap(atRow, placement));
-    if (collisions.length === 0) return y;
-
-    y = Math.max(...collisions.map((placement) => placement.y + placement.h));
-  }
-};
-
-const comparePlacements = (first: GridPlacement, second: GridPlacement) =>
-  first.y - second.y || first.x - second.x || (first.id === second.id ? 0 : first.id < second.id ? -1 : 1);
-
-const assertUniqueIds = (placements: readonly GridPlacement[]) => {
-  const ids = new Set<string>();
-  for (const placement of placements) {
-    if (ids.has(placement.id)) throw new Error(`Duplicate grid item id "${placement.id}"`);
-    ids.add(placement.id);
-  }
-};
-
-const getRequiredPlacement = <TPlacement extends GridPlacement>(
-  placements: ReadonlyMap<string, TPlacement>,
-  id: string,
-) => {
-  const placement = placements.get(id);
-  if (!placement) throw new Error(`Grid item "${id}" was lost during layout`);
-
-  return placement;
-};

apps/nextjs/src/components/board/layout/scaled-board-canvas.module.css

@@ -1,51 +0,0 @@
-.viewport {
-  width: 100%;
-  max-width: 100%;
-  min-width: 0;
-  overflow: visible;
-  overscroll-behavior-inline: contain;
-}
-
-.viewport[data-board-hydrated="false"] {
-  overflow: clip;
-}
-
-.sizer {
-  position: relative;
-}
-
-.canvas {
-  position: absolute;
-  inset: 0 auto auto 0;
-  transform-origin: top left;
-  will-change: transform;
-
-  /*
-   * Keep dashboard UI at its normal readable density while the fixed canvas
-   * is fitted below 100%. Above 100%, the canvas still behaves like browser
-   * zoom and enlarges everything together.
-   */
-  --mantine-scale: var(--board-canvas-ui-scale, 1);
-  --mantine-spacing-xs: calc(0.625rem * var(--board-canvas-ui-scale, 1));
-  --mantine-spacing-sm: calc(0.75rem * var(--board-canvas-ui-scale, 1));
-  --mantine-spacing-md: calc(1rem * var(--board-canvas-ui-scale, 1));
-  --mantine-spacing-lg: calc(1.25rem * var(--board-canvas-ui-scale, 1));
-  --mantine-spacing-xl: calc(2rem * var(--board-canvas-ui-scale, 1));
-  --mantine-font-size-xs: calc(0.75rem * var(--board-canvas-ui-scale, 1));
-  --mantine-font-size-sm: calc(0.875rem * var(--board-canvas-ui-scale, 1));
-  --mantine-font-size-md: calc(1rem * var(--board-canvas-ui-scale, 1));
-  --mantine-font-size-lg: calc(1.125rem * var(--board-canvas-ui-scale, 1));
-  --mantine-font-size-xl: calc(1.25rem * var(--board-canvas-ui-scale, 1));
-  --mantine-h1-font-size: calc(2.125rem * var(--board-canvas-ui-scale, 1));
-  --mantine-h2-font-size: calc(1.625rem * var(--board-canvas-ui-scale, 1));
-  --mantine-h3-font-size: calc(1.375rem * var(--board-canvas-ui-scale, 1));
-  --mantine-h4-font-size: calc(1.125rem * var(--board-canvas-ui-scale, 1));
-  --mantine-h5-font-size: calc(1rem * var(--board-canvas-ui-scale, 1));
-  --mantine-h6-font-size: calc(0.875rem * var(--board-canvas-ui-scale, 1));
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .canvas {
-    will-change: auto;
-  }
-}

apps/nextjs/src/components/board/layout/scaled-board-canvas.tsx

@@ -1,92 +0,0 @@
-"use client";
-
-import type { PropsWithChildren } from "react";
-import { useEffect, useMemo, useState } from "react";
-import { Box } from "@mantine/core";
-import { useElementSize } from "@mantine/hooks";
-
-import { MIN_ACCESSIBLE_CANVAS_SCALE } from "./constants";
-import classes from "./scaled-board-canvas.module.css";
-
-export { MIN_ACCESSIBLE_CANVAS_SCALE };
-
-export const calculateBoardCanvasScale = (availableWidth: number, logicalWidth: number) => {
-  if (!Number.isFinite(availableWidth) || !Number.isFinite(logicalWidth)) return 1;
-  if (availableWidth <= 0 || logicalWidth <= 0) return 1;
-
-  return Math.max(MIN_ACCESSIBLE_CANVAS_SCALE, availableWidth / logicalWidth);
-};
-
-export const calculateBoardUiScale = (canvasScale: number) => {
-  if (!Number.isFinite(canvasScale) || canvasScale <= 0) return 1;
-
-  return canvasScale < 1 ? 1 / canvasScale : 1;
-};
-
-interface ScaledBoardCanvasProps {
-  logicalWidth: number;
-  initialLogicalHeight: number;
-  initialAvailableWidth: number;
-  label: string;
-}
-
-/**
- * Scales the complete board as one surface while keeping widget layout in
- * fixed logical pixels. The scale floor deliberately allows horizontal
- * overflow so browser zoom still magnifies content instead of being cancelled
- * by responsive downscaling.
- */
-export const ScaledBoardCanvas = ({
-  logicalWidth,
-  initialLogicalHeight,
-  initialAvailableWidth,
-  label,
-  children,
-}: PropsWithChildren<ScaledBoardCanvasProps>) => {
-  const { ref: viewportRef, width: availableWidth } = useElementSize<HTMLDivElement>();
-  const { ref: canvasRef, height: logicalHeight } = useElementSize<HTMLDivElement>();
-  const [isHydrated, setIsHydrated] = useState(false);
-
-  useEffect(() => {
-    setIsHydrated(true);
-  }, []);
-
-  const resolvedAvailableWidth = availableWidth > 0 ? availableWidth : initialAvailableWidth;
-  const resolvedLogicalHeight = logicalHeight > 0 ? logicalHeight : initialLogicalHeight;
-  const scale = useMemo(
-    () => calculateBoardCanvasScale(resolvedAvailableWidth, logicalWidth),
-    [logicalWidth, resolvedAvailableWidth],
-  );
-  const uiScale = calculateBoardUiScale(scale);
-  const visualWidth = logicalWidth * scale;
-  const hasHorizontalOverflow = resolvedAvailableWidth > 0 && visualWidth - resolvedAvailableWidth > 0.5;
-
-  return (
-    <Box
-      component="section"
-      ref={viewportRef}
-      className={classes.viewport}
-      data-testid="board-canvas"
-      data-board-hydrated={isHydrated ? "true" : "false"}
-      data-canvas-scale={scale}
-      data-canvas-overflow={hasHorizontalOverflow ? "true" : "false"}
-      data-canvas-initial-height={initialLogicalHeight}
-      data-canvas-initial-width={initialAvailableWidth}
-      aria-label={label}
-    >
-      <Box className={classes.sizer} w={visualWidth} h={resolvedLogicalHeight * scale}>
-        <Box
-          ref={canvasRef}
-          className={classes.canvas}
-          w={logicalWidth}
-          style={{
-            "--board-canvas-ui-scale": uiScale,
-            transform: `scale(${scale})`,
-          }}
-        >
-          {children}
-        </Box>
-      </Box>
-    </Box>
-  );
-};

apps/nextjs/src/components/board/layout/semantics.ts

@@ -1,56 +0,0 @@
-import type { GridPlacement } from "./types";
-
-interface ReadonlyCanvasAttributesInput {
-  label: string;
-}
-
-interface EditableCanvasAttributesInput extends ReadonlyCanvasAttributesInput {
-  columnCount: number;
-  rowCount: number;
-}
-
-interface EditableGridCellAttributesInput {
-  label: string;
-  placement: GridPlacement;
-}
-
-/**
- * View mode is a labelled region, not an ARIA grid. It keeps the native
- * semantics and focus behavior of links, buttons and widget controls inside.
- */
-export const getReadonlyCanvasAttributes = ({ label }: ReadonlyCanvasAttributesInput) =>
-  ({
-    role: "region",
-    "aria-label": label,
-    "data-grid-readonly": "true",
-  }) as const;
-
-export const getReadonlyGridItemAttributes = (placement: GridPlacement) =>
-  ({
-    "data-grid-id": placement.id,
-    "data-grid-x": placement.x,
-    "data-grid-y": placement.y,
-    "data-grid-w": placement.w,
-    "data-grid-h": placement.h,
-  }) as const;
-
-/**
- * Edit mode remains a labelled region. Dashboard placement is not an ARIA
- * data grid: arrow keys edit geometry rather than navigate rows and columns.
- * Each tile is one focusable direct-manipulation surface, while controls inside
- * it keep their native semantics and tab order.
- */
-export const getEditableCanvasAttributes = ({ label }: EditableCanvasAttributesInput) =>
-  ({
-    role: "region",
-    "aria-label": label,
-    "data-grid-editable": "true",
-  }) as const;
-
-export const getEditableGridCellAttributes = ({ label, placement }: EditableGridCellAttributesInput) =>
-  ({
-    role: "group",
-    "aria-label": label,
-    tabIndex: 0,
-    ...getReadonlyGridItemAttributes(placement),
-  }) as const;

apps/nextjs/src/components/board/layout/test/board-lanes.spec.ts

@@ -1,112 +0,0 @@
-import { describe, expect, test } from "vitest";
-
-import type { Board } from "~/app/[locale]/boards/_types";
-import { BoardMockBuilder } from "~/components/board/items/actions/test/mocks/board-mock";
-import { DynamicSectionMockBuilder } from "~/components/board/items/actions/test/mocks/dynamic-section-mock";
-import { EmptySectionMockBuilder } from "~/components/board/items/actions/test/mocks/empty-section-mock";
-import { ItemMockBuilder } from "~/components/board/items/actions/test/mocks/item-mock";
-import { getBoardLaneColumnCount, getInitialBoardLogicalHeight, getRootSectionForLane } from "../index";
-
-describe("board lanes", () => {
-  test("gutters consume columns from the main canvas", () => {
-    const layout = {
-      id: "layout",
-      name: "Base",
-      columnCount: 12,
-      leftGutterColumnCount: 2,
-      rightGutterColumnCount: 3,
-      breakpoint: 0,
-    } satisfies Board["layouts"][number];
-
-    expect(getBoardLaneColumnCount(layout, "left")).toBe(2);
-    expect(getBoardLaneColumnCount(layout, "main")).toBe(7);
-    expect(getBoardLaneColumnCount(layout, "right")).toBe(3);
-  });
-
-  test("clamps invalid gutters while preserving one main column", () => {
-    const layout = {
-      id: "layout",
-      name: "Base",
-      columnCount: 4,
-      leftGutterColumnCount: 3,
-      rightGutterColumnCount: 3,
-      breakpoint: 0,
-    } satisfies Board["layouts"][number];
-
-    expect(getBoardLaneColumnCount(layout, "left")).toBe(3);
-    expect(getBoardLaneColumnCount(layout, "main")).toBe(1);
-    expect(getBoardLaneColumnCount(layout, "right")).toBe(0);
-  });
-
-  test("rejects ambiguous duplicate roots", () => {
-    const board = new BoardMockBuilder()
-      .addSection(new EmptySectionMockBuilder({ id: "main-a" }).build())
-      .addSection(new EmptySectionMockBuilder({ id: "main-b" }).build())
-      .build();
-
-    expect(() => getRootSectionForLane(board, "main")).toThrow("multiple main canvas roots");
-  });
-
-  test("calculates a stable server height from the tallest visible lane", () => {
-    const layoutId = "layout";
-    const mainSectionId = "main";
-    const leftSectionId = "left";
-    const dynamicSectionId = "dynamic";
-    const board = new BoardMockBuilder()
-      .addSection(new EmptySectionMockBuilder({ id: mainSectionId }).build())
-      .addSection(new EmptySectionMockBuilder({ id: leftSectionId, xOffset: -1 }).build())
-      .addSection(
-        new DynamicSectionMockBuilder({
-          id: dynamicSectionId,
-          collapsed: true,
-          options: { collapsible: true },
-        })
-          .addLayout({
-            layoutId,
-            parentSectionId: mainSectionId,
-            xOffset: 0,
-            yOffset: 0,
-            width: 2,
-            height: 3,
-          })
-          .build(),
-      )
-      .addItem(
-        new ItemMockBuilder()
-          .addLayout({
-            layoutId,
-            sectionId: mainSectionId,
-            xOffset: 0,
-            yOffset: 3,
-            width: 1,
-            height: 1,
-          })
-          .build(),
-      )
-      .addItem(
-        new ItemMockBuilder()
-          .addLayout({
-            layoutId,
-            sectionId: leftSectionId,
-            xOffset: 0,
-            yOffset: 0,
-            width: 1,
-            height: 4,
-          })
-          .build(),
-      )
-      .build();
-    board.layouts = [
-      {
-        id: layoutId,
-        name: "Base",
-        columnCount: 8,
-        leftGutterColumnCount: 1,
-        rightGutterColumnCount: 0,
-        breakpoint: 0,
-      },
-    ];
-
-    expect(getInitialBoardLogicalHeight(board, layoutId)).toBe(872);
-  });
-});

apps/nextjs/src/components/board/layout/test/geometry.spec.ts

@@ -1,26 +0,0 @@
-import { describe, expect, test } from "vitest";
-
-import { getLayoutRowCount, getLogicalItemStyle, getLogicalTrackSize, normalizeGridPlacement } from "../index";
-
-describe("fixed dashboard geometry", () => {
-  test("keeps a 1x1 item exactly 200px with a fixed 24px gap", () => {
-    expect(getLogicalTrackSize(1)).toBe(200);
-    expect(getLogicalTrackSize(2)).toBe(424);
-    expect(getLogicalTrackSize(3)).toBe(648);
-
-    expect(getLogicalItemStyle({ x: 1, y: 2, w: 2, h: 3 })).toEqual({
-      position: "absolute",
-      left: 224,
-      top: 448,
-      width: 424,
-      height: 648,
-    });
-  });
-
-  test("normalizes invalid bounds and derives the required row count", () => {
-    const placement = normalizeGridPlacement({ id: "wide", x: 7, y: -2, w: 8, h: 2 }, 4);
-
-    expect(placement).toEqual({ id: "wide", x: 0, y: 0, w: 4, h: 2 });
-    expect(getLayoutRowCount([placement, { x: 0, y: 4, w: 1, h: 3 }])).toBe(7);
-  });
-});

apps/nextjs/src/components/board/layout/test/reflow.spec.ts

@@ -1,100 +0,0 @@
-import { describe, expect, test } from "vitest";
-
-import {
-  doGridPlacementsOverlap,
-  getCollapsedDisplayLayout,
-  placeGridItem,
-  reflowVerticalLayout,
-  sortGridPlacementsForReadingOrder,
-} from "../index";
-import type { GridPlacement } from "../index";
-
-describe("dashboard layout reflow", () => {
-  test("compacts each horizontal lane and removes collisions", () => {
-    const result = reflowVerticalLayout(
-      [
-        { id: "a", x: 0, y: 0, w: 1, h: 1 },
-        { id: "b", x: 0, y: 3, w: 1, h: 1 },
-        { id: "c", x: 1, y: 3, w: 1, h: 1 },
-      ],
-      { columnCount: 2 },
-    );
-
-    expect(result).toEqual([
-      { id: "a", x: 0, y: 0, w: 1, h: 1 },
-      { id: "b", x: 0, y: 1, w: 1, h: 1 },
-      { id: "c", x: 1, y: 0, w: 1, h: 1 },
-    ]);
-    expect(hasOverlap(result)).toBe(false);
-  });
-
-  test("shrinks a collapsed inline container and pulls neighbors up", () => {
-    const result = getCollapsedDisplayLayout(
-      [
-        { id: "section", x: 0, y: 0, w: 2, h: 3 },
-        { id: "below", x: 0, y: 3, w: 2, h: 1 },
-        { id: "other-lane", x: 2, y: 4, w: 1, h: 1 },
-      ],
-      {
-        columnCount: 3,
-        collapsedItemIds: new Set(["section"]),
-      },
-    );
-
-    expect(result).toEqual([
-      { id: "section", x: 0, y: 0, w: 2, h: 1 },
-      { id: "below", x: 0, y: 1, w: 2, h: 1 },
-      { id: "other-lane", x: 2, y: 0, w: 1, h: 1 },
-    ]);
-  });
-
-  test("pins a moved or expanded item and pushes collisions out of the way", () => {
-    const result = placeGridItem(
-      [
-        { id: "section", x: 0, y: 0, w: 2, h: 1 },
-        { id: "neighbor", x: 0, y: 1, w: 2, h: 1 },
-        { id: "side", x: 2, y: 2, w: 1, h: 1 },
-      ],
-      { id: "section", x: 0, y: 0, w: 2, h: 3 },
-      3,
-    );
-
-    expect(result).toEqual([
-      { id: "section", x: 0, y: 0, w: 2, h: 3 },
-      { id: "neighbor", x: 0, y: 3, w: 2, h: 1 },
-      { id: "side", x: 2, y: 0, w: 1, h: 1 },
-    ]);
-    expect(hasOverlap(result)).toBe(false);
-  });
-
-  test("is deterministic regardless of input array order", () => {
-    const first = [
-      { id: "b", x: 0, y: 2, w: 1, h: 1 },
-      { id: "a", x: 0, y: 2, w: 1, h: 1 },
-      { id: "c", x: 1, y: 8, w: 1, h: 1 },
-    ];
-    const second = first.toReversed();
-
-    expect(byId(reflowVerticalLayout(first, { columnCount: 2 }))).toEqual(
-      byId(reflowVerticalLayout(second, { columnCount: 2 })),
-    );
-  });
-
-  test("provides row-major DOM order for the read-only renderer", () => {
-    const items = [
-      { id: "last", x: 0, y: 2, w: 1, h: 1 },
-      { id: "right", x: 1, y: 0, w: 1, h: 1 },
-      { id: "left", x: 0, y: 0, w: 1, h: 1 },
-    ];
-
-    expect(sortGridPlacementsForReadingOrder(items).map((item) => item.id)).toEqual(["left", "right", "last"]);
-  });
-});
-
-const hasOverlap = (placements: readonly GridPlacement[]) =>
-  placements.some((placement, index) =>
-    placements.slice(index + 1).some((otherPlacement) => doGridPlacementsOverlap(placement, otherPlacement)),
-  );
-
-const byId = (placements: readonly GridPlacement[]) =>
-  Object.fromEntries(placements.map((placement) => [placement.id, placement]));

apps/nextjs/src/components/board/layout/test/scaled-board-canvas.spec.ts

@@ -1,60 +0,0 @@
-import { describe, expect, test } from "vitest";
-
-import { calculateBoardCanvasScale, calculateBoardUiScale, MIN_ACCESSIBLE_CANVAS_SCALE } from "../scaled-board-canvas";
-
-describe("board canvas scale policy", () => {
-  test("fits the logical canvas exactly when the viewport can preserve the minimum scale", () => {
-    const scale = calculateBoardCanvasScale(840, 1000);
-
-    expect(scale).toBe(0.84);
-    expect(1000 * scale).toBe(840);
-  });
-
-  test("scales up uniformly on a larger screen", () => {
-    expect(calculateBoardCanvasScale(1800, 1000)).toBe(1.8);
-  });
-
-  test("stops counter-scaling at 0.75 and lets the canvas overflow", () => {
-    const availableWidth = 600;
-    const logicalWidth = 1000;
-    const scale = calculateBoardCanvasScale(availableWidth, logicalWidth);
-
-    expect(scale).toBe(MIN_ACCESSIBLE_CANVAS_SCALE);
-    expect(logicalWidth * scale).toBeGreaterThan(availableWidth);
-  });
-
-  test("keeps content materially magnified at 200% effective zoom", () => {
-    const logicalWidth = 1696;
-    const normalAvailableWidth = 1872;
-    const normalScale = calculateBoardCanvasScale(normalAvailableWidth, logicalWidth);
-    const zoomedScale = calculateBoardCanvasScale(normalAvailableWidth / 2, logicalWidth);
-    const normalPaintedCellSize = 200 * normalScale;
-    const zoomedPaintedCellSize = 200 * zoomedScale * 2;
-
-    expect(zoomedScale).toBe(MIN_ACCESSIBLE_CANVAS_SCALE);
-    expect(zoomedPaintedCellSize).toBeGreaterThan(normalPaintedCellSize * 1.25);
-  });
-
-  test.each([
-    [0, 1000],
-    [1000, 0],
-    [Number.NaN, 1000],
-    [1000, Number.POSITIVE_INFINITY],
-  ])("uses a stable initial scale for unavailable geometry (%s, %s)", (availableWidth, logicalWidth) => {
-    expect(calculateBoardCanvasScale(availableWidth, logicalWidth)).toBe(1);
-  });
-
-  test("keeps UI typography and density at 100% while fitting the canvas down", () => {
-    expect(calculateBoardUiScale(0.75)).toBeCloseTo(4 / 3);
-    expect(calculateBoardUiScale(0.84)).toBeCloseTo(1 / 0.84);
-    expect(calculateBoardUiScale(1)).toBe(1);
-    expect(calculateBoardUiScale(1.5)).toBe(1);
-  });
-
-  test.each([0, -1, Number.NaN, Number.POSITIVE_INFINITY])(
-    "uses stable UI density for an invalid canvas scale (%s)",
-    (scale) => {
-      expect(calculateBoardUiScale(scale)).toBe(1);
-    },
-  );
-});

apps/nextjs/src/components/board/layout/test/semantics.spec.ts

@@ -1,57 +0,0 @@
-import { describe, expect, test } from "vitest";
-
-import {
-  getEditableCanvasAttributes,
-  getEditableGridCellAttributes,
-  getReadonlyCanvasAttributes,
-  getReadonlyGridItemAttributes,
-} from "../index";
-
-describe("dashboard layout semantics", () => {
-  const placement = { id: "weather", x: 1, y: 2, w: 3, h: 2 };
-
-  test("keeps read-only mode a native labelled region", () => {
-    expect(getReadonlyCanvasAttributes({ label: "Home dashboard" })).toEqual({
-      role: "region",
-      "aria-label": "Home dashboard",
-      "data-grid-readonly": "true",
-    });
-    expect(getReadonlyGridItemAttributes(placement)).toEqual({
-      "data-grid-id": "weather",
-      "data-grid-x": 1,
-      "data-grid-y": 2,
-      "data-grid-w": 3,
-      "data-grid-h": 2,
-    });
-  });
-
-  test("keeps edit mode a labelled region with spatial item metadata", () => {
-    expect(
-      getEditableCanvasAttributes({
-        label: "Edit home dashboard",
-        columnCount: 12,
-        rowCount: 8,
-      }),
-    ).toEqual({
-      role: "region",
-      "aria-label": "Edit home dashboard",
-      "data-grid-editable": "true",
-    });
-
-    expect(
-      getEditableGridCellAttributes({
-        label: "Weather widget",
-        placement,
-      }),
-    ).toEqual({
-      role: "group",
-      "aria-label": "Weather widget",
-      tabIndex: 0,
-      "data-grid-id": "weather",
-      "data-grid-x": 1,
-      "data-grid-y": 2,
-      "data-grid-w": 3,
-      "data-grid-h": 2,
-    });
-  });
-});

apps/nextjs/src/components/board/layout/types.ts

@@ -1,10 +0,0 @@
-export interface GridCoordinates {
-  x: number;
-  y: number;
-  w: number;
-  h: number;
-}
-
-export interface GridPlacement extends GridCoordinates {
-  id: string;
-}

apps/nextjs/src/components/board/sections/category-section.tsx

@@ -0,0 +1,65 @@
+import { Card, Collapse, Group, Stack, Title, UnstyledButton } from "@mantine/core";
+import { useDisclosure } from "@mantine/hooks";
+import { IconChevronDown, IconChevronUp } from "@tabler/icons-react";
+
+import { clientApi } from "@homarr/api/client";
+import { useSession } from "@homarr/auth/client";
+import { useRequiredBoard } from "@homarr/boards/context";
+
+import type { CategorySection } from "~/app/[locale]/boards/_types";
+import { CategoryMenu } from "./category/category-menu";
+import { GridStack } from "./gridstack/gridstack";
+import classes from "./item.module.css";
+
+const localStorageKey = (sectionId: string) => `homarr-section-collapsed-${sectionId}`;
+
+interface Props {
+  section: CategorySection;
+}
+
+export const BoardCategorySection = ({ section }: Props) => {
+  const { status } = useSession();
+  const { mutate } = clientApi.section.changeCollapsed.useMutation();
+  const board = useRequiredBoard();
+
+  const initialCollapsed =
+    typeof window !== "undefined"
+      ? (localStorage.getItem(localStorageKey(section.id)) ?? String(section.collapsed)) === "true"
+      : section.collapsed;
+
+  const [opened, { toggle }] = useDisclosure(initialCollapsed, {
+    onOpen() {
+      if (status === "authenticated") {
+        mutate({ sectionId: section.id, collapsed: true });
+      } else if (status === "unauthenticated") {
+        localStorage.setItem(localStorageKey(section.id), "true");
+      }
+    },
+    onClose() {
+      if (status === "authenticated") {
+        mutate({ sectionId: section.id, collapsed: false });
+      } else if (status === "unauthenticated") {
+        localStorage.setItem(localStorageKey(section.id), "false");
+      }
+    },
+  });
+
+  return (
+    <Card style={{ "--opacity": board.opacity / 100 }} radius={board.itemRadius} p={0} className={classes.itemCard}>
+      <Stack>
+        <Group wrap="nowrap" gap="sm">
+          <UnstyledButton w="100%" p="sm" onClick={toggle}>
+            <Group wrap="nowrap">
+              {opened ? <IconChevronUp size={20} /> : <IconChevronDown size={20} />}
+              <Title order={3}>{section.name}</Title>
+            </Group>
+          </UnstyledButton>
+          <CategoryMenu category={section} />
+        </Group>
+        <Collapse expanded={opened} p="sm" pt={0}>
+          <GridStack section={section} />
+        </Collapse>
+      </Stack>
+    </Card>
+  );
+};

apps/nextjs/src/components/board/sections/category/actions/move-category.ts

@@ -0,0 +1,54 @@
+import type { RouterOutputs } from "@homarr/api";
+
+import type { CategorySection } from "~/app/[locale]/boards/_types";
+
+export interface MoveCategoryInput {
+  id: string;
+  direction: "up" | "down";
+}
+
+export const moveCategoryCallback =
+  (input: MoveCategoryInput) =>
+  (previous: RouterOutputs["board"]["getHomeBoard"]): RouterOutputs["board"]["getHomeBoard"] => {
+    const currentCategory = previous.sections.find(
+      (section): section is CategorySection => section.kind === "category" && section.id === input.id,
+    );
+    if (!currentCategory) {
+      return previous;
+    }
+    if (currentCategory.yOffset === 1 && input.direction === "up") {
+      return previous;
+    }
+    if (currentCategory.yOffset === previous.sections.length - 2 && input.direction === "down") {
+      return previous;
+    }
+
+    return {
+      ...previous,
+      sections: previous.sections.map((section) => {
+        if (section.kind !== "category" && section.kind !== "empty") {
+          return section;
+        }
+        const offset = input.direction === "up" ? -2 : 2;
+        // Move category and empty section
+        if (section.yOffset === currentCategory.yOffset || section.yOffset === currentCategory.yOffset + 1) {
+          return {
+            ...section,
+            yOffset: section.yOffset + offset,
+          };
+        }
+
+        if (
+          section.yOffset === currentCategory.yOffset + offset ||
+          section.yOffset === currentCategory.yOffset + offset + 1
+        ) {
+          return {
+            ...section,
+            yOffset: section.yOffset - offset,
+          };
+        }
+
+        return section;
+      }),
+    };
+  };

apps/nextjs/src/components/board/sections/category/actions/remove-category.ts

@@ -0,0 +1,150 @@
+import { getBoardLayouts } from "@homarr/boards/context";
+
+import type { Board, CategorySection, EmptySection, Section } from "~/app/[locale]/boards/_types";
+
+export interface RemoveCategoryInput {
+  id: string;
+}
+
+export const removeCategoryCallback =
+  (input: RemoveCategoryInput) =>
+  (previous: Board): Board => {
+    const currentCategory = previous.sections.find(
+      (section): section is CategorySection => section.kind === "category" && section.id === input.id,
+    );
+    if (!currentCategory) {
+      return previous;
+    }
+
+    const emptySectionsAbove = previous.sections.filter(
+      (section): section is EmptySection => section.kind === "empty" && section.yOffset < currentCategory.yOffset,
+    );
+    const aboveSection = emptySectionsAbove.sort((sectionA, sectionB) => sectionB.yOffset - sectionA.yOffset).at(0);
+
+    const emptySectionsBelow = previous.sections.filter(
+      (section): section is EmptySection => section.kind === "empty" && section.yOffset > currentCategory.yOffset,
+    );
+    const removedSection = emptySectionsBelow.sort((sectionA, sectionB) => sectionA.yOffset - sectionB.yOffset).at(0);
+
+    if (!aboveSection || !removedSection) {
+      return previous;
+    }
+
+    const aboveYOffsets = getBoardLayouts(previous).map((layoutId) => {
+      return {
+        layoutId,
+        yOffset: Math.max(
+          calculateYHeightWithOffsetForItemLayouts(previous, { sectionId: aboveSection.id, layoutId }),
+          calculateYHeightWithOffsetForDynamicSectionLayouts(previous.sections, {
+            sectionId: aboveSection.id,
+            layoutId,
+          }),
+        ),
+      };
+    });
+
+    const categoryYOffsets = getBoardLayouts(previous).map((layoutId) => {
+      return {
+        layoutId,
+        yOffset: Math.max(
+          calculateYHeightWithOffsetForItemLayouts(previous, { sectionId: currentCategory.id, layoutId }),
+          calculateYHeightWithOffsetForDynamicSectionLayouts(previous.sections, {
+            sectionId: currentCategory.id,
+            layoutId,
+          }),
+        ),
+      };
+    });
+
+    return {
+      ...previous,
+      sections: previous.sections
+        .filter((section) => section.id !== currentCategory.id && section.id !== removedSection.id)
+        .map((section) =>
+          section.kind === "dynamic"
+            ? {
+                ...section,
+                layouts: section.layouts.map((layout) => {
+                  const aboveYOffset = aboveYOffsets.find(({ layoutId }) => layout.layoutId === layoutId)?.yOffset ?? 0;
+                  const categoryYOffset =
+                    categoryYOffsets.find(({ layoutId }) => layout.layoutId === layoutId)?.yOffset ?? 0;
+
+                  if (layout.parentSectionId === currentCategory.id) {
+                    return {
+                      ...layout,
+                      yOffset: layout.yOffset + aboveYOffset,
+                      parentSectionId: aboveSection.id,
+                    };
+                  }
+
+                  if (layout.parentSectionId === removedSection.id) {
+                    return {
+                      ...layout,
+                      yOffset: layout.yOffset + aboveYOffset + categoryYOffset,
+                      parentSectionId: aboveSection.id,
+                    };
+                  }
+
+                  return layout;
+                }),
+              }
+            : section,
+        ),
+
+      items: previous.items.map((item) => ({
+        ...item,
+        layouts: item.layouts.map((layout) => {
+          const aboveYOffset = aboveYOffsets.find(({ layoutId }) => layout.layoutId === layoutId)?.yOffset ?? 0;
+          const categoryYOffset = categoryYOffsets.find(({ layoutId }) => layout.layoutId === layoutId)?.yOffset ?? 0;
+
+          if (layout.sectionId === currentCategory.id) {
+            return {
+              ...layout,
+              yOffset: layout.yOffset + aboveYOffset,
+              sectionId: aboveSection.id,
+            };
+          }
+
+          if (layout.sectionId === removedSection.id) {
+            return {
+              ...layout,
+              yOffset: layout.yOffset + aboveYOffset + categoryYOffset,
+              sectionId: aboveSection.id,
+            };
+          }
+
+          return layout;
+        }),
+      })),
+    };
+  };
+
+const calculateYHeightWithOffsetForDynamicSectionLayouts = (
+  sections: Section[],
+  { sectionId, layoutId }: { sectionId: string; layoutId: string },
+) => {
+  return sections
+    .filter((section) => section.kind === "dynamic")
+    .map((section) => section.layouts.find((layout) => layout.layoutId === layoutId))
+    .filter((layout) => layout !== undefined)
+    .filter((layout) => layout.parentSectionId === sectionId)
+    .reduce((acc, layout) => {
+      const yHeightWithOffset = layout.yOffset + layout.height;
+      if (yHeightWithOffset > acc) return yHeightWithOffset;
+      return acc;
+    }, 0);
+};
+
+const calculateYHeightWithOffsetForItemLayouts = (
+  board: Board,
+  { sectionId, layoutId }: { sectionId: string; layoutId: string },
+) =>
+  board.items
+    .map((item) => item.layouts.find((layout) => layout.layoutId === layoutId))
+    .filter((layout) => layout !== undefined)
+    .filter((layout) => layout.sectionId === sectionId)
+    .reduce((acc, layout) => {
+      const yHeightWithOffset = layout.yOffset + layout.height;
+      if (yHeightWithOffset > acc) return yHeightWithOffset;
+      return acc;
+    }, 0);

apps/nextjs/src/components/board/sections/category/actions/test/move-category.spec.ts

@@ -0,0 +1,79 @@
+import { describe, expect, test } from "vitest";
+
+import type { Section } from "~/app/[locale]/boards/_types";
+import { moveCategoryCallback } from "../move-category";
+
+describe("Move Category", () => {
+  test.each([
+    [3, [0, 3, 4, 1, 2, 5, 6]],
+    [5, [0, 1, 2, 5, 6, 3, 4]],
+  ])("should move category up", (moveId, expectedOrder) => {
+    const sections = createSections(3);
+
+    const input = {
+      id: moveId.toString(),
+      direction: "up" as const,
+    };
+
+    const result = moveCategoryCallback(input)({ sections } as never);
+
+    expect(sortSections(result.sections).map((section) => parseInt(section.id, 10))).toEqual(expectedOrder);
+  });
+  test.each([
+    [1, [0, 3, 4, 1, 2, 5, 6]],
+    [3, [0, 1, 2, 5, 6, 3, 4]],
+  ])("should move category down", (moveId, expectedOrder) => {
+    const sections = createSections(3);
+
+    const input = {
+      id: moveId.toString(),
+      direction: "down" as const,
+    };
+
+    const result = moveCategoryCallback(input)({ sections } as never);
+
+    expect(sortSections(result.sections).map((section) => parseInt(section.id, 10))).toEqual(expectedOrder);
+  });
+  test("should not move category up if it is at the top", () => {
+    const sections = createSections(3);
+
+    const input = {
+      id: "1",
+      direction: "up" as const,
+    };
+
+    const result = moveCategoryCallback(input)({ sections } as never);
+
+    expect(sortSections(result.sections).map((section) => parseInt(section.id, 10))).toEqual([0, 1, 2, 3, 4, 5, 6]);
+  });
+  test("should not move category down if it is at the bottom", () => {
+    const sections = createSections(3);
+
+    const input = {
+      id: "5",
+      direction: "down" as const,
+    };
+
+    const result = moveCategoryCallback(input)({ sections } as never);
+
+    expect(sortSections(result.sections).map((section) => parseInt(section.id, 10))).toEqual([0, 1, 2, 3, 4, 5, 6]);
+  });
+});
+
+const createSections = (categoryCount: number) => {
+  return Array.from({ length: categoryCount * 2 + 1 }, (_, index) => ({
+    id: index.toString(),
+    kind: index % 2 === 1 ? ("category" as const) : ("empty" as const),
+    name: `Category ${index}`,
+    yOffset: index,
+    xOffset: 0,
+    collapsed: false,
+    items: [],
+  })) satisfies Section[];
+};
+
+const sortSections = (sections: Section[]) => {
+  return sections
+    .filter((section) => section.kind !== "dynamic")
+    .sort((sectionA, sectionB) => sectionA.yOffset - sectionB.yOffset);
+};

apps/nextjs/src/components/board/sections/category/actions/test/remove-category.spec.ts

@@ -0,0 +1,145 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+import { describe, expect, test, vi } from "vitest";
+
+import * as boardContext from "@homarr/boards/context";
+
+import type { DynamicSection, Section } from "~/app/[locale]/boards/_types";
+import { BoardMockBuilder } from "~/components/board/items/actions/test/mocks/board-mock";
+import { CategorySectionMockBuilder } from "~/components/board/items/actions/test/mocks/category-section-mock";
+import { DynamicSectionMockBuilder } from "~/components/board/items/actions/test/mocks/dynamic-section-mock";
+import { EmptySectionMockBuilder } from "~/components/board/items/actions/test/mocks/empty-section-mock";
+import { ItemMockBuilder } from "~/components/board/items/actions/test/mocks/item-mock";
+import { removeCategoryCallback } from "../remove-category";
+
+describe("Remove Category", () => {
+  test.each([
+    [3, [0, 1, 2, 3, 4, 5, 6], [0, 1, 2, 5, 6], [3, 4], 2],
+    [5, [0, 1, 2, 3, 4, 5, 6], [0, 1, 2, 3, 4], [5, 6], 4],
+    [1, [0, 1, 2, 3, 4, 5, 6], [0, 3, 4, 5, 6], [1, 2], 0],
+    [3, [0, 3, 6, 7, 8], [0, 7, 8], [3, 6], 0],
+  ])(
+    "should remove category",
+    (removeId, initialYOffsets, expectedYOffsets, expectedRemovals, expectedLocationOfItems) => {
+      // Arrange
+      const layoutId = "1";
+      const input = removeId.toString();
+
+      const board = new BoardMockBuilder()
+        .addLayout({ id: layoutId })
+        .addSections(createSections(initialYOffsets))
+        .addItems(createSectionItems(initialYOffsets, layoutId))
+        .build();
+
+      vi.spyOn(boardContext, "getBoardLayouts").mockReturnValue([layoutId]);
+
+      // Act
+      const result = removeCategoryCallback({ id: input })(board);
+
+      // Assert
+      expect(result.sections.map((section) => parseInt(section.id, 10))).toEqual(expectedYOffsets);
+      expectedRemovals.forEach((expectedRemoval) => {
+        expect(result.sections.find((section) => section.id === expectedRemoval.toString())).toBeUndefined();
+      });
+      const aboveSectionItems = result.items.filter(
+        (item) => item.layouts[0]?.sectionId === expectedLocationOfItems.toString(),
+      );
+      expect(aboveSectionItems.map((item) => parseInt(item.id, 10))).toEqual(expect.arrayContaining(expectedRemovals));
+    },
+  );
+
+  test("should correctly move items to above empty section", () => {
+    // Arrange
+    const layoutId = "1";
+    const sectionIds = {
+      above: "2",
+      category: "3",
+      below: "4",
+      dynamic: "7",
+    };
+    const initialYOffsets = [0, 1, 2, 3, 4, 5, 6];
+
+    const board = new BoardMockBuilder()
+      .addLayout({ id: layoutId })
+      .addSections(createSections(initialYOffsets))
+      .addItems(createSectionItems([0, 1, 5, 6], layoutId)) // Only add items to other sections
+      .addDynamicSection(
+        new DynamicSectionMockBuilder({ id: sectionIds.dynamic })
+          .addLayout({ layoutId, parentSectionId: sectionIds.category, yOffset: 7, height: 3 })
+          .build(),
+      )
+      .addItem(new ItemMockBuilder({ id: "above-1" }).addLayout({ layoutId, sectionId: sectionIds.above }).build())
+      .addItem(
+        new ItemMockBuilder({ id: "above-2" })
+          .addLayout({ layoutId, sectionId: sectionIds.above, yOffset: 3, xOffset: 2, height: 2 })
+          .build(),
+      )
+      .addItem(
+        new ItemMockBuilder({ id: "category-1" }).addLayout({ layoutId, sectionId: sectionIds.category }).build(),
+      )
+      .addItem(
+        new ItemMockBuilder({ id: "category-2" })
+          .addLayout({ layoutId, sectionId: sectionIds.category, yOffset: 2, xOffset: 4, width: 4 })
+          .build(),
+      )
+      .addItem(
+        new ItemMockBuilder({ id: "below-1" }).addLayout({ layoutId, sectionId: sectionIds.below, xOffset: 5 }).build(),
+      )
+      .addItem(
+        new ItemMockBuilder({ id: "below-2" })
+          .addLayout({ layoutId, sectionId: sectionIds.below, yOffset: 1, xOffset: 1, height: 2 })
+          .build(),
+      )
+      .addItem(new ItemMockBuilder({ id: "dynamic-1" }).addLayout({ layoutId, sectionId: sectionIds.dynamic }).build())
+      .build();
+
+    vi.spyOn(boardContext, "getBoardLayouts").mockReturnValue([layoutId]);
+
+    // Act
+    const result = removeCategoryCallback({ id: sectionIds.category })(board);
+
+    // Assert
+    expect(result.sections.map((section) => parseInt(section.id, 10))).toEqual([0, 1, 2, 5, 6, 7]);
+    const aboveSectionItems = result.items.filter((item) => item.layouts[0]?.sectionId === sectionIds.above);
+    expect(aboveSectionItems.length).toBe(6);
+
+    expect(
+      aboveSectionItems
+        .map((item) => ({
+          ...item,
+          ...item.layouts[0]!,
+        }))
+        .sort((itemA, itemB) => itemA.yOffset - itemB.yOffset),
+    ).toEqual([
+      expect.objectContaining({ id: "above-1", yOffset: 0, xOffset: 0 }),
+      expect.objectContaining({ id: "above-2", yOffset: 3, xOffset: 2, height: 2 }),
+      expect.objectContaining({ id: "category-1", yOffset: 5, xOffset: 0 }),
+      expect.objectContaining({ id: "category-2", yOffset: 7, xOffset: 4, width: 4 }),
+      expect.objectContaining({ id: "below-1", yOffset: 15, xOffset: 5 }),
+      expect.objectContaining({ id: "below-2", yOffset: 16, xOffset: 1, height: 2 }),
+    ]);
+
+    const dynamicSection = result.sections.find((section): section is DynamicSection => section.id === "7")!;
+    expect(dynamicSection.layouts.at(0)?.yOffset).toBe(12);
+    expect(dynamicSection.layouts[0]?.parentSectionId).toBe("2");
+  });
+});
+
+const createSections = (initialYOffsets: number[]) => {
+  return initialYOffsets.map((yOffset, index) =>
+    index % 2 === 0
+      ? new EmptySectionMockBuilder({
+          id: yOffset.toString(),
+          yOffset,
+        }).build()
+      : new CategorySectionMockBuilder({
+          id: yOffset.toString(),
+          yOffset,
+        }).build(),
+  ) satisfies Section[];
+};
+
+const createSectionItems = (initialYOffsets: number[], layoutId: string) => {
+  return initialYOffsets.map((yOffset) =>
+    new ItemMockBuilder({ id: yOffset.toString() }).addLayout({ layoutId, sectionId: yOffset.toString() }).build(),
+  );
+};

apps/nextjs/src/components/board/sections/category/category-actions.ts

@@ -0,0 +1,145 @@
+import { useCallback } from "react";
+
+import { useUpdateBoard } from "@homarr/boards/updater";
+import { createId } from "@homarr/common";
+
+import type { CategorySection, EmptySection, Section } from "~/app/[locale]/boards/_types";
+import type { MoveCategoryInput } from "./actions/move-category";
+import { moveCategoryCallback } from "./actions/move-category";
+import type { RemoveCategoryInput } from "./actions/remove-category";
+import { removeCategoryCallback } from "./actions/remove-category";
+
+interface AddCategory {
+  name: string;
+  yOffset: number;
+}
+
+interface RenameCategory {
+  id: string;
+  name: string;
+}
+
+export const useCategoryActions = () => {
+  const { updateBoard } = useUpdateBoard();
+
+  const addCategory = useCallback(
+    ({ name, yOffset }: AddCategory) => {
+      if (yOffset <= -1) {
+        return;
+      }
+      updateBoard((previous) => ({
+        ...previous,
+        sections: [
+          // Place sections before the new category
+          ...previous.sections.filter(
+            (section) => (section.kind === "category" || section.kind === "empty") && section.yOffset < yOffset,
+          ),
+          {
+            id: createId(),
+            name,
+            kind: "category",
+            yOffset,
+            xOffset: 0,
+            collapsed: false,
+          },
+          {
+            id: createId(),
+            kind: "empty",
+            yOffset: yOffset + 1,
+            xOffset: 0,
+          },
+          // Place sections after the new category
+          ...previous.sections
+            .filter(
+              (section): section is CategorySection | EmptySection =>
+                (section.kind === "category" || section.kind === "empty") && section.yOffset >= yOffset,
+            )
+            .map((section) => ({
+              ...section,
+              yOffset: section.yOffset + 2,
+            })),
+          ...previous.sections.filter((section) => section.kind !== "category" && section.kind !== "empty"),
+        ] satisfies Section[],
+      }));
+    },
+    [updateBoard],
+  );
+
+  const addCategoryToEnd = useCallback(
+    ({ name }: { name: string }) => {
+      updateBoard((previous) => {
+        const lastSection = previous.sections
+          .filter(
+            (section): section is CategorySection | EmptySection =>
+              section.kind === "empty" || section.kind === "category",
+          )
+          .sort((sectionA, sectionB) => sectionB.yOffset - sectionA.yOffset)
+          .at(0);
+
+        if (!lastSection) return previous;
+        const lastYOffset = lastSection.yOffset;
+
+        return {
+          ...previous,
+          sections: [
+            ...previous.sections,
+            {
+              id: createId(),
+              name,
+              kind: "category",
+              yOffset: lastYOffset + 1,
+              xOffset: 0,
+              collapsed: false,
+            },
+            {
+              id: createId(),
+              kind: "empty",
+              yOffset: lastYOffset + 2,
+              xOffset: 0,
+            },
+          ] satisfies Section[],
+        };
+      });
+    },
+    [updateBoard],
+  );
+
+  const renameCategory = useCallback(
+    ({ id: categoryId, name }: RenameCategory) => {
+      updateBoard((previous) => ({
+        ...previous,
+        sections: previous.sections.map((section) => {
+          if (section.kind !== "category") return section;
+          if (section.id !== categoryId) return section;
+          return {
+            ...section,
+            name,
+          };
+        }),
+      }));
+    },
+    [updateBoard],
+  );
+
+  const moveCategory = useCallback(
+    (input: MoveCategoryInput) => {
+      updateBoard(moveCategoryCallback(input));
+    },
+    [updateBoard],
+  );
+
+  const removeCategory = useCallback(
+    (input: RemoveCategoryInput) => {
+      updateBoard(removeCategoryCallback(input));
+    },
+    [updateBoard],
+  );
+
+  return {
+    addCategory,
+    addCategoryToEnd,
+    renameCategory,
+    moveCategory,
+    removeCategory,
+  };
+};

apps/nextjs/src/components/board/sections/category/category-edit-modal.tsx

@@ -0,0 +1,45 @@
+import { Stack, TextInput } from "@mantine/core";
+import { z } from "zod/v4";
+
+import { useZodForm } from "@homarr/form";
+import { createModal, ModalFormFooter, modalSizeForm } from "@homarr/modals";
+import { useI18n } from "@homarr/translation/client";
+
+interface Category {
+  id: string;
+  name: string;
+}
+
+interface InnerProps {
+  submitLabel: string;
+  category: Category;
+  onSuccess: (category: Category) => void;
+}
+
+export const CategoryEditModal = createModal<InnerProps>(({ actions, innerProps }) => {
+  const t = useI18n();
+  const form = useZodForm(z.object({ name: z.string().min(1) }), {
+    initialValues: {
+      name: innerProps.category.name,
+    },
+  });
+
+  return (
+    <form
+      onSubmit={form.onSubmit((values) => {
+        void innerProps.onSuccess({
+          ...innerProps.category,
+          name: values.name,
+        });
+        actions.closeModal();
+      })}
+    >
+      <Stack>
+        <TextInput label={t("section.category.field.name.label")} data-autofocus {...form.getInputProps("name")} />
+        <ModalFormFooter onCancel={actions.closeModal} submitLabel={innerProps.submitLabel} />
+      </Stack>
+    </form>
+  );
+}).withOptions({
+  size: modalSizeForm,
+});

apps/nextjs/src/components/board/sections/category/category-menu-actions.tsx

@@ -0,0 +1,146 @@
+import { useCallback } from "react";
+
+import { fetchApi } from "@homarr/api/client";
+import { getCurrentLayout, useRequiredBoard } from "@homarr/boards/context";
+import { createId } from "@homarr/common";
+import { useConfirmModal, useModalAction } from "@homarr/modals";
+import { useSettings } from "@homarr/settings";
+import { useI18n } from "@homarr/translation/client";
+
+import type { CategorySection } from "~/app/[locale]/boards/_types";
+import { useCategoryActions } from "./category-actions";
+import { CategoryEditModal } from "./category-edit-modal";
+import { filterByItemKind } from "./filter";
+
+export const useCategoryMenuActions = (category: CategorySection) => {
+  const { openModal } = useModalAction(CategoryEditModal);
+  const { openConfirmModal } = useConfirmModal();
+  const { addCategory, moveCategory, removeCategory, renameCategory } = useCategoryActions();
+  const t = useI18n();
+  const board = useRequiredBoard();
+
+  const createCategoryAtYOffset = useCallback(
+    (position: number) => {
+      openModal(
+        {
+          category: {
+            id: createId(),
+            name: t("section.category.create.title"),
+          },
+          onSuccess: (category) => {
+            addCategory({
+              name: category.name,
+              yOffset: position,
+            });
+          },
+          submitLabel: t("section.category.create.submit"),
+        },
+        {
+          title: (t) => t("section.category.create.title"),
+        },
+      );
+    },
+    [addCategory, t, openModal],
+  );
+
+  // creates a new category above the current
+  const addCategoryAbove = useCallback(() => {
+    const aboveYOffset = category.yOffset;
+    createCategoryAtYOffset(aboveYOffset);
+  }, [category.yOffset, createCategoryAtYOffset]);
+
+  // creates a new category below the current
+  const addCategoryBelow = useCallback(() => {
+    const belowYOffset = category.yOffset + 2;
+    createCategoryAtYOffset(belowYOffset);
+  }, [category.yOffset, createCategoryAtYOffset]);
+
+  const moveCategoryUp = useCallback(() => {
+    moveCategory({
+      id: category.id,
+      direction: "up",
+    });
+  }, [category.id, moveCategory]);
+
+  const moveCategoryDown = useCallback(() => {
+    moveCategory({
+      id: category.id,
+      direction: "down",
+    });
+  }, [category.id, moveCategory]);
+
+  // Removes the current category
+  const remove = useCallback(() => {
+    openConfirmModal({
+      title: t("section.category.remove.title"),
+      children: t("section.category.remove.message", {
+        name: category.name,
+      }),
+      onConfirm: () => {
+        removeCategory({
+          id: category.id,
+        });
+      },
+    });
+  }, [category.id, category.name, removeCategory, t, openConfirmModal]);
+
+  const edit = useCallback(() => {
+    openModal(
+      {
+        category,
+        submitLabel: t("section.category.edit.submit"),
+        onSuccess: (category) => {
+          renameCategory({
+            id: category.id,
+            name: category.name,
+          });
+        },
+      },
+      {
+        title: (t) => t("section.category.edit.title"),
+      },
+    );
+  }, [category, openModal, renameCategory, t]);
+
+  const settings = useSettings();
+  const openAllInNewTabs = useCallback(async () => {
+    const currentLayoutId = getCurrentLayout(board);
+    const appIds = (
+      await filterByItemKind(
+        board.items.filter(
+          (item) => item.layouts.find((layout) => layout.layoutId === currentLayoutId)?.sectionId === category.id,
+        ),
+        settings,
+        "app",
+      )
+    ).map((item) => {
+      return item.options.appId;
+    });
+
+    const apps = await fetchApi.app.byIds.query(appIds);
+    const appsWithUrls = apps.filter((app) => app.href && app.href.length > 0);
+
+    for (const app of appsWithUrls) {
+      const openedWindow = window.open(app.href ?? undefined);
+      if (openedWindow) {
+        continue;
+      }
+
+      openConfirmModal({
+        title: t("section.category.openAllInNewTabs.title"),
+        children: t("section.category.openAllInNewTabs.text"),
+      });
+      break;
+    }
+  }, [category, board, t, openConfirmModal, settings]);
+
+  return {
+    addCategoryAbove,
+    addCategoryBelow,
+    moveCategoryUp,
+    moveCategoryDown,
+    remove,
+    edit,
+    openAllInNewTabs,
+  };
+};

apps/nextjs/src/components/board/sections/category/category-menu.tsx

@@ -0,0 +1,128 @@
+"use client";
+
+import React, { useMemo } from "react";
+import { ActionIcon, Menu } from "@mantine/core";
+import {
+  IconDotsVertical,
+  IconEdit,
+  IconExternalLink,
+  IconRowInsertBottom,
+  IconRowInsertTop,
+  IconTransitionBottom,
+  IconTransitionTop,
+  IconTrash,
+} from "@tabler/icons-react";
+
+import { useEditMode } from "@homarr/boards/edit-mode";
+import type { MaybePromise } from "@homarr/common/types";
+import { useScopedI18n } from "@homarr/translation/client";
+import type { TablerIcon } from "@homarr/ui";
+
+import type { CategorySection } from "~/app/[locale]/boards/_types";
+import { useCategoryMenuActions } from "./category-menu-actions";
+
+interface Props {
+  category: CategorySection;
+}
+
+export const CategoryMenu = ({ category }: Props) => {
+  const actions = useActions(category);
+  const t = useScopedI18n("section.category");
+
+  return (
+    <Menu>
+      <Menu.Target>
+        <ActionIcon mr="sm" variant="transparent" aria-label={t("menu.label.settings")}>
+          <IconDotsVertical size={20} />
+        </ActionIcon>
+      </Menu.Target>
+      <Menu.Dropdown>
+        {actions.map((action) => {
+          return (
+            <React.Fragment key={action.label}>
+              {"group" in action && <Menu.Label>{t(action.group)}</Menu.Label>}
+              <Menu.Item
+                leftSection={<action.icon size="1rem" />}
+                onClick={action.onClick}
+                color={"color" in action ? action.color : undefined}
+              >
+                {t(action.label)}
+              </Menu.Item>
+            </React.Fragment>
+          );
+        })}
+      </Menu.Dropdown>
+    </Menu>
+  );
+};
+
+const useActions = (category: CategorySection) => {
+  const [isEditMode] = useEditMode();
+  const editModeActions = useEditModeActions(category);
+  const nonEditModeActions = useNonEditModeActions(category);
+
+  return useMemo(
+    () => (isEditMode ? editModeActions : nonEditModeActions),
+    [isEditMode, editModeActions, nonEditModeActions],
+  );
+};
+
+const useEditModeActions = (category: CategorySection) => {
+  const { addCategoryAbove, addCategoryBelow, moveCategoryUp, moveCategoryDown, edit, remove } =
+    useCategoryMenuActions(category);
+
+  return [
+    {
+      icon: IconEdit,
+      label: "action.edit",
+      onClick: edit,
+    },
+    {
+      icon: IconTrash,
+      color: "red",
+      label: "action.remove",
+      onClick: remove,
+    },
+    {
+      group: "menu.label.changePosition",
+      icon: IconTransitionTop,
+      label: "action.moveUp",
+      onClick: moveCategoryUp,
+    },
+    {
+      icon: IconTransitionBottom,
+      label: "action.moveDown",
+      onClick: moveCategoryDown,
+    },
+    {
+      group: "menu.label.create",
+      icon: IconRowInsertTop,
+      label: "action.createAbove",
+      onClick: addCategoryAbove,
+    },
+    {
+      icon: IconRowInsertBottom,
+      label: "action.createBelow",
+      onClick: addCategoryBelow,
+    },
+  ] as const satisfies ActionDefinition[];
+};
+
+const useNonEditModeActions = (category: CategorySection) => {
+  const { openAllInNewTabs } = useCategoryMenuActions(category);
+  return [
+    {
+      icon: IconExternalLink,
+      label: "action.openAllInNewTabs",
+      onClick: openAllInNewTabs,
+    },
+  ] as const satisfies ActionDefinition[];
+};
+
+interface ActionDefinition {
+  icon: TablerIcon;
+  label: string;
+  onClick: () => MaybePromise<void>;
+  color?: string;
+  group?: string;
+}

apps/nextjs/src/components/board/sections/category/filter.ts

@@ -1,21 +1,23 @@
 import type { WidgetKind } from "@homarr/definitions";
 import type { SettingsContextProps } from "@homarr/settings/creator";
-import type { WidgetComponentProps } from "@homarr/widgets";
-import { reduceWidgetOptionsWithDefaultValues } from "@homarr/widgets";
+import type { WidgetComponentProps } from "@homarr/widgets/definition";
+import { loadWidgetDefinition, reduceWidgetOptionsWithDefinition } from "@homarr/widgets/manifest";
 
 import type { Item } from "~/app/[locale]/boards/_types";
 
-export const filterByItemKind = <TKind extends WidgetKind>(
+export const filterByItemKind = async <TKind extends WidgetKind>(
   items: Item[],
   settings: SettingsContextProps,
   kind: TKind,
 ) => {
+  const definition = await loadWidgetDefinition(kind);
+
   return items
     .filter((item) => item.kind === kind)
     .map((item) => ({
       ...item,
-      options: reduceWidgetOptionsWithDefaultValues(
-        kind,
+      options: reduceWidgetOptionsWithDefinition(
+        definition,
         settings,
         item.options,
       ) as WidgetComponentProps<TKind>["options"],