fix

mappable-world · Apr 19, 2024 · d7ed271 · d7ed271
1 parent b496fb8
commit d7ed271
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/src/markers/MMapDefaultMarker/index.css b/src/markers/MMapDefaultMarker/index.css
@@ -1,4 +1,4 @@
-@keyframes hint-hover {
+@keyframes mappable--default-marker-hint-hover {
     from {
         margin-left: -10px;
         opacity: 0;
@@ -37,7 +37,7 @@
 }
 .mappable--default-marker-point:hover .mappable--hint__hovered {
     display: inline-flex;
-    animation: hint-hover 200ms ease-out;
+    animation: mappable--default-marker-hint-hover 200ms ease-out;
 }
 .mappable--hint-title {
     display: block;

diff --git a/src/markers/MMapDefaultMarker/index.ts b/src/markers/MMapDefaultMarker/index.ts
@@ -64,8 +64,6 @@ export class MMapDefaultMarker extends mappable.MMapComplexEntity<MMapDefaultMar
     private _titleHint: HTMLElement;
     private _subtitleHint: HTMLElement;
 
-    private _unwatchThemeContext?: () => void;
-
     constructor(props: MMapDefaultMarkerProps) {
         super(props);
     }
@@ -120,7 +118,7 @@ export class MMapDefaultMarker extends mappable.MMapComplexEntity<MMapDefaultMar
         this._marker = new mappable.MMapMarker(this._props, this._markerElement);
         this.addChild(this._marker);
 
-        this._unwatchThemeContext = this._watchContext(mappable.ThemeContext, () => this._updateTheme(), {
+        this._watchContext(mappable.ThemeContext, () => this._updateTheme(), {
             immediate: true
         });
     }
@@ -153,10 +151,6 @@ export class MMapDefaultMarker extends mappable.MMapComplexEntity<MMapDefaultMar
         this._marker.update(this._props);
     }
 
-    protected _onDetach(): void {
-        this._unwatchThemeContext?.();
-    }
-
     private _createHintContainer(): HTMLElement {
         const {title, subtitle, staticHint} = this._props;
         const hintContainer = document.createElement('mappable');

diff --git a/tools/icons/fetch-icons.ts b/tools/icons/fetch-icons.ts
@@ -21,7 +21,7 @@ const REGION_CODE_REGEXP = /_([a-z]{2})_/;
 export const SIZE_REGEXP = /_([0-9]{2})/;
 /** RegExp to discard rubrics fallbacks */
 const RUBRIC_FALLBACK_REGEXP = /fallback_.+\d{2}$/;
-const INTL_REGION_CODES = new Intl.DisplayNames(['en', 'ru'], {type: 'region'});
+const INTL_REGION_CODES = new Intl.DisplayNames(['en'], {type: 'region'});
 /** A number between 0.01 and 4, the image scaling factor */
 const IMAGE_SCALE = 1;
 const ICONS_PER_CHUNK = 100;