Live location sharing - consolidate maps (#8236)

* extract location markers into generic Marker Signed-off-by: Kerry Archibald <kerrya@element.io> * wrap marker in smartmarker Signed-off-by: Kerry Archibald <kerrya@element.io> * test smartmarker Signed-off-by: Kerry Archibald <kerrya@element.io> * working map in location body Signed-off-by: Kerry Archibald <kerrya@element.io> * test Map Signed-off-by: Kerry Archibald <kerrya@element.io> * remove skinned sdk Signed-off-by: Kerry Archibald <kerrya@element.io> * update snaps with new mocks Signed-off-by: Kerry Archibald <kerrya@element.io> * use new ZoomButtons in MLocationBody Signed-off-by: Kerry Archibald <kerrya@element.io> * make LocationViewDialog map interactive Signed-off-by: Kerry Archibald <kerrya@element.io> * test MLocationBody Signed-off-by: Kerry Archibald <kerrya@element.io> * test LocationViewDialog Signed-off-by: Kerry Archibald <kerrya@element.io> * add copyrights, shrink snapshot Signed-off-by: Kerry Archibald <kerrya@element.io> * update comment Signed-off-by: Kerry Archibald <kerrya@element.io> * lint Signed-off-by: Kerry Archibald <kerrya@element.io> * lint Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-04-11 18:40:06 +02:00 · 2022-04-11 18:40:06 +02:00 · 9ba55d1d14
commit 9ba55d1d14
parent 944e11d7d6
16 changed files with 890 additions and 235 deletions
--- a/test/components/views/location/snapshots/LocationViewDialog-test.tsx.snap
+++ b/test/components/views/location/snapshots/LocationViewDialog-test.tsx.snap
@ -0,0 +1,156 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<LocationViewDialog /> renders map correctly 1`] = `
+<Map
+  centerGeoUri="geo:51.5076,-0.1276"
+  className="mx_LocationViewDialog_map"
+  id="mx_LocationViewDialog_$2"
+  interactive={true}
+  onError={[Function]}
+>
+  <div
+    className="mx_Map mx_LocationViewDialog_map"
+    id="mx_Map_mx_LocationViewDialog_$2"
+    onClick={[Function]}
+  >
+    <SmartMarker
+      geoUri="geo:51.5076,-0.1276"
+      id="mx_LocationViewDialog_$2-marker"
+      map={
+        MockMap {
+          "_events": Object {
+            "error": [Function],
+          },
+          "_eventsCount": 1,
+          "_maxListeners": undefined,
+          "addControl": [MockFunction],
+          "removeControl": [MockFunction],
+          "setCenter": [MockFunction] {
+            "calls": Array [
+              Array [
+                Object {
+                  "lat": 51.5076,
+                  "lon": -0.1276,
+                },
+              ],
+            ],
+            "results": Array [
+              Object {
+                "type": "return",
+                "value": undefined,
+              },
+            ],
+          },
+          "setStyle": [MockFunction],
+          "zoomIn": [MockFunction],
+          "zoomOut": [MockFunction],
+          Symbol(kCapture): false,
+        }
+      }
+    >
+      <ForwardRef
+        id="mx_LocationViewDialog_$2-marker"
+      >
+        <div
+          className="mx_Marker mx_Marker_defaultColor"
+          id="mx_LocationViewDialog_$2-marker"
+        >
+          <div
+            className="mx_Marker_border"
+          >
+            <div
+              className="mx_Marker_icon"
+            />
+          </div>
+        </div>
+      </ForwardRef>
+    </SmartMarker>
+    <ZoomButtons
+      map={
+        MockMap {
+          "_events": Object {
+            "error": [Function],
+          },
+          "_eventsCount": 1,
+          "_maxListeners": undefined,
+          "addControl": [MockFunction],
+          "removeControl": [MockFunction],
+          "setCenter": [MockFunction] {
+            "calls": Array [
+              Array [
+                Object {
+                  "lat": 51.5076,
+                  "lon": -0.1276,
+                },
+              ],
+            ],
+            "results": Array [
+              Object {
+                "type": "return",
+                "value": undefined,
+              },
+            ],
+          },
+          "setStyle": [MockFunction],
+          "zoomIn": [MockFunction],
+          "zoomOut": [MockFunction],
+          Symbol(kCapture): false,
+        }
+      }
+    >
+      <div
+        className="mx_ZoomButtons"
+      >
+        <AccessibleButton
+          className="mx_ZoomButtons_button"
+          data-test-id="map-zoom-in-button"
+          element="div"
+          onClick={[Function]}
+          role="button"
+          tabIndex={0}
+          title="Zoom in"
+        >
+          <div
+            className="mx_AccessibleButton mx_ZoomButtons_button"
+            data-test-id="map-zoom-in-button"
+            onClick={[Function]}
+            onKeyDown={[Function]}
+            onKeyUp={[Function]}
+            role="button"
+            tabIndex={0}
+            title="Zoom in"
+          >
+            <div
+              className="mx_ZoomButtons_icon"
+            />
+          </div>
+        </AccessibleButton>
+        <AccessibleButton
+          className="mx_ZoomButtons_button"
+          data-test-id="map-zoom-out-button"
+          element="div"
+          onClick={[Function]}
+          role="button"
+          tabIndex={0}
+          title="Zoom out"
+        >
+          <div
+            className="mx_AccessibleButton mx_ZoomButtons_button"
+            data-test-id="map-zoom-out-button"
+            onClick={[Function]}
+            onKeyDown={[Function]}
+            onKeyUp={[Function]}
+            role="button"
+            tabIndex={0}
+            title="Zoom out"
+          >
+            <div
+              className="mx_ZoomButtons_icon"
+            />
+          </div>
+        </AccessibleButton>
+      </div>
+    </ZoomButtons>
+  </div>
+</Map>
+`;
--- a/test/components/views/location/snapshots/SmartMarker-test.tsx.snap
+++ b/test/components/views/location/snapshots/SmartMarker-test.tsx.snap
@ -10,6 +10,8 @@ exports[`<SmartMarker /> creates a marker on mount 1`] = `
      "_maxListeners": undefined,
      "addControl": [MockFunction],
      "removeControl": [MockFunction],
+      "setCenter": [MockFunction],
+      "setStyle": [MockFunction],
      "zoomIn": [MockFunction],
      "zoomOut": [MockFunction],
      Symbol(kCapture): false,
@ -42,6 +44,8 @@ exports[`<SmartMarker /> removes marker on unmount 1`] = `
      "_maxListeners": undefined,
      "addControl": [MockFunction],
      "removeControl": [MockFunction],
+      "setCenter": [MockFunction],
+      "setStyle": [MockFunction],
      "zoomIn": [MockFunction],
      "zoomOut": [MockFunction],
      Symbol(kCapture): false,
--- a/test/components/views/location/snapshots/ZoomButtons-test.tsx.snap
+++ b/test/components/views/location/snapshots/ZoomButtons-test.tsx.snap
@ -9,6 +9,8 @@ exports[`<ZoomButtons /> renders buttons 1`] = `
      "_maxListeners": undefined,
      "addControl": [MockFunction],
      "removeControl": [MockFunction],
+      "setCenter": [MockFunction],
+      "setStyle": [MockFunction],
      "zoomIn": [MockFunction],
      "zoomOut": [MockFunction],
      Symbol(kCapture): false,