This repository was archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 819
Add option to display tooltip on link hover #8394
Merged
Merged
Changes from 33 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 7129ba6
Merge branch 'develop' into feature/url-tooltip
Johennes cf07f54
Gracefully handle missing platform
Johennes 5da4ab8
Use public access modifier
Johennes f90805f
Use exact inequality
Johennes 2374247
Merge branch 'develop' into feature/url-tooltip
Johennes 1f2808b
Document getAbsoluteUrl
Johennes c5ae080
Appease the linter
Johennes 73dfb56
Clarify performance impact in comment
Johennes 89ff830
Merge branch 'develop' into feature/url-tooltip
Johennes 502fab8
Merge branch 'develop' into feature/url-tooltip
Johennes e6946ac
Use URL instead of anchor element hack
Johennes cd0574b
Wrap anchor in tooltip target and only allow focus on anchor
Johennes 8cbd220
Merge branch 'develop' into feature/url-tooltip
t3chguy 0b5d048
Use optional chaining
Johennes 49ee784
Use double quotes for consistency
Johennes 1561555
Accumulate and unmount tooltips and extract tooltipify.tsx
Johennes d3f5e8d
Merge branch 'develop' into feature/url-tooltip
Johennes cfe46f2
Fix indentation
Johennes d90964f
Blur tooltip target on click
Johennes c7c9bc7
Merge branch 'develop' into feature/url-tooltip
Johennes b8f68e0
Remove space
Johennes 76862a0
Merge branch 'develop' into feature/url-tooltip
Johennes 7b6f641
Mention platform flag in comment
Johennes 1216b17
Add (simplistic) tests
Johennes 9a711f1
Fix lint errors
Johennes cdd181d
Fix lint errors ... for real
Johennes 69f096e
Merge branch 'develop' into feature/url-tooltip
Johennes 1e4cfac
Replace snapshot tests with structural assertions
Johennes 837c56a
Add missing semicolon
Johennes 33c40ac
Merge branch 'develop' into feature/url-tooltip
Johennes e892052
Merge branch 'develop' into feature/url-tooltip
Johennes dc3a5d3
Add tooltips in link previews
Johennes a76abc6
Fix copyright
Johennes b83b12f
Merge branch 'develop' into feature/url-tooltip
t3chguy aa9f454
Merge branch 'develop' into feature/url-tooltip
Johennes 68cf5c0
Merge branch 'develop' into feature/url-tooltip
t3chguy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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,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> | ||
); | ||
} | ||
} |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 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 ReactDOM from 'react-dom'; | ||
|
||
import PlatformPeg from "../PlatformPeg"; | ||
import LinkWithTooltip from "../components/views/elements/LinkWithTooltip"; | ||
|
||
/** | ||
* If the platform enabled needsUrlTooltips, recurses depth-first through a DOM tree, adding tooltip previews | ||
* for link elements. Otherwise, does nothing. | ||
* | ||
* @param {Element[]} rootNodes - a list of sibling DOM nodes to traverse to try | ||
* to add tooltips. | ||
* @param {Element[]} ignoredNodes: a list of nodes to not recurse into. | ||
* @param {Element[]} containers: an accumulator of the DOM nodes which contain | ||
* React components that have been mounted by this function. The initial caller | ||
* should pass in an empty array to seed the accumulator. | ||
*/ | ||
export function tooltipifyLinks(rootNodes: ArrayLike<Element>, ignoredNodes: Element[], containers: Element[]) { | ||
Johennes marked this conversation as resolved.
Show resolved
Hide resolved
|
||
if (!PlatformPeg.get()?.needsUrlTooltips()) { | ||
return; | ||
} | ||
|
||
let node = rootNodes[0]; | ||
|
||
while (node) { | ||
let tooltipified = false; | ||
|
||
if (ignoredNodes.indexOf(node) >= 0) { | ||
node = node.nextSibling as Element; | ||
continue; | ||
} | ||
|
||
if (node.tagName === "A" && node.getAttribute("href") | ||
&& node.getAttribute("href") !== node.textContent.trim() | ||
) { | ||
const container = document.createElement("span"); | ||
const href = node.getAttribute("href"); | ||
|
||
const tooltip = <LinkWithTooltip tooltip={new URL(href, window.location.href).toString()}> | ||
<span dangerouslySetInnerHTML={{ __html: node.outerHTML }} /> | ||
</LinkWithTooltip>; | ||
|
||
ReactDOM.render(tooltip, container); | ||
node.parentNode.replaceChild(container, node); | ||
containers.push(container); | ||
tooltipified = true; | ||
} | ||
|
||
if (node.childNodes?.length && !tooltipified) { | ||
tooltipifyLinks(node.childNodes as NodeListOf<Element>, ignoredNodes, containers); | ||
} | ||
|
||
node = node.nextSibling as Element; | ||
} | ||
} | ||
|
||
/** | ||
* Unmount tooltip containers created by tooltipifyLinks. | ||
* | ||
* It's critical to call this after tooltipifyLinks, otherwise | ||
* tooltips will leak. | ||
* | ||
* @param {Element[]} containers - array of tooltip containers to unmount | ||
*/ | ||
export function unmountTooltips(containers: Element[]) { | ||
for (const container of containers) { | ||
ReactDOM.unmountComponentAtNode(container); | ||
} | ||
} |
This file contains hidden or 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,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 { mount } from 'enzyme'; | ||
|
||
import { tooltipifyLinks } from '../../src/utils/tooltipify'; | ||
import PlatformPeg from '../../src/PlatformPeg'; | ||
import BasePlatform from '../../src/BasePlatform'; | ||
|
||
describe('tooltipify', () => { | ||
jest.spyOn(PlatformPeg, 'get') | ||
.mockReturnValue({ needsUrlTooltips: () => true } as unknown as BasePlatform); | ||
|
||
it('does nothing for empty element', () => { | ||
const component = mount(<div />); | ||
const root = component.getDOMNode(); | ||
const originalHtml = root.outerHTML; | ||
const containers: Element[] = []; | ||
tooltipifyLinks([root], [], containers); | ||
expect(containers).toHaveLength(0); | ||
expect(root.outerHTML).toEqual(originalHtml); | ||
}); | ||
|
||
it('wraps single anchor', () => { | ||
const component = mount(<div><a href="/foo">click</a></div>); | ||
const root = component.getDOMNode(); | ||
const containers: Element[] = []; | ||
tooltipifyLinks([root], [], containers); | ||
expect(containers).toHaveLength(1); | ||
const anchor = root.querySelector(".mx_TextWithTooltip_target a"); | ||
expect(anchor?.getAttribute("href")).toEqual("/foo"); | ||
expect(anchor?.innerHTML).toEqual("click"); | ||
}); | ||
|
||
it('ignores node', () => { | ||
const component = mount(<div><a href="/foo">click</a></div>); | ||
const root = component.getDOMNode(); | ||
const originalHtml = root.outerHTML; | ||
const containers: Element[] = []; | ||
tooltipifyLinks([root], [root.children[0]], containers); | ||
expect(containers).toHaveLength(0); | ||
expect(root.outerHTML).toEqual(originalHtml); | ||
}); | ||
}); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.