Skip to content

Commit 18e9d60

Browse files
[refactored] ParallaxDemo to use JSS instead of AttachStreams
Reviewers: O2 Material Motion, O3 Material JavaScript platform reviewers, #material_motion Tags: #material_motion Differential Revision: http://codereview.cc/D3489
1 parent ae27dad commit 18e9d60

3 files changed

Lines changed: 26 additions & 186 deletions

File tree

packages/demos-react/src/JSSDemo.tsx

Lines changed: 0 additions & 151 deletions
This file was deleted.

packages/demos-react/src/ParallaxDemo.tsx

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616

1717
import * as React from 'react';
1818

19+
import { create as createJSS, StyleSheet } from 'jss';
20+
import createDefaultJSSPreset from 'jss-preset-default';
21+
1922
import {
2023
Axis,
2124
Draggable,
@@ -35,18 +38,22 @@ import {
3538
viewportDimensions$,
3639
} from 'material-motion';
3740

38-
import {
39-
AttachStreams,
40-
} from './AttachStreams';
41-
42-
import {
43-
TransformTarget,
44-
} from './TransformTarget';
41+
const jss = createJSS(createDefaultJSSPreset());
4542

4643
export class ParallaxDemo extends React.Component<{}, {}> {
4744
foregroundStyle$ = createProperty({ initialValue: {} });
4845
backgroundStyle$ = createProperty({ initialValue: {} });
4946

47+
styleSheet = jss.createStyleSheet(
48+
{
49+
foreground: this.foregroundStyle$,
50+
background: this.backgroundStyle$,
51+
},
52+
{
53+
link: true,
54+
},
55+
).attach();
56+
5057
attachInteractions = (element: HTMLElement | null) => {
5158
if (element) {
5259
const {
@@ -80,9 +87,8 @@ export class ParallaxDemo extends React.Component<{}, {}> {
8087

8188
render() {
8289
const {
83-
backgroundStyle$,
84-
foregroundStyle$,
85-
} = this;
90+
classes,
91+
} = this.styleSheet;
8692

8793
return (
8894
<div
@@ -97,25 +103,14 @@ export class ParallaxDemo extends React.Component<{}, {}> {
97103
}
98104
}
99105
>
100-
<AttachStreams
101-
style = { backgroundStyle$ }
102-
>
103-
<TransformTarget>
104-
<RandomClouds
105-
scale = { 3 }
106-
/>
107-
</TransformTarget>
108-
</AttachStreams>
109-
110-
<AttachStreams
111-
style = { foregroundStyle$ }
112-
>
113-
<TransformTarget>
114-
<RandomClouds
115-
scale = { 5 }
116-
/>
117-
</TransformTarget>
118-
</AttachStreams>
106+
<RandomClouds
107+
className = { classes.background }
108+
scale = { 3 }
109+
/>
110+
<RandomClouds
111+
className = { classes.foreground }
112+
scale = { 5 }
113+
/>
119114
</div>
120115
);
121116
}
@@ -129,11 +124,13 @@ class RandomClouds extends React.Component<{ scale: number }, {}> {
129124

130125
render() {
131126
const {
127+
className,
132128
scale,
133129
} = this.props;
134130

135131
return (
136132
<div
133+
className = { className }
137134
style = {
138135
{
139136
position: 'relative',

packages/demos-react/src/routes.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import Router from 'react-router/BrowserRouter';
2323

2424
// import ExampleMain from './example/components/ExampleMain';
2525
import ArticulableFinger from './ArticulableFinger';
26-
import JSSDemo from './JSSDemo';
2726
import ParallaxDemo from './ParallaxDemo';
2827
import QuickiePointerEventTest from './QuickiePointerEventTest';
2928
import SwipeableDemo from './SwipeableDemo';
@@ -57,11 +56,6 @@ const links = [
5756
name: 'ParallaxDemo',
5857
component: ParallaxDemo,
5958
},
60-
{
61-
href: '/parallax-jss/',
62-
name: 'JSSDemo',
63-
component: JSSDemo,
64-
},
6559
{
6660
href: '/pointer-events/',
6761
name: 'QuickiePointerEventTest',

0 commit comments

Comments
 (0)