From 3d7bc21173cd2a2b8904ed432012f35d76727cdd Mon Sep 17 00:00:00 2001 From: Willem Liu Date: Fri, 15 Feb 2019 14:36:59 +0100 Subject: [PATCH] Added buttonStyle --- demo/demo.tsx | 8 +++---- dist/FollowButton.d.ts | 4 +++- dist/buttons.js | 2 +- package-lock.json | 30 +++++++----------------- package.json | 2 +- src/FollowButton.tsx | 9 ++++--- test/Buttons.test.tsx | 8 +++---- test/__snapshots__/Buttons.test.tsx.snap | 8 +++---- 8 files changed, 31 insertions(+), 40 deletions(-) diff --git a/demo/demo.tsx b/demo/demo.tsx index a5eea30..6360d41 100644 --- a/demo/demo.tsx +++ b/demo/demo.tsx @@ -29,9 +29,9 @@ ReactDOM.render(<>
.fd-button.m
.fd-button.l
-
.fd-follow-button
-
.fd-follow-button
-
.fd-follow-button.persoonlijk
-
.fd-follow-button.persoonlijk
+
.fd-follow-button
+
.fd-follow-button
+
.fd-follow-button.persoonlijk
+
.fd-follow-button.persoonlijk
, document.getElementById('root')); diff --git a/dist/FollowButton.d.ts b/dist/FollowButton.d.ts index 7fbed81..93cbcb2 100644 --- a/dist/FollowButton.d.ts +++ b/dist/FollowButton.d.ts @@ -1,9 +1,11 @@ import React, { PureComponent } from "react"; +export declare type ButtonTypes = 'default' | 'persoonlijk'; export interface Props { + buttonStyle: ButtonTypes; className?: string; followButtonText?: string; followLink?: string; - unfollowButtonText?: string; + unFollowButtonText?: string; unFollowLink?: string; onClick: (e: React.MouseEvent) => void; selected?: boolean; diff --git a/dist/buttons.js b/dist/buttons.js index 5173f4a..0922b08 100644 --- a/dist/buttons.js +++ b/dist/buttons.js @@ -1 +1 @@ -module.exports=function(n){var t={};function e(o){if(t[o])return t[o].exports;var r=t[o]={i:o,l:!1,exports:{}};return n[o].call(r.exports,r,r.exports,e),r.l=!0,r.exports}return e.m=n,e.c=t,e.d=function(n,t,o){e.o(n,t)||Object.defineProperty(n,t,{enumerable:!0,get:o})},e.r=function(n){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(n,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(n,"__esModule",{value:!0})},e.t=function(n,t){if(1&t&&(n=e(n)),8&t)return n;if(4&t&&"object"==typeof n&&n&&n.__esModule)return n;var o=Object.create(null);if(e.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:n}),2&t&&"string"!=typeof n)for(var r in n)e.d(o,r,function(t){return n[t]}.bind(null,r));return o},e.n=function(n){var t=n&&n.__esModule?function(){return n.default}:function(){return n};return e.d(t,"a",t),t},e.o=function(n,t){return Object.prototype.hasOwnProperty.call(n,t)},e.p="",e(e.s=2)}([function(n,t){n.exports=require("react")},function(n,t){n.exports=require("styled-components")},function(n,t,e){n.exports=e(3)},function(n,t,e){"use strict";var o=this&&this.__importStar||function(n){if(n&&n.__esModule)return n;var t={};if(null!=n)for(var e in n)Object.hasOwnProperty.call(n,e)&&(t[e]=n[e]);return t.default=n,t};Object.defineProperty(t,"__esModule",{value:!0});var r=o(e(4));t.ButtonCallToAction=r.default,t.ButtonCallToActionStyles=r.ButtonCallToActionStyles;var i=o(e(5));t.ButtonEditorial=i.default,t.ButtonEditorialStyles=i.ButtonEditorialStyles;var a=o(e(6));t.FollowButton=a.default,t.FollowButtonStyle=a.FollowButtonStyle},function(n,t,e){"use strict";var o,r=this&&this.__extends||(o=function(n,t){return(o=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(n,t){n.__proto__=t}||function(n,t){for(var e in t)t.hasOwnProperty(e)&&(n[e]=t[e])})(n,t)},function(n,t){function e(){this.constructor=n}o(n,t),n.prototype=null===t?Object.create(t):(e.prototype=t.prototype,new e)}),i=this&&this.__makeTemplateObject||function(n,t){return Object.defineProperty?Object.defineProperty(n,"raw",{value:t}):n.raw=t,n},a=this&&this.__assign||function(){return(a=Object.assign||function(n){for(var t,e=1,o=arguments.length;e) => void; selected?: boolean; @@ -17,8 +20,8 @@ export default class FollowButton extends PureComponent { return ( <> - ); diff --git a/test/Buttons.test.tsx b/test/Buttons.test.tsx index 4ba8a31..7d0020f 100644 --- a/test/Buttons.test.tsx +++ b/test/Buttons.test.tsx @@ -22,13 +22,13 @@ describe('Button', () => { }); test('renders follow buttons correctly', () => { - let button = TestRenderer.create( {}} tag="tag1"/>); + let button = TestRenderer.create( {}} tag="tag1"/>); expect(button.toJSON()).toMatchSnapshot(); - button = TestRenderer.create( {}} tag="tag2" selected={true} followLink="https://fd.nl" unFollowLink="https://bnr.nl"/>); + button = TestRenderer.create( {}} tag="tag2" selected={true} followLink="https://fd.nl" unFollowLink="https://bnr.nl"/>); expect(button.toJSON()).toMatchSnapshot(); - button = TestRenderer.create( {}} tag="tag3" followButtonText="Follow tha leada leada"/>); + button = TestRenderer.create( {}} tag="tag3" followButtonText="Follow tha leada leada"/>); expect(button.toJSON()).toMatchSnapshot(); - button = TestRenderer.create( {}} tag="tag4" selected={true} unfollowButtonText="You can go your own way!"/>); + button = TestRenderer.create( {}} tag="tag4" selected={true} unFollowButtonText="You can go your own way!"/>); expect(button.toJSON()).toMatchSnapshot(); }); }); \ No newline at end of file diff --git a/test/__snapshots__/Buttons.test.tsx.snap b/test/__snapshots__/Buttons.test.tsx.snap index 5ef465c..b23d6be 100644 --- a/test/__snapshots__/Buttons.test.tsx.snap +++ b/test/__snapshots__/Buttons.test.tsx.snap @@ -38,7 +38,7 @@ exports[`Button renders editorial buttons correctly 3`] = ` exports[`Button renders follow buttons correctly 1`] = `