Merge pull request #3 from TurtIeSocks/leaflet-geoman-2.13.1

Support Leaflet Geoman 2.13.1

Author: TurtIeSocks

README.md

@@ -76,7 +76,7 @@ Respects all of the options, global options, and event handlers from Leaflet Geo
 - [Options](https://github.com/geoman-io/leaflet-geoman/blob/0fabb8c2bfe0d40d1d9d6a827912bd53d8f6ad3b/leaflet-geoman.d.ts#L1083)
 - [Global Options](https://github.com/geoman-io/leaflet-geoman/blob/0fabb8c2bfe0d40d1d9d6a827912bd53d8f6ad3b/leaflet-geoman.d.ts#L748)
 - [Path Options](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/3b442d0c53fe1de99bcaf2b82fae33c22c42a052/types/leaflet/index.d.ts#L1000)
-- [Lang Options](https://github.com/geoman-io/leaflet-geoman/blob/0fabb8c2bfe0d40d1d9d6a827912bd53d8f6ad3b/leaflet-geoman.d.ts#L526)
+- [Lang Options](https://github.com/geoman-io/leaflet-geoman/blob/3458b8541dc283fa5404dbb3e6558bdee4a32874/leaflet-geoman.d.ts#L488)
 
 ```ts
 // Additional Props
@@ -85,7 +85,7 @@ interface GeomanProps extends GeomanHandlers {
   globalOptions?: PM.GlobalOptions // See global options link above
   pathOptions?: L.PathOptions // See Leaflet PathOptions link above
   eventDebugFn?: EventDebugFn // optional function that can be used to debug events, such as `console.log`
-  lang?: string // See lang options link above
+  lang?: PM.SupportLocales // See lang options link above
   onMount?: () => void // callback that runs after it mounts to the DOM
   onUnmount?: () => void // callback that runs after it unmounts
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-leaflet-geoman-v2",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "React wrapper for the leaflet-geoman plugin",
   "repository": "https://github.com/TurtIeSocks/react-leaflet-geoman",
   "author": "TurtIeSocks <58572875+TurtIeSocks@users.noreply.github.com>",
@@ -20,7 +20,7 @@
     "use-deep-compare-effect": "^1.8.1"
   },
   "devDependencies": {
-    "@geoman-io/leaflet-geoman-free": "^2.13.0",
+    "@geoman-io/leaflet-geoman-free": "^2.13.1",
     "@rollup/plugin-typescript": "^8.4.0",
     "@types/leaflet": "^1.7.11",
     "@types/node": "^18.7.13",
@@ -37,7 +37,7 @@
     "vite-plugin-checker": "^0.4.9"
   },
   "peerDependencies": {
-    "@geoman-io/leaflet-geoman-free": "^2.13.0",
+    "@geoman-io/leaflet-geoman-free": "^2.13.1",
     "react": "^17.0.0 || ^18.0.0",
     "react-dom": "^17.0.0 || ^18.0.0",
     "react-leaflet": "^4.0.2"

src/GeomanControls.ts

@@ -6,10 +6,7 @@ import type { LayerGroup } from 'leaflet'
 import useDeepCompareEffect from 'use-deep-compare-effect'
 
 import type { GeomanProps } from './types'
-import reference from './events/reference'
-import layerEvents from './events/layer'
-import globalEvents from './events/global'
-import mapEvents from './events/map'
+import { reference, layerEvents, globalEvents, mapEvents } from './events'
 
 export default function GeomanControls({
   options = {},

src/events/global.ts

@@ -2,7 +2,7 @@ import type { Map } from 'leaflet'
 
 import type { HandlersWithDebug, Method } from '../types'
 
-export default function globalEvents(
+export function globalEvents(
   map: Map,
   handlers: HandlersWithDebug,
   method: Method

src/events/index.ts

@@ -1,4 +1,4 @@
-export { default as globalEvents } from './global'
-export { default as layerEvents } from './layer'
-export { default as mapEvents } from './map'
-export { default as references } from './reference'
+export * from './global'
+export * from './layer'
+export * from './map'
+export * from './reference'

src/events/layer.ts

@@ -2,7 +2,7 @@ import type { Layer } from 'leaflet'
 
 import type { HandlersWithDebug, Method } from '../types'
 
-export default function layerEvents(
+export function layerEvents(
   layer: Layer,
   handlers: HandlersWithDebug,
   method: Method

src/events/map.ts

@@ -1,9 +1,9 @@
 import type { Map } from 'leaflet'
 
-import layerEvents from './layer'
+import { layerEvents } from './layer'
 import type { HandlersWithDebug, Method } from '../types'
 
-export default function mapEvents(
+export function mapEvents(
   map: Map,
   handlers: HandlersWithDebug,
   method: Method

src/events/reference.ts

@@ -1,6 +1,6 @@
 import type { GeomanHandlers } from '../types'
 
-export default [
+export const reference = [
   'onMapRemove',
   'onLayerRemove',
   'onMapCut',

src/types.ts

@@ -1,18 +1,5 @@
 import type { PM, PathOptions } from 'leaflet'
 
-declare module 'leaflet' {
-  namespace PM {
-    interface PMMap {
-      // PR https://github.com/geoman-io/leaflet-geoman/pull/1215
-      getGeomanLayers(asFeatureGroup: true): FeatureGroup
-      getGeomanLayers(asFeatureGroup?: false): Layer[]
-
-      getGeomanDrawLayers(asFeatureGroup: true): FeatureGroup
-      getGeomanDrawLayers(asFeatureGroup?: false): Layer[]
-    }
-  }
-}
-
 export type Method = 'on' | 'off'
 
 export type EventDebugFn = (input?: any) => void
@@ -88,27 +75,5 @@ export interface GeomanProps extends GeomanHandlers {
   eventDebugFn?: EventDebugFn
   onMount?: () => void
   onUnmount?: () => void
-  lang?:
-    | 'cz'
-    | 'da'
-    | 'de'
-    | 'el'
-    | 'en'
-    | 'es'
-    | 'fa'
-    | 'fr'
-    | 'hu'
-    | 'id'
-    | 'it'
-    | 'nl'
-    | 'no'
-    | 'pl'
-    | 'pt_br'
-    | 'ro'
-    | 'ru'
-    | 'sv'
-    | 'tr'
-    | 'ua'
-    | 'zh'
-    | 'zh_tw'
+  lang?: PM.SupportLocales
 }