Migration of more components

.codesandbox/ci.json

@@ -0,0 +1,4 @@
+{
+  "packages": [],
+  "sandboxes": ["/"]
+}

.eslintrc

@@ -1,46 +0,0 @@
-{
-    "root": true,
-    "env": { 
-      "browser": true, 
-      "es2020": true 
-    },
-    "extends": [
-      "eslint:recommended",
-      "plugin:react/recommended",
-      "plugin:react/jsx-runtime",
-      "plugin:react-hooks/recommended",
-    ],
-    "ignorePatterns": [
-      "dist"
-    ],
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": { 
-      "ecmaVersion": "latest", 
-      "sourceType": "module" 
-    },
-    "settings": { 
-      "react": { "version": "16.4" } 
-    },
-    "plugins": [
-      "@typescript-eslint",
-      "react-refresh"],
-    "rules": {
-      "react-refresh/only-export-components": [
-        "warn",
-        { "allowConstantExport": true }
-      ],
-      "@typescript-eslint/no-unused-vars": [
-        "warn",
-        { "argsIgnorePattern": "^_" }
-      ],
-      "no-unused-vars": "off",
-      "react/prop-types": ["off"],
-      // Disable no-undef. It's covered by @typescript-eslint
-      "no-undef": "off",
-      "indent": ["error", 2],
-      "no-var": ["error"]
-    },
-    "globals": {
-      "global": "readonly"
-  }
-}

.eslintrc.cjs

@@ -0,0 +1,20 @@
+module.exports = {
+    root: true,
+    env: { browser: true, es2020: true },
+    extends: [
+      'eslint:recommended',
+      'plugin:react/recommended',
+      'plugin:react/jsx-runtime',
+      'plugin:react-hooks/recommended',
+    ],
+    ignorePatterns: ['dist', '.eslintrc.cjs'],
+    parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
+    settings: { react: { version: '18.2' } },
+    plugins: ['react-refresh'],
+    rules: {
+      'react-refresh/only-export-components': [
+        'warn',
+        { allowConstantExport: true },
+      ],
+    },
+  }

.github/FUNDING.yml

@@ -1,2 +1 @@
-github: [maplibre]
-open_collective: maplibre
+custom: "https://maputnik.github.io/donate"

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,11 +0,0 @@
-## Launch Checklist
-
-<!-- Thanks for the PR! Feel free to add or remove items from the checklist. -->
-
-
- - [ ] Briefly describe the changes in this PR.
- - [ ] Link to related issues.
- - [ ] Include before/after visuals or gifs if this PR includes visual changes.
- - [ ] Write tests for all new functionality.
- - [ ] Add an entry to `CHANGELOG.md` under the `## main` section.
-

.github/workflows/ci.yml

@@ -8,18 +8,23 @@ on:
 
 jobs:
   build-docker:
-    name: build docker
-    runs-on: ubuntu-latest
+    name: build/docker
+    runs-on: ${{ matrix.os }}
 
     if: ${{ github.event_name == 'push' || github.event_name == 'pull_request' }}
 
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+
     steps:
     - uses: actions/checkout@v4
-    - run: docker build -t test-docker-image-build .
+    - run: docker build -t docker.pkg.github.com/maputnik/editor/editor:main .
 
   # build the editor
   build-node:
-    name: "build on ${{ matrix.os }}"
+    name: "build/node@${{ matrix.node-version }} (${{ matrix.os }})"
     runs-on: ${{ matrix.os }}
 
     if: ${{ github.event_name == 'push' || github.event_name == 'pull_request' }}
@@ -28,68 +33,95 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
+        node-version: [18.x]
 
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v1
       with:
-        node-version-file: '.nvmrc'
+        node-version: ${{ matrix.node-version }}
+    - uses: actions/cache@v1
+      with:
+        path: ~/.npm
+        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+        restore-keys: |
+          ${{ runner.os }}-node-
     - run: npm ci
     - run: npm run build
-    - run: npm run lint
-    - run: npm run lint-css
-
 
 
   build-artifacts:
-    name: "build artifacts"
-    runs-on: ubuntu-latest
+    name: "build/artifacts (${{ matrix.os }})"
+    runs-on: ${{ matrix.os }}
     if: ${{ github.event_name == 'push' || github.event_name == 'pull_request' }}
 
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        node-version: [18.x]
+
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v1
       with:
-        node-version-file: '.nvmrc'
+        node-version: ${{ matrix.node-version }}
+    - uses: actions/cache@v1
+      with:
+        path: ~/.npm
+        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+        restore-keys: |
+          ${{ runner.os }}-node-
     - run: npm ci
     - run: npm run build
-    - name: artifacts/maputnik
-      uses: actions/upload-artifact@v4
+    - run: npm run build-storybook
+    - name: artifacts/editor
+      uses: actions/upload-artifact@v1
       with:
-        name: maputnik
+        name: editor
         path: dist
+    - name: artifacts/storybook
+      uses: actions/upload-artifact@v1
+      with:
+        name: storybook
+        path: build/storybook
 
     # Build and upload desktop CLI artifacts
     - name: Set up Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v3
       with:
-        go-version: ^1.23.x
-        cache-dependency-path: desktop/go.sum
+        go-version: ^1.19.x
       id: go
 
-    - name: Build desktop artifacts
-      run: npm run build-desktop
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v4
+      with:
+        repository: maputnik/desktop
+        ref: master
+        path: ./src/github.com/maputnik/desktop/
+
+    - name: Make
+      run: cd src/github.com/maputnik/desktop/ && make
 
     - name: Artifacts/linux
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v1
       with:
         name: maputnik-linux
-        path: ./desktop/bin/linux/
+        path: ./src/github.com/maputnik/desktop/bin/linux/
 
     - name: Artifacts/darwin
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v1
       with:
         name: maputnik-darwin
-        path: ./desktop/bin/darwin/
+        path: ./src/github.com/maputnik/desktop/bin/darwin/
 
     - name: Artifacts/windows
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v1
       with:
         name: maputnik-windows
-        path: ./desktop/bin/windows/
+        path: ./src/github.com/maputnik/desktop/bin/windows/
   
-  e2e-tests:
-    name: "E2E tests using ${{ matrix.browser }}"
+  cypress-run:
     strategy:
       fail-fast: false
       matrix:
@@ -106,8 +138,3 @@ jobs:
           build: npm run build
           start: npm run start
           browser: ${{ matrix.browser }}
-      - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v3
-        with:
-          files: ${{ github.workspace }}/.nyc_output/out.json
-          verbose: true

.github/workflows/create-bump-version-pr.yml

@@ -1,39 +0,0 @@
-name: Create bump version PR
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: Version to change to.
-        required: true
-        type: string
-
-jobs:
-  bump-version-pr:
-    name: Bump version PR
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          ref: main
-
-      - name: Use Node.js from nvmrc
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-
-      - name: Bump version
-        run: |
-          npm version --commit-hooks false --git-tag-version false ${{ inputs.version }}
-          ./build/bump-version-changelog.js ${{ inputs.version }}
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
-        with:
-          commit-message: Bump version to ${{ inputs.version }}
-          branch: bump-version-to-${{ inputs.version }}
-          title: Bump version to ${{ inputs.version }}

.github/workflows/deploy.yml

@@ -3,49 +3,24 @@ name: deploy
 on:
   push:
     branches: [ main ]
+    tags:
+    - 'v*'
 
 jobs:
-  deploy-pages:
-    name: deploy/pages
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'push' }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Use Node.js from nvmrc
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-
-      - name: Install
-        run: npm ci
-
-      - name: Build 
-        run: npm run build
-
-      - name: Upload to GitHub Pages
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: dist
-  
   # publish docker to GitHub registry
   deploy-docker:
     name: deploy/docker
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
 
     if: ${{ github.event_name == 'push' }}
 
     strategy:
       fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
 
     steps:
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v3
-      with:
-        registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
     - uses: actions/checkout@v4
-    - run: docker build -t ghcr.io/maplibre/maputnik:main .
-    - run: docker push ghcr.io/maplibre/maputnik:main
+    - run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u orangemug --password-stdin
+    - run: docker build -t docker.pkg.github.com/maputnik/editor/editor:main .
+    - run: docker push docker.pkg.github.com/maputnik/editor/editor:main

.github/workflows/release.yml

@@ -1,104 +0,0 @@
-name: Release
-
-on:
-  push:
-    branches: [main]
-  workflow_dispatch:
-
-jobs:
-  release-check:
-    name: Check if version changed
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          ref: main
-
-      - name: Use Node.js from nvmrc
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-
-      - name: Check if version has been updated
-        id: check
-        uses: EndBug/version-check@v2
-
-    outputs:
-      publish: ${{ steps.check.outputs.changed }}
-
-  release:
-    name: Release
-    needs: release-check
-    if: ${{ needs.release-check.outputs.publish == 'true' }}
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          ref: main
-
-      - name: Use Node.js from nvmrc
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-          registry-url: "https://registry.npmjs.org"
-
-      - name: Set up Go for desktop build
-        uses: actions/setup-go@v5
-        with:
-          go-version: ^1.23.x
-          cache-dependency-path: desktop/go.sum
-        id: go
-
-      - name: Get version
-        id: package-version
-        uses: martinbeentjes/npm-get-version-action@v1.3.1
-
-      - name: Install
-        run: npm ci
-
-      - name: Build
-        run: |
-          npm run build
-          npm run build-desktop
-
-      - name: Tag commit and push
-        id: tag_version
-        uses: mathieudutour/github-tag-action@v6.2
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          custom_tag: ${{ steps.package-version.outputs.current-version }}
-
-      - name: Create Archives
-        run: |
-          zip -r dist dist
-          zip -r desktop desktop/bin/
-
-      - name: Build Release Notes
-        id: release_notes
-        run: |
-          RELEASE_NOTES_PATH="${PWD}/release_notes.txt"
-          ./build/release-notes.js > ${RELEASE_NOTES_PATH}
-          echo "release_notes=${RELEASE_NOTES_PATH}" >> $GITHUB_OUTPUT
-
-      - name: Create GitHub Release
-        id: create_regular_release
-        uses: ncipollo/release-action@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag: ${{ steps.tag_version.outputs.new_tag }}
-          name: ${{ steps.tag_version.outputs.new_tag }}
-          bodyFile: ${{ steps.release_notes.outputs.release_notes }}
-          artifacts: "dist.zip,desktop.zip"
-          allowUpdates: true
-          draft: false
-          prerelease: false
-

.gitignore

@@ -14,7 +14,6 @@ lib-cov
 
 # Coverage directory used by tools like istanbul
 coverage
-.nyc_output
 
 # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
@@ -33,6 +32,6 @@ node_modules
 public
 /errorShots
 /old
+/build
 /cypress/screenshots
 /dist/
-/desktop/version.go

.npmrc

@@ -1 +0,0 @@
-legacy-peer-deps = true

.nvmrc

@@ -1 +0,0 @@
-18.19

.nycrc.json

@@ -1,18 +0,0 @@
-{
-  "all": true,
-  "extends": "@istanbuljs/nyc-config-typescript",
-  "check-coverage": false,
-  "include": ["src/**/*.ts", "src/**/*.tsx"],
-  "exclude": [
-    "cypress/**/*.*",
-    "**/*.d.ts",
-    "**/*.cy.tsx",
-    "**/*.cy.ts",
-    "./coverage/**",
-    "./cypress/**",
-    "./dist/**",
-    "node_modules"
-  ],
-  "report-dir": "coverage",
-  "reporter": ["json", "lcov", "json-summary"]
-}

.storybook/main.js

@@ -0,0 +1,9 @@
+const config = {
+  stories: ['../stories/**/*.stories.jsx'],
+  addons: ['@storybook/addon-actions', '@storybook/addon-links', '@storybook/addon-a11y/register', '@storybook/addon-storysource'],
+  framework: {
+    name: '@storybook/react-vite',
+    options: {}
+  }
+};
+export default config;

.storybook/manager.js

@@ -0,0 +1,7 @@
+import { addons } from '@storybook/addons';
+import { themes } from '@storybook/theming';
+import theme from './maputnik.theme';
+
+addons.setConfig({
+  theme: theme,
+});

.storybook/maputnik.theme.js

@@ -0,0 +1,8 @@
+import { create } from '@storybook/theming/create';
+
+export default create({
+  base: 'light',
+
+  brandTitle: 'Maputnik',
+  brandUrl: 'https://github.com/maputnik/editor',
+});

CHANGELOG.md

@@ -1,24 +0,0 @@
-## main
-
-### ✨ Features and improvements
-- _...Add new stuff here..._
-
-### 🐞 Bug fixes
-- _...Add new stuff here..._
-
-## 2.1.1
-
-### ✨ Features and improvements
-
-- Add GitHub workflows for releasing new versions
-- Update desktop build to pull from this repo (#922)
-
-## 2.0.0
-
-- Update MapLibre to version 4 (#872)
-- Start continuous deployment of maputnik website
-
-## 1.7.0
-
-- See release notes at https://maputnik.github.io/blog/2020/04/23/release-v1.7.0
-

CODE_OF_CONDUCT.md

@@ -1,2 +0,0 @@
-# Contributor Covenant
-[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](https://github.com/maplibre/maplibre/blob/main/CODE_OF_CONDUCT.md)

Dockerfile

@@ -2,15 +2,21 @@ FROM node:18 as builder
 WORKDIR /maputnik
 
 # Only copy package.json to prevent npm install from running on every build
-COPY package.json package-lock.json .npmrc ./
-RUN npm ci
+COPY package.json package-lock.json ./
+RUN npm install
 
 # Build maputnik
+# TODO:  we should also do a   npm run test   here (needs more dependencies)
 COPY . .
-RUN npx vite build
+RUN npm run build
 
 #---------------------------------------------------------------------------
-# Create a clean nginx-alpine slim image with just the build results
-FROM nginx:alpine-slim
 
-COPY --from=builder /maputnik/dist /usr/share/nginx/html/
+# Create a clean python-based image with just the build results
+FROM python:3-slim
+WORKDIR /maputnik
+
+COPY --from=builder /maputnik/dist .
+
+EXPOSE 8888
+CMD python -m http.server 8888

LICENSE

@@ -1,7 +1,6 @@
 The MIT License (MIT)
 
 Copyright (c) 2015 Lukas Martinelli
-Copyright (c) 2024 MapLibre contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,10 +1,10 @@
 <img width="200" alt="Maputnik logo" src="https://cdn.jsdelivr.net/gh/maputnik/design/logos/logo-color.png" />
 
 # Maputnik
-[![GitHub CI status](https://github.com/maplibre/maputnik/workflows/ci/badge.svg)][github-action-ci]
+[![GitHub CI status](https://github.com/maputnik/editor/workflows/ci/badge.svg)][github-action-ci]
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)][license]
 
-[github-action-ci]: https://github.com/maplibre/maputnik/actions?query=workflow%3Aci
+[github-action-ci]: https://github.com/maputnik/editor/actions?query=workflow%3Aci
 [license]:          https://tldrlegal.com/license/mit-license
 
 A free and open visual editor for the [MapLibre GL styles](https://maplibre.org/maplibre-style-spec/)
@@ -13,32 +13,33 @@ targeted at developers and map designers.
 
 ## Usage
 
-- :link: Design your maps online at **<https://www.maplibre.org/maputnik/>** (all in local storage)
-- :link: Use the [Maputnik CLI](https://github.com/maplibre/maputnik/wiki/Maputnik-CLI) for local style development
+- :link: Design your maps online at **<https://maputnik.github.io/editor/>** (all in local storage)
+- :link: Use the [Maputnik CLI](https://github.com/maputnik/editor/wiki/Maputnik-CLI) for local style development
 - In a Docker, run this command and browse to http://localhost:8888, Ctrl+C to stop the server.
 
 ```bash
-docker run -it --rm -p 8888:80 ghcr.io/maplibre/maputnik:main
+docker run -it --rm -p 8888:8888 maputnik/editor
 ```
 
+## Donations
+Mapbox has built one of the best and most amazing OSS ecosystems. A key component to ensure its longevity and independence is an OSS map designer.
+If you or your organisation has seen value from Maputnik, please consider donating at <https://maputnik.github.io/donate>
+
 ## Documentation
 
-The documentation can be found in the [Wiki](https://github.com/maplibre/maputnik/wiki). You are welcome to collaborate!
+The documentation can be found in the [Wiki](https://github.com/maputnik/editor/wiki). You are welcome to collaborate!
 
-- :link: **Study the [Maputnik Wiki](https://github.com/maplibre/maputnik/wiki)**
+- :link: **Study the [Maputnik Wiki](https://github.com/maputnik/editor/wiki)**
 - :video_camera: Design a map from Scratch https://youtu.be/XoDh0gEnBQo
 
 [![Design Map from Scratch](https://j.gifs.com/g5XMgl.gif)](https://youtu.be/XoDh0gEnBQo)
 
 ## Develop
 
-Maputnik is written in typescript and is using [React](https://github.com/facebook/react) and [MapLibre GL JS](https://maplibre.org/projects/maplibre-gl-js/).
+Maputnik is written in ES6 and is using [React](https://github.com/facebook/react) and [MapLibre GL JS](https://maplibre.org/projects/maplibre-gl-js/).
 
 We ensure building and developing Maputnik works with the [current active LTS Node.js version and above](https://github.com/nodejs/Release#release-schedule).
 
-### Getting Involved
-Join the #maplibre or #maputnik slack channel at OSMUS: get an invite at https://slack.openstreetmap.us/ Read the the below guide in order to get familiar with how we do things around here.
-
 Install the deps, start the dev server and open the web browser on `http://localhost:8888/`.
 
 ```bash
@@ -66,8 +67,7 @@ Lint the JavaScript code.
 ```
 # run linter
 npm run lint
-npm run lint-css
-npm run sort-styles
+npm run lint-styles
 ```
 
 
@@ -94,23 +94,68 @@ You can also see the tests as they run or select which suites to run by executin
 npm run cy:open
 ```
 
-## Release process
 
-1. Review [`CHANGELOG.md`](/CHANGELOG.md)
-   - Double-check that all changes included in the release are appropriately documented.
-   - To-be-released changes should be under the "main" header.
-   - Commit any final changes to the changelog.
-2. Run [Create bump version PR](https://github.com/maplibre/maputnik/actions/workflows/create-bump-version-pr.yml) by manual workflow dispatch and set the version number in the input. This will create a PR that changes the changelog and `package.json` file to review and merge.
-3. Once merged, an automatic process will kick in and creates a GitHub release and uploads release assets.
+## Related Projects
 
+- [maputnik-dev-server](https://github.com/nycplanning/labs-maputnik-dev-server) - An express.js server that allows for quickly loading the style from any mapboxGL map into mapuntnik.
 
 ## Sponsors
 
 Thanks to the supporters of the **[Kickstarter campaign](https://www.kickstarter.com/projects/174808720/maputnik-visual-map-editor-for-mapbox-gl)**. This project would not be possible without these commercial and individual sponsors.
-You can see this file's history for previous sponsors of the original Maputnik repo.
-Read more about the MapLibre Sponsorship Program at https://maplibre.org/sponsors/.
+
+### Gold
+
+- [Wemap](https://getwemap.com/)
+- [Orbicon Informatik](https://www.orbiconinformatik.dk/)
+- [Terranodo](http://terranodo.io/)
+
+<a href="https://getwemap.com/">
+  <img width="33%" alt="Wemap" style="display:inline" src="https://cdn.jsdelivr.net/gh/maputnik/editor@1.5.0/media/sponsors/wemap.jpg" />
+</a>
+<a href="http://terranodo.io/">
+  <img width="33%" alt="Terranodo" style="display:inline" src="https://cdn.jsdelivr.net/gh/maputnik/editor@1.5.0/media/sponsors/terranodo.png" />
+</a>
+<a href="https://www.orbiconinformatik.dk/">
+  <img width="32%" alt="Terranodo" style="display:inline" src="https://cdn.jsdelivr.net/gh/maputnik/editor@1.5.0/media/sponsors/orbicon_informatik.png" />
+</a>
+
+<br/>
+
+### Silver
+
+- [Klokan Technologies](https://www.klokantech.com/)
+- [Geofabrik](http://www.geofabrik.de/)
+- [Dreipol](https://www.dreipol.ch/)
+
+<a href="https://www.klokantech.com/">
+  <img width="18%" alt="Klokan Technologies" style="display:inline-block" src="https://cdn.jsdelivr.net/gh/maputnik/editor@1.5.0/media/sponsors/klokantech.png" />
+</a>
+<a href="http://www.geofabrik.de/">
+  <img width="18%" alt="Geofabrik" style="display:inline-block" src="https://cdn.jsdelivr.net/gh/maputnik/editor@1.5.0/media/sponsors/geofabrik.png" />
+</a>
+<a href="https://www.dreipol.ch/">
+  <img width="18%" alt="Dreipol" style="display:inline-block" src="https://cdn.jsdelivr.net/gh/maputnik/editor@1.5.0/media/sponsors/dreipol.png" />
+</a>
+
+<br/>
+
+### Individuals
+
+**Influential Stakeholder**
+
+Alan McConchie, Odi, Mats Norén, Uli [geOps](http://geops.ch/), Helge Fahrnberger ([Toursprung](http://www.toursprung.com/)), Kirusanth Poopalasingam
+
+**Stakeholder**
+
+Brian Flood, Vasile Coțovanu, Andreas Kalkbrenner, Christian Mäder, Gregor Wassmann, Lee Armstrong, Rafel, Jon Burgess, Lukas Lehmann, Joachim Ungar, Alois Ackermann, Zsolt Ero, Jordan Meek
+
+**Supporter**
+
+Sina Martinelli, Nicholas Doiron, Neil Cawse, Urs42, Benedikt Groß, Manuel Roth, Janko Mihelić, Moritz Stefaner, Sebastian Ahoi, Juerg Uhlmann, Tom Wider, Nadia Panchaud, Oliver Snowden, Stephan Heuel, Tobin Bradley, Adrian Herzog, Antti Lehto, Pascal Mages, Marc Gehling, Imre Samu, Lauri K., Visahavel Parthasarathy, Christophe Waterlot-Buisine, Max Galka, ubahnverleih, Wouter van Dam, Jakob Lobensteiner, Samuel Kurath, Brian Bancroft
 
 ## License
 
-Maputnik is [licensed under MIT](LICENSE) and is Copyright (c) Lukas Martinelli and Maplibre contributors.
-As contributor please take extra care of not violating any Mapbox trademarks. Do not get inspired by other map studios and make your own decisions for a good style editor.
+Maputnik is [licensed under MIT](LICENSE) and is Copyright (c) Lukas Martinelli and contributors.
+
+**Disclaimer** This is an independent style editor.
+As contributor please take extra care of not violating any Mapbox trademarks. Do not get inspired by Mapbox Studio and make your own decisions for a good style editor.

SECURITY_POLICY.txt

@@ -1,2 +0,0 @@
-For an up-to-date policy refer to
-https://github.com/maplibre/maplibre/blob/main/SECURITY_POLICY.txt

build/README.md

@@ -1,11 +0,0 @@
-# Build Scripts
-
-This folder holds common build scripts used by some of the Github workflows. 
-
-The scripts are borrowed from [maplibre/maplibre-gl-js](https://github.com/maplibre/maplibre-gl-js/tree/bc70bc559cea5c987fa1b79fd44766cef68bbe28/build).
-
-## Generate Release Notes
-
-`bump-version-changelog.js` Used to update the changelog with the current notes, and set up a space for new notes
-
-`release-notes.js` Used to generate release notes when releasing a new version

build/bump-version-changelog.js

@@ -1,29 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * This script updates the changelog.md file with the version given in the arguments
- * It replaces ## main with ## <version>
- * Removes _...Add new stuff here..._
- * And adds on top a ## main with add stuff here.
- *
- * Copied from maplibre/maplibre-gl-js
- * https://github.com/maplibre/maplibre-gl-js/blob/bc70bc559cea5c987fa1b79fd44766cef68bbe28/build/release-notes.js
- */
-
-import * as fs from 'fs';
-
-const changelogPath = 'CHANGELOG.md';
-let changelog = fs.readFileSync(changelogPath, 'utf8');
-changelog = changelog.replace('## main', `## ${process.argv[2]}`);
-changelog = changelog.replaceAll('- _...Add new stuff here..._\n', '');
-changelog = `## main
-
-### ✨ Features and improvements
-- _...Add new stuff here..._
-
-### 🐞 Bug fixes
-- _...Add new stuff here..._
-
-` + changelog;
-
-fs.writeFileSync(changelogPath, changelog, 'utf8');

build/release-notes.js

@@ -1,48 +0,0 @@
-#!/usr/bin/env node
-
-// Copied from maplibre/maplibre-gl-js
-// https://github.com/maplibre/maplibre-gl-js/blob/bc70bc559cea5c987fa1b79fd44766cef68bbe28/build/release-notes.js
-
-import * as fs from 'fs';
-
-const changelogPath = 'CHANGELOG.md';
-const changelog = fs.readFileSync(changelogPath, 'utf8');
-
-/*
-  Parse the raw changelog text and split it into individual releases.
-
-  This regular expression:
-    - Matches lines starting with "## x.x.x".
-    - Groups the version number.
-    - Skips the (optional) release date.
-    - Groups the changelog content.
-    - Ends when another "## x.x.x" is found.
-*/
-const regex = /^## (\d+\.\d+\.\d+.*?)\n(.+?)(?=\n^## \d+\.\d+\.\d+.*?\n)/gms;
-
-let releaseNotes = [];
-let match;
-// eslint-disable-next-line no-cond-assign
-while (match = regex.exec(changelog)) {
-    releaseNotes.push({
-        'version': match[1],
-        'changelog': match[2].trim(),
-    });
-}
-
-const latest = releaseNotes[0];
-const previous = releaseNotes[1];
-
-//  Print the release notes template.
-
-let header = 'Changes since previous version'
-if (previous) {
-  header = `https://github.com/maplibre/maputnik
-  [Changes](https://github.com/maplibre/maputnik/compare/v${previous.version}...v${latest.version}) since [Maputnik v${previous.version}](https://github.com/maplibre/maputnik/releases/tag/v${previous.version})`
-}
-const templatedReleaseNotes = `${header}
-
-${latest.changelog}`;
-
-// eslint-disable-next-line eol-last
-process.stdout.write(templatedReleaseNotes.trimEnd());

cypress.config.ts

@@ -1,20 +1,10 @@
 import { defineConfig } from "cypress";
-import { createRequire } from "module";
-const require = createRequire(import.meta.url);
 
 export default defineConfig({
-  env: {
-    codeCoverage: {
-      exclude: "cypress/**/*.*",
-    },
-  },
   e2e: {
     setupNodeEvents(on, config) {
       // implement node event listeners here
-      require("@cypress/code-coverage/task")(on, config);
-      return config;
     },
-    baseUrl: "http://localhost:8888",
     retries: {
       runMode: 2,
       openMode: 0,

cypress/e2e/accessibility.cy.ts

@@ -1,7 +1,7 @@
-import { MaputnikDriver } from "./maputnik-driver";
+import MaputnikDriver from "./driver";
 
 describe("accessibility", () => {
-  let { beforeAndAfter, get, when, then } = new MaputnikDriver();
+  let { beforeAndAfter, given, when, get, should } = new MaputnikDriver();
   beforeAndAfter();
 
   describe("skip links", () => {
@@ -11,30 +11,30 @@ describe("accessibility", () => {
 
     it("skip link to layer list", () => {
       const selector = "root:skip:layer-list";
-      then(get.elementByTestId(selector)).shouldExist();
+      should.exist(selector);
       when.tab();
-      then(get.elementByTestId(selector)).shouldBeFocused();
+      should.beFocused(selector);
       when.click(selector);
-      then(get.skipTargetLayerList()).shouldBeFocused();
+      should.beFocused("skip-target-layer-list");
     });
 
     // This fails for some reason only in Chrome, but passes in firefox. Adding a skip here to allow merge and later on we'll decide if we want to fix this or not.
     it.skip("skip link to layer editor", () => {
       const selector = "root:skip:layer-editor";
-      then(get.elementByTestId(selector)).shouldExist();
+      should.exist(selector);
       when.tab().tab();
-      then(get.elementByTestId(selector)).shouldBeFocused();
+      should.beFocused(selector);
       when.click(selector);
-      then(get.skipTargetLayerEditor()).shouldBeFocused();
+      should.beFocused("skip-target-layer-editor");
     });
 
     it("skip link to map view", () => {
       const selector = "root:skip:map-view";
-      then(get.elementByTestId(selector)).shouldExist();
+      should.exist(selector);
       when.tab().tab().tab();
-      then(get.elementByTestId(selector)).shouldBeFocused();
+      should.beFocused(selector);
       when.click(selector);
-      then(get.canvas()).shouldBeFocused();
+      should.canvasBeFocused();
     });
   });
 });

cypress/e2e/driver.ts

@@ -0,0 +1,210 @@
+import { CypressHelper } from "@shellygo/cypress-test-utils";
+import { v1 as uuid } from "uuid";
+export default class MaputnikDriver {
+  private helper = new CypressHelper({ defaultDataAttribute: "data-wd-key" });
+  public beforeAndAfter = () => {
+    beforeEach(() => {
+      this.given.setupInterception();
+      this.when.setStyle("both");
+    });
+  };
+
+  public given = {
+    setupInterception: () => {
+      cy.intercept("GET", "http://localhost:8888/example-style.json", {
+        fixture: "example-style.json",
+      }).as("example-style.json");
+      cy.intercept("GET", "http://localhost:8888/example-layer-style.json", {
+        fixture: "example-layer-style.json",
+      });
+      cy.intercept("GET", "http://localhost:8888/geojson-style.json", {
+        fixture: "geojson-style.json",
+      });
+      cy.intercept("GET", "http://localhost:8888/raster-style.json", {
+        fixture: "raster-style.json",
+      });
+      cy.intercept("GET", "http://localhost:8888/geojson-raster-style.json", {
+        fixture: "geojson-raster-style.json",
+      });
+      cy.intercept({ method: "GET", url: "*example.local/*" }, []);
+      cy.intercept({ method: "GET", url: "*example.com/*" }, []);
+    },
+  };
+
+  public when = {
+    within: (selector: string, fn: () => void) => {
+      this.helper.when.within(fn, selector);
+    },
+    tab: () => cy.get("body").tab(),
+    waitForExampleFileRequset: () => {
+      this.helper.when.waitForResponse("example-style.json");
+    },
+    chooseExampleFile: () => {
+      cy.get("input[type='file']").selectFile(
+        "cypress/fixtures/example-style.json",
+        { force: true }
+      );
+    },
+    setStyle: (
+      styleProperties: "geojson" | "raster" | "both" | "layer" | "",
+      zoom?: number
+    ) => {
+      let url = "?debug";
+      switch (styleProperties) {
+        case "geojson":
+          url += "&style=http://localhost:8888/geojson-style.json";
+          break;
+        case "raster":
+          url += "&style=http://localhost:8888/raster-style.json";
+          break;
+        case "both":
+          url += "&style=http://localhost:8888/geojson-raster-style.json";
+          break;
+        case "layer":
+          url += "&style=http://localhost:8888/example-layer-style.json";
+          break;
+      }
+      if (zoom) {
+        url += "#" + zoom + "/41.3805/2.1635";
+      }
+      cy.visit("http://localhost:8888/" + url);
+      if (styleProperties) {
+        cy.on("window:confirm", () => true);
+      }
+      cy.get(".maputnik-toolbar-link").should("be.visible");
+    },
+    fillLayersModal: (opts: {type: string, layer?: string, id?: string}) => {
+      var type = opts.type;
+      var layer = opts.layer;
+      var id;
+      if (opts.id) {
+        id = opts.id;
+      } else {
+        id = `${type}:${uuid()}`;
+      }
+
+      cy.get(
+        this.get.dataAttribute("add-layer.layer-type", "select")
+      ).select(type);
+      cy.get(this.get.dataAttribute("add-layer.layer-id", "input")).type(id);
+      if (layer) {
+        cy.get(
+          this.get.dataAttribute("add-layer.layer-source-block", "input")
+        ).type(layer);
+      }
+      this.when.click("add-layer");
+
+      return id;
+    },
+
+    typeKeys: (keys: string) => {
+      cy.get("body").type(keys);
+    },
+
+    click: (selector: string) => {
+      this.helper.when.click(selector);
+    },
+
+    clickZoomin: () => {
+      cy.get(".maplibregl-ctrl-zoom-in").click();
+    },
+
+    selectWithin: (selector: string, value: string) => {
+      this.when.within(selector, () => {
+        cy.get("select").select(value);
+      });
+    },
+
+    select: (selector: string, value: string) => {
+      this.helper.get.element(selector).select(value);
+    },
+
+    focus: (selector: string) => {
+      this.helper.when.focus(selector);
+    },
+
+    setValue: (selector: string, text: string) => {
+      cy.get(selector).clear().type(text, { parseSpecialCharSequences: false });
+    },
+
+    closeModal: (key: string) => {
+      this.helper.when.waitUntil(() => this.helper.get.element(key));
+      this.when.click(key + ".close-modal");
+    },
+
+    openLayersModal: () => {
+      this.helper.when.click("layer-list:add-layer");
+
+      cy.get(this.get.dataAttribute("modal:add-layer")).should("exist");
+      cy.get(this.get.dataAttribute("modal:add-layer")).should("be.visible");
+    },
+  };
+
+  public get = {
+    isMac: () => {
+      return Cypress.platform === "darwin";
+    },
+    styleFromWindow: (win: Window) => {
+      const styleId = win.localStorage.getItem("maputnik:latest_style");
+      const styleItem = win.localStorage.getItem(`maputnik:style:${styleId}`);
+      const obj = JSON.parse(styleItem || "");
+      return obj;
+    },
+    exampleFileUrl: () => {
+      return "http://localhost:8888/example-style.json";
+    },
+    dataAttribute: (key: string, selector?: string): string => {
+      return `*[data-wd-key='${key}'] ${selector || ""}`;
+    },
+  };
+
+  public should = {
+    canvasBeFocused: () => {
+      this.when.within("maplibre:map", () => {
+        cy.get("canvas").should("be.focused");
+      });
+    },
+    notExist: (selector: string) => {
+      cy.get(selector).should("not.exist");
+    },
+    beFocused: (selector: string) => {
+      this.helper.get.element(selector).should("have.focus");
+    },
+
+    notBeFocused: (selector: string) => {
+      this.helper.get.element(selector).should("not.have.focus");
+    },
+
+    beVisible: (selector: string) => {
+      this.helper.get.element(selector).should("be.visible");
+    },
+
+    notBeVisible: (selector: string) => {
+      this.helper.get.element(selector).should("not.be.visible");
+    },
+
+    equalStyleStore: (getter: (obj: any) => any, styleObj: any) => {
+      cy.window().then((win: any) => {
+        const obj = this.get.styleFromWindow(win);
+        assert.deepEqual(getter(obj), styleObj);
+      });
+    },
+
+    styleStoreEqualToExampleFileData: () => {
+      cy.window().then((win: any) => {
+        const obj = this.get.styleFromWindow(win);
+        cy.fixture("example-style.json").should("deep.equal", obj);
+      });
+    },
+
+    exist: (selector: string) => {
+      this.helper.get.element(selector).should("exist");
+    },
+    beSelected: (selector: string, value: string) => {
+      this.helper.get.element(selector).find(`option[value="${value}"]`).should("be.selected");
+    },
+    containText: (selector: string, text: string) => {
+      this.helper.get.element(selector).should("contain.text", text);
+    }
+  };
+}

cypress/e2e/history.cy.ts

@@ -1,7 +1,7 @@
-import { MaputnikDriver } from "./maputnik-driver";
+import MaputnikDriver from "./driver";
 
 describe("history", () => {
-  let { beforeAndAfter, when, get, then } = new MaputnikDriver();
+  let { beforeAndAfter, given, when, get, should } = new MaputnikDriver();
   beforeAndAfter();
 
   let undoKeyCombo: string;
@@ -15,30 +15,34 @@ describe("history", () => {
 
   it("undo/redo", () => {
     when.setStyle("geojson");
-    when.modal.open();
-    then(get.styleFromLocalStorage()).shouldDeepNestedInclude({ layers: [] });
+    when.openLayersModal();
 
-    when.modal.fillLayers({
+    should.equalStyleStore((a: any) => a.layers, []);
+
+    when.fillLayersModal({
       id: "step 1",
       type: "background",
     });
-    then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-      layers: [
+
+    should.equalStyleStore(
+      (a: any) => a.layers,
+      [
         {
           id: "step 1",
           type: "background",
         },
-      ],
-    });
+      ]
+    );
 
-    when.modal.open();
-    when.modal.fillLayers({
+    when.openLayersModal();
+    when.fillLayersModal({
       id: "step 2",
       type: "background",
     });
 
-    then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-      layers: [
+    should.equalStyleStore(
+      (a: any) => a.layers,
+      [
         {
           id: "step 1",
           type: "background",
@@ -47,35 +51,38 @@ describe("history", () => {
           id: "step 2",
           type: "background",
         },
-      ],
-    });
+      ]
+    );
 
     when.typeKeys(undoKeyCombo);
-    then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-      layers: [
+    should.equalStyleStore(
+      (a: any) => a.layers,
+      [
         {
           id: "step 1",
           type: "background",
         },
-      ],
-    });
+      ]
+    );
 
     when.typeKeys(undoKeyCombo);
-    then(get.styleFromLocalStorage()).shouldDeepNestedInclude({ layers: [] });
+    should.equalStyleStore((a: any) => a.layers, []);
 
     when.typeKeys(redoKeyCombo);
-    then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-      layers: [
+    should.equalStyleStore(
+      (a: any) => a.layers,
+      [
         {
           id: "step 1",
           type: "background",
         },
-      ],
-    });
+      ]
+    );
 
     when.typeKeys(redoKeyCombo);
-    then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-      layers: [
+    should.equalStyleStore(
+      (a: any) => a.layers,
+      [
         {
           id: "step 1",
           type: "background",
@@ -84,42 +91,7 @@ describe("history", () => {
           id: "step 2",
           type: "background",
         },
-      ],
-    });
-  });
-
-  it("should not redo after undo and value change", () => {
-    when.setStyle("geojson");
-    when.modal.open();
-    when.modal.fillLayers({
-      id: "step 1",
-      type: "background",
-    });
-
-    when.modal.open();
-    when.modal.fillLayers({
-      id: "step 2",
-      type: "background",
-    });
-
-    when.typeKeys(undoKeyCombo);
-    when.typeKeys(undoKeyCombo);
-    then(get.styleFromLocalStorage()).shouldDeepNestedInclude({ layers: [] });
-
-    when.modal.open();
-    when.modal.fillLayers({
-      id: "step 3",
-      type: "background",
-    });
-
-    when.typeKeys(redoKeyCombo);
-    then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-      layers: [
-        {
-          id: "step 3",
-          type: "background",
-        },
-      ],
-    });
+      ]
+    );
   });
 });

cypress/e2e/i18n.cy.ts

@@ -1,35 +0,0 @@
-import { MaputnikDriver } from "./maputnik-driver";
-
-describe("i18n", () => {
-  let { beforeAndAfter, get, when, then } = new MaputnikDriver();
-  beforeAndAfter();
-
-  describe("language detector", () => {
-    it("English", () => {
-      const url = "?lng=en";
-      when.visit(url);
-      then(get.elementByTestId("maputnik-lang-select")).shouldHaveValue("en");
-    });
-
-    it("Japanese", () => {
-      const url = "?lng=ja";
-      when.visit(url);
-      then(get.elementByTestId("maputnik-lang-select")).shouldHaveValue("ja");
-    });
-  });
-
-  describe("language switcher", () => {
-    beforeEach(() => {
-      when.setStyle("layer");
-    });
-
-    it("the language switcher switches to Japanese", () => {
-      const selector = "maputnik-lang-select";
-      then(get.elementByTestId(selector)).shouldExist();
-      when.select(selector, "ja");
-      then(get.elementByTestId(selector)).shouldHaveValue("ja");
-
-      then(get.elementByTestId("nav:settings")).shouldHaveText("スタイル設定");
-    });
-  });
-});

cypress/e2e/keyboard.cy.ts

@@ -1,60 +1,61 @@
-import { MaputnikDriver } from "./maputnik-driver";
+import MaputnikDriver from "./driver";
 
 describe("keyboard", () => {
-  let { beforeAndAfter, given, when, get, then } = new MaputnikDriver();
+  let { beforeAndAfter, given, when, get, should } = new MaputnikDriver();
   beforeAndAfter();
   describe("shortcuts", () => {
     beforeEach(() => {
-      given.setupMockBackedResponses();
+      given.setupInterception();
       when.setStyle("");
     });
 
     it("ESC should unfocus", () => {
       const targetSelector = "maputnik-select";
       when.focus(targetSelector);
-      then(get.elementByTestId(targetSelector)).shouldBeFocused();
+      should.beFocused(targetSelector);
+
       when.typeKeys("{esc}");
-      then(get.elementByTestId(targetSelector)).shouldNotBeFocused();
+      expect(should.notBeFocused(targetSelector));
     });
 
     it("'?' should show shortcuts modal", () => {
       when.typeKeys("?");
-      then(get.elementByTestId("modal:shortcuts")).shouldBeVisible();
+      should.beVisible("modal:shortcuts");
     });
 
     it("'o' should show open modal", () => {
       when.typeKeys("o");
-      then(get.elementByTestId("modal:open")).shouldBeVisible();
+      should.beVisible("modal:open");
     });
 
     it("'e' should show export modal", () => {
       when.typeKeys("e");
-      then(get.elementByTestId("modal:export")).shouldBeVisible();
+      should.beVisible("modal:export");
     });
 
     it("'d' should show sources modal", () => {
       when.typeKeys("d");
-      then(get.elementByTestId("modal:sources")).shouldBeVisible();
+      should.beVisible("modal:sources");
     });
 
     it("'s' should show settings modal", () => {
       when.typeKeys("s");
-      then(get.elementByTestId("modal:settings")).shouldBeVisible();
+      should.beVisible("modal:settings");
     });
 
     it("'i' should change map to inspect mode", () => {
       when.typeKeys("i");
-      then(get.inputValue("maputnik-select")).shouldEqual("inspect");
+      should.beSelected("nav:inspect", "inspect");
     });
 
     it("'m' should focus map", () => {
       when.typeKeys("m");
-      then(get.canvas()).shouldBeFocused();
+      should.canvasBeFocused();
     });
 
     it("'!' should show debug modal", () => {
       when.typeKeys("!");
-      then(get.elementByTestId("modal:debug")).shouldBeVisible();
+      should.beVisible("modal:debug");
     });
   });
 });

cypress/e2e/layers.cy.ts

@@ -1,51 +1,56 @@
 import { v1 as uuid } from "uuid";
-import { MaputnikDriver } from "./maputnik-driver";
+import MaputnikDriver from "./driver";
 
 describe("layers", () => {
-  let { beforeAndAfter, get, when, then } = new MaputnikDriver();
+  let { beforeAndAfter, given, when, get, should } = new MaputnikDriver();
   beforeAndAfter();
   beforeEach(() => {
     when.setStyle("both");
-    when.modal.open();
+    when.openLayersModal();
   });
 
   describe("ops", () => {
-    let id: string;
-    beforeEach(() => {
-      id = when.modal.fillLayers({
+    it("delete", () => {
+      var id = when.fillLayersModal({
         type: "background",
       });
-    });
 
-    it("should update layers in local storage", () => {
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layers: [
+      should.equalStyleStore(
+        (a: any) => a.layers,
+        [
           {
             id: id,
             type: "background",
           },
-        ],
-      });
-    });
+        ]
+      );
 
-    describe("when clicking delete", () => {
-      beforeEach(() => {
       when.click("layer-list-item:" + id + ":delete");
-      });
-      it("should empty layers in local storage", () => {
-        then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-          layers: [],
-        });
-      });
+
+      should.equalStyleStore((a: any) => a.layers, []);
     });
 
-    describe("when clicking duplicate", () => {
-      beforeEach(() => {
-        when.click("layer-list-item:" + id + ":copy");
+    it("duplicate", () => {
+      var styleObj;
+      var id = when.fillLayersModal({
+        type: "background",
       });
-      it("should add copy layer in local storage", () => {
-        then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-          layers: [
+
+      should.equalStyleStore(
+        (a: any) => a.layers,
+        [
+          {
+            id: id,
+            type: "background",
+          },
+        ]
+      );
+
+      when.click("layer-list-item:" + id + ":copy");
+
+      should.equalStyleStore(
+        (a: any) => a.layers,
+        [
           {
             id: id + "-copy",
             type: "background",
@@ -54,19 +59,31 @@ describe("layers", () => {
             id: id,
             type: "background",
           },
-          ],
-        });
-      });
+        ]
+      );
     });
 
-    describe("when clicking hide", () => {
-      beforeEach(() => {
+    it("hide", () => {
+      var styleObj;
+      var id = when.fillLayersModal({
+        type: "background",
+      });
+
+      should.equalStyleStore(
+        (a: any) => a.layers,
+        [
+          {
+            id: id,
+            type: "background",
+          },
+        ]
+      );
+
       when.click("layer-list-item:" + id + ":toggle-visibility");
-      });
 
-      it("should update visibility to none in local storage", () => {
-        then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-          layers: [
+      should.equalStyleStore(
+        (a: any) => a.layers,
+        [
           {
             id: id,
             type: "background",
@@ -74,18 +91,14 @@ describe("layers", () => {
               visibility: "none",
             },
           },
-          ],
-        });
-      });
+        ]
+      );
 
-      describe("when clicking show", () => {
-        beforeEach(() => {
       when.click("layer-list-item:" + id + ":toggle-visibility");
-        });
 
-        it("should update visibility to visible in local storage", () => {
-          then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-            layers: [
+      should.equalStyleStore(
+        (a: any) => a.layers,
+        [
           {
             id: id,
             type: "background",
@@ -93,45 +106,50 @@ describe("layers", () => {
               visibility: "visible",
             },
           },
-            ],
-          });
-        });
-      });
+        ]
+      );
     });
   });
+
   describe("background", () => {
     it("add", () => {
-      let id = when.modal.fillLayers({
+      var id = when.fillLayersModal({
         type: "background",
       });
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layers: [
+
+      should.equalStyleStore(
+        (a: any) => a.layers,
+        [
           {
             id: id,
             type: "background",
           },
-        ],
-      });
+        ]
+      );
     });
 
     describe("modify", () => {
       function createBackground() {
         // Setup
-        let id = uuid();
+        var id = uuid();
 
         when.selectWithin("add-layer.layer-type", "background");
-        when.setValue("add-layer.layer-id.input", "background:" + id);
+        when.setValue(
+          get.dataAttribute("add-layer.layer-id", "input"),
+          "background:" + id
+        );
 
         when.click("add-layer");
 
-        then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-          layers: [
+        should.equalStyleStore(
+          (a: any) => a.layers,
+          [
             {
               id: "background:" + id,
               type: "background",
             },
-          ],
-        });
+          ]
+        );
         return id;
       }
 
@@ -139,167 +157,138 @@ describe("layers", () => {
       describe("layer", () => {
         it("expand/collapse");
         it("id", () => {
-          let bgId = createBackground();
+          var bgId = createBackground();
 
           when.click("layer-list-item:background:" + bgId);
 
-          let id = uuid();
-          when.setValue("layer-editor.layer-id.input", "foobar:" + id);
+          var id = uuid();
+          when.setValue(
+            get.dataAttribute("layer-editor.layer-id", "input"),
+            "foobar:" + id
+          );
           when.click("min-zoom");
 
-          then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-            layers: [
+          should.equalStyleStore(
+            (a: any) => a.layers,
+            [
               {
                 id: "foobar:" + id,
                 type: "background",
               },
-            ],
-          });
+            ]
+          );
         });
 
-        describe("min-zoom", () => {
-          let bgId: string;
+        it("min-zoom", () => {
+          var bgId = createBackground();
 
-          beforeEach(() => {
-            bgId = createBackground();
           when.click("layer-list-item:background:" + bgId);
-            when.setValue("min-zoom.input-text", "1");
-            when.click("layer-editor.layer-id");
-          });
+          when.setValue(
+            get.dataAttribute("min-zoom", 'input[type="text"]'),
+            "1"
+          );
 
-          it("should update min-zoom in local storage", () => {
-            then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-              layers: [
+          when.click("layer-editor.layer-id");
+
+          should.equalStyleStore(
+            (a: any) => a.layers,
+            [
               {
                 id: "background:" + bgId,
                 type: "background",
                 minzoom: 1,
               },
-              ],
-            });
+            ]
+          );
+
+          // AND RESET!
+          // driver.setValue(driver.get.dataAttribute("min-zoom", "input"), "")
+          // driver.click(driver.get.dataAttribute("max-zoom", "input"));
+
+          // driver.isStyleStoreEqual((a: any) => a.layers, [
+          //   {
+          //     "id": 'background:'+bgId,
+          //     "type": 'background'
+          //   }
+          // ]);
         });
 
-          it("when clicking next layer should update style on local storage", () => {
-            when.type("min-zoom.input-text", "{backspace}");
-            when.click("max-zoom.input-text");
-            then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-              layers: [
-                {
-                  id: "background:" + bgId,
-                  type: "background",
-                  minzoom: 1,
-                },
-              ],
-            });
-          });
-        });
+        it("max-zoom", () => {
+          var bgId = createBackground();
 
-        describe("max-zoom", () => {
-          let bgId: string;
-
-          beforeEach(() => {
-            bgId = createBackground();
           when.click("layer-list-item:background:" + bgId);
-            when.setValue("max-zoom.input-text", "1");
-            when.click("layer-editor.layer-id");
-          });
+          when.setValue(
+            get.dataAttribute("max-zoom", 'input[type="text"]'),
+            "1"
+          );
 
-          it("should update style in local storage", () => {
-            then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-              layers: [
+          when.click("layer-editor.layer-id");
+
+          should.equalStyleStore(
+            (a: any) => a.layers,
+            [
               {
                 id: "background:" + bgId,
                 type: "background",
                 maxzoom: 1,
               },
-              ],
-            });
-          });
+            ]
+          );
         });
 
-        describe("comments", () => {
-          let bgId: string;
-          let comment = "42";
+        it("comments", () => {
+          var bgId = createBackground();
+          var id = uuid();
 
-          beforeEach(() => {
-            bgId = createBackground();
           when.click("layer-list-item:background:" + bgId);
-            when.setValue("layer-comment.input", comment);
-            when.click("layer-editor.layer-id");
-          });
+          when.setValue(get.dataAttribute("layer-comment", "textarea"), id);
 
-          it("should update style in local storage", () => {
-            then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-              layers: [
+          when.click("layer-editor.layer-id");
+
+          should.equalStyleStore(
+            (a: any) => a.layers,
+            [
               {
                 id: "background:" + bgId,
                 type: "background",
                 metadata: {
-                    "maputnik:comment": comment,
+                  "maputnik:comment": id,
                 },
               },
-              ],
-            });
+            ]
+          );
+
+          // Unset it again.
+          // TODO: This fails
+          // driver.setValue(driver.getDataAttribute("layer-comment", "textarea"), "");
+          // driver.click(driver.getDataAttribute("min-zoom", "input"));
+
+          // driver.isStyleStoreEqual((a: any) => a.layers, [
+          //   {
+          //     "id": 'background:'+bgId,
+          //     "type": 'background'
+          //   }
+          // ]);
         });
 
-          describe("when unsetting", () => {
-            beforeEach(() => {
-              when.clear("layer-comment.input");
-              when.click("min-zoom.input-text");
-            });
+        it("color", () => {
+          var bgId = createBackground();
 
-            it("should update style in local storage", () => {
-              then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-                layers: [
-                  {
-                    id: "background:" + bgId,
-                    type: "background",
-                  },
-                ],
-              });
-            });
-          });
-        });
-
-        describe("color", () => {
-          let bgId: string;
-          beforeEach(() => {
-            bgId = createBackground();
           when.click("layer-list-item:background:" + bgId);
+
           when.click("spec-field:background-color");
-          });
 
-          it("should update style in local storage", () => {
-            then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-              layers: [
+          should.equalStyleStore(
+            (a: any) => a.layers,
+            [
               {
                 id: "background:" + bgId,
                 type: "background",
               },
-              ],
+            ]
+          );
         });
       });
-        });
-
-        describe("opacity", () => {
-          let bgId: string;
-          beforeEach(() => {
-            bgId = createBackground();
-            when.click("layer-list-item:background:" + bgId);
-            when.type("spec-field-input:background-opacity", "0.");
-          });
-
-          it("should keep '.' in the input field", () => {
-            then(get.elementByTestId("spec-field-input:background-opacity")).shouldHaveValue("0.");
-          });
-
-          it("should revert to a valid value when focus out", () => {
-            when.click("layer-list-item:background:" + bgId);
-            then(get.elementByTestId("spec-field-input:background-opacity")).shouldHaveValue('0');
-          });
-        });
-
-      });
 
       describe("filter", () => {
         it("expand/collapse");
@@ -320,18 +309,18 @@ describe("layers", () => {
 
         // TODO
         it.skip("parse error", () => {
-          let bgId = createBackground();
+          var bgId = createBackground();
 
           when.click("layer-list-item:background:" + bgId);
 
-          let errorSelector = ".CodeMirror-lint-marker-error";
-          then(get.elementByTestId(errorSelector)).shouldNotExist();
+          var errorSelector = ".CodeMirror-lint-marker-error";
+          should.notExist(errorSelector);
 
           when.click(".CodeMirror");
           when.typeKeys(
             "\uE013\uE013\uE013\uE013\uE013\uE013\uE013\uE013\uE013\uE013\uE013\uE013 {"
           );
-          then(get.elementByTestId(errorSelector)).shouldExist();
+          should.exist(errorSelector);
         });
       });
     });
@@ -339,20 +328,21 @@ describe("layers", () => {
 
   describe("fill", () => {
     it("add", () => {
-      let id = when.modal.fillLayers({
+      var id = when.fillLayersModal({
         type: "fill",
         layer: "example",
       });
 
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layers: [
+      should.equalStyleStore(
+        (a: any) => a.layers,
+        [
           {
             id: id,
             type: "fill",
             source: "example",
           },
-        ],
-      });
+        ]
+      );
     });
 
     // TODO: Change source
@@ -361,20 +351,21 @@ describe("layers", () => {
 
   describe("line", () => {
     it("add", () => {
-      let id = when.modal.fillLayers({
+      var id = when.fillLayersModal({
         type: "line",
         layer: "example",
       });
 
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layers: [
+      should.equalStyleStore(
+        (a: any) => a.layers,
+        [
           {
             id: id,
             type: "line",
             source: "example",
           },
-        ],
-      });
+        ]
+      );
     });
 
     it("groups", () => {
@@ -385,77 +376,81 @@ describe("layers", () => {
 
   describe("symbol", () => {
     it("add", () => {
-      let id = when.modal.fillLayers({
+      var id = when.fillLayersModal({
         type: "symbol",
         layer: "example",
       });
 
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layers: [
+      should.equalStyleStore(
+        (a: any) => a.layers,
+        [
           {
             id: id,
             type: "symbol",
             source: "example",
           },
-        ],
-      });
+        ]
+      );
     });
   });
 
   describe("raster", () => {
     it("add", () => {
-      let id = when.modal.fillLayers({
+      var id = when.fillLayersModal({
         type: "raster",
         layer: "raster",
       });
 
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layers: [
+      should.equalStyleStore(
+        (a: any) => a.layers,
+        [
           {
             id: id,
             type: "raster",
             source: "raster",
           },
-        ],
-      });
+        ]
+      );
     });
   });
 
   describe("circle", () => {
     it("add", () => {
-      let id = when.modal.fillLayers({
+      var id = when.fillLayersModal({
         type: "circle",
         layer: "example",
       });
 
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layers: [
+      should.equalStyleStore(
+        (a: any) => a.layers,
+        [
           {
             id: id,
             type: "circle",
             source: "example",
           },
-        ],
-      });
+        ]
+      );
     });
   });
 
   describe("fill extrusion", () => {
     it("add", () => {
-      let id = when.modal.fillLayers({
+      var id = when.fillLayersModal({
         type: "fill-extrusion",
         layer: "example",
       });
 
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        layers: [
+      should.equalStyleStore(
+        (a: any) => a.layers,
+        [
           {
             id: id,
             type: "fill-extrusion",
             source: "example",
           },
-        ],
-      });
+        ]
+      );
     });
   });
 
@@ -463,35 +458,34 @@ describe("layers", () => {
     it("simple", () => {
       when.setStyle("geojson");
 
-      when.modal.open();
-      when.modal.fillLayers({
+      when.openLayersModal();
+      when.fillLayersModal({
         id: "foo",
         type: "background",
       });
 
-      when.modal.open();
-      when.modal.fillLayers({
+      when.openLayersModal();
+      when.fillLayersModal({
         id: "foo_bar",
         type: "background",
       });
 
-      when.modal.open();
-      when.modal.fillLayers({
+      when.openLayersModal();
+      when.fillLayersModal({
         id: "foo_bar_baz",
         type: "background",
       });
 
-      then(get.elementByTestId("layer-list-item:foo")).shouldBeVisible();
-      then(get.elementByTestId("layer-list-item:foo_bar")).shouldNotBeVisible();
-      then(
-        get.elementByTestId("layer-list-item:foo_bar_baz")
-      ).shouldNotBeVisible();
+      should.beVisible("layer-list-item:foo");
+
+      should.notBeVisible("layer-list-item:foo_bar");
+      should.notBeVisible("layer-list-item:foo_bar_baz");
+
       when.click("layer-list-group:foo-0");
-      then(get.elementByTestId("layer-list-item:foo")).shouldBeVisible();
-      then(get.elementByTestId("layer-list-item:foo_bar")).shouldBeVisible();
-      then(
-        get.elementByTestId("layer-list-item:foo_bar_baz")
-      ).shouldBeVisible();
+
+      should.beVisible("layer-list-item:foo");
+      should.beVisible("layer-list-item:foo_bar");
+      should.beVisible("layer-list-item:foo_bar_baz");
     });
   });
 });

cypress/e2e/map.cy.ts

@@ -1,32 +1,23 @@
-import { MaputnikDriver } from "./maputnik-driver";
+import MaputnikDriver from "./driver";
 
 describe("map", () => {
-  let { beforeAndAfter, get, when, then } = new MaputnikDriver();
+  let { beforeAndAfter, given, when, get, should } = new MaputnikDriver();
   beforeAndAfter();
   describe("zoom level", () => {
     it("via url", () => {
-      let zoomLevel = 12.37;
+      var zoomLevel = 12.37;
       when.setStyle("geojson", zoomLevel);
-      then(get.elementByTestId("maplibre:ctrl-zoom")).shouldBeVisible();
-      then(get.elementByTestId("maplibre:ctrl-zoom")).shouldContainText(
-        "Zoom: " + zoomLevel
-      );
+      should.beVisible("maplibre:ctrl-zoom");
+      should.containText("maplibre:ctrl-zoom", "Zoom: " + zoomLevel);
     });
 
     it("via map controls", () => {
-      let zoomLevel = 12.37;
+      var zoomLevel = 12.37;
       when.setStyle("geojson", zoomLevel);
-      then(get.elementByTestId("maplibre:ctrl-zoom")).shouldBeVisible();
-      when.clickZoomIn();
-      then(get.elementByTestId("maplibre:ctrl-zoom")).shouldContainText(
-        "Zoom: " + (zoomLevel + 1)
-      );
-    });
-  });
 
-  describe("search", () => {
-    it('should exist', () => {
-      then(get.searchControl()).shouldBeVisible();
+      should.beVisible("maplibre:ctrl-zoom");
+      when.clickZoomin();
+      should.containText("maplibre:ctrl-zoom", "Zoom: "+(zoomLevel + 1));
     });
   });
 });

cypress/e2e/maputnik-cypress-helper.ts

@@ -1,19 +0,0 @@
-import { CypressHelper } from "@shellygo/cypress-test-utils";
-
-export default class MaputnikCypressHelper {
-  private helper = new CypressHelper({ defaultDataAttribute: "data-wd-key" });
-
-  public given = {
-    ...this.helper.given,
-  };
-
-  public get = {
-    ...this.helper.get,
-  };
-
-  public when = {
-    ...this.helper.when,
-  };
-
-  public beforeAndAfter = this.helper.beforeAndAfter;
-}

cypress/e2e/maputnik-driver.ts

@@ -1,186 +0,0 @@
-/// <reference types="cypress-plugin-tab" />
-
-import { CypressHelper } from "@shellygo/cypress-test-utils";
-import { Assertable, then } from "@shellygo/cypress-test-utils/assertable";
-import MaputnikCypressHelper from "./maputnik-cypress-helper";
-import ModalDriver from "./modal-driver";
-const baseUrl = "http://localhost:8888/";
-
-const styleFromWindow = (win: Window) => {
-  const styleId = win.localStorage.getItem("maputnik:latest_style");
-  const styleItem = win.localStorage.getItem(`maputnik:style:${styleId}`);
-  const obj = JSON.parse(styleItem || "");
-  return obj;
-};
-
-export class MaputnikAssertable<T> extends Assertable<T> {
-  shouldEqualToStoredStyle = () =>
-    then(
-      new CypressHelper().get.window().then((win: Window) => {
-        const style = styleFromWindow(win);
-        then(this.chainable).shouldDeepNestedInclude(style);
-      })
-    );
-}
-
-export class MaputnikDriver {
-  private helper = new MaputnikCypressHelper();
-  private modalDriver = new ModalDriver();
-
-  public beforeAndAfter = () => {
-    beforeEach(() => {
-      this.given.setupMockBackedResponses();
-      this.when.setStyle("both");
-    });
-  };
-
-  public then = (chainable: Cypress.Chainable<any>) =>
-    new MaputnikAssertable(chainable);
-
-  public given = {
-    ...this.helper.given,
-    setupMockBackedResponses: () => {
-      this.helper.given.interceptAndMockResponse({
-        method: "GET",
-        url: baseUrl + "example-style.json",
-        response: {
-          fixture: "example-style.json",
-        },
-        alias: "example-style.json",
-      });
-      this.helper.given.interceptAndMockResponse({
-        method: "GET",
-        url: baseUrl + "example-layer-style.json",
-        response: {
-          fixture: "example-layer-style.json",
-        },
-      });
-      this.helper.given.interceptAndMockResponse({
-        method: "GET",
-        url: baseUrl + "geojson-style.json",
-        response: {
-          fixture: "geojson-style.json",
-        },
-      });
-      this.helper.given.interceptAndMockResponse({
-        method: "GET",
-        url: baseUrl + "raster-style.json",
-        response: {
-          fixture: "raster-style.json",
-        },
-      });
-      this.helper.given.interceptAndMockResponse({
-        method: "GET",
-        url: baseUrl + "geojson-raster-style.json",
-        response: {
-          fixture: "geojson-raster-style.json",
-        },
-      });
-      this.helper.given.interceptAndMockResponse({
-        method: "GET",
-        url: "*example.local/*",
-        response: [],
-      });
-      this.helper.given.interceptAndMockResponse({
-        method: "GET",
-        url: "*example.com/*",
-        response: [],
-      });
-    },
-  };
-
-  public when = {
-    ...this.helper.when,
-    modal: this.modalDriver.when,
-    within: (selector: string, fn: () => void) => {
-      this.helper.when.within(fn, selector);
-    },
-    tab: () => this.helper.get.element("body").tab(),
-    waitForExampleFileResponse: () => {
-      this.helper.when.waitForResponse("example-style.json");
-    },
-    chooseExampleFile: () => {
-      this.helper.get
-        .bySelector("type", "file")
-        .selectFile("cypress/fixtures/example-style.json", { force: true });
-    },
-    setStyle: (
-      styleProperties: "geojson" | "raster" | "both" | "layer" | "",
-      zoom?: number
-    ) => {
-      let url = "?debug";
-      switch (styleProperties) {
-      case "geojson":
-        url += `&style=${baseUrl}geojson-style.json`;
-        break;
-      case "raster":
-        url += `&style=${baseUrl}raster-style.json`;
-        break;
-      case "both":
-        url += `&style=${baseUrl}geojson-raster-style.json`;
-        break;
-      case "layer":
-        url += `&style=${baseUrl}/example-layer-style.json`;
-        break;
-      }
-      if (zoom) {
-        url += `#${zoom}/41.3805/2.1635`;
-      }
-      this.helper.when.visit(baseUrl + url);
-      if (styleProperties) {
-        this.helper.when.acceptConfirm();
-      }
-      // when methods should not include assertions
-      const toolbarLink = this.helper.get.elementByTestId("toolbar:link")
-      toolbarLink.scrollIntoView();
-      toolbarLink.should("be.visible");
-    },
-
-    typeKeys: (keys: string) => this.helper.get.element("body").type(keys),
-
-    clickZoomIn: () => {
-      this.helper.get.element(".maplibregl-ctrl-zoom-in").click();
-    },
-
-    selectWithin: (selector: string, value: string) => {
-      this.when.within(selector, () => {
-        this.helper.get.element("select").select(value);
-      });
-    },
-
-    select: (selector: string, value: string) => {
-      this.helper.get.elementByTestId(selector).select(value);
-    },
-
-    focus: (selector: string) => {
-      this.helper.when.focus(selector);
-    },
-
-    setValue: (selector: string, text: string) => {
-      this.helper.get
-        .elementByTestId(selector)
-        .clear()
-        .type(text, { parseSpecialCharSequences: false });
-    },
-  };
-
-  public get = {
-    ...this.helper.get,
-    isMac: () => {
-      return Cypress.platform === "darwin";
-    },
-
-    styleFromLocalStorage: () =>
-      this.helper.get.window().then((win) => styleFromWindow(win)),
-
-    exampleFileUrl: () => {
-      return baseUrl + "example-style.json";
-    },
-    skipTargetLayerList: () =>
-      this.helper.get.elementByTestId("skip-target-layer-list"),
-    skipTargetLayerEditor: () =>
-      this.helper.get.elementByTestId("skip-target-layer-editor"),
-    canvas: () => this.helper.get.element("canvas"),
-    searchControl: () => this.helper.get.element('.maplibregl-ctrl-geocoder')
-  };
-}

cypress/e2e/modal-driver.ts

@@ -1,40 +0,0 @@
-import { v1 as uuid } from "uuid";
-import MaputnikCypressHelper from "./maputnik-cypress-helper";
-
-export default class ModalDriver {
-  private helper = new MaputnikCypressHelper();
-
-  public when = {
-    fillLayers: (opts: { type: string; layer?: string; id?: string }) => {
-      // Having logic in test code is an anti pattern.
-      // This should be splitted to multiple single responsibility functions
-      let type = opts.type;
-      let layer = opts.layer;
-      let id;
-      if (opts.id) {
-        id = opts.id;
-      } else {
-        id = `${type}:${uuid()}`;
-      }
-      this.helper.when.selectOption("add-layer.layer-type.select", type);
-      this.helper.when.type("add-layer.layer-id.input", id);
-
-      if (layer) {
-        this.helper.when.within(() => {
-          this.helper.get.element("input").type(layer!);
-        }, "add-layer.layer-source-block");
-      }
-      this.helper.when.click("add-layer");
-
-      return id;
-    },
-
-    open: () => {
-      this.helper.when.click("layer-list:add-layer");
-    },
-
-    close: (key: string) => {
-      this.helper.when.click(key + ".close-modal");
-    },
-  };
-}

cypress/e2e/modals.cy.ts

@@ -1,9 +1,8 @@
-import { MaputnikDriver } from "./maputnik-driver";
+import MaputnikDriver from "./driver";
 
 describe("modals", () => {
-  let { beforeAndAfter, when, get, then } = new MaputnikDriver();
+  let { beforeAndAfter, given, when, get, should } = new MaputnikDriver();
   beforeAndAfter();
-
   beforeEach(() => {
     when.setStyle("");
   });
@@ -13,27 +12,25 @@ describe("modals", () => {
     });
 
     it("close", () => {
-      when.modal.close("modal:open");
-      then(get.elementByTestId("modal:open")).shouldNotExist();
+      when.closeModal("modal:open");
+      should.notExist("modal:open");
     });
 
     it.skip("upload", () => {
       // HM: I was not able to make the following choose file actually to select a file and close the modal...
       when.chooseExampleFile();
-      then(get.responseBody("example-style.json")).shouldEqualToStoredStyle();
+
+      should.styleStoreEqualToExampleFileData();
     });
 
-    describe("when click open url", () => {
-      beforeEach(() => {
-        let styleFileUrl = get.exampleFileUrl();
-
-        when.setValue("modal:open.url.input", styleFileUrl);
-        when.click("modal:open.url.button");
-        when.wait(200);
-      });
     it("load from url", () => {
-        then(get.responseBody("example-style.json")).shouldEqualToStoredStyle();
-      });
+      var styleFileUrl = get.exampleFileUrl();
+
+      when.setValue(get.dataAttribute("modal:open.url.input"), styleFileUrl);
+      when.click("modal:open.url.button");
+      when.waitForExampleFileRequset();
+
+      should.styleStoreEqualToExampleFileData();
     });
   });
 
@@ -41,8 +38,8 @@ describe("modals", () => {
     it("open/close", () => {
       when.setStyle("");
       when.typeKeys("?");
-      when.modal.close("modal:shortcuts");
-      then(get.elementByTestId("modal:shortcuts")).shouldNotExist();
+      when.closeModal("modal:shortcuts");
+      should.notExist("modal:shortcuts");
     });
   });
 
@@ -52,8 +49,8 @@ describe("modals", () => {
     });
 
     it("close", () => {
-      when.modal.close("modal:export");
-      then(get.elementByTestId("modal:export")).shouldNotExist();
+      when.closeModal("modal:export");
+      should.notExist("modal:export");
     });
 
     // TODO: Work out how to download a file and check the contents
@@ -68,9 +65,9 @@ describe("modals", () => {
 
   describe("inspect", () => {
     it("toggle", () => {
-      // There is no assertion in this test
       when.setStyle("geojson");
-      when.select("maputnik-select", "inspect");
+
+      when.selectWithin("nav:inspect", "inspect");
     });
   });
 
@@ -79,98 +76,82 @@ describe("modals", () => {
       when.click("nav:settings");
     });
 
-    describe("when click name filed spec information", () => {
-      beforeEach(() => {
+    it("name", () => {
       when.click("field-doc-button-Name");
-      });
 
-      it("should show the spec information", () => {
-        then(get.elementsText("spec-field-doc")).shouldInclude(
-          "name for the style"
-        );
-      });
-    });
-
-    describe("when set name and click owner", () => {
-      beforeEach(() => {
-        when.setValue("modal:settings.name", "foobar");
-        when.click("modal:settings.owner");
-        when.wait(200);
+      should.containText("spec-field-doc", "name for the style");
     });
 
     it("show name specifications", () => {
-        then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-          name: "foobar",
-        });
-      });
+      when.setValue(get.dataAttribute("modal:settings.name"), "foobar");
+      when.click("modal:settings.owner");
+
+      should.equalStyleStore((obj) => obj.name, "foobar");
     });
 
-    describe("when set owner and click name", () => {
-      beforeEach(() => {
-        when.setValue("modal:settings.owner", "foobar");
+    it("owner", () => {
+      when.setValue(get.dataAttribute("modal:settings.owner"), "foobar");
       when.click("modal:settings.name");
-        when.wait(200);
-      });
-      it("should update owner in local storage", () => {
-        then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-          owner: "foobar",
-        });
-      });
-    });
 
+      should.equalStyleStore((obj) => obj.owner, "foobar");
+    });
     it("sprite url", () => {
-      when.setValue("modal:settings.sprite", "http://example.com");
+      when.setValue(
+        get.dataAttribute("modal:settings.sprite"),
+        "http://example.com"
+      );
       when.click("modal:settings.name");
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        sprite: "http://example.com",
-      });
+
+      should.equalStyleStore((obj) => obj.sprite, "http://example.com");
     });
     it("glyphs url", () => {
-      let glyphsUrl = "http://example.com/{fontstack}/{range}.pbf";
-      when.setValue("modal:settings.glyphs", glyphsUrl);
+      var glyphsUrl = "http://example.com/{fontstack}/{range}.pbf";
+      when.setValue(get.dataAttribute("modal:settings.glyphs"), glyphsUrl);
       when.click("modal:settings.name");
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        glyphs: glyphsUrl,
-      });
+
+      should.equalStyleStore((obj) => obj.glyphs, glyphsUrl);
     });
 
     it("maptiler access token", () => {
-      let apiKey = "testing123";
+      var apiKey = "testing123";
       when.setValue(
-        "modal:settings.maputnik:openmaptiles_access_token",
+        get.dataAttribute(
+          "modal:settings.maputnik:openmaptiles_access_token"
+        ),
         apiKey
       );
       when.click("modal:settings.name");
-      then(
-        get.styleFromLocalStorage().then((style) => style.metadata)
-      ).shouldInclude({
-        "maputnik:openmaptiles_access_token": apiKey,
-      });
+
+      should.equalStyleStore(
+        (obj) => obj.metadata["maputnik:openmaptiles_access_token"],
+        apiKey
+      );
     });
 
     it("thunderforest access token", () => {
-      let apiKey = "testing123";
+      var apiKey = "testing123";
       when.setValue(
-        "modal:settings.maputnik:thunderforest_access_token",
+        get.dataAttribute(
+          "modal:settings.maputnik:thunderforest_access_token"
+        ),
         apiKey
       );
       when.click("modal:settings.name");
-      then(
-        get.styleFromLocalStorage().then((style) => style.metadata)
-      ).shouldInclude({ "maputnik:thunderforest_access_token": apiKey });
+
+      should.equalStyleStore(
+        (obj) => obj.metadata["maputnik:thunderforest_access_token"],
+        apiKey
+      );
     });
 
     it("style renderer", () => {
       cy.on("uncaught:exception", () => false); // this is due to the fact that this is an invalid style for openlayers
       when.select("modal:settings.maputnik:renderer", "ol");
-      then(get.inputValue("modal:settings.maputnik:renderer")).shouldEqual(
-        "ol"
-      );
+      should.beSelected("modal:settings.maputnik:renderer", "ol");
 
       when.click("modal:settings.name");
-      then(get.styleFromLocalStorage()).shouldDeepNestedInclude({
-        metadata: { "maputnik:renderer": "ol" },
-      });
+
+      should.equalStyleStore((obj) => obj.metadata["maputnik:renderer"], "ol");
     });
   });
 

cypress/support/e2e.ts

@@ -14,7 +14,6 @@
 // ***********************************************************
 
 // Import commands.js using ES2015 syntax:
-import "@cypress/code-coverage/support";
 import "cypress-plugin-tab";
 import "./commands";
 

desktop/.gitignore

@@ -1,31 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-editor
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.test
-*.prof
-
-# Binary version of pubilic/editor
-rice-box.go
-
-# Built binary
-maputnik

desktop/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2016 Maputnik
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

desktop/Makefile

@@ -1,39 +0,0 @@
-SOURCEDIR=.
-SOURCES := $(shell find $(SOURCEDIR) -name '*.go')
-BINARY=maputnik
-DESKTOP_VERSION := 1.1.1
-EDITOR_VERSION := $(shell node -p "require('../package.json').version")
-GOPATH := $(if $(GOPATH),$(GOPATH),$(HOME)/go)
-GOBIN := $(if $(GOBIN),$(GOBIN),$(HOME)/go/bin)
-
-all: $(BINARY)
-
-$(BINARY): $(GOBIN)/gox $(SOURCES) version.go rice-box.go
-	$(GOBIN)/gox -osarch "windows/amd64 linux/amd64 darwin/amd64" -output "bin/{{.OS}}/${BINARY}"
-
-# Copy the current release into ./editor/maputnik so it can be
-# embedded in the binary
-editor/pull_release:
-	mkdir -p editor
-	cp -r ../dist/* editor
-
-$(GOBIN)/gox:
-	go install github.com/mitchellh/gox@v1.0.1
-
-$(GOBIN)/rice:
-	go install github.com/GeertJohan/go.rice/rice@v1.0.3
-
-# Embed the current version numbers in the executable by writing version.go
-.PHONY: version.go
-version.go:
-	@echo "// DO NOT EDIT: Autogenerated by Makefile\n" > version.go
-	@echo "package main\n" >> version.go
-	@echo "const DesktopVersion = \"$(DESKTOP_VERSION)\"" >> version.go
-	@echo "const EditorVersion = \"$(EDITOR_VERSION)\"" >> version.go
-
-rice-box.go: $(GOBIN)/rice editor/pull_release
-	$(GOBIN)/rice embed-go
-
-.PHONY: clean
-clean:
-	rm -rf editor && rm -f rice-box.go && rm -rf bin

desktop/README.md

@@ -1,72 +0,0 @@
-# Maputnik Desktop [![GitHub CI status](https://github.com/maplibre/maputnik/workflows/ci/badge.svg)][github-action-ci]
----
-
-A Golang based cross platform executable for integrating Maputnik locally.
-This binary packages up the JavaScript and CSS bundle produced by maputnik
-and embeds it in the program for easy distribution. It also allows
-exposing a local style file and work on it both in Maputnik and with your favorite
-editor.
-
-Report issues on [maplibre/maputnik](https://github.com/maplibre/maputnik).
-
-## Install
-
-You can download a single binary for Linux, OSX or Windows from [the latest releases of **maplibre/maputnik**](https://github.com/maplibre/maputnik/editor/releases/latest).
-
-### Usage
-
-Simply start up a web server and access the Maputnik editor GUI at `localhost:8000`.
-
-```bash
-maputnik
-```
-
-Expose a local style file to Maputnik allowing the web based editor
-to save to the local filesystem.
-
-```bash
-maputnik --file basic-v9.json
-```
-
-Watch the local style for changes and inform the editor via web socket.
-This makes it possible to edit the style with a local text editor and still
-use Maputnik.
-
-```bash
-maputnik --watch --file basic-v9.json
-```
-
-Choose a local port to listen on, instead of using the default port 8000.
-
-```bash
-maputnik --port 8001
-```
-
-Specify a path to a directory which, if it exists, will be served under http://localhost:8000/static/ .
-Could be used to serve sprites and glyphs.
-
-```bash
-maputnik --static ./localFolder
-```
-
-### API
-
-`maputnik` exposes the configured styles via a HTTP API.
-
-| Method                          | Description
-|---------------------------------|---------------------------------------
-| `GET /styles`                   | List the ID of all configured style files
-| `GET /styles/{filename}`        | Get contents of a single style file
-| `PUT /styles/{filename}`        | Update contents of a style file
-| `WEBSOCKET /ws`                 | Listen to change events for the configured style files
-
-### Build
-
-From the root of the [maplibre/maputnik](https://github.com/maplibre/maputnik) project, install the deps and run the desktop-build command.
-
-```
-npm install
-npm run build-desktop
-```
-
-You should now find the `maputnik` binary in your `bin` directory.

desktop/api.go

@@ -1,81 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"net/http"
-
-	"github.com/gorilla/mux"
-)
-
-func StyleFileAccessor(filename string) styleFileAccessor {
-	return styleFileAccessor{filename, styleId(filename)}
-}
-
-func styleId(filename string) string {
-	raw, err := ioutil.ReadFile(filename)
-	if err != nil {
-		log.Panicln(err)
-	}
-
-	var spec styleSpec
-	err = json.Unmarshal(raw, &spec)
-	if err != nil {
-		log.Panicln(err)
-	}
-
-	if spec.Id == "" {
-		fmt.Println("No id in style")
-	}
-	return spec.Id
-}
-
-type styleSpec struct {
-	Id string `json:"id"`
-}
-
-// Allows access to a single style file
-type styleFileAccessor struct {
-	filename string
-	id       string
-}
-
-func (fa styleFileAccessor) ListFiles(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json")
-	encoder := json.NewEncoder(w)
-	encoder.Encode([]string{fa.id})
-}
-
-func (fa styleFileAccessor) ReadFile(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	_ = vars["styleId"]
-
-	//TODO: Choose right file
-	// right now we just return the single file we know of
-	w.Header().Set("Content-Type", "application/json")
-
-	raw, err := ioutil.ReadFile(fa.filename)
-	if err != nil {
-		log.Panicln(err)
-	}
-	w.Write(raw)
-}
-
-func (fa styleFileAccessor) SaveFile(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	_ = vars["styleId"]
-
-	//TODO: Save to right file
-	w.Header().Set("Content-Type", "application/json")
-
-	body, _ := ioutil.ReadAll(r.Body)
-	var out bytes.Buffer
-	json.Indent(&out, body, "", "  ")
-
-	if err := ioutil.WriteFile(fa.filename, out.Bytes(), 0666); err != nil {
-		log.Fatalf("Can not copy from request to file: %s", err.Error())
-	}
-}

desktop/filewatch/filewatch.go

@@ -1,69 +0,0 @@
-package filewatch
-
-import (
-	"io/ioutil"
-	"log"
-	"net/http"
-
-	"github.com/fsnotify/fsnotify"
-	"github.com/gorilla/websocket"
-)
-
-var upgrader = websocket.Upgrader{
-	ReadBufferSize:  1024,
-	WriteBufferSize: 1024,
-	CheckOrigin:     func(r *http.Request) bool { return true },
-}
-
-func writer(ws *websocket.Conn, filename string) {
-	watcher, err := fsnotify.NewWatcher()
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer watcher.Close()
-
-	done := make(chan bool)
-	go func() {
-		for {
-			select {
-			case event := <-watcher.Events:
-				if event.Op&fsnotify.Write == fsnotify.Write {
-					log.Println("Modified file:", event.Name)
-					var p []byte
-					var err error
-
-					p, err = ioutil.ReadFile(filename)
-					if err != nil {
-						log.Fatal(err)
-					}
-
-					if p != nil {
-						if err := ws.WriteMessage(websocket.TextMessage, p); err != nil {
-							return
-						}
-					}
-				}
-			case err := <-watcher.Errors:
-				log.Println("Watch error:", err)
-			}
-		}
-	}()
-
-	if err = watcher.Add(filename); err != nil {
-		log.Fatal(err)
-	}
-	<-done
-}
-
-func ServeWebsocketFileWatcher(filename string, w http.ResponseWriter, r *http.Request) {
-	ws, err := upgrader.Upgrade(w, r, nil)
-	if err != nil {
-		if _, ok := err.(websocket.HandshakeError); !ok {
-			log.Println(err)
-		}
-		return
-	}
-
-	writer(ws, filename)
-	defer ws.Close()
-}

desktop/go.mod

@@ -1,27 +0,0 @@
-module maputnik/desktop
-
-go 1.19
-
-require (
-	github.com/GeertJohan/go.rice v1.0.3
-	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.0
-	github.com/maputnik/desktop v1.0.7
-	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
-	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
-)

desktop/go.sum

@@ -1,54 +0,0 @@
-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=
-github.com/daaku/go.zipexe v1.0.2 h1:Zg55YLYTr7M9wjKn8SY/WcpuuEi+kR2u4E8RhvpyXmk=
-github.com/daaku/go.zipexe v1.0.2/go.mod h1:5xWogtqlYnfBXkSB1o9xysukNP9GTvaNkqzUZbt3Bw8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ=
-github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
-github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
-github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4=
-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.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/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=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-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=
-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=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

desktop/maputnik.go

@@ -1,80 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"net/http"
-	"os"
-	"path/filepath"
-
-        "github.com/GeertJohan/go.rice"
-	"github.com/gorilla/handlers"
-	"github.com/gorilla/mux"
-	"github.com/maputnik/desktop/filewatch"
-	"github.com/urfave/cli"
-)
-
-func main() {
-	app := cli.NewApp()
-	app.Name = "maputnik"
-	app.Usage = "Server for integrating Maputnik locally"
-	app.Version = "Editor: " + EditorVersion + "; Desktop: " + DesktopVersion
-
-	app.Flags = []cli.Flag{
-		&cli.StringFlag{
-			Name:  "file, f",
-			Usage: "Allow access to JSON style from web client",
-		},
-		&cli.BoolFlag{
-			Name:  "watch",
-			Usage: "Notify web client about JSON style file changes",
-		},
-		&cli.IntFlag{
-			Name: "port",
-			Value: 8000,
-			Usage: "TCP port to listen on",
-		},
-		&cli.StringFlag{
-			Name:  "static",
-			Usage: "Serve directory under /static/",
-		},
-	}
-
-	app.Action = func(c *cli.Context) error {
-		gui := http.FileServer(rice.MustFindBox("editor").HTTPBox())
-
-		router := mux.NewRouter().StrictSlash(true)
-
-		filename := c.String("file")
-		if filename != "" {
-			fmt.Printf("%s is accessible via Maputnik\n", filename)
-			// Allow access to reading and writing file on the local system
-			path, _ := filepath.Abs(filename)
-			accessor := StyleFileAccessor(path)
-			router.Path("/styles").Methods("GET").HandlerFunc(accessor.ListFiles)
-			router.Path("/styles/{styleId}").Methods("GET").HandlerFunc(accessor.ReadFile)
-			router.Path("/styles/{styleId}").Methods("PUT").HandlerFunc(accessor.SaveFile)
-
-			// Register websocket to notify we clients about file changes
-			if c.Bool("watch") {
-				router.Path("/ws").HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-					filewatch.ServeWebsocketFileWatcher(filename, w, r)
-				})
-			}
-		}
-
-		staticDir := c.String("static")
-		if staticDir != "" {
-			h := http.StripPrefix("/static/", http.FileServer(http.Dir(staticDir)))
-			router.PathPrefix("/static/").Handler(h)
-		}
-
-		router.PathPrefix("/").Handler(http.StripPrefix("/", gui))
-		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)
-
-		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)
-}

i18next-parser.config.ts

@@ -1,17 +0,0 @@
-export default {
-  output: 'src/locales/$LOCALE/$NAMESPACE.json',
-  locales: [ 'ja', 'he','zh' ],
-
-  // Because some keys are dynamically generated, i18next-parser can't detect them.
-  // We add these keys manually, so we don't want to remove them.
-  keepRemoved: true,
-
-  // We use plain English keys, so we disable key and namespace separators.
-  keySeparator: false,
-  namespaceSeparator: false,
-
-  defaultValue: (locale, ns, key) => {
-    // The default value is a string that indicates that the string is not translated.
-    return '__STRING_NOT_TRANSLATED__';
-  }
-}

package.json

@@ -1,49 +1,38 @@
 {
   "name": "maputnik",
-  "version": "2.1.1",
+  "version": "2.0.0-pre.2",
   "description": "A MapLibre GL visual style editor",
-  "type": "module",
   "main": "''",
   "scripts": {
     "start": "vite",
-    "build": "tsc && vite build --base=/maputnik/",
-    "build-desktop": "tsc && vite build --base=/ && cd desktop && make",
-    "i18n:refresh": "i18next 'src/**/*.{ts,tsx,js,jsx}'",
-    "lint": "eslint ./src ./cypress --ext ts,tsx,js,jsx --report-unused-disable-directives --max-warnings 0",
+    "build": "tsc && vite build",
+    "lint": "eslint ./src --ext ts,tsx,js,jsx --report-unused-disable-directives --max-warnings 0 && npm run lint-css",
     "test": "cypress run",
     "cy:open": "cypress open",
     "lint-css": "stylelint \"src/styles/*.scss\"",
-    "sort-styles": "jq 'sort_by(.id)' src/config/styles.json > tmp.json && mv tmp.json src/config/styles.json"
+    "storybook": "storybook dev -h 0.0.0.0 -p 6006",
+    "build-storybook": "storybook build -o build/storybook"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/maplibre/maputnik"
+    "url": "https://github.com/maputnik/editor"
   },
   "author": "Lukas Martinelli",
   "license": "MIT",
-  "homepage": "https://github.com/maplibre/maputnik#readme",
+  "homepage": "https://github.com/maputnik/editor#readme",
   "dependencies": {
     "@mapbox/mapbox-gl-rtl-text": "^0.2.3",
-    "@maplibre/maplibre-gl-geocoder": "^1.6.0",
-    "@maplibre/maplibre-gl-inspect": "^1.6.3",
-    "@maplibre/maplibre-gl-style-spec": "^20.1.1",
-    "@mdi/js": "^7.4.47",
-    "@mdi/react": "^1.6.1",
-    "@typescript-eslint/eslint-plugin": "^7.3.1",
-    "@typescript-eslint/parser": "^7.3.1",
+    "@maplibre/maplibre-gl-style-spec": "^17.0.1",
+    "@mdi/js": "^6.6.96",
+    "@mdi/react": "^1.5.0",
     "array-move": "^4.0.0",
     "buffer": "^6.0.3",
-    "classnames": "^2.5.1",
+    "classnames": "^2.3.1",
     "codemirror": "^5.65.2",
     "color": "^4.2.3",
-    "cypress-plugin-tab": "^1.0.5",
     "detect-browser": "^5.3.0",
-    "events": "^3.3.0",
     "file-saver": "^2.0.5",
-    "i18next": "^23.12.2",
-    "i18next-browser-languagedetector": "^8.0.0",
-    "i18next-resources-to-backend": "^1.2.1",
-    "json-stringify-pretty-compact": "^4.0.0",
+    "json-stringify-pretty-compact": "^3.0.0",
     "json-to-ast": "^2.1.0",
     "jsonlint": "github:josdejong/jsonlint#85a19d7",
     "lodash": "^4.17.21",
@@ -53,30 +42,30 @@
     "lodash.get": "^4.4.2",
     "lodash.isequal": "^4.5.0",
     "lodash.throttle": "^4.1.1",
-    "maplibre-gl": "^4.1.2",
+    "mapbox-gl-inspect": "^1.3.1",
+    "maplibre-gl": "^2.4.0",
     "maputnik-design": "github:maputnik/design#172b06c",
     "ol": "^6.14.1",
     "ol-mapbox-style": "^7.1.1",
     "prop-types": "^15.8.1",
-    "react": "^18.2.0",
-    "react-accessible-accordion": "^5.0.0",
+    "react": "^16.0.0",
+    "react-accessible-accordion": "^4.0.0",
     "react-aria-menubutton": "^7.0.3",
-    "react-aria-modal": "^5.0.2",
+    "react-aria-modal": "^4.0.1",
     "react-autobind": "^1.0.6",
     "react-autocomplete": "^1.8.1",
     "react-collapse": "^5.1.1",
     "react-color": "^2.19.3",
-    "react-dom": "^18.2.0",
+    "react-dom": "^16.0.0",
     "react-file-reader-input": "^2.0.0",
-    "react-i18next": "^15.0.1",
     "react-icon-base": "^2.1.2",
-    "react-icons": "^5.0.1",
+    "react-icons": "^4.3.1",
     "react-sortable-hoc": "^2.0.0",
     "reconnecting-websocket": "^4.4.0",
-    "sass": "^1.72.0",
-    "slugify": "^1.6.6",
+    "sass": "^1.50.0",
+    "slugify": "^1.6.5",
     "string-hash": "^1.1.3",
-    "url": "^0.11.3"
+    "url": "^0.11.0"
   },
   "jshintConfig": {
     "esversion": 6
@@ -96,54 +85,52 @@
     }
   },
   "devDependencies": {
-    "@cypress/code-coverage": "^3.12.30",
-    "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@rollup/plugin-replace": "^5.0.5",
-    "@shellygo/cypress-test-utils": "^2.1.9",
+    "@shellygo/cypress-test-utils": "^2.0.9",
+    "@storybook/addon-a11y": "^7.6.5",
+    "@storybook/addon-actions": "^7.6.5",
+    "@storybook/addon-links": "^7.6.5",
+    "@storybook/addon-storysource": "^7.6.5",
+    "@storybook/addons": "^7.6.5",
+    "@storybook/builder-vite": "^7.6.5",
+    "@storybook/react": "^7.6.5",
+    "@storybook/react-vite": "^7.6.5",
+    "@storybook/theming": "^7.6.5",
     "@types/codemirror": "^5.60.15",
     "@types/color": "^3.0.6",
     "@types/cors": "^2.8.17",
     "@types/file-saver": "^2.0.7",
-    "@types/geojson": "^7946.0.14",
-    "@types/json-to-ast": "^2.1.4",
     "@types/lodash.capitalize": "^4.2.9",
-    "@types/lodash.clamp": "^4.0.9",
-    "@types/lodash.clonedeep": "^4.5.9",
-    "@types/lodash.get": "^4.4.9",
     "@types/lodash.isequal": "^4.5.8",
     "@types/lodash.throttle": "^4.1.9",
-    "@types/mocha": "^10.0.6",
-    "@types/randomcolor": "^0.5.9",
-    "@types/react": "^18.2.67",
-    "@types/react-aria-menubutton": "^6.2.14",
-    "@types/react-aria-modal": "^4.0.10",
-    "@types/react-autocomplete": "^1.8.10",
+    "@types/react": "^16.14.52",
+    "@types/react-aria-modal": "^4.0.9",
+    "@types/react-autocomplete": "^1.8.9",
     "@types/react-collapse": "^5.0.4",
-    "@types/react-color": "^3.0.12",
-    "@types/react-dom": "^18.2.22",
+    "@types/react-color": "^3.0.10",
+    "@types/react-dom": "^16.9.24",
     "@types/react-file-reader-input": "^2.0.4",
     "@types/react-icon-base": "^2.1.6",
-    "@types/string-hash": "^1.1.3",
-    "@types/uuid": "^9.0.8",
-    "@vitejs/plugin-react": "^4.2.1",
+    "@types/uuid": "^9.0.7",
+    "@vitejs/plugin-react": "^4.2.0",
     "cors": "^2.8.5",
-    "cypress": "^13.13.0",
-    "eslint": "^8.57.0",
-    "eslint-plugin-react": "^7.34.1",
+    "cypress": "^13.6.1",
+    "eslint": "^8.53.0",
+    "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.4.6",
-    "i18next-parser": "^9.0.1",
+    "eslint-plugin-react-refresh": "^0.4.4",
+    "express": "^4.17.3",
     "istanbul": "^0.4.5",
-    "istanbul-lib-coverage": "^3.2.2",
-    "mocha": "^10.3.0",
-    "postcss": "^8.4.38",
-    "react-hot-loader": "^4.13.1",
-    "stylelint": "^16.2.1",
-    "stylelint-config-recommended-scss": "^14.0.0",
-    "stylelint-scss": "^6.2.1",
-    "typescript": "^5.4.3",
-    "uuid": "^9.0.1",
-    "vite": "^5.2.6",
-    "vite-plugin-istanbul": "^6.0.0"
+    "istanbul-lib-coverage": "^3.2.0",
+    "mocha": "^9.2.2",
+    "postcss": "^8.4.12",
+    "react-hot-loader": "^4.13.0",
+    "storybook": "^7.6.5",
+    "stylelint": "^14.6.1",
+    "stylelint-config-recommended-scss": "^6.0.0",
+    "stylelint-scss": "^4.2.0",
+    "typescript": "^5.3.3",
+    "uuid": "^8.3.2",
+    "vite": "^5.0.0"
   }
 }

src/components/App.jsx

@@ -1,4 +1,3 @@
-// @ts-ignore - this can be easily replaced with arrow functions
 import autoBind from 'react-autobind';
 import React from 'react'
 import cloneDeep from 'lodash.clonedeep'
@@ -7,15 +6,14 @@ import buffer from 'buffer'
 import get from 'lodash.get'
 import {unset} from 'lodash'
 import {arrayMoveMutable} from 'array-move'
+import url from 'url'
 import hash from "string-hash";
-import {Map, LayerSpecification, StyleSpecification, ValidationError, SourceSpecification} from 'maplibre-gl'
-import {latest, validateStyleMin} from '@maplibre/maplibre-gl-style-spec'
 
 import MapMaplibreGl from './MapMaplibreGl'
 import MapOpenLayers from './MapOpenLayers'
 import LayerList from './LayerList'
 import LayerEditor from './LayerEditor'
-import AppToolbar, { MapState } from './AppToolbar'
+import AppToolbar from './AppToolbar'
 import AppLayout from './AppLayout'
 import MessagePanel from './AppMessagePanel'
 
@@ -24,9 +22,11 @@ import ModalExport from './ModalExport'
 import ModalSources from './ModalSources'
 import ModalOpen from './ModalOpen'
 import ModalShortcuts from './ModalShortcuts'
+import ModalSurvey from './ModalSurvey'
 import ModalDebug from './ModalDebug'
 
-import {downloadGlyphsMetadata, downloadSpriteMetadata} from '../libs/metadata'
+import { downloadGlyphsMetadata, downloadSpriteMetadata } from '../libs/metadata'
+import {latest, validate} from '@maplibre/maplibre-gl-style-spec'
 import style from '../libs/style'
 import { initialStyleUrl, loadStyleUrl, removeStyleQuerystring } from '../libs/urlopen'
 import { undoMessages, redoMessages } from '../libs/diffmessage'
@@ -37,13 +37,12 @@ import LayerWatcher from '../libs/layerwatcher'
 import tokens from '../config/tokens.json'
 import isEqual from 'lodash.isequal'
 import Debug from '../libs/debug'
-import { SortEnd } from 'react-sortable-hoc';
-import { MapOptions } from 'maplibre-gl';
+import {formatLayerId} from '../util/format';
 
 // Buffer must be defined globally for @maplibre/maplibre-gl-style-spec validate() function to succeed.
 window.Buffer = buffer.Buffer;
 
-function setFetchAccessToken(url: string, mapStyle: StyleSpecification) {
+function setFetchAccessToken(url, mapStyle) {
   const matchesTilehosting = url.match(/\.tilehosting\.com/);
   const matchesMaptiler = url.match(/\.maptiler\.com/);
   const matchesThunderforest = url.match(/\.thunderforest\.com/);
@@ -64,7 +63,7 @@ function setFetchAccessToken(url: string, mapStyle: StyleSpecification) {
   }
 }
 
-function updateRootSpec(spec: any, fieldName: string, newValues: any) {
+function updateRootSpec(spec, fieldName, newValues) {
   return {
     ...spec,
     $root: {
@@ -77,73 +76,15 @@ function updateRootSpec(spec: any, fieldName: string, newValues: any) {
   }
 }
 
-type OnStyleChangedOpts = {
-  save?: boolean
-  addRevision?: boolean
-  initialLoad?: boolean
-}
-
-type MappedErrors = {
-  message: string
-  parsed?: {
-    type: string
-    data: {
-      index: number
-      key: string
-      message: string
-    }
-  }
-}
-
-type AppState = {
-  errors: MappedErrors[],
-  infos: string[],
-  mapStyle: StyleSpecification & {id: string},
-  dirtyMapStyle?: StyleSpecification,
-  selectedLayerIndex: number,
-  selectedLayerOriginalId?: string,
-  sources: {[key: string]: SourceSpecification},
-  vectorLayers: {},
-  spec: any,
-  mapView: {
-    zoom: number,
-    center: {
-      lng: number,
-      lat: number,
-    },
-  },
-  maplibreGlDebugOptions: Partial<MapOptions> & {
-    showTileBoundaries: boolean,
-    showCollisionBoxes: boolean,
-    showOverdrawInspector: boolean,
-  },
-  openlayersDebugOptions: {
-    debugToolbox: boolean,
-  },
-  mapState: MapState
-  isOpen: {
-    settings: boolean
-    sources: boolean
-    open: boolean
-    shortcuts: boolean
-    export: boolean
-    debug: boolean
-  }
-}
-
-export default class App extends React.Component<any, AppState> {
-  revisionStore: RevisionStore;
-  styleStore: StyleStore | ApiStyleStore;
-  layerWatcher: LayerWatcher;
-
-  constructor(props: any) {
+export default class App extends React.Component {
+  constructor(props) {
     super(props)
     autoBind(this);
 
     this.revisionStore = new RevisionStore()
     const params = new URLSearchParams(window.location.search.substring(1))
     let port = params.get("localport")
-    if (port == null && (window.location.port !== "80" && window.location.port !== "443")) {
+    if (port == null && (window.location.port != 80 && window.location.port != 443)) {
       port = window.location.port
     }
     this.styleStore = new ApiStyleStore({
@@ -195,7 +136,7 @@ export default class App extends React.Component<any, AppState> {
       {
         key: "m",
         handler: () => {
-          (document.querySelector(".maplibregl-canvas") as HTMLCanvasElement).focus();
+          document.querySelector(".maplibregl-canvas").focus();
         }
       },
       {
@@ -208,7 +149,7 @@ export default class App extends React.Component<any, AppState> {
 
     document.body.addEventListener("keyup", (e) => {
       if(e.key === "Escape") {
-        (e.target as HTMLElement).blur();
+        e.target.blur();
         document.body.focus();
       }
       else if(this.state.isOpen.shortcuts || document.activeElement === document.body) {
@@ -218,7 +159,7 @@ export default class App extends React.Component<any, AppState> {
 
         if(shortcut) {
           this.setModal("shortcuts", false);
-          shortcut.handler();
+          shortcut.handler(e);
         }
       }
     })
@@ -251,6 +192,8 @@ export default class App extends React.Component<any, AppState> {
       Debug.set("maputnik", "styleStore", this.styleStore);
     }
 
+    const queryObj = url.parse(window.location.href, true).query;
+
     this.state = {
       errors: [],
       infos: [],
@@ -274,6 +217,7 @@ export default class App extends React.Component<any, AppState> {
         shortcuts: false,
         export: false,
         // TODO: Disabled for now, this should be opened on the Nth visit to the editor
+        survey: false,
         debug: false,
       },
       maplibreGlDebugOptions: {
@@ -291,25 +235,25 @@ export default class App extends React.Component<any, AppState> {
     })
   }
 
-  handleKeyPress = (e: KeyboardEvent) => {
+  handleKeyPress = (e) => {
     if(navigator.platform.toUpperCase().indexOf('MAC') >= 0) {
       if(e.metaKey && e.shiftKey && e.keyCode === 90) {
         e.preventDefault();
-        this.onRedo();
+        this.onRedo(e);
       }
       else if(e.metaKey && e.keyCode === 90) {
         e.preventDefault();
-        this.onUndo();
+        this.onUndo(e);
       }
     }
     else {
       if(e.ctrlKey && e.keyCode === 90) {
         e.preventDefault();
-        this.onUndo();
+        this.onUndo(e);
       }
       else if(e.ctrlKey && e.keyCode === 89) {
         e.preventDefault();
-        this.onRedo();
+        this.onRedo(e);
       }
     }
   }
@@ -322,27 +266,27 @@ export default class App extends React.Component<any, AppState> {
     window.removeEventListener("keydown", this.handleKeyPress);
   }
 
-  saveStyle(snapshotStyle: StyleSpecification & {id: string}) {
+  saveStyle(snapshotStyle) {
     this.styleStore.save(snapshotStyle)
   }
 
-  updateFonts(urlTemplate: string) {
-    const metadata: {[key: string]: string} = this.state.mapStyle.metadata || {} as any
+  updateFonts(urlTemplate) {
+    const metadata = this.state.mapStyle.metadata || {}
     const accessToken = metadata['maputnik:openmaptiles_access_token'] || tokens.openmaptiles
 
-    const glyphUrl = (typeof urlTemplate === 'string')? urlTemplate.replace('{key}', accessToken): urlTemplate;
+    let glyphUrl = (typeof urlTemplate === 'string')? urlTemplate.replace('{key}', accessToken): urlTemplate;
     downloadGlyphsMetadata(glyphUrl, fonts => {
       this.setState({ spec: updateRootSpec(this.state.spec, 'glyphs', fonts)})
     })
   }
 
-  updateIcons(baseUrl: string) {
+  updateIcons(baseUrl) {
     downloadSpriteMetadata(baseUrl, icons => {
       this.setState({ spec: updateRootSpec(this.state.spec, 'sprite', icons)})
     })
   }
 
-  onChangeMetadataProperty = (property: string, value: any) => {
+  onChangeMetadataProperty = (property, value) => {
     // If we're changing renderer reset the map state.
     if (
       property === 'maputnik:renderer' &&
@@ -356,14 +300,14 @@ export default class App extends React.Component<any, AppState> {
     const changedStyle = {
       ...this.state.mapStyle,
       metadata: {
-        ...(this.state.mapStyle as any).metadata,
+        ...this.state.mapStyle.metadata,
         [property]: value
       }
     }
     this.onStyleChanged(changedStyle)
   }
 
-  onStyleChanged = (newStyle: StyleSpecification & {id: string}, opts: OnStyleChangedOpts={}) => {
+  onStyleChanged = (newStyle, opts={}) => {
     opts = {
       save: true,
       addRevision: true,
@@ -375,15 +319,16 @@ export default class App extends React.Component<any, AppState> {
       this.getInitialStateFromUrl(newStyle);
     }
 
-    const errors: ValidationError[] = validateStyleMin(newStyle) || [];
+    const errors = validate(newStyle, latest) || [];
 
     // The validate function doesn't give us errors for duplicate error with
     // empty string for layer.id, manually deal with that here.
-    const layerErrors: (Error | ValidationError)[] = [];
+    const layerErrors = [];
     if (newStyle && newStyle.layers) {
-      const foundLayers = new global.Map();
+      const foundLayers = new Map();
       newStyle.layers.forEach((layer, index) => {
         if (layer.id === "" && foundLayers.has(layer.id)) {
+          const message = `Duplicate layer: ${formatLayerId(layer.id)}`;
           const error = new Error(
             `layers[${index}]: duplicate layer id [empty_string], previously used`
           );
@@ -397,7 +342,7 @@ export default class App extends React.Component<any, AppState> {
       // Special case: Duplicate layer id
       const dupMatch = error.message.match(/layers\[(\d+)\]: (duplicate layer id "?(.*)"?, previously used)/);
       if (dupMatch) {
-        const [, index, message] = dupMatch;
+        const [matchStr, index, message] = dupMatch;
         return {
           message: error.message,
           parsed: {
@@ -414,7 +359,7 @@ export default class App extends React.Component<any, AppState> {
       // Special case: Invalid source
       const invalidSourceMatch = error.message.match(/layers\[(\d+)\]: (source "(?:.*)" not found)/);
       if (invalidSourceMatch) {
-        const [, index, message] = invalidSourceMatch;
+        const [matchStr, index, message] = invalidSourceMatch;
         return {
           message: error.message,
           parsed: {
@@ -430,7 +375,7 @@ export default class App extends React.Component<any, AppState> {
 
       const layerMatch = error.message.match(/layers\[(\d+)\]\.(?:(\S+)\.)?(\S+): (.*)/);
       if (layerMatch) {
-        const [, index, group, property, message] = layerMatch;
+        const [matchStr, index, group, property, message] = layerMatch;
         const key = (group && property) ? [group, property].join(".") : property;
         return {
           message: error.message,
@@ -451,7 +396,7 @@ export default class App extends React.Component<any, AppState> {
       }
     });
 
-    let dirtyMapStyle: StyleSpecification | undefined = undefined;
+    let dirtyMapStyle = undefined;
     if (errors.length > 0) {
       dirtyMapStyle = cloneDeep(newStyle);
 
@@ -461,7 +406,7 @@ export default class App extends React.Component<any, AppState> {
           try {
             const objPath = message.split(":")[0];
             // Errors can be deply nested for example 'layers[0].filter[1][1][0]' we only care upto the property 'layers[0].filter'
-            const unsetPath = objPath.match(/^\S+?\[\d+\]\.[^[]+/)![0];
+            const unsetPath = objPath.match(/^\S+?\[\d+\]\.[^\[]+/)[0];
             unset(dirtyMapStyle, unsetPath);
           }
           catch (err) {
@@ -472,17 +417,17 @@ export default class App extends React.Component<any, AppState> {
     }
 
     if(newStyle.glyphs !== this.state.mapStyle.glyphs) {
-      this.updateFonts(newStyle.glyphs as string)
+      this.updateFonts(newStyle.glyphs)
     }
     if(newStyle.sprite !== this.state.mapStyle.sprite) {
-      this.updateIcons(newStyle.sprite as string)
+      this.updateIcons(newStyle.sprite)
     }
 
     if (opts.addRevision) {
       this.revisionStore.addRevision(newStyle);
     }
     if (opts.save) {
-      this.saveStyle(newStyle as StyleSpecification & {id: string});
+      this.saveStyle(newStyle);
     }
 
     this.setState({
@@ -515,7 +460,7 @@ export default class App extends React.Component<any, AppState> {
     })
   }
 
-  onMoveLayer = (move: SortEnd) => {
+  onMoveLayer = (move) => {
     let { oldIndex, newIndex } = move;
     let layers = this.state.mapStyle.layers;
     oldIndex = clamp(oldIndex, 0, layers.length-1);
@@ -533,7 +478,7 @@ export default class App extends React.Component<any, AppState> {
     this.onLayersChange(layers);
   }
 
-  onLayersChange = (changedLayers: LayerSpecification[]) => {
+  onLayersChange = (changedLayers) => {
     const changedStyle = {
       ...this.state.mapStyle,
       layers: changedLayers
@@ -541,15 +486,15 @@ export default class App extends React.Component<any, AppState> {
     this.onStyleChanged(changedStyle)
   }
 
-  onLayerDestroy = (index: number) => {
-    const layers = this.state.mapStyle.layers;
+  onLayerDestroy = (index) => {
+    let layers = this.state.mapStyle.layers;
     const remainingLayers = layers.slice(0);
     remainingLayers.splice(index, 1);
     this.onLayersChange(remainingLayers);
   }
 
-  onLayerCopy = (index: number) => {
-    const layers = this.state.mapStyle.layers;
+  onLayerCopy = (index) => {
+    let layers = this.state.mapStyle.layers;
     const changedLayers = layers.slice(0)
 
     const clonedLayer = cloneDeep(changedLayers[index])
@@ -558,8 +503,8 @@ export default class App extends React.Component<any, AppState> {
     this.onLayersChange(changedLayers)
   }
 
-  onLayerVisibilityToggle = (index: number) => {
-    const layers = this.state.mapStyle.layers;
+  onLayerVisibilityToggle = (index) => {
+    let layers = this.state.mapStyle.layers;
     const changedLayers = layers.slice(0)
 
     const layer = { ...changedLayers[index] }
@@ -572,7 +517,7 @@ export default class App extends React.Component<any, AppState> {
   }
 
 
-  onLayerIdChange = (index: number, _oldId: string, newId: string) => {
+  onLayerIdChange = (index, oldId, newId) => {
     const changedLayers = this.state.mapStyle.layers.slice(0)
     changedLayers[index] = {
       ...changedLayers[index],
@@ -582,26 +527,26 @@ export default class App extends React.Component<any, AppState> {
     this.onLayersChange(changedLayers)
   }
 
-  onLayerChanged = (index: number, layer: LayerSpecification) => {
+  onLayerChanged = (index, layer) => {
     const changedLayers = this.state.mapStyle.layers.slice(0)
     changedLayers[index] = layer
 
     this.onLayersChange(changedLayers)
   }
 
-  setMapState = (newState: MapState) => {
+  setMapState = (newState) => {
     this.setState({
       mapState: newState
     }, this.setStateInUrl);
   }
 
-  setDefaultValues = (styleObj: StyleSpecification & {id: string}) => {
-    const metadata: {[key: string]: string} = styleObj.metadata || {} as any
+  setDefaultValues = (styleObj) => {
+    const metadata = styleObj.metadata || {}
     if(metadata['maputnik:renderer'] === undefined) {
       const changedStyle = {
         ...styleObj,
         metadata: {
-          ...styleObj.metadata as any,
+          ...styleObj.metadata,
           'maputnik:renderer': 'mlgljs'
         }
       }
@@ -611,19 +556,19 @@ export default class App extends React.Component<any, AppState> {
     }
   }
 
-  openStyle = (styleObj: StyleSpecification & {id: string}) => {
+  openStyle = (styleObj) => {
     styleObj = this.setDefaultValues(styleObj)
     this.onStyleChanged(styleObj)
   }
 
   fetchSources() {
-    const sourceList: {[key: string]: any} = {};
+    const sourceList = {};
 
-    for(const [key, val] of Object.entries(this.state.mapStyle.sources)) {
+    for(let [key, val] of Object.entries(this.state.mapStyle.sources)) {
       if(
-        !Object.prototype.hasOwnProperty.call(this.state.sources, key) &&
+        !this.state.sources.hasOwnProperty(key) &&
         val.type === "vector" &&
-        Object.prototype.hasOwnProperty.call(val, "url")
+        val.hasOwnProperty("url")
       ) {
         sourceList[key] = {
           type: val.type,
@@ -633,18 +578,18 @@ export default class App extends React.Component<any, AppState> {
         let url = val.url;
 
         try {
-          url = setFetchAccessToken(url!, this.state.mapStyle)
+          url = setFetchAccessToken(url, this.state.mapStyle)
         } catch(err) {
           console.warn("Failed to setFetchAccessToken: ", err);
         }
 
-        fetch(url!, {
+        fetch(url, {
           mode: 'cors',
         })
         .then(response => response.json())
         .then(json => {
 
-            if(!Object.prototype.hasOwnProperty.call(json, "vector_layers")) {
+          if(!json.hasOwnProperty("vector_layers")) {
             return;
           }
 
@@ -653,8 +598,8 @@ export default class App extends React.Component<any, AppState> {
             [key]: this.state.sources[key],
           });
 
-            for(const layer of json.vector_layers) {
-              (sources[key] as any).layers.push(layer.id)
+          for(let layer of json.vector_layers) {
+            sources[key].layers.push(layer.id)
           }
 
           console.debug("Updating source: "+key);
@@ -680,17 +625,11 @@ export default class App extends React.Component<any, AppState> {
   }
 
   _getRenderer () {
-    const metadata: {[key:string]: string} = this.state.mapStyle.metadata || {} as any;
+    const metadata = this.state.mapStyle.metadata || {};
     return metadata['maputnik:renderer'] || 'mlgljs';
   }
 
-  onMapChange = (mapView: {
-    zoom: number,
-    center: {
-      lng: number,
-      lat: number,
-    },
-  }) => {
+  onMapChange = (mapView) => {
     this.setState({
       mapView,
     });
@@ -698,15 +637,16 @@ export default class App extends React.Component<any, AppState> {
 
   mapRenderer() {
     const {mapStyle, dirtyMapStyle} = this.state;
+    const metadata = this.state.mapStyle.metadata || {};
 
     const mapProps = {
       mapStyle: (dirtyMapStyle || mapStyle),
-      replaceAccessTokens: (mapStyle: StyleSpecification) => {
+      replaceAccessTokens: (mapStyle) => {
         return style.replaceAccessTokens(mapStyle, {
           allowFallback: true
         });
       },
-      onDataChange: (e: {map: Map}) => {
+      onDataChange: (e) => {
         this.layerWatcher.analyzeMap(e.map)
         this.fetchSources();
       },
@@ -737,7 +677,7 @@ export default class App extends React.Component<any, AppState> {
     if(this.state.mapState.match(/^filter-/)) {
       filterName = this.state.mapState.replace(/^filter-/, "");
     }
-    const elementStyle: {filter?: string} = {};
+    const elementStyle = {};
     if (filterName) {
       elementStyle.filter = `url('#${filterName}')`;
     }
@@ -775,12 +715,12 @@ export default class App extends React.Component<any, AppState> {
     history.replaceState({selectedLayerIndex}, "Maputnik", url.href);
   }
 
-  getInitialStateFromUrl = (mapStyle: StyleSpecification) => {
+  getInitialStateFromUrl = (mapStyle) => {
     const url = new URL(location.href);
     const modalParam = url.searchParams.get("modal");
     if (modalParam && modalParam !== "") {
       const modals = modalParam.split(",");
-      const modalObj: {[key: string]: boolean} = {};
+      const modalObj = {};
       modals.forEach(modalName => {
         modalObj[modalName] = true;
       });
@@ -795,7 +735,7 @@ export default class App extends React.Component<any, AppState> {
 
     const view = url.searchParams.get("view");
     if (view && view !== "") {
-      this.setMapState(view as MapState);
+      this.setMapState(view);
     }
 
     const path = url.searchParams.get("layer");
@@ -827,14 +767,18 @@ export default class App extends React.Component<any, AppState> {
     }
   }
 
-  onLayerSelect = (index: number) => {
+  onLayerSelect = (index) => {
     this.setState({
       selectedLayerIndex: index,
       selectedLayerOriginalId: this.state.mapStyle.layers[index].id,
     }, this.setStateInUrl);
   }
 
-  setModal(modalName: keyof AppState["isOpen"], value: boolean) {
+  setModal(modalName, value) {
+    if(modalName === 'survey' && value === false) {
+      localStorage.setItem('survey', '');
+    }
+
     this.setState({
       isOpen: {
         ...this.state.isOpen,
@@ -843,11 +787,11 @@ export default class App extends React.Component<any, AppState> {
     }, this.setStateInUrl)
   }
 
-  toggleModal(modalName: keyof AppState["isOpen"]) {
+  toggleModal(modalName) {
     this.setModal(modalName, !this.state.isOpen[modalName]);
   }
 
-  onChangeOpenlayersDebug = (key: keyof AppState["openlayersDebugOptions"], value: boolean) => {
+  onChangeOpenlayersDebug = (key, value) => {
     this.setState({
       openlayersDebugOptions: {
         ...this.state.openlayersDebugOptions,
@@ -856,7 +800,7 @@ export default class App extends React.Component<any, AppState> {
     });
   }
 
-  onChangeMaplibreGlDebug = (key: keyof AppState["maplibreGlDebugOptions"], value: any) => {
+  onChangeMaplibreGlDebug = (key, value) => {
     this.setState({
       maplibreGlDebugOptions: {
         ...this.state.maplibreGlDebugOptions,
@@ -867,7 +811,8 @@ export default class App extends React.Component<any, AppState> {
 
   render() {
     const layers = this.state.mapStyle.layers || []
-    const selectedLayer = layers.length > 0 ? layers[this.state.selectedLayerIndex] : undefined
+    const selectedLayer = layers.length > 0 ? layers[this.state.selectedLayerIndex] : null
+    const metadata = this.state.mapStyle.metadata || {}
 
     const toolbar = <AppToolbar
       renderer={this._getRenderer()}
@@ -910,7 +855,7 @@ export default class App extends React.Component<any, AppState> {
       onLayerVisibilityToggle={this.onLayerVisibilityToggle}
       onLayerIdChange={this.onLayerIdChange}
       errors={this.state.errors}
-    /> : undefined
+    /> : null
 
     const bottomPanel = (this.state.errors.length + this.state.infos.length) > 0 ? <MessagePanel
       currentLayer={selectedLayer}
@@ -919,7 +864,7 @@ export default class App extends React.Component<any, AppState> {
       mapStyle={this.state.mapStyle}
       errors={this.state.errors}
       infos={this.state.infos}
-    /> : undefined
+    /> : null
 
 
     const modals = <div>
@@ -934,6 +879,7 @@ export default class App extends React.Component<any, AppState> {
         mapView={this.state.mapView}
       />
       <ModalShortcuts
+        ref={(el) => this.shortcutEl = el}
         isOpen={this.state.isOpen.shortcuts}
         onOpenToggle={this.toggleModal.bind(this, 'shortcuts')}
       />
@@ -943,6 +889,7 @@ export default class App extends React.Component<any, AppState> {
         onChangeMetadataProperty={this.onChangeMetadataProperty}
         isOpen={this.state.isOpen.settings}
         onOpenToggle={this.toggleModal.bind(this, 'settings')}
+        openlayersDebugOptions={this.state.openlayersDebugOptions}
       />
       <ModalExport
         mapStyle={this.state.mapStyle}
@@ -961,6 +908,10 @@ export default class App extends React.Component<any, AppState> {
         isOpen={this.state.isOpen.sources}
         onOpenToggle={this.toggleModal.bind(this, 'sources')}
       />
+      <ModalSurvey
+        isOpen={this.state.isOpen.survey}
+        onOpenToggle={this.toggleModal.bind(this, 'survey')}
+      />
     </div>
 
     return <AppLayout

src/components/AppLayout.tsx

@@ -1,18 +1,17 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import ScrollContainer from './ScrollContainer'
-import { WithTranslation, withTranslation } from 'react-i18next';
 
-type AppLayoutInternalProps = {
+type AppLayoutProps = {
   toolbar: React.ReactElement
   layerList: React.ReactElement
   layerEditor?: React.ReactElement
   map: React.ReactElement
   bottom?: React.ReactElement
   modals?: React.ReactNode
-} & WithTranslation;
+};
 
-class AppLayoutInternal extends React.Component<AppLayoutInternalProps> {
+class AppLayout extends React.Component<AppLayoutProps> {
   static childContextTypes = {
     reactIconBase: PropTypes.object
   }
@@ -24,11 +23,8 @@ class AppLayoutInternal extends React.Component<AppLayoutInternalProps> {
   }
 
   render() {
-    document.body.dir = this.props.i18n.dir();
-
     return <div className="maputnik-layout">
       {this.props.toolbar}
-      <div className="maputnik-layout-main">
       <div className="maputnik-layout-list">
         {this.props.layerList}
       </div>
@@ -38,7 +34,6 @@ class AppLayoutInternal extends React.Component<AppLayoutInternalProps> {
         </ScrollContainer>
       </div>
       {this.props.map}
-      </div>
       {this.props.bottom && <div className="maputnik-layout-bottom">
           {this.props.bottom}
         </div>
@@ -48,5 +43,4 @@ class AppLayoutInternal extends React.Component<AppLayoutInternalProps> {
   }
 }
 
-const AppLayout = withTranslation()(AppLayoutInternal);
-export default AppLayout;
+export default AppLayout

src/components/AppMessagePanel.tsx

@@ -1,24 +1,23 @@
 import React from 'react'
-import {formatLayerId} from '../libs/format';
-import {LayerSpecification, StyleSpecification} from 'maplibre-gl';
-import { Trans, WithTranslation, withTranslation } from 'react-i18next';
+import {formatLayerId} from '../util/format';
+import { StyleSpecification } from '@maplibre/maplibre-gl-style-spec';
 
-type AppMessagePanelInternalProps = {
+type AppMessagePanelProps = {
   errors?: unknown[]
-  infos?: string[]
+  infos?: unknown[]
   mapStyle?: StyleSpecification
   onLayerSelect?(...args: unknown[]): unknown
-  currentLayer?: LayerSpecification
+  currentLayer?: object
   selectedLayerIndex?: number
-} & WithTranslation;
+};
 
-class AppMessagePanelInternal extends React.Component<AppMessagePanelInternalProps> {
+export default class AppMessagePanel extends React.Component<AppMessagePanelProps> {
   static defaultProps = {
     onLayerSelect: () => {},
   }
 
   render() {
-    const {t, selectedLayerIndex} = this.props;
+    const {selectedLayerIndex} = this.props;
     const errors = this.props.errors?.map((error: any, idx) => {
       let content;
       if (error.parsed && error.parsed.type === "layer") {
@@ -26,9 +25,7 @@ class AppMessagePanelInternal extends React.Component<AppMessagePanelInternalPro
         const layerId = this.props.mapStyle?.layers[parsed.data.index].id;
         content = (
           <>
-            <Trans t={t}>
             Layer <span>{formatLayerId(layerId)}</span>: {parsed.data.message}
-            </Trans>
             {selectedLayerIndex !== parsed.data.index &&
               <>
                 &nbsp;&mdash;&nbsp;
@@ -36,7 +33,7 @@ class AppMessagePanelInternal extends React.Component<AppMessagePanelInternalPro
                   className="maputnik-message-panel__switch-button"
                   onClick={() => this.props.onLayerSelect!(parsed.data.index)}
                 >
-                  {t("switch to layer")}
+                  switch to layer
                 </button>
               </>
             }
@@ -62,5 +59,3 @@ class AppMessagePanelInternal extends React.Component<AppMessagePanelInternalPro
   }
 }
 
-const AppMessagePanel = withTranslation()(AppMessagePanelInternal);
-export default AppMessagePanel;

src/components/AppToolbar.tsx

@@ -2,12 +2,9 @@ import React from 'react'
 import classnames from 'classnames'
 import {detect} from 'detect-browser';
 
-import {MdFileDownload, MdOpenInBrowser, MdSettings, MdLayers, MdHelpOutline, MdFindInPage, MdLanguage} from 'react-icons/md'
+import {MdFileDownload, MdOpenInBrowser, MdSettings, MdLayers, MdHelpOutline, MdFindInPage, MdAssignmentTurnedIn} from 'react-icons/md'
 import pkgJson from '../../package.json'
-//@ts-ignore
-import maputnikLogo from 'maputnik-design/logos/logo-color.svg?inline'
-import { withTranslation, WithTranslation } from 'react-i18next';
-import { supportedLanguages } from '../i18n';
+
 
 // This is required because of <https://stackoverflow.com/a/49846426>, there isn't another way to detect support that I'm aware of.
 const browser = detect();
@@ -39,13 +36,34 @@ class ToolbarLink extends React.Component<ToolbarLinkProps> {
       href={this.props.href}
       rel="noopener noreferrer"
       target="_blank"
-      data-wd-key="toolbar:link"
     >
       {this.props.children}
     </a>
   }
 }
 
+type ToolbarLinkHighlightedProps = {
+  className?: string
+  children?: React.ReactNode
+  href?: string
+  onToggleModal?(...args: unknown[]): unknown
+};
+
+class ToolbarLinkHighlighted extends React.Component<ToolbarLinkHighlightedProps> {
+  render() {
+    return <a
+      className={classnames('maputnik-toolbar-link', "maputnik-toolbar-link--highlighted", this.props.className)}
+      href={this.props.href}
+      rel="noopener noreferrer"
+      target="_blank"
+    >
+      <span className="maputnik-toolbar-link-wrapper">
+        {this.props.children}
+      </span>
+    </a>
+  }
+}
+
 type ToolbarSelectProps = {
   children?: React.ReactNode
   wdKey?: string
@@ -80,9 +98,7 @@ class ToolbarAction extends React.Component<ToolbarActionProps> {
   }
 }
 
-export type MapState = "map" | "inspect" | "filter-achromatopsia" | "filter-deuteranopia" | "filter-protanopia" | "filter-tritanopia";
-
-type AppToolbarInternalProps = {
+type AppToolbarProps = {
   mapStyle: object
   inspectModeEnabled: boolean
   onStyleChanged(...args: unknown[]): unknown
@@ -92,12 +108,12 @@ type AppToolbarInternalProps = {
   sources: object
   children?: React.ReactNode
   onToggleModal(...args: unknown[]): unknown
-  onSetMapState(mapState: MapState): unknown
-  mapState?: MapState
+  onSetMapState(...args: unknown[]): unknown
+  mapState?: string
   renderer?: string
-} & WithTranslation;
+};
 
-class AppToolbarInternal extends React.Component<AppToolbarInternalProps> {
+export default class AppToolbar extends React.Component<AppToolbarProps> {
   state = {
     isOpen: {
       settings: false,
@@ -108,14 +124,10 @@ class AppToolbarInternal extends React.Component<AppToolbarInternalProps> {
     }
   }
 
-  handleSelection(val: MapState) {
+  handleSelection(val: string | undefined) {
     this.props.onSetMapState(val);
   }
 
-  handleLanguageChange(val: string) {
-    this.props.i18n.changeLanguage(val);
-  }
-
   onSkip = (target: string) => {
     if (target === "map") {
       (document.querySelector(".maplibregl-canvas") as HTMLCanvasElement).focus();
@@ -127,41 +139,40 @@ class AppToolbarInternal extends React.Component<AppToolbarInternalProps> {
   }
 
   render() {
-    const t = this.props.t;
     const views = [
       {
         id: "map",
         group: "general",
-        title: t("Map"),
+        title: "Map",
       },
       {
         id: "inspect",
         group: "general",
-        title: t("Inspect"),
+        title: "Inspect",
         disabled: this.props.renderer === 'ol',
       },
       {
         id: "filter-deuteranopia",
         group: "color-accessibility",
-        title: t("Deuteranopia filter"),
+        title: "Deuteranopia filter",
         disabled: !colorAccessibilityFiltersEnabled,
       },
       {
         id: "filter-protanopia",
         group: "color-accessibility",
-        title: t("Protanopia filter"),
+        title: "Protanopia filter",
         disabled: !colorAccessibilityFiltersEnabled,
       },
       {
         id: "filter-tritanopia",
         group: "color-accessibility",
-        title: t("Tritanopia filter"),
+        title: "Tritanopia filter",
         disabled: !colorAccessibilityFiltersEnabled,
       },
       {
         id: "filter-achromatopsia",
         group: "color-accessibility",
-        title: t("Achromatopsia filter"),
+        title: "Achromatopsia filter",
         disabled: !colorAccessibilityFiltersEnabled,
       },
     ];
@@ -181,29 +192,29 @@ class AppToolbarInternal extends React.Component<AppToolbarInternalProps> {
             className="maputnik-toolbar-skip"
             onClick={_e => this.onSkip("layer-list")}
           >
-            {t("Layers list")}
+            Layers list
           </button>
           <button
             data-wd-key="root:skip:layer-editor"
             className="maputnik-toolbar-skip"
             onClick={_e => this.onSkip("layer-editor")}
           >
-            {t("Layer editor")}
+            Layer editor
           </button>
           <button
             data-wd-key="root:skip:map-view"
             className="maputnik-toolbar-skip"
             onClick={_e => this.onSkip("map")}
           >
-            {t("Map view")}
+            Map view
           </button>
           <a
             className="maputnik-toolbar-logo"
             target="blank"
             rel="noreferrer noopener"
-            href="https://github.com/maplibre/maputnik"
+            href="https://github.com/maputnik/editor"
           >
-            <img src={maputnikLogo} alt={t("Maputnik on GitHub")} />
+            <img src="node_modules/maputnik-design/logos/logo-color.svg" />
             <h1>
               <span className="maputnik-toolbar-name">{pkgJson.name}</span>
               <span className="maputnik-toolbar-version">v{pkgJson.version}</span>
@@ -213,28 +224,28 @@ class AppToolbarInternal extends React.Component<AppToolbarInternalProps> {
         <div className="maputnik-toolbar__actions" role="navigation" aria-label="Toolbar">
           <ToolbarAction wdKey="nav:open" onClick={this.props.onToggleModal.bind(this, 'open')}>
             <MdOpenInBrowser />
-            <IconText>{t("Open")}</IconText>
+            <IconText>Open</IconText>
           </ToolbarAction>
           <ToolbarAction wdKey="nav:export" onClick={this.props.onToggleModal.bind(this, 'export')}>
             <MdFileDownload />
-            <IconText>{t("Export")}</IconText>
+            <IconText>Export</IconText>
           </ToolbarAction>
           <ToolbarAction wdKey="nav:sources" onClick={this.props.onToggleModal.bind(this, 'sources')}>
             <MdLayers />
-            <IconText>{t("Data Sources")}</IconText>
+            <IconText>Data Sources</IconText>
           </ToolbarAction>
           <ToolbarAction wdKey="nav:settings" onClick={this.props.onToggleModal.bind(this, 'settings')}>
             <MdSettings />
-            <IconText>{t("Style Settings")}</IconText>
+            <IconText>Style Settings</IconText>
           </ToolbarAction>
 
           <ToolbarSelect wdKey="nav:inspect">
             <MdFindInPage />
-            <label>{t("View")}
+            <label>View
               <select
                 className="maputnik-select"
                 data-wd-key="maputnik-select"
-                onChange={(e) => this.handleSelection(e.target.value as MapState)}
+                onChange={(e) => this.handleSelection(e.target.value)}
                 value={currentView?.id}
               >
                 {views.filter(v => v.group === "general").map((item) => {
@@ -244,7 +255,7 @@ class AppToolbarInternal extends React.Component<AppToolbarInternalProps> {
                     </option>
                   );
                 })}
-                <optgroup label={t("Color accessibility")}>
+                <optgroup label="Color accessibility">
                   {views.filter(v => v.group === "color-accessibility").map((item) => {
                     return (
                       <option key={item.id} value={item.id} disabled={item.disabled}>
@@ -257,35 +268,16 @@ class AppToolbarInternal extends React.Component<AppToolbarInternalProps> {
             </label>
           </ToolbarSelect>
 
-          <ToolbarSelect wdKey="nav:language">
-            <MdLanguage />
-            <label>{t("Language")}
-              <select
-                className="maputnik-select"
-                data-wd-key="maputnik-lang-select"
-                onChange={(e) => this.handleLanguageChange(e.target.value)}
-                value={this.props.i18n.language}
-              >
-                {Object.entries(supportedLanguages).map(([code, name]) => {
-                  return (
-                    <option key={code} value={code}>
-                      {name}
-                    </option>
-                  );
-                })}
-              </select>
-            </label>
-          </ToolbarSelect>
-
-          <ToolbarLink href={"https://github.com/maplibre/maputnik/wiki"}>
+          <ToolbarLink href={"https://github.com/maputnik/editor/wiki"}>
             <MdHelpOutline />
-            <IconText>{t("Help")}</IconText>
+            <IconText>Help</IconText>
           </ToolbarLink>
+          <ToolbarLinkHighlighted href={"https://gregorywolanski.typeform.com/to/cPgaSY"}>
+            <MdAssignmentTurnedIn />
+            <IconText>Take the Maputnik Survey</IconText>
+          </ToolbarLinkHighlighted>
         </div>
       </div>
     </nav>
   }
 }
-
-const AppToolbar = withTranslation()(AppToolbarInternal);
-export default AppToolbar;

src/components/Block.tsx

@@ -1,10 +1,10 @@
-import React, {PropsWithChildren, SyntheticEvent} from 'react'
+import React, {SyntheticEvent} from 'react'
 import classnames from 'classnames'
 import FieldDocLabel from './FieldDocLabel'
 import Doc from './Doc'
 
 
-type BlockProps = PropsWithChildren & {
+type BlockProps = {
   "data-wd-key"?: string
   label?: string
   action?: React.ReactElement
@@ -12,7 +12,7 @@ type BlockProps = PropsWithChildren & {
   onChange?(...args: unknown[]): unknown
   fieldSpec?: object
   wideMode?: boolean
-  error?: {message: string}
+  error?: unknown[]
 };
 
 type BlockState = {

src/components/Doc.tsx

@@ -31,7 +31,7 @@ export default class Doc extends React.Component<DocProps> {
     const renderValues = (
       !!values &&
       // HACK: Currently we merge additional values into the style spec, so this is required
-      // See <https://github.com/maplibre/maputnik/blob/main/src/components/PropertyGroup.jsx#L16>
+      // See <https://github.com/maputnik/editor/blob/main/src/components/PropertyGroup.jsx#L16>
       !Array.isArray(values)
     );
 
@@ -71,7 +71,7 @@ export default class Doc extends React.Component<DocProps> {
                     <tr key={key}>
                       <td>{key}</td>
                       {Object.keys(headers).map((k) => {
-                        if (Object.prototype.hasOwnProperty.call(supportObj, k)) {
+                        if (supportObj.hasOwnProperty(k)) {
                           return <td key={k}>{supportObj[k as keyof typeof headers]}</td>;
                         }
                         else {

src/components/FieldComment.tsx

@@ -2,37 +2,29 @@ import React from 'react'
 
 import Block from './Block'
 import InputString from './InputString'
-import { WithTranslation, withTranslation } from 'react-i18next';
 
-type FieldCommentInternalProps = {
+type FieldCommentProps = {
   value?: string
-  onChange(value: string | undefined): unknown
-  error: {message: string}
-} & WithTranslation;
+  onChange(...args: unknown[]): unknown
+};
 
-class FieldCommentInternal extends React.Component<FieldCommentInternalProps> {
+export default class FieldComment extends React.Component<FieldCommentProps> {
   render() {
-    const t = this.props.t;
     const fieldSpec = {
-      doc: t("Comments for the current layer. This is non-standard and not in the spec."),
+      doc: "Comments for the current layer. This is non-standard and not in the spec."
     };
 
     return <Block
-      label={t("Comments")}
+      label={"Comments"}
       fieldSpec={fieldSpec}
       data-wd-key="layer-comment"
-      error={this.props.error}
     >
       <InputString
         multi={true}
         value={this.props.value}
         onChange={this.props.onChange}
-        default={t("Comment...")}
-        data-wd-key="layer-comment.input"
+        default="Comment..."
       />
     </Block>
   }
 }
-
-const FieldComment = withTranslation()(FieldCommentInternal);
-export default FieldComment;

src/components/FieldDocLabel.tsx

@@ -2,7 +2,7 @@ import React from 'react'
 import {MdInfoOutline, MdHighlightOff} from 'react-icons/md'
 
 type FieldDocLabelProps = {
-  label: JSX.Element | string | undefined
+  label: object | string | undefined
   fieldSpec?: {
     doc?: string
   }

src/components/FieldFunction.tsx

@@ -5,7 +5,7 @@ import DataProperty, { 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 {findDefaultFromSpec} from '../util/spec-helper';
 
 
 function isLiteralExpression(value: any) {
@@ -40,7 +40,7 @@ function isIdentityProperty(value: any) {
   return (
     typeof(value) === 'object' &&
     value.type === "identity" &&
-    Object.prototype.hasOwnProperty.call(value, "property")
+    value.hasOwnProperty("property")
   );
 }
 
@@ -107,7 +107,7 @@ type FieldFunctionProps = {
   fieldName: string
   fieldType: string
   fieldSpec: any
-  errors?: {[key: string]: {message: string}}
+  errors?: unknown[]
   value?: any
 };
 
@@ -128,7 +128,7 @@ export default class FieldFunction extends React.Component<FieldFunctionProps, F
     }
   }
 
-  static getDerivedStateFromProps(props: Readonly<FieldFunctionProps>, state: FieldFunctionState) {
+  static getDerivedStateFromProps(props: FieldFunctionProps, state: FieldFunctionState) {
     // Because otherwise when editing values we end up accidentally changing field type.
     if (state.isEditing) {
       return {};
@@ -399,7 +399,7 @@ export default class FieldFunction extends React.Component<FieldFunctionProps, F
         />
       )
     }
-    return <div className={propClass} data-wd-key={"spec-field-container:"+this.props.fieldName}>
+    return <div className={propClass} data-wd-key={"spec-field:"+this.props.fieldName}>
       {specField}
     </div>
   }

src/components/FieldId.tsx

@@ -1,27 +1,25 @@
 import React from 'react'
 
-import latest from '@maplibre/maplibre-gl-style-spec/dist/latest.json'
+import {latest} from '@maplibre/maplibre-gl-style-spec'
 import Block from './Block'
 import InputString from './InputString'
 
 type FieldIdProps = {
   value: string
   wdKey: string
-  onChange(value: string | undefined): unknown
-  error?: {message: string}
+  onChange(...args: unknown[]): unknown
+  error?: unknown[]
 };
 
 export default class FieldId extends React.Component<FieldIdProps> {
   render() {
-    return <Block label="ID" fieldSpec={latest.layer.id}
-
+    return <Block label={"ID"} fieldSpec={latest.layer.id}
       data-wd-key={this.props.wdKey}
       error={this.props.error}
     >
       <InputString
         value={this.props.value}
         onInput={this.props.onChange}
-        data-wd-key={this.props.wdKey + ".input"}
       />
     </Block>
   }

src/components/FieldMaxZoom.tsx

@@ -1,20 +1,18 @@
 import React from 'react'
 
-import latest from '@maplibre/maplibre-gl-style-spec/dist/latest.json'
+import {latest} from '@maplibre/maplibre-gl-style-spec'
 import Block from './Block'
 import InputNumber from './InputNumber'
-import { WithTranslation, withTranslation } from 'react-i18next';
 
-type FieldMaxZoomInternalProps = {
+type FieldMaxZoomProps = {
   value?: number
-  onChange(value: number | undefined): unknown
-  error?: {message: string}
-} & WithTranslation;
+  onChange(...args: unknown[]): unknown
+  error?: unknown[]
+};
 
-class FieldMaxZoomInternal extends React.Component<FieldMaxZoomInternalProps> {
+export default class FieldMaxZoom extends React.Component<FieldMaxZoomProps> {
   render() {
-    const t = this.props.t;
-    return <Block label={t("Max Zoom")} fieldSpec={latest.layer.maxzoom}
+    return <Block label={"Max Zoom"} fieldSpec={latest.layer.maxzoom}
       error={this.props.error}
       data-wd-key="max-zoom"
     >
@@ -25,11 +23,7 @@ class FieldMaxZoomInternal extends React.Component<FieldMaxZoomInternalProps> {
         min={latest.layer.maxzoom.minimum}
         max={latest.layer.maxzoom.maximum}
         default={latest.layer.maxzoom.maximum}
-        data-wd-key="max-zoom.input"
       />
     </Block>
   }
 }
-
-const FieldMaxZoom = withTranslation()(FieldMaxZoomInternal);
-export default FieldMaxZoom;

src/components/FieldMinZoom.tsx

@@ -1,20 +1,18 @@
 import React from 'react'
 
-import latest from '@maplibre/maplibre-gl-style-spec/dist/latest.json'
+import {latest} from '@maplibre/maplibre-gl-style-spec'
 import Block from './Block'
 import InputNumber from './InputNumber'
-import { WithTranslation, withTranslation } from 'react-i18next';
 
-type FieldMinZoomInternalProps = {
+type FieldMinZoomProps = {
   value?: number
   onChange(...args: unknown[]): unknown
-  error?: {message: string}
-} & WithTranslation;
+  error?: unknown[]
+};
 
-class FieldMinZoomInternal extends React.Component<FieldMinZoomInternalProps> {
+export default class FieldMinZoom extends React.Component<FieldMinZoomProps> {
   render() {
-    const t = this.props.t;
-    return <Block label={t("Min Zoom")} fieldSpec={latest.layer.minzoom}
+    return <Block label={"Min Zoom"} fieldSpec={latest.layer.minzoom}
       error={this.props.error}
       data-wd-key="min-zoom"
     >
@@ -25,11 +23,7 @@ class FieldMinZoomInternal extends React.Component<FieldMinZoomInternalProps> {
         min={latest.layer.minzoom.minimum}
         max={latest.layer.minzoom.maximum}
         default={latest.layer.minzoom.minimum}
-        data-wd-key='min-zoom.input'
       />
     </Block>
   }
 }
-
-const FieldMinZoom = withTranslation()(FieldMinZoomInternal);
-export default FieldMinZoom;

src/components/FieldSource.tsx

@@ -1,28 +1,26 @@
 import React from 'react'
 
-import latest from '@maplibre/maplibre-gl-style-spec/dist/latest.json'
+import {latest} from '@maplibre/maplibre-gl-style-spec'
 import Block from './Block'
 import InputAutocomplete from './InputAutocomplete'
-import { WithTranslation, withTranslation } from 'react-i18next';
 
-type FieldSourceInternalProps = {
+type FieldSourceProps = {
   value?: string
   wdKey?: string
-  onChange?(value: string| undefined): unknown
+  onChange?(...args: unknown[]): unknown
   sourceIds?: unknown[]
-  error?: {message: string}
-} & WithTranslation;
+  error?: unknown[]
+};
 
-class FieldSourceInternal extends React.Component<FieldSourceInternalProps> {
+export default class FieldSource extends React.Component<FieldSourceProps> {
   static defaultProps = {
     onChange: () => {},
     sourceIds: [],
   }
 
   render() {
-    const t = this.props.t;
     return <Block
-      label={t("Source")}
+      label={"Source"}
       fieldSpec={latest.layer.source}
       error={this.props.error}
       data-wd-key={this.props.wdKey}
@@ -35,6 +33,3 @@ class FieldSourceInternal extends React.Component<FieldSourceInternalProps> {
     </Block>
   }
 }
-
-const FieldSource = withTranslation()(FieldSourceInternal);
-export default FieldSource;

src/components/FieldSourceLayer.tsx

@@ -3,17 +3,15 @@ import React from 'react'
 import {latest} from '@maplibre/maplibre-gl-style-spec'
 import Block from './Block'
 import InputAutocomplete from './InputAutocomplete'
-import { WithTranslation, withTranslation } from 'react-i18next';
 
-type FieldSourceLayerInternalProps = {
+type FieldSourceLayerProps = {
   value?: string
   onChange?(...args: unknown[]): unknown
   sourceLayerIds?: unknown[]
   isFixed?: boolean
-  error?: {message: string}
-} & WithTranslation;
+};
 
-class FieldSourceLayerInternal extends React.Component<FieldSourceLayerInternalProps> {
+export default class FieldSourceLayer extends React.Component<FieldSourceLayerProps> {
   static defaultProps = {
     onChange: () => {},
     sourceLayerIds: [],
@@ -21,12 +19,8 @@ class FieldSourceLayerInternal extends React.Component<FieldSourceLayerInternalP
   }
 
   render() {
-    const t = this.props.t;
-    return <Block 
-      label={t("Source Layer")} 
-      fieldSpec={latest.layer['source-layer']}
+    return <Block label={"Source Layer"} fieldSpec={latest.layer['source-layer']}
       data-wd-key="layer-source-layer"
-      error={this.props.error}
     >
       <InputAutocomplete
         keepMenuWithinWindowBounds={!!this.props.isFixed}
@@ -37,6 +31,3 @@ class FieldSourceLayerInternal extends React.Component<FieldSourceLayerInternalP
     </Block>
   }
 }
-
-const FieldSourceLayer = withTranslation()(FieldSourceLayerInternal);
-export default FieldSourceLayer;

src/components/FieldType.tsx

@@ -1,27 +1,25 @@
 import React from 'react'
 
-import latest from '@maplibre/maplibre-gl-style-spec/dist/latest.json'
+import {latest} from '@maplibre/maplibre-gl-style-spec'
 import Block from './Block'
 import InputSelect from './InputSelect'
 import InputString from './InputString'
-import { WithTranslation, withTranslation } from 'react-i18next';
 
-type FieldTypeInternalProps = {
+type FieldTypeProps = {
   value: string
   wdKey?: string
-  onChange(value: string): unknown
-  error?: {message: string}
+  onChange(...args: unknown[]): unknown
+  error?: unknown[] | undefined
   disabled?: boolean
-} & WithTranslation;
+};
 
-class FieldTypeInternal extends React.Component<FieldTypeInternalProps> {
+export default class FieldType extends React.Component<FieldTypeProps> {
   static defaultProps = {
     disabled: false,
   }
 
   render() {
-    const t = this.props.t;
-    return <Block label={t("Type")} fieldSpec={latest.layer.type}
+    return <Block label={"Type"} fieldSpec={latest.layer.type}
       data-wd-key={this.props.wdKey}
       error={this.props.error}
     >
@@ -46,12 +44,8 @@ class FieldTypeInternal extends React.Component<FieldTypeInternalProps> {
           ]}
           onChange={this.props.onChange}
           value={this.props.value}
-          data-wd-key={this.props.wdKey + ".select"}
         />
       }
     </Block>
   }
 }
-
-const FieldType = withTranslation()(FieldTypeInternal);
-export default FieldType;

src/components/Fieldset.tsx

@@ -1,9 +1,8 @@
-import React, { PropsWithChildren, ReactElement } from 'react'
+import React, { ReactElement } from 'react'
 import FieldDocLabel from './FieldDocLabel'
 import Doc from './Doc'
-import generateUniqueId from '../libs/document-uid';
 
-type FieldsetProps = PropsWithChildren & {
+type FieldsetProps = {
   label?: string,
   fieldSpec?: { doc?: string },
   action?: ReactElement,
@@ -13,12 +12,14 @@ type FieldsetState = {
   showDoc: boolean
 };
 
+let IDX = 0;
+
 export default class Fieldset extends React.Component<FieldsetProps, FieldsetState> {
   _labelId: string;
 
   constructor (props: FieldsetProps) {
     super(props);
-    this._labelId = generateUniqueId(`fieldset_label_`);
+    this._labelId = `fieldset_label_${(IDX++)}`;
     this.state = {
       showDoc: false,
     }

src/components/FilterEditor.jsx

@@ -1,11 +1,10 @@
 import React from 'react'
+import PropTypes from 'prop-types'
+import {combiningFilterOps} from '../libs/filterops'
 import {mdiTableRowPlusAfter} from '@mdi/js';
 import {isEqual} from 'lodash';
-import {ExpressionSpecification, LegacyFilterSpecification, StyleSpecification} from 'maplibre-gl'
-import {latest, migrate, convertFilter} from '@maplibre/maplibre-gl-style-spec'
-import {mdiFunctionVariant} from '@mdi/js';
 
-import {combiningFilterOps} from '../libs/filterops'
+import {latest, migrate, convertFilter} from '@maplibre/maplibre-gl-style-spec'
 import InputSelect from './InputSelect'
 import Block from './Block'
 import SingleFilterEditor from './SingleFilterEditor'
@@ -13,11 +12,11 @@ import FilterEditorBlock from './FilterEditorBlock'
 import InputButton from './InputButton'
 import Doc from './Doc'
 import ExpressionProperty from './_ExpressionProperty';
-import { WithTranslation, withTranslation } from 'react-i18next';
+import {mdiFunctionVariant} from '@mdi/js';
 
 
-function combiningFilter(props: FilterEditorInternalProps): LegacyFilterSpecification | ExpressionSpecification {
-  const filter = props.filter || ['all'];
+function combiningFilter (props) {
+  let filter = props.filter || ['all'];
 
   if (!Array.isArray(filter)) {
     return filter;
@@ -31,15 +30,14 @@ function combiningFilter(props: FilterEditorInternalProps): LegacyFilterSpecific
     filters = [filter.slice(0)];
   }
 
-  return [combiningOp, ...filters] as LegacyFilterSpecification | ExpressionSpecification;
+  return [combiningOp, ...filters];
 }
 
-function migrateFilter(filter: LegacyFilterSpecification | ExpressionSpecification) {
-  // This "any" can be removed in latest version of maplibre where maplibre re-exported types from style-spec
-  return (migrate(createStyleFromFilter(filter) as any).layers[0] as any).filter;
+function migrateFilter (filter) {
+  return migrate(createStyleFromFilter(filter)).layers[0].filter;
 }
 
-function createStyleFromFilter(filter: LegacyFilterSpecification | ExpressionSpecification): StyleSpecification & {id: string} {
+function createStyleFromFilter (filter) {
   return {
     "id": "tmp",
     "version": 8,
@@ -48,7 +46,7 @@ function createStyleFromFilter(filter: LegacyFilterSpecification | ExpressionSpe
     "sources": {
       "tmp": {
         "type": "geojson",
-        "data": ''
+        "data": {}
       }
     },
     "sprite": "",
@@ -71,7 +69,7 @@ const FILTER_OPS = [
 ];
 
 // If we convert a filter that is an expression to an expression it'll remain the same in value
-function checkIfSimpleFilter (filter: LegacyFilterSpecification | ExpressionSpecification) {
+function checkIfSimpleFilter (filter) {
   if (filter.length === 1 && FILTER_OPS.includes(filter[0])) {
     return true;
   }
@@ -79,38 +77,33 @@ function checkIfSimpleFilter (filter: LegacyFilterSpecification | ExpressionSpec
   return !isEqual(expression, filter);
 }
 
-function hasCombiningFilter(filter: LegacyFilterSpecification | ExpressionSpecification) {
+function hasCombiningFilter(filter) {
   return combiningFilterOps.indexOf(filter[0]) >= 0
 }
 
-function hasNestedCombiningFilter(filter: LegacyFilterSpecification | ExpressionSpecification) {
+function hasNestedCombiningFilter(filter) {
   if(hasCombiningFilter(filter)) {
-    return filter.slice(1).map(f => hasCombiningFilter(f as any)).filter(f => f == true).length > 0
+    const combinedFilters = filter.slice(1)
+    return filter.slice(1).map(f => hasCombiningFilter(f)).filter(f => f == true).length > 0
   }
   return false
 }
 
-type FilterEditorInternalProps = {
+export default class FilterEditor extends React.Component {
+  static propTypes = {
     /** Properties of the vector layer and the available fields */
-  properties?: {[key:string]: any}
-  filter?: any[]
-  errors?: {[key:string]: any}
-  onChange(value: LegacyFilterSpecification | ExpressionSpecification): unknown
-} & WithTranslation;
+    properties: PropTypes.object,
+    filter: PropTypes.array,
+    errors: PropTypes.object,
+    onChange: PropTypes.func.isRequired,
+  }
 
-type FilterEditorState = {
-  showDoc: boolean
-  displaySimpleFilter: boolean
-  valueIsSimpleFilter?: boolean
-};
-
-class FilterEditorInternal extends React.Component<FilterEditorInternalProps, FilterEditorState> {
   static defaultProps = {
     filter: ["all"],
   }
 
-  constructor (props: FilterEditorInternalProps) {
-    super(props);
+  constructor (props) {
+    super();
     this.state = {
       showDoc: false,
       displaySimpleFilter: checkIfSimpleFilter(combiningFilter(props)),
@@ -118,25 +111,25 @@ class FilterEditorInternal extends React.Component<FilterEditorInternalProps, Fi
   }
 
   // Convert filter to combining filter
-  onFilterPartChanged(filterIdx: number, newPart: any[]) {
-    const newFilter = combiningFilter(this.props).slice(0) as LegacyFilterSpecification | ExpressionSpecification
+  onFilterPartChanged(filterIdx, newPart) {
+    const newFilter = combiningFilter(this.props).slice(0)
     newFilter[filterIdx] = newPart
     this.props.onChange(newFilter)
   }
 
-  deleteFilterItem(filterIdx: number) {
-    const newFilter = combiningFilter(this.props).slice(0) as LegacyFilterSpecification | ExpressionSpecification
+  deleteFilterItem(filterIdx) {
+    const newFilter = combiningFilter(this.props).slice(0)
     newFilter.splice(filterIdx + 1, 1)
     this.props.onChange(newFilter)
   }
 
   addFilterItem = () => {
-    const newFilterItem = combiningFilter(this.props).slice(0) as LegacyFilterSpecification | ExpressionSpecification
-    (newFilterItem as any[]).push(['==', 'name', ''])
+    const newFilterItem = combiningFilter(this.props).slice(0)
+    newFilterItem.push(['==', 'name', ''])
     this.props.onChange(newFilterItem)
   }
 
-  onToggleDoc = (val: boolean) => {
+  onToggleDoc = (val) => {
     this.setState({
       showDoc: val
     });
@@ -149,24 +142,25 @@ class FilterEditorInternal extends React.Component<FilterEditorInternalProps, Fi
   }
 
   makeExpression = () => {
-    const filter = combiningFilter(this.props);
+    let filter = combiningFilter(this.props);
     this.props.onChange(migrateFilter(filter));
     this.setState({
       displaySimpleFilter: false,
     })
   }
 
-  static getDerivedStateFromProps(props: Readonly<FilterEditorInternalProps>, state: FilterEditorState) {
+  static getDerivedStateFromProps (props, currentState) {
+    const {filter} = props;
     const displaySimpleFilter = checkIfSimpleFilter(combiningFilter(props));
 
     // Upgrade but never downgrade
-    if (!displaySimpleFilter && state.displaySimpleFilter === true) {
+    if (!displaySimpleFilter && currentState.displaySimpleFilter === true) {
       return {
         displaySimpleFilter: false,
         valueIsSimpleFilter: false,
       };
     }
-    else if (displaySimpleFilter && state.displaySimpleFilter === false) {
+    else if (displaySimpleFilter && currentState.displaySimpleFilter === false) {
       return {
         valueIsSimpleFilter: true,
       }
@@ -179,41 +173,41 @@ class FilterEditorInternal extends React.Component<FilterEditorInternalProps, Fi
   }
 
   render() {
-    const {errors, t} = this.props;
+    const {errors} = this.props;
     const {displaySimpleFilter} = this.state;
     const fieldSpec={
       doc: latest.layer.filter.doc + " Combine multiple filters together by using a compound filter."
     };
-    const defaultFilter = ["all"] as LegacyFilterSpecification | ExpressionSpecification;
+    const defaultFilter = ["all"];
 
     const isNestedCombiningFilter = displaySimpleFilter && hasNestedCombiningFilter(combiningFilter(this.props));
 
     if (isNestedCombiningFilter) {
       return <div className="maputnik-filter-editor-unsupported">
         <p>
-          {t("Nested filters are not supported.")}
+          Nested filters are not supported.
         </p>
         <InputButton
           onClick={this.makeExpression}
-          title={t("Convert to expression")}
+          title="Convert to expression"
         >
           <svg style={{marginRight: "0.2em", width:"14px", height:"14px", verticalAlign: "middle"}} viewBox="0 0 24 24">
             <path fill="currentColor" d={mdiFunctionVariant} />
           </svg>
-          {t("Upgrade to expression")}
+          Upgrade to expression
         </InputButton>
       </div>
     }
     else if (displaySimpleFilter) {
       const filter = combiningFilter(this.props);
-      const combiningOp = filter[0];
-      const filters = filter.slice(1) as (LegacyFilterSpecification | ExpressionSpecification)[];
+      let combiningOp = filter[0];
+      let filters = filter.slice(1)
 
       const actions = (
         <div>
           <InputButton
             onClick={this.makeExpression}
-            title={t("Convert to expression")}
+            title="Convert to expression"
             className="maputnik-make-zoom-function"
           >
             <svg style={{width:"14px", height:"14px", verticalAlign: "middle"}} viewBox="0 0 24 24">
@@ -224,7 +218,7 @@ class FilterEditorInternal extends React.Component<FilterEditorInternalProps, Fi
       );
 
       const editorBlocks = filters.map((f, idx) => {
-        const error = errors![`filter[${idx+1}]`];
+        const error = errors[`filter[${idx+1}]`];
 
         return (
           <div key={`block-${idx}`}>
@@ -248,17 +242,13 @@ class FilterEditorInternal extends React.Component<FilterEditorInternalProps, Fi
           <Block
             key="top"
             fieldSpec={fieldSpec}
-            label={t("Filter")}
+            label={"Filter"}
             action={actions}
           >
             <InputSelect
               value={combiningOp}
-              onChange={(v: [string, any]) => this.onFilterPartChanged(0, v)}
-              options={[
-                ["all", t("every filter matches")], 
-                ["none", t("no filter matches")], 
-                ["any", t("any filter matches")]
-              ]}
+              onChange={this.onFilterPartChanged.bind(this, 0)}
+              options={[["all", "every filter matches"], ["none", "no filter matches"], ["any", "any filter matches"]]}
             />
           </Block>
           {editorBlocks}
@@ -273,7 +263,7 @@ class FilterEditorInternal extends React.Component<FilterEditorInternalProps, Fi
             >
               <svg style={{width:"14px", height:"14px", verticalAlign: "text-bottom"}} viewBox="0 0 24 24">
                 <path fill="currentColor" d={mdiTableRowPlusAfter} />
-              </svg> {t("Add filter")}
+              </svg> Add filter
             </InputButton>
           </div>
           <div
@@ -287,7 +277,7 @@ class FilterEditorInternal extends React.Component<FilterEditorInternalProps, Fi
       );
     }
     else {
-      const {filter} = this.props;
+      let {filter} = this.props;
 
       return (
         <>
@@ -304,13 +294,12 @@ class FilterEditorInternal extends React.Component<FilterEditorInternalProps, Fi
           />
           {this.state.valueIsSimpleFilter &&
             <div className="maputnik-expr-infobox">
-              {t("You've entered an old style filter.")}
-              {' '}
+              You&apos;ve entered a old style filter,{' '}
               <button
                 onClick={this.makeFilter}
                 className="maputnik-expr-infobox__button"
               >
-                {t("Switch to filter editor.")}
+                switch to filter editor
               </button>
             </div>
           }
@@ -319,6 +308,3 @@ class FilterEditorInternal extends React.Component<FilterEditorInternalProps, Fi
     }
   }
 }
-
-const FilterEditor = withTranslation()(FilterEditorInternal);
-export default FilterEditor;

src/components/FilterEditorBlock.tsx

@@ -1,21 +1,19 @@
-import React, { PropsWithChildren } from 'react'
+import React from 'react'
 import InputButton from './InputButton'
 import {MdDelete} from 'react-icons/md'
-import { WithTranslation, withTranslation } from 'react-i18next';
 
-type FilterEditorBlockInternalProps = PropsWithChildren & {
+type FilterEditorBlockProps = {
   onDelete(...args: unknown[]): unknown
-} & WithTranslation;
+};
 
-class FilterEditorBlockInternal extends React.Component<FilterEditorBlockInternalProps> {
+export default class FilterEditorBlock extends React.Component<FilterEditorBlockProps> {
   render() {
-    const t = this.props.t;
     return <div className="maputnik-filter-editor-block">
       <div className="maputnik-filter-editor-block-action">
         <InputButton
           className="maputnik-delete-filter"
           onClick={this.props.onDelete}
-          title={t("Delete filter block")}
+          title="Delete filter block"
         >
           <MdDelete />
         </InputButton>
@@ -27,5 +25,3 @@ class FilterEditorBlockInternal extends React.Component<FilterEditorBlockInterna
   }
 }
 
-const FilterEditorBlock = withTranslation()(FilterEditorBlockInternal);
-export default FilterEditorBlock;

src/components/IconLayer.tsx

@@ -10,7 +10,6 @@ import IconMissing from './IconMissing'
 type IconLayerProps = {
   type: string
   style?: object
-  className?: string
 };
 
 export default class IconLayer extends React.Component<IconLayerProps> {

src/components/InputArray.tsx

@@ -32,7 +32,7 @@ export default class FieldArray extends React.Component<FieldArrayProps, FieldAr
     };
   }
 
-  static getDerivedStateFromProps(props: Readonly<FieldArrayProps>, state: FieldArrayState) {
+  static getDerivedStateFromProps(props: FieldArrayProps, state: FieldArrayState) {
     const value: any[] = [];
     const initialPropsValue = state.initialPropsValue.slice(0);
 

src/components/InputAutocomplete.tsx

@@ -8,7 +8,7 @@ const MAX_HEIGHT = 140;
 export type InputAutocompleteProps = {
   value?: string
   options: any[]
-  onChange(value: string | undefined): unknown
+  onChange(...args: unknown[]): unknown
   keepMenuWithinWindowBounds?: boolean
   'aria-label'?: string
 };

src/components/InputColor.tsx

@@ -110,7 +110,7 @@ export default class InputColor extends React.Component<InputColorProps> {
       />
     </div>
 
-    const swatchStyle = {
+    var swatchStyle = {
       backgroundColor: this.props.value
     };
 

src/components/InputDynamicArray.tsx

@@ -1,7 +1,6 @@
 import React from 'react'
 import capitalize from 'lodash.capitalize'
 import {MdDelete} from 'react-icons/md'
-import { WithTranslation, withTranslation } from 'react-i18next';
 
 import InputString from './InputString'
 import InputNumber from './InputNumber'
@@ -22,11 +21,10 @@ export type FieldDynamicArrayProps = {
   }
   'aria-label'?: string
   label: string
-} 
+};
 
-type FieldDynamicArrayInternalProps = FieldDynamicArrayProps & WithTranslation;
 
-class FieldDynamicArrayInternal extends React.Component<FieldDynamicArrayInternalProps> {
+export default class FieldDynamicArray extends React.Component<FieldDynamicArrayProps> {
   changeValue(idx: number, newValue: string | number | undefined) {
     const values = this.values.slice(0)
     values[idx] = newValue
@@ -64,13 +62,8 @@ class FieldDynamicArrayInternal extends React.Component<FieldDynamicArrayInterna
   }
 
   render() {
-    const t = this.props.t;
-    const i18nProps = { t, i18n: this.props.i18n, tReady: this.props.tReady };
     const inputs = this.values.map((v, i) => {
-      const deleteValueBtn= <DeleteValueInputButton 
-        onClick={this.deleteValue.bind(this, i)}
-        {...i18nProps}
-      />;
+      const deleteValueBtn= <DeleteValueInputButton onClick={this.deleteValue.bind(this, i)} />
       let input;
       if(this.props.type === 'url') {
         input = <InputUrl
@@ -124,30 +117,27 @@ class FieldDynamicArrayInternal extends React.Component<FieldDynamicArrayInterna
           className="maputnik-array-add-value"
           onClick={this.addValue}
         >
-          {t("Add value")}
+          Add value
         </InputButton>
       </div>
     );
   }
 }
 
-const FieldDynamicArray = withTranslation()(FieldDynamicArrayInternal);
-export default FieldDynamicArray;
-
 type DeleteValueInputButtonProps = {
   onClick?(...args: unknown[]): unknown
-} & WithTranslation;
+};
 
 class DeleteValueInputButton extends React.Component<DeleteValueInputButtonProps> {
   render() {
-    const t = this.props.t;
     return <InputButton
       className="maputnik-delete-stop"
       onClick={this.props.onClick}
-      title={t("Remove array item")}
+      title="Remove array item"
     >
       <FieldDocLabel
         label={<MdDelete />}
+        fieldSpec={{doc:" Remove array item."}}
       />
     </InputButton>
   }

src/components/InputJson.tsx

@@ -1,7 +1,6 @@
 import React from 'react'
 import classnames from 'classnames';
 import CodeMirror, { ModeSpec } from 'codemirror';
-import { Trans, WithTranslation, withTranslation } from 'react-i18next';
 
 import 'codemirror/mode/javascript/javascript'
 import 'codemirror/addon/lint/lint'
@@ -9,7 +8,7 @@ import 'codemirror/addon/edit/matchbrackets'
 import 'codemirror/lib/codemirror.css'
 import 'codemirror/addon/lint/lint.css'
 import stringifyPretty from 'json-stringify-pretty-compact'
-import '../libs/codemirror-mgl';
+import '../util/codemirror-mgl';
 
 
 export type InputJsonProps = {
@@ -28,7 +27,6 @@ export type InputJsonProps = {
   mode?: ModeSpec<any>
   lint?: boolean | object
 };
-type InputJsonInternalProps = InputJsonProps & WithTranslation;
 
 type InputJsonState = {
   isEditing: boolean
@@ -36,7 +34,7 @@ type InputJsonState = {
   prevValue: string
 };
 
-class InputJsonInternal extends React.Component<InputJsonInternalProps, InputJsonState> {
+export default class InputJson extends React.Component<InputJsonProps, InputJsonState> {
   static defaultProps = {
     lineNumbers: true,
     lineWrapping: false,
@@ -54,7 +52,7 @@ class InputJsonInternal extends React.Component<InputJsonInternalProps, InputJso
   _el: HTMLDivElement | null = null;
   _cancelNextChange: boolean = false;
 
-  constructor(props: InputJsonInternalProps) {
+  constructor(props: InputJsonProps) {
     super(props);
     this._keyEvent = "keyboard";
     this.state = {
@@ -158,7 +156,6 @@ class InputJsonInternal extends React.Component<InputJsonInternalProps, InputJso
   }
 
   render() {
-    const t = this.props.t;
     const {showMessage} = this.state;
     const style = {} as {maxHeight?: number};
     if (this.props.maxHeight) {
@@ -167,9 +164,7 @@ class InputJsonInternal extends React.Component<InputJsonInternalProps, InputJso
 
     return <div className="JSONEditor" onPointerDown={this.onPointerDown} aria-hidden="true">
       <div className={classnames("JSONEditor__message", {"JSONEditor__message--on": showMessage})}>
-        <Trans t={t}>
         Press <kbd>ESC</kbd> to lose focus
-        </Trans>
       </div>
       <div
         className={classnames("codemirror-container", this.props.className)}
@@ -179,6 +174,3 @@ class InputJsonInternal extends React.Component<InputJsonInternalProps, InputJso
     </div>
   }
 }
-
-const InputJson = withTranslation()(InputJsonInternal);
-export default InputJson;

src/components/InputNumber.tsx

@@ -1,5 +1,6 @@
 import React, { BaseSyntheticEvent } from 'react'
-import generateUniqueId from '../libs/document-uid';
+
+let IDX = 0;
 
 export type InputNumberProps = {
   value?: number
@@ -9,7 +10,7 @@ export type InputNumberProps = {
   onChange?(value: number | undefined): unknown
   allowRange?: boolean
   rangeStep?: number
-  "data-wd-key"?: string
+  wdKey?: string
   required?: boolean
   "aria-label"?: string
 };
@@ -19,10 +20,7 @@ type InputNumberState = {
   editing: boolean
   editingRange?: boolean
   value?: number
-  /**
-   * This is the value that is currently being edited. It can be an invalid value.
-   */
-  dirtyValue?: number | string | undefined
+  dirtyValue?: number
 }
 
 export default class InputNumber extends React.Component<InputNumberProps, InputNumberState> {
@@ -34,14 +32,14 @@ export default class InputNumber extends React.Component<InputNumberProps, Input
   constructor(props: InputNumberProps) {
     super(props)
     this.state = {
-      uuid: +generateUniqueId(),
+      uuid: IDX++,
       editing: false,
       value: props.value,
       dirtyValue: props.value,
     }
   }
 
-  static getDerivedStateFromProps(props: Readonly<InputNumberProps>, state: InputNumberState) {
+  static getDerivedStateFromProps(props: InputNumberProps, state: InputNumberState) {
     if (!state.editing && props.value !== state.value) {
       return {
         value: props.value,
@@ -69,7 +67,7 @@ export default class InputNumber extends React.Component<InputNumberProps, Input
     }
 
     this.setState({
-      dirtyValue: newValue === "" ? undefined : newValue,
+      dirtyValue: newValue === "" ? undefined : value,
     })
   }
 
@@ -128,7 +126,7 @@ export default class InputNumber extends React.Component<InputNumberProps, Input
         // for example we might go from 13 to 13.23, however because we know
         // that came from a keyboard event we always want to increase by a
         // single step value.
-        if (value < +this.state.dirtyValue!) {
+        if (value < this.state.dirtyValue!) {
           value = this.state.value! - step;
         }
         else {
@@ -142,7 +140,7 @@ export default class InputNumber extends React.Component<InputNumberProps, Input
         }
         else {
           value = value + (step - snap);
-        }
+        };
       }
     }
 
@@ -157,8 +155,7 @@ export default class InputNumber extends React.Component<InputNumberProps, Input
 
   render() {
     if(
-      Object.prototype.hasOwnProperty.call(this.props, "min") && 
-      Object.prototype.hasOwnProperty.call(this.props, "max") &&
+      this.props.hasOwnProperty("min") && this.props.hasOwnProperty("max") &&
       this.props.min !== undefined && this.props.max !== undefined &&
       this.props.allowRange
     ) {
@@ -200,7 +197,6 @@ export default class InputNumber extends React.Component<InputNumberProps, Input
               dirtyValue: this.state.value,
             });
           }}
-          data-wd-key={this.props["data-wd-key"] + "-range"}
         />
         <input
           key="text"
@@ -219,8 +215,6 @@ export default class InputNumber extends React.Component<InputNumberProps, Input
             this.setState({editing: false});
             this.resetValue()
           }}
-          data-wd-key={this.props["data-wd-key"] + "-text"}
-
         />
       </div>
     }
@@ -239,7 +233,6 @@ export default class InputNumber extends React.Component<InputNumberProps, Input
         }}
         onBlur={this.resetValue}
         required={this.props.required}
-        data-wd-key={this.props["data-wd-key"]}
       />
     }
   }

src/components/InputSelect.tsx

@@ -5,7 +5,7 @@ export type InputSelectProps = {
   "data-wd-key"?: string
   options: [string, any][] | string[]
   style?: object
-  onChange(value: string | [string, any]): unknown
+  onChange(value: string): unknown
   title?: string
   'aria-label'?: string
 };

src/components/InputSpec.tsx

@@ -49,7 +49,6 @@ export default class SpecField extends React.Component<SpecFieldProps> {
       value: this.props.value,
       default: this.props.fieldSpec?.default,
       name: this.props.fieldName,
-      "data-wd-key": "spec-field-input:" + this.props.fieldName,
       onChange: (newValue: number | undefined | (string | number | undefined)[]) => this.props.onChange!(this.props.fieldName, newValue),
       'aria-label': this.props['aria-label'],
     }
@@ -61,14 +60,13 @@ export default class SpecField extends React.Component<SpecFieldProps> {
           max={this.props.fieldSpec.maximum}
         />
       )
-    case 'enum': {
+      case 'enum':
         const options = Object.keys(this.props.fieldSpec.values || []).map(v => [v, capitalize(v)])
 
         return <InputEnum
           {...commonProps as Omit<InputEnumProps, "options">}
           options={options}
         />
-    }
       case 'resolvedImage':
       case 'formatted':
       case 'string':

src/components/InputString.tsx

@@ -33,7 +33,7 @@ export default class InputString extends React.Component<InputStringProps, Input
     }
   }
 
-  static getDerivedStateFromProps(props: Readonly<InputStringProps>, state: InputStringState) {
+  static getDerivedStateFromProps(props: InputStringProps, state: InputStringState) {
     if (!state.editing) {
       return {
         value: props.value
@@ -46,7 +46,7 @@ export default class InputString extends React.Component<InputStringProps, Input
     let tag;
     let classes;
 
-    if(this.props.multi) {
+    if(!!this.props.multi) {
       tag = "textarea"
       classes = [
         "maputnik-string",
@@ -60,14 +60,14 @@ export default class InputString extends React.Component<InputStringProps, Input
       ]
     }
 
-    if(this.props.disabled) {
+    if(!!this.props.disabled) {
       classes.push("maputnik-string--disabled");
     }
 
     return React.createElement(tag, {
       "aria-label": this.props["aria-label"],
       "data-wd-key": this.props["data-wd-key"],
-      spellCheck: Object.prototype.hasOwnProperty.call(this.props, "spellCheck") ? this.props.spellCheck : !(tag === "input"),
+      spellCheck: this.props.hasOwnProperty("spellCheck") ? this.props.spellCheck : !(tag === "input"),
       disabled: this.props.disabled,
       className: classes.join(" "),
       style: this.props.style,

src/components/InputUrl.tsx

@@ -1,10 +1,9 @@
 import React from 'react'
 import InputString from './InputString'
 import SmallError from './SmallError'
-import { Trans, WithTranslation, withTranslation } from 'react-i18next';
-import { TFunction } from 'i18next';
 
-function validate(url: string, t: TFunction): JSX.Element | undefined {
+
+function validate(url: string) {
   if (url === "") {
     return;
   }
@@ -23,19 +22,15 @@ function validate(url: string, t: TFunction): JSX.Element | undefined {
   const isSsl = window.location.protocol === "https:";
 
   if (!protocol) {
-    if (isSsl) {
     error = (
       <SmallError>
-          <Trans t={t}>Must provide protocol: <code>https://</code></Trans>
-        </SmallError>
-      );
-    } else {
-      error = (
-        <SmallError>
-          <Trans t={t}>Must provide protocol: <code>http://</code> or <code>https://</code></Trans>
-        </SmallError>
-      );
+        Must provide protocol {
+          isSsl
+          ? <code>https://</code>
+          : <><code>http://</code> or <code>https://</code></>
         }
+      </SmallError>
+    );
   }
   else if (
     protocol &&
@@ -44,9 +39,7 @@ function validate(url: string, t: TFunction): JSX.Element | undefined {
   ) {
     error = (
       <SmallError>
-        <Trans t={t}>
         CORS policy won&apos;t allow fetching resources served over http from https, use a <code>https://</code> domain
-        </Trans>
       </SmallError>
     );
   }
@@ -68,34 +61,32 @@ export type FieldUrlProps = {
   className?: string
 };
 
-type FieldUrlInternalProps = FieldUrlProps & WithTranslation;
-
 type FieldUrlState = {
   error?: React.ReactNode
 }
 
-class FieldUrlInternal extends React.Component<FieldUrlInternalProps, FieldUrlState> {
+export default class FieldUrl extends React.Component<FieldUrlProps, FieldUrlState> {
   static defaultProps = {
     onInput: () => {},
   }
 
-  constructor (props: FieldUrlInternalProps) {
+  constructor (props: FieldUrlProps) {
     super(props);
     this.state = {
-      error: validate(props.value, props.t),
+      error: validate(props.value)
     };
   }
 
   onInput = (url: string) => {
     this.setState({
-      error: validate(url, this.props.t),
+      error: validate(url)
     });
     if (this.props.onInput) this.props.onInput(url);
   }
 
   onChange = (url: string) => {
     this.setState({
-      error: validate(url, this.props.t),
+      error: validate(url)
     });
     this.props.onChange(url);
   }
@@ -115,5 +106,3 @@ class FieldUrlInternal extends React.Component<FieldUrlInternalProps, FieldUrlSt
   }
 }
 
-const FieldUrl = withTranslation()(FieldUrlInternal);
-export default FieldUrl;

src/components/LayerEditor.jsx

@@ -0,0 +1,337 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { Wrapper, Button, Menu, MenuItem } from 'react-aria-menubutton'
+
+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 {Accordion} from 'react-accessible-accordion';
+
+import {MdMoreVert} from 'react-icons/md'
+
+import { changeType, changeProperty } from '../libs/layer'
+import layout from '../config/layout.json'
+import {formatLayerId} from '../util/format';
+
+
+function getLayoutForType (type) {
+  return layout[type] ? layout[type] : layout.invalid;
+}
+
+function layoutGroups(layerType) {
+  const layerGroup = {
+    title: 'Layer',
+    type: 'layer'
+  }
+  const filterGroup = {
+    title: 'Filter',
+    type: 'filter'
+  }
+  const editorGroup = {
+    title: 'JSON Editor',
+    type: 'jsoneditor'
+  }
+  return [layerGroup, filterGroup]
+    .concat(getLayoutForType(layerType).groups)
+    .concat([editorGroup])
+}
+
+/** Layer editor supporting multiple types of layers. */
+export default class LayerEditor extends React.Component {
+  static propTypes = {
+    layer: PropTypes.object.isRequired,
+    sources: PropTypes.object,
+    vectorLayers: PropTypes.object,
+    spec: PropTypes.object.isRequired,
+    onLayerChanged: PropTypes.func,
+    onLayerIdChange: PropTypes.func,
+    onMoveLayer: PropTypes.func,
+    onLayerDestroy: PropTypes.func,
+    onLayerCopy: PropTypes.func,
+    onLayerVisibilityToggle: PropTypes.func,
+    isFirstLayer: PropTypes.bool,
+    isLastLayer: PropTypes.bool,
+    layerIndex: PropTypes.number,
+    errors: PropTypes.array,
+  }
+
+  static defaultProps = {
+    onLayerChanged: () => {},
+    onLayerIdChange: () => {},
+    onLayerDestroyed: () => {},
+  }
+
+  static childContextTypes = {
+    reactIconBase: PropTypes.object
+  }
+
+  constructor(props) {
+    super(props)
+
+    //TODO: Clean this up and refactor into function
+    const editorGroups = {}
+    layoutGroups(this.props.layer.type).forEach(group => {
+      editorGroups[group.title] = true
+    })
+
+    this.state = { editorGroups }
+  }
+
+  static getDerivedStateFromProps(props, state) {
+    const additionalGroups = { ...state.editorGroups }
+
+    getLayoutForType(props.layer.type).groups.forEach(group => {
+      if(!(group.title in additionalGroups)) {
+        additionalGroups[group.title] = true
+      }
+    })
+
+    return {
+      editorGroups: additionalGroups
+    };
+  }
+
+  getChildContext () {
+    return {
+      reactIconBase: {
+        size: 14,
+        color: '#8e8e8e',
+      }
+    }
+  }
+
+  changeProperty(group, property, newValue) {
+    this.props.onLayerChanged(
+      this.props.layerIndex,
+      changeProperty(this.props.layer, group, property, newValue)
+    )
+  }
+
+  onGroupToggle(groupTitle, active) {
+    const changedActiveGroups = {
+      ...this.state.editorGroups,
+      [groupTitle]: active,
+    }
+    this.setState({
+      editorGroups: changedActiveGroups
+    })
+  }
+
+  renderGroupType(type, fields) {
+    let comment = ""
+    if(this.props.layer.metadata) {
+      comment = this.props.layer.metadata['maputnik:comment']
+    }
+    const {errors, layerIndex} = this.props;
+
+    const errorData = {};
+    errors.forEach(error => {
+      if (
+        error.parsed &&
+        error.parsed.type === "layer" &&
+        error.parsed.data.index == layerIndex
+      ) {
+        errorData[error.parsed.data.key] = {
+          message: error.parsed.data.message
+        };
+      }
+    })
+
+    let sourceLayerIds;
+    if(this.props.sources.hasOwnProperty(this.props.layer.source)) {
+      sourceLayerIds = this.props.sources[this.props.layer.source].layers;
+    }
+
+    switch(type) {
+      case 'layer': return <div>
+        <FieldId
+          value={this.props.layer.id}
+          wdKey="layer-editor.layer-id"
+          error={errorData.id}
+          onChange={newId => this.props.onLayerIdChange(this.props.layerIndex, this.props.layer.id, newId)}
+        />
+        <FieldType
+          disabled={true}
+          error={errorData.type}
+          value={this.props.layer.type}
+          onChange={newType => this.props.onLayerChanged(
+            this.props.layerIndex,
+            changeType(this.props.layer, newType)
+          )}
+        />
+        {this.props.layer.type !== 'background' && <FieldSource
+          error={errorData.source}
+          sourceIds={Object.keys(this.props.sources)}
+          value={this.props.layer.source}
+          onChange={v => this.changeProperty(null, 'source', v)}
+        />
+        }
+        {['background', 'raster', 'hillshade', 'heatmap'].indexOf(this.props.layer.type) < 0 &&
+        <FieldSourceLayer
+          error={errorData['source-layer']}
+          sourceLayerIds={sourceLayerIds}
+          value={this.props.layer['source-layer']}
+          onChange={v => this.changeProperty(null, 'source-layer', v)}
+        />
+        }
+        <FieldMinZoom
+          error={errorData.minzoom}
+          value={this.props.layer.minzoom}
+          onChange={v => this.changeProperty(null, 'minzoom', v)}
+        />
+        <FieldMaxZoom
+          error={errorData.maxzoom}
+          value={this.props.layer.maxzoom}
+          onChange={v => this.changeProperty(null, 'maxzoom', v)}
+        />
+        <FieldComment
+          error={errorData.comment}
+          value={comment}
+          onChange={v => this.changeProperty('metadata', 'maputnik:comment', v == ""  ? undefined : v)}
+        />
+      </div>
+      case 'filter': return <div>
+        <div className="maputnik-filter-editor-wrapper">
+          <FilterEditor
+            errors={errorData}
+            filter={this.props.layer.filter}
+            properties={this.props.vectorLayers[this.props.layer['source-layer']]}
+            onChange={f => this.changeProperty(null, 'filter', f)}
+          />
+        </div>
+      </div>
+      case 'properties':
+        return <PropertyGroup
+          errors={errorData}
+          layer={this.props.layer}
+          groupFields={fields}
+          spec={this.props.spec}
+          onChange={this.changeProperty.bind(this)}
+        />
+      case 'jsoneditor':
+        return <FieldJson
+          layer={this.props.layer}
+          onChange={(layer) => {
+            this.props.onLayerChanged(
+              this.props.layerIndex,
+              layer
+            );
+          }}
+        />
+    }
+  }
+
+  moveLayer(offset) {
+    this.props.onMoveLayer({
+      oldIndex: this.props.layerIndex,
+      newIndex: this.props.layerIndex+offset
+    })
+  }
+
+  render() {
+    const groupIds = [];
+    const layerType = this.props.layer.type
+    const groups = layoutGroups(layerType).filter(group => {
+      return !(layerType === 'background' && group.type === 'source')
+    }).map(group => {
+      const groupId = group.title.replace(/ /g, "_");
+      groupIds.push(groupId);
+      return <LayerEditorGroup
+        data-wd-key={group.title}
+        id={groupId}
+        key={group.title}
+        title={group.title}
+        isActive={this.state.editorGroups[group.title]}
+        onActiveToggle={this.onGroupToggle.bind(this, group.title)}
+      >
+        {this.renderGroupType(group.type, group.fields)}
+      </LayerEditorGroup>
+    })
+
+    const layout = this.props.layer.layout || {}
+
+    const items = {
+      delete: {
+        text: "Delete",
+        handler: () => this.props.onLayerDestroy(this.props.layerIndex)
+      },
+      duplicate: {
+        text: "Duplicate",
+        handler: () => this.props.onLayerCopy(this.props.layerIndex)
+      },
+      hide: {
+        text: (layout.visibility === "none") ? "Show" : "Hide",
+        handler: () => this.props.onLayerVisibilityToggle(this.props.layerIndex)
+      },
+      moveLayerUp: {
+        text: "Move layer up",
+        // Not actually used...
+        disabled: this.props.isFirstLayer,
+        handler: () => this.moveLayer(-1)
+      },
+      moveLayerDown: {
+        text: "Move layer down",
+        // Not actually used...
+        disabled: this.props.isLastLayer,
+        handler: () => this.moveLayer(+1)
+      }
+    }
+
+    function handleSelection(id, event) {
+      event.stopPropagation;
+      items[id].handler();
+    }
+
+    return <section className="maputnik-layer-editor"
+      role="main"
+      aria-label="Layer editor"
+    >
+      <header>
+        <div className="layer-header">
+          <h2 className="layer-header__title">
+            Layer: {formatLayerId(this.props.layer.id)}
+          </h2>
+          <div className="layer-header__info">
+            <Wrapper
+              className='more-menu'
+              onSelection={handleSelection}
+              closeOnSelection={false}
+            >
+              <Button id="skip-target-layer-editor" data-wd-key="skip-target-layer-editor" className='more-menu__button' title="Layer options">
+                <MdMoreVert className="more-menu__button__svg" />
+              </Button>
+              <Menu>
+                <ul className="more-menu__menu">
+                  {Object.keys(items).map((id, idx) => {
+                    const item = items[id];
+                    return <li key={id}>
+                      <MenuItem value={id} className='more-menu__menu__item'>
+                        {item.text}
+                      </MenuItem>
+                    </li>
+                  })}
+                </ul>
+              </Menu>
+            </Wrapper>
+          </div>
+        </div>
+
+      </header>
+      <Accordion
+        allowMultipleExpanded={true}
+        allowZeroExpanded={true}
+        preExpanded={groupIds}
+      >
+        {groups}
+      </Accordion>
+    </section>
+  }
+}

src/components/LayerEditor.tsx

@@ -1,365 +0,0 @@
-import React, {type JSX} from 'react'
-import PropTypes from 'prop-types'
-import { Wrapper, Button, Menu, MenuItem } from 'react-aria-menubutton'
-import {Accordion} from 'react-accessible-accordion';
-import {MdMoreVert} from 'react-icons/md'
-import {BackgroundLayerSpecification, LayerSpecification, SourceSpecification} from 'maplibre-gl';
-
-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 layout from '../config/layout.json'
-import {formatLayerId} from '../libs/format';
-import { WithTranslation, withTranslation } from 'react-i18next';
-import { TFunction } from 'i18next';
-
-
-function getLayoutForType(type: LayerSpecification["type"], t: TFunction) {
-  return layout[type] ? {
-    ...layout[type],
-    groups: layout[type].groups.map(group => {
-      return {
-        ...group,
-        id: group.title.replace(/ /g, "_"),
-        title: t(group.title)
-      };
-    }),
-  } : layout.invalid;
-}
-
-function layoutGroups(layerType: LayerSpecification["type"], t: TFunction): {id: string, title: string, type: string, fields?: string[]}[] {
-  const layerGroup = {
-    id: 'layer',
-    title: t('Layer'),
-    type: 'layer'
-  }
-  const filterGroup = {
-    id: 'filter',
-    title: t('Filter'),
-    type: 'filter'
-  }
-  const editorGroup = {
-    id: 'jsoneditor',
-    title: t('JSON Editor'),
-    type: 'jsoneditor'
-  }
-  return [layerGroup, filterGroup]
-    .concat(getLayoutForType(layerType, t).groups)
-    .concat([editorGroup])
-}
-
-type LayerEditorInternalProps = {
-  layer: LayerSpecification
-  sources: {[key: string]: SourceSpecification}
-  vectorLayers: {[key: string]: any}
-  spec: object
-  onLayerChanged(...args: unknown[]): unknown
-  onLayerIdChange(...args: unknown[]): unknown
-  onMoveLayer(...args: unknown[]): unknown
-  onLayerDestroy(...args: unknown[]): unknown
-  onLayerCopy(...args: unknown[]): unknown
-  onLayerVisibilityToggle(...args: unknown[]): unknown
-  isFirstLayer?: boolean
-  isLastLayer?: boolean
-  layerIndex: number
-  errors?: any[]
-} & WithTranslation;
-
-type LayerEditorState = {
-  editorGroups: {[keys:string]: boolean}
-};
-
-/** Layer editor supporting multiple types of layers. */
-class LayerEditorInternal extends React.Component<LayerEditorInternalProps, LayerEditorState> {
-  static defaultProps = {
-    onLayerChanged: () => {},
-    onLayerIdChange: () => {},
-    onLayerDestroyed: () => {},
-  }
-
-  static childContextTypes = {
-    reactIconBase: PropTypes.object
-  }
-
-  constructor(props: LayerEditorInternalProps) {
-    super(props)
-
-    //TODO: Clean this up and refactor into function
-    const editorGroups: {[keys:string]: boolean} = {}
-    layoutGroups(this.props.layer.type, props.t).forEach(group => {
-      editorGroups[group.title] = true
-    })
-
-    this.state = { editorGroups }
-  }
-
-  static getDerivedStateFromProps(props: Readonly<LayerEditorInternalProps>, state: LayerEditorState) {
-    const additionalGroups = { ...state.editorGroups }
-
-    getLayoutForType(props.layer.type, props.t).groups.forEach(group => {
-      if(!(group.title in additionalGroups)) {
-        additionalGroups[group.title] = true
-      }
-    })
-
-    return {
-      editorGroups: additionalGroups
-    };
-  }
-
-  getChildContext () {
-    return {
-      reactIconBase: {
-        size: 14,
-        color: '#8e8e8e',
-      }
-    }
-  }
-
-  changeProperty(group: keyof LayerSpecification | null, property: string, newValue: any) {
-    this.props.onLayerChanged(
-      this.props.layerIndex,
-      changeProperty(this.props.layer, group, property, newValue)
-    )
-  }
-
-  onGroupToggle(groupTitle: string, active: boolean) {
-    const changedActiveGroups = {
-      ...this.state.editorGroups,
-      [groupTitle]: active,
-    }
-    this.setState({
-      editorGroups: changedActiveGroups
-    })
-  }
-
-  renderGroupType(type: string, fields?: string[]): JSX.Element {
-    let comment = ""
-    if(this.props.layer.metadata) {
-      comment = (this.props.layer.metadata as any)['maputnik:comment']
-    }
-    const {errors, layerIndex} = this.props;
-
-    const errorData: {[key in LayerSpecification as string]: {message: string}} = {};
-    errors!.forEach(error => {
-      if (
-        error.parsed &&
-        error.parsed.type === "layer" &&
-        error.parsed.data.index == layerIndex
-      ) {
-        errorData[error.parsed.data.key] = {
-          message: error.parsed.data.message
-        };
-      }
-    })
-
-    let sourceLayerIds;
-    const layer = this.props.layer as Exclude<LayerSpecification, BackgroundLayerSpecification>;
-    if(Object.prototype.hasOwnProperty.call(this.props.sources, layer.source)) {
-      sourceLayerIds = (this.props.sources[layer.source] as any).layers;
-    }
-
-    switch(type) {
-    case 'layer': return <div>
-      <FieldId
-        value={this.props.layer.id}
-        wdKey="layer-editor.layer-id"
-        error={errorData.id}
-        onChange={newId => this.props.onLayerIdChange(this.props.layerIndex, this.props.layer.id, newId)}
-      />
-      <FieldType
-        disabled={true}
-        error={errorData.type}
-        value={this.props.layer.type}
-        onChange={newType => this.props.onLayerChanged(
-          this.props.layerIndex,
-          changeType(this.props.layer, newType)
-        )}
-      />
-      {this.props.layer.type !== 'background' && <FieldSource
-        error={errorData.source}
-        sourceIds={Object.keys(this.props.sources!)}
-        value={this.props.layer.source}
-        onChange={v => this.changeProperty(null, 'source', v)}
-      />
-      }
-      {['background', 'raster', 'hillshade', 'heatmap'].indexOf(this.props.layer.type) < 0 &&
-        <FieldSourceLayer
-          error={errorData['source-layer']}
-          sourceLayerIds={sourceLayerIds}
-          value={(this.props.layer as any)['source-layer']}
-          onChange={v => this.changeProperty(null, 'source-layer', v)}
-        />
-      }
-      <FieldMinZoom
-        error={errorData.minzoom}
-        value={this.props.layer.minzoom}
-        onChange={v => this.changeProperty(null, 'minzoom', v)}
-      />
-      <FieldMaxZoom
-        error={errorData.maxzoom}
-        value={this.props.layer.maxzoom}
-        onChange={v => this.changeProperty(null, 'maxzoom', v)}
-      />
-      <FieldComment
-        error={errorData.comment}
-        value={comment}
-        onChange={v => this.changeProperty('metadata', 'maputnik:comment', v == ""  ? undefined : v)}
-      />
-    </div>
-    case 'filter': return <div>
-      <div className="maputnik-filter-editor-wrapper">
-        <FilterEditor
-          errors={errorData}
-          filter={(this.props.layer as any).filter}
-          properties={this.props.vectorLayers[(this.props.layer as any)['source-layer']]}
-          onChange={f => this.changeProperty(null, 'filter', f)}
-        />
-      </div>
-    </div>
-    case 'properties':
-      return <PropertyGroup
-        errors={errorData}
-        layer={this.props.layer}
-        groupFields={fields!}
-        spec={this.props.spec}
-        onChange={this.changeProperty.bind(this)}
-      />
-    case 'jsoneditor':
-      return <FieldJson
-        layer={this.props.layer}
-        onChange={(layer) => {
-          this.props.onLayerChanged(
-            this.props.layerIndex,
-            layer
-          );
-        }}
-      />
-    default: return <></>
-    }
-  }
-
-  moveLayer(offset: number) {
-    this.props.onMoveLayer({
-      oldIndex: this.props.layerIndex,
-      newIndex: this.props.layerIndex+offset
-    })
-  }
-
-  render() {
-    const t = this.props.t;
-
-    const groupIds: string[] = [];
-    const layerType = this.props.layer.type
-    const groups = layoutGroups(layerType, t).filter(group => {
-      return !(layerType === 'background' && group.type === 'source')
-    }).map(group => {
-      const groupId = group.id;
-      groupIds.push(groupId);
-      return <LayerEditorGroup
-        data-wd-key={group.title}
-        id={groupId}
-        key={groupId}
-        title={group.title}
-        isActive={this.state.editorGroups[group.title]}
-        onActiveToggle={this.onGroupToggle.bind(this, group.title)}
-      >
-        {this.renderGroupType(group.type, group.fields)}
-      </LayerEditorGroup>
-    })
-
-    const layout = this.props.layer.layout || {}
-
-    const items: {[key: string]: {text: string, handler: () => void, disabled?: boolean}} = {
-      delete: {
-        text: t("Delete"),
-        handler: () => this.props.onLayerDestroy(this.props.layerIndex)
-      },
-      duplicate: {
-        text: t("Duplicate"),
-        handler: () => this.props.onLayerCopy(this.props.layerIndex)
-      },
-      hide: {
-        text: (layout.visibility === "none") ? t("Show") : t("Hide"),
-        handler: () => this.props.onLayerVisibilityToggle(this.props.layerIndex)
-      },
-      moveLayerUp: {
-        text: t("Move layer up"),
-        // Not actually used...
-        disabled: this.props.isFirstLayer,
-        handler: () => this.moveLayer(-1)
-      },
-      moveLayerDown: {
-        text: t("Move layer down"),
-        // Not actually used...
-        disabled: this.props.isLastLayer,
-        handler: () => this.moveLayer(+1)
-      }
-    }
-
-    function handleSelection(id: string, event: React.SyntheticEvent) {
-      event.stopPropagation();
-      items[id].handler();
-    }
-
-    return <section className="maputnik-layer-editor"
-      role="main"
-      aria-label={t("Layer editor")}
-    >
-      <header>
-        <div className="layer-header">
-          <h2 className="layer-header__title">
-            {t("Layer: {{layerId}}", { layerId: formatLayerId(this.props.layer.id) })}
-          </h2>
-          <div className="layer-header__info">
-            <Wrapper
-              className='more-menu'
-              onSelection={handleSelection}
-              closeOnSelection={false}
-            >
-              <Button 
-                id="skip-target-layer-editor" 
-                data-wd-key="skip-target-layer-editor" 
-                className='more-menu__button' 
-                title={"Layer options"}>
-                <MdMoreVert className="more-menu__button__svg" />
-              </Button>
-              <Menu>
-                <ul className="more-menu__menu">
-                  {Object.keys(items).map((id) => {
-                    const item = items[id];
-                    return <li key={id}>
-                      <MenuItem value={id} className='more-menu__menu__item'>
-                        {item.text}
-                      </MenuItem>
-                    </li>
-                  })}
-                </ul>
-              </Menu>
-            </Wrapper>
-          </div>
-        </div>
-
-      </header>
-      <Accordion
-        allowMultipleExpanded={true}
-        allowZeroExpanded={true}
-        preExpanded={groupIds}
-      >
-        {groups}
-      </Accordion>
-    </section>
-  }
-}
-
-const LayerEditor = withTranslation()(LayerEditorInternal);
-export default LayerEditor;

src/components/LayerEditorGroup.tsx

@@ -18,7 +18,7 @@ type LayerEditorGroupProps = {
   title: string
   isActive: boolean
   children: React.ReactElement
-  onActiveToggle(active: boolean): unknown
+  onActiveToggle(...args: unknown[]): unknown
 };
 
 

src/components/LayerList.jsx

@@ -1,4 +1,5 @@
-import React, {type JSX} from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 import classnames from 'classnames'
 import lodash from 'lodash';
 
@@ -6,41 +7,44 @@ import LayerListGroup from './LayerListGroup'
 import LayerListItem from './LayerListItem'
 import ModalAdd from './ModalAdd'
 
-import {SortEndHandler, SortableContainer} from 'react-sortable-hoc';
-import type {LayerSpecification} from 'maplibre-gl';
-import generateUniqueId from '../libs/document-uid';
-import { findClosestCommonPrefix, layerPrefix } from '../libs/layer';
-import { WithTranslation, withTranslation } from 'react-i18next';
+import {SortableContainer} from 'react-sortable-hoc';
 
-type LayerListContainerProps = {
-  layers: LayerSpecification[]
-  selectedLayerIndex: number
-  onLayersChange(layers: LayerSpecification[]): unknown
-  onLayerSelect(...args: unknown[]): unknown
-  onLayerDestroy?(...args: unknown[]): unknown
-  onLayerCopy(...args: unknown[]): unknown
-  onLayerVisibilityToggle(...args: unknown[]): unknown
-  sources: object
-  errors: any[]
-};
-type LayerListContainerInternalProps = LayerListContainerProps & WithTranslation;
+const layerListPropTypes = {
+  layers: PropTypes.array.isRequired,
+  selectedLayerIndex: PropTypes.number.isRequired,
+  onLayersChange: PropTypes.func.isRequired,
+  onLayerSelect: PropTypes.func,
+  sources: PropTypes.object.isRequired,
+}
 
-type LayerListContainerState = {
-  collapsedGroups: {[ket: string]: boolean}
-  areAllGroupsExpanded: boolean
-  keys: {[key: string]: number}
-  isOpen: {[key: string]: boolean}
-};
+function layerPrefix(name) {
+  return name.replace(' ', '-').replace('_', '-').split('-')[0]
+}
+
+function findClosestCommonPrefix(layers, idx) {
+  const currentLayerPrefix = layerPrefix(layers[idx].id)
+  let closestIdx = idx
+  for (let i = idx; i > 0; i--) {
+    const previousLayerPrefix = layerPrefix(layers[i-1].id)
+    if(previousLayerPrefix === currentLayerPrefix) {
+      closestIdx = i - 1
+    } else {
+      return closestIdx
+    }
+  }
+  return closestIdx
+}
+
+let UID = 0;
 
 // List of collapsible layer editors
-class LayerListContainerInternal extends React.Component<LayerListContainerInternalProps, LayerListContainerState> {
+class LayerListContainer extends React.Component {
+  static propTypes = {...layerListPropTypes}
   static defaultProps = {
     onLayerSelect: () => {},
   }
-  selectedItemRef: React.RefObject<any>;
-  scrollContainerRef: React.RefObject<HTMLElement>;
 
-  constructor(props: LayerListContainerInternalProps) {
+  constructor(props) {
     super(props);
     this.selectedItemRef = React.createRef();
     this.scrollContainerRef = React.createRef();
@@ -48,7 +52,7 @@ class LayerListContainerInternal extends React.Component<LayerListContainerInter
       collapsedGroups: {},
       areAllGroupsExpanded: false,
       keys: {
-        add: +generateUniqueId(),
+        add: UID++,
       },
       isOpen: {
         add: false,
@@ -56,11 +60,11 @@ class LayerListContainerInternal extends React.Component<LayerListContainerInter
     }
   }
 
-  toggleModal(modalName: string) {
+  toggleModal(modalName) {
     this.setState({
       keys: {
         ...this.state.keys,
-        [modalName]: +generateUniqueId(),
+        [modalName]: UID++,
       },
       isOpen: {
         ...this.state.isOpen,
@@ -70,9 +74,9 @@ class LayerListContainerInternal extends React.Component<LayerListContainerInter
   }
 
   toggleLayers = () => {
-    let idx = 0
+    let idx=0
 
-    const newGroups: {[key:string]: boolean} = {}
+    let newGroups=[]
 
     this.groupedLayers().forEach(layers => {
       const groupPrefix = layerPrefix(layers[0].id)
@@ -83,7 +87,7 @@ class LayerListContainerInternal extends React.Component<LayerListContainerInter
         newGroups[lookupKey] = this.state.areAllGroupsExpanded
       }
 
-      layers.forEach((_layer) => {
+      layers.forEach((layer) => {
         idx += 1
       })
     });
@@ -94,7 +98,7 @@ class LayerListContainerInternal extends React.Component<LayerListContainerInter
     })
   }
 
-  groupedLayers(): (LayerSpecification & {key: string})[][] {
+  groupedLayers() {
     const groups = []
     const layerIdCount = new Map();
 
@@ -118,7 +122,7 @@ class LayerListContainerInternal extends React.Component<LayerListContainerInter
     return groups
   }
 
-  toggleLayerGroup(groupPrefix: string, idx: number) {
+  toggleLayerGroup(groupPrefix, idx) {
     const lookupKey = [groupPrefix, idx].join('-')
     const newGroups = { ...this.state.collapsedGroups }
     if(lookupKey in this.state.collapsedGroups) {
@@ -131,12 +135,12 @@ class LayerListContainerInternal extends React.Component<LayerListContainerInter
     })
   }
 
-  isCollapsed(groupPrefix: string, idx: number) {
+  isCollapsed(groupPrefix, idx) {
     const collapsed = this.state.collapsedGroups[[groupPrefix, idx].join('-')]
     return collapsed === undefined ? true : collapsed
   }
 
-  shouldComponentUpdate (nextProps: LayerListContainerProps, nextState: LayerListContainerState) {
+  shouldComponentUpdate (nextProps, nextState) {
     // Always update on state change
     if (this.state !== nextState) {
       return true;
@@ -144,8 +148,8 @@ class LayerListContainerInternal extends React.Component<LayerListContainerInter
 
     // This component tree only requires id and visibility from the layers
     // objects
-    function getRequiredProps(layer: LayerSpecification) {
-      const out: {id: string, layout?: { visibility: any}} = {
+    function getRequiredProps (layer) {
+      const out = {
         id: layer.id,
       };
 
@@ -161,10 +165,10 @@ class LayerListContainerInternal extends React.Component<LayerListContainerInter
       this.props.layers.map(getRequiredProps),
     );
 
-    function withoutLayers(props: LayerListContainerProps) {
+    function withoutLayers (props) {
       const out = {
         ...props
-      } as LayerListContainerProps & { layers?: any };
+      };
       delete out['layers'];
       return out;
     }
@@ -180,7 +184,7 @@ class LayerListContainerInternal extends React.Component<LayerListContainerInter
     return propsChanged;
   }
 
-  componentDidUpdate (prevProps: LayerListContainerProps) {
+  componentDidUpdate (prevProps) {
     if (prevProps.selectedLayerIndex !== this.props.selectedLayerIndex) {
       const selectedItemNode = this.selectedItemRef.current;
       if (selectedItemNode && selectedItemNode.node) {
@@ -203,7 +207,7 @@ class LayerListContainerInternal extends React.Component<LayerListContainerInter
 
   render() {
 
-    const listItems: JSX.Element[] = []
+    const listItems = []
     let idx = 0
     const layersByGroup = this.groupedLayers();
     layersByGroup.forEach(layers => {
@@ -231,7 +235,7 @@ class LayerListContainerInternal extends React.Component<LayerListContainerInter
           );
         });
 
-        const additionalProps: {ref?: React.RefObject<any>} = {};
+        const additionalProps = {};
         if (idx === this.props.selectedLayerIndex) {
           additionalProps.ref = this.selectedItemRef;
         }
@@ -251,7 +255,7 @@ class LayerListContainerInternal extends React.Component<LayerListContainerInter
           visibility={(layer.layout || {}).visibility}
           isSelected={idx === this.props.selectedLayerIndex}
           onLayerSelect={this.props.onLayerSelect}
-          onLayerDestroy={this.props.onLayerDestroy?.bind(this)}
+          onLayerDestroy={this.props.onLayerDestroy.bind(this)}
           onLayerCopy={this.props.onLayerCopy.bind(this)}
           onLayerVisibilityToggle={this.props.onLayerVisibilityToggle.bind(this)}
           {...additionalProps}
@@ -261,12 +265,10 @@ class LayerListContainerInternal extends React.Component<LayerListContainerInter
       })
     })
 
-    const t = this.props.t;
-
     return <section
       className="maputnik-layer-list"
       role="complementary"
-      aria-label={t("Layers list")}
+      aria-label="Layers list"
       ref={this.scrollContainerRef}
     >
       <ModalAdd
@@ -278,7 +280,7 @@ class LayerListContainerInternal extends React.Component<LayerListContainerInter
           onLayersChange={this.props.onLayersChange}
       />
       <header className="maputnik-layer-list-header">
-        <span className="maputnik-layer-list-header-title">{t("Layers")}</span>
+        <span className="maputnik-layer-list-header-title">Layers</span>
         <span className="maputnik-space" />
         <div className="maputnik-default-property">
           <div className="maputnik-multibutton">
@@ -287,11 +289,7 @@ class LayerListContainerInternal extends React.Component<LayerListContainerInter
               data-wd-key="skip-target-layer-list"
               onClick={this.toggleLayers}
               className="maputnik-button">
-              {this.state.areAllGroupsExpanded === true ? 
-                t("Collapse") 
-                : 
-                t("Expand")
-              }
+              {this.state.areAllGroupsExpanded === true ? "Collapse" : "Expand"}
             </button>
           </div>
         </div>
@@ -301,14 +299,14 @@ class LayerListContainerInternal extends React.Component<LayerListContainerInter
               onClick={this.toggleModal.bind(this, 'add')}
               data-wd-key="layer-list:add-layer"
               className="maputnik-button maputnik-button-selected">
-              {t("Add Layer")}
+             Add Layer
             </button>
           </div>
         </div>
       </header>
       <div
         role="navigation"
-        aria-label={t("Layers list")}
+        aria-label="Layers list"
       >
         <ul className="maputnik-layer-list-container">
           {listItems}
@@ -318,21 +316,11 @@ class LayerListContainerInternal extends React.Component<LayerListContainerInter
   }
 }
 
-// The next two lines have react-refresh/only-export-components disabled because they are
-// internal components that are not intended to be used outside of this file.
-// For some reason, the linter is not recognizing these components correctly.
-// When these components are migrated to functional components, the HOCs will no longer be needed
-// and the comments can be removed.
-// eslint-disable-next-line react-refresh/only-export-components
-const LayerListContainer = withTranslation()(LayerListContainerInternal);
-// eslint-disable-next-line react-refresh/only-export-components
-const LayerListContainerSortable = SortableContainer((props: LayerListContainerProps) => <LayerListContainer {...props} />)
+const LayerListContainerSortable = SortableContainer((props) => <LayerListContainer {...props} />)
 
-type LayerListProps = LayerListContainerProps & {
-  onMoveLayer: SortEndHandler
-};
+export default class LayerList extends React.Component {
+  static propTypes = {...layerListPropTypes}
 
-export default class LayerList extends React.Component<LayerListProps> {
   render() {
     return <LayerListContainerSortable
       {...this.props}

src/components/LayerListItem.jsx

@@ -8,12 +8,7 @@ import IconLayer from './IconLayer'
 import {SortableElement, SortableHandle} from 'react-sortable-hoc'
 
 
-type DraggableLabelProps = {
-  layerId: string
-  layerType: string
-};
-
-const DraggableLabel = SortableHandle((props: DraggableLabelProps) => {
+const DraggableLabel = SortableHandle((props) => {
   return <div className="maputnik-layer-list-item-handle">
     <IconLayer
       className="layer-handle__icon"
@@ -25,15 +20,15 @@ const DraggableLabel = SortableHandle((props: DraggableLabelProps) => {
   </div>
 });
 
-type IconActionProps = {
-  action: string
-  onClick(...args: unknown[]): unknown
-  wdKey?: string
-  classBlockName?: string
-  classBlockModifier?: string
-};
+class IconAction extends React.Component {
+  static propTypes = {
+    action: PropTypes.string.isRequired,
+    onClick: PropTypes.func.isRequired,
+    wdKey: PropTypes.string,
+    classBlockName: PropTypes.string,
+    classBlockModifier: PropTypes.string,
+  }
 
-class IconAction extends React.Component<IconActionProps> {
   renderIcon() {
     switch(this.props.action) {
       case 'duplicate': return <MdContentCopy />
@@ -56,7 +51,7 @@ class IconAction extends React.Component<IconActionProps> {
     }
 
     return <button
-      tabIndex={-1}
+      tabIndex="-1"
       title={this.props.action}
       className={`maputnik-layer-list-icon-action ${classAdditions}`}
       data-wd-key={this.props.wdKey}
@@ -68,21 +63,21 @@ class IconAction extends React.Component<IconActionProps> {
   }
 }
 
-type LayerListItemProps = {
-  id?: string
-  layerIndex: number
-  layerId: string
-  layerType: string
-  isSelected?: boolean
-  visibility?: string
-  className?: string
-  onLayerSelect(...args: unknown[]): unknown
-  onLayerCopy?(...args: unknown[]): unknown
-  onLayerDestroy?(...args: unknown[]): unknown
-  onLayerVisibilityToggle?(...args: unknown[]): unknown
-};
+class LayerListItem extends React.Component {
+  static propTypes = {
+    layerIndex: PropTypes.number.isRequired,
+    layerId: PropTypes.string.isRequired,
+    layerType: PropTypes.string.isRequired,
+    isSelected: PropTypes.bool,
+    visibility: PropTypes.string,
+    className: PropTypes.string,
+
+    onLayerSelect: PropTypes.func.isRequired,
+    onLayerCopy: PropTypes.func,
+    onLayerDestroy: PropTypes.func,
+    onLayerVisibilityToggle: PropTypes.func,
+  }
 
-class LayerListItem extends React.Component<LayerListItemProps> {
   static defaultProps = {
     isSelected: false,
     visibility: 'visible',
@@ -107,12 +102,12 @@ class LayerListItem extends React.Component<LayerListItemProps> {
     return <li
       id={this.props.id}
       key={this.props.layerId}
-      onClick={_e => this.props.onLayerSelect(this.props.layerIndex)}
+      onClick={e => this.props.onLayerSelect(this.props.layerIndex)}
       data-wd-key={"layer-list-item:"+this.props.layerId}
       className={classnames({
         "maputnik-layer-list-item": true,
         "maputnik-layer-list-item-selected": this.props.isSelected,
-        [this.props.className!]: true,
+        [this.props.className]: true,
       })}>
         <DraggableLabel {...this.props} />
         <span style={{flexGrow: 1}} />
@@ -120,25 +115,25 @@ class LayerListItem extends React.Component<LayerListItemProps> {
           wdKey={"layer-list-item:"+this.props.layerId+":delete"}
           action={'delete'}
           classBlockName="delete"
-        onClick={_e => this.props.onLayerDestroy!(this.props.layerIndex)}
+          onClick={e => this.props.onLayerDestroy(this.props.layerIndex)}
         />
         <IconAction
           wdKey={"layer-list-item:"+this.props.layerId+":copy"}
           action={'duplicate'}
           classBlockName="duplicate"
-        onClick={_e => this.props.onLayerCopy!(this.props.layerIndex)}
+          onClick={e => this.props.onLayerCopy(this.props.layerIndex)}
         />
         <IconAction
           wdKey={"layer-list-item:"+this.props.layerId+":toggle-visibility"}
           action={visibilityAction}
           classBlockName="visibility"
           classBlockModifier={visibilityAction}
-        onClick={_e => this.props.onLayerVisibilityToggle!(this.props.layerIndex)}
+          onClick={e => this.props.onLayerVisibilityToggle(this.props.layerIndex)}
         />
     </li>
   }
 }
 
-const LayerListItemSortable = SortableElement<LayerListItemProps>((props: LayerListItemProps) => <LayerListItem {...props} />);
+const LayerListItemSortable = SortableElement((props) => <LayerListItem {...props} />);
 
 export default LayerListItemSortable;

src/components/MapMaplibreGl.jsx

@@ -0,0 +1,247 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import ReactDOM from 'react-dom'
+import MapLibreGl from 'maplibre-gl'
+import MapboxInspect from 'mapbox-gl-inspect'
+import MapMaplibreGlLayerPopup from './MapMaplibreGlLayerPopup'
+import MapMaplibreGlFeaturePropertyPopup from './MapMaplibreGlFeaturePropertyPopup'
+import tokens from '../config/tokens.json'
+import colors from 'mapbox-gl-inspect/lib/colors'
+import Color from 'color'
+import ZoomControl from '../libs/zoomcontrol'
+import { colorHighlightedLayer } from '../libs/highlight'
+import 'maplibre-gl/dist/maplibre-gl.css'
+import '../maplibregl.css'
+import '../libs/maplibre-rtl'
+
+
+const IS_SUPPORTED = MapLibreGl.supported();
+
+function renderPopup(popup, mountNode) {
+  ReactDOM.render(popup, mountNode);
+  return mountNode;
+}
+
+function buildInspectStyle(originalMapStyle, coloredLayers, highlightedLayer) {
+  const backgroundLayer = {
+    "id": "background",
+    "type": "background",
+    "paint": {
+      "background-color": '#1c1f24',
+    }
+  }
+
+  const layer = colorHighlightedLayer(highlightedLayer)
+  if(layer) {
+    coloredLayers.push(layer)
+  }
+
+  const sources = {}
+  Object.keys(originalMapStyle.sources).forEach(sourceId => {
+    const source = originalMapStyle.sources[sourceId]
+    if(source.type !== 'raster' && source.type !== 'raster-dem') {
+      sources[sourceId] = source
+    }
+  })
+
+  const inspectStyle = {
+    ...originalMapStyle,
+    sources: sources,
+    layers: [backgroundLayer].concat(coloredLayers)
+  }
+  return inspectStyle
+}
+
+export default class MapMaplibreGl extends React.Component {
+  static propTypes = {
+    onDataChange: PropTypes.func,
+    onLayerSelect: PropTypes.func.isRequired,
+    mapStyle: PropTypes.object.isRequired,
+    inspectModeEnabled: PropTypes.bool.isRequired,
+    highlightedLayer: PropTypes.object,
+    options: PropTypes.object,
+    replaceAccessTokens: PropTypes.func.isRequired,
+    onChange: PropTypes.func.isRequired,
+  }
+
+  static defaultProps = {
+    onMapLoaded: () => {},
+    onDataChange: () => {},
+    onLayerSelect: () => {},
+    onChange: () => {},
+    options: {},
+  }
+
+  constructor(props) {
+    super(props)
+    this.state = {
+      map: null,
+      inspect: null,
+    }
+  }
+
+  updateMapFromProps(props) {
+    if(!IS_SUPPORTED) return;
+
+    if(!this.state.map) return
+
+    //Maplibre GL now does diffing natively so we don't need to calculate
+    //the necessary operations ourselves!
+    this.state.map.setStyle(
+      this.props.replaceAccessTokens(props.mapStyle),
+      {diff: true}
+    )
+  }
+
+  shouldComponentUpdate(nextProps, nextState) {
+    let should = false;
+    try {
+      should = JSON.stringify(this.props) !== JSON.stringify(nextProps) || JSON.stringify(this.state) !== JSON.stringify(nextState);
+    } catch(e) {
+      // no biggie, carry on
+    }
+    return should;
+  }
+
+  componentDidUpdate(prevProps, prevState, snapshot) {
+    if(!IS_SUPPORTED) return;
+
+    const map = this.state.map;
+
+    this.updateMapFromProps(this.props);
+
+    if(this.state.inspect && this.props.inspectModeEnabled !== this.state.inspect._showInspectMap) {
+      // HACK: Fix for <https://github.com/maputnik/editor/issues/576>, while we wait for a proper fix.
+      // eslint-disable-next-line
+      this.state.inspect._popupBlocked = false;
+      this.state.inspect.toggleInspector()
+    }
+    if (map) {
+      if (this.props.inspectModeEnabled) {
+        // HACK: We need to work out why we need to do this and what's causing
+        // this error. I'm assuming an issue with maplibre-gl update and
+        // mapbox-gl-inspect.
+        try {
+          this.state.inspect.render();
+        } catch(err) {
+          console.error("FIXME: Caught error", err);
+        }
+      }
+
+      map.showTileBoundaries = this.props.options.showTileBoundaries;
+      map.showCollisionBoxes = this.props.options.showCollisionBoxes;
+      map.showOverdrawInspector = this.props.options.showOverdrawInspector;
+    }
+  }
+
+  componentDidMount() {
+    if(!IS_SUPPORTED) return;
+
+    const mapOpts = {
+      ...this.props.options,
+      container: this.container,
+      style: this.props.mapStyle,
+      hash: true,
+      maxZoom: 24
+    }
+
+    const map = new MapLibreGl.Map(mapOpts);
+
+    const mapViewChange = () => {
+      const center = map.getCenter();
+      const zoom = map.getZoom();
+      this.props.onChange({center, zoom});
+    }
+    mapViewChange();
+
+    map.showTileBoundaries = mapOpts.showTileBoundaries;
+    map.showCollisionBoxes = mapOpts.showCollisionBoxes;
+    map.showOverdrawInspector = mapOpts.showOverdrawInspector;
+
+    const zoomControl = new ZoomControl;
+    map.addControl(zoomControl, 'top-right');
+
+    const nav = new MapLibreGl.NavigationControl({visualizePitch:true});
+    map.addControl(nav, 'top-right');
+
+    const tmpNode = document.createElement('div');
+
+    const inspect = new MapboxInspect({
+      popup: new MapLibreGl.Popup({
+        closeOnClick: false
+      }),
+      showMapPopup: true,
+      showMapPopupOnHover: false,
+      showInspectMapPopupOnHover: true,
+      showInspectButton: false,
+      blockHoverPopupOnClick: true,
+      assignLayerColor: (layerId, alpha) => {
+        return Color(colors.brightColor(layerId, alpha)).desaturate(0.5).string()
+      },
+      buildInspectStyle: (originalMapStyle, coloredLayers) => buildInspectStyle(originalMapStyle, coloredLayers, this.props.highlightedLayer),
+      renderPopup: features => {
+        if(this.props.inspectModeEnabled) {
+          return renderPopup(<MapMaplibreGlFeaturePropertyPopup features={features} />, tmpNode);
+        } else {
+          return renderPopup(<MapMaplibreGlLayerPopup features={features} onLayerSelect={this.onLayerSelectById} zoom={this.state.zoom} />, tmpNode);
+        }
+      }
+    })
+    map.addControl(inspect)
+
+    map.on("style.load", () => {
+      this.setState({
+        map,
+        inspect,
+        zoom: map.getZoom()
+      });
+    })
+
+    map.on("data", e => {
+      if(e.dataType !== 'tile') return
+      this.props.onDataChange({
+        map: this.state.map
+      })
+    })
+
+    map.on("error", e => {
+      console.log("ERROR", e);
+    })
+
+    map.on("zoom", e => {
+      this.setState({
+        zoom: map.getZoom()
+      });
+    });
+
+    map.on("dragend", mapViewChange);
+    map.on("zoomend", mapViewChange);
+  }
+
+  onLayerSelectById = (id) => {
+    const index = this.props.mapStyle.layers.findIndex(layer => layer.id === id);
+    this.props.onLayerSelect(index);
+  }
+
+  render() {
+    if(IS_SUPPORTED) {
+      return <div
+        className="maputnik-map__map"
+        role="region"
+        aria-label="Map view"
+        ref={x => this.container = x}
+        data-wd-key="maplibre:map"
+      ></div>
+    }
+    else {
+      return <div
+        className="maputnik-map maputnik-map--error"
+      >
+        <div className="maputnik-map__error-message">
+          Error: Cannot load MaplibreGL, WebGL is either unsupported or disabled
+        </div>
+      </div>
+    }
+  }
+}
+

src/components/MapMaplibreGl.tsx

@@ -1,279 +0,0 @@
-import React, {type JSX} from 'react'
-import ReactDOM from 'react-dom'
-import MapLibreGl, {LayerSpecification, LngLat, Map, MapOptions, SourceSpecification, StyleSpecification} from 'maplibre-gl'
-import MaplibreInspect from '@maplibre/maplibre-gl-inspect'
-import colors from '@maplibre/maplibre-gl-inspect/lib/colors'
-import MapMaplibreGlLayerPopup from './MapMaplibreGlLayerPopup'
-import MapMaplibreGlFeaturePropertyPopup, { InspectFeature } from './MapMaplibreGlFeaturePropertyPopup'
-import Color from 'color'
-import ZoomControl from '../libs/zoomcontrol'
-import { HighlightedLayer, colorHighlightedLayer } from '../libs/highlight'
-import 'maplibre-gl/dist/maplibre-gl.css'
-import '../maplibregl.css'
-import '../libs/maplibre-rtl'
-import MaplibreGeocoder, { MaplibreGeocoderApi, MaplibreGeocoderApiConfig } from '@maplibre/maplibre-gl-geocoder';
-import '@maplibre/maplibre-gl-geocoder/dist/maplibre-gl-geocoder.css';
-import { withTranslation, WithTranslation } from 'react-i18next'
-
-function renderPopup(popup: JSX.Element, mountNode: ReactDOM.Container): HTMLElement {
-  ReactDOM.render(popup, mountNode);
-  return mountNode as HTMLElement;
-}
-
-function buildInspectStyle(originalMapStyle: StyleSpecification, coloredLayers: HighlightedLayer[], highlightedLayer?: HighlightedLayer) {
-  const backgroundLayer = {
-    "id": "background",
-    "type": "background",
-    "paint": {
-      "background-color": '#1c1f24',
-    }
-  } as LayerSpecification
-
-  const layer = colorHighlightedLayer(highlightedLayer)
-  if(layer) {
-    coloredLayers.push(layer)
-  }
-
-  const sources: {[key:string]: SourceSpecification} = {}
-
-  Object.keys(originalMapStyle.sources).forEach(sourceId => {
-    const source = originalMapStyle.sources[sourceId]
-    if(source.type !== 'raster' && source.type !== 'raster-dem') {
-      sources[sourceId] = source
-    }
-  })
-
-  const inspectStyle = {
-    ...originalMapStyle,
-    sources: sources,
-    layers: [backgroundLayer].concat(coloredLayers as LayerSpecification[])
-  }
-  return inspectStyle
-}
-
-type MapMaplibreGlInternalProps = {
-  onDataChange?(event: {map: Map | null}): unknown
-  onLayerSelect(...args: unknown[]): unknown
-  mapStyle: StyleSpecification
-  inspectModeEnabled: boolean
-  highlightedLayer?: HighlightedLayer
-  options?: Partial<MapOptions> & {
-    showTileBoundaries?: boolean
-    showCollisionBoxes?: boolean
-    showOverdrawInspector?: boolean
-  }
-  replaceAccessTokens(mapStyle: StyleSpecification): StyleSpecification
-  onChange(value: {center: LngLat, zoom: number}): unknown
-} & WithTranslation;
-
-type MapMaplibreGlState = {
-  map: Map | null
-  inspect: MaplibreInspect | null
-  zoom?: number
-};
-
-class MapMaplibreGlInternal extends React.Component<MapMaplibreGlInternalProps, MapMaplibreGlState> {
-  static defaultProps = {
-    onMapLoaded: () => {},
-    onDataChange: () => {},
-    onLayerSelect: () => {},
-    onChange: () => {},
-    options: {} as MapOptions,
-  }
-  container: HTMLDivElement | null = null
-
-  constructor(props: MapMaplibreGlInternalProps) {
-    super(props)
-    this.state = {
-      map: null,
-      inspect: null,
-    }
-  }
-
-
-  shouldComponentUpdate(nextProps: MapMaplibreGlInternalProps, nextState: MapMaplibreGlState) {
-    let should = false;
-    try {
-      should = JSON.stringify(this.props) !== JSON.stringify(nextProps) || JSON.stringify(this.state) !== JSON.stringify(nextState);
-    } catch(e) {
-      // no biggie, carry on
-    }
-    return should;
-  }
-
-  componentDidUpdate() {
-    const map = this.state.map;
-
-    const styleWithTokens = this.props.replaceAccessTokens(this.props.mapStyle);
-    if (map) {
-      // Maplibre GL now does diffing natively so we don't need to calculate
-      // the necessary operations ourselves!
-      // We also need to update the style for inspect to work properly
-      map.setStyle(styleWithTokens, {diff: true});
-      map.showTileBoundaries = this.props.options?.showTileBoundaries!;
-      map.showCollisionBoxes = this.props.options?.showCollisionBoxes!;
-      map.showOverdrawInspector = this.props.options?.showOverdrawInspector!;
-    }
-
-    if(this.state.inspect && this.props.inspectModeEnabled !== this.state.inspect._showInspectMap) {
-      this.state.inspect.toggleInspector()
-    }
-    if (this.state.inspect && this.props.inspectModeEnabled) {
-      this.state.inspect.setOriginalStyle(styleWithTokens);
-      // In case the sources are the same, there's a need to refresh the style
-      setTimeout(() => {
-        this.state.inspect!.render();
-      }, 500);
-    }
-  }
-
-  componentDidMount() {
-    const mapOpts = {
-      ...this.props.options,
-      container: this.container!,
-      style: this.props.mapStyle,
-      hash: true,
-      maxZoom: 24,
-      // setting to always load glyphs of CJK fonts from server
-      // https://maplibre.org/maplibre-gl-js/docs/examples/local-ideographs/
-      localIdeographFontFamily: false
-    } satisfies MapOptions;
-
-    const map = new MapLibreGl.Map(mapOpts);
-
-    const mapViewChange = () => {
-      const center = map.getCenter();
-      const zoom = map.getZoom();
-      this.props.onChange({center, zoom});
-    }
-    mapViewChange();
-
-    map.showTileBoundaries = mapOpts.showTileBoundaries!;
-    map.showCollisionBoxes = mapOpts.showCollisionBoxes!;
-    map.showOverdrawInspector = mapOpts.showOverdrawInspector!;
-
-    this.initGeocoder(map);
-
-    const zoomControl = new ZoomControl(this.props.t("Zoom:"));
-    map.addControl(zoomControl, 'top-right');
-
-    const nav = new MapLibreGl.NavigationControl({visualizePitch:true});
-    map.addControl(nav, 'top-right');
-
-    const tmpNode = document.createElement('div');
-
-    const inspect = new MaplibreInspect({
-      popup: new MapLibreGl.Popup({
-        closeOnClick: false
-      }),
-      showMapPopup: true,
-      showMapPopupOnHover: false,
-      showInspectMapPopupOnHover: true,
-      showInspectButton: false,
-      blockHoverPopupOnClick: true,
-      assignLayerColor: (layerId: string, alpha: number) => {
-        return Color(colors.brightColor(layerId, alpha)).desaturate(0.5).string()
-      },
-      buildInspectStyle: (originalMapStyle: StyleSpecification, coloredLayers: HighlightedLayer[]) => buildInspectStyle(originalMapStyle, coloredLayers, this.props.highlightedLayer),
-      renderPopup: (features: InspectFeature[]) => {
-        if(this.props.inspectModeEnabled) {
-          return renderPopup(<MapMaplibreGlFeaturePropertyPopup features={features} />, tmpNode);
-        } else {
-          return renderPopup(<MapMaplibreGlLayerPopup features={features} onLayerSelect={this.onLayerSelectById} zoom={this.state.zoom} />, tmpNode);
-        }
-      }
-    })
-    map.addControl(inspect)
-
-    map.on("style.load", () => {
-      this.setState({
-        map,
-        inspect,
-        zoom: map.getZoom()
-      });
-    })
-
-    map.on("data", e => {
-      if(e.dataType !== 'tile') return
-      this.props.onDataChange!({
-        map: this.state.map
-      })
-    })
-
-    map.on("error", e => {
-      console.log("ERROR", e);
-    })
-
-    map.on("zoom", _e => {
-      this.setState({
-        zoom: map.getZoom()
-      });
-    });
-
-    map.on("dragend", mapViewChange);
-    map.on("zoomend", mapViewChange);
-  }
-
-  onLayerSelectById = (id: string) => {
-    const index = this.props.mapStyle.layers.findIndex(layer => layer.id === id);
-    this.props.onLayerSelect(index);
-  }
-
-  initGeocoder(map: Map) {
-    const geocoderConfig = {
-      forwardGeocode: async (config: MaplibreGeocoderApiConfig) => {
-        const features = [];
-        try {
-          const request = `https://nominatim.openstreetmap.org/search?q=${config.query}&format=geojson&polygon_geojson=1&addressdetails=1`;
-          const response = await fetch(request);
-          const geojson = await response.json();
-          for (const feature of geojson.features) {
-            const center = [
-              feature.bbox[0] +
-                  (feature.bbox[2] - feature.bbox[0]) / 2,
-              feature.bbox[1] +
-                  (feature.bbox[3] - feature.bbox[1]) / 2
-            ];
-            const point = {
-              type: 'Feature',
-              geometry: {
-                type: 'Point',
-                coordinates: center
-              },
-              place_name: feature.properties.display_name,
-              properties: feature.properties,
-              text: feature.properties.display_name,
-              place_type: ['place'],
-              center
-            };
-            features.push(point);
-          }
-        } catch (e) {
-          console.error(`Failed to forwardGeocode with error: ${e}`);
-        }
-        return {
-          features
-        };
-      },
-    } as unknown as MaplibreGeocoderApi;
-    const geocoder = new MaplibreGeocoder(geocoderConfig, {
-      placeholder: this.props.t("Search"),
-      maplibregl: MapLibreGl,
-    });
-    map.addControl(geocoder, 'top-left');
-  }
-
-  render() {
-    const t = this.props.t;
-    return <div
-      className="maputnik-map__map"
-      role="region"
-      aria-label={t("Map view")}
-      ref={x => this.container = x}
-      data-wd-key="maplibre:map"
-    ></div>
-  }
-}
-
-const MapMaplibreGl = withTranslation()(MapMaplibreGlInternal);
-export default MapMaplibreGl;

src/components/MapMaplibreGlFeaturePropertyPopup.jsx

@@ -0,0 +1,78 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import Block from './Block'
+import FieldString from './FieldString'
+
+function displayValue(value) {
+  if (typeof value === 'undefined' || value === null) return value;
+  if (value instanceof Date) return value.toLocaleString();
+  if (typeof value === 'object' ||
+          typeof value === 'number' ||
+          typeof value === 'string') return value.toString();
+  return value;
+}
+
+function renderProperties(feature) {
+  return Object.keys(feature.properties).map(propertyName => {
+    const property = feature.properties[propertyName]
+    return <Block key={propertyName} label={propertyName}>
+      <FieldString value={displayValue(property)} style={{backgroundColor: 'transparent'}}/>
+    </Block>
+  })
+}
+
+function renderFeatureId(feature) {
+  return <Block key={"feature-id"} label={"feature_id"}>
+    <FieldString value={displayValue(feature.id)} style={{backgroundColor: 'transparent'}} />
+  </Block>
+  }
+
+function renderFeature(feature, idx) {
+  return <div key={`${feature.sourceLayer}-${idx}`}>
+    <div className="maputnik-popup-layer-id">{feature.layer['source']}: {feature.layer['source-layer']}{feature.inspectModeCounter && <span> × {feature.inspectModeCounter}</span>}</div>
+    <Block key={"property-type"} label={"$type"}>
+      <FieldString value={feature.geometry.type} style={{backgroundColor: 'transparent'}} />
+    </Block>
+    {renderFeatureId(feature)}
+    {renderProperties(feature)}
+  </div>
+}
+
+function removeDuplicatedFeatures(features) {
+  let uniqueFeatures = [];
+
+  features.forEach(feature => {
+    const featureIndex = uniqueFeatures.findIndex(feature2 => {
+      return feature.layer['source-layer'] === feature2.layer['source-layer']
+        && JSON.stringify(feature.properties) === JSON.stringify(feature2.properties)
+    })
+
+    if(featureIndex === -1) {
+      uniqueFeatures.push(feature)
+    } else {
+      if(uniqueFeatures[featureIndex].hasOwnProperty('inspectModeCounter')) {
+        uniqueFeatures[featureIndex].inspectModeCounter++
+      } else {
+        uniqueFeatures[featureIndex].inspectModeCounter = 2
+      }
+    }
+  })
+
+  return uniqueFeatures
+}
+
+class FeaturePropertyPopup extends React.Component {
+  static propTypes = {
+    features: PropTypes.array
+  }
+
+  render() {
+    const features = removeDuplicatedFeatures(this.props.features)
+    return <div className="maputnik-feature-property-popup">
+      {features.map(renderFeature)}
+    </div>
+  }
+}
+
+
+export default FeaturePropertyPopup

src/components/MapMaplibreGlFeaturePropertyPopup.tsx

@@ -1,80 +0,0 @@
-import React from 'react'
-import type { GeoJSONFeatureWithSourceLayer } from '@maplibre/maplibre-gl-inspect'
-
-export type InspectFeature = GeoJSONFeatureWithSourceLayer & {
-  inspectModeCounter?: number
-  counter?: number
-}
-
-function displayValue(value: string | number | Date | object | undefined) {
-  if (typeof value === 'undefined' || value === null) return value;
-  if (value instanceof Date) return value.toLocaleString();
-  if (typeof value === 'object' ||
-          typeof value === 'number' ||
-          typeof value === 'string') return value.toString();
-  return value;
-}
-
-function renderKeyValueTableRow(key: string, value: string | undefined) {
-  return <tr key={key}>
-    <td className="maputnik-popup-table-cell">{key}</td>
-    <td className="maputnik-popup-table-cell">{value}</td>
-  </tr>
-}
-
-function renderFeature(feature: InspectFeature, idx: number) {
-  return <React.Fragment key={idx}>
-    <tr>
-      <td colSpan={2} className="maputnik-popup-layer-id">{feature.layer['source']}: {feature.layer['source-layer']}{feature.inspectModeCounter && <span> × {feature.inspectModeCounter}</span>}</td>
-    </tr>
-    {renderKeyValueTableRow("$type", feature.geometry.type)}
-    {renderKeyValueTableRow("$id", displayValue(feature.id))}
-    {Object.keys(feature.properties).map(propertyName => {
-      const property = feature.properties[propertyName];
-      return renderKeyValueTableRow(propertyName, displayValue(property))
-    })}
-  </React.Fragment>
-}
-
-function removeDuplicatedFeatures(features: InspectFeature[]) {
-  const uniqueFeatures: InspectFeature[] = [];
-
-  features.forEach(feature => {
-    const featureIndex = uniqueFeatures.findIndex(feature2 => {
-      return feature.layer['source-layer'] === feature2.layer['source-layer']
-        && JSON.stringify(feature.properties) === JSON.stringify(feature2.properties)
-    })
-
-    if(featureIndex === -1) {
-      uniqueFeatures.push(feature)
-    } else {
-      if('inspectModeCounter' in uniqueFeatures[featureIndex]) {
-        uniqueFeatures[featureIndex].inspectModeCounter!++
-      } else {
-        uniqueFeatures[featureIndex].inspectModeCounter = 2
-      }
-    }
-  })
-
-  return uniqueFeatures
-}
-
-type FeaturePropertyPopupProps = {
-  features: InspectFeature[]
-};
-
-class FeaturePropertyPopup extends React.Component<FeaturePropertyPopupProps> {
-  render() {
-    const features = removeDuplicatedFeatures(this.props.features)
-    return <div className="maputnik-feature-property-popup">
-      <table className="maputnik-popup-table">
-        <tbody>
-          {features.map(renderFeature)}
-        </tbody>
-      </table>
-    </div>
-  }
-}
-
-
-export default FeaturePropertyPopup

src/components/MapMaplibreGlLayerPopup.tsx

@@ -1,23 +1,21 @@
 import React from 'react'
 import IconLayer from './IconLayer'
-import type {InspectFeature} from './MapMaplibreGlFeaturePropertyPopup';
 
-function groupFeaturesBySourceLayer(features: InspectFeature[]) {
-  const sources: {[key: string]: InspectFeature[]} = {}
+function groupFeaturesBySourceLayer(features: any[]) {
+  const sources = {} as any
 
-  const returnedFeatures: {[key: string]: number} = {}
+  let returnedFeatures = {} as any;
 
   features.forEach(feature => {
-    const sourceKey = feature.layer['source-layer'] as string;
-    if(Object.prototype.hasOwnProperty.call(returnedFeatures, feature.layer.id)) {
+    if(returnedFeatures.hasOwnProperty(feature.layer.id)) {
       returnedFeatures[feature.layer.id]++
 
-      const featureObject = sources[sourceKey].find((f: InspectFeature) => f.layer.id === feature.layer.id)
+      const featureObject = sources[feature.layer['source-layer']].find((f: any) => f.layer.id === feature.layer.id)
 
-      featureObject!.counter = returnedFeatures[feature.layer.id]
+      featureObject.counter = returnedFeatures[feature.layer.id]
     } else {
-      sources[sourceKey] = sources[sourceKey] || []
-      sources[sourceKey].push(feature)
+      sources[feature.layer['source-layer']] = sources[feature.layer['source-layer']] || []
+      sources[feature.layer['source-layer']].push(feature)
 
       returnedFeatures[feature.layer.id] = 1
     }
@@ -27,13 +25,13 @@ function groupFeaturesBySourceLayer(features: InspectFeature[]) {
 }
 
 type FeatureLayerPopupProps = {
-  onLayerSelect(layerId: string): unknown
-  features: InspectFeature[]
+  onLayerSelect(...args: unknown[]): unknown
+  features: any[]
   zoom?: number
 };
 
 class FeatureLayerPopup extends React.Component<FeatureLayerPopupProps> {
-  _getFeatureColor(feature: InspectFeature, _zoom?: number) {
+  _getFeatureColor(feature: any, _zoom?: number) {
     // Guard because openlayers won't have this
     if (!feature.layer.paint) {
       return;
@@ -41,22 +39,30 @@ class FeatureLayerPopup extends React.Component<FeatureLayerPopupProps> {
 
     try {
       const paintProps = feature.layer.paint;
+      let propName;
 
-      if("text-color" in paintProps && paintProps["text-color"]) {
-        return String(paintProps["text-color"]);
+      if(paintProps.hasOwnProperty("text-color") && paintProps["text-color"]) {
+        propName = "text-color";
       }
-      if ("fill-color" in paintProps && paintProps["fill-color"]) {
-        return String(paintProps["fill-color"]);
+      else if (paintProps.hasOwnProperty("fill-color") && paintProps["fill-color"]) {
+        propName = "fill-color";
       }
-      if ("line-color" in paintProps && paintProps["line-color"]) {
-        return String(paintProps["line-color"]);
+      else if (paintProps.hasOwnProperty("line-color") && paintProps["line-color"]) {
+        propName = "line-color";
       }
-      if ("fill-extrusion-color" in paintProps && paintProps["fill-extrusion-color"]) {
-        return String(paintProps["fill-extrusion-color"]);
+      else if (paintProps.hasOwnProperty("fill-extrusion-color") && paintProps["fill-extrusion-color"]) {
+        propName = "fill-extrusion-color";
       }
+
+      if(propName) {
+        let color = feature.layer.paint[propName];
+        return String(color);
+      }
+      else {
         // Default color
         return "black";
       }
+    }
     // This is quite complex, just incase there's an edgecase we're missing
     // always return black if we get an unexpected error.
     catch (err) {
@@ -69,7 +75,7 @@ class FeatureLayerPopup extends React.Component<FeatureLayerPopupProps> {
     const sources = groupFeaturesBySourceLayer(this.props.features)
 
     const items = Object.keys(sources).map(vectorLayerId => {
-      const layers = sources[vectorLayerId].map((feature: InspectFeature, idx: number) => {
+      const layers = sources[vectorLayerId].map((feature: any, idx: number) => {
         const featureColor = this._getFeatureColor(feature, this.props.zoom);
 
         return <div

src/components/MapOpenLayers.tsx

@@ -1,16 +1,14 @@
 import React from 'react'
 import {throttle} from 'lodash';
-import { WithTranslation, withTranslation } from 'react-i18next';
 
 import MapMaplibreGlLayerPopup from './MapMaplibreGlLayerPopup';
 
 import 'ol/ol.css'
-//@ts-ignore
 import {apply} from 'ol-mapbox-style';
 import {Map, View, Overlay} from 'ol';
 
 import {toLonLat} from 'ol/proj';
-import type {StyleSpecification} from 'maplibre-gl';
+import { StyleSpecification } from '@maplibre/maplibre-gl-style-spec';
 
 
 function renderCoords (coords: string[]) {
@@ -24,7 +22,7 @@ function renderCoords (coords: string[]) {
   }
 }
 
-type MapOpenLayersInternalProps = {
+type MapOpenLayersProps = {
   onDataChange?(...args: unknown[]): unknown
   mapStyle: object
   accessToken?: string
@@ -33,7 +31,7 @@ type MapOpenLayersInternalProps = {
   debugToolbox: boolean
   replaceAccessTokens(...args: unknown[]): unknown
   onChange(...args: unknown[]): unknown
-} & WithTranslation;
+};
 
 type MapOpenLayersState = {
   zoom: string
@@ -43,7 +41,7 @@ type MapOpenLayersState = {
   selectedFeatures?: any[]
 };
 
-class MapOpenLayersInternal extends React.Component<MapOpenLayersInternalProps, MapOpenLayersState> {
+export default class MapOpenLayers extends React.Component<MapOpenLayersProps, MapOpenLayersState> {
   static defaultProps = {
     onMapLoaded: () => {},
     onDataChange: () => {},
@@ -55,7 +53,7 @@ class MapOpenLayersInternal extends React.Component<MapOpenLayersInternalProps,
   overlay: Overlay | undefined;
   popupContainer: HTMLElement | null = null;
 
-  constructor(props: MapOpenLayersInternalProps) {
+  constructor(props: MapOpenLayersProps) {
     super(props);
     this.state = {
       zoom: "0",
@@ -74,7 +72,7 @@ class MapOpenLayersInternal extends React.Component<MapOpenLayersInternalProps,
     apply(this.map, newMapStyle);
   }
 
-  componentDidUpdate(prevProps: MapOpenLayersInternalProps) {
+  componentDidUpdate(prevProps: MapOpenLayersProps) {
     if (this.props.mapStyle !== prevProps.mapStyle) {
       this.updateStyle(
         this.props.replaceAccessTokens(this.props.mapStyle)
@@ -101,7 +99,7 @@ class MapOpenLayersInternal extends React.Component<MapOpenLayersInternalProps,
     });
 
     map.on('pointermove', (evt) => {
-      const coords = toLonLat(evt.coordinate);
+      var coords = toLonLat(evt.coordinate);
       this.setState({
         cursor: [
           coords[0].toFixed(2),
@@ -152,7 +150,6 @@ class MapOpenLayersInternal extends React.Component<MapOpenLayersInternalProps,
   }
 
   render() {
-    const t = this.props.t;
     return <div className="maputnik-ol-container">
       <div
         ref={x => this.popupContainer = x}
@@ -162,7 +159,7 @@ class MapOpenLayersInternal extends React.Component<MapOpenLayersInternalProps,
         <button
           className="maplibregl-popup-close-button"
           onClick={this.closeOverlay}
-          aria-label={t("Close popup")}
+          aria-label="Close popup"
         >
           ×
         </button>
@@ -172,20 +169,20 @@ class MapOpenLayersInternal extends React.Component<MapOpenLayersInternalProps,
         />
       </div>
       <div className="maputnik-ol-zoom">
-        {t("Zoom:")} {this.state.zoom}
+        Zoom: {this.state.zoom}
       </div>
       {this.props.debugToolbox &&
         <div className="maputnik-ol-debug">
           <div>
-            <label>{t("cursor:")} </label>
+            <label>cursor: </label>
             <span>{renderCoords(this.state.cursor)}</span>
           </div>
           <div>
-            <label>{t("center:")} </label>
+            <label>center: </label>
             <span>{renderCoords(this.state.center)}</span>
           </div>
           <div>
-            <label>{t("rotation:")} </label>
+            <label>rotation: </label>
             <span>{this.state.rotation}</span>
           </div>
         </div>
@@ -194,7 +191,7 @@ class MapOpenLayersInternal extends React.Component<MapOpenLayersInternalProps,
         className="maputnik-ol"
         ref={x => this.container = x}
         role="region"
-        aria-label={t("Map view")}
+        aria-label="Map view"
         style={{
           ...this.props.style,
         }}>
@@ -203,5 +200,3 @@ class MapOpenLayersInternal extends React.Component<MapOpenLayersInternalProps,
   }
 }
 
-const MapOpenLayers = withTranslation()(MapOpenLayersInternal);
-export default MapOpenLayers;

src/components/Modal.tsx

@@ -1,26 +1,26 @@
-import React, { PropsWithChildren } from 'react'
+import React from 'react'
 import {MdClose} from 'react-icons/md'
 import AriaModal from 'react-aria-modal'
 import classnames from 'classnames';
-import { WithTranslation, withTranslation } from 'react-i18next';
 
-type ModalInternalProps = PropsWithChildren & {
+
+type ModalProps = {
   "data-wd-key"?: string
   isOpen: boolean
   title: string
-  onOpenToggle(value: boolean): unknown
+  onOpenToggle(...args: unknown[]): unknown
   underlayClickExits?: boolean
   underlayProps?: any
   className?: string
-} & WithTranslation;
+};
 
 
-class ModalInternal extends React.Component<ModalInternalProps> {
+export default class Modal extends React.Component<ModalProps> {
   static defaultProps = {
     underlayClickExits: true
   }
 
-  // See <https://github.com/maplibre/maputnik/issues/416>
+  // See <https://github.com/maputnik/editor/issues/416>
   onClose = () => {
     if (document.activeElement) {
       (document.activeElement as HTMLElement).blur();
@@ -32,7 +32,6 @@ class ModalInternal extends React.Component<ModalInternalProps> {
   }
 
   render() {
-    const t = this.props.t;
     if(this.props.isOpen) {
       return <AriaModal
         titleText={this.props.title}
@@ -50,7 +49,7 @@ class ModalInternal extends React.Component<ModalInternalProps> {
             <h1 className="maputnik-modal-header-title">{this.props.title}</h1>
             <span className="maputnik-modal-header-space"></span>
             <button className="maputnik-modal-header-toggle"
-              title={t("Close modal")}
+              title="Close modal"
               onClick={this.onClose}
               data-wd-key={this.props["data-wd-key"]+".close-modal"}
             >
@@ -69,5 +68,3 @@ class ModalInternal extends React.Component<ModalInternalProps> {
   }
 }
 
-const Modal = withTranslation()(ModalInternal);
-export default Modal;

src/components/ModalAdd.tsx

@@ -6,26 +6,24 @@ import FieldType from './FieldType'
 import FieldId from './FieldId'
 import FieldSource from './FieldSource'
 import FieldSourceLayer from './FieldSourceLayer'
-import type {LayerSpecification} from 'maplibre-gl'
-import { WithTranslation, withTranslation } from 'react-i18next';
 
-type ModalAddInternalProps = {
-  layers: LayerSpecification[]
-  onLayersChange(layers: LayerSpecification[]): unknown
+type ModalAddProps = {
+  layers: unknown[]
+  onLayersChange(...args: unknown[]): unknown
   isOpen: boolean
-  onOpenToggle(open: boolean): unknown
+  onOpenToggle(...args: unknown[]): unknown
   // A dict of source id's and the available source layers
   sources: any
-} & WithTranslation;
+};
 
 type ModalAddState = {
-  type: LayerSpecification["type"]
+  type: string
   id: string
   source?: string
   'source-layer'?: string
 };
 
-class ModalAddInternal extends React.Component<ModalAddInternalProps, ModalAddState> {
+export default class ModalAdd extends React.Component<ModalAddProps, ModalAddState> {
   addLayer = () => {
     const changedLayers = this.props.layers.slice(0)
     const layer: ModalAddState = {
@@ -40,13 +38,13 @@ class ModalAddInternal extends React.Component<ModalAddInternalProps, ModalAddSt
       }
     }
 
-    changedLayers.push(layer as LayerSpecification)
+    changedLayers.push(layer)
 
     this.props.onLayersChange(changedLayers)
     this.props.onOpenToggle(false)
   }
 
-  constructor(props: ModalAddInternalProps) {
+  constructor(props: ModalAddProps) {
     super(props)
     const state: ModalAddState = {
       type: 'fill',
@@ -55,12 +53,12 @@ class ModalAddInternal extends React.Component<ModalAddInternalProps, ModalAddSt
 
     if(props.sources.length > 0) {
       state.source = Object.keys(this.props.sources)[0];
-      state['source-layer'] = this.props.sources[state.source as keyof ModalAddInternalProps["sources"]][0]
+      state['source-layer'] = this.props.sources[state.source as keyof ModalAddProps["sources"]][0]
     }
     this.state = state;
   }
 
-  componentDidUpdate(_prevProps: ModalAddInternalProps, prevState: ModalAddState) {
+  componentDidUpdate(_prevProps: ModalAddProps, prevState: ModalAddState) {
     // Check if source is valid for new type
     const oldType = prevState.type;
     const newType = this.state.type;
@@ -114,7 +112,7 @@ class ModalAddInternal extends React.Component<ModalAddInternalProps, ModalAddSt
       ]
     }
 
-    for(const [key, val] of Object.entries(this.props.sources) as any) {
+    for(let [key, val] of Object.entries(this.props.sources) as any) {
       const valType = val.type as keyof typeof types;
       if(types[valType] && types[valType].indexOf(type) > -1) {
         sources.push(key);
@@ -126,14 +124,13 @@ class ModalAddInternal extends React.Component<ModalAddInternalProps, ModalAddSt
 
 
   render() {
-    const t = this.props.t;
     const sources = this.getSources(this.state.type);
     const layers = this.getLayersForSource(this.state.source!);
 
     return <Modal
       isOpen={this.props.isOpen}
       onOpenToggle={this.props.onOpenToggle}
-      title={t('Add Layer')}
+      title={'Add Layer'}
       data-wd-key="modal:add-layer"
       className="maputnik-add-modal"
     >
@@ -148,7 +145,7 @@ class ModalAddInternal extends React.Component<ModalAddInternalProps, ModalAddSt
       <FieldType
         value={this.state.type}
         wdKey="add-layer.layer-type"
-          onChange={(v: LayerSpecification["type"]) => this.setState({ type: v })}
+        onChange={(v: string) => this.setState({ type: v })}
       />
       {this.state.type !== 'background' &&
       <FieldSource
@@ -171,12 +168,10 @@ class ModalAddInternal extends React.Component<ModalAddInternalProps, ModalAddSt
         onClick={this.addLayer}
         data-wd-key="add-layer"
       >
-          {t("Add Layer")}
+        Add Layer
       </InputButton>
       </div>
     </Modal>
   }
 }
 
-const ModalAdd = withTranslation()(ModalAddInternal);
-export default ModalAdd;

src/components/ModalDebug.tsx

@@ -1,49 +1,48 @@
 import React from 'react'
 
-import { Trans, WithTranslation, withTranslation } from 'react-i18next';
 import Modal from './Modal'
 
 
-type ModalDebugInternalProps = {
+type ModalDebugProps = {
   isOpen: boolean
   renderer: string
-  onChangeMaplibreGlDebug(key: string, checked: boolean): unknown
-  onChangeOpenlayersDebug(key: string, checked: boolean): unknown
-  onOpenToggle(value: boolean): unknown
+  onChangeMaboxGlDebug(...args: unknown[]): unknown
+  onChangeOpenlayersDebug(...args: unknown[]): unknown
+  onOpenToggle(...args: unknown[]): unknown
   maplibreGlDebugOptions?: object
   openlayersDebugOptions?: object
   mapView: {
     zoom: number
     center: {
-      lng: number
-      lat: number
+      lng: string
+      lat: string
     }
   }
-} & WithTranslation;
+};
 
 
-class ModalDebugInternal extends React.Component<ModalDebugInternalProps> {
+export default class ModalDebug extends React.Component<ModalDebugProps> {
   render() {
-    const {t, mapView} = this.props;
+    const {mapView} = this.props;
 
     const osmZoom = Math.round(mapView.zoom)+1;
-    const osmLon = +(mapView.center.lng).toFixed(5);
-    const osmLat = +(mapView.center.lat).toFixed(5);
+    const osmLon = Number.parseFloat(mapView.center.lng).toFixed(5);
+    const osmLat = Number.parseFloat(mapView.center.lat).toFixed(5);
 
     return <Modal
       data-wd-key="modal:debug"
       isOpen={this.props.isOpen}
       onOpenToggle={this.props.onOpenToggle}
-      title={t('Debug')}
+      title={'Debug'}
     >
       <section className="maputnik-modal-section maputnik-modal-shortcuts">
-        <h1>{t("Options")}</h1>
+        <h1>Options</h1>
         {this.props.renderer === 'mlgljs' &&
           <ul>
             {Object.entries(this.props.maplibreGlDebugOptions!).map(([key, val]) => {
               return <li key={key}>
                 <label>
-                  <input type="checkbox" checked={val} onChange={(e) => this.props.onChangeMaplibreGlDebug(key, e.target.checked)} /> {key}
+                  <input type="checkbox" checked={val} onChange={(e) => this.props.onChangeMaboxGlDebug(key, e.target.checked)} /> {key}
                 </label>
               </li>
             })}
@@ -64,7 +63,6 @@ class ModalDebugInternal extends React.Component<ModalDebugInternalProps> {
       <section className="maputnik-modal-section">
         <h1>Links</h1>
         <p>
-          <Trans t={t}>
           <a
             target="_blank"
             rel="noopener noreferrer"
@@ -72,12 +70,9 @@ class ModalDebugInternal extends React.Component<ModalDebugInternalProps> {
           >
             Open in OSM
           </a> &mdash; Opens the current view on openstreetmap.org
-          </Trans>
         </p>
       </section>
     </Modal>
   }
 }
 
-const ModalDebug = withTranslation()(ModalDebugInternal);
-export default ModalDebug;

src/components/ModalExport.tsx

@@ -2,10 +2,8 @@ import React from 'react'
 import Slugify from 'slugify'
 import {saveAs} from 'file-saver'
 import {version} from 'maplibre-gl/package.json'
-import {format} from '@maplibre/maplibre-gl-style-spec'
-import type {StyleSpecification} from 'maplibre-gl'
+import {StyleSpecification, format} from '@maplibre/maplibre-gl-style-spec'
 import {MdFileDownload} from 'react-icons/md'
-import { WithTranslation, withTranslation } from 'react-i18next';
 
 import FieldString from './FieldString'
 import InputButton from './InputButton'
@@ -17,15 +15,15 @@ import fieldSpecAdditional from '../libs/field-spec-additional'
 const MAPLIBRE_GL_VERSION = version;
 
 
-type ModalExportInternalProps = {
+type ModalExportProps = {
   mapStyle: StyleSpecification & { id: string }
   onStyleChanged(...args: unknown[]): unknown
   isOpen: boolean
   onOpenToggle(...args: unknown[]): unknown
-} & WithTranslation;
+};
 
 
-class ModalExportInternal extends React.Component<ModalExportInternalProps> {
+export default class ModalExport extends React.Component<ModalExportProps> {
 
   tokenizedStyle () {
     return format(
@@ -49,7 +47,7 @@ class ModalExportInternal extends React.Component<ModalExportInternalProps> {
 
   downloadHtml() {
     const tokenStyle = this.tokenizedStyle();
-    const htmlTitle = this.props.mapStyle.name || this.props.t("Map");
+    const htmlTitle = this.props.mapStyle.name || "Map";
     const html = `<!DOCTYPE html>
 <html>
 <head>
@@ -101,32 +99,30 @@ class ModalExportInternal extends React.Component<ModalExportInternalProps> {
 
 
   render() {
-    const t = this.props.t;
-    const fsa = fieldSpecAdditional(t);
     return <Modal
       data-wd-key="modal:export"
       isOpen={this.props.isOpen}
       onOpenToggle={this.props.onOpenToggle}
-      title={t('Export Style')}
+      title={'Export Style'}
       className="maputnik-export-modal"
     >
 
       <section className="maputnik-modal-section">
-        <h1>{t("Download Style")}</h1>
+        <h1>Download Style</h1>
         <p>
-          {t("Download a JSON style to your computer.")}
+          Download a JSON style to your computer.
         </p>
 
         <div>
           <FieldString
-            label={fsa.maputnik.maptiler_access_token.label}
-            fieldSpec={fsa.maputnik.maptiler_access_token}
+            label={fieldSpecAdditional.maputnik.maptiler_access_token.label}
+            fieldSpec={fieldSpecAdditional.maputnik.maptiler_access_token}
             value={(this.props.mapStyle.metadata || {} as any)['maputnik:openmaptiles_access_token']}
             onChange={this.changeMetadataProperty.bind(this, "maputnik:openmaptiles_access_token")}
           />
           <FieldString
-            label={fsa.maputnik.thunderforest_access_token.label}
-            fieldSpec={fsa.maputnik.thunderforest_access_token}
+            label={fieldSpecAdditional.maputnik.thunderforest_access_token.label}
+            fieldSpec={fieldSpecAdditional.maputnik.thunderforest_access_token}
             value={(this.props.mapStyle.metadata || {} as any)['maputnik:thunderforest_access_token']}
             onChange={this.changeMetadataProperty.bind(this, "maputnik:thunderforest_access_token")}
           />
@@ -137,14 +133,14 @@ class ModalExportInternal extends React.Component<ModalExportInternalProps> {
             onClick={this.downloadStyle.bind(this)}
           >
             <MdFileDownload />
-            {t("Download Style")}
+            Download Style
           </InputButton>
 
           <InputButton
             onClick={this.downloadHtml.bind(this)}
           >
             <MdFileDownload />
-            {t("Download HTML")}
+            Download HTML
           </InputButton>
         </div>
       </section>
@@ -153,5 +149,3 @@ class ModalExportInternal extends React.Component<ModalExportInternalProps> {
   }
 }
 
-const ModalExport = withTranslation()(ModalExportInternal);
-export default ModalExport;