Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ConsenSys/rimble-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
gesquinca committed Aug 13, 2019
2 parents 46e7f23 + d55ad79 commit 58d7515
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 6 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ class Example extends Component {

## Change log

### 0.9.7

- fixed onChange events not firing for file inputs.

### 0.9.6

- Fixed default theme in rimble ThemeProvider.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rimble-ui",
"version": "0.9.6",
"version": "0.9.7",
"description": "Rimble Design System react component library.",
"author": "ConsenSys Design",
"homepage": "https://rimble.consensys.design/",
Expand Down
12 changes: 8 additions & 4 deletions src/EthAddress/__snapshots__/EthAddress.test.js.snap
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Simple Address component sanity matches Themed snapshot 1`] = `
.c2 {
.c3 {
color: #3F3D4B;
}
.c2 {
.c3 {
box-sizing: border-box;
}
.c1 {
.c2 {
font-family: "Source Sans Pro",-apple-system,sans-serif;
font-size: 16px;
font-weight: 400;
Expand All @@ -18,6 +18,10 @@ exports[`Simple Address component sanity matches Themed snapshot 1`] = `
color: #3F3D4B;
}
.c1 {
word-break: break-all;
}
.c0 {
font-size: 1em;
font-family: "Source Sans Pro",-apple-system,sans-serif;
Expand All @@ -28,7 +32,7 @@ exports[`Simple Address component sanity matches Themed snapshot 1`] = `
class="c0"
>
<div
class="c1 c2"
class="c1 c2 c3"
color="copyColor"
font-family="sansSerif"
font-size="2"
Expand Down
9 changes: 8 additions & 1 deletion src/EthAddress/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
import React from 'react';
import PropTypes from 'prop-types';
import styled from 'styled-components';
import Text from '../Text';

const StyledText = styled(Text)`
& {
word-break: break-all;
}
`;

const addressSummary = (address, firstSegLength = 5, lastSegLength = 4) => {
if (!address) return '';
return address
Expand All @@ -16,7 +23,7 @@ class EthAddress extends React.PureComponent {
const { address, truncate } = this.props;
const displayAddress = truncate ? addressSummary(address) : address;

return <Text>{displayAddress}</Text>;
return <StyledText>{displayAddress}</StyledText>;
}
}

Expand Down
4 changes: 4 additions & 0 deletions src/Input/FileInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ class FileInput extends Component {
buttonLabel: 'Choose file…',
});
}

if (this.props.onChange) {
this.props.onChange();
}
};

render() {
Expand Down

0 comments on commit 58d7515

Please sign in to comment.