Skip to content

Commit d38c1b7

Browse files
boygirlboygirl
committed
update deps
1 parent f2c73b2 commit d38c1b7

File tree

4 files changed

+134
-123
lines changed

4 files changed

+134
-123
lines changed

‎CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Victory Changelog
22

3+
## 0.15.0 (2017-01-03)
4+
5+
- Adds `VictorySelectionContainer`
6+
- Changes when functional styles and props are evaluated (this may be a breaking change)
7+
Functional styles and props are now evaluated in the primitive components (`Point`, `Bar` etc.)
8+
- Supports an `active` prop on all primitive components that is used when evaluating functional styles and props
9+
- Tooltips now trigger `active: true` on both labels and data components
10+
- `defaultEvents` are supported for `containerComponents`
11+
312
## 0.14.2 (2016-12-13)
413

514
- Fixes date handling in VictoryZoom

‎demo/demo.js

+121-120
Original file line numberDiff line numberDiff line change
@@ -30,126 +30,6 @@ export default class App extends React.Component {
3030
<h3>VictoryChart</h3>
3131
<p>Line chart of function <code>y = x^2</code></p>
3232

33-
<VictoryGroup style={style}
34-
containerComponent={
35-
<VictorySelectionContainer
36-
selectionStyle={{
37-
stroke: "tomato", strokeWidth: 2, fill: "tomato", fillOpacity: 0.1
38-
}}
39-
/>
40-
}
41-
>
42-
<VictoryScatter
43-
style={{
44-
data: {fill: "tomato"}
45-
}}
46-
size={(datum, active) => active ? 5 : 3}
47-
data={[
48-
{x: 1, y: -5},
49-
{x: 2, y: 4},
50-
{x: 3, y: 2},
51-
{x: 4, y: 3},
52-
{x: 5, y: 1},
53-
{x: 6, y: -3},
54-
{x: 7, y: 3}
55-
]}
56-
/>
57-
<VictoryScatter
58-
style={{
59-
data: {fill: "blue"}
60-
}}
61-
size={(datum, active) => active ? 5 : 3}
62-
data={[
63-
{x: 1, y: -3},
64-
{x: 2, y: 5},
65-
{x: 3, y: 3},
66-
{x: 4, y: 0},
67-
{x: 5, y: -2},
68-
{x: 6, y: -2},
69-
{x: 7, y: 5}
70-
]}
71-
/>
72-
<VictoryScatter
73-
data={[
74-
{x: 1, y: 5},
75-
{x: 2, y: -4},
76-
{x: 3, y: -2},
77-
{x: 4, y: -3},
78-
{x: 5, y: -1},
79-
{x: 6, y: 3},
80-
{x: 7, y: -3}
81-
]}
82-
size={(datum, active) => active ? 5 : 3}
83-
/>
84-
</VictoryGroup>
85-
86-
<VictoryStack style={style}
87-
containerComponent={
88-
<VictorySelectionContainer
89-
selectionStyle={{
90-
stroke: "tomato", strokeWidth: 2, fill: "tomato", fillOpacity: 0.1
91-
}}
92-
/>
93-
}
94-
>
95-
<VictoryBar
96-
style={{
97-
data: {
98-
fill: "tomato",
99-
stroke: (d, active) => active ? "black" : "none",
100-
strokeWidth: 2
101-
}
102-
}}
103-
size={(datum, active) => active ? 5 : 3}
104-
data={[
105-
{x: 1, y: -5},
106-
{x: 2, y: 4},
107-
{x: 3, y: 2},
108-
{x: 4, y: 3},
109-
{x: 5, y: 1},
110-
{x: 6, y: -3},
111-
{x: 7, y: 3}
112-
]}
113-
/>
114-
<VictoryBar
115-
style={{
116-
data: {
117-
fill: "orange",
118-
stroke: (d, active) => active ? "black" : "none",
119-
strokeWidth: 2
120-
}
121-
}}
122-
size={(datum, active) => active ? 5 : 3}
123-
data={[
124-
{x: 1, y: -3},
125-
{x: 2, y: 5},
126-
{x: 3, y: 3},
127-
{x: 4, y: 0},
128-
{x: 5, y: -2},
129-
{x: 6, y: -2},
130-
{x: 7, y: 5}
131-
]}
132-
/>
133-
<VictoryBar
134-
style={{
135-
data: {
136-
fill: "gold",
137-
stroke: (d, active) => active ? "black" : "none",
138-
strokeWidth: 2
139-
}
140-
}}
141-
data={[
142-
{x: 1, y: 5},
143-
{x: 2, y: -4},
144-
{x: 3, y: -2},
145-
{x: 4, y: -3},
146-
{x: 5, y: -1},
147-
{x: 6, y: 3},
148-
{x: 7, y: -3}
149-
]}
150-
/>
151-
</VictoryStack>
152-
15333
<VictoryChart style={style}>
15434
<VictoryLine y={(data) => data.x * data.x}/>
15535
</VictoryChart>
@@ -280,6 +160,127 @@ export default class App extends React.Component {
280160
<p>Default props</p>
281161
<VictoryArea style={style}/>
282162

163+
<h3>VictorySelectionContainer</h3>
164+
165+
<VictoryGroup style={style}
166+
containerComponent={
167+
<VictorySelectionContainer
168+
selectionStyle={{
169+
stroke: "tomato", strokeWidth: 2, fill: "tomato", fillOpacity: 0.1
170+
}}
171+
/>
172+
}
173+
>
174+
<VictoryScatter
175+
style={{
176+
data: {fill: "tomato"}
177+
}}
178+
size={(datum, active) => active ? 5 : 3}
179+
data={[
180+
{x: 1, y: -5},
181+
{x: 2, y: 4},
182+
{x: 3, y: 2},
183+
{x: 4, y: 3},
184+
{x: 5, y: 1},
185+
{x: 6, y: -3},
186+
{x: 7, y: 3}
187+
]}
188+
/>
189+
<VictoryScatter
190+
style={{
191+
data: {fill: "blue"}
192+
}}
193+
size={(datum, active) => active ? 5 : 3}
194+
data={[
195+
{x: 1, y: -3},
196+
{x: 2, y: 5},
197+
{x: 3, y: 3},
198+
{x: 4, y: 0},
199+
{x: 5, y: -2},
200+
{x: 6, y: -2},
201+
{x: 7, y: 5}
202+
]}
203+
/>
204+
<VictoryScatter
205+
data={[
206+
{x: 1, y: 5},
207+
{x: 2, y: -4},
208+
{x: 3, y: -2},
209+
{x: 4, y: -3},
210+
{x: 5, y: -1},
211+
{x: 6, y: 3},
212+
{x: 7, y: -3}
213+
]}
214+
size={(datum, active) => active ? 5 : 3}
215+
/>
216+
</VictoryGroup>
217+
218+
<VictoryStack style={style}
219+
containerComponent={
220+
<VictorySelectionContainer
221+
selectionStyle={{
222+
stroke: "tomato", strokeWidth: 2, fill: "tomato", fillOpacity: 0.1
223+
}}
224+
/>
225+
}
226+
>
227+
<VictoryBar
228+
style={{
229+
data: {
230+
fill: "tomato",
231+
stroke: (d, active) => active ? "black" : "none",
232+
strokeWidth: 2
233+
}
234+
}}
235+
size={(datum, active) => active ? 5 : 3}
236+
data={[
237+
{x: 1, y: -5},
238+
{x: 2, y: 4},
239+
{x: 3, y: 2},
240+
{x: 4, y: 3},
241+
{x: 5, y: 1},
242+
{x: 6, y: -3},
243+
{x: 7, y: 3}
244+
]}
245+
/>
246+
<VictoryBar
247+
style={{
248+
data: {
249+
fill: "orange",
250+
stroke: (d, active) => active ? "black" : "none",
251+
strokeWidth: 2
252+
}
253+
}}
254+
size={(datum, active) => active ? 5 : 3}
255+
data={[
256+
{x: 1, y: -3},
257+
{x: 2, y: 5},
258+
{x: 3, y: 3},
259+
{x: 4, y: 0},
260+
{x: 5, y: -2},
261+
{x: 6, y: -2},
262+
{x: 7, y: 5}
263+
]}
264+
/>
265+
<VictoryBar
266+
style={{
267+
data: {
268+
fill: "gold",
269+
stroke: (d, active) => active ? "black" : "none",
270+
strokeWidth: 2
271+
}
272+
}}
273+
data={[
274+
{x: 1, y: 5},
275+
{x: 2, y: -4},
276+
{x: 3, y: -2},
277+
{x: 4, y: -3},
278+
{x: 5, y: -1},
279+
{x: 6, y: 3},
280+
{x: 7, y: -3}
281+
]}
282+
/>
283+
</VictoryStack>
283284
</div>
284285
);
285286
}

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
"dependencies": {
3535
"builder": "^3.1.0",
3636
"builder-victory-component": "^3.1.0",
37-
"victory-chart": "git+https://github.com/formidablelabs/victory-chart#feature/select-box",
38-
"victory-core": "git+https://github.com/formidablelabs/victory-core#container-events",
39-
"victory-pie": "^7.2.0"
37+
"victory-chart": "^15.0.0",
38+
"victory-core": "^11.0.0",
39+
"victory-pie": "^9.0.0"
4040
},
4141
"devDependencies": {
4242
"builder-victory-component-dev": "^3.1.0",

‎test/client/spec/components/victory.spec.js

+1
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,6 @@ describe("victory", () => {
5353
expect(Victory.TextSize).not.to.equal(undefined);
5454
expect(Victory.Transitions).not.to.equal(undefined);
5555
expect(Victory.VictoryZoom).not.to.equal(undefined);
56+
expect(Victory.VictorySelectionContainer).not.to.equal(undefined);
5657
});
5758
});

0 commit comments

Comments
 (0)