Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
f18cce8
Add option to display tooltip on link hover
Johennes Apr 21, 2022
7129ba6
Merge branch 'develop' into feature/url-tooltip
Johennes Apr 22, 2022
cf07f54
Gracefully handle missing platform
Johennes Apr 22, 2022
5da4ab8
Use public access modifier
Johennes May 2, 2022
f90805f
Use exact inequality
Johennes May 2, 2022
2374247
Merge branch 'develop' into feature/url-tooltip
Johennes May 2, 2022
1f2808b
Document getAbsoluteUrl
Johennes May 2, 2022
c5ae080
Appease the linter
Johennes May 2, 2022
73dfb56
Clarify performance impact in comment
Johennes May 6, 2022
89ff830
Merge branch 'develop' into feature/url-tooltip
Johennes May 6, 2022
502fab8
Merge branch 'develop' into feature/url-tooltip
Johennes May 9, 2022
e6946ac
Use URL instead of anchor element hack
Johennes May 9, 2022
cd0574b
Wrap anchor in tooltip target and only allow focus on anchor
Johennes May 11, 2022
8cbd220
Merge branch 'develop' into feature/url-tooltip
t3chguy May 13, 2022
0b5d048
Use optional chaining
Johennes May 13, 2022
49ee784
Use double quotes for consistency
Johennes May 13, 2022
1561555
Accumulate and unmount tooltips and extract tooltipify.tsx
Johennes May 13, 2022
d3f5e8d
Merge branch 'develop' into feature/url-tooltip
Johennes May 13, 2022
cfe46f2
Fix indentation
Johennes May 13, 2022
d90964f
Blur tooltip target on click
Johennes May 13, 2022
c7c9bc7
Merge branch 'develop' into feature/url-tooltip
Johennes May 13, 2022
b8f68e0
Remove space
Johennes May 13, 2022
76862a0
Merge branch 'develop' into feature/url-tooltip
Johennes May 17, 2022
7b6f641
Mention platform flag in comment
Johennes May 17, 2022
1216b17
Add (simplistic) tests
Johennes May 17, 2022
9a711f1
Fix lint errors
Johennes May 17, 2022
cdd181d
Fix lint errors ... for real
Johennes May 18, 2022
69f096e
Merge branch 'develop' into feature/url-tooltip
Johennes May 18, 2022
1e4cfac
Replace snapshot tests with structural assertions
Johennes May 18, 2022
837c56a
Add missing semicolon
Johennes May 18, 2022
33c40ac
Merge branch 'develop' into feature/url-tooltip
Johennes May 20, 2022
e892052
Merge branch 'develop' into feature/url-tooltip
Johennes Jun 1, 2022
dc3a5d3
Add tooltips in link previews
Johennes Jun 2, 2022
a76abc6
Fix copyright
Johennes Jun 6, 2022
b83b12f
Merge branch 'develop' into feature/url-tooltip
t3chguy Jun 6, 2022
aa9f454
Merge branch 'develop' into feature/url-tooltip
Johennes Jul 5, 2022
68cf5c0
Merge branch 'develop' into feature/url-tooltip
t3chguy Jul 6, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions src/components/views/elements/LinkWithTooltip.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/*
Copyright 2022 New Vector Ltd.

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 TextWithTooltip from './TextWithTooltip';

interface IProps extends Omit<React.ComponentProps<typeof TextWithTooltip>, "tabIndex" | "onClick" > {}

export default class LinkWithTooltip extends React.Component<IProps> {
constructor(props: IProps) {
super(props);
}

public render(): JSX.Element {
const { children, tooltip, ...props } = this.props;

return (
<TextWithTooltip
// Disable focusing on the tooltip target to avoid double / nested focus. The contained anchor element
// itself allows focusing which also triggers the tooltip.
tabIndex={-1}
tooltip={tooltip}
onClick={e => (e.target as HTMLElement).blur()} // Force tooltip to hide on clickout
{...props}
>
{ children }
</TextWithTooltip>
);
}
}
11 changes: 10 additions & 1 deletion src/components/views/rooms/LinkPreviewWidget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ import Modal from "../../../Modal";
import * as ImageUtils from "../../../ImageUtils";
import { mediaFromMxc } from "../../../customisations/Media";
import ImageView from '../elements/ImageView';
import LinkWithTooltip from '../elements/LinkWithTooltip';
import PlatformPeg from '../../../PlatformPeg';

interface IProps {
link: string;
Expand Down Expand Up @@ -118,12 +120,19 @@ export default class LinkPreviewWidget extends React.Component<IProps> {
// opaque string. This does not allow any HTML to be injected into the DOM.
const description = AllHtmlEntities.decode(p["og:description"] || "");

const anchor = <a href={this.props.link} target="_blank" rel="noreferrer noopener">{ p["og:title"] }</a>;
const needsTooltip = PlatformPeg.get()?.needsUrlTooltips() && this.props.link !== p["og:title"].trim();

return (
<div className="mx_LinkPreviewWidget">
{ img }
<div className="mx_LinkPreviewWidget_caption">
<div className="mx_LinkPreviewWidget_title">
<a href={this.props.link} target="_blank" rel="noreferrer noopener">{ p["og:title"] }</a>
{ needsTooltip ? <LinkWithTooltip
tooltip={new URL(this.props.link, window.location.href).toString()}
>
{ anchor }
</LinkWithTooltip> : anchor }
{ p["og:site_name"] && <span className="mx_LinkPreviewWidget_siteName">
{ (" - " + p["og:site_name"]) }
</span> }
Expand Down
12 changes: 3 additions & 9 deletions src/utils/tooltipify.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import React from "react";
import ReactDOM from 'react-dom';

import PlatformPeg from "../PlatformPeg";
import TextWithTooltip from "../components/views/elements/TextWithTooltip";
import LinkWithTooltip from "../components/views/elements/LinkWithTooltip";

/**
* If the platform enabled needsUrlTooltips, recurses depth-first through a DOM tree, adding tooltip previews
Expand Down Expand Up @@ -52,15 +52,9 @@ export function tooltipifyLinks(rootNodes: ArrayLike<Element>, ignoredNodes: Ele
const container = document.createElement("span");
const href = node.getAttribute("href");

const tooltip = <TextWithTooltip
// Disable focusing on the tooltip target to avoid double / nested focus. The contained anchor element
// itself allows focusing which also triggers the tooltip.
tabIndex={-1}
tooltip={new URL(href, window.location.href).toString()}
onClick={e => (e.target as HTMLElement).blur()} // Force tooltip to hide on clickout
>
const tooltip = <LinkWithTooltip tooltip={new URL(href, window.location.href).toString()}>
<span dangerouslySetInnerHTML={{ __html: node.outerHTML }} />
</TextWithTooltip>;
</LinkWithTooltip>;

ReactDOM.render(tooltip, container);
node.parentNode.replaceChild(container, node);
Expand Down