improve react-native/expo support

wq · Sep 8, 2021 · 1fb706d · 1fb706d
1 parent c810d65
commit 1fb706d
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 11 deletions.
diff --git a/packages/app/src/auth.js b/packages/app/src/auth.js
@@ -120,7 +120,7 @@ export default {
  return this.userInfo(ctx);
  },
 
- userInfo(ctx) {
+ userInfo(ctx={}) {
  const { user, config, csrftoken } = this.getState(),
  pageConf = (ctx.router_info && ctx.router_info.page_config) || {},
  wqPageConf =

diff --git a/packages/map-gl/package.json b/packages/map-gl/package.json
@@ -39,7 +39,7 @@
  "react-mapbox-gl-draw": "^2.0.4"
  },
  "peerDependencies": {
- "@react-native-mapbox-gl/maps": "^8.1.0-rc.2"
+ "@react-native-mapbox-gl/maps": "^8.3.0"
  },
  "devDependencies": {
  "@wq/model": "^1.3.0-beta.1",

diff --git a/packages/map-gl/src/basemaps/Tile.js b/packages/map-gl/src/basemaps/Tile.js
@@ -3,7 +3,7 @@ export default function Tile() {
  return null;
 }
 
-Tile.asBasemapStyle = basemap => {
+export function asBasemapStyle(basemap) {
  const urls = [];
  if (basemap.url.match('{s}')) {
  (basemap.subdomains || ['a', 'b', 'c']).forEach(s =>
@@ -29,4 +29,6 @@ Tile.asBasemapStyle = basemap => {
  }
  ]
  };
-};
+}
+
+Tile.asBasemapStyle = asBasemapStyle;
diff --git a/packages/map-gl/src/basemaps/Tile.native.js b/packages/map-gl/src/basemaps/Tile.native.js
@@ -1,3 +1,8 @@
-export default function FIXME() {
+import { asBasemapStyle } from './Tile.js';
+
+export default function Tile() {
+ // Handled with style= prop in root Map
  return null;
 }
+
+Tile.asBasemapStyle = asBasemapStyle;
diff --git a/packages/map-gl/src/basemaps/VectorTile.js b/packages/map-gl/src/basemaps/VectorTile.js
@@ -3,4 +3,8 @@ export default function VectorTile() {
  return null;
 }
 
-VectorTile.asBasemapStyle = basemap => basemap.url;
+export function asBasemapStyle(basemap) {
+ return basemap.style || basemap.url;
+}
+
+VectorTile.asBasemapStyle = asBasemapStyle;
diff --git a/packages/map-gl/src/basemaps/VectorTile.native.js b/packages/map-gl/src/basemaps/VectorTile.native.js
@@ -1,6 +1,8 @@
+import { asBasemapStyle } from './VectorTile.js';
+
 export default function VectorTile() {
  // Handled with style= prop in root Map
  return null;
 }
 
-VectorTile.asBasemapStyle = basemap => basemap.url;
+VectorTile.asBasemapStyle = asBasemapStyle;
diff --git a/packages/map-gl/src/components/Map.native.js b/packages/map-gl/src/components/Map.native.js
@@ -25,8 +25,9 @@ export default function Map({
  const [[xmin, ymin], [xmax, ymax]] = initBounds;
  return { sw: [xmin, ymin], ne: [xmax, ymax] };
  }, [initBounds]),
- style = findBasemapStyle(children);
-
+ style = findBasemapStyle(children),
+ styleURL = typeof style === 'string' ? style : null,
+ styleJSON = typeof style === 'string' ? null : JSON.stringify(style);
  const mapRef = React.useRef(),
  setMapRef = React.useCallback(ref => {
  mapRef.current = ref;
@@ -53,7 +54,8 @@ export default function Map({
 
  return (
  <MapboxGL.MapView
- styleURL={style}
+ styleURL={styleURL}
+ styleJSON={styleJSON}
  ref={setMapRef}
  rotateEnabled={rotateEnabled}
  pitchEnabled={pitchEnabled}

diff --git a/packages/router/src/router.js b/packages/router/src/router.js
@@ -298,7 +298,7 @@ router.render = function (context, refresh) {
  if (site_title && title !== site_title) {
  title = `${title} - ${site_title}`;
  }
- document.title = title;
+ if (window.document) window.document.title = title;
 
  return router.store.dispatch({
  type: RENDER,