feat: Show icon on external links (#3100)
* feat: External links get treatment * cache decorations
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
import * as React from "react";
|
import * as React from "react";
|
||||||
import { Optional } from "utility-types";
|
import { Optional } from "utility-types";
|
||||||
import embeds from "@shared/editor/embeds";
|
import embeds from "@shared/editor/embeds";
|
||||||
|
import { isInternalUrl } from "@shared/utils/urls";
|
||||||
import ErrorBoundary from "~/components/ErrorBoundary";
|
import ErrorBoundary from "~/components/ErrorBoundary";
|
||||||
import { Props as EditorProps } from "~/editor";
|
import { Props as EditorProps } from "~/editor";
|
||||||
import useDictionary from "~/hooks/useDictionary";
|
import useDictionary from "~/hooks/useDictionary";
|
||||||
@@ -8,7 +9,7 @@ import useToasts from "~/hooks/useToasts";
|
|||||||
import history from "~/utils/history";
|
import history from "~/utils/history";
|
||||||
import { isModKey } from "~/utils/keyboard";
|
import { isModKey } from "~/utils/keyboard";
|
||||||
import { uploadFile } from "~/utils/uploadFile";
|
import { uploadFile } from "~/utils/uploadFile";
|
||||||
import { isInternalUrl, isHash } from "~/utils/urls";
|
import { isHash } from "~/utils/urls";
|
||||||
|
|
||||||
const SharedEditor = React.lazy(
|
const SharedEditor = React.lazy(
|
||||||
() =>
|
() =>
|
||||||
|
|||||||
@@ -3,10 +3,10 @@ import * as React from "react";
|
|||||||
import { Portal } from "react-portal";
|
import { Portal } from "react-portal";
|
||||||
import styled from "styled-components";
|
import styled from "styled-components";
|
||||||
import parseDocumentSlug from "@shared/utils/parseDocumentSlug";
|
import parseDocumentSlug from "@shared/utils/parseDocumentSlug";
|
||||||
|
import { isInternalUrl } from "@shared/utils/urls";
|
||||||
import HoverPreviewDocument from "~/components/HoverPreviewDocument";
|
import HoverPreviewDocument from "~/components/HoverPreviewDocument";
|
||||||
import useStores from "~/hooks/useStores";
|
import useStores from "~/hooks/useStores";
|
||||||
import { fadeAndSlideDown } from "~/styles/animations";
|
import { fadeAndSlideDown } from "~/styles/animations";
|
||||||
import { isInternalUrl } from "~/utils/urls";
|
|
||||||
|
|
||||||
const DELAY_OPEN = 300;
|
const DELAY_OPEN = 300;
|
||||||
const DELAY_CLOSE = 300;
|
const DELAY_CLOSE = 300;
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import {
|
import {
|
||||||
|
ArrowIcon,
|
||||||
DocumentIcon,
|
DocumentIcon,
|
||||||
CloseIcon,
|
CloseIcon,
|
||||||
PlusIcon,
|
PlusIcon,
|
||||||
@@ -11,6 +12,7 @@ import { EditorView } from "prosemirror-view";
|
|||||||
import * as React from "react";
|
import * as React from "react";
|
||||||
import styled from "styled-components";
|
import styled from "styled-components";
|
||||||
import isUrl from "@shared/editor/lib/isUrl";
|
import isUrl from "@shared/editor/lib/isUrl";
|
||||||
|
import { isInternalUrl } from "@shared/utils/urls";
|
||||||
import Flex from "~/components/Flex";
|
import Flex from "~/components/Flex";
|
||||||
import { Dictionary } from "~/hooks/useDictionary";
|
import { Dictionary } from "~/hooks/useDictionary";
|
||||||
import Input from "./Input";
|
import Input from "./Input";
|
||||||
@@ -299,6 +301,7 @@ class LinkEditor extends React.Component<Props, State> {
|
|||||||
|
|
||||||
const looksLikeUrl = value.match(/^https?:\/\//i);
|
const looksLikeUrl = value.match(/^https?:\/\//i);
|
||||||
const suggestedLinkTitle = this.suggestedLinkTitle;
|
const suggestedLinkTitle = this.suggestedLinkTitle;
|
||||||
|
const isInternal = isInternalUrl(value);
|
||||||
|
|
||||||
const showCreateLink =
|
const showCreateLink =
|
||||||
!!this.props.onCreateLink &&
|
!!this.props.onCreateLink &&
|
||||||
@@ -324,9 +327,15 @@ class LinkEditor extends React.Component<Props, State> {
|
|||||||
autoFocus={this.href === ""}
|
autoFocus={this.href === ""}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<Tooltip tooltip={dictionary.openLink}>
|
<Tooltip
|
||||||
|
tooltip={isInternal ? dictionary.goToLink : dictionary.openLink}
|
||||||
|
>
|
||||||
<ToolbarButton onClick={this.handleOpenLink} disabled={!value}>
|
<ToolbarButton onClick={this.handleOpenLink} disabled={!value}>
|
||||||
<OpenIcon color="currentColor" />
|
{isInternal ? (
|
||||||
|
<ArrowIcon color="currentColor" />
|
||||||
|
) : (
|
||||||
|
<OpenIcon color="currentColor" />
|
||||||
|
)}
|
||||||
</ToolbarButton>
|
</ToolbarButton>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
<Tooltip tooltip={dictionary.removeLink}>
|
<Tooltip tooltip={dictionary.removeLink}>
|
||||||
|
|||||||
@@ -529,13 +529,16 @@ const EditorStyles = styled.div<{
|
|||||||
|
|
||||||
a {
|
a {
|
||||||
color: ${(props) => props.theme.text};
|
color: ${(props) => props.theme.text};
|
||||||
border-bottom: 1px solid ${(props) => lighten(0.5, props.theme.text)};
|
text-decoration: underline;
|
||||||
text-decoration: none !important;
|
text-decoration-color: ${(props) => lighten(0.5, props.theme.text)};
|
||||||
|
text-decoration-thickness: 1px;
|
||||||
|
text-underline-offset: .15em;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
border-bottom: 1px solid ${(props) => props.theme.text};
|
text-decoration: underline;
|
||||||
text-decoration: none;
|
text-decoration-color: ${(props) => props.theme.text};
|
||||||
|
text-decoration-thickness: 1px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -718,6 +721,11 @@ const EditorStyles = styled.div<{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.external-link {
|
||||||
|
position: relative;
|
||||||
|
top: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
.code-actions,
|
.code-actions,
|
||||||
.notice-actions {
|
.notice-actions {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ export default function useDictionary() {
|
|||||||
newLineWithSlash: `${t("Keep typing to filter")}…`,
|
newLineWithSlash: `${t("Keep typing to filter")}…`,
|
||||||
noResults: t("No results"),
|
noResults: t("No results"),
|
||||||
openLink: t("Open link"),
|
openLink: t("Open link"),
|
||||||
|
goToLink: t("Go to link"),
|
||||||
orderedList: t("Ordered list"),
|
orderedList: t("Ordered list"),
|
||||||
pageBreak: t("Page break"),
|
pageBreak: t("Page break"),
|
||||||
pasteLink: `${t("Paste a link")}…`,
|
pasteLink: `${t("Paste a link")}…`,
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import { observer } from "mobx-react";
|
|||||||
import * as React from "react";
|
import * as React from "react";
|
||||||
import { RouteComponentProps, StaticContext } from "react-router";
|
import { RouteComponentProps, StaticContext } from "react-router";
|
||||||
import parseDocumentSlug from "@shared/utils/parseDocumentSlug";
|
import parseDocumentSlug from "@shared/utils/parseDocumentSlug";
|
||||||
|
import { isInternalUrl } from "@shared/utils/urls";
|
||||||
import RootStore from "~/stores/RootStore";
|
import RootStore from "~/stores/RootStore";
|
||||||
import Document from "~/models/Document";
|
import Document from "~/models/Document";
|
||||||
import Revision from "~/models/Revision";
|
import Revision from "~/models/Revision";
|
||||||
@@ -17,7 +18,6 @@ import { NavigationNode } from "~/types";
|
|||||||
import { NotFoundError, OfflineError } from "~/utils/errors";
|
import { NotFoundError, OfflineError } from "~/utils/errors";
|
||||||
import history from "~/utils/history";
|
import history from "~/utils/history";
|
||||||
import { matchDocumentEdit } from "~/utils/routeHelpers";
|
import { matchDocumentEdit } from "~/utils/routeHelpers";
|
||||||
import { isInternalUrl } from "~/utils/urls";
|
|
||||||
import HideSidebar from "./HideSidebar";
|
import HideSidebar from "./HideSidebar";
|
||||||
import Loading from "./Loading";
|
import Loading from "./Loading";
|
||||||
|
|
||||||
|
|||||||
@@ -1,25 +1,3 @@
|
|||||||
import { parseDomain } from "@shared/utils/domains";
|
|
||||||
|
|
||||||
export function isInternalUrl(href: string) {
|
|
||||||
if (href[0] === "/") {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
const outline = parseDomain(window.location.href);
|
|
||||||
const parsed = parseDomain(href);
|
|
||||||
|
|
||||||
if (
|
|
||||||
parsed &&
|
|
||||||
outline &&
|
|
||||||
parsed.subdomain === outline.subdomain &&
|
|
||||||
parsed.domain === outline.domain &&
|
|
||||||
parsed.tld === outline.tld
|
|
||||||
) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function isHash(href: string) {
|
export function isHash(href: string) {
|
||||||
if (href[0] === "#") {
|
if (href[0] === "#") {
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import Token from "markdown-it/lib/token";
|
import Token from "markdown-it/lib/token";
|
||||||
|
import { OpenIcon } from "outline-icons";
|
||||||
import { toggleMark } from "prosemirror-commands";
|
import { toggleMark } from "prosemirror-commands";
|
||||||
import { InputRule } from "prosemirror-inputrules";
|
import { InputRule } from "prosemirror-inputrules";
|
||||||
import { MarkdownSerializerState } from "prosemirror-markdown";
|
import { MarkdownSerializerState } from "prosemirror-markdown";
|
||||||
@@ -9,6 +10,11 @@ import {
|
|||||||
Mark as ProsemirrorMark,
|
Mark as ProsemirrorMark,
|
||||||
} from "prosemirror-model";
|
} from "prosemirror-model";
|
||||||
import { Transaction, EditorState, Plugin } from "prosemirror-state";
|
import { Transaction, EditorState, Plugin } from "prosemirror-state";
|
||||||
|
import { Decoration, DecorationSet } from "prosemirror-view";
|
||||||
|
import * as React from "react";
|
||||||
|
import ReactDOM from "react-dom";
|
||||||
|
import { isInternalUrl } from "../../utils/urls";
|
||||||
|
import findLinkNodes from "../queries/findLinkNodes";
|
||||||
import Mark from "./Mark";
|
import Mark from "./Mark";
|
||||||
|
|
||||||
const LINK_INPUT_REGEX = /\[([^[]+)]\((\S+)\)$/;
|
const LINK_INPUT_REGEX = /\[([^[]+)]\((\S+)\)$/;
|
||||||
@@ -109,56 +115,97 @@ export default class Link extends Mark {
|
|||||||
}
|
}
|
||||||
|
|
||||||
get plugins() {
|
get plugins() {
|
||||||
return [
|
const getLinkDecorations = (doc: Node) => {
|
||||||
new Plugin({
|
const decorations: Decoration[] = [];
|
||||||
props: {
|
const links = findLinkNodes(doc);
|
||||||
handleDOMEvents: {
|
|
||||||
mouseover: (_view, event: MouseEvent) => {
|
links.forEach((nodeWithPos) => {
|
||||||
if (
|
const linkMark = nodeWithPos.node.marks.find(
|
||||||
event.target instanceof HTMLAnchorElement &&
|
(mark) => mark.type.name === "link"
|
||||||
!event.target.className.includes("ProseMirror-widget")
|
);
|
||||||
) {
|
if (linkMark && !isInternalUrl(linkMark.attrs.href)) {
|
||||||
if (this.options.onHoverLink) {
|
decorations.push(
|
||||||
return this.options.onHoverLink(event);
|
Decoration.widget(
|
||||||
}
|
// place the decoration at the end of the link
|
||||||
|
nodeWithPos.pos + nodeWithPos.node.nodeSize,
|
||||||
|
() => {
|
||||||
|
const component = <OpenIcon color="currentColor" size={16} />;
|
||||||
|
const icon = document.createElement("span");
|
||||||
|
icon.className = "external-link";
|
||||||
|
ReactDOM.render(component, icon);
|
||||||
|
return icon;
|
||||||
|
},
|
||||||
|
{
|
||||||
|
// position on the right side of the position
|
||||||
|
side: 1,
|
||||||
}
|
}
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return DecorationSet.create(doc, decorations);
|
||||||
|
};
|
||||||
|
|
||||||
|
const plugin: Plugin = new Plugin({
|
||||||
|
state: {
|
||||||
|
init: (config, state) => {
|
||||||
|
return getLinkDecorations(state.doc);
|
||||||
|
},
|
||||||
|
apply: (tr, oldState) => {
|
||||||
|
return tr.docChanged ? getLinkDecorations(tr.doc) : oldState;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
props: {
|
||||||
|
decorations: (state) => plugin.getState(state),
|
||||||
|
handleDOMEvents: {
|
||||||
|
mouseover: (_view, event: MouseEvent) => {
|
||||||
|
if (
|
||||||
|
event.target instanceof HTMLAnchorElement &&
|
||||||
|
!event.target.className.includes("ProseMirror-widget")
|
||||||
|
) {
|
||||||
|
if (this.options.onHoverLink) {
|
||||||
|
return this.options.onHoverLink(event);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
},
|
||||||
|
click: (view, event: MouseEvent) => {
|
||||||
|
if (!(event.target instanceof HTMLAnchorElement)) {
|
||||||
return false;
|
return false;
|
||||||
},
|
}
|
||||||
click: (view, event: MouseEvent) => {
|
|
||||||
if (!(event.target instanceof HTMLAnchorElement)) {
|
// clicking a link while editing should show the link toolbar,
|
||||||
return false;
|
// clicking in read-only will navigate
|
||||||
|
if (!view.editable) {
|
||||||
|
const href =
|
||||||
|
event.target.href ||
|
||||||
|
(event.target.parentNode instanceof HTMLAnchorElement
|
||||||
|
? event.target.parentNode.href
|
||||||
|
: "");
|
||||||
|
|
||||||
|
const isHashtag = href.startsWith("#");
|
||||||
|
if (isHashtag && this.options.onClickHashtag) {
|
||||||
|
event.stopPropagation();
|
||||||
|
event.preventDefault();
|
||||||
|
this.options.onClickHashtag(href, event);
|
||||||
}
|
}
|
||||||
|
|
||||||
// clicking a link while editing should show the link toolbar,
|
if (this.options.onClickLink) {
|
||||||
// clicking in read-only will navigate
|
event.stopPropagation();
|
||||||
if (!view.editable) {
|
event.preventDefault();
|
||||||
const href =
|
this.options.onClickLink(href, event);
|
||||||
event.target.href ||
|
|
||||||
(event.target.parentNode instanceof HTMLAnchorElement
|
|
||||||
? event.target.parentNode.href
|
|
||||||
: "");
|
|
||||||
|
|
||||||
const isHashtag = href.startsWith("#");
|
|
||||||
if (isHashtag && this.options.onClickHashtag) {
|
|
||||||
event.stopPropagation();
|
|
||||||
event.preventDefault();
|
|
||||||
this.options.onClickHashtag(href, event);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.options.onClickLink) {
|
|
||||||
event.stopPropagation();
|
|
||||||
event.preventDefault();
|
|
||||||
this.options.onClickLink(href, event);
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
},
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}),
|
},
|
||||||
];
|
});
|
||||||
|
|
||||||
|
return [plugin];
|
||||||
}
|
}
|
||||||
|
|
||||||
toMarkdown() {
|
toMarkdown() {
|
||||||
19
shared/editor/queries/findLinkNodes.ts
Normal file
19
shared/editor/queries/findLinkNodes.ts
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
import { Node } from "prosemirror-model";
|
||||||
|
import { findTextNodes, NodeWithPos } from "prosemirror-utils";
|
||||||
|
|
||||||
|
export default function findLinkNodes(doc: Node): NodeWithPos[] {
|
||||||
|
const textNodes = findTextNodes(doc);
|
||||||
|
const nodes: NodeWithPos[] = [];
|
||||||
|
|
||||||
|
for (const nodeWithPos of textNodes) {
|
||||||
|
const hasLinkMark = nodeWithPos.node.marks.find(
|
||||||
|
(mark) => mark.type.name === "link"
|
||||||
|
);
|
||||||
|
|
||||||
|
if (hasLinkMark) {
|
||||||
|
nodes.push(nodeWithPos);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nodes;
|
||||||
|
}
|
||||||
@@ -206,6 +206,7 @@
|
|||||||
"Type '/' to insert": "Type '/' to insert",
|
"Type '/' to insert": "Type '/' to insert",
|
||||||
"Keep typing to filter": "Keep typing to filter",
|
"Keep typing to filter": "Keep typing to filter",
|
||||||
"Open link": "Open link",
|
"Open link": "Open link",
|
||||||
|
"Go to link": "Go to link",
|
||||||
"Ordered list": "Ordered list",
|
"Ordered list": "Ordered list",
|
||||||
"Page break": "Page break",
|
"Page break": "Page break",
|
||||||
"Paste a link": "Paste a link",
|
"Paste a link": "Paste a link",
|
||||||
|
|||||||
@@ -1,5 +1,30 @@
|
|||||||
|
import { parseDomain } from "./domains";
|
||||||
|
|
||||||
const env = typeof window !== "undefined" ? window.env : process.env;
|
const env = typeof window !== "undefined" ? window.env : process.env;
|
||||||
|
|
||||||
export function cdnPath(path: string): string {
|
export function cdnPath(path: string): string {
|
||||||
return `${env.CDN_URL}${path}`;
|
return `${env.CDN_URL}${path}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function isInternalUrl(href: string) {
|
||||||
|
if (href[0] === "/") {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
const outline =
|
||||||
|
typeof window !== "undefined"
|
||||||
|
? parseDomain(window.location.href)
|
||||||
|
: undefined;
|
||||||
|
const parsed = parseDomain(href);
|
||||||
|
|
||||||
|
if (
|
||||||
|
parsed &&
|
||||||
|
outline &&
|
||||||
|
parsed.subdomain === outline.subdomain &&
|
||||||
|
parsed.domain === outline.domain &&
|
||||||
|
parsed.tld === outline.tld
|
||||||
|
) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user