@tileflow/react 0.1.0-alpha.25 → 0.1.0-alpha.26

package/README.md

@@ -79,7 +79,7 @@ import {Map} from '@tileflow/react';
 export function App() {
   return (
     <Map
-      source={{kind: 'tileflow', map: 'madrid'}}
+      source={{map: 'madrid'}}
       theme="system"
       center={[-3.7038, 40.4168]}
       zoom={12}
@@ -89,19 +89,21 @@ export function App() {
 }
 ```
 
-Coordinates are `[longitude, latitude]`. `source.map` must match the config's portable map ID,
-not a hosted `map_...` identifier. The default manifest URL is exactly `/tileflow/manifest.json`.
-For a subpath or external host, provide `manifestUrl` in the source; the component does not infer
-bundler configuration or search for assets.
+Coordinates are `[longitude, latitude]`. `source` is one object, `{map, manifestUrl?}`.
+`source.map` must match the config's portable map ID, not a hosted `map_...` identifier.
+The default manifest URL is exactly `/tileflow/manifest.json`. For a subpath or external host,
+provide `manifestUrl` in the source; the component does not infer bundler configuration or search
+for assets.
 
 `theme` selects a published concrete theme. Omission uses `defaultTheme`; `system` requires an
 explicit light/dark mapping, which Streets supplies. Theme changes preserve the MapLibre instance,
 camera, and interactions, and roll back on failure. `onThemeChange` reports transitions.
 
 `mapOptions` accepts native MapLibre options except `container` and `style`. Direct camera props
-take priority over `mapOptions`, then the manifest view, then shared defaults. To load one unmanaged
-style, use `source={{kind: 'maplibre', style: styleUrl}}`; that source has no Tileflow theme switching
-or manifest identity. Do not supply a Tileflow theme with an unmanaged source.
+take priority over `mapOptions`, then the manifest view, then shared defaults. `Map` always selects
+a Tileflow map through its manifest; it has no renderer discriminator or direct-style mode.
+The obsolete source fields `kind` and `style` are rejected. For a completely unmanaged map, use
+`maplibre-gl` directly rather than a Tileflow component.
 
 ## Add annotations and popups
 
@@ -141,7 +143,7 @@ export function PropertyMap() {
 
   return (
     <Map
-      source={{kind: 'tileflow', map: 'madrid'}}
+      source={{map: 'madrid'}}
       annotations={annotations}
       interactionState={state}
       onInteractionStateChange={setState}
@@ -178,10 +180,11 @@ Keep tooltips non-interactive; put buttons, links, and forms in popups.
 
 ## Display an image or create a render
 
-`<Map mode="image">` displays an existing explicit `imageUrl` or an image URL in the published
-manifest. It does not create a static render, poll an operation, or load MapLibre. A local style
-build alone does not create that image. Annotations, semantic bindings, and interaction state are
-not supported in image mode.
+`<Map mode="image">` displays an explicit `imageUrl` or derives an image URL from the selected
+manifest map's `mapId`, `apiUrl`, concrete theme and view. It still requires a valid Tileflow source.
+It does not create a static render, poll an operation, or load MapLibre. A local style build alone
+does not create that image. Annotations, semantic bindings, and interaction state are not supported
+in image mode.
 
 To request a new static render, use `StaticMap` from `@tileflow/react/static`. First install the
 shared client/types used by this example:

package/dist/index.js

@@ -37,8 +37,7 @@ import {
   resolveTileflowRuntimeStyle,
   resolveTileflowRuntimeTheme,
   resolveTileflowRuntimeView,
-  resolveTileflowStaticImageUrl,
-  shouldLoadTileflowManifest
+  resolveTileflowStaticImageUrl
 } from "@tileflow/core/runtime";
 import {
   createTileflowMapLibreDomRuntime,
@@ -175,9 +174,6 @@ function validateTileflowMapStyleInputs(input) {
   if (input.theme !== void 0 && !validateTileflowThemeSelection(input.theme)) {
     return { error: 'theme must be a concrete portable theme name or "system"', ok: false };
   }
-  if (input.theme !== void 0 && input.source.kind !== "tileflow") {
-    return { error: "theme is only valid with a tileflow source", ok: false };
-  }
   return { ok: true };
 }
 function assertTileflowMapStyleInputs(input) {
@@ -253,16 +249,14 @@ function Map2(props) {
   } = props;
   const generalRenderPopup = renderPopup;
   const generalRenderTooltip = renderTooltip;
-  const sourceKind = source.kind;
-  const sourceMap = source.kind === "tileflow" ? source.map : void 0;
-  const sourceManifestUrl = source.kind === "tileflow" ? source.manifestUrl : void 0;
-  const sourceStyle = source.kind === "maplibre" ? source.style : void 0;
+  const sourceMap = source.map;
+  const sourceManifestUrl = source.manifestUrl;
   const runtimeSource = useMemo(
-    () => sourceKind === "tileflow" ? { kind: "tileflow", manifestUrl: sourceManifestUrl, map: sourceMap } : { kind: "maplibre", style: sourceStyle },
-    [sourceKind, sourceManifestUrl, sourceMap, sourceStyle]
+    () => ({ manifestUrl: sourceManifestUrl, map: sourceMap }),
+    [sourceManifestUrl, sourceMap]
   );
-  const mapName = runtimeSource.kind === "tileflow" ? runtimeSource.map : void 0;
-  const manifestUrl = runtimeSource.kind === "tileflow" ? runtimeSource.manifestUrl ?? defaultTileflowManifestUrl : defaultTileflowManifestUrl;
+  const mapName = runtimeSource.map;
+  const manifestUrl = runtimeSource.manifestUrl ?? defaultTileflowManifestUrl;
   const preparedAnnotations = useMemo(
     () => prepareTileflowReactAnnotations(annotations),
     [annotations]
@@ -328,22 +322,12 @@ function Map2(props) {
   const resolvedCaptureId = normalizeTileflowCaptureId(captureId);
   const resolvedMode = resolveTileflowMapMode({ mode });
   const isImageMode = resolvedMode === "image";
-  const shouldLoadManifest = shouldLoadTileflowManifest({
-    source: runtimeSource
-  });
-  const manifestRequestKey = shouldLoadManifest ? JSON.stringify([manifestUrl, mapName]) : "not-needed";
-  const currentManifestResolution = manifestResolution.key === manifestRequestKey ? manifestResolution : {
-    key: manifestRequestKey,
-    map: null,
-    state: shouldLoadManifest ? "loading" : "not-needed"
-  };
+  const manifestRequestKey = JSON.stringify([manifestUrl, mapName]);
+  const currentManifestResolution = manifestResolution.key === manifestRequestKey ? manifestResolution : { key: manifestRequestKey, map: null, state: "loading" };
   const manifestMap = currentManifestResolution.state === "ready" ? currentManifestResolution.map : null;
   const themeResolution = useMemo(() => {
-    if (!manifestMap || runtimeSource.kind !== "tileflow") {
-      return {
-        error: false,
-        name: runtimeSource.kind === "tileflow" && theme && theme !== "system" ? theme : void 0
-      };
+    if (!manifestMap) {
+      return { error: false, name: theme && theme !== "system" ? theme : void 0 };
     }
     try {
       return {
@@ -353,7 +337,7 @@ function Map2(props) {
     } catch {
       return { error: true, name: void 0 };
     }
-  }, [manifestMap, runtimeSource, systemColorScheme, theme]);
+  }, [manifestMap, systemColorScheme, theme]);
   const resolvedThemeName = themeResolution.name;
   const manifestView = resolveTileflowRuntimeView({ manifestMap });
   const manifestCenter = useStableMapOptionValue(
@@ -458,10 +442,6 @@ function Map2(props) {
     reportedDeclarativeDiagnosticKeysRef.current = nextKeys;
   }, [declarativeInteractionDiagnostics]);
   useEffect(() => {
-    if (!shouldLoadManifest) {
-      setManifestResolution({ key: manifestRequestKey, map: null, state: "not-needed" });
-      return;
-    }
     let cancelled = false;
     setManifestResolution({ key: manifestRequestKey, map: null, state: "loading" });
     loadTileflowManifest(manifestUrl).then((manifest) => {
@@ -483,7 +463,7 @@ function Map2(props) {
     return () => {
       cancelled = true;
     };
-  }, [manifestRequestKey, manifestUrl, mapName, shouldLoadManifest]);
+  }, [manifestRequestKey, manifestUrl, mapName]);
   const runtimeStyle = useMemo(() => {
     if (isImageMode || themeResolution.error) {
       return null;
@@ -496,7 +476,7 @@ function Map2(props) {
     });
   }, [isImageMode, manifestMap, runtimeSource, systemColorScheme, themeResolution]);
   runtimeStyleRef.current = runtimeStyle;
-  const runtimeMapIdentity = runtimeSource.kind === "tileflow" ? `${manifestUrl}\0${runtimeSource.map}` : runtimeSource.style;
+  const runtimeMapIdentity = `${manifestUrl}\0${runtimeSource.map}`;
   const runtimeStyleReady = runtimeStyle !== null || themeResolution.error && mapRef.current !== null;
   const resolvedAnalytics = useMemo(
     () => mergeTileflowAnalytics(analytics, runtimeStyle?.analytics),
@@ -544,7 +524,7 @@ function Map2(props) {
     ]
   );
   const runtimeResolutionState = (() => {
-    if (shouldLoadManifest && currentManifestResolution.state !== "ready") {
+    if (currentManifestResolution.state !== "ready") {
       return currentManifestResolution.state === "error" ? "error" : "loading";
     }
     if (themeResolution.error) return "error";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tileflow/react",
-  "version": "0.1.0-alpha.25",
+  "version": "0.1.0-alpha.26",
   "license": "Apache-2.0",
   "description": "React components for rendering Tileflow maps with MapLibre.",
   "type": "module",
@@ -43,9 +43,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@tileflow/core": ">=0.1.0-alpha.25 <0.1.0-beta.0",
+    "@tileflow/core": ">=0.1.0-alpha.27 <0.1.0-beta.0",
     "@tileflow/interactions": ">=0.1.0-alpha.4 <0.1.0-beta.0",
-    "@tileflow/static": ">=0.1.0-alpha.26 <0.1.0-beta.0"
+    "@tileflow/static": ">=0.1.0-alpha.27 <0.1.0-beta.0"
   },
   "peerDependencies": {
     "maplibre-gl": ">=6.4.1 <7",