-
-
Notifications
You must be signed in to change notification settings - Fork 830
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 #3387 from matrix-org/bwindels/cider-formatbar-too…
…ltips New composer: format bar tooltips
- Loading branch information
Showing
6 changed files
with
205 additions
and
128 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
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,86 @@ | ||
| /* | ||
| 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_MessageComposerFormatBar { | ||
| display: none; | ||
| width: calc(26px * 5); | ||
| height: 24px; | ||
| position: absolute; | ||
| cursor: pointer; | ||
| border-radius: 4px; | ||
| background-color: $message-action-bar-bg-color; | ||
| user-select: none; | ||
|
|
||
| &.mx_MessageComposerFormatBar_shown { | ||
| display: block; | ||
| } | ||
|
|
||
| > * { | ||
| white-space: nowrap; | ||
| display: inline-block; | ||
| position: relative; | ||
| border: 1px solid $message-action-bar-border-color; | ||
| margin-left: -1px; | ||
|
|
||
| &:hover { | ||
| border-color: $message-action-bar-hover-border-color; | ||
| } | ||
| } | ||
|
|
||
| .mx_MessageComposerFormatBar_button { | ||
| width: 27px; | ||
| height: 24px; | ||
| box-sizing: border-box; | ||
| } | ||
|
|
||
| .mx_MessageComposerFormatBar_button::after { | ||
| content: ''; | ||
| position: absolute; | ||
| top: 0; | ||
| left: 0; | ||
| height: 100%; | ||
| width: 100%; | ||
| mask-repeat: no-repeat; | ||
| mask-position: center; | ||
| background-color: $message-action-bar-fg-color; | ||
| } | ||
|
|
||
| .mx_MessageComposerFormatBar_buttonIconBold::after { | ||
| mask-image: url('$(res)/img/format/bold.svg'); | ||
| } | ||
|
|
||
| .mx_MessageComposerFormatBar_buttonIconItalic::after { | ||
| mask-image: url('$(res)/img/format/italics.svg'); | ||
| } | ||
|
|
||
| .mx_MessageComposerFormatBar_buttonIconStrikethrough::after { | ||
| mask-image: url('$(res)/img/format/strikethrough.svg'); | ||
| } | ||
|
|
||
| .mx_MessageComposerFormatBar_buttonIconQuote::after { | ||
| mask-image: url('$(res)/img/format/quote.svg'); | ||
| } | ||
|
|
||
| .mx_MessageComposerFormatBar_buttonIconCode::after { | ||
| mask-image: url('$(res)/img/format/code.svg'); | ||
| } | ||
| } | ||
|
|
||
| .mx_MessageComposerFormatBar_buttonTooltip { | ||
| white-space: nowrap; | ||
| font-size: 12px; | ||
| font-weight: 600; | ||
| } |
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,88 @@ | ||
| /* | ||
| 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 PropTypes from 'prop-types'; | ||
| import { _t } from '../../../languageHandler'; | ||
| import sdk from '../../../index'; | ||
|
|
||
|
|
||
| export default class MessageComposerFormatBar extends React.PureComponent { | ||
| static propTypes = { | ||
| onAction: PropTypes.func.isRequired, | ||
| } | ||
|
|
||
| render() { | ||
| return (<div className="mx_MessageComposerFormatBar" ref={ref => this._formatBarRef = ref}> | ||
| <FormatButton label={_t("Bold")} onClick={() => this.props.onAction("bold")} icon="Bold" /> | ||
| <FormatButton label={_t("Italics")} onClick={() => this.props.onAction("italics")} icon="Italic" /> | ||
| <FormatButton label={_t("Strikethrough")} onClick={() => this.props.onAction("strikethrough")} icon="Strikethrough" /> | ||
| <FormatButton label={_t("Code block")} onClick={() => this.props.onAction("code")} icon="Code" /> | ||
| <FormatButton label={_t("Quote")} onClick={() => this.props.onAction("quote")} icon="Quote" /> | ||
| </div>); | ||
| } | ||
|
|
||
| showAt(selectionRect) { | ||
| this._formatBarRef.classList.add("mx_MessageComposerFormatBar_shown"); | ||
| let leftOffset = 0; | ||
| let node = this._formatBarRef; | ||
| while (node.offsetParent) { | ||
| node = node.offsetParent; | ||
| leftOffset += node.offsetLeft; | ||
| } | ||
|
|
||
| let topOffset = 0; | ||
| node = this._formatBarRef; | ||
| while (node.offsetParent) { | ||
| node = node.offsetParent; | ||
| topOffset += node.offsetTop; | ||
| } | ||
|
|
||
| this._formatBarRef.style.left = `${selectionRect.left - leftOffset}px`; | ||
| // 12 is half the height of the bar (e.g. to center it) and 16 is an offset that felt ok. | ||
| this._formatBarRef.style.top = `${selectionRect.top - topOffset - 16 - 12}px`; | ||
| } | ||
|
|
||
| hide() { | ||
| this._formatBarRef.classList.remove("mx_MessageComposerFormatBar_shown"); | ||
| } | ||
| } | ||
|
|
||
| class FormatButton extends React.PureComponent { | ||
| static propTypes = { | ||
| label: PropTypes.string.isRequired, | ||
| onClick: PropTypes.func.isRequired, | ||
| icon: PropTypes.string.isRequired, | ||
| } | ||
|
|
||
| render() { | ||
| const InteractiveTooltip = sdk.getComponent('elements.InteractiveTooltip'); | ||
| const className = `mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIcon${this.props.icon}`; | ||
| const tooltipContent = ( | ||
| <div className="mx_MessageComposerFormatBar_buttonTooltip">{this.props.label}</div> | ||
| ); | ||
|
|
||
| return ( | ||
| <InteractiveTooltip content={tooltipContent}> | ||
| <span aria-label={this.props.label} | ||
| role="button" | ||
| onClick={this.props.onClick} | ||
| className={className}> | ||
| </span> | ||
| </InteractiveTooltip> | ||
| ); | ||
| } | ||
| } |
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