Infrastructure/immich
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-03-11 02:23:09 -05:00
Code Issues Activity

fix: only load rtl plugin once (#12365)

Browse source 
fix(web): only load rtl plugin once
This commit is contained in:
Jason Rasmussen 2024-09-05 14:29:41 -04:00 • committed by GitHub
parent 77904a54d8
commit d6729c50c9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
web/src/lib/components/shared-components/map/map.svelte
View file

@ -1,15 +1,20 @@
<script lang="ts" context="module">
void maplibregl.setRTLTextPlugin(mapboxRtlUrl, true);
</script>
<script lang="ts"> <script lang="ts">
import Icon from '$lib/components/elements/icon.svelte'; import Icon from '$lib/components/elements/icon.svelte';
import { Theme } from '$lib/constants'; import { Theme } from '$lib/constants';
import { colorTheme, mapSettings } from '$lib/stores/preferences.store'; import { colorTheme, mapSettings } from '$lib/stores/preferences.store';
import { getAssetThumbnailUrl, getKey, handlePromiseError } from '$lib/utils'; import { getAssetThumbnailUrl, getKey, handlePromiseError } from '$lib/utils';
import { getMapStyle, MapTheme, type MapMarkerResponseDto } from '@immich/sdk'; import { getMapStyle, MapTheme, type MapMarkerResponseDto } from '@immich/sdk';
import mapboxRtlUrl from '@mapbox/mapbox-gl-rtl-text/mapbox-gl-rtl-text.min.js?url';
import { mdiCog, mdiMap, mdiMapMarker } from '@mdi/js'; import { mdiCog, mdiMap, mdiMapMarker } from '@mdi/js';
import type { Feature, GeoJsonProperties, Geometry, Point } from 'geojson'; import type { Feature, GeoJsonProperties, Geometry, Point } from 'geojson';
import type { GeoJSONSource, LngLatLike, StyleSpecification } from 'maplibre-gl'; import type { GeoJSONSource, LngLatLike, StyleSpecification } from 'maplibre-gl';
import mapboxRtlUrl from '@mapbox/mapbox-gl-rtl-text/mapbox-gl-rtl-text.min.js?url';
import maplibregl from 'maplibre-gl'; import maplibregl from 'maplibre-gl';
import { createEventDispatcher } from 'svelte'; import { createEventDispatcher } from 'svelte';
import { t } from 'svelte-i18n';
import { import {
AttributionControl, AttributionControl,
Control, Control,
@ -25,7 +30,6 @@
ScaleControl, ScaleControl,
type Map, type Map,
} from 'svelte-maplibre'; } from 'svelte-maplibre';
import { t } from 'svelte-i18n';
export let mapMarkers: MapMarkerResponseDto[]; export let mapMarkers: MapMarkerResponseDto[];
export let showSettingsModal: boolean | undefined = undefined; export let showSettingsModal: boolean | undefined = undefined;
@ -52,8 +56,6 @@
let map: maplibregl.Map; let map: maplibregl.Map;
let marker: maplibregl.Marker | null = null; let marker: maplibregl.Marker | null = null;
void maplibregl.setRTLTextPlugin(mapboxRtlUrl, true);
$: style = (() => $: style = (() =>
getMapStyle({ getMapStyle({
theme: ($mapSettings.allowDarkMode ? $colorTheme.value : Theme.LIGHT) as unknown as MapTheme, theme: ($mapSettings.allowDarkMode ? $colorTheme.value : Theme.LIGHT) as unknown as MapTheme,

8
web/src/lib/utils/server.ts
View file

@ -3,17 +3,13 @@ import { initLanguage } from '$lib/utils';
import { defaults } from '@immich/sdk'; import { defaults } from '@immich/sdk';
import { memoize } from 'lodash-es'; import { memoize } from 'lodash-es';
type fetchType = typeof fetch; type Fetch = typeof fetch;
export function initSDK(fetch: fetchType) { async function _init(fetch: Fetch) {
// set event.fetch on the fetch-client used by @immich/sdk // set event.fetch on the fetch-client used by @immich/sdk
// https://kit.svelte.dev/docs/load#making-fetch-requests // https://kit.svelte.dev/docs/load#making-fetch-requests
// https://github.com/oazapfts/oazapfts/blob/main/README.md#fetch-options // https://github.com/oazapfts/oazapfts/blob/main/README.md#fetch-options
defaults.fetch = fetch; defaults.fetch = fetch;
}
async function _init(fetch: fetchType) {
initSDK(fetch);
await initLanguage(); await initLanguage();
await retrieveServerConfig(); await retrieveServerConfig();
} }