Improve code-splitting of highlight.js and maplibre-gs libs (#12349)
* Dynamic import anything that touches maplibre-gs Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Dynamic import anything that touches highlight.js Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Fix types Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Fix tests Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
parent
79c50db009
commit
4a05de485e
17 changed files with 185 additions and 63 deletions
|
@ -24,7 +24,7 @@ import { aboveLeftOf, useContextMenu, MenuProps } from "../../structures/Context
|
|||
import { OverflowMenuContext } from "../rooms/MessageComposerButtons";
|
||||
import LocationShareMenu from "./LocationShareMenu";
|
||||
|
||||
interface IProps {
|
||||
export interface IProps {
|
||||
roomId: string;
|
||||
sender: RoomMember;
|
||||
menuPosition?: MenuProps;
|
||||
|
|
|
@ -139,7 +139,7 @@ const onGeolocateError = (e: GeolocationPositionError): void => {
|
|||
});
|
||||
};
|
||||
|
||||
interface MapProps {
|
||||
export interface MapProps {
|
||||
id: string;
|
||||
interactive?: boolean;
|
||||
/**
|
||||
|
|
|
@ -18,7 +18,8 @@ import React, { ReactNode, useCallback, useEffect, useState } from "react";
|
|||
import * as maplibregl from "maplibre-gl";
|
||||
import { RoomMember } from "matrix-js-sdk/src/matrix";
|
||||
|
||||
import { createMarker, parseGeoUri } from "../../../utils/location";
|
||||
import { parseGeoUri } from "../../../utils/location";
|
||||
import { createMarker } from "../../../utils/location/map";
|
||||
import Marker from "./Marker";
|
||||
|
||||
const useMapMarker = (
|
||||
|
@ -66,7 +67,7 @@ const useMapMarker = (
|
|||
};
|
||||
};
|
||||
|
||||
interface SmartMarkerProps {
|
||||
export interface SmartMarkerProps {
|
||||
map: maplibregl.Map;
|
||||
geoUri: string;
|
||||
id?: string;
|
||||
|
|
71
src/components/views/location/index.tsx
Normal file
71
src/components/views/location/index.tsx
Normal file
|
@ -0,0 +1,71 @@
|
|||
/*
|
||||
Copyright 2024 The Matrix.org Foundation C.I.C.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
// Exports location components which touch maplibre-gs wrapped in React Suspense to enable code splitting
|
||||
|
||||
import React, { ComponentProps, lazy, Suspense } from "react";
|
||||
|
||||
import Spinner from "../elements/Spinner";
|
||||
|
||||
const MapComponent = lazy(() => import("./Map"));
|
||||
|
||||
export function Map(props: ComponentProps<typeof MapComponent>): JSX.Element {
|
||||
return (
|
||||
<Suspense fallback={<Spinner />}>
|
||||
<MapComponent {...props} />
|
||||
</Suspense>
|
||||
);
|
||||
}
|
||||
|
||||
const LocationPickerComponent = lazy(() => import("./LocationPicker"));
|
||||
|
||||
export function LocationPicker(props: ComponentProps<typeof LocationPickerComponent>): JSX.Element {
|
||||
return (
|
||||
<Suspense fallback={<Spinner />}>
|
||||
<LocationPickerComponent {...props} />
|
||||
</Suspense>
|
||||
);
|
||||
}
|
||||
|
||||
const SmartMarkerComponent = lazy(() => import("./SmartMarker"));
|
||||
|
||||
export function SmartMarker(props: ComponentProps<typeof SmartMarkerComponent>): JSX.Element {
|
||||
return (
|
||||
<Suspense fallback={<Spinner />}>
|
||||
<SmartMarkerComponent {...props} />
|
||||
</Suspense>
|
||||
);
|
||||
}
|
||||
|
||||
const LocationButtonComponent = lazy(() => import("./LocationButton"));
|
||||
|
||||
export function LocationButton(props: ComponentProps<typeof LocationButtonComponent>): JSX.Element {
|
||||
return (
|
||||
<Suspense fallback={<Spinner />}>
|
||||
<LocationButtonComponent {...props} />
|
||||
</Suspense>
|
||||
);
|
||||
}
|
||||
|
||||
const LocationViewDialogComponent = lazy(() => import("./LocationViewDialog"));
|
||||
|
||||
export function LocationViewDialog(props: ComponentProps<typeof LocationViewDialogComponent>): JSX.Element {
|
||||
return (
|
||||
<Suspense fallback={<Spinner />}>
|
||||
<LocationViewDialogComponent {...props} />
|
||||
</Suspense>
|
||||
);
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue