1
Fork 0
mirror of https://github.com/Steffo99/bluelib.git synced 2024-12-22 11:34:21 +00:00

I have no idea why I didn't commit these earlier

This commit is contained in:
Steffo 2021-01-26 01:57:14 +01:00
parent 164e955584
commit de1d94074e
Signed by: steffo
GPG key ID: 6965406171929D01
8 changed files with 133 additions and 186 deletions

246
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
{ {
"name": "bluelib", "name": "bluelib",
"version": "0.23.3", "version": "0.24.0",
"description": "React components for Bluelib", "description": "React components for Bluelib",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -16,15 +16,16 @@
"start": "styleguidist server" "start": "styleguidist server"
}, },
"dependencies": { "dependencies": {
"@babel/preset-env": "^7.12.11",
"@babel/preset-react": "^7.12.10",
"@reach/router": "^1.3.4",
"classnames": "^2.2.6", "classnames": "^2.2.6",
"mathjax-react": "^1.0.6", "mathjax-react": "^1.0.6",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",
"react-syntax-highlighter": "^15.4.3",
"strip-indent": "^3.0.0",
"@babel/preset-env": "^7.12.11",
"@babel/preset-react": "^7.12.10",
"react": "^17.0.1", "react": "^17.0.1",
"react-dom": "^17.0.1" "react-dom": "^17.0.1",
"react-syntax-highlighter": "^15.4.3",
"strip-indent": "^3.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"react": "16.x" "react": "16.x"

View file

@ -5,7 +5,7 @@ import PropTypes from "prop-types";
export default function Anchor({children, className, href}) { export default function Anchor({children, className, href}) {
return ( return (
<a className={useBluelibClassNames("element-anchor", className)} href={href}> <a className={useBluelibClassNames(`element-anchor`, className)} href={href}>
{children} {children}
</a> </a>
) )
@ -15,5 +15,5 @@ export default function Anchor({children, className, href}) {
Anchor.propTypes = { Anchor.propTypes = {
children: PropTypes.node, children: PropTypes.node,
className: PropTypes.string, className: PropTypes.string,
href: PropTypes.string, href: PropTypes.string
} }

View file

@ -0,0 +1,3 @@
A router-aware version of [`<Anchor>`](#anchor). It becomes bold if the current location matches its `href` property,
and can be disabled with the `disabled` prop.

View file

@ -0,0 +1,42 @@
import React from "react";
import useBluelibClassNames from "../../hooks/useBluelibClassNames";
import PropTypes from "prop-types";
import { Link, useMatch } from "@reach/router"
export default function BaseLink({children, className, href, disabled}) {
const locationMatch = useMatch(href);
const activeClassNames = useBluelibClassNames("style-bold", className);
if(locationMatch) {
return (
<span className={activeClassNames}>
{children}
</span>
)
}
const disabledClassNames = useBluelibClassNames("element-anchor status-disabled", className);
if(disabled) {
return (
<span className={disabledClassNames}>
{children}
</span>
)
}
const enabledClassNames = useBluelibClassNames("element-anchor", className)
return (
<Link to={href} className={enabledClassNames}>
{children}
</Link>
)
}
BaseLink.propTypes = {
children: PropTypes.node,
className: PropTypes.string,
href: PropTypes.string,
disabled: PropTypes.bool,
}

View file

@ -20,3 +20,4 @@ export {default as Strike} from "./Strike";
export {default as Table} from "./Table"; export {default as Table} from "./Table";
export {default as Title} from "./Title"; export {default as Title} from "./Title";
export {default as Underline} from "./Underline"; export {default as Underline} from "./Underline";
export {default as BaseLink} from "./BaseLink";

View file

@ -1,3 +1,3 @@
export {default as ContextBluelibSkin} from "./ContextBluelibSkin"; export {default as ContextBluelibSkin} from "./ContextBluelibSkin";
export {default as ContextCodeSkin} from "./ContextCodeSkin"; export {default as ContextCodeSkin} from "./ContextCodeSkin";
export {default as ContextCodeLanguage} from "./ContextCodeLanguage"; export {default as ContextCodeLanguage} from "./ContextCodeLanguage";

View file

@ -9,10 +9,16 @@ export default function useBluelibClassNames(cn, extra) {
const bluelibSkin = useContext(contextBluelibSkin); const bluelibSkin = useContext(contextBluelibSkin);
// Split class names // Split class names
cn = cn.split(" "); if(typeof(cn) === "string") {
cn = cn.split(" ");
}
// Get bluelib skeleton and skin class names // Get bluelib skeleton and skin class names
cn = cn.map(c => { cn = cn.map(c => {
if(!c) {
return null;
}
return classNames(skeleton[c], bluelibSkin ? bluelibSkin[c] : null) return classNames(skeleton[c], bluelibSkin ? bluelibSkin[c] : null)
}); });