From 949fa112e491e706aa4b2f6e4795b5e57f2d0268 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Mon, 19 Jul 2021 18:48:43 +0200 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=20Update=20bluelib=20to=20the=20lates?= =?UTF-8?q?t=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/codeStyles/Project.xml | 87 +++++++++++++++++++ .idea/runConfigurations/start.xml | 9 ++ package-lock.json | 6 +- src/bluelib | 2 +- .../Bluelib/BluelibProvider/Readme.md | 3 +- .../Bluelib/BluelibProvider/index.js | 9 +- src/components/Bluelib/Readme.md | 5 +- src/hooks/useBluelibClassNames.js | 9 +- 8 files changed, 117 insertions(+), 13 deletions(-) create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/runConfigurations/start.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..f7f7820 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,87 @@ + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/start.xml b/.idea/runConfigurations/start.xml new file mode 100644 index 0000000..a4f2555 --- /dev/null +++ b/.idea/runConfigurations/start.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 8931d0f..83e6036 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "bluelib", - "version": "2.1.1", + "version": "2.1.7", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "bluelib", - "version": "2.1.1", + "version": "2.1.7", "license": "AGPL-3.0-or-later", "dependencies": { "@babel/preset-env": "^7.12.11", @@ -12225,7 +12225,6 @@ "version": "17.0.2", "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz", "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==", - "peer": true, "dependencies": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" @@ -27421,7 +27420,6 @@ "version": "17.0.2", "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz", "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==", - "peer": true, "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" diff --git a/src/bluelib b/src/bluelib index ccff439..a47f83b 160000 --- a/src/bluelib +++ b/src/bluelib @@ -1 +1 @@ -Subproject commit ccff439a77b1acd3d9b60ad842412f47c98e0224 +Subproject commit a47f83b53638e503b0740e6b9a6350ed0c7275be diff --git a/src/components/Bluelib/BluelibProvider/Readme.md b/src/components/Bluelib/BluelibProvider/Readme.md index 88f3b3b..bbf7f32 100644 --- a/src/components/Bluelib/BluelibProvider/Readme.md +++ b/src/components/Bluelib/BluelibProvider/Readme.md @@ -4,4 +4,5 @@ A skin can be selected by passing either a CSS module or a string to the `skin` Valid strings are: -- `"rygblue"` +- `"paper"` +- `"royalblue"` diff --git a/src/components/Bluelib/BluelibProvider/index.js b/src/components/Bluelib/BluelibProvider/index.js index 888e8b4..e6e6324 100644 --- a/src/components/Bluelib/BluelibProvider/index.js +++ b/src/components/Bluelib/BluelibProvider/index.js @@ -1,13 +1,15 @@ import React from "react" -import skinRygblue from "../../../bluelib/src/targets/rygblue.module.css" +import skinPaper from "../../../bluelib/src/targets/paper.module.css" +import skinRygblue from "../../../bluelib/src/targets/royalblue.module.css" import ContextBluelibSkin from "../../../contexts/ContextBluelibSkin" import isString from "../../../utils/isString" import PropTypes from "prop-types" const builtinSkins = { - "rygblue": skinRygblue + "paper": skinPaper, + "royalblue": skinRygblue, } @@ -16,6 +18,9 @@ export default function BluelibProvider({skin, children}) { if (isString(skin)) { skin = builtinSkins[skin] } + else { + skin = builtinSkins["paper"] + } return ( diff --git a/src/components/Bluelib/Readme.md b/src/components/Bluelib/Readme.md index 200e183..583037f 100644 --- a/src/components/Bluelib/Readme.md +++ b/src/components/Bluelib/Readme.md @@ -7,10 +7,11 @@ A skin can be selected by passing either a CSS module or a string to the `skin` Valid strings are: -- `"rygblue"` +- `"paper"` +- `"royalblue"` ```jsx - + Ciao! ``` diff --git a/src/hooks/useBluelibClassNames.js b/src/hooks/useBluelibClassNames.js index b89eec1..ba75c44 100644 --- a/src/hooks/useBluelibClassNames.js +++ b/src/hooks/useBluelibClassNames.js @@ -2,8 +2,6 @@ import {useContext} from "react"; import contextBluelibSkin from "../contexts/ContextBluelibSkin"; import classNames from "classnames"; -import skeleton from "../bluelib/src/targets/skeleton.module.css"; - export default function useBluelibClassNames(cn, extra) { const bluelibSkin = useContext(contextBluelibSkin); @@ -19,7 +17,12 @@ export default function useBluelibClassNames(cn, extra) { return null; } - return classNames(skeleton[c], bluelibSkin ? bluelibSkin[c] : null) + if(!bluelibSkin) { + console.warn("bluelibSkin is invalid: ", bluelibSkin) + return null + } + + return classNames(bluelibSkin[c]) }); // Return all the class names