Skip to content

Commit daaa964

Browse files
committed
Update emotion and draggable
1 parent cc4bf37 commit daaa964

File tree

3 files changed

+159
-115
lines changed

3 files changed

+159
-115
lines changed

packages/hitchcock/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
"build:watch": "yarn build --watch --source-maps"
1212
},
1313
"dependencies": {
14+
"@emotion/core": "^10.0.22",
15+
"@emotion/styled": "^10.0.22",
1416
"create-subscription": "^0.1.0",
15-
"glamor": "^2.20.40",
16-
"glamorous": "^4.12.1",
17-
"react-draggable": "^3.0.5"
17+
"react-draggable": "^4.1.0"
1818
},
1919
"peerDependencies": {
2020
"react": "0.0.0-experimental-f6b8d31a7",

packages/hitchcock/src/director.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react";
2-
import glamorous from "glamorous";
2+
import styled from "@emotion/styled";
33
import { cachePublisher as cache, WAITING, RUNNING, PAUSED, DONE } from "./spy";
44
import { createSubscription } from "create-subscription/cjs/create-subscription.production.min.js";
55
import Draggable from "react-draggable";
@@ -29,12 +29,12 @@ const clickable = {
2929
}
3030
};
3131

32-
const Row = glamorous.li({
32+
const Row = styled.li({
3333
margin: "8px 8px",
3434
...clickable,
3535
fontSize: "15px",
3636
fontFamily: `"Courier New", Monaco, sans-serif`,
37-
"& *:first-child": {
37+
"& *:first-of-type": {
3838
height: 18,
3939
paddingBottom: 2,
4040
display: "flex",
@@ -45,7 +45,7 @@ const Row = glamorous.li({
4545
}
4646
});
4747

48-
const ProgressBar = glamorous.div(({ completion }) => ({
48+
const ProgressBar = styled.div(({ completion }) => ({
4949
borderBottom: "solid 1px #222",
5050
width: `${completion}%`
5151
}));
@@ -84,15 +84,15 @@ const Record = ({ record }) => (
8484
</Subscription>
8585
);
8686

87-
const List = glamorous.ul(({ scrollable }) => ({
87+
const List = styled.ul(({ scrollable }) => ({
8888
padding: 0,
8989
margin: 0,
9090
listStyleType: "none"
9191
// overflowY: "auto",
9292
// height: `${scrollable ? 94 : "auto"}`
9393
}));
9494

95-
const EmptyList = glamorous.div({
95+
const EmptyList = styled.div({
9696
fontSize: "15px",
9797
margin: "8px 8px",
9898
fontFamily: `"Courier New", Monaco, sans-serif`
@@ -109,7 +109,7 @@ const RecordList = ({ records, scrollable }) =>
109109
</List>
110110
);
111111

112-
const DirectorPanel = glamorous.div({
112+
const DirectorPanel = styled.div({
113113
position: "fixed",
114114
top: 10,
115115
right: 10,
@@ -121,15 +121,15 @@ const DirectorPanel = glamorous.div({
121121
fontFamily: `Helvetica Neue, Helvetica, Arial, "Lucida Grande", sans-serif`
122122
});
123123

124-
const Header = glamorous.div({
124+
const Header = styled.div({
125125
display: "flex",
126126
justifyContent: "space-between",
127127
alignItems: "flex-end",
128128
height: 20,
129129
lineHeight: "20px",
130130
verticalAlign: "bottom",
131131
margin: "20px 8px 8px 8px",
132-
"& *:first-child": {
132+
"& *:first-of-type": {
133133
fontSize: "18px",
134134
fontWeight: "500"
135135
},
@@ -140,7 +140,7 @@ const Header = glamorous.div({
140140
}
141141
});
142142

143-
const Slider = glamorous.div({
143+
const Slider = styled.div({
144144
margin: "8px 8px 0px 8px",
145145
display: "flex",
146146
justifyContent: "space-between",

0 commit comments

Comments
 (0)