[layer-leafet/maplibre] Slightly adapts #1483

Details:
- Moves layers/leaflet.ts to layer-leaflet/lifecycle.ts
- Moves layers/maplibre.ts to layer-maplibre/lifecycle.ts
- Fixes weird "stderr" from MapLibre tests, by overriding the map's
  style
- Fixes overriding map style when calling bindMapLayer for MapLibre
- Removes unused import

packages/layer-maplibre/src/index.ts

@@ -2,7 +2,6 @@ import Graph from "graphology";
 import { Attributes } from "graphology-types";
 import { LngLat, Map, MapOptions } from "maplibre-gl";
 import { Sigma } from "sigma";
-import { DEFAULT_SETTINGS } from "sigma/settings";
 
 import { graphToLatlng, latlngToGraph, syncMapWithSigma, syncSigmaWithMap } from "./utils";
 
@@ -33,13 +32,13 @@ export default function bindMaplibreLayer(
 
   // Initialize the map
   const map = new Map({
-    ...(opts?.mapOptions || {}),
     container: mapContainerId,
     style: "https://demotiles.maplibre.org/style.json",
     center: [0, 0],
     zoom: 1,
     minPitch: 0,
     maxPitch: 0,
+    ...(opts?.mapOptions || {}),
   });
 
   // `stagePadding: 0` is mandatory, so the bbox of the map & Sigma is the same.

packages/test/unit/layers/leaflet.ts → packages/test/unit/layer-leaflet/lifecycle.ts

@@ -38,7 +38,7 @@ describe("@sigma/layer-leaflet", () => {
       clean();
     }).not.to.throw();
   });
-  test<SigmaTestContext>("clean the map should reset sigma'settings to its previous value", ({ sigma }) => {
+  test<SigmaTestContext>("clean the map should reset sigma settings to its previous value", ({ sigma }) => {
     const prevSettings = sigma.getSettings();
 
     const { clean } = bindMapLayer(sigma);

packages/test/unit/layers/maplibre.ts → packages/test/unit/layer-maplibre/lifecycle.ts

@@ -32,16 +32,17 @@ afterEach<SigmaTestContext>(async ({ sigma }) => {
 
 describe("@sigma/layer-maplibre", () => {
   test<SigmaTestContext>("calling clean function multiple times should work", ({ sigma }) => {
-    const { clean } = bindMapLayer(sigma);
+    const { clean } = bindMapLayer(sigma, { mapOptions: { style: undefined } });
+
     expect(() => {
       clean();
       clean();
     }).not.to.throw();
   });
-  test<SigmaTestContext>("clean the map should reset sigma'settings to its previous value", ({ sigma }) => {
+  test<SigmaTestContext>("clean the map should reset sigma settings to its previous value", ({ sigma }) => {
     const prevSettings = sigma.getSettings();
 
-    const { clean } = bindMapLayer(sigma);
+    const { clean } = bindMapLayer(sigma, { mapOptions: { style: undefined } });
     const settings = sigma.getSettings();
 
     clean();