Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add flair to snackbar #1313

Merged
merged 2 commits into from Apr 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Expand Up @@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
* Build for both architectures (x86 and x64) for Windows ([#1262](https://github.com/lbryio/lbry-app/pull/1262))
* Add referral FAQ to Invites screen([#1314](https://github.com/lbryio/lbry-app/pull/1314))

### Changed

* Add flair to snackbar ([#1313](https://github.com/lbryio/lbry-app/pull/1313))

### Fixed
* Black screen on macOS after maximizing LBRY and then closing ([#1235](https://github.com/lbryio/lbry-app/pull/1235))

Expand Down
1 change: 0 additions & 1 deletion src/renderer/component/snackBar/index.js
@@ -1,4 +1,3 @@
import React from 'react';
import { connect } from 'react-redux';
import { doRemoveSnackBarSnack } from 'redux/actions/app';
import { selectSnackBarSnacks } from 'redux/selectors/app';
Expand Down
33 changes: 23 additions & 10 deletions src/renderer/component/snackBar/view.jsx
@@ -1,35 +1,48 @@
// @flow
import React from 'react';
import Button from 'component/button';

class SnackBar extends React.PureComponent {
constructor(props) {
type Props = {
removeSnack: any => void,
snacks: {
linkTarget: ?string,
linkText: ?string,
message: string,
},
};

class SnackBar extends React.PureComponent<Props> {
constructor(props: Props) {
super(props);

this._displayTime = 5; // in seconds
this._hideTimeout = null;
this.displayTime = 5; // in seconds
this.hideTimeout = null;
}

render() {
const { snacks, removeSnack } = this.props;

if (!snacks.length) {
this._hideTimeout = null; // should be unmounting anyway, but be safe?
this.hideTimeout = null; // should be unmounting anyway, but be safe?
return null;
}

const snack = snacks[0];
const { message, linkText, linkTarget } = snack;

if (this._hideTimeout === null) {
this._hideTimeout = setTimeout(() => {
this._hideTimeout = null;
if (this.hideTimeout === null) {
this.hideTimeout = setTimeout(() => {
this.hideTimeout = null;
removeSnack();
}, this._displayTime * 1000);
}, this.displayTime * 1000);
}

return (
<div className="snack-bar">
{message}
<div className="snack-bar__message">
<div>&#9432;</div>
<div>{message}</div>
</div>
{linkText &&
linkTarget && (
<Button navigate={linkTarget} className="snack-bar__action" label={linkText} />
Expand Down
4 changes: 4 additions & 0 deletions src/renderer/scss/_vars.scss
Expand Up @@ -102,6 +102,10 @@ $large-breakpoint: 1760px;
--btn-radius: 20px;
--btn-height: 36px;

/* SnackBar */
--snackbar-bg-primary: var(--color-primary);
--snackbar-color-primary: var(--text-color-inverse);

/* Header */
--header-bg: var(--color-white);
--header-color: var(--color-text);
Expand Down
53 changes: 37 additions & 16 deletions src/renderer/scss/component/_snack-bar.scss
@@ -1,30 +1,51 @@
.snack-bar {
padding: $spacing-vertical;
position: fixed;
top: $spacing-vertical;
background-color: var(--snackbar-bg-primary);
border-radius: 10px;
box-shadow: var(--box-shadow-layer);
color: var(--snackbar-color-primary);
display: flex;
justify-content: space-between;
left: 0;
right: 0;
margin-left: auto;
margin-right: auto;
min-width: 300px;
max-width: var(--snack-bar-width);
background: var(--color-dark-overlay);
color: #f0f0f0;
display: flex;
justify-content: space-between;
align-items: center;
border-radius: 2px;
min-width: 300px;
opacity: 0.95;
padding: 14px 20px 10px 20px;
position: fixed;
right: 0;
top: $spacing-vertical;
transition: all var(--transition-duration) var(--transition-type);
width: 100%;
z-index: 10000; /*hack to get it over react modal */
}

.snack-bar__action {
display: inline-block;
text-transform: uppercase;
color: var(--color-primary-light);
margin: 0px 0px 0px $spacing-vertical;
margin-bottom: 4px;
min-width: min-content;
&:hover {
text-decoration: underline;
text-transform: uppercase;

span {
&:hover {
text-decoration: underline;
}
}
}

.snack-bar__message {
align-items: center;
display: flex;
flex-direction: row;

div {
&:nth-of-type(1) {
font-size: 30px;
margin-right: 20px;
}
&:nth-of-type(2) {
font-size: 16px;
margin-bottom: 4px;
}
}
}