Dunno what changed but found changes

Swizec · Swizec · commit 628a8a16da8a · 2020-05-21T19:08:40.000-07:00
diff --git a/package.json b/package.json
@@ -1,23 +1,23 @@
 {
-  "name": "react-fractals",
-  "version": "0.0.1",
-  "private": true,
-  "devDependencies": {
-    "gh-pages": "^0.12.0",
-    "react-scripts": "0.7.0"
-  },
-  "dependencies": {
-    "d3-scale": "^1.0.4",
-    "d3-selection": "^1.0.3",
-    "react": "^15.4.0",
-    "react-dom": "^15.4.0"
-  },
-  "homepage": "https://swizec.github.io/react-fractals",
-  "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test --env=jsdom",
-    "eject": "react-scripts eject",
-    "deploy": "gh-pages -d build"
-  }
+    "name": "react-fractals",
+    "version": "0.0.1",
+    "private": true,
+    "devDependencies": {
+        "gh-pages": "^0.12.0",
+        "react-scripts": "0.7.0"
+    },
+    "dependencies": {
+        "d3-scale": "^1.0.4",
+        "d3-selection": "^1.0.3",
+        "react": "^16.3.0-rc.0",
+        "react-dom": "^16.3.0-rc.0"
+    },
+    "homepage": "https://swizec.github.io/react-fractals",
+    "scripts": {
+        "start": "react-scripts start",
+        "build": "react-scripts build",
+        "test": "react-scripts test --env=jsdom",
+        "eject": "react-scripts eject",
+        "deploy": "gh-pages -d build"
+    }
 }
diff --git a/src/App.js b/src/App.js
@@ -1,24 +1,10 @@
-import React, { Component } from 'react';
-import logo from './logo.svg';
-import './App.css';
-import { select as d3select, mouse as d3mouse } from 'd3-selection';
-import { scaleLinear } from 'd3-scale';
+import React, { Component } from "react";
+import logo from "./logo.svg";
+import "./App.css";
+import { select as d3select, mouse as d3mouse } from "d3-selection";
+import { scaleLinear } from "d3-scale";
 
-import Pythagoras from './Pythagoras';
-
-
-// borrowed from Vue fork https://github.com/yyx990803/vue-fractal/blob/master/src/App.vue
-function throttleWithRAF (fn) {
-  let running = false
-  return function () {
-    if (running) return
-    running = true
-    window.requestAnimationFrame(() => {
-      fn.apply(this, arguments)
-      running = false
-    })
-  }
-}
+import Pythagoras from "./Pythagoras";
 
 class App extends Component {
     svg = {
@@ -44,7 +30,7 @@ class App extends Component {
         const { currentMax } = this.state;
 
         if (currentMax < this.realMax) {
-            this.setState({currentMax: currentMax + 1});
+            this.setState({ currentMax: currentMax + 1 });
             setTimeout(this.next.bind(this), 500);
         }
     }
@@ -57,12 +43,12 @@ class App extends Component {
         this.running = true;
 
         const [x, y] = d3mouse(this.refs.svg),
-
-              scaleFactor = scaleLinear().domain([this.svg.height, 0])
-                                         .range([0, .8]),
-
-              scaleLean = scaleLinear().domain([0, this.svg.width/2, this.svg.width])
-                                       .range([.5, 0, -.5]);
+            scaleFactor = scaleLinear()
+                .domain([this.svg.height, 0])
+                .range([0, 0.8]),
+            scaleLean = scaleLinear()
+                .domain([0, this.svg.width / 2, this.svg.width])
+                .range([0.5, 0, -0.5]);
 
         this.setState({
             heightFactor: scaleFactor(y),
@@ -79,18 +65,22 @@ class App extends Component {
                     <h2>This is a dancing Pythagoras tree</h2>
                 </div>
                 <p className="App-intro">
-                    <svg width={this.svg.width} height={this.svg.height} ref="svg"
-                         style={{border: "1px solid lightgray"}}>
-
-                        <Pythagoras w={this.state.baseW}
-                                    h={this.state.baseW}
-                                    heightFactor={this.state.heightFactor}
-                                    lean={this.state.lean}
-                                    x={this.svg.width/2-40}
-                                    y={this.svg.height-this.state.baseW}
-                                    lvl={0}
-                                    maxlvl={this.state.currentMax}/>
-
+                    <svg
+                        width={this.svg.width}
+                        height={this.svg.height}
+                        ref="svg"
+                        style={{ border: "1px solid lightgray" }}
+                    >
+                        <Pythagoras
+                            w={this.state.baseW}
+                            h={this.state.baseW}
+                            heightFactor={this.state.heightFactor}
+                            lean={this.state.lean}
+                            x={this.svg.width / 2 - 40}
+                            y={this.svg.height - this.state.baseW}
+                            lvl={0}
+                            maxlvl={this.state.currentMax}
+                        />
                     </svg>
                 </p>
             </div>
diff --git a/yarn.lock b/yarn.lock
@@ -1500,14 +1500,6 @@ cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
     parse-json "^2.2.0"
     require-from-string "^1.1.0"
 
-create-react-class@^15.6.0:
-  version "15.6.2"
-  resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.2.tgz#cf1ed15f12aad7f14ef5f2dfe05e6c42f91ef02a"
-  dependencies:
-    fbjs "^0.8.9"
-    loose-envify "^1.3.1"
-    object-assign "^4.1.1"
-
 cross-spawn@4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
@@ -2305,7 +2297,7 @@ fb-watchman@^1.8.0, fb-watchman@^1.9.0:
   dependencies:
     bser "1.0.2"
 
-fbjs@^0.8.16, fbjs@^0.8.9:
+fbjs@^0.8.16:
   version "0.8.16"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
   dependencies:
@@ -4547,9 +4539,9 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-prop-types@^15.5.10:
-  version "15.6.0"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
+prop-types@^15.6.0:
+  version "15.6.1"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
   dependencies:
     fbjs "^0.8.16"
     loose-envify "^1.3.1"
@@ -4673,14 +4665,14 @@ react-dev-utils@^0.3.0:
     sockjs-client "1.0.3"
     strip-ansi "3.0.1"
 
-react-dom@^15.4.0:
-  version "15.6.2"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730"
+react-dom@^16.3.0-rc.0:
+  version "16.3.0-rc.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.0-rc.0.tgz#18282bcc98496197877b9365467362caf74b8e45"
   dependencies:
-    fbjs "^0.8.9"
+    fbjs "^0.8.16"
     loose-envify "^1.1.0"
-    object-assign "^4.1.0"
-    prop-types "^15.5.10"
+    object-assign "^4.1.1"
+    prop-types "^15.6.0"
 
 react-scripts@0.7.0:
   version "0.7.0"
@@ -4733,15 +4725,14 @@ react-scripts@0.7.0:
   optionalDependencies:
     fsevents "1.0.14"
 
-react@^15.4.0:
-  version "15.6.2"
-  resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72"
+react@^16.3.0-rc.0:
+  version "16.3.0-rc.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.3.0-rc.0.tgz#07ddbe3ef14b910038576ef4afb29793d9e20f84"
   dependencies:
-    create-react-class "^15.6.0"
-    fbjs "^0.8.9"
+    fbjs "^0.8.16"
     loose-envify "^1.1.0"
-    object-assign "^4.1.0"
-    prop-types "^15.5.10"
+    object-assign "^4.1.1"
+    prop-types "^15.6.0"
 
 read-pkg-up@^1.0.1:
   version "1.0.1"
