From 93e0f16e96b1c9d893249c819740cac793e95bd8 Mon Sep 17 00:00:00 2001 From: meriadec Date: Sun, 24 Jun 2018 20:18:32 +0200 Subject: [PATCH 1/5] Add `overflow` to styled Box props --- src/components/base/Box/Box.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/base/Box/Box.js b/src/components/base/Box/Box.js index 5ded4f57..bbbdbda1 100644 --- a/src/components/base/Box/Box.js +++ b/src/components/base/Box/Box.js @@ -17,6 +17,7 @@ import { import fontFamily from 'styles/styled/fontFamily' export const styledTextAlign = style({ prop: 'textAlign', cssProperty: 'textAlign' }) +export const styledOverflow = style({ prop: 'overflow', cssProperty: 'overflow' }) export const styledCursor = style({ prop: 'cursor', cssProperty: 'cursor' }) export const styledTextTransform = style({ prop: 'textTransform', cssProperty: 'textTransform' }) @@ -34,6 +35,7 @@ export default styled.div` ${styledTextAlign}; ${styledCursor}; ${styledTextTransform}; + ${styledOverflow}; display: flex; flex-shrink: ${p => (p.noShrink === true ? '0' : p.shrink === true ? '1' : '')}; From 73f89e1c84987f27435bd20dc18d72c070c987ad Mon Sep 17 00:00:00 2001 From: meriadec Date: Sun, 24 Jun 2018 20:05:29 +0200 Subject: [PATCH 2/5] Make HomeIcon fill with currentColor --- src/icons/Home.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/icons/Home.js b/src/icons/Home.js index 4850aa6a..14ab4f05 100644 --- a/src/icons/Home.js +++ b/src/icons/Home.js @@ -3,7 +3,10 @@ import React from 'react' const path = ( - + ) export default ({ size, ...p }: { size: number }) => ( From 48b19e9dffd88ecdc3dc0a315b483ac2f82568f4 Mon Sep 17 00:00:00 2001 From: meriadec Date: Sun, 24 Jun 2018 20:17:35 +0200 Subject: [PATCH 3/5] Fix storybook import raven in logger --- src/logger.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/logger.js b/src/logger.js index 0036f0fc..757835c1 100644 --- a/src/logger.js +++ b/src/logger.js @@ -148,14 +148,16 @@ export default { critical: (error: Error) => { addLog('critical', error) console.error(error) - try { - if (typeof window !== 'undefined') { - require('sentry/browser').captureException(error) - } else { - require('sentry/node').captureException(error) + if (!process.env.STORYBOOK_ENV) { + try { + if (typeof window !== 'undefined') { + require('sentry/browser').captureException(error) + } else { + require('sentry/node').captureException(error) + } + } catch (e) { + console.warn("Can't send to sentry", error, e) } - } catch (e) { - console.warn("Can't send to sentry", error, e) } }, From 21a78a442f56c1e51daa00c4072533cb71ecd4cd Mon Sep 17 00:00:00 2001 From: meriadec Date: Sun, 24 Jun 2018 20:20:42 +0200 Subject: [PATCH 4/5] Flow stuff --- src/components/EnsureDeviceApp/index.js | 2 +- src/components/base/SideBar/SideBarListItem.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/EnsureDeviceApp/index.js b/src/components/EnsureDeviceApp/index.js index 1f5a8730..eaedac7c 100644 --- a/src/components/EnsureDeviceApp/index.js +++ b/src/components/EnsureDeviceApp/index.js @@ -36,7 +36,7 @@ type OwnProps = { deviceSelected: ?Device, deviceStatus: DeviceStatus, error: ?Error, - }) => React$Element<*>, + }) => React$Node, } type Props = OwnProps & { diff --git a/src/components/base/SideBar/SideBarListItem.js b/src/components/base/SideBar/SideBarListItem.js index 5f9a83d8..671dee6f 100644 --- a/src/components/base/SideBar/SideBarListItem.js +++ b/src/components/base/SideBar/SideBarListItem.js @@ -6,7 +6,7 @@ import styled from 'styled-components' import Box, { Tabbable } from 'components/base/Box' export type Props = { - label: string | (Props => React$Element), + label: string | (Props => React$Node), desc?: Props => any, // TODO: type should be more precise, but, eh ¯\_(ツ)_/¯ icon?: any, // TODO: type should be more precise, but, eh ¯\_(ツ)_/¯ disabled?: boolean, From 14cb342677c7c4275931b4f41f7deed0a26a871f Mon Sep 17 00:00:00 2001 From: meriadec Date: Sun, 24 Jun 2018 20:35:31 +0200 Subject: [PATCH 5/5] Move EnsureDeviceApp out of its folder --- src/components/{EnsureDeviceApp/index.js => EnsureDeviceApp.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/components/{EnsureDeviceApp/index.js => EnsureDeviceApp.js} (100%) diff --git a/src/components/EnsureDeviceApp/index.js b/src/components/EnsureDeviceApp.js similarity index 100% rename from src/components/EnsureDeviceApp/index.js rename to src/components/EnsureDeviceApp.js