Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3661 from matrix-org/bwindels/verif-toasts
Show incoming verification requests in in-app notifications
- Loading branch information
Showing
13 changed files
with
424 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| /* | ||
| Copyright 2019 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_ToastContainer { | ||
| position: absolute; | ||
| top: 0; | ||
| left: 70px; | ||
| z-index: 101; | ||
| padding: 4px; | ||
| display: grid; | ||
| grid-template-rows: 1fr 14px 6px; | ||
|
|
||
| &.mx_ToastContainer_stacked::before { | ||
| content: ""; | ||
| margin: 0 4px; | ||
| grid-row: 2 / 4; | ||
| grid-column: 1; | ||
| background-color: white; | ||
| box-shadow: 0px 4px 12px $menu-box-shadow-color; | ||
| border-radius: 8px; | ||
| } | ||
|
|
||
| .mx_Toast_toast { | ||
| grid-row: 1 / 3; | ||
| grid-column: 1; | ||
| color: $primary-fg-color; | ||
| background-color: $primary-bg-color; | ||
| box-shadow: 0px 4px 12px $menu-box-shadow-color; | ||
| border-radius: 8px; | ||
| overflow: hidden; | ||
| display: grid; | ||
| grid-template-columns: 20px 1fr; | ||
| column-gap: 10px; | ||
| row-gap: 4px; | ||
| padding: 8px; | ||
| padding-right: 16px; | ||
|
|
||
| &.mx_Toast_hasIcon { | ||
| &::after { | ||
| content: ""; | ||
| width: 20px; | ||
| height: 20px; | ||
| grid-column: 1; | ||
| grid-row: 1; | ||
| mask-size: 100%; | ||
| mask-repeat: no-repeat; | ||
| } | ||
|
|
||
| &.mx_Toast_icon_verification::after { | ||
| mask-image: url("$(res)/img/e2e/normal.svg"); | ||
| background-color: $primary-fg-color; | ||
| } | ||
|
|
||
| h2, .mx_Toast_body { | ||
| grid-column: 2; | ||
| } | ||
| } | ||
|
|
||
| h2 { | ||
| grid-column: 1 / 3; | ||
| grid-row: 1; | ||
| margin: 0; | ||
| font-size: 15px; | ||
| font-weight: 600; | ||
| } | ||
|
|
||
| .mx_Toast_body { | ||
| grid-column: 1 / 3; | ||
| grid-row: 2; | ||
| } | ||
|
|
||
| .mx_Toast_buttons { | ||
| display: flex; | ||
| } | ||
|
|
||
| .mx_Toast_description { | ||
| max-width: 400px; | ||
| overflow: hidden; | ||
| white-space: nowrap; | ||
| text-overflow: ellipsis; | ||
| margin: 4px 0 11px 0; | ||
| font-size: 12px; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /* | ||
| Copyright 2019 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_FormButton { | ||
| line-height: 16px; | ||
| padding: 5px 15px; | ||
| font-size: 12px; | ||
| height: min-content; | ||
|
|
||
| &:not(:last-child) { | ||
| margin-right: 8px; | ||
| } | ||
|
|
||
| &.mx_AccessibleButton_kind_primary { | ||
| color: $accent-color; | ||
| background-color: $accent-bg-color; | ||
| } | ||
|
|
||
| &.mx_AccessibleButton_kind_danger { | ||
| color: $notice-primary-color; | ||
| background-color: $notice-primary-bg-color; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /* | ||
| Copyright 2019 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 * as React from "react"; | ||
| import dis from "../../dispatcher"; | ||
| import { _t } from '../../languageHandler'; | ||
| import classNames from "classnames"; | ||
|
|
||
| export default class ToastContainer extends React.Component { | ||
| constructor() { | ||
| super(); | ||
| this.state = {toasts: []}; | ||
| } | ||
|
|
||
| componentDidMount() { | ||
| this._dispatcherRef = dis.register(this.onAction); | ||
| } | ||
|
|
||
| componentWillUnmount() { | ||
| dis.unregister(this._dispatcherRef); | ||
| } | ||
|
|
||
| onAction = (payload) => { | ||
| if (payload.action === "show_toast") { | ||
| this._addToast(payload.toast); | ||
| } | ||
| }; | ||
|
|
||
| _addToast(toast) { | ||
| this.setState({toasts: this.state.toasts.concat(toast)}); | ||
| } | ||
|
|
||
| dismissTopToast = () => { | ||
| const [, ...remaining] = this.state.toasts; | ||
| this.setState({toasts: remaining}); | ||
| }; | ||
|
|
||
| render() { | ||
| const totalCount = this.state.toasts.length; | ||
| if (totalCount === 0) { | ||
| return null; | ||
| } | ||
| const isStacked = totalCount > 1; | ||
| const topToast = this.state.toasts[0]; | ||
| const {title, icon, key, component, props} = topToast; | ||
|
|
||
| const containerClasses = classNames("mx_ToastContainer", { | ||
| "mx_ToastContainer_stacked": isStacked, | ||
| }); | ||
|
|
||
| const toastClasses = classNames("mx_Toast_toast", { | ||
| "mx_Toast_hasIcon": icon, | ||
| [`mx_Toast_icon_${icon}`]: icon, | ||
| }); | ||
|
|
||
| const countIndicator = isStacked ? _t(" (1/%(totalCount)s)", {totalCount}) : null; | ||
|
|
||
| const toastProps = Object.assign({}, props, { | ||
| dismiss: this.dismissTopToast, | ||
| key, | ||
| }); | ||
|
|
||
| return ( | ||
| <div className={containerClasses}> | ||
| <div className={toastClasses}> | ||
| <h2>{title}{countIndicator}</h2> | ||
| <div className="mx_Toast_body">{React.createElement(component, toastProps)}</div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| /* | ||
| Copyright 2019 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 AccessibleButton from "./AccessibleButton"; | ||
|
|
||
| export default function FormButton(props) { | ||
| const {className, label, kind, ...restProps} = props; | ||
| const newClassName = (className || "") + " mx_FormButton"; | ||
| const allProps = Object.assign({}, restProps, | ||
| {className: newClassName, kind: kind || "primary", children: [label]}); | ||
| return React.createElement(AccessibleButton, allProps); | ||
| } | ||
|
|
||
| FormButton.propTypes = AccessibleButton.propTypes; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.