Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
# Setup .npmrc file to publish to npm
- uses: actions/setup-node@v2
with:
node-version: "16.x"
node-version: "10.x"
registry-url: "https://registry.npmjs.org"
- run: git config --global user.email "github@escolalms.com" && git config --global user.name "Github"
- run: npm i --legacy-peer-deps
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v2
Expand All @@ -30,7 +30,7 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v2
Expand All @@ -48,7 +48,7 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"postcss-styled": "^0.34.0",
"postcss-syntax": "^0.36.2",
"react-docgen-typescript": "^2.2.2",
"react-styleguidist": "^11.2.0",
"react-styleguidist": "^13.1.2",
"source-map-loader": "^3.0.1",
"start-server-and-test": "1.14.0",
"style-loader": "^3.3.1",
Expand Down
14 changes: 8 additions & 6 deletions src/styleguide/Logo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,14 @@ export const Logo: React.FC = () => {

return (
<React.Fragment>
<ThemeCustomizer
// hasAll
onUpdate={(theme) => {
setTheme(theme);
}}
/>
{process.env.NODE_ENV !== "development" && (
<ThemeCustomizer
// hasAll
onUpdate={(theme) => {
setTheme(theme);
}}
/>
)}
<svg
version="1.0"
id="Warstwa_1"
Expand Down
25 changes: 25 additions & 0 deletions src/styleguide/ThemeTester.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,31 @@ export const ThemeTester: React.FC<ThemeTesterProps> = (props) => {
const { children, childrenListStyle, flexDirection, alignItems } = props;
const [localTheme] = useLocalTheme();

if (process.env.NODE_ENV === "development") {
return (
<div>
{Object.entries(themes).map((theme) =>
modes.map((mode) => (
<ThemeProvider
theme={{ ...theme[1], mode }}
key={`${theme[0]}${mode}`}
>
<ThemeTesterWrapper
flexDirection={flexDirection}
alignItems={alignItems}
name={theme[0].split("Theme").join("")}
mode={mode}
childrenListStyle={childrenListStyle}
>
{children}
</ThemeTesterWrapper>
</ThemeProvider>
))
)}
</div>
);
}

return (
<div>
{localTheme.theme === "all" &&
Expand Down
23 changes: 13 additions & 10 deletions src/styleguide/useLocalTheme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,28 +35,31 @@ export const setThemeToLocalStorage = (
window.dispatchEvent(new Event("themeChange"));
};

console.log(Object.keys(themes).includes(window.location.hash.substr(1)));

// Hook
export function useLocalTheme(
initialValue: DefaultTheme = defaultTheme
): [DefaultTheme, (value: DefaultTheme) => void] {
const [localTheme, setLocalTheme] = useState<DefaultTheme>(
getThemeFromLocalStorage(
Object.keys(themes).includes(window.location.hash.substr(1))
? {
...(themes[window.location.hash.substr(1)] as DefaultTheme),
theme: window.location.hash.substr(1),
}
: initialValue
)
process.env.NODE_ENV === "development"
? themes.redTheme
: getThemeFromLocalStorage(
Object.keys(themes).includes(window.location.hash.substr(1))
? {
...(themes[window.location.hash.substr(1)] as DefaultTheme),
theme: window.location.hash.substr(1),
}
: initialValue
)
);

const setTheme = useCallback((theme: DefaultTheme) => {
setThemeToLocalStorage(theme);
}, []);

useEffect(() => {
if (process.env.NODE_ENV === "development") {
return;
}
if (typeof window !== "undefined") {
const listener = () => {
const value = getThemeFromLocalStorage(initialValue);
Expand Down
1 change: 1 addition & 0 deletions src/theme/provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ export const GlobalThemeProvider: React.FC<{
children?: React.ReactNode;
}> = ({ defaultTheme, children }) => {
const [theme] = useLocalTheme();

const font = Fonts[theme.font];

return (
Expand Down
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = {
},

// Enable sourcemaps for debugging webpack"s output.
devtool: "source-map",
//devtool: "source-map",

resolve: {
// Add ".ts" and ".tsx" as resolvable extensions.
Expand Down