Live location sharing - extract zoom buttons into component (#8235)

* extract out zoombuttons component

* newline

Signed-off-by: Kerry Archibald <kerrya@element.io>

* stylelint

Signed-off-by: Kerry Archibald <kerrya@element.io>

* remove skinned sdk

Signed-off-by: Kerry Archibald <kerrya@element.io>

__mocks__/maplibre-gl.js

@@ -4,6 +4,8 @@ const { LngLat, NavigationControl } = require('maplibre-gl');
 class MockMap extends EventEmitter {
     addControl = jest.fn();
     removeControl = jest.fn();
+    zoomIn = jest.fn();
+    zoomOut = jest.fn();
 }
 const MockMapInstance = new MockMap();
 

res/css/_components.scss

@@ -13,6 +13,7 @@
 @import "./components/views/location/_Marker.scss";
 @import "./components/views/location/_ShareDialogButtons.scss";
 @import "./components/views/location/_ShareType.scss";
+@import "./components/views/location/_ZoomButtons.scss";
 @import "./components/views/spaces/_QuickThemeSwitcher.scss";
 @import "./structures/_AutoHideScrollbar.scss";
 @import "./structures/_BackdropPanel.scss";

res/css/components/views/location/_ZoomButtons.scss

@@ -0,0 +1,45 @@
+/*
+Copyright 2022 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.
+*/
+
+.mx_ZoomButtons {
+    position: absolute;
+    bottom: $spacing-32;
+    right: $spacing-24;
+}
+
+.mx_ZoomButtons_button {
+    @mixin ButtonResetDefault;
+
+    margin-top: $spacing-8;
+    border-radius: 4px;
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+
+    height: 24px;
+    width: 24px;
+
+    background: $background;
+    box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.25);
+}
+
+.mx_ZoomButtons_icon {
+    height: 10px;
+    width: 10px;
+
+    color: $primary-content;
+}

res/img/element-icons/minus-button.svg

@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2 8.00001C2 7.56779 2.35038 7.21741 2.78261 7.21741L13.2173 7.21741C13.6496 7.21741 13.9999 7.56779 13.9999 8.00001C13.9999 8.43223 13.6496 8.78262 13.2173 8.78262L2.78261 8.78262C2.35038 8.78262 2 8.43223 2 8.00001Z" fill="#17191C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 8.00001C2 7.56779 2.35038 7.21741 2.78261 7.21741L13.2173 7.21741C13.6496 7.21741 13.9999 7.56779 13.9999 8.00001C13.9999 8.43223 13.6496 8.78262 13.2173 8.78262L2.78261 8.78262C2.35038 8.78262 2 8.43223 2 8.00001Z" fill="currentColor"/>
 </svg>

res/img/element-icons/plus-button.svg

@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.78269 2.78285C8.78269 2.35063 8.43231 2.00024 8.00009 2.00024C7.56787 2.00024 7.21748 2.35063 7.21748 2.78285V7.21748L2.78285 7.21748C2.35063 7.21748 2.00024 7.56787 2.00024 8.00009C2.00024 8.43231 2.35063 8.78269 2.78285 8.78269L7.21748 8.7827V13.2176C7.21748 13.6498 7.56787 14.0002 8.00009 14.0002C8.43231 14.0002 8.7827 13.6498 8.7827 13.2176V8.7827L13.2176 8.7827C13.6498 8.7827 14.0002 8.43231 14.0002 8.00009C14.0002 7.56787 13.6498 7.21749 13.2176 7.21749L8.78269 7.21748V2.78285Z" fill="#17191C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.78269 2.78285C8.78269 2.35063 8.43231 2.00024 8.00009 2.00024C7.56787 2.00024 7.21748 2.35063 7.21748 2.78285V7.21748L2.78285 7.21748C2.35063 7.21748 2.00024 7.56787 2.00024 8.00009C2.00024 8.43231 2.35063 8.78269 2.78285 8.78269L7.21748 8.7827V13.2176C7.21748 13.6498 7.56787 14.0002 8.00009 14.0002C8.43231 14.0002 8.7827 13.6498 8.7827 13.2176V8.7827L13.2176 8.7827C13.6498 8.7827 14.0002 8.43231 14.0002 8.00009C14.0002 7.56787 13.6498 7.21749 13.2176 7.21749L8.78269 7.21748V2.78285Z" fill="currentColor"/>
 </svg>

src/components/views/location/ZoomButtons.tsx

@@ -0,0 +1,58 @@
+/*
+Copyright 2022 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.
+*/
+
+import React from 'react';
+import maplibregl from 'maplibre-gl';
+
+import { _t } from '../../../languageHandler';
+import AccessibleButton from '../elements/AccessibleButton';
+import { Icon as PlusIcon } from '../../../../res/img/element-icons/plus-button.svg';
+import { Icon as MinusIcon } from '../../../../res/img/element-icons/minus-button.svg';
+
+interface Props {
+    map: maplibregl.Map;
+}
+
+const ZoomButtons: React.FC<Props> = ({ map }) => {
+    const onZoomIn = () => {
+        map.zoomIn();
+    };
+
+    const onZoomOut = () => {
+        map.zoomOut();
+    };
+
+    return <div className="mx_ZoomButtons">
+        <AccessibleButton
+            onClick={onZoomIn}
+            data-test-id='map-zoom-in-button'
+            title={_t("Zoom in")}
+            className='mx_ZoomButtons_button'
+        >
+            <PlusIcon className='mx_ZoomButtons_icon' />
+        </AccessibleButton>
+        <AccessibleButton
+            onClick={onZoomOut}
+            data-test-id='map-zoom-out-button'
+            title={_t("Zoom out")}
+            className='mx_ZoomButtons_button'
+        >
+            <MinusIcon className='mx_ZoomButtons_icon' />
+        </AccessibleButton>
+    </div>;
+};
+
+export default ZoomButtons;

test/components/views/location/ZoomButtons-test.tsx

@@ -0,0 +1,63 @@
+/*
+Copyright 2022 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.
+*/
+
+import React from 'react';
+import { mount } from 'enzyme';
+import maplibregl from 'maplibre-gl';
+import { act } from 'react-dom/test-utils';
+
+import ZoomButtons from '../../../../src/components/views/location/ZoomButtons';
+import { findByTestId } from '../../../test-utils';
+
+describe('<ZoomButtons />', () => {
+    const mockMap = new maplibregl.Map();
+    const defaultProps = {
+        map: mockMap,
+    };
+    const getComponent = (props = {}) =>
+        mount(<ZoomButtons {...defaultProps} {...props} />);
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('renders buttons', () => {
+        const component = getComponent();
+        expect(component).toMatchSnapshot();
+    });
+
+    it('calls map zoom in on zoom in click', () => {
+        const component = getComponent();
+
+        act(() => {
+            findByTestId(component, 'map-zoom-in-button').at(0).simulate('click');
+        });
+
+        expect(mockMap.zoomIn).toHaveBeenCalled();
+        expect(component).toBeTruthy();
+    });
+
+    it('calls map zoom out on zoom out click', () => {
+        const component = getComponent();
+
+        act(() => {
+            findByTestId(component, 'map-zoom-out-button').at(0).simulate('click');
+        });
+
+        expect(mockMap.zoomOut).toHaveBeenCalled();
+        expect(component).toBeTruthy();
+    });
+});

test/components/views/location/__snapshots__/ZoomButtons-test.tsx.snap

@@ -0,0 +1,71 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<ZoomButtons /> renders buttons 1`] = `
+<ZoomButtons
+  map={
+    MockMap {
+      "_events": Object {},
+      "_eventsCount": 0,
+      "_maxListeners": undefined,
+      "addControl": [MockFunction],
+      "removeControl": [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>
+`;