Skip to content

armgit / mapcn

Public Imported from GitHub
0

Beautiful map components. 100% Free, Zero config, one command setup.

TypeScript

Updates

Anmoldeep Singh47fe5c02a18b
diff --git a/README.md b/README.md
index 2ec0e82..3c3eb47 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
</p>
<p>
- <a href="https://mapcn.vercel.app/docs">Get Started</a> •
+ <a href="https://mapcn.vercel.app">Get Started</a> •
<a href="https://mapcn.vercel.app/docs/installation">Installation</a> •
<a href="https://mapcn.vercel.app/docs/basic-map">Examples</a>
</p>
diff --git a/package-lock.json b/package-lock.json
index 0e115b2..5c059f8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,6 +12,7 @@
"@radix-ui/react-separator": "^1.1.8",
"@radix-ui/react-slot": "^1.2.4",
"@radix-ui/react-tooltip": "^1.2.8",
+ "@vercel/analytics": "^1.6.1",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"lucide-react": "^0.562.0",
@@ -3999,6 +4000,44 @@
"win32"
]
},
+ "node_modules/@vercel/analytics": {
+ "version": "1.6.1",
+ "resolved": "https://registry.npmjs.org/@vercel/analytics/-/analytics-1.6.1.tgz",
+ "integrity": "sha512-oH9He/bEM+6oKlv3chWuOOcp8Y6fo6/PSro8hEkgCW3pu9/OiCXiUpRUogDh3Fs3LH2sosDrx8CxeOLBEE+afg==",
+ "license": "MPL-2.0",
+ "peerDependencies": {
+ "@remix-run/react": "^2",
+ "@sveltejs/kit": "^1 || ^2",
+ "next": ">= 13",
+ "react": "^18 || ^19 || ^19.0.0-rc",
+ "svelte": ">= 4",
+ "vue": "^3",
+ "vue-router": "^4"
+ },
+ "peerDependenciesMeta": {
+ "@remix-run/react": {
+ "optional": true
+ },
+ "@sveltejs/kit": {
+ "optional": true
+ },
+ "next": {
+ "optional": true
+ },
+ "react": {
+ "optional": true
+ },
+ "svelte": {
+ "optional": true
+ },
+ "vue": {
+ "optional": true
+ },
+ "vue-router": {
+ "optional": true
+ }
+ }
+ },
"node_modules/accepts": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz",
diff --git a/package.json b/package.json
index f81c220..03b7c93 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
"@radix-ui/react-separator": "^1.1.8",
"@radix-ui/react-slot": "^1.2.4",
"@radix-ui/react-tooltip": "^1.2.8",
+ "@vercel/analytics": "^1.6.1",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"lucide-react": "^0.562.0",
diff --git a/src/app/docs/_components/code-block.tsx b/src/app/docs/_components/code-block.tsx
index a0bbe88..8ed54e3 100644
--- a/src/app/docs/_components/code-block.tsx
+++ b/src/app/docs/_components/code-block.tsx
@@ -15,12 +15,14 @@ export async function CodeBlock({
const highlighted = await highlightCode(code, language);
return (
- <div className="relative rounded-lg border bg-muted/30 min-w-full overflow-x-auto">
+ <div className="w-full rounded-lg border overflow-hidden">
{showCopyButton && (
- <CopyButton text={code} className="absolute top-3 right-3" />
+ <div className="flex items-center justify-end border-b bg-muted/30 px-2 h-9">
+ <CopyButton text={code} />
+ </div>
)}
<div
- className="p-4 text-sm [&_pre]:bg-transparent! [&_code]:bg-transparent!"
+ className="p-4 overflow-auto text-sm bg-muted/20 [&_pre]:bg-transparent! [&_code]:bg-transparent!"
dangerouslySetInnerHTML={{ __html: highlighted }}
/>
</div>
diff --git a/src/app/docs/_components/component-preview-client.tsx b/src/app/docs/_components/component-preview-client.tsx
index 737c584..9f4f14b 100644
--- a/src/app/docs/_components/component-preview-client.tsx
+++ b/src/app/docs/_components/component-preview-client.tsx
@@ -50,7 +50,7 @@ export function ComponentPreviewClient({
<CopyButton text={code} />
</div>
- <div className={cn("overflow-hidden h-[400px]", className)}>
+ <div className={cn("h-[400px] overflow-hidden", className)}>
{activeTab === "preview" ? (
<div className="h-full">{children}</div>
) : (
diff --git a/src/app/docs/_components/examples/advanced-usage-example.tsx b/src/app/docs/_components/examples/advanced-usage-example.tsx
index 08bd898..db44280 100644
--- a/src/app/docs/_components/examples/advanced-usage-example.tsx
+++ b/src/app/docs/_components/examples/advanced-usage-example.tsx
@@ -64,7 +64,7 @@ function MapController() {
export function AdvancedUsageExample() {
return (
- <div className="h-[450px] w-full overflow-hidden">
+ <div className="h-[400px] w-full">
<Map center={[-73.9857, 40.7484]} zoom={15}>
<MapController />
</Map>
diff --git a/src/app/docs/_components/examples/basic-map-example.tsx b/src/app/docs/_components/examples/basic-map-example.tsx
index 4d91c6a..5029cd5 100644
--- a/src/app/docs/_components/examples/basic-map-example.tsx
+++ b/src/app/docs/_components/examples/basic-map-example.tsx
@@ -2,7 +2,7 @@ import { Map } from "@/registry/map";
export function BasicMapExample() {
return (
- <div className="h-[400px] w-full overflow-hidden">
+ <div className="h-[400px] w-full">
<Map center={[-74.006, 40.7128]} zoom={12} />
</div>
);
diff --git a/src/app/docs/_components/examples/custom-layer-example.tsx b/src/app/docs/_components/examples/custom-layer-example.tsx
index 25d44b9..0bc6886 100644
--- a/src/app/docs/_components/examples/custom-layer-example.tsx
+++ b/src/app/docs/_components/examples/custom-layer-example.tsx
@@ -164,7 +164,7 @@ function CustomLayer() {
export function CustomLayerExample() {
return (
- <div className="h-[400px] w-full overflow-hidden">
+ <div className="h-[400px] w-full">
<Map center={[-73.97, 40.78]} zoom={11.8}>
<MapControls />
<CustomLayer />
diff --git a/src/app/docs/_components/examples/map-controls-example.tsx b/src/app/docs/_components/examples/map-controls-example.tsx
index 33488df..357923f 100644
--- a/src/app/docs/_components/examples/map-controls-example.tsx
+++ b/src/app/docs/_components/examples/map-controls-example.tsx
@@ -2,7 +2,7 @@ import { Map, MapControls } from "@/registry/map";
export function MapControlsExample() {
return (
- <div className="h-[400px] w-full overflow-hidden">
+ <div className="h-[400px] w-full">
<Map center={[2.3522, 48.8566]} zoom={11}>
<MapControls
position="bottom-right"
diff --git a/src/app/docs/_components/examples/markers-example.tsx b/src/app/docs/_components/examples/markers-example.tsx
index f22353c..c08ec24 100644
--- a/src/app/docs/_components/examples/markers-example.tsx
+++ b/src/app/docs/_components/examples/markers-example.tsx
@@ -24,7 +24,7 @@ const locations = [
export function MarkersExample() {
return (
- <div className="h-[400px] w-full overflow-hidden">
+ <div className="h-[400px] w-full">
<Map center={[-73.98, 40.76]} zoom={12}>
{locations.map((location) => (
<MapMarker
diff --git a/src/app/docs/_components/examples/osrm-route-example.tsx b/src/app/docs/_components/examples/osrm-route-example.tsx
index 33326a5..72e6228 100644
--- a/src/app/docs/_components/examples/osrm-route-example.tsx
+++ b/src/app/docs/_components/examples/osrm-route-example.tsx
@@ -39,8 +39,8 @@ export function OsrmRouteExample() {
}, []);
return (
- <div className="h-[400px] w-full overflow-hidden relative">
- <Map center={[-73.975, 40.77]} zoom={12.5}>
+ <div className="h-[400px] w-full relative">
+ <Map center={[-73.975, 40.772]} zoom={12.5}>
{route && (
<MapRoute
coordinates={route}
diff --git a/src/app/docs/_components/examples/popup-example.tsx b/src/app/docs/_components/examples/popup-example.tsx
index 46a004b..20bcab9 100644
--- a/src/app/docs/_components/examples/popup-example.tsx
+++ b/src/app/docs/_components/examples/popup-example.tsx
@@ -13,6 +13,7 @@ const places = [
{
id: 1,
name: "The Metropolitan Museum of Art",
+ label: "Museum",
category: "Museum",
rating: 4.8,
reviews: 12453,
@@ -25,6 +26,7 @@ const places = [
{
id: 2,
name: "Brooklyn Bridge",
+ label: "Landmark",
category: "Landmark",
rating: 4.9,
reviews: 8234,
@@ -37,6 +39,7 @@ const places = [
{
id: 3,
name: "Grand Central Terminal",
+ label: "Transit",
category: "Transit",
rating: 4.7,
reviews: 5621,
@@ -50,13 +53,13 @@ const places = [
export function PopupExample() {
return (
- <div className="h-[500px] w-full overflow-hidden">
+ <div className="h-[500px] w-full">
<Map center={[-73.98, 40.74]} zoom={11}>
{places.map((place) => (
<MapMarker key={place.id} longitude={place.lng} latitude={place.lat}>
<MarkerContent>
<div className="size-5 rounded-full bg-rose-500 border-2 border-white shadow-lg cursor-pointer hover:scale-110 transition-transform" />
- <MarkerLabel>{place.name}</MarkerLabel>
+ <MarkerLabel position="bottom">{place.label}</MarkerLabel>
</MarkerContent>
<MarkerPopup className="p-0 w-62">
<div className="relative h-32 overflow-hidden rounded-t-md">
diff --git a/src/app/docs/_components/examples/route-example.tsx b/src/app/docs/_components/examples/route-example.tsx
index 3d45af0..1210d25 100644
--- a/src/app/docs/_components/examples/route-example.tsx
+++ b/src/app/docs/_components/examples/route-example.tsx
@@ -22,14 +22,14 @@ const stops = [
export function RouteExample() {
return (
- <div className="h-[400px] w-full overflow-hidden">
- <Map center={[-73.98, 40.76]} zoom={11}>
+ <div className="h-[400px] w-full">
+ <Map center={[-73.98, 40.75]} zoom={11.2}>
<MapRoute coordinates={route} color="#3b82f6" width={4} opacity={0.8} />
{stops.map((stop, index) => (
<MapMarker key={stop.name} longitude={stop.lng} latitude={stop.lat}>
<MarkerContent>
- <div className="size-6 rounded-full bg-blue-500 border-2 border-white shadow-lg flex items-center justify-center text-white text-xs font-bold">
+ <div className="size-4.5 rounded-full bg-blue-500 border-2 border-white shadow-lg flex items-center justify-center text-white text-xs font-bold">
{index + 1}
</div>
</MarkerContent>
diff --git a/src/app/docs/_components/examples/standalone-popup-example.tsx b/src/app/docs/_components/examples/standalone-popup-example.tsx
index 8e1c4a7..974c842 100644
--- a/src/app/docs/_components/examples/standalone-popup-example.tsx
+++ b/src/app/docs/_components/examples/standalone-popup-example.tsx
@@ -8,7 +8,7 @@ export function StandalonePopupExample() {
const [showPopup, setShowPopup] = useState(true);
return (
- <div className="h-[400px] w-full overflow-hidden relative">
+ <div className="h-[400px] w-full relative">
<Map center={[-74.006, 40.7128]} zoom={13}>
<MapPopup
longitude={-74.006}
@@ -19,7 +19,7 @@ export function StandalonePopupExample() {
focusAfterOpen={false}
closeOnClick={false}
>
- <div className="space-y-2 pr-4">
+ <div className="space-y-2">
<h3 className="font-semibold text-foreground">New York City</h3>
<p className="text-sm text-muted-foreground">
The city that never sleeps. Population: 8.3 million
diff --git a/src/app/docs/api-reference/page.tsx b/src/app/docs/api-reference/page.tsx
index 03503c5..e48847e 100644
--- a/src/app/docs/api-reference/page.tsx
+++ b/src/app/docs/api-reference/page.tsx
@@ -304,7 +304,9 @@ export default function ApiReferencePage() {
>
PopupOptions
</DocsLink>{" "}
- from MapLibre GL.
+ from MapLibre GL (excluding <DocsCode>closeButton</DocsCode> and{" "}
+ <DocsCode>closeOnClick</DocsCode> as tooltips auto-dismiss on hover
+ out).
</p>
<DocsPropTable
props={[
diff --git a/src/app/docs/installation/page.tsx b/src/app/docs/installation/page.tsx
index bb1e771..a67b859 100644
--- a/src/app/docs/installation/page.tsx
+++ b/src/app/docs/installation/page.tsx
@@ -7,6 +7,8 @@ import {
} from "../_components/docs";
import { CodeBlock } from "../_components/code-block";
import { Metadata } from "next";
+import { Card } from "@/components/ui/card";
+import { Map, MapControls } from "@/registry/map";
const siteUrl = process.env.NEXT_PUBLIC_SITE_URL ?? "site-url-here";
@@ -17,8 +19,8 @@ import { Card } from "@/components/ui/card";
export function MyMap() {
return (
- <Card className="h-[400px] p-0 overflow-hidden w-full">
- <Map center={[-74.006, 40.7128]} zoom={12}>
+ <Card className="h-[300px] p-0 overflow-hidden">
+ <Map center={[-74.006, 40.7128]} zoom={11}>
<MapControls />
</Map>
</Card>
@@ -63,6 +65,11 @@ export default function InstallationPage() {
<DocsSection title="Usage">
<p>Import and use the map component:</p>
<CodeBlock code={usageCode} />
+ <Card className="h-[300px] p-0 overflow-hidden rounded-lg">
+ <Map center={[-74.006, 40.7128]} zoom={11}>
+ <MapControls />
+ </Map>
+ </Card>
</DocsSection>
<DocsNote>
diff --git a/src/app/docs/markers/page.tsx b/src/app/docs/markers/page.tsx
index 16b0291..b2425f0 100644
--- a/src/app/docs/markers/page.tsx
+++ b/src/app/docs/markers/page.tsx
@@ -45,7 +45,7 @@ export default function MarkersPage() {
</p>
</DocsSection>
- <ComponentPreview code={popupSource}>
+ <ComponentPreview code={popupSource} className="h-[500px]">
<PopupExample />
</ComponentPreview>
</DocsLayout>
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index e60b1fe..5e11ae9 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,5 +1,7 @@
-import type { Metadata, Viewport } from "next";
+import type { Metadata } from "next";
import { Inter, JetBrains_Mono } from "next/font/google";
+import { Analytics } from "@vercel/analytics/next";
+
import { ThemeProvider } from "@/components/theme-provider";
import "./globals.css";
@@ -98,6 +100,7 @@ export default function RootLayout({
disableTransitionOnChange
>
{children}
+ <Analytics />
</ThemeProvider>
</body>
</html>
diff --git a/src/registry/map.tsx b/src/registry/map.tsx
index 9626f7b..4018309 100644
--- a/src/registry/map.tsx
+++ b/src/registry/map.tsx
@@ -13,15 +13,7 @@ import {
type ReactNode,
} from "react";
import { createPortal } from "react-dom";
-import {
- X,
- Compass,
- Minus,
- Plus,
- Locate,
- Maximize,
- Loader2,
-} from "lucide-react";
+import { X, Minus, Plus, Locate, Maximize, Loader2 } from "lucide-react";
import { cn } from "@/lib/utils";
@@ -104,7 +96,7 @@ function Map({ children, ...props }: MapProps) {
}
}, [resolvedTheme]);
- const isLoading = !isLoaded && !isStyleLoaded;
+ const isLoading = !isLoaded || !isStyleLoaded;
return (
<MapContext.Provider
@@ -185,19 +177,23 @@ function MapMarker({
if (onMouseEnter) container.addEventListener("mouseenter", onMouseEnter);
if (onMouseLeave) container.addEventListener("mouseleave", onMouseLeave);
+ const handleDragStart = () => {
+ const lngLat = marker.getLngLat();
+ onDragStart?.({ lng: lngLat.lng, lat: lngLat.lat });
+ };
+ const handleDrag = () => {
+ const lngLat = marker.getLngLat();
+ onDrag?.({ lng: lngLat.lng, lat: lngLat.lat });
+ };
+ const handleDragEnd = () => {
+ const lngLat = marker.getLngLat();
+ onDragEnd?.({ lng: lngLat.lng, lat: lngLat.lat });
+ };
+
if (draggable) {
- marker.on("dragstart", () => {
- const lngLat = marker.getLngLat();
- onDragStart?.({ lng: lngLat.lng, lat: lngLat.lat });
- });
- marker.on("drag", () => {
- const lngLat = marker.getLngLat();
- onDrag?.({ lng: lngLat.lng, lat: lngLat.lat });
- });
- marker.on("dragend", () => {
- const lngLat = marker.getLngLat();
- onDragEnd?.({ lng: lngLat.lng, lat: lngLat.lat });
- });
+ marker.on("dragstart", handleDragStart);
+ marker.on("drag", handleDrag);
+ marker.on("dragend", handleDragEnd);
}
setIsReady(true);
@@ -208,6 +204,11 @@ function MapMarker({
container.removeEventListener("mouseenter", onMouseEnter);
if (onMouseLeave)
container.removeEventListener("mouseleave", onMouseLeave);
+ if (draggable) {
+ marker.off("dragstart", handleDragStart);
+ marker.off("drag", handleDrag);
+ marker.off("dragend", handleDragEnd);
+ }
marker.remove();
markerRef.current = null;
markerElementRef.current = null;
@@ -328,7 +329,7 @@ function MarkerPopup({
type MarkerTooltipProps = {
children: ReactNode;
className?: string;
-} & Omit<PopupOptions, "className">;
+} & Omit<PopupOptions, "className" | "closeButton" | "closeOnClick">;
function MarkerTooltip({
children,
@@ -413,7 +414,7 @@ function MarkerLabel({
<div
className={cn(
"absolute left-1/2 -translate-x-1/2 whitespace-nowrap",
- "text-[10px] font-medium",
+ "text-[10px] font-medium text-foreground",
positionClasses[position],
className
)}
@@ -582,16 +583,16 @@ function MapControls({
function CompassButton({ onClick }: { onClick?: () => void }) {
const { isLoaded, map } = useMap();
+ const compassRef = useRef<SVGSVGElement>(null);
useEffect(() => {
- if (!isLoaded || !map) return;
+ if (!isLoaded || !map || !compassRef.current) return;
- const compass = document.getElementById("map-compass-icon");
- if (!compass) return;
+ const compass = compassRef.current;
const updateRotation = () => {
- const bearing = map?.getBearing() ?? 0;
- const pitch = map?.getPitch() ?? 0;
+ const bearing = map.getBearing();
+ const pitch = map.getPitch();
compass.style.transform = `rotateX(${pitch}deg) rotateZ(${-bearing}deg)`;
};
@@ -600,8 +601,8 @@ function CompassButton({ onClick }: { onClick?: () => void }) {
updateRotation();
return () => {
- map?.off("rotate", updateRotation);
- map?.off("pitch", updateRotation);
+ map.off("rotate", updateRotation);
+ map.off("pitch", updateRotation);
};
}, [isLoaded, map]);
@@ -609,13 +610,20 @@ function CompassButton({ onClick }: { onClick?: () => void }) {
<button
onClick={onClick}
aria-label="Reset bearing to north"
+ type="button"
className="flex items-center justify-center size-8 hover:bg-accent transition-colors"
>
- <Compass
- id="map-compass-icon"
- className="size-4 transition-transform duration-200"
+ <svg
+ ref={compassRef}
+ viewBox="0 0 24 24"
+ className="size-5 transition-transform duration-200"
style={{ transformStyle: "preserve-3d" }}
- />
+ >
+ <path d="M12 2L16 12H12V2Z" className="fill-red-500" />
+ <path d="M12 2L8 12H12V2Z" className="fill-red-300" />
+ <path d="M12 22L16 12H12V22Z" className="fill-muted-foreground/60" />
+ <path d="M12 22L8 12H12V22Z" className="fill-muted-foreground/30" />
+ </svg>
</button>
);
}