diff options
author | 2019-02-08 15:40:32 +0100 | |
---|---|---|
committer | 2019-02-08 15:40:32 +0100 | |
commit | 54e4141ffecfdf19751ea59f47d0e9e8a67be6d5 (patch) | |
tree | 701cdee55ceb4727754db4fd90147b1ab30dd45c | |
parent | Update versions (diff) | |
download | ferdium-app-54e4141ffecfdf19751ea59f47d0e9e8a67be6d5.tar.gz ferdium-app-54e4141ffecfdf19751ea59f47d0e9e8a67be6d5.tar.zst ferdium-app-54e4141ffecfdf19751ea59f47d0e9e8a67be6d5.zip |
Add withTheme context to button
-rw-r--r-- | package-lock.json | 24 | ||||
-rw-r--r-- | packages/forms/src/button/index.tsx | 4 |
2 files changed, 22 insertions, 6 deletions
diff --git a/package-lock.json b/package-lock.json index 550cde693..c58c0d5d3 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -2729,6 +2729,13 @@ | |||
2729 | "react-loader": "^2.4.5" | 2729 | "react-loader": "^2.4.5" |
2730 | }, | 2730 | }, |
2731 | "dependencies": { | 2731 | "dependencies": { |
2732 | "@meetfranz/theme": { | ||
2733 | "version": "1.0.7", | ||
2734 | "bundled": true, | ||
2735 | "requires": { | ||
2736 | "color": "^3.1.0" | ||
2737 | } | ||
2738 | }, | ||
2732 | "debug": { | 2739 | "debug": { |
2733 | "version": "4.1.1", | 2740 | "version": "4.1.1", |
2734 | "bundled": true, | 2741 | "bundled": true, |
@@ -2792,6 +2799,15 @@ | |||
2792 | "@mdi/react": "^1.1.0", | 2799 | "@mdi/react": "^1.1.0", |
2793 | "@meetfranz/theme": "^1.0.7", | 2800 | "@meetfranz/theme": "^1.0.7", |
2794 | "react-loader": "^2.4.5" | 2801 | "react-loader": "^2.4.5" |
2802 | }, | ||
2803 | "dependencies": { | ||
2804 | "@meetfranz/theme": { | ||
2805 | "version": "1.0.7", | ||
2806 | "bundled": true, | ||
2807 | "requires": { | ||
2808 | "color": "^3.1.0" | ||
2809 | } | ||
2810 | } | ||
2795 | } | 2811 | } |
2796 | }, | 2812 | }, |
2797 | "@mrmlnc/readdir-enhanced": { | 2813 | "@mrmlnc/readdir-enhanced": { |
@@ -17901,7 +17917,7 @@ | |||
17901 | "dependencies": { | 17917 | "dependencies": { |
17902 | "pretty-bytes": { | 17918 | "pretty-bytes": { |
17903 | "version": "1.0.4", | 17919 | "version": "1.0.4", |
17904 | "resolved": "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz", | 17920 | "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz", |
17905 | "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=", | 17921 | "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=", |
17906 | "dev": true, | 17922 | "dev": true, |
17907 | "requires": { | 17923 | "requires": { |
@@ -18902,7 +18918,7 @@ | |||
18902 | }, | 18918 | }, |
18903 | "readable-stream": { | 18919 | "readable-stream": { |
18904 | "version": "1.1.14", | 18920 | "version": "1.1.14", |
18905 | "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", | 18921 | "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", |
18906 | "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", | 18922 | "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", |
18907 | "dev": true, | 18923 | "dev": true, |
18908 | "requires": { | 18924 | "requires": { |
@@ -18914,13 +18930,13 @@ | |||
18914 | }, | 18930 | }, |
18915 | "string_decoder": { | 18931 | "string_decoder": { |
18916 | "version": "0.10.31", | 18932 | "version": "0.10.31", |
18917 | "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", | 18933 | "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", |
18918 | "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", | 18934 | "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", |
18919 | "dev": true | 18935 | "dev": true |
18920 | }, | 18936 | }, |
18921 | "through2": { | 18937 | "through2": { |
18922 | "version": "0.2.3", | 18938 | "version": "0.2.3", |
18923 | "resolved": "http://registry.npmjs.org/through2/-/through2-0.2.3.tgz", | 18939 | "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz", |
18924 | "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=", | 18940 | "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=", |
18925 | "dev": true, | 18941 | "dev": true, |
18926 | "requires": { | 18942 | "requires": { |
diff --git a/packages/forms/src/button/index.tsx b/packages/forms/src/button/index.tsx index 90eda21e7..7a7f83dab 100644 --- a/packages/forms/src/button/index.tsx +++ b/packages/forms/src/button/index.tsx | |||
@@ -4,7 +4,7 @@ import { Theme } from '@meetfranz/theme'; | |||
4 | import classnames from 'classnames'; | 4 | import classnames from 'classnames'; |
5 | import CSS from 'csstype'; | 5 | import CSS from 'csstype'; |
6 | import React, { Component } from 'react'; | 6 | import React, { Component } from 'react'; |
7 | import injectStyle from 'react-jss'; | 7 | import injectStyle, { withTheme } from 'react-jss'; |
8 | import Loader from 'react-loader'; | 8 | import Loader from 'react-loader'; |
9 | 9 | ||
10 | import { IFormField, IWithStyle } from '../typings/generic'; | 10 | import { IFormField, IWithStyle } from '../typings/generic'; |
@@ -271,4 +271,4 @@ class ButtonComponent extends Component<IProps> { | |||
271 | } | 271 | } |
272 | } | 272 | } |
273 | 273 | ||
274 | export const Button = injectStyle(styles)(ButtonComponent); | 274 | export const Button = injectStyle(styles)(withTheme(ButtonComponent)); |