Merge pull request #459 from Jlu18/random-color

Remove cursor update from getRandomColor and add setRandomColor function

Author: kdvalin

src/myr/Myr.js

@@ -736,10 +736,14 @@ class Myr {
                 i++;
             }
         }
-        this.cursor.color = color;
         return color;
     }
 
+    setRandomColor = (colors = null) => {
+        this.cursor.color = this.getRandomColor(colors);
+        return this.cursor.color;
+    }
+
     drop = (outerElId) => {
         this.getEl(outerElId)["dynamic-body"] = "shape: box; mass: 5";
         return outerElId;

src/myr/reference.js

@@ -266,9 +266,14 @@ let transformations = [
     {
         name: "getRandomColor",
         parameters: [{ type: "array", name: "colors" }],
-        description: <span>The getRandomColor function returns a random color and changes the color of the cursor. If passed an array, getRandomColor will choose randomly from the given colors.</span>,
+        description: <span>The getRandomColor function returns a random color. If passed an array, getRandomColor will choose randomly from the given colors.</span>,
         example: "getRandomColor"
     },
+    {
+        name: "setRandomColor",
+        parameters: [{ type: "array", name: "colors" }],
+        description: <span>The setRandomColor function changes the color of the cursor to a random color. If passed an array, setRandomColor will choose randomly from the given colors.</span>,
+    },
     {
         name: "getColor",
         parameters: [],

src/tests/Myr.test.js

@@ -139,17 +139,35 @@ describe("Updates to Myr's Model", () => {
     });
 
     it("to makes Random Color", () => {
+        myr.cursor.color = null;
         let color = myr.getRandomColor();
         expect(color).not.toBeUndefined();
+        expect(myr.cursor.color).toBeNull();
         expect(colorRegEx.test(color)).toBeTruthy();
     });
 
+    it("to set Random Color", ()=> {
+        myr.cursor.color = null;
+        myr.setRandomColor();
+        expect(myr.cursor.color).not.toBeNull(); 
+    });
+
     it("pick Random Color out of a list of colors", () => {
         let colors = ["blue", "green", "red", "hotpink", "FF00FF", "rgb(100,33,93)"];
+        myr.cursor.color = null;
         let color = myr.getRandomColor(colors);
+        expect(myr.cursor.color).toBeNull();
         expect(color).not.toBeUndefined();
         expect(colors.includes(color)).toBeTruthy();
     });
+
+    it("pick and set Random Color out of a list of colors", () => {
+        let colors = ["blue", "green", "red", "hotpink", "FF00FF", "rgb(100,33,93)"];
+        myr.cursor.color = null;
+        myr.setRandomColor(colors);
+        expect(myr.cursor.color).not.toBeNull();
+        expect(colors.includes(myr.cursor.color)).toBeTruthy();
+    });
 });
 
 describe("Component Renders", () => {