Update agents.md file with the relevant information.

Improve unit test.
[pre-commit.ci] auto fixes from pre-commit.com hooks
2026-09-16 01:07:26 +00:00 · 2026-07-12 11:16:49 +03:00 · 2026-07-12 11:08:54 +03:00 · 2026-07-12 07:52:25 +00:00 · 2026-07-12 10:52:10 +03:00 · 2026-07-12 10:46:13 +03:00
136 changed files with 2624 additions and 2570 deletions
@@ -31,10 +31,6 @@ updates:
    directory: "/"
    schedule:
      interval: "daily"
-    groups:
-      codeql-action:
-        patterns:
-          - "github/codeql-action*"
    cooldown:
      default-days: 3
      # no semver support for github-actions
@@ -6,10 +6,6 @@ on:
  push:
    branches: [ main ]

-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
 jobs:

  build-node:
@@ -25,9 +21,9 @@ jobs:
        os: [ ubuntu-latest, windows-latest, macos-latest ]

    steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
        with: { persist-credentials: false }
-      - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
          node-version-file: '.nvmrc'
      - run: npm ci
@@ -45,9 +41,9 @@ jobs:
    if: ${{ github.event_name == 'push' || github.event_name == 'pull_request' }}

    steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
        with: { persist-credentials: false }
-      - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
          node-version-file: '.nvmrc'
      - run: npm ci
@@ -60,7 +56,7 @@ jobs:

      # Build and upload desktop CLI artifacts
      - name: Set up Go
-        uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
+        uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
        with:
          go-version: ^1.23.x
          cache-dependency-path: desktop/go.sum
@@ -94,9 +90,9 @@ jobs:
      contents: read
    steps:
      - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
        with: { persist-credentials: false }
-      - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
          node-version-file: '.nvmrc'
      - run: npm ci
@@ -115,9 +111,9 @@ jobs:
      contents: read
    steps:
      - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
        with: { persist-credentials: false }
-      - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
          node-version-file: '.nvmrc'
      - run: npm ci
@@ -143,9 +139,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
        with: { persist-credentials: false }
-      - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
          node-version-file: '.nvmrc'
      - run: npm ci
@@ -20,10 +20,6 @@ on:
  schedule:
    - cron: '17 0 * * 6'

-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
 jobs:
  analyze:
    name: Analyze
@@ -42,11 +38,11 @@ jobs:

    steps:
    - name: Checkout repository
-      uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
-      uses: github/codeql-action/init@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9
+      uses: github/codeql-action/init@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v4.36.3
      with:
        languages: ${{ matrix.language }}
        # If you wish to specify custom queries, you can do so here or in a config file.
@@ -57,7 +53,7 @@ jobs:
    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
    # If this step fails, then you should remove it and run the build manually (see below)
    - name: Autobuild
-      uses: github/codeql-action/autobuild@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9
+      uses: github/codeql-action/autobuild@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v4.36.3

    # ℹ️ Command-line programs to run using the OS shell.
    # 📚 https://git.io/JvXDl
@@ -71,4 +67,4 @@ jobs:
    #   make release

    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9
+      uses: github/codeql-action/analyze@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v4.36.3
@@ -16,13 +16,13 @@ jobs:
      run:
        shell: bash
    steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
        with:
          fetch-depth: 0
          ref: main

      - name: Use Node.js from nvmrc
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
          node-version-file: ".nvmrc"

@@ -12,11 +12,11 @@ jobs:
      contents: write
    if: ${{ github.event_name == 'push' }}
    steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
        with: { persist-credentials: false }

      - name: Use Node.js from nvmrc
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
          node-version-file: '.nvmrc'

@@ -45,11 +45,11 @@ jobs:

    steps:
      - name: Login to GitHub Container Registry
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
      - run: docker build -t ghcr.io/maplibre/maputnik:main .
      - run: docker push ghcr.io/maplibre/maputnik:main
@@ -15,14 +15,14 @@ jobs:
    permissions:
      contents: read
    steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
        with:
          fetch-depth: 0
          ref: main
          persist-credentials: false

      - name: Use Node.js from nvmrc
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
          node-version-file: ".nvmrc"

@@ -42,19 +42,19 @@ jobs:
      run:
        shell: bash
    steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
        with:
          fetch-depth: 0
          ref: main

      - name: Use Node.js from nvmrc
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
          node-version-file: ".nvmrc"
          registry-url: "https://registry.npmjs.org"

      - name: Set up Go for desktop build
-        uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
+        uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
        with:
          go-version: ^1.23.x
          cache-dependency-path: desktop/go.sum
@@ -2,18 +2,9 @@

 ### ✨ Features and improvements
 - Replace Cypress with Playwright for end-to-end tests and Vitest browser mode (Playwright provider) for component tests; drop the `@shellygo/cypress-test-utils` helper in favour of a `MaputnikDriver` page object
- Upgrade to MapLibre GL JS 6 and Vite 8, and update the remaining dependencies
- Serve the RTL text plugin from `@mapbox/mapbox-gl-rtl-text` instead of a pinned CDN URL, so its version is tracked in `package.json`
- Exported HTML now loads MapLibre GL JS as an ES module, since v6 no longer ships a UMD bundle
- The sidebar can now be resized, both as a whole and in the split between the layer list and the layer editor
 - _...Add new stuff here..._

 ### 🐞 Bug fixes
- Prevent a crash when converting a function to an expression
- Prevent a crash when deleting either stop from a function with two stops
- Preserve expanded layer groups when deleting layers, including the first layer of a group
- The map's data listener now fires on tile loads again, so source and vector layer field autocompletion is populated
- The `maputnik` desktop binary now opens the default browser automatically on startup (opt out with `--no-browser`)
 - _...Add new stuff here..._

 ## 3.1.0
@@ -7,16 +7,21 @@ require (
 	github.com/fsnotify/fsnotify v1.6.0
 	github.com/gorilla/handlers v1.5.1
 	github.com/gorilla/mux v1.8.0
-	github.com/gorilla/websocket v1.5.3
+	github.com/gorilla/websocket v1.5.0
 	github.com/maputnik/desktop v1.0.7
-	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
 	github.com/urfave/cli v1.22.12
 )

 require (
+	github.com/GeertJohan/go.incremental v1.0.0 // indirect
+	github.com/akavel/rsrc v0.8.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/daaku/go.zipexe v1.0.2 // indirect
 	github.com/felixge/httpsnoop v1.0.1 // indirect
+	github.com/jessevdk/go-flags v1.4.0 // indirect
+	github.com/nkovacs/streamquote v1.0.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	golang.org/x/sys v0.1.0 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasttemplate v1.0.1 // indirect
+	golang.org/x/sys v0.0.0-20220908164124-27713097b956 // indirect
 )
@@ -1,7 +1,9 @@
 github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/GeertJohan/go.incremental v1.0.0 h1:7AH+pY1XUgQE4Y1HcXYaMqAI0m9yrFqo/jt0CW30vsg=
 github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0=
 github.com/GeertJohan/go.rice v1.0.3 h1:k5viR+xGtIhF61125vCE1cmJ5957RQGXG6dmbaWZSmI=
 github.com/GeertJohan/go.rice v1.0.3/go.mod h1:XVdrU4pW00M4ikZed5q56tPf1v2KwnIKeIdc9CBYNt4=
+github.com/akavel/rsrc v0.8.0 h1:zjWn7ukO9Kc5Q62DOJCcxGpXC18RawVtYAGdz2aLlfw=
 github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
 github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
@@ -18,14 +20,14 @@ github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH
 github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
-github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/maputnik/desktop v1.0.7 h1:rdFg7emIJOT3YsZpwqSChmWtMOvu+T4h6WwVQAZP9n4=
 github.com/maputnik/desktop v1.0.7/go.mod h1:wmDjHUztx9jOBz0I22589yWguAGdV/sEM57YANpN8oQ=
+github.com/nkovacs/streamquote v1.0.0 h1:PmVIV08Zlx2lZK5fFZlMZ04eHcDTIFJCv/5/0twVUow=
 github.com/nkovacs/streamquote v1.0.0/go.mod h1:BN+NaZ2CmdKqUuTUXUEm9j95B2TRbpOWpxbJYzzgUsc=
-github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
-github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
@@ -39,11 +41,12 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/urfave/cli v1.22.12 h1:igJgVw1JdKH+trcLWLeLwZjU9fEfPesQ+9/e4MQ44S8=
 github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8=
+github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8WdUSz8=
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
+golang.org/x/sys v0.0.0-20220908164124-27713097b956 h1:XeJjHH1KiLpKGb6lvMiksZ9l0fVUh+AmGcm0nOMEBOY=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -2,7 +2,6 @@ package main

 import (
 	"fmt"
-	"net"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -10,7 +9,6 @@ import (
 	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
 	"github.com/maputnik/desktop/filewatch"
-	"github.com/pkg/browser"
 	"github.com/urfave/cli"
 )

@@ -38,10 +36,6 @@ func main() {
 			Name:  "static",
 			Usage: "Serve directory under /static/",
 		},
-		&cli.BoolFlag{
-			Name:  "no-browser",
-			Usage: "Do not automatically open the default browser",
-		},
 	}

 	app.Action = func(c *cli.Context) error {
@@ -77,26 +71,8 @@ func main() {
 		loggedRouter := handlers.LoggingHandler(os.Stdout, router)
 		corsRouter := handlers.CORS(handlers.AllowedHeaders([]string{"Content-Type"}), handlers.AllowedMethods([]string{"GET", "PUT"}), handlers.AllowedOrigins([]string{"*"}), handlers.AllowCredentials())(loggedRouter)

-		listener, err := net.Listen("tcp", fmt.Sprintf(":%d", c.Int("port")))
-		if err != nil {
-			return err
-		}
-
-		url := fmt.Sprintf("http://localhost:%d", c.Int("port"))
-		fmt.Printf("Exposing Maputnik on %s\n", url)
-
-		// Listener is already accepting connections, so this can't race http.Serve below.
-		// xdg-open is known to hang on some headless Linux setups, so this runs in its own
-		// goroutine to keep a stuck opener from stalling server startup.
-		if !c.Bool("no-browser") {
-			go func() {
-				if err := browser.OpenURL(url); err != nil {
-					fmt.Printf("Could not open browser automatically: %s\nPlease open %s manually.\n", err, url)
-				}
-			}()
-		}
-
-		return http.Serve(listener, corsRouter)
+		fmt.Printf("Exposing Maputnik on http://localhost:%d\n", c.Int("port"))
+		return http.ListenAndServe(fmt.Sprintf(":%d", c.Int("port")), corsRouter)
 	}

 	app.Run(os.Args)
@@ -1,16 +0,0 @@
-{
-  "version": 8,
-  "name": "Grouped layers",
-  "sources": {},
-  "layers": [
-    { "id": "background", "type": "background" },
-    { "id": "park-a", "type": "background" },
-    { "id": "park-b", "type": "background" },
-    { "id": "park-c", "type": "background" },
-    { "id": "road", "type": "background" },
-    { "id": "park-d", "type": "background" },
-    { "id": "park-e", "type": "background" },
-    { "id": "water-a", "type": "background" },
-    { "id": "water-b", "type": "background" }
-  ]
-}
@@ -289,20 +289,6 @@ describe("layer editor", () => {
        });
      });

-      test("should leave a plain editable value after deleting a stop", async () => {
-        await when.setFunctionStopValue("circle-radius", "Output value", 1, "0");
-        await when.deleteFunctionStop("circle-radius");
-        await then(get.elementByTestId("spec-field:circle-radius")).shouldBeVisible();
-        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-          layers: [{ id, paint: { "circle-radius": 0 } }],
-        });
-
-        await when.setValue("spec-field-input:circle-radius", "7");
-        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-          layers: [{ id, paint: { "circle-radius": 7 } }],
-        });
-      });
-
      test("should set the base", async () => {
        await when.setFunctionBase("circle-radius", "2");
        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
@@ -324,9 +310,8 @@ describe("layer editor", () => {
        });
      });

-      test("should convert to an expression without crashing", async () => {
+      test("should convert to an expression", async () => {
        await when.makeExpression("circle-radius");
-        await then(get.element("[data-wd-key='spec-field-container:circle-radius'] .maputnik-expression-editor")).shouldBeVisible();
        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
          layers: [{ id, paint: { "circle-radius": ["interpolate", ["linear"], ["zoom"], 6, 5, 10, 5] } }],
        });
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, test } from "./utils/fixtures";
+import { beforeEach, describe, test } from "./utils/fixtures";
 import { MaputnikDriver } from "./maputnik-driver";

 describe("layers list", () => {
@@ -47,14 +47,6 @@ describe("layers list", () => {
      });
    });

-    test("should title the visibility button with the action it performs", async () => {
-      const key = "layer-list-item:" + id + ":toggle-visibility";
-      // A visible layer is about to be hidden, and a hidden one to be shown.
-      await expect(get.elementByTestId(key)).toHaveAttribute("title", "hide");
-      await when.click(key);
-      await expect(get.elementByTestId(key)).toHaveAttribute("title", "show");
-    });
-
    describe("when clicking hide", () => {
      beforeEach(async () => {
        await when.click("layer-list-item:" + id + ":toggle-visibility");
@@ -306,75 +298,6 @@ describe("layers list", () => {
  });

  describe("groups", () => {
-    for (const control of ["menu", "trash"] as const) {
-      describe(`after deletion using ${control}`, () => {
-        beforeEach(async () => {
-          await when.setStyle("grouped_layers");
-        });
-
-        test("keeps all groups expanded when an earlier layer is deleted", async () => {
-          await when.click("skip-target-layer-list");
-          await then(get.elementByTestId("layer-list-item:park-b")).shouldBeVisible();
-          await when.deleteLayer("background", control);
-          await then(get.elementByTestId("layer-list-item:background")).shouldNotExist();
-          await then(get.elementByTestId("layer-list-group:park-0")).shouldExist();
-          await expect(get.elementByTestId("layer-list-group:water-6").getByRole("button")).toHaveAttribute("aria-expanded", "true");
-          await then(get.elementByTestId("layer-list-item:park-b")).shouldBeVisible();
-          await then(get.elementByTestId("layer-list-item:park-e")).shouldBeVisible();
-          await then(get.elementByTestId("layer-list-item:water-b")).shouldBeVisible();
-        });
-
-        test("preserves separate states for groups with the same prefix", async () => {
-          await when.click("layer-list-group:park-1");
-          await when.deleteLayer("background", control);
-          await then(get.elementByTestId("layer-list-group:park-0")).shouldExist();
-          await when.click("layer-list-item:road");
-          await expect(get.elementByTestId("layer-list-group:park-0").getByRole("button")).toHaveAttribute("aria-expanded", "true");
-          await expect(get.elementByTestId("layer-list-group:park-4").getByRole("button")).toHaveAttribute("aria-expanded", "false");
-          await then(get.elementByTestId("layer-list-item:park-b")).shouldBeVisible();
-          await then(get.elementByTestId("layer-list-item:park-e")).shouldNotBeVisible();
-        });
-
-        test("keeps a group expanded when its first layer is deleted", async () => {
-          await when.click("layer-list-group:park-1");
-          await when.deleteLayer("park-a", control);
-          await then(get.elementByTestId("layer-list-item:park-a")).shouldNotExist();
-          await when.click("layer-list-item:road");
-          await expect(get.elementByTestId("layer-list-group:park-1").getByRole("button")).toHaveAttribute("aria-expanded", "true");
-          await then(get.elementByTestId("layer-list-item:park-c")).shouldBeVisible();
-        });
-
-        for (const expandedGroup of ["park-1", "park-5"]) {
-          test(`keeps a merged group expanded when ${expandedGroup} was expanded`, async () => {
-            await when.click("layer-list-group:" + expandedGroup);
-            await when.deleteLayer("road", control);
-            await then(get.elementByTestId("layer-list-item:road")).shouldNotExist();
-            await expect(get.elementByTestId("layer-list-group:park-1").getByRole("button")).toHaveAttribute("aria-expanded", "true");
-            await then(get.elementByTestId("layer-list-item:park-b")).shouldBeVisible();
-            await then(get.elementByTestId("layer-list-item:park-e")).shouldBeVisible();
-          });
-        }
-
-        test("keeps a merged group collapsed when both groups were collapsed", async () => {
-          await when.deleteLayer("road", control);
-          await then(get.elementByTestId("layer-list-item:road")).shouldNotExist();
-          await when.click("layer-list-item:background");
-          await expect(get.elementByTestId("layer-list-group:park-1").getByRole("button")).toHaveAttribute("aria-expanded", "false");
-          await then(get.elementByTestId("layer-list-item:park-b")).shouldNotBeVisible();
-          await then(get.elementByTestId("layer-list-item:park-e")).shouldNotBeVisible();
-        });
-
-        test("preserves later groups after deleting an entire group", async () => {
-          await when.click("skip-target-layer-list");
-          await when.deleteLayer("park-a", control);
-          await when.deleteLayer("park-b", control);
-          await when.deleteLayer("park-c", control);
-          await expect(get.elementByTestId("layer-list-group:water-4").getByRole("button")).toHaveAttribute("aria-expanded", "true");
-          await then(get.elementByTestId("layer-list-item:water-b")).shouldBeVisible();
-        });
-      });
-    }
-
    test("simple", async () => {
      await when.setStyle("geojson");

@@ -39,7 +39,6 @@ export class MaputnikDriver {
        "example-style-with-zoom-7-and-center-0-51.json",
        "example-style-with-zoom-5-and-center-50-50.json",
        "access-token-style.json",
-        "grouped-layers-style.json",
      ];
      for (const fixture of styleFixtures) {
        await this.helper.given.interceptAndMockResponse({
@@ -64,18 +63,6 @@ export class MaputnikDriver {

    modal: this.modalDriver.when,

-    deleteLayer: async (id: string, control: "menu" | "trash" = "menu") => {
-      if (control === "trash") {
-        await this.helper.when.hover("layer-list-item:" + id);
-        await this.helper.when.click("layer-list-item:" + id + ":delete");
-        return;
-      }
-
-      await this.helper.when.click("layer-list-item:" + id);
-      await this.helper.when.click("skip-target-layer-editor");
-      await this.helper.when.click("menu-delete-layer");
-    },
-
    setStyle: async (
      styleProperties:
        | "geojson"
@@ -86,7 +73,6 @@ export class MaputnikDriver {
        | "font"
        | "zoom_7_center_0_51"
        | "access_tokens"
-        | "grouped_layers"
        | "",
      zoom?: number
    ) => {
@@ -99,7 +85,6 @@ export class MaputnikDriver {
        font: "example-style-with-fonts.json",
        zoom_7_center_0_51: "example-style-with-zoom-7-and-center-0-51.json",
        access_tokens: "access-token-style.json",
-        grouped_layers: "grouped-layers-style.json",
      };

      const url = new URL(baseUrl);
@@ -125,13 +110,7 @@ export class MaputnikDriver {
    },

    chooseExampleFile: async () => {
-      await this.helper.when.openFileByFixture("example-style.json", "modal:open.dropzone");
-      await this.helper.when.wait(200);
-    },
-
-    /** Picks the example style through the browser's native file chooser. */
-    chooseExampleFileFromPicker: async () => {
-      await this.helper.when.chooseFileFromPicker("example-style.json", "modal:open.dropzone");
+      await this.helper.when.openFileByFixture("example-style.json", "modal:open.dropzone", "modal:open.file.input");
      await this.helper.when.wait(200);
    },

@@ -43,16 +43,6 @@ describe("modals", () => {
        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude(get.responseBody("example-style.json"));
      });
    });
-
-    describe("without the File System Access API", () => {
-      test("upload via the file chooser", async () => {
-        await given.noFileSystemAccessApi();
-        await when.setStyle("");
-        await when.click("nav:open");
-        await when.chooseExampleFileFromPicker();
-        await then(get.styleFromLocalStorage()).shouldDeepNestedInclude(get.fixture("example-style.json"));
-      });
-    });
  });

  describe("shortcuts", () => {
@@ -122,8 +122,6 @@ export class Assertable<T> {
  // Value assertions (auto-retrying for Query targets).
  shouldEqual = (value: any) => this.assertValue((actual) => expect(actual).toBe(value));

-  shouldBeGreaterThan = (value: number) => this.assertValue((actual) => expect(actual).toBeGreaterThan(value));
-
  shouldInclude = (value: any) =>
    this.assertValue((actual) => {
      if (typeof value === "object" && value !== null) {
@@ -220,18 +218,6 @@ export class PlaywrightHelper {
  public then = <T>(target: T): Assertable<T> => new Assertable(target);

  public given = {
-    /**
-     * Removes the File System Access API so the app falls back to a plain
-     * <input type="file">, the way Firefox and Safari behave. Must be called
-     * before the page under test is loaded.
-     */
-    noFileSystemAccessApi: async () => {
-      await this.page.addInitScript(() => {
-        delete (window as any).showOpenFilePicker;
-        delete (window as any).showSaveFilePicker;
-      });
-    },
-
    intercept: async (pattern: RegExp, alias: string, _method = "GET") => {
      this.recordedRequests.set(alias, []);
      await this.page.route(pattern, (route) => {
@@ -351,15 +337,6 @@ export class PlaywrightHelper {
      await this.page.mouse.up();
    },

-    /** Presses at the centre of an element and drags it by the given offset. */
-    dragBy: async (testId: string, deltaX: number, deltaY = 0) => {
-      const { x, y } = await centerOf(this.testId(testId));
-      await this.page.mouse.move(x, y);
-      await this.page.mouse.down();
-      await this.page.mouse.move(x + deltaX, y + deltaY, { steps: 10 });
-      await this.page.mouse.up();
-    },
-
    clickCenter: async (testId: string) => {
      const { x, y } = await centerOf(this.testId(testId));
      await this.page.mouse.move(x, y);
@@ -368,38 +345,23 @@ export class PlaywrightHelper {
      await this.page.mouse.up();
    },

-    /**
-     * Opens a fixture through the File System Access API, which raises no
-     * "filechooser" event and so has to be stubbed. For the <input type="file">
-     * fallback that browsers without the API use, see chooseFileFromPicker.
-     */
-    openFileByFixture: async (fixture: string, buttonTestId: string) => {
+    openFileByFixture: async (fixture: string, buttonTestId: string, inputTestId: string) => {
      const content = JSON.stringify(this.readFixture(fixture));
-      await this.page.evaluate((fileContent) => {
-        (window as any).showOpenFilePicker = async () => [
-          { getFile: async () => ({ text: async () => fileContent }) },
-        ];
-      }, content);
-      await this.testId(buttonTestId).click();
-    },
-
-    /**
-     * Clicks a control that opens the browser's native file chooser and answers
-     * it with a fixture. Only works on the <input type="file"> path — the File
-     * System Access API does not raise a "filechooser" event, so pair this with
-     * given.noFileSystemAccessApi().
-     */
-    chooseFileFromPicker: async (fixture: string, triggerTestId: string) => {
-      const content = JSON.stringify(this.readFixture(fixture));
-      const [fileChooser] = await Promise.all([
-        this.page.waitForEvent("filechooser"),
-        this.testId(triggerTestId).click(),
-      ]);
-      await fileChooser.setFiles({
-        name: fixture,
-        mimeType: "application/json",
-        buffer: Buffer.from(content),
-      });
+      const hasPicker = await this.page.evaluate(() => "showOpenFilePicker" in window);
+      if (hasPicker) {
+        await this.page.evaluate((fileContent) => {
+          (window as any).showOpenFilePicker = async () => [
+            { getFile: async () => ({ text: async () => fileContent }) },
+          ];
+        }, content);
+        await this.testId(buttonTestId).click();
+      } else {
+        await this.testId(inputTestId).setInputFiles({
+          name: fixture,
+          mimeType: "application/json",
+          buffer: Buffer.from(content),
+        });
+      }
    },

    dropFileByFixture: async (fixture: string, dropzoneTestId: string) => {
@@ -457,13 +419,6 @@ export class PlaywrightHelper {

    inputValue: (testId: string) => new Query<string>(() => this.testId(testId).first().inputValue()),

-    elementWidth: (testId: string) =>
-      new Query<number>(async () => {
-        const box = await this.testId(testId).first().boundingBox();
-        if (!box) throw new Error(`Element "${testId}" has no bounding box`);
-        return box.width;
-      }),
-
    elementsText: (testId: string) => new Query<string>(() => this.testId(testId).first().innerText()),

    locationHash: () => new Query<string>(async () => new URL(this.page.url()).hash),
@@ -1,27 +0,0 @@
-import { beforeEach, describe, test } from "./utils/fixtures";
-import { MaputnikDriver } from "./maputnik-driver";
-
-describe("sidebar resize", () => {
-  const { given, get, when, then } = new MaputnikDriver();
-
-  beforeEach(async () => {
-    await given.setupMockBackedResponses();
-    await when.setStyle("layer");
-  });
-
-  test("dragging the outer handle widens the sidebar", async () => {
-    const initialWidth = await get.elementWidth("sidebar-panel").get();
-
-    await when.dragBy("sidebar-resize-handle", 100);
-
-    await then(get.elementWidth("sidebar-panel")).shouldBeGreaterThan(initialWidth + 50);
-  });
-
-  test("dragging the inner handle widens the layer list", async () => {
-    const initialWidth = await get.elementWidth("layer-list-panel").get();
-
-    await when.dragBy("inner-resize-handle", 50);
-
-    await then(get.elementWidth("layer-list-panel")).shouldBeGreaterThan(initialWidth + 20);
-  });
-});
@@ -14,7 +14,6 @@ export default defineConfig({
  files: ["**/*.{js,jsx,ts,tsx}"],
  ignores: [
    "dist/**/*",
-    "public/**/*",
  ],
  languageOptions: {
    ecmaVersion: 2024,
@@ -35,9 +34,7 @@ export default defineConfig({
  rules: {
    "react-refresh/only-export-components": [
      "warn",
-      // Many components are exported as withTranslation()(Component); without
-      // this the rule cannot tell the HOC's result is still a component.
-      { allowConstantExport: true, extraHOCs: ["withTranslation"] }
+      { allowConstantExport: true }
    ],
    "@typescript-eslint/no-explicit-any": "off",
    "@typescript-eslint/no-unused-vars": [
@@ -1,7 +1,7 @@
 import { defineConfig } from "i18next-cli";

 export default defineConfig({
-  locales: ["az", "de", "fr", "he", "it", "ja", "ko", "tr", "zh"],
+  locales: ["de", "fr", "he", "it", "ja", "ko", "tr", "zh"],
  extract: {
    input: ["src/**/*.{js,jsx,ts,tsx}"],
    output: "src/locales/{{language}}/{{namespace}}.json",
@@ -5,11 +5,10 @@
  "type": "module",
  "main": "''",
  "scripts": {
-    "copy-rtl-text-plugin": "mkdir -p public && cp -p node_modules/@mapbox/mapbox-gl-rtl-text/dist/mapbox-gl-rtl-text.js public/",
-    "start": "npm run copy-rtl-text-plugin && vite",
-    "build": "npm run copy-rtl-text-plugin && tsc && vite build --mode=production",
-    "build-desktop": "npm run copy-rtl-text-plugin && tsc && vite build --mode=desktop && cd desktop && make",
-    "build-linux": "npm run copy-rtl-text-plugin && tsc && vite build --mode=desktop && cd desktop && make bin/linux/maputnik",
+    "start": "vite",
+    "build": "tsc && vite build --mode=production",
+    "build-desktop": "tsc && vite build --mode=desktop && cd desktop && make",
+    "build-linux": "tsc && vite build --mode=desktop && cd desktop && make bin/linux/maputnik",
    "i18n:extract": "npx i18next-cli extract",
    "lint": "eslint",
    "test": "playwright test",
@@ -29,16 +28,16 @@
  "dependencies": {
    "@codemirror/lang-json": "^6.0.2",
    "@codemirror/lint": "^6.9.7",
-    "@codemirror/state": "^6.7.4",
+    "@codemirror/state": "^6.7.1",
    "@codemirror/theme-one-dark": "^6.1.3",
-    "@codemirror/view": "^6.43.11",
+    "@codemirror/view": "^6.43.6",
    "@dnd-kit/core": "^6.3.1",
    "@dnd-kit/sortable": "^10.0.0",
    "@dnd-kit/utilities": "^3.2.2",
    "@mapbox/mapbox-gl-rtl-text": "^0.4.0",
    "@maplibre/maplibre-gl-geocoder": "^1.9.4",
-    "@maplibre/maplibre-gl-inspect": "^1.9.0",
-    "@maplibre/maplibre-gl-style-spec": "^26.4.2",
+    "@maplibre/maplibre-gl-inspect": "^1.8.2",
+    "@maplibre/maplibre-gl-style-spec": "^25.0.2",
    "array-move": "^4.0.0",
    "buffer": "^6.0.3",
    "classnames": "^2.5.1",
@@ -48,9 +47,9 @@
    "downshift": "^9.4.0",
    "events": "^3.3.0",
    "file-saver": "^2.0.5",
-    "i18next": "^26.4.2",
+    "i18next": "^26.3.4",
    "i18next-browser-languagedetector": "^8.2.1",
-    "i18next-resources-to-backend": "^1.2.3",
+    "i18next-resources-to-backend": "^1.2.1",
    "json-stringify-pretty-compact": "^4.0.0",
    "json-to-ast": "^2.1.0",
    "lodash": "^4.18.1",
@@ -60,23 +59,22 @@
    "lodash.get": "^4.4.2",
    "lodash.isequal": "^4.5.0",
    "lodash.throttle": "^4.1.1",
-    "maplibre-gl": "^6.7.0",
+    "maplibre-gl": "^5.24.0",
    "maputnik-design": "github:maputnik/design#172b06c",
-    "ol": "^10.10.0",
-    "ol-mapbox-style": "^13.4.3",
-    "pmtiles": "^4.5.0",
+    "ol": "^10.9.0",
+    "ol-mapbox-style": "^13.4.1",
+    "pmtiles": "^4.4.1",
    "prop-types": "^15.8.1",
-    "react": "^19.2.8",
+    "react": "^19.2.7",
    "react-accessible-accordion": "^5.0.1",
    "react-aria-menubutton": "^8.0.0",
    "react-aria-modal": "^5.0.2",
    "react-collapse": "^5.1.1",
    "react-color": "^2.19.3",
-    "react-dom": "^19.2.8",
-    "react-i18next": "^17.0.13",
+    "react-dom": "^19.2.7",
+    "react-i18next": "^17.0.8",
    "react-icons": "^5.7.0",
    "react-markdown": "^10.1.0",
-    "react-resizable-panels": "^4.11.0",
    "reconnecting-websocket": "^4.4.0",
    "slugify": "^1.6.9",
    "string-hash": "^1.1.3",
@@ -102,9 +100,9 @@
  "devDependencies": {
    "@eslint/js": "^10.0.1",
    "@istanbuljs/nyc-config-typescript": "^1.0.2",
-    "@playwright/test": "^1.63.0",
+    "@playwright/test": "^1.61.1",
    "@stylistic/eslint-plugin": "^5.10.0",
-    "@types/codemirror": "^5.60.18",
+    "@types/codemirror": "^5.60.17",
    "@types/color": "^4.2.1",
    "@types/cors": "^2.8.19",
    "@types/file-saver": "^2.0.7",
@@ -117,36 +115,36 @@
    "@types/lodash.isequal": "^4.5.8",
    "@types/lodash.throttle": "^4.1.9",
    "@types/randomcolor": "^0.5.9",
-    "@types/react": "^19.2.18",
+    "@types/react": "^19.2.17",
    "@types/react-aria-menubutton": "^6.2.14",
    "@types/react-aria-modal": "^5.0.0",
    "@types/react-collapse": "^5.0.4",
    "@types/react-color": "^3.0.13",
-    "@types/react-dom": "^19.2.7",
+    "@types/react-dom": "^19.2.3",
    "@types/string-hash": "^1.1.3",
    "@types/wicg-file-system-access": "^2023.10.7",
-    "@vitejs/plugin-react": "^6.1.1",
-    "@vitest/coverage-v8": "^5.0.0",
+    "@vitejs/plugin-react": "5.2",
+    "@vitest/coverage-v8": "^4.1.10",
    "cors": "^2.8.6",
-    "eslint": "^10.10.0",
+    "eslint": "^10.6.0",
    "eslint-plugin-react": "^7.37.5",
    "eslint-plugin-react-hooks": "^7.1.1",
-    "eslint-plugin-react-refresh": "^0.5.6",
-    "i18next-cli": "^1.73.1",
+    "eslint-plugin-react-refresh": "^0.5.3",
+    "i18next-cli": "^1.65.0",
    "istanbul": "^0.4.5",
    "istanbul-lib-coverage": "^3.2.2",
    "nyc": "^18.0.0",
-    "postcss": "^8.5.28",
+    "postcss": "^8.5.16",
    "react-hot-loader": "^4.13.1",
-    "sass": "^1.104.0",
-    "stylelint": "^17.15.0",
+    "sass": "^1.101.0",
+    "stylelint": "^17.14.0",
    "stylelint-config-recommended-scss": "^17.0.1",
    "stylelint-scss": "^7.2.0",
    "typescript": "^6.0.3",
-    "typescript-eslint": "^8.69.0",
-    "uuid": "^14.0.2",
-    "vite": "^8.2.2",
+    "typescript-eslint": "^8.62.1",
+    "uuid": "^14.0.1",
+    "vite": "^7.3.2",
    "vite-plugin-istanbul": "^9.0.1",
-    "vitest": "^5.0.0"
+    "vitest": "^4.1.10"
  }
 }
@@ -11,29 +11,29 @@ import {type Map, type LayerSpecification, type StyleSpecification, type Validat
 import {validateStyleMin} from "@maplibre/maplibre-gl-style-spec";
 import latest from "@maplibre/maplibre-gl-style-spec/dist/latest.json";

-import { MapMaplibreGl } from "./MapMaplibreGl";
-import { MapOpenLayers } from "./MapOpenLayers";
-import { CodeEditor } from "./CodeEditor";
-import { LayerList } from "./LayerList";
-import { LayerEditor } from "./LayerEditor";
-import { AppToolbar, type MapState } from "./AppToolbar";
-import { AppLayout } from "./AppLayout";
-import { AppMessagePanel as MessagePanel } from "./AppMessagePanel";
+import MapMaplibreGl from "./MapMaplibreGl";
+import MapOpenLayers from "./MapOpenLayers";
+import CodeEditor from "./CodeEditor";
+import LayerList from "./LayerList";
+import LayerEditor from "./LayerEditor";
+import AppToolbar, { type MapState } from "./AppToolbar";
+import AppLayout from "./AppLayout";
+import MessagePanel from "./AppMessagePanel";

-import { ModalSettings } from "./modals/ModalSettings";
-import { ModalExport } from "./modals/ModalExport";
-import { ModalSources } from "./modals/ModalSources";
-import { ModalOpen } from "./modals/ModalOpen";
-import { ModalShortcuts } from "./modals/ModalShortcuts";
-import { ModalDebug } from "./modals/ModalDebug";
-import { ModalGlobalState } from "./modals/ModalGlobalState";
+import ModalSettings from "./modals/ModalSettings";
+import ModalExport from "./modals/ModalExport";
+import ModalSources from "./modals/ModalSources";
+import ModalOpen from "./modals/ModalOpen";
+import ModalShortcuts from "./modals/ModalShortcuts";
+import ModalDebug from "./modals/ModalDebug";
+import ModalGlobalState from "./modals/ModalGlobalState";

 import {downloadGlyphsMetadata, downloadSpriteMetadata} from "../libs/metadata";
 import { emptyStyle, getAccessToken, replaceAccessTokens } from "../libs/style";
 import { undoMessages, redoMessages } from "../libs/diffmessage";
 import { createStyleStore, type IStyleStore } from "../libs/store/style-store-factory";
 import { RevisionStore } from "../libs/revisions";
-import { LayerWatcher } from "../libs/layerwatcher";
+import LayerWatcher from "../libs/layerwatcher";
 import tokens from "../config/tokens.json";
 import isEqual from "lodash.isequal";
 import { type MapOptions } from "maplibre-gl";
@@ -123,7 +123,7 @@ type AppState = {
  fileHandle: FileSystemFileHandle | null
 };

-export class App extends React.Component<any, AppState> {
+export default class App extends React.Component<any, AppState> {
  revisionStore: RevisionStore;
  styleStore: IStyleStore | null = null;
  layerWatcher: LayerWatcher;
@@ -1,23 +1,9 @@
-import React, { useEffect, useState } from "react";
-import { Group, Panel, Separator, useDefaultLayout } from "react-resizable-panels";
-import { ScrollContainer } from "./ScrollContainer";
-import { useTranslation } from "react-i18next";
+import React from "react";
+import ScrollContainer from "./ScrollContainer";
+import { type WithTranslation, withTranslation } from "react-i18next";
 import { IconContext } from "react-icons";

-// Keep these in sync with $layout-list-width/$layout-editor-width in _vars.scss
-const DEFAULT_LIST_WIDTH = 200;
-const DEFAULT_DRAWER_WIDTH = 370;
-const DEFAULT_SIDEBAR_WIDTH = DEFAULT_LIST_WIDTH + DEFAULT_DRAWER_WIDTH;
-const PANEL_STYLE: React.CSSProperties = { overflow: "hidden" };
-
-const SIDEBAR_LAYOUT_ID = "maputnik:sidebar-layout";
-const SIDEBAR_INNER_LAYOUT_ID = "maputnik:sidebar-inner-layout";
-const SIDEBAR_PANEL_ID = "sidebar";
-const MAP_PANEL_ID = "map";
-const LIST_PANEL_ID = "list";
-const DRAWER_PANEL_ID = "drawer";
-
-type AppLayoutProps = {
+type AppLayoutInternalProps = {
  toolbar: React.ReactElement
  layerList: React.ReactElement
  layerEditor?: React.ReactElement
@@ -25,108 +11,44 @@ type AppLayoutProps = {
  map: React.ReactElement
  bottom?: React.ReactElement
  modals?: React.ReactNode
-};
+} & WithTranslation;

-export const AppLayout: React.FC<AppLayoutProps> = (props) => {
-  const { t, i18n } = useTranslation();
+class AppLayoutInternal extends React.Component<AppLayoutInternalProps> {

-  const sidebarLayout = useDefaultLayout({
-    id: SIDEBAR_LAYOUT_ID,
-    panelIds: [SIDEBAR_PANEL_ID, MAP_PANEL_ID],
-  });
-  const innerLayout = useDefaultLayout({
-    id: SIDEBAR_INNER_LAYOUT_ID,
-    panelIds: [LIST_PANEL_ID, DRAWER_PANEL_ID],
-  });
+  render() {
+    document.body.dir = this.props.i18n.dir();

-  // The bottom panel is position: fixed, so it can't be a flex sibling of the
-  // map panel; it follows the sidebar through this custom property instead.
-  const [sidebarWidth, setSidebarWidth] = useState(DEFAULT_SIDEBAR_WIDTH);
-
-  useEffect(() => {
-    document.body.dir = i18n.dir();
-  }, [i18n, i18n.language]);
-
-  return <IconContext.Provider value={{size: "14px"}}>
-    <div
-      className="maputnik-layout"
-      style={{"--sidebar-width": `${sidebarWidth}px`} as React.CSSProperties}
-    >
-      {props.toolbar}
-      <div className="maputnik-layout-main">
-        <Group
-          className="maputnik-layout-panels"
-          orientation="horizontal"
-          id={SIDEBAR_LAYOUT_ID}
-          defaultLayout={sidebarLayout.defaultLayout}
-          onLayoutChanged={sidebarLayout.onLayoutChanged}
-        >
-          <Panel
-            id={SIDEBAR_PANEL_ID}
-            data-wd-key="sidebar-panel"
-            className={props.codeEditor ? "maputnik-layout-code-editor" : "maputnik-layout-sidebar"}
-            style={PANEL_STYLE}
-            defaultSize={`${DEFAULT_SIDEBAR_WIDTH}px`}
-            minSize="280px"
-            onResize={({inPixels}) => setSidebarWidth(inPixels)}
-          >
-            {props.codeEditor && <ScrollContainer>
-              {props.codeEditor}
+    return <IconContext.Provider value={{size: "14px"}}>
+      <div className="maputnik-layout">
+        {this.props.toolbar}
+        <div className="maputnik-layout-main">
+          {this.props.codeEditor && <div className="maputnik-layout-code-editor">
+            <ScrollContainer>
+              {this.props.codeEditor}
            </ScrollContainer>
-            }
-            {!props.codeEditor && <Group
-              className="maputnik-layout-sidebar-panels"
-              orientation="horizontal"
-              id={SIDEBAR_INNER_LAYOUT_ID}
-              defaultLayout={innerLayout.defaultLayout}
-              onLayoutChanged={innerLayout.onLayoutChanged}
-            >
-              <Panel
-                id={LIST_PANEL_ID}
-                data-wd-key="layer-list-panel"
-                className="maputnik-layout-list"
-                style={PANEL_STYLE}
-                defaultSize={`${DEFAULT_LIST_WIDTH}px`}
-                minSize="100px"
-              >
-                {props.layerList}
-              </Panel>
-              <Separator
-                className="maputnik-layout-resize-handle"
-                data-wd-key="inner-resize-handle"
-                title={t("Drag to resize the layer list")}
-                aria-label={t("Drag to resize the layer list")}
-              />
-              <Panel
-                id={DRAWER_PANEL_ID}
-                className="maputnik-layout-drawer"
-                style={PANEL_STYLE}
-                defaultSize={`${DEFAULT_DRAWER_WIDTH}px`}
-                minSize="150px"
-              >
-                <ScrollContainer>
-                  {props.layerEditor}
-                </ScrollContainer>
-              </Panel>
-            </Group>
-            }
-          </Panel>
-          <Separator
-            className="maputnik-layout-resize-handle"
-            data-wd-key="sidebar-resize-handle"
-            title={t("Drag to resize the sidebar")}
-            aria-label={t("Drag to resize the sidebar")}
-          />
-          <Panel id={MAP_PANEL_ID} className="maputnik-layout-map" style={PANEL_STYLE} minSize="200px">
-            {props.map}
-          </Panel>
-        </Group>
+          </div>
+          }
+          {!this.props.codeEditor && <>
+            <div className="maputnik-layout-list">
+              {this.props.layerList}
+            </div>
+            <div className="maputnik-layout-drawer">
+              <ScrollContainer>
+                {this.props.layerEditor}
+              </ScrollContainer>
+            </div>
+          </>}
+          {this.props.map}
+        </div>
+        {this.props.bottom && <div className="maputnik-layout-bottom">
+          {this.props.bottom}
+        </div>
+        }
+        {this.props.modals}
      </div>
-      {props.bottom && <div className="maputnik-layout-bottom">
-        {props.bottom}
-      </div>
-      }
-      {props.modals}
-    </div>
-  </IconContext.Provider>;
-};
+    </IconContext.Provider>;
+  }
+}
+
+const AppLayout = withTranslation()(AppLayoutInternal);
+export default AppLayout;
@@ -61,4 +61,5 @@ class AppMessagePanelInternal extends React.Component<AppMessagePanelInternalPro
  }
 }

-export const AppMessagePanel = withTranslation()(AppMessagePanelInternal);
+const AppMessagePanel = withTranslation()(AppMessagePanelInternal);
+export default AppMessagePanel;
@@ -306,4 +306,5 @@ class AppToolbarInternal extends React.Component<AppToolbarInternalProps> {
  }
 }

-export const AppToolbar = withTranslation()(AppToolbarInternal);
+const AppToolbar = withTranslation()(AppToolbarInternal);
+export default AppToolbar;
@@ -1,7 +1,7 @@
 import React, {type CSSProperties, type PropsWithChildren, type SyntheticEvent} from "react";
 import classnames from "classnames";
-import { FieldDocLabel } from "./FieldDocLabel";
-import { Doc } from "./Doc";
+import FieldDocLabel from "./FieldDocLabel";
+import Doc from "./Doc";

 export type BlockProps = PropsWithChildren & {
  "data-wd-key"?: string
@@ -19,7 +19,7 @@ type BlockState = {
 };

 /** Wrap a component with a label */
-export class Block extends React.Component<BlockProps, BlockState> {
+export default class Block extends React.Component<BlockProps, BlockState> {
  _blockEl: HTMLDivElement | null = null;

  constructor (props: BlockProps) {
@@ -1,4 +1,4 @@
-import { InputJson } from "./InputJson";
+import InputJson from "./InputJson";
 import React from "react";
 import { withTranslation, type WithTranslation } from "react-i18next";
 import { type StyleSpecification } from "maplibre-gl";
@@ -24,4 +24,6 @@ const CodeEditorInternal: React.FC<CodeEditorProps> = (props) => {
  </>;
 };

-export const CodeEditor = withTranslation()(CodeEditorInternal);
+const CodeEditor = withTranslation()(CodeEditorInternal);
+
+export default CodeEditor;
@@ -9,7 +9,7 @@ type CollapseProps = {
 };


-export class Collapse extends React.Component<CollapseProps> {
+export default class Collapse extends React.Component<CollapseProps> {
  static defaultProps = {
    isActive: true
  };
@@ -6,7 +6,7 @@ type CollapserProps = {
  style?: object
 };

-export class Collapser extends React.Component<CollapserProps> {
+export default class Collapser extends React.Component<CollapserProps> {
  render() {
    const iconStyle = {
      width: 20,
@@ -23,7 +23,7 @@ type DocProps = {
  }
 };

-export class Doc extends React.Component<DocProps> {
+export default class Doc extends React.Component<DocProps> {
  render () {
    const {fieldSpec} = this.props;

@@ -1,5 +1,5 @@
-import { InputArray, type InputArrayProps } from "./InputArray";
-import { Fieldset } from "./Fieldset";
+import InputArray, { type InputArrayProps } from "./InputArray";
+import Fieldset from "./Fieldset";

 type FieldArrayProps = InputArrayProps & {
  name?: string
@@ -8,10 +8,12 @@ type FieldArrayProps = InputArrayProps & {
  }
 };

-export const FieldArray: React.FC<FieldArrayProps> = (props) => {
+const FieldArray: React.FC<FieldArrayProps> = (props) => {
  return (
    <Fieldset label={props.label} fieldSpec={props.fieldSpec}>
      <InputArray {...props} />
    </Fieldset>
  );
 };
+
+export default FieldArray;
@@ -1,5 +1,5 @@
-import { Block } from "./Block";
-import { InputAutocomplete, type InputAutocompleteProps } from "./InputAutocomplete";
+import Block from "./Block";
+import InputAutocomplete, { type InputAutocompleteProps } from "./InputAutocomplete";


 type FieldAutocompleteProps = InputAutocompleteProps & {
@@ -7,10 +7,12 @@ type FieldAutocompleteProps = InputAutocompleteProps & {
 };


-export const FieldAutocomplete: React.FC<FieldAutocompleteProps> = (props) => {
+const FieldAutocomplete: React.FC<FieldAutocompleteProps> = (props) => {
  return (
    <Block label={props.label}>
      <InputAutocomplete {...props} />
    </Block>
  );
 };
+
+export default FieldAutocomplete;
@@ -1,5 +1,5 @@
-import { Block } from "./Block";
-import { InputCheckbox, type InputCheckboxProps } from "./InputCheckbox";
+import Block from "./Block";
+import InputCheckbox, {type InputCheckboxProps} from "./InputCheckbox";


 type FieldCheckboxProps = InputCheckboxProps & {
@@ -7,10 +7,12 @@ type FieldCheckboxProps = InputCheckboxProps & {
 };


-export const FieldCheckbox: React.FC<FieldCheckboxProps> = (props) => {
+const FieldCheckbox: React.FC<FieldCheckboxProps> = (props) => {
  return (
    <Block label={props.label}>
      <InputCheckbox {...props} />
    </Block>
  );
 };
+
+export default FieldCheckbox;
@@ -1,5 +1,5 @@
-import { Block } from "./Block";
-import { InputColor, type InputColorProps } from "./InputColor";
+import Block from "./Block";
+import InputColor, {type InputColorProps} from "./InputColor";


 type FieldColorProps = InputColorProps & {
@@ -10,10 +10,12 @@ type FieldColorProps = InputColorProps & {
 };


-export const FieldColor: React.FC<FieldColorProps> = (props) => {
+const FieldColor: React.FC<FieldColorProps> = (props) => {
  return (
    <Block label={props.label} fieldSpec={props.fieldSpec}>
      <InputColor {...props} />
    </Block>
  );
 };
+
+export default FieldColor;
@@ -1,7 +1,7 @@
 import React from "react";

-import { Block } from "./Block";
-import { InputString } from "./InputString";
+import Block from "./Block";
+import InputString from "./InputString";
 import { type WithTranslation, withTranslation } from "react-i18next";

 type FieldCommentInternalProps = {
@@ -36,4 +36,5 @@ const FieldCommentInternal: React.FC<FieldCommentInternalProps> = (props) => {
  );
 };

-export const FieldComment = withTranslation()(FieldCommentInternal);
+const FieldComment = withTranslation()(FieldCommentInternal);
+export default FieldComment;
@@ -10,7 +10,7 @@ type FieldDocLabelProps = {
 };


-export const FieldDocLabel: React.FC<FieldDocLabelProps> = (props) => {
+const FieldDocLabel: React.FC<FieldDocLabelProps> = (props) => {
  const [open, setOpen] = React.useState(false);

  const onToggleDoc = (state: boolean) => {
@@ -49,3 +49,5 @@ export const FieldDocLabel: React.FC<FieldDocLabelProps> = (props) => {
  }
  return <div />;
 };
+
+export default FieldDocLabel;
@@ -1,17 +1,16 @@
-import { InputDynamicArray, type InputDynamicArrayProps } from "./InputDynamicArray";
-import { Fieldset } from "./Fieldset";
+import InputDynamicArray, {type InputDynamicArrayProps} from "./InputDynamicArray";
+import Fieldset from "./Fieldset";

 type FieldDynamicArrayProps = InputDynamicArrayProps & {
-  name?: string;
-  fieldSpec?: {
-    value?: string;
-  }
+  name?: string
 };

-export const FieldDynamicArray: React.FC<FieldDynamicArrayProps> = (props) => {
+const FieldDynamicArray: React.FC<FieldDynamicArrayProps> = (props) => {
  return (
    <Fieldset label={props.label}>
      <InputDynamicArray {...props} />
    </Fieldset>
  );
 };
+
+export default FieldDynamicArray;
@@ -1,5 +1,5 @@
-import { InputEnum, type InputEnumProps } from "./InputEnum";
-import { Fieldset } from "./Fieldset";
+import InputEnum, {type InputEnumProps} from "./InputEnum";
+import Fieldset from "./Fieldset";


 type FieldEnumProps = InputEnumProps & {
@@ -10,10 +10,12 @@ type FieldEnumProps = InputEnumProps & {
 };


-export const FieldEnum: React.FC<FieldEnumProps> = (props) => {
+const FieldEnum: React.FC<FieldEnumProps> = (props) => {
  return (
    <Fieldset label={props.label} fieldSpec={props.fieldSpec}>
      <InputEnum {...props} />
    </Fieldset>
  );
 };
+
+export default FieldEnum;
@@ -1,9 +1,9 @@
 import React from "react";

-import { SpecProperty } from "./SpecProperty";
-import { DataProperty, type Stop } from "./DataProperty";
-import { ZoomProperty } from "./ZoomProperty";
-import { ExpressionProperty } from "./ExpressionProperty";
+import SpecProperty from "./_SpecProperty";
+import DataProperty, { type Stop } from "./_DataProperty";
+import ZoomProperty from "./_ZoomProperty";
+import ExpressionProperty from "./_ExpressionProperty";
 import {function as styleFunction} from "@maplibre/maplibre-gl-style-spec";
 import {findDefaultFromSpec} from "../libs/spec-helper";
 import { type MappedLayerErrors } from "../libs/definitions";
@@ -128,11 +128,17 @@ type FieldFunctionProps = {
 /** Supports displaying spec field for zoom function objects
 * https://www.mapbox.com/mapbox-gl-style-spec/#types-function-zoom-property
 */
-export const FieldFunction: React.FC<FieldFunctionProps> = (props) => {
+const FieldFunction: React.FC<FieldFunctionProps> = (props) => {
+  const [dataType, setDataType] = React.useState(
+    getDataType(props.value, props.fieldSpec)
+  );
  const [isEditing, setIsEditing] = React.useState(false);
-  // Keep the expression editor mounted while typing, but otherwise select the
-  // editor from the current value so a collapsed function never renders as stops.
-  const dataType = isEditing ? "expression" : getDataType(props.value, props.fieldSpec);
+
+  React.useEffect(() => {
+    if (!isEditing) {
+      setDataType(getDataType(props.value, props.fieldSpec));
+    }
+  }, [props.value, props.fieldSpec, isEditing]);

  const getFieldFunctionType = (fieldSpec: any) => {
    if (fieldSpec.expression.interpolated) {
@@ -167,7 +173,7 @@ export const FieldFunction: React.FC<FieldFunctionProps> = (props) => {
  const deleteExpression = () => {
    const { fieldSpec, fieldName } = props;
    props.onChange(fieldName, fieldSpec.default);
-    setIsEditing(false);
+    setDataType("value");
  };

  const deleteStop = (stopIdx: number) => {
@@ -227,10 +233,10 @@ export const FieldFunction: React.FC<FieldFunctionProps> = (props) => {
        type: "identity",
        property: value[1],
      });
-      setIsEditing(false);
+      setDataType("value");
    } else if (isLiteralExpression(value)) {
      props.onChange(fieldName, value[1]);
-      setIsEditing(false);
+      setDataType("value");
    }
  };

@@ -396,3 +402,5 @@ export const FieldFunction: React.FC<FieldFunctionProps> = (props) => {
    </div>
  );
 };
+
+export default FieldFunction;
@@ -1,7 +1,7 @@

 import latest from "@maplibre/maplibre-gl-style-spec/dist/latest.json";
-import { Block } from "./Block";
-import { InputString } from "./InputString";
+import Block from "./Block";
+import InputString from "./InputString";

 type FieldIdProps = {
  value: string
@@ -10,7 +10,7 @@ type FieldIdProps = {
  error?: {message: string}
 };

-export const FieldId: React.FC<FieldIdProps> = (props) => {
+const FieldId: React.FC<FieldIdProps> = (props) => {
  return (
    <Block label="ID" fieldSpec={latest.layer.id}
      data-wd-key={props.wdKey}
@@ -24,3 +24,5 @@ export const FieldId: React.FC<FieldIdProps> = (props) => {
    </Block>
  );
 };
+
+export default FieldId;
@@ -1,9 +1,11 @@
-import { InputJson, type InputJsonProps } from "./InputJson";
+import InputJson, {type InputJsonProps} from "./InputJson";


 type FieldJsonProps = InputJsonProps & {};


-export const FieldJson: React.FC<FieldJsonProps> = (props) => {
+const FieldJson: React.FC<FieldJsonProps> = (props) => {
  return <InputJson {...props} />;
 };
+
+export default FieldJson;
@@ -1,8 +1,8 @@
 import React from "react";

 import latest from "@maplibre/maplibre-gl-style-spec/dist/latest.json";
-import { Block } from "./Block";
-import { InputNumber } from "./InputNumber";
+import Block from "./Block";
+import InputNumber from "./InputNumber";
 import { type WithTranslation, withTranslation } from "react-i18next";

 type FieldMaxZoomInternalProps = {
@@ -31,4 +31,5 @@ const FieldMaxZoomInternal: React.FC<FieldMaxZoomInternalProps> = (props) => {
  );
 };

-export const FieldMaxZoom = withTranslation()(FieldMaxZoomInternal);
+const FieldMaxZoom = withTranslation()(FieldMaxZoomInternal);
+export default FieldMaxZoom;
@@ -1,8 +1,8 @@
 import React from "react";

 import latest from "@maplibre/maplibre-gl-style-spec/dist/latest.json";
-import { Block } from "./Block";
-import { InputNumber } from "./InputNumber";
+import Block from "./Block";
+import InputNumber from "./InputNumber";
 import { type WithTranslation, withTranslation } from "react-i18next";

 type FieldMinZoomInternalProps = {
@@ -31,4 +31,5 @@ const FieldMinZoomInternal: React.FC<FieldMinZoomInternalProps> = (props) => {
  );
 };

-export const FieldMinZoom = withTranslation()(FieldMinZoomInternal);
+const FieldMinZoom = withTranslation()(FieldMinZoomInternal);
+export default FieldMinZoom;
@@ -1,5 +1,5 @@
-import { InputMultiInput, type InputMultiInputProps } from "./InputMultiInput";
-import { Fieldset } from "./Fieldset";
+import InputMultiInput, {type InputMultiInputProps} from "./InputMultiInput";
+import Fieldset from "./Fieldset";


 type FieldMultiInputProps = InputMultiInputProps & {
@@ -7,10 +7,12 @@ type FieldMultiInputProps = InputMultiInputProps & {
 };


-export const FieldMultiInput: React.FC<FieldMultiInputProps> = (props) => {
+const FieldMultiInput: React.FC<FieldMultiInputProps> = (props) => {
  return (
    <Fieldset label={props.label}>
      <InputMultiInput {...props} />
    </Fieldset>
  );
 };
+
+export default FieldMultiInput;
@@ -1,5 +1,5 @@
-import { InputNumber, type InputNumberProps } from "./InputNumber";
-import { Block } from "./Block";
+import InputNumber, {type InputNumberProps} from "./InputNumber";
+import Block from "./Block";


 type FieldNumberProps = InputNumberProps & {
@@ -10,10 +10,12 @@ type FieldNumberProps = InputNumberProps & {
 };


-export const FieldNumber: React.FC<FieldNumberProps> = (props) => {
+const FieldNumber: React.FC<FieldNumberProps> = (props) => {
  return (
    <Block label={props.label} fieldSpec={props.fieldSpec}>
      <InputNumber {...props} />
    </Block>
  );
 };
+
+export default FieldNumber;
@@ -1,5 +1,5 @@
-import { Block } from "./Block";
-import { InputSelect, type InputSelectProps } from "./InputSelect";
+import Block from "./Block";
+import InputSelect, {type InputSelectProps} from "./InputSelect";


 type FieldSelectProps = InputSelectProps & {
@@ -10,10 +10,12 @@ type FieldSelectProps = InputSelectProps & {
 };


-export const FieldSelect: React.FC<FieldSelectProps> = (props) => {
+const FieldSelect: React.FC<FieldSelectProps> = (props) => {
  return (
    <Block label={props.label} fieldSpec={props.fieldSpec}>
      <InputSelect {...props} />
    </Block>
  );
 };
+
+export default FieldSelect;
@@ -1,8 +1,8 @@
 import React from "react";

 import latest from "@maplibre/maplibre-gl-style-spec/dist/latest.json";
-import { Block } from "./Block";
-import { InputAutocomplete } from "./InputAutocomplete";
+import Block from "./Block";
+import InputAutocomplete from "./InputAutocomplete";
 import { type WithTranslation, withTranslation } from "react-i18next";

 type FieldSourceInternalProps = {
@@ -38,4 +38,5 @@ const FieldSourceInternal: React.FC<FieldSourceInternalProps> = ({
 };


-export const FieldSource = withTranslation()(FieldSourceInternal);
+const FieldSource = withTranslation()(FieldSourceInternal);
+export default FieldSource;
@@ -1,8 +1,8 @@
 import React from "react";

 import {latest} from "@maplibre/maplibre-gl-style-spec";
-import { Block } from "./Block";
-import { InputAutocomplete } from "./InputAutocomplete";
+import Block from "./Block";
+import InputAutocomplete from "./InputAutocomplete";
 import { type WithTranslation, withTranslation } from "react-i18next";

 type FieldSourceLayerInternalProps = {
@@ -35,4 +35,5 @@ const FieldSourceLayerInternal: React.FC<FieldSourceLayerInternalProps> = ({
  );
 };

-export const FieldSourceLayer = withTranslation()(FieldSourceLayerInternal);
+const FieldSourceLayer = withTranslation()(FieldSourceLayerInternal);
+export default FieldSourceLayer;
@@ -1,6 +1,6 @@
-import { Block, type BlockProps } from "./Block";
-import { InputSpec, type FieldSpecType, type InputSpecProps } from "./InputSpec";
-import { Fieldset, type FieldsetProps } from "./Fieldset";
+import Block, { type BlockProps } from "./Block";
+import InputSpec, { type FieldSpecType, type InputSpecProps } from "./InputSpec";
+import Fieldset, { type FieldsetProps } from "./Fieldset";

 function getElementFromType(fieldSpec: { type?: FieldSpecType, values?: unknown[] }): typeof Fieldset | typeof Block {
  switch(fieldSpec.type) {
@@ -36,7 +36,7 @@ function getElementFromType(fieldSpec: { type?: FieldSpecType, values?: unknown[

 export type FieldSpecProps = InputSpecProps & BlockProps & FieldsetProps;

-export const FieldSpec: React.FC<FieldSpecProps> = (props) => {
+const FieldSpec: React.FC<FieldSpecProps> = (props) => {
  const TypeBlock = getElementFromType(props.fieldSpec!);

  return (
@@ -45,3 +45,5 @@ export const FieldSpec: React.FC<FieldSpecProps> = (props) => {
    </TypeBlock>
  );
 };
+
+export default FieldSpec;
@@ -1,5 +1,5 @@
-import { Block } from "./Block";
-import { InputString, type InputStringProps } from "./InputString";
+import Block from "./Block";
+import InputString, {type InputStringProps} from "./InputString";

 type FieldStringProps = InputStringProps & {
  name?: string
@@ -9,10 +9,12 @@ type FieldStringProps = InputStringProps & {
  }
 };

-export const FieldString: React.FC<FieldStringProps> = (props) => {
+const FieldString: React.FC<FieldStringProps> = (props) => {
  return (
    <Block label={props.label} fieldSpec={props.fieldSpec}>
      <InputString {...props} />
    </Block>
  );
 };
+
+export default FieldString;
@@ -1,8 +1,8 @@
 import React from "react";
 import {v8} from "@maplibre/maplibre-gl-style-spec";
-import { Block } from "./Block";
-import { InputSelect } from "./InputSelect";
-import { InputString } from "./InputString";
+import Block from "./Block";
+import InputSelect from "./InputSelect";
+import InputString from "./InputString";
 import { type WithTranslation, withTranslation } from "react-i18next";
 import { startCase } from "lodash";

@@ -43,4 +43,5 @@ const FieldTypeInternal: React.FC<FieldTypeInternalProps> = ({
  );
 };

-export const FieldType = withTranslation()(FieldTypeInternal);
+const FieldType = withTranslation()(FieldTypeInternal);
+export default FieldType;
@@ -1,5 +1,5 @@
-import { InputUrl, type FieldUrlProps as InputUrlProps } from "./InputUrl";
-import { Block } from "./Block";
+import InputUrl, {type FieldUrlProps as InputUrlProps} from "./InputUrl";
+import Block from "./Block";


 type FieldUrlProps = InputUrlProps & {
@@ -10,10 +10,12 @@ type FieldUrlProps = InputUrlProps & {
 };


-export const FieldUrl: React.FC<FieldUrlProps> = (props) => {
+const FieldUrl: React.FC<FieldUrlProps> = (props) => {
  return (
    <Block label={props.label} fieldSpec={props.fieldSpec}>
      <InputUrl {...props} />
    </Block>
  );
 };
+
+export default FieldUrl;
@@ -1,8 +1,8 @@
 import React, { type PropsWithChildren, type ReactElement } from "react";
 import classnames from "classnames";
-import { FieldDocLabel } from "./FieldDocLabel";
-import { Doc } from "./Doc";
-import { generateUniqueId } from "../libs/document-uid";
+import FieldDocLabel from "./FieldDocLabel";
+import Doc from "./Doc";
+import generateUniqueId from "../libs/document-uid";

 export type FieldsetProps = PropsWithChildren & {
  label?: string,
@@ -12,7 +12,7 @@ export type FieldsetProps = PropsWithChildren & {
 };


-export const Fieldset: React.FC<FieldsetProps> = (props) => {
+const Fieldset: React.FC<FieldsetProps> = (props) => {
  const [showDoc, setShowDoc] = React.useState(false);
  const labelId = React.useRef(generateUniqueId("fieldset_label_"));

@@ -49,3 +49,5 @@ export const Fieldset: React.FC<FieldsetProps> = (props) => {
    </div>
  );
 };
+
+export default Fieldset;
@@ -7,13 +7,13 @@ import {migrate, convertFilter} from "@maplibre/maplibre-gl-style-spec";
 import latest from "@maplibre/maplibre-gl-style-spec/dist/latest.json";

 import {combiningFilterOps} from "../libs/filterops";
-import { InputSelect } from "./InputSelect";
-import { Block } from "./Block";
-import { SingleFilterEditor } from "./SingleFilterEditor";
-import { FilterEditorBlock } from "./FilterEditorBlock";
-import { InputButton } from "./InputButton";
-import { Doc } from "./Doc";
-import { ExpressionProperty } from "./ExpressionProperty";
+import InputSelect from "./InputSelect";
+import Block from "./Block";
+import SingleFilterEditor from "./SingleFilterEditor";
+import FilterEditorBlock from "./FilterEditorBlock";
+import InputButton from "./InputButton";
+import Doc from "./Doc";
+import ExpressionProperty from "./_ExpressionProperty";
 import { type WithTranslation, withTranslation } from "react-i18next";
 import type { MappedLayerErrors, StyleSpecificationWithId } from "../libs/definitions";

@@ -318,4 +318,5 @@ class FilterEditorInternal extends React.Component<FilterEditorInternalProps, Fi
  }
 }

-export const FilterEditor = withTranslation()(FilterEditorInternal);
+const FilterEditor = withTranslation()(FilterEditorInternal);
+export default FilterEditor;
@@ -1,5 +1,5 @@
 import React, { type PropsWithChildren } from "react";
-import { InputButton } from "./InputButton";
+import InputButton from "./InputButton";
 import {MdDelete} from "react-icons/md";
 import { type WithTranslation, withTranslation } from "react-i18next";

@@ -27,4 +27,5 @@ class FilterEditorBlockInternal extends React.Component<FilterEditorBlockInterna
  }
 }

-export const FilterEditorBlock = withTranslation()(FilterEditorBlockInternal);
+const FilterEditorBlock = withTranslation()(FilterEditorBlockInternal);
+export default FilterEditorBlock;
@@ -13,7 +13,7 @@ type IconLayerProps = {
  className?: string
 };

-export const IconLayer: React.FC<IconLayerProps> = (props) => {
+const IconLayer: React.FC<IconLayerProps> = (props) => {
  const iconProps = { style: props.style };
  switch(props.type) {
    case "fill-extrusion": return <IoMdCube {...iconProps} />;
@@ -29,3 +29,5 @@ export const IconLayer: React.FC<IconLayerProps> = (props) => {
    default: return <MdPriorityHigh {...iconProps} />;
  }
 };
+
+export default IconLayer;
@@ -1,6 +1,6 @@
 import React from "react";
-import { InputString } from "./InputString";
-import { InputNumber } from "./InputNumber";
+import InputString from "./InputString";
+import InputNumber from "./InputNumber";

 export type InputArrayProps = {
  value: (string | number | undefined)[]
@@ -17,7 +17,7 @@ type InputArrayState = {
  initialPropsValue: unknown[]
 };

-export class InputArray extends React.Component<InputArrayProps, InputArrayState> {
+export default class InputArray extends React.Component<InputArrayProps, InputArrayState> {
  static defaultProps = {
    value: [],
    default: [],
@@ -11,7 +11,7 @@ export type InputAutocompleteProps = {
  "aria-label"?: string
 };

-export function InputAutocomplete({
+export default function InputAutocomplete({
  value,
  options = [],
  onChange = () => {},
@@ -14,7 +14,7 @@ type InputButtonProps = {
  title?: string
 };

-export class InputButton extends React.Component<InputButtonProps> {
+export default class InputButton extends React.Component<InputButtonProps> {
  render() {
    return <button
      id={this.props.id}
@@ -6,7 +6,7 @@ export type InputCheckboxProps = {
  onChange(...args: unknown[]): unknown
 };

-export class InputCheckbox extends React.Component<InputCheckboxProps> {
+export default class InputCheckbox extends React.Component<InputCheckboxProps> {
  static defaultProps = {
    value: false,
  };
@@ -1,6 +1,7 @@
 import React from "react";
 import Color from "color";
-import {ChromePicker, type ColorResult} from "react-color";
+import ChromePicker from "react-color/lib/components/chrome/Chrome";
+import {type ColorResult} from "react-color";
 import lodash from "lodash";

 function formatColor(color: ColorResult): string {
@@ -19,7 +20,7 @@ export type InputColorProps = {
 };

 /*** Number fields with support for min, max and units and documentation*/
-export class InputColor extends React.Component<InputColorProps> {
+export default class InputColor extends React.Component<InputColorProps> {
  state = {
    pickerOpened: false
  };
@@ -3,13 +3,13 @@ import capitalize from "lodash.capitalize";
 import {MdDelete} from "react-icons/md";
 import { type WithTranslation, withTranslation } from "react-i18next";

-import { InputString } from "./InputString";
-import { InputNumber } from "./InputNumber";
-import { InputButton } from "./InputButton";
-import { FieldDocLabel } from "./FieldDocLabel";
-import { InputEnum } from "./InputEnum";
-import { InputUrl } from "./InputUrl";
-import { InputColor } from "./InputColor";
+import InputString from "./InputString";
+import InputNumber from "./InputNumber";
+import InputButton from "./InputButton";
+import FieldDocLabel from "./FieldDocLabel";
+import InputEnum from "./InputEnum";
+import InputUrl from "./InputUrl";
+import InputColor from "./InputColor";


 export type InputDynamicArrayProps = {
@@ -141,7 +141,9 @@ class InputDynamicArrayInternal extends React.Component<InputDynamicArrayInterna
  }
 }

-export const InputDynamicArray = withTranslation()(InputDynamicArrayInternal);
+const InputDynamicArray = withTranslation()(InputDynamicArrayInternal);
+export default InputDynamicArray;
+
 type DeleteValueInputButtonProps = {
  onClick?(...args: unknown[]): unknown
 } & WithTranslation;
@@ -1,6 +1,6 @@
 import React from "react";
-import { InputSelect } from "./InputSelect";
-import { InputMultiInput } from "./InputMultiInput";
+import InputSelect from "./InputSelect";
+import InputMultiInput from "./InputMultiInput";


 function optionsLabelLength(options: any[]) {
@@ -25,7 +25,7 @@ export type InputEnumProps = {
 };


-export class InputEnum extends React.Component<InputEnumProps> {
+export default class InputEnum extends React.Component<InputEnumProps> {
  render() {
    const {options, value, onChange, name, label} = this.props;

@@ -1,5 +1,5 @@
 import React from "react";
-import { InputAutocomplete } from "./InputAutocomplete";
+import InputAutocomplete from "./InputAutocomplete";

 export type InputFontProps = {
  name: string
@@ -11,7 +11,7 @@ export type InputFontProps = {
  "aria-label"?: string
 };

-export class InputFont extends React.Component<InputFontProps> {
+export default class InputFont extends React.Component<InputFontProps> {
  static defaultProps = {
    fonts: []
  };
@@ -135,4 +135,5 @@ class InputJsonInternal extends React.Component<InputJsonInternalProps, InputJso
  }
 }

-export const InputJson = withTranslation()(InputJsonInternal);
+const InputJson = withTranslation()(InputJsonInternal);
+export default InputJson;
@@ -9,7 +9,7 @@ export type InputMultiInputProps = {
  "aria-label"?: string
 };

-export class InputMultiInput extends React.Component<InputMultiInputProps> {
+export default class InputMultiInput extends React.Component<InputMultiInputProps> {
  render() {
    let options = this.props.options;
    if(options.length > 0 && !Array.isArray(options[0])) {
@@ -1,5 +1,5 @@
 import React, { type BaseSyntheticEvent } from "react";
-import { generateUniqueId } from "../libs/document-uid";
+import generateUniqueId from "../libs/document-uid";

 export type InputNumberProps = {
  value?: number
@@ -25,7 +25,7 @@ type InputNumberState = {
  dirtyValue?: number | string | undefined
 };

-export class InputNumber extends React.Component<InputNumberProps, InputNumberState> {
+export default class InputNumber extends React.Component<InputNumberProps, InputNumberState> {
  static defaultProps = {
    rangeStep: 1
  };
@@ -10,7 +10,7 @@ export type InputSelectProps = {
  "aria-label"?: string
 };

-export class InputSelect extends React.Component<InputSelectProps> {
+export default class InputSelect extends React.Component<InputSelectProps> {
  render() {
    let options = this.props.options;
    if(options.length > 0 && !Array.isArray(options[0])) {
@@ -1,14 +1,14 @@
 import React, { type ReactElement } from "react";

-import { InputColor, type InputColorProps } from "./InputColor";
-import { InputNumber, type InputNumberProps } from "./InputNumber";
-import { InputCheckbox, type InputCheckboxProps } from "./InputCheckbox";
-import { InputString, type InputStringProps } from "./InputString";
-import { InputArray, type InputArrayProps } from "./InputArray";
-import { InputDynamicArray, type InputDynamicArrayProps } from "./InputDynamicArray";
-import { InputFont, type InputFontProps } from "./InputFont";
-import { InputAutocomplete, type InputAutocompleteProps } from "./InputAutocomplete";
-import { InputEnum, type InputEnumProps } from "./InputEnum";
+import InputColor, { type InputColorProps } from "./InputColor";
+import InputNumber, { type InputNumberProps } from "./InputNumber";
+import InputCheckbox, { type InputCheckboxProps } from "./InputCheckbox";
+import InputString, { type InputStringProps } from "./InputString";
+import InputArray, { type InputArrayProps } from "./InputArray";
+import InputDynamicArray, { type InputDynamicArrayProps } from "./InputDynamicArray";
+import InputFont, { type InputFontProps } from "./InputFont";
+import InputAutocomplete, { type InputAutocompleteProps } from "./InputAutocomplete";
+import InputEnum, { type InputEnumProps } from "./InputEnum";
 import capitalize from "lodash.capitalize";

 const iconProperties = ["background-pattern", "fill-pattern", "line-pattern", "fill-extrusion-pattern", "icon-image"];
@@ -38,7 +38,7 @@ export type InputSpecProps = {
 /** Display any field from the Maplibre GL style spec and
 * choose the correct field component based on the @{fieldSpec}
 * to display @{value}. */
-export class InputSpec extends React.Component<InputSpecProps> {
+export default class InputSpec extends React.Component<InputSpecProps> {

  childNodes() {
    const commonProps = {
@@ -20,7 +20,7 @@ type InputStringState = {
  value?: string
 };

-export class InputString extends React.Component<InputStringProps, InputStringState> {
+export default class InputString extends React.Component<InputStringProps, InputStringState> {
  static defaultProps = {
    onInput: () => {},
  };
@@ -1,6 +1,6 @@
 import React, { type JSX } from "react";
-import { InputString } from "./InputString";
-import { SmallError } from "./SmallError";
+import InputString from "./InputString";
+import SmallError from "./SmallError";
 import { Trans, type WithTranslation, withTranslation } from "react-i18next";
 import { type TFunction } from "i18next";
 import { ErrorType, validate } from "../libs/urlopen";
@@ -91,4 +91,5 @@ class InputUrlInternal extends React.Component<InputUrlInternalProps, InputUrlSt
  }
 }

-export const InputUrl = withTranslation()(InputUrlInternal);
+const InputUrl = withTranslation()(InputUrlInternal);
+export default InputUrl;
@@ -6,17 +6,17 @@ import { IconContext } from "react-icons";
 import { type BackgroundLayerSpecification, type LayerSpecification, type SourceSpecification } from "maplibre-gl";
 import { v8 } from "@maplibre/maplibre-gl-style-spec";

-import { FieldJson } from "./FieldJson";
-import { FilterEditor } from "./FilterEditor";
-import { PropertyGroup } from "./PropertyGroup";
-import { LayerEditorGroup } from "./LayerEditorGroup";
-import { FieldType } from "./FieldType";
-import { FieldId } from "./FieldId";
-import { FieldMinZoom } from "./FieldMinZoom";
-import { FieldMaxZoom } from "./FieldMaxZoom";
-import { FieldComment } from "./FieldComment";
-import { FieldSource } from "./FieldSource";
-import { FieldSourceLayer } from "./FieldSourceLayer";
+import FieldJson from "./FieldJson";
+import FilterEditor from "./FilterEditor";
+import PropertyGroup from "./PropertyGroup";
+import LayerEditorGroup from "./LayerEditorGroup";
+import FieldType from "./FieldType";
+import FieldId from "./FieldId";
+import FieldMinZoom from "./FieldMinZoom";
+import FieldMaxZoom from "./FieldMaxZoom";
+import FieldComment from "./FieldComment";
+import FieldSource from "./FieldSource";
+import FieldSourceLayer from "./FieldSourceLayer";
 import { changeType, changeProperty } from "../libs/layer";
 import { formatLayerId } from "../libs/format";
 import { type WithTranslation, withTranslation } from "react-i18next";
@@ -74,20 +74,20 @@ function getLayoutForType(type: LayerSpecification["type"], t: TFunction): Maput
    return getLayoutForSymbolType(t);
  }
  const groups: MaputnikLayoutGroup[] = [];
-  if (Object.keys(v8["paint_" + type as keyof typeof v8]).length > 0) {
+  if (Object.keys(v8["paint_" + type]).length > 0) {
    groups.push({
      title: t("Paint properties"),
      id: "Paint_properties",
      type: "properties",
-      fields: Object.keys(v8["paint_" + type as keyof typeof v8]),
+      fields: Object.keys(v8["paint_" + type]),
    });
  }
-  if (Object.keys(v8["layout_" + type as keyof typeof v8]).length > 0) {
+  if (Object.keys(v8["layout_" + type]).length > 0) {
    groups.push({
      title: t("Layout properties"),
      id: "Layout_properties",
      type: "properties",
-      fields: Object.keys(v8["layout_" + type as keyof typeof v8])
+      fields: Object.keys(v8["layout_" + type])
    });
  }
  return groups;
@@ -420,4 +420,5 @@ class LayerEditorInternal extends React.Component<LayerEditorInternalProps, Laye
  }
 }

-export const LayerEditor = withTranslation()(LayerEditorInternal);
+const LayerEditor = withTranslation()(LayerEditorInternal);
+export default LayerEditor;
@@ -18,7 +18,7 @@ type LayerEditorGroupProps = {
 };


-export class LayerEditorGroup extends React.Component<LayerEditorGroupProps> {
+export default class LayerEditorGroup extends React.Component<LayerEditorGroupProps> {
  render() {
    return <AccordionItem uuid={this.props.id}>
      <AccordionItemHeading className="maputnik-layer-editor-group"
@@ -14,12 +14,12 @@ import {
  verticalListSortingStrategy,
 } from "@dnd-kit/sortable";

-import { LayerListGroup } from "./LayerListGroup";
-import { LayerListItem } from "./LayerListItem";
-import { ModalAdd } from "./modals/ModalAdd";
+import LayerListGroup from "./LayerListGroup";
+import LayerListItem from "./LayerListItem";
+import ModalAdd from "./modals/ModalAdd";

 import type {LayerSpecification, SourceSpecification} from "maplibre-gl";
-import { generateUniqueId } from "../libs/document-uid";
+import generateUniqueId from "../libs/document-uid";
 import { findClosestCommonPrefix, layerPrefix } from "../libs/layer";
 import { type WithTranslation, withTranslation } from "react-i18next";
 import { type MappedError, type OnMoveLayerCallback } from "../libs/definitions";
@@ -106,13 +106,13 @@ class LayerListContainerInternal extends React.Component<LayerListContainerInter
    });
  };

-  groupedLayers(layers = this.props.layers): (LayerSpecification & {key: string})[][] {
+  groupedLayers(): (LayerSpecification & {key: string})[][] {
    const groups = [];
    const layerIdCount = new Map();

-    for (let i = 0; i < layers.length; i++) {
-      const origLayer = layers[i];
-      const previousLayer = layers[i-1];
+    for (let i = 0; i < this.props.layers.length; i++) {
+      const origLayer = this.props.layers[i];
+      const previousLayer = this.props.layers[i-1];
      layerIdCount.set(origLayer.id,
        layerIdCount.has(origLayer.id) ? layerIdCount.get(origLayer.id) + 1 : 0
      );
@@ -192,39 +192,7 @@ class LayerListContainerInternal extends React.Component<LayerListContainerInter
    return propsChanged;
  }

-  /**
-   * Preserves group state through surviving layer IDs when group indices change.
-   * If deletion joins groups, the result stays expanded when either group was.
-   */
-  private preserveLayerGroupState(previousLayers: LayerSpecification[]) {
-    if (previousLayers === this.props.layers) return;
-
-    const collapsedByLayer = new Map<string, boolean>();
-    let idx = 0;
-    for (const layers of this.groupedLayers(previousLayers)) {
-      const collapsed = this.isCollapsed(layerPrefix(layers[0].id), idx);
-      for (const layer of layers) {
-        collapsedByLayer.set(layer.id, collapsed);
-      }
-      idx += layers.length;
-    }
-
-    const collapsedGroups: {[key: string]: boolean} = {};
-    idx = 0;
-    for (const layers of this.groupedLayers()) {
-      const lookupKey = [layerPrefix(layers[0].id), idx].join("-");
-      collapsedGroups[lookupKey] = layers.every(layer => collapsedByLayer.get(layer.id) !== false);
-      idx += layers.length;
-    }
-
-    if (!lodash.isEqual(collapsedGroups, this.state.collapsedGroups)) {
-      this.setState({ collapsedGroups });
-    }
-  }
-
  componentDidUpdate (prevProps: LayerListContainerProps) {
-    this.preserveLayerGroupState(prevProps.layers);
-
    if (prevProps.selectedLayerIndex !== this.props.selectedLayerIndex) {
      const selectedItemNode = this.selectedItemRef.current;
      if (selectedItemNode && selectedItemNode.node) {
@@ -368,7 +336,7 @@ type LayerListProps = LayerListContainerProps & {
  onMoveLayer: OnMoveLayerCallback
 };

-export const LayerList: React.FC<LayerListProps> = (props) => {
+const LayerList: React.FC<LayerListProps> = (props) => {
  const sensors = useSensors(useSensor(PointerSensor, { activationConstraint: { distance: 5 } }));

  const handleDragEnd = (event: DragEndEvent) => {
@@ -393,3 +361,5 @@ export const LayerList: React.FC<LayerListProps> = (props) => {
    </DndContext>
  );
 };
+
+export default LayerList;
@@ -1,5 +1,5 @@
 import React from "react";
-import { Collapser } from "./Collapser";
+import Collapser from "./Collapser";

 type LayerListGroupProps = {
  title: string
@@ -9,7 +9,7 @@ type LayerListGroupProps = {
  "aria-controls"?: string
 };

-export class LayerListGroup extends React.Component<LayerListGroupProps> {
+export default class LayerListGroup extends React.Component<LayerListGroupProps> {
  render() {
    return <li className="maputnik-layer-list-group">
      <div className="maputnik-layer-list-group-header"
@@ -5,7 +5,7 @@ import { IconContext } from "react-icons";
 import { useSortable } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";

-import { IconLayer } from "./IconLayer";
+import IconLayer from "./IconLayer";
 import type { VisibilitySpecification } from "maplibre-gl";


@@ -32,8 +32,6 @@ const DraggableLabel: React.FC<DraggableLabelProps> = (props) => {

 type IconActionProps = {
  action: string
-  /** Tooltip text, for buttons whose action reads differently from their icon. */
-  title?: string
  onClick(...args: unknown[]): unknown
  wdKey?: string
  classBlockName?: string
@@ -64,7 +62,7 @@ class IconAction extends React.Component<IconActionProps> {

    return <button
      tabIndex={-1}
-      title={this.props.title ?? this.props.action}
+      title={this.props.action}
      className={`maputnik-layer-list-icon-action ${classAdditions}`}
      data-wd-key={this.props.wdKey}
      onClick={this.props.onClick}
@@ -89,7 +87,7 @@ type LayerListItemProps = {
  onLayerVisibilityToggle?(...args: unknown[]): unknown
 };

-export const LayerListItem = React.forwardRef<HTMLLIElement, LayerListItemProps>((props, ref) => {
+const LayerListItem = React.forwardRef<HTMLLIElement, LayerListItemProps>((props, ref) => {
  const {
    isSelected = false,
    visibility = "visible",
@@ -113,12 +111,7 @@ export const LayerListItem = React.forwardRef<HTMLLIElement, LayerListItemProps>
    opacity: isDragging ? 0.5 : 1,
  };

-  // The icon and the CSS modifier describe the layer's current visibility,
-  // while the tooltip has to describe what clicking the button does, which is
-  // the opposite of it.
-  const isVisible = visibility === "visible";
-  const visibilityAction = isVisible ? "show" : "hide";
-  const visibilityTitle = isVisible ? "hide" : "show";
+  const visibilityAction = visibility === "visible" ? "show" : "hide";

  // Cast ref to MutableRefObject since we know from the codebase that's what's always passed
  const refObject = ref as React.MutableRefObject<HTMLLIElement | null> | null;
@@ -162,7 +155,6 @@ export const LayerListItem = React.forwardRef<HTMLLIElement, LayerListItemProps>
      <IconAction
        wdKey={"layer-list-item:" + props.layerId + ":toggle-visibility"}
        action={visibilityAction}
-        title={visibilityTitle}
        classBlockName="visibility"
        classBlockModifier={visibilityAction}
        onClick={_e => onLayerVisibilityToggle!(props.layerIndex)}
@@ -170,3 +162,5 @@ export const LayerListItem = React.forwardRef<HTMLLIElement, LayerListItemProps>
    </li>
  </IconContext.Provider>;
 });
+
+export default LayerListItem;
@@ -1,17 +1,16 @@
 import React from "react";
 import {createRoot} from "react-dom/client";
-import * as MapLibreGl from "maplibre-gl";
-import {type LayerSpecification, type LngLat, type Map, type MapOptions, type SourceSpecification, type StyleSpecification} from "maplibre-gl";
+import MapLibreGl, {type LayerSpecification, type LngLat, type Map, type MapOptions, type SourceSpecification, type StyleSpecification} from "maplibre-gl";
 import MaplibreInspect from "@maplibre/maplibre-gl-inspect";
 import colors from "@maplibre/maplibre-gl-inspect/lib/colors";
-import { FeatureLayerPopup as MapMaplibreGlLayerPopup } from "./MapMaplibreGlLayerPopup";
-import { FeaturePropertyPopup as MapMaplibreGlFeaturePropertyPopup, type InspectFeature } from "./MapMaplibreGlFeaturePropertyPopup";
+import MapMaplibreGlLayerPopup from "./MapMaplibreGlLayerPopup";
+import MapMaplibreGlFeaturePropertyPopup, { type InspectFeature } from "./MapMaplibreGlFeaturePropertyPopup";
 import Color from "color";
-import { ZoomControl } from "../libs/zoomcontrol";
+import ZoomControl from "../libs/zoomcontrol";
 import { type HighlightedLayer, colorHighlightedLayer } from "../libs/highlight";
 import "maplibre-gl/dist/maplibre-gl.css";
 import "../maplibregl.css";
-import "../libs/maplibre-init";
+import "../libs/maplibre-rtl";
 import MaplibreGeocoder, { type MaplibreGeocoderApi, type MaplibreGeocoderApiConfig } from "@maplibre/maplibre-gl-geocoder";
 import "@maplibre/maplibre-gl-geocoder/dist/maplibre-gl-geocoder.css";
 import { withTranslation, type WithTranslation } from "react-i18next";
@@ -239,7 +238,7 @@ class MapMaplibreGlInternal extends React.Component<MapMaplibreGlInternalProps,
    });

    map.on("data", e => {
-      if(e.dataType !== "source" || !e.tile) return;
+      if(e.dataType !== "tile") return;
      this.props.onDataChange!({
        map: this.state.map
      });
@@ -323,4 +322,5 @@ class MapMaplibreGlInternal extends React.Component<MapMaplibreGlInternalProps,
  }
 }

-export const MapMaplibreGl = withTranslation()(MapMaplibreGlInternal);
+const MapMaplibreGl = withTranslation()(MapMaplibreGlInternal);
+export default MapMaplibreGl;
@@ -63,7 +63,7 @@ type FeaturePropertyPopupProps = {
  features: InspectFeature[]
 };

-export class FeaturePropertyPopup extends React.Component<FeaturePropertyPopupProps> {
+class FeaturePropertyPopup extends React.Component<FeaturePropertyPopupProps> {
  render() {
    const features = removeDuplicatedFeatures(this.props.features);
    return <div className="maputnik-feature-property-popup" dir="ltr" data-wd-key="feature-property-popup">
@@ -75,3 +75,6 @@ export class FeaturePropertyPopup extends React.Component<FeaturePropertyPopupPr
    </div>;
  }
 }
+
+
+export default FeaturePropertyPopup;
@@ -1,5 +1,5 @@
 import React from "react";
-import { IconLayer } from "./IconLayer";
+import IconLayer from "./IconLayer";
 import type {InspectFeature} from "./MapMaplibreGlFeaturePropertyPopup";

 function groupFeaturesBySourceLayer(features: InspectFeature[]) {
@@ -32,7 +32,7 @@ type FeatureLayerPopupProps = {
  zoom?: number
 };

-export class FeatureLayerPopup extends React.Component<FeatureLayerPopupProps> {
+class FeatureLayerPopup extends React.Component<FeatureLayerPopupProps> {
  _getFeatureColor(feature: InspectFeature, _zoom?: number) {
    // Guard because openlayers won't have this
    if (!feature.layer.paint) {
@@ -109,3 +109,6 @@ export class FeatureLayerPopup extends React.Component<FeatureLayerPopupProps> {
    </div>;
  }
 }
+
+
+export default FeatureLayerPopup;
@@ -2,7 +2,7 @@ import React from "react";
 import {throttle} from "lodash";
 import { type WithTranslation, withTranslation } from "react-i18next";

-import { FeatureLayerPopup as MapMaplibreGlLayerPopup } from "./MapMaplibreGlLayerPopup";
+import MapMaplibreGlLayerPopup from "./MapMaplibreGlLayerPopup";

 import "ol/ol.css";
 //@ts-ignore
@@ -204,4 +204,5 @@ class MapOpenLayersInternal extends React.Component<MapOpenLayersInternalProps,
  }
 }

-export const MapOpenLayers = withTranslation()(MapOpenLayersInternal);
+const MapOpenLayers = withTranslation()(MapOpenLayersInternal);
+export default MapOpenLayers;
@@ -1,6 +1,6 @@
 import React from "react";

-import { FieldFunction } from "./FieldFunction";
+import FieldFunction from "./FieldFunction";
 import type {LayerSpecification} from "maplibre-gl";
 import { type MappedLayerErrors } from "../libs/definitions";

@@ -40,7 +40,7 @@ type PropertyGroupProps = {
  errors?: MappedLayerErrors
 };

-export class PropertyGroup extends React.Component<PropertyGroupProps> {
+export default class PropertyGroup extends React.Component<PropertyGroupProps> {
  onPropertyChange = (property: string, newValue: any) => {
    const group = getGroupName(this.props.spec, this.props.layer.type, property);
    this.props.onChange(group ,property, newValue);
@@ -4,7 +4,7 @@ type ScrollContainerProps = {
  children?: React.ReactNode
 };

-export class ScrollContainer extends React.Component<ScrollContainerProps> {
+export default class ScrollContainer extends React.Component<ScrollContainerProps> {
  render() {
    return <div className="maputnik-scroll-container">
      {this.props.children}
@@ -1,9 +1,9 @@
 import React from "react";

 import {otherFilterOps} from "../libs/filterops";
-import { InputString } from "./InputString";
-import { InputAutocomplete } from "./InputAutocomplete";
-import { InputSelect } from "./InputSelect";
+import InputString from "./InputString";
+import InputAutocomplete from "./InputAutocomplete";
+import InputSelect from "./InputSelect";

 function tryParseInt(v: string | number) {
  if (v === "") return v;
@@ -40,7 +40,7 @@ type SingleFilterEditorProps = {
  properties?: {[key: string]: string}
 };

-export class SingleFilterEditor extends React.Component<SingleFilterEditorProps> {
+export default class SingleFilterEditor extends React.Component<SingleFilterEditorProps> {
  static defaultProps = {
    properties: {},
  };
@@ -18,4 +18,5 @@ class SmallErrorInternal extends React.Component<SmallErrorInternalProps> {
  }
 }

-export const SmallError = withTranslation()(SmallErrorInternal);
+const SmallError = withTranslation()(SmallErrorInternal);
+export default SmallError;
@@ -3,19 +3,19 @@ import {PiListPlusBold} from "react-icons/pi";
 import {TbMathFunction} from "react-icons/tb";
 import latest from "@maplibre/maplibre-gl-style-spec/dist/latest.json";

-import { InputButton } from "./InputButton";
-import { InputSpec } from "./InputSpec";
-import { InputNumber } from "./InputNumber";
-import { InputString } from "./InputString";
-import { InputSelect } from "./InputSelect";
-import { Block } from "./Block";
-import { generateUniqueId as docUid } from "../libs/document-uid";
-import { sortNumerically } from "../libs/sort-numerically";
+import InputButton from "./InputButton";
+import InputSpec from "./InputSpec";
+import InputNumber from "./InputNumber";
+import InputString from "./InputString";
+import InputSelect from "./InputSelect";
+import Block from "./Block";
+import docUid from "../libs/document-uid";
+import sortNumerically from "../libs/sort-numerically";
 import {findDefaultFromSpec} from "../libs/spec-helper";
 import { type WithTranslation, withTranslation } from "react-i18next";

-import { labelFromFieldName } from "../libs/label-from-field-name";
-import { DeleteStopButton } from "./DeleteStopButton";
+import labelFromFieldName from "../libs/label-from-field-name";
+import DeleteStopButton from "./_DeleteStopButton";
 import { type MappedLayerErrors } from "../libs/definitions";


@@ -385,4 +385,5 @@ class DataPropertyInternal extends React.Component<DataPropertyInternalProps, Da
  }
 }

-export const DataProperty = withTranslation()(DataPropertyInternal);
+const DataProperty = withTranslation()(DataPropertyInternal);
+export default DataProperty;
@@ -1,6 +1,6 @@
 import React from "react";

-import { InputButton } from "./InputButton";
+import InputButton from "./InputButton";
 import {MdDelete} from "react-icons/md";
 import { type WithTranslation, withTranslation } from "react-i18next";

@@ -23,4 +23,5 @@ class DeleteStopButtonInternal extends React.Component<DeleteStopButtonInternalP
  }
 }

-export const DeleteStopButton = withTranslation()(DeleteStopButtonInternal);
+const DeleteStopButton = withTranslation()(DeleteStopButtonInternal);
+export default DeleteStopButton;
@@ -2,10 +2,10 @@ import React from "react";
 import {MdDelete, MdUndo} from "react-icons/md";
 import { type WithTranslation, withTranslation } from "react-i18next";

-import { Block } from "./Block";
-import { InputButton } from "./InputButton";
-import { labelFromFieldName } from "../libs/label-from-field-name";
-import { FieldJson } from "./FieldJson";
+import Block from "./Block";
+import InputButton from "./InputButton";
+import labelFromFieldName from "../libs/label-from-field-name";
+import FieldJson from "./FieldJson";
 import type { StylePropertySpecification } from "maplibre-gl";
 import { type MappedLayerErrors } from "../libs/definitions";

@@ -92,4 +92,5 @@ class ExpressionPropertyInternal extends React.Component<ExpressionPropertyInter
  }
 }

-export const ExpressionProperty = withTranslation()(ExpressionPropertyInternal);
+const ExpressionProperty = withTranslation()(ExpressionPropertyInternal);
+export default ExpressionProperty;
@@ -1,6 +1,6 @@
 import React from "react";

-import { InputButton } from "./InputButton";
+import InputButton from "./InputButton";
 import {MdFunctions, MdInsertChart} from "react-icons/md";
 import { TbMathFunction } from "react-icons/tb";
 import { type WithTranslation, withTranslation } from "react-i18next";
@@ -67,4 +67,5 @@ class FunctionInputButtonsInternal extends React.Component<FunctionInputButtonsI
  }
 }

-export const FunctionInputButtons = withTranslation()(FunctionInputButtonsInternal);
+const FunctionInputButtons = withTranslation()(FunctionInputButtonsInternal);
+export default FunctionInputButtons;
@@ -1,9 +1,9 @@
 import React from "react";

-import { FieldSpec, type FieldSpecProps } from "./FieldSpec";
-import { FunctionInputButtons as FunctionButtons } from "./FunctionButtons";
+import FieldSpec, {type FieldSpecProps} from "./FieldSpec";
+import FunctionButtons from "./_FunctionButtons";

-import { labelFromFieldName } from "../libs/label-from-field-name";
+import labelFromFieldName from "../libs/label-from-field-name";


 type SpecPropertyProps = FieldSpecProps & {
@@ -19,7 +19,7 @@ type SpecPropertyProps = FieldSpecProps & {
 };


-export class SpecProperty extends React.Component<SpecPropertyProps> {
+export default class SpecProperty extends React.Component<SpecPropertyProps> {
  static defaultProps = {
    errors: {},
  };
@@ -4,17 +4,17 @@ import { TbMathFunction } from "react-icons/tb";
 import latest from "@maplibre/maplibre-gl-style-spec/dist/latest.json";
 import { type WithTranslation, withTranslation } from "react-i18next";

-import { InputButton } from "./InputButton";
-import { InputSpec } from "./InputSpec";
-import { InputNumber } from "./InputNumber";
-import { InputSelect } from "./InputSelect";
-import { Block } from "./Block";
+import InputButton from "./InputButton";
+import InputSpec from "./InputSpec";
+import InputNumber from "./InputNumber";
+import InputSelect from "./InputSelect";
+import Block from "./Block";

-import { DeleteStopButton } from "./DeleteStopButton";
-import { labelFromFieldName } from "../libs/label-from-field-name";
+import DeleteStopButton from "./_DeleteStopButton";
+import labelFromFieldName from "../libs/label-from-field-name";

-import { generateUniqueId as docUid } from "../libs/document-uid";
-import { sortNumerically } from "../libs/sort-numerically";
+import docUid from "../libs/document-uid";
+import sortNumerically from "../libs/sort-numerically";
 import { type MappedLayerErrors } from "../libs/definitions";


@@ -267,4 +267,5 @@ class ZoomPropertyInternal extends React.Component<ZoomPropertyInternalProps, Zo
  }
 }

-export const ZoomProperty = withTranslation()(ZoomPropertyInternal);
+const ZoomProperty = withTranslation()(ZoomPropertyInternal);
+export default ZoomProperty;
@@ -67,4 +67,5 @@ class ModalInternal extends React.Component<ModalInternalProps> {
  }
 }

-export const Modal = withTranslation()(ModalInternal);
+const Modal = withTranslation()(ModalInternal);
+export default Modal;
@@ -2,12 +2,12 @@ import React from "react";
 import { type WithTranslation, withTranslation } from "react-i18next";
 import type {LayerSpecification, SourceSpecification} from "maplibre-gl";

-import { InputButton } from "../InputButton";
-import { Modal } from "./Modal";
-import { FieldType } from "../FieldType";
-import { FieldId } from "../FieldId";
-import { FieldSource } from "../FieldSource";
-import { FieldSourceLayer } from "../FieldSourceLayer";
+import InputButton from "../InputButton";
+import Modal from "./Modal";
+import FieldType from "../FieldType";
+import FieldId from "../FieldId";
+import FieldSource from "../FieldSource";
+import FieldSourceLayer from "../FieldSourceLayer";
 import { NON_SOURCE_LAYERS } from "../../libs/non-source-layers";

 type ModalAddInternalProps = {
@@ -192,4 +192,5 @@ class ModalAddInternal extends React.Component<ModalAddInternalProps, ModalAddSt
  }
 }

-export const ModalAdd = withTranslation()(ModalAddInternal);
+const ModalAdd = withTranslation()(ModalAddInternal);
+export default ModalAdd;
@@ -1,7 +1,7 @@
 import React from "react";
 import { Trans, type WithTranslation, withTranslation } from "react-i18next";

-import { Modal } from "./Modal";
+import Modal from "./Modal";


 type ModalDebugInternalProps = {
@@ -79,4 +79,5 @@ class ModalDebugInternal extends React.Component<ModalDebugInternalProps> {
  }
 }

-export const ModalDebug = withTranslation()(ModalDebugInternal);
+const ModalDebug = withTranslation()(ModalDebugInternal);
+export default ModalDebug;
@@ -6,11 +6,11 @@ import {format} from "@maplibre/maplibre-gl-style-spec";
 import {MdMap, MdSave} from "react-icons/md";
 import {type WithTranslation, withTranslation} from "react-i18next";

-import { FieldString } from "../FieldString";
-import { InputButton } from "../InputButton";
-import { Modal } from "./Modal";
-import { replaceAccessTokens, stripAccessTokens } from "../../libs/style";
-import { spec as fieldSpecAdditional } from "../../libs/field-spec-additional";
+import FieldString from "../FieldString";
+import InputButton from "../InputButton";
+import Modal from "./Modal";
+import {replaceAccessTokens, stripAccessTokens} from "../../libs/style";
+import fieldSpecAdditional from "../../libs/field-spec-additional";
 import type {OnStyleChangedCallback, StyleSpecificationWithId} from "../../libs/definitions";


@@ -59,6 +59,7 @@ class ModalExportInternal extends React.Component<ModalExportInternalProps> {
  <meta charset="utf-8" />
  <title>${htmlTitle}</title>
  <meta name="viewport" content="initial-scale=1,maximum-scale=1,user-scalable=no" />
+  <script src="https://unpkg.com/maplibre-gl@${MAPLIBRE_GL_VERSION}/dist/maplibre-gl.js"></script>
  <link href="https://unpkg.com/maplibre-gl@${MAPLIBRE_GL_VERSION}/dist/maplibre-gl.css" rel="stylesheet" />
  <style>
    body { margin: 0; padding: 0; }
@@ -67,9 +68,8 @@ class ModalExportInternal extends React.Component<ModalExportInternalProps> {
 </head>
 <body>
  <div id="map"></div>
-  <script type="module">
-      import {Map} from 'https://unpkg.com/maplibre-gl@${MAPLIBRE_GL_VERSION}/dist/maplibre-gl.mjs';
-      const map = new Map({
+  <script>
+      const map = new maplibregl.Map({
         container: 'map',
         style: ${tokenStyle},
      });
@@ -217,4 +217,5 @@ class ModalExportInternal extends React.Component<ModalExportInternalProps> {
  }
 }

-export const ModalExport = withTranslation()(ModalExportInternal);
+const ModalExport = withTranslation()(ModalExportInternal);
+export default ModalExport;
@@ -3,13 +3,13 @@ import { withTranslation, type WithTranslation } from "react-i18next";
 import { MdDelete } from "react-icons/md";
 import latest from "@maplibre/maplibre-gl-style-spec/dist/latest.json";

-import { Modal } from "./Modal";
-import { FieldString } from "../FieldString";
-import { InputButton } from "../InputButton";
+import Modal from "./Modal";
+import FieldString from "../FieldString";
+import InputButton from "../InputButton";
 import { PiListPlusBold } from "react-icons/pi";
 import { type StyleSpecificationWithId } from "../../libs/definitions";
 import { type SchemaSpecification } from "maplibre-gl";
-import { Doc } from "../Doc";
+import Doc from "../Doc";

 type ModalGlobalStateInternalProps = {
  mapStyle: StyleSpecificationWithId;
@@ -151,4 +151,5 @@ const ModalGlobalStateInternal: React.FC<ModalGlobalStateInternalProps> = (props
  );
 };

-export const ModalGlobalState = withTranslation()(ModalGlobalStateInternal);
+const ModalGlobalState = withTranslation()(ModalGlobalStateInternal);
+export default ModalGlobalState;
@@ -1,8 +1,8 @@
 import React from "react";
 import { type WithTranslation, withTranslation } from "react-i18next";

-import { InputButton } from "../InputButton";
-import { Modal } from "./Modal";
+import InputButton from "../InputButton";
+import Modal from "./Modal";


 type ModalLoadingInternalProps = {
@@ -35,4 +35,5 @@ class ModalLoadingInternal extends React.Component<ModalLoadingInternalProps> {
  }
 }

-export const ModalLoading = withTranslation()(ModalLoadingInternal);
+const ModalLoading = withTranslation()(ModalLoadingInternal);
+export default ModalLoading;
@@ -3,10 +3,10 @@ import { MdFileUpload } from "react-icons/md";
 import { MdAddCircleOutline } from "react-icons/md";
 import { Trans, type WithTranslation, withTranslation } from "react-i18next";

-import { ModalLoading } from "./ModalLoading";
-import { Modal } from "./Modal";
-import { InputButton } from "../InputButton";
-import { InputUrl } from "../InputUrl";
+import ModalLoading from "./ModalLoading";
+import Modal from "./Modal";
+import InputButton from "../InputButton";
+import InputUrl from "../InputUrl";

 import { ensureStyleValidity } from "../../libs/style";
 import publicStyles from "../../config/styles.json";
@@ -364,4 +364,5 @@ class ModalOpenInternal extends React.Component<ModalOpenInternalProps, ModalOpe
  }
 }

-export const ModalOpen = withTranslation()(ModalOpenInternal);
+const ModalOpen = withTranslation()(ModalOpenInternal);
+export default ModalOpen;
@@ -3,17 +3,17 @@ import latest from "@maplibre/maplibre-gl-style-spec/dist/latest.json";
 import type {LightSpecification, ProjectionSpecification, StyleSpecification, TerrainSpecification, TransitionSpecification} from "maplibre-gl";
 import { type WithTranslation, withTranslation } from "react-i18next";

-import { FieldArray } from "../FieldArray";
-import { FieldNumber } from "../FieldNumber";
-import { FieldString } from "../FieldString";
-import { FieldUrl } from "../FieldUrl";
-import { FieldSelect } from "../FieldSelect";
-import { FieldEnum } from "../FieldEnum";
-import { FieldColor } from "../FieldColor";
-import { Modal } from "./Modal";
-import { FieldJson } from "../FieldJson";
-import { Block } from "../Block";
-import { spec as fieldSpecAdditional } from "../../libs/field-spec-additional";
+import FieldArray from "../FieldArray";
+import FieldNumber from "../FieldNumber";
+import FieldString from "../FieldString";
+import FieldUrl from "../FieldUrl";
+import FieldSelect from "../FieldSelect";
+import FieldEnum from "../FieldEnum";
+import FieldColor from "../FieldColor";
+import Modal from "./Modal";
+import FieldJson from "../FieldJson";
+import Block from "../Block";
+import fieldSpecAdditional from "../../libs/field-spec-additional";
 import type {OnStyleChangedCallback, StyleSpecificationWithId} from "../../libs/definitions";

 type ModalSettingsInternalProps = {
@@ -322,7 +322,7 @@ class ModalSettingsInternal extends React.Component<ModalSettingsInternalProps>
          data-wd-key="modal:settings.maputnik:renderer"
          options={[
            ["mlgljs", "MapLibreGL JS"],
-            ["ol", t("OpenLayers (experimental)")],
+            ["ol", t("Open Layers (experimental)")],
          ]}
          value={metadata["maputnik:renderer"] || "mlgljs"}
          onChange={(value) => onChangeMetadataProperty("maputnik:renderer", value)}
@@ -332,4 +332,5 @@ class ModalSettingsInternal extends React.Component<ModalSettingsInternalProps>
  }
 }

-export const ModalSettings = withTranslation()(ModalSettingsInternal);
+const ModalSettings = withTranslation()(ModalSettingsInternal);
+export default ModalSettings;
@@ -1,7 +1,7 @@
 import React from "react";
 import { Trans, type WithTranslation, withTranslation } from "react-i18next";

-import { Modal } from "./Modal";
+import Modal from "./Modal";


 type ModalShortcutsInternalProps = {
@@ -134,4 +134,5 @@ class ModalShortcutsInternal extends React.Component<ModalShortcutsInternalProps
  }
 }

-export const ModalShortcuts = withTranslation()(ModalShortcutsInternal);
+const ModalShortcuts = withTranslation()(ModalShortcutsInternal);
+export default ModalShortcuts;
@@ -4,11 +4,11 @@ import latest from "@maplibre/maplibre-gl-style-spec/dist/latest.json";
 import type {GeoJSONSourceSpecification, RasterDEMSourceSpecification, RasterSourceSpecification, SourceSpecification, VectorSourceSpecification} from "maplibre-gl";
 import { type WithTranslation, withTranslation } from "react-i18next";

-import { Modal } from "./Modal";
-import { InputButton } from "../InputButton";
-import { FieldString } from "../FieldString";
-import { FieldSelect } from "../FieldSelect";
-import { ModalSourcesTypeEditor, type EditorMode } from "./ModalSourcesTypeEditor";
+import Modal from "./Modal";
+import InputButton from "../InputButton";
+import FieldString from "../FieldString";
+import FieldSelect from "../FieldSelect";
+import ModalSourcesTypeEditor, { type EditorMode } from "./ModalSourcesTypeEditor";

 import { generateId } from "../../libs/style";
 import { deleteSource, addSource, changeSource } from "../../libs/source";
@@ -343,4 +343,5 @@ class ModalSourcesInternal extends React.Component<ModalSourcesInternalProps> {
  }
 }

-export const ModalSources = withTranslation()(ModalSourcesInternal);
+const ModalSources = withTranslation()(ModalSourcesInternal);
+export default ModalSources;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
HarelM	b09c629be4	Update agents.md file with the relevant information.	2026-07-12 11:16:49 +03:00
HarelM	89be954485	Improve unit test.	2026-07-12 11:08:54 +03:00
pre-commit-ci[bot]	83c099bef4	[pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci	2026-07-12 07:52:25 +00:00
HarelM	382ba69134	Add access token tests.	2026-07-12 10:52:10 +03:00
HarelM	dbe5d3916d	Remove redundant comment	2026-07-12 10:46:13 +03:00
HarelM	373b57a6f4	Improve tests	2026-07-12 10:43:03 +03:00
HarelM	f2579e2a19	Split tests	2026-07-12 10:36:47 +03:00
pre-commit-ci[bot]	aa9530274f	[pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci	2026-07-12 07:25:39 +00:00
HarelM	0ba7b3704f	Restore urlopen test file.	2026-07-12 10:24:55 +03:00
HarelM	be11f75c9f	Add more end to end tests to increase coverage	2026-07-12 10:23:17 +03:00
HarelM	03a41cf17a	fix import style	2026-07-12 10:05:02 +03:00
HarelM	192df96a79	import style	2026-07-12 10:04:01 +03:00
HarelM	10d47c561b	Remove unneeded unit tests.	2026-07-12 10:02:36 +03:00
HarelM	c22f7404e7	Add more end-to-end tests	2026-07-12 09:34:58 +03:00
HarelM	36073b2b1f	Fix build	2026-07-12 09:34:58 +03:00
HarelM	ca66f47be0	fix build	2026-07-12 09:34:58 +03:00
HarelM	a5c47437ee	Remove dead code	2026-07-12 09:34:58 +03:00
Harel M	91a6335d09	Apply suggestion from @HarelM	2026-07-12 09:00:50 +03:00
Harel M	acaa350f0f	Apply suggestion from @HarelM	2026-07-12 08:59:43 +03:00
HarelM	1a5c879c75	Improve tests.	2026-07-11 15:33:31 +03:00
HarelM	b16776fed3	Merge branch 'main' into increase-coverage	2026-07-10 21:40:37 +03:00
HarelM	d039dc73a5	Increase coverage to about 80%	2026-07-10 21:11:41 +03:00
HarelM	70a2db580f	replace for ;; with while true.	2026-07-09 16:31:27 +03:00
HarelM	b76d9cbe29	Remove circular dependency.	2026-07-09 15:38:41 +03:00
HarelM	dd04c14d96	Remove maputnik assertable	2026-07-09 15:28:36 +03:00
HarelM	6c31add041	Reduce export surface	2026-07-09 15:22:41 +03:00
HarelM	60ed80651c	Improve abstraction	2026-07-09 15:05:18 +03:00
HarelM	c642ec5325	Remove comments	2026-07-09 15:05:18 +03:00
pre-commit-ci[bot]	0c98378243	[pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci	2026-07-09 11:44:08 +00:00
HarelM	95ba3c4428	Remove cypress related comments.	2026-07-09 14:43:58 +03:00
HarelM	b112c6a2bf	Split dirver and helper	2026-07-09 14:40:06 +03:00
HarelM	a251faf8f7	improve abstraction	2026-07-09 14:27:33 +03:00
HarelM	8580499ec3	Fix incorrect quotes	2026-07-09 14:19:47 +03:00
HarelM	56a9840def	Remove unused page	2026-07-09 14:19:23 +03:00
HarelM	3d1919738b	Improve test readability	2026-07-09 14:16:12 +03:00
HarelM	cc317c20a1	Move fill local storage to driver	2026-07-09 14:11:49 +03:00
HarelM	a9c3da0f40	Remove hack from modal driver	2026-07-09 13:59:55 +03:00
HarelM	dc5d6dd77d	Remove unneeded comments.	2026-07-09 13:50:16 +03:00
HarelM	95d87ad7ef	Remove export for a method that isn't used outside the file.	2026-07-09 13:41:51 +03:00
HarelM	09efbb5cd6	Fix utils path	2026-07-09 13:40:45 +03:00
HarelM	4f046cb83e	Fix build	2026-07-09 13:38:54 +03:00
HarelM	fb00dea285	Move playwrite stuff to utils folder	2026-07-09 13:33:29 +03:00
HarelM	c00395ee11	Remove coverage file and have everything inside the fixtures.ts file.	2026-07-09 13:29:42 +03:00
pre-commit-ci[bot]	5092a924aa	[pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci	2026-07-09 10:27:14 +00:00
HarelM	7d80dccb81	Remote test related entries.	2026-07-09 13:26:24 +03:00
HarelM	a93fe4d78b	Fix test for regexp	2026-07-09 12:35:29 +03:00
Harel M	603a30cba8	Potential fix for pull request finding 'CodeQL / Incomplete regular expression for hostnames' Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>	2026-07-09 12:19:45 +03:00
HarelM	6f55fda7d4	Remove docker coverage upload.	2026-07-09 11:47:40 +03:00
HarelM	8f0ee898ff	Merge branch 'main' into replace-cypress-with-playwright	2026-07-09 11:43:28 +03:00
HarelM	3896c4c187	Merge branch 'relocate-e2e-tests' into replace-cypress-with-playwright	2026-07-08 22:44:19 +03:00
HarelM	c0f1a72d80	Fix failing unit tests in CI	2026-07-08 22:43:34 +03:00
HarelM	ac9186e7f8	test: instantiate MaputnikDriver once per describe block Make the driver page-lazy (it resolves the running test's page on demand via an auto fixture) so it can be created a single time at describe scope and reused across the block's tests, matching the pre-migration ergonomics: const { given, get, when, then } = new MaputnikDriver(); instead of pulling `driver` out of a fixture and destructuring it in every test. Coverage collection and dialog handling move into the auto fixture. Also inject a bare invalid token ("zzz") in the json-editor parse-error test: CodeMirror auto-closes brackets/quotes, so " {" no longer reliably breaks the JSON. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-08 17:48:44 +03:00
Harel M	8c86607100	Add alias for 'it' as 'test' in layers list spec	2026-07-08 15:35:34 +03:00
HarelM	7c5e5358cb	Merge branch 'relocate-e2e-tests' into replace-cypress-with-playwright	2026-07-08 15:17:09 +03:00
HarelM	18b34d3ecd	Fix lint	2026-07-08 15:16:28 +03:00
HarelM	08ebca266c	Merge branch 'relocate-e2e-tests' into replace-cypress-with-playwright	2026-07-08 15:15:39 +03:00
HarelM	8344a30f5d	Move things back to where this will still work.	2026-07-08 15:05:35 +03:00
Harel M	4249e9beb9	Merge branch 'main' into relocate-e2e-tests	2026-07-08 14:32:25 +03:00
HarelM	c3dd253737	test: migrate e2e to Playwright and component test to Vitest browser mode Replace Cypress with Playwright for the end-to-end suite and drop @shellygo/cypress-test-utils in favour of a hand-written MaputnikDriver page object that keeps the fluent then(...).shouldX() assertion style (now async). The InputAutocomplete component test moves to Vitest browser mode using the Playwright provider. - e2e/maputnik-driver.ts: driver + MaputnikAssertable over Playwright - e2e/{fixtures,coverage,global-setup,global-teardown}.ts: test fixture, istanbul coverage collection, and nyc report generation - playwright.config.ts / vitest.config.ts - Code coverage preserved: dev server is istanbul-instrumented, per-test window.__coverage__ is merged via nyc into coverage/coverage-final.json - CI: Cypress jobs replaced with Playwright; docker e2e runs against the container via E2E_NO_WEBSERVER - Remove Cypress deps, config and support files; update docs and .nycrc Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-08 12:42:32 +03:00
HarelM	f7b48139a4	test: adopt Playwright test()/test.describe() naming in e2e specs Mechanical rename of it() -> test() and describe() -> test.describe() so the subsequent Playwright migration diff only touches test bodies, not the suite/case wrappers.	2026-07-08 12:42:13 +03:00
HarelM	8af1cfd5f8	test: relocate Cypress e2e suite to e2e/ ahead of Playwright migration Pure file moves (no content changes) so git records them as renames and history/blame is preserved through the migration that follows: cypress/e2e/.cy.ts -> e2e/.spec.ts cypress/e2e/-driver.ts -> e2e/-driver.ts cypress/fixtures/ -> e2e/fixtures/ cypress.config.ts -> playwright.config.ts InputAutocomplete.cy.tsx -> InputAutocomplete.browser.test.tsx Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-08 12:24:03 +03:00