Skip to content
This repository was archived by the owner on Jul 9, 2019. It is now read-only.

Commit 6bb2def

Browse files
committed
feat: Use raw toolbox components
chore: Upgrade toolbox
1 parent 9685fb4 commit 6bb2def

8 files changed

+27
-25
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"react": "^15.4.1",
2020
"react-addons-css-transition-group": "^15.4.2",
2121
"react-dom": "^15.4.1",
22-
"react-toolbox": "^1.3.3",
22+
"react-toolbox": "^2.0.0-beta.8",
2323
"tscomp": "^0.8.0",
2424
"tslint": "^4.0.2",
2525
"tslint-config-beanloop": "^0.1.0"

src/backtick.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export const StyledBacktick: StatelessComponent<{
1515
z-index: 11;
1616
background-color: rgba(0, 0, 0, 0.54);
1717
will-change: opacity;
18-
`
18+
` as any
1919

2020
export const Backtick = ({open, onClick}) =>
2121
<TransitionMotion

src/datetime-picker.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react'
22
import {ComponentClass, ReactType, StatelessComponent} from 'react'
33
import {themr} from 'react-css-themr'
4-
import {IconButton} from 'react-toolbox/lib/button'
4+
import IconButton from 'react-toolbox/lib/button/IconButton'
55
import calendarFactory from 'react-toolbox/lib/date_picker/Calendar'
66
import datePickerDialogFactory from 'react-toolbox/lib/date_picker/DatePickerDialog'
77
import dateTheme from 'react-toolbox/lib/date_picker/theme.scss'

src/edit-list.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from 'react'
22
import {ReactChild} from 'react'
33
import {FieldConfig, FormHelper} from 'react-form-helper'
44
import {getValue} from 'react-form-helper/dist/src/helpers'
5-
import {IconButton} from 'react-toolbox/lib/button'
5+
import IconButton from 'react-toolbox/lib/button/IconButton'
66
import Input from 'react-toolbox/lib/input'
77
import compose from 'recompose/compose'
88
import lifecycle from 'recompose/lifecycle'

src/loading-button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react'
22
import {Component} from 'react'
3-
import {Button} from 'react-toolbox/lib/button'
3+
import Button from 'react-toolbox/lib/button/Button'
44
import {Spinner} from './spinner'
55

66
export type Props = {

src/menu.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import * as React from 'react'
2-
import {IconButton} from 'react-toolbox/lib/button'
3-
import {IconMenu, MenuItem} from 'react-toolbox/lib/menu'
2+
import IconButton from 'react-toolbox/lib/button/IconButton'
3+
import IconMenu from 'react-toolbox/lib/menu/IconMenu'
4+
import MenuItem from 'react-toolbox/lib/menu/MenuItem'
45
import {withMedia} from 'react-with-media'
56
import {Row} from 'styled-material/dist/src/layout'
67

src/spinner.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react'
22
import {StatelessComponent} from 'react'
3-
import ProgressBar from 'react-toolbox/lib/progress_bar'
3+
import ProgressBar from 'react-toolbox/lib/progress_bar/ProgressBar'
44
import compose from 'recompose/compose'
55
import lifecycle from 'recompose/lifecycle'
66
import withState from 'recompose/withState'

yarn.lock

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@
2121
version "0.0.2"
2222
resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.0.2.tgz#04e9b560b118eaf48542945ef9b2701c3f9832e3"
2323

24-
"@types/react@^15.0.0":
25-
version "15.0.14"
26-
resolved "https://registry.yarnpkg.com/@types/react/-/react-15.0.14.tgz#07a739b20b0d4cf946f52444d3c40a94d4a234b1"
27-
28-
"@types/react@^15.0.21":
24+
"@types/react@^15.0.0", "@types/react@^15.0.21":
2925
version "15.0.21"
3026
resolved "https://registry.yarnpkg.com/@types/react/-/react-15.0.21.tgz#29d849427237c1463abfb7b370755ee3e5b5b375"
3127

@@ -3452,7 +3448,7 @@ ignore@^3.1.2, ignore@^3.1.5:
34523448
version "3.2.6"
34533449
resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.6.tgz#26e8da0644be0bb4cb39516f6c79f0e0f4ffe48c"
34543450

3455-
immutability-helper@^2.0.0, immutability-helper@^2.1.0:
3451+
immutability-helper@^2.1.0:
34563452
version "2.1.2"
34573453
resolved "https://registry.yarnpkg.com/immutability-helper/-/immutability-helper-2.1.2.tgz#734506440d7209b74664dcadaa8ba14e73f2185b"
34583454
dependencies:
@@ -5272,10 +5268,6 @@ normalize-url@^1.4.0:
52725268
query-string "^4.1.0"
52735269
sort-keys "^1.0.0"
52745270

5275-
normalize.css@^4.2.0:
5276-
version "4.2.0"
5277-
resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-4.2.0.tgz#21d66cc557154d4379fd1e079ec7de58a379b099"
5278-
52795271
npm-run-path@^1.0.0:
52805272
version "1.0.0"
52815273
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-1.0.0.tgz#f5c32bf595fe81ae927daec52e82f8b000ac3c8f"
@@ -6223,6 +6215,10 @@ ramda@^0.22.1:
62236215
version "0.22.1"
62246216
resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.22.1.tgz#031da0c3df417c5b33c96234757eb37033f36a0e"
62256217

6218+
ramda@^0.23.0:
6219+
version "0.23.0"
6220+
resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.23.0.tgz#ccd13fff73497a93974e3e86327bfd87bd6e8e2b"
6221+
62266222
randexp@^0.4.2:
62276223
version "0.4.5"
62286224
resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.5.tgz#ffe3a80c3f666cd71e6b008e477e584c1a32ff3e"
@@ -6257,7 +6253,7 @@ react-addons-css-transition-group@^15.4.2:
62576253
fbjs "^0.8.4"
62586254
object-assign "^4.1.0"
62596255

6260-
react-css-themr@^1.7.1:
6256+
react-css-themr@^1.7.2:
62616257
version "1.7.2"
62626258
resolved "https://registry.yarnpkg.com/react-css-themr/-/react-css-themr-1.7.2.tgz#424701383488f63966677f10a908d40861544ef3"
62636259
dependencies:
@@ -6287,22 +6283,27 @@ react-motion@^0.4.7:
62876283
performance-now "^0.2.0"
62886284
raf "^3.1.0"
62896285

6286+
react-style-proptype@^2.0.0:
6287+
version "2.0.2"
6288+
resolved "https://registry.yarnpkg.com/react-style-proptype/-/react-style-proptype-2.0.2.tgz#b4687990ac256deed89ee5777a3c58de5ac7bd15"
6289+
62906290
react-test-renderer@^15.3.1:
62916291
version "15.4.2"
62926292
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-15.4.2.tgz#27e1dff5d26d0e830f99614c487622bc831416f3"
62936293
dependencies:
62946294
fbjs "^0.8.4"
62956295
object-assign "^4.1.0"
62966296

6297-
react-toolbox@^1.3.3:
6298-
version "1.3.4"
6299-
resolved "https://registry.yarnpkg.com/react-toolbox/-/react-toolbox-1.3.4.tgz#89fabf000cbc5907b50d506d733762624894bd70"
6297+
react-toolbox@^2.0.0-beta.8:
6298+
version "2.0.0-beta.8"
6299+
resolved "https://registry.yarnpkg.com/react-toolbox/-/react-toolbox-2.0.0-beta.8.tgz#95a785e02f74c52ed5d1932b1ad1121d4a60f807"
63006300
dependencies:
63016301
classnames "^2.2.5"
63026302
core-js "^2.4.0"
6303-
immutability-helper "^2.0.0"
6304-
normalize.css "^4.2.0"
6305-
react-css-themr "^1.7.1"
6303+
ramda "^0.23.0"
6304+
react-addons-css-transition-group "^15.4.2"
6305+
react-css-themr "^1.7.2"
6306+
react-style-proptype "^2.0.0"
63066307

63076308
react-with-media@^0.1.0:
63086309
version "0.1.2"

0 commit comments

Comments
 (0)