Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Open map in a dialog when it is clicked #7465

Merged
merged 10 commits into from
Jan 7, 2022
1 change: 1 addition & 0 deletions res/css/_components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
@import "./views/dialogs/_JoinRuleDropdown.scss";
@import "./views/dialogs/_KeyboardShortcutsDialog.scss";
@import "./views/dialogs/_LeaveSpaceDialog.scss";
@import "./views/dialogs/_LocationViewDialog.scss";
@import "./views/dialogs/_ManageRestrictedJoinRuleDialog.scss";
@import "./views/dialogs/_MessageEditHistoryDialog.scss";
@import "./views/dialogs/_ModalWidgetDialog.scss";
Expand Down
56 changes: 56 additions & 0 deletions res/css/views/dialogs/_LocationViewDialog.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/*
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_LocationViewDialog_wrapper .mx_Dialog {
padding: 0px;

/* Unset contain and position to allow the close button
to appear outside the dialog */
contain: unset;
position: unset;
}

.mx_LocationViewDialog {
/* subtract 0.5px to prevent single-pixel margin due to rounding */
width: calc(79vw - 0.5px);
height: calc(79vh - 0.5px);
andybalaam marked this conversation as resolved.
Show resolved Hide resolved
overflow: hidden;

.mx_Dialog_header {
margin: 0px;
padding: 0px;
position: unset;

.mx_Dialog_title {
display: none;
}

.mx_Dialog_cancelButton {
z-index: 4010;
position: absolute;
right: 5vw;
top: 5vh;
width: 20px;
height: 20px;
background-color: $dialog-close-external-color;
}
}

.mx_MLocationBody .mx_MLocationBody_map {
width: 79vw;
height: 79vh;
andybalaam marked this conversation as resolved.
Show resolved Hide resolved
}
}
1 change: 1 addition & 0 deletions res/themes/dark/css/_dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ $input-lighter-bg-color: #f2f5f8;
$dialog-title-fg-color: $primary-content;
$dialog-backdrop-color: $menu-border-color;
$dialog-close-fg-color: #9fa9ba;
$dialog-close-external-color: $primary-content;
// ********************

// RoomList
Expand Down
1 change: 1 addition & 0 deletions res/themes/legacy-dark/css/_legacy-dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ $dialog-title-fg-color: $base-text-color;
$dialog-backdrop-color: #000;
$dialog-shadow-color: rgba(0, 0, 0, 0.48);
$dialog-close-fg-color: #9fa9ba;
$dialog-close-external-color: $text-primary-color;

$lightbox-background-bg-color: #000;
$lightbox-background-bg-opacity: 0.85;
Expand Down
1 change: 1 addition & 0 deletions res/themes/legacy-light/css/_legacy-light.scss
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ $dialog-title-fg-color: #45474a;
$dialog-backdrop-color: rgba(46, 48, 51, 0.38);
$dialog-shadow-color: rgba(0, 0, 0, 0.48);
$dialog-close-fg-color: #c1c1c1;
$dialog-close-external-color: $primary-bg-color;

$lightbox-background-bg-color: #000;
$lightbox-background-bg-opacity: 0.95;
Expand Down
1 change: 1 addition & 0 deletions res/themes/light/css/_light.scss
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ $input-fg-color: rgba(74, 74, 74, 0.9);
$dialog-title-fg-color: #45474a;
$dialog-backdrop-color: rgba(46, 48, 51, 0.38);
$dialog-close-fg-color: #c1c1c1;
$dialog-close-external-color: $background;
$dialog-shadow-color: rgba(0, 0, 0, 0.48);
// ********************

Expand Down
92 changes: 92 additions & 0 deletions src/components/views/location/LocationViewDialog.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
/*
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 { MatrixEvent } from 'matrix-js-sdk/src/models/event';

import { replaceableComponent } from "../../../utils/replaceableComponent";
import BaseDialog from "../dialogs/BaseDialog";
import { IDialogProps } from "../dialogs/IDialogProps";
import { createMap, LocationBodyContent, locationEventGeoUri, parseGeoUri } from '../messages/MLocationBody';

interface IProps extends IDialogProps {
mxEvent: MatrixEvent;
}

interface IState {
error: Error;
}

@replaceableComponent("views.location.LocationViewDialog")
export default class LocationViewDialog extends React.Component<IProps, IState> {
private coords: GeolocationCoordinates;

constructor(props: IProps) {
super(props);

this.coords = parseGeoUri(locationEventGeoUri(this.props.mxEvent));
this.state = {
error: undefined,
};
}

componentDidMount() {
if (this.state.error) {
return;
}

createMap(
this.coords,
true,
this.getBodyId(),
this.getMarkerId(),
(e: Error) => this.setState({ error: e }),
);

// Set class mx_Dialog_nonDialogButton on all buttons inside
// the map container. This prevents our CSS from styling the
// attribution button as if it were a dialog submit/cancel button.
const container: Element = document.getElementById(this.getBodyId());
container.querySelectorAll("button").forEach(
(b: Element) => b.classList.add("mx_Dialog_nonDialogButton"),
);
andybalaam marked this conversation as resolved.
Show resolved Hide resolved
}

private getBodyId = () => {
return `mx_LocationViewDialog_${this.props.mxEvent.getId()}`;
};

private getMarkerId = () => {
return `mx_MLocationViewDialog_marker_${this.props.mxEvent.getId()}`;
};

render() {
return (
<BaseDialog
className='mx_LocationViewDialog'
onFinished={this.props.onFinished}
fixedWidth={false}
>
<LocationBodyContent
mxEvent={this.props.mxEvent}
bodyId={this.getBodyId()}
markerId={this.getMarkerId()}
error={this.state.error}
/>
</BaseDialog>
);
}
}
Loading