Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-09 15:05:44 +01:00
Code Issues Packages Projects Releases Activity

Correct mixing concepts, Link instead of a for internal links, adjust regex

Browse Source
This commit is contained in:
Florian Scholdei
2020-05-15 09:54:20 +02:00
parent 327bde9515
commit a148d29770
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
scm-ui/ui-components/src/MarkdownLinkRenderer.tsx
View File

@@ -21,15 +21,17 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. * SOFTWARE.
*/ */
import React, { ReactNode } from "react"; import React, { FC, ReactNode } from "react";
import { withRouter, RouteComponentProps } from "react-router-dom"; import { Link, useLocation } from "react-router-dom";
import { withContextPath } from "./urls"; import { withContextPath } from "./urls";
type Props = RouteComponentProps & { type Props = {
children: ReactNode; children: ReactNode;
href: string; href: string;
}; };
const regex = new RegExp("[a-z]:");
/** /**
* Handle local SCM-Manager and external links * Handle local SCM-Manager and external links
* *
@@ -40,8 +42,7 @@ export function correctLocalLink(pathname: string, link: string) {
return pathname; return pathname;
} }
// Leave uris unchanged which start with schemes // Leave uris unchanged which start with schemes or fragment
const regex = new RegExp(".:");
if (link.match(regex) || link.startsWith("#")) { if (link.match(regex) || link.startsWith("#")) {
return link; return link;
} }
@@ -73,9 +74,15 @@ export function correctLocalLink(pathname: string, link: string) {
return base + path; return base + path;
} }
function MarkdownLinkRenderer(props: Props) {
const compositeUrl = correctLocalLink(withContextPath(props.location.pathname), props.href);
return <a href={compositeUrl}>{props.children}</a>;
}
export default withRouter(MarkdownLinkRenderer); const MarkdownLinkRenderer: FC<Props> = ({ children, href }) => {
const location = useLocation();
const compositeUrl = correctLocalLink(withContextPath(location.pathname), href);
if (compositeUrl.match(regex)) {
return <a href={compositeUrl}>{children}</a>;
}
return <Link to={compositeUrl}>{children}</Link>;
};
export default MarkdownLinkRenderer;