raain-ui 2.3.23 → 2.3.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
7
7
 
8
8
  ## [Unreleased]
9
9
 
10
+ ## [2.3.24] - 2025-10-28
11
+
12
+ ## [2.3.23] - 2025-10-28
13
+
10
14
  ### Added
11
15
 
12
16
  - Add `RaainDivIcon` to show markers in map: it allows rotation and more complex design manipulation
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "raain-ui",
3
- "version": "2.3.23",
3
+ "version": "2.3.25",
4
4
  "author": "contact@raain.io",
5
5
  "homepage": "https://github.com/raainio/raain-ui",
6
6
  "description": "raain.io ui layers",
@@ -35,7 +35,7 @@
35
35
  "geolib": "~3.3.4",
36
36
  "leaflet": "~1.9.4",
37
37
  "pixi.js": "~5.3.12",
38
- "raain-model": "~3.1.1",
38
+ "raain-model": "~3.1.10",
39
39
  "satellite-view": "~2.1.2",
40
40
  "spinning-ball": "~0.5.0",
41
41
  "tile-setter": "~0.1.12",
@@ -1,8 +1,13 @@
1
- import { DivIcon, DivIconOptions, Marker } from 'leaflet';
1
+ import { DivIcon, DivIconOptions, Marker, PointExpression } from 'leaflet';
2
2
  /**
3
3
  * Extended DivIconOptions to include rotation and dynamic sizing properties
4
4
  */
5
5
  export interface RaainDivIconOptions extends DivIconOptions {
6
+ html?: string | HTMLElement | false;
7
+ iconSize?: PointExpression | undefined;
8
+ iconAnchor?: PointExpression | undefined;
9
+ popupAnchor?: PointExpression | undefined;
10
+ className?: string | undefined;
6
11
  /**
7
12
  * Initial rotation angle in degrees (0 = North, 90 = East, 180 = South, 270 = West)
8
13
  */
@@ -20,7 +25,8 @@ export interface RaainDivIconOptions extends DivIconOptions {
20
25
  */
21
26
  height?: number;
22
27
  /**
23
- * Base HTML template - can include {width} and {height} placeholders for dynamic sizing
28
+ * HTML template with {width} and {height} placeholders for dynamic sizing
29
+ * Use this for icons that need to change size at runtime using setSize()
24
30
  */
25
31
  htmlTemplate?: string;
26
32
  }
@@ -240,4 +240,4 @@ class RaainDivIcon extends leaflet_1.DivIcon {
240
240
  }
241
241
  }
242
242
  exports.RaainDivIcon = RaainDivIcon;
243
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"RaainDivIcon.js","sourceRoot":"","sources":["../../src/tools/RaainDivIcon.ts"],"names":[],"mappings":"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"}
243
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"RaainDivIcon.js","sourceRoot":"","sources":["../../src/tools/RaainDivIcon.ts"],"names":[],"mappings":"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"}