Updated package.json engine

Merge remote-tracking branch 'origin/main' into shahanneda/add-wordcloud
Removed unused import
2022-07-20 23:20:34 -07:00 · 2022-07-20 23:09:41 -07:00 · 2022-07-20 22:51:34 -07:00 · 2022-07-20 22:51:34 -07:00 · 2022-07-20 22:51:34 -07:00 · 2022-07-20 22:51:33 -07:00
9 changed files with 450 additions and 240 deletions
--- a/components/ColorPalette.module.css
+++ b/components/ColorPalette.module.css
@ -16,6 +16,6 @@
  flex-direction: column;
  align-items: center;
  text-align: center;
-  margin: calc(10rem / 16);
+  margin: calc(10rem / 16) calc(60rem / 16);
  width: calc(150rem / 16);
 }
--- a/components/WordCloud.module.css
+++ b/components/WordCloud.module.css
@ -0,0 +1,19 @@
+.word:hover {
+  text-shadow: var(--primary-accent) 0 0 calc(20rem / 16);
+  text-anchor: "middle";
+}
+
+.tooltip {
+  font-family: "Inconsolata", monospace;
+  font-weight: bold;
+  top: 0;
+  left: 0;
+  position: absolute;
+  background-color: white;
+  color: var(--navy);
+  box-shadow: var(--card-background) 0px calc(1rem / 16) calc(2rem / 16);
+  pointer-events: none;
+  padding: calc(10rem / 16);
+  font-size: calc(18rem / 16);
+  border-radius: calc(10rem / 16);
+}
--- a/components/Wordcloud.tsx
+++ b/components/Wordcloud.tsx
@ -0,0 +1,201 @@
+import { localPoint } from "@visx/event";
+import { Point } from "@visx/point";
+import { scaleLog } from "@visx/scale";
+import { Text } from "@visx/text";
+import { TooltipWithBounds, useTooltip, withTooltip } from "@visx/tooltip";
+import { Wordcloud as VisxWordcloud } from "@visx/Wordcloud";
+import React from "react";
+import { Color } from "utils/Color";
+
+import styles from "./WordCloud.module.css";
+
+interface WordCloudProps {
+  data: Array<WordData>;
+  width?: number;
+  height?: number;
+  wordPadding?: number;
+  fontWeight?: number;
+  minFontSize?: number;
+  maxFontSize?: number;
+}
+
+interface WordData {
+  text: string;
+  value: number;
+}
+
+const wordColors = [Color.primaryAccent, Color.primaryAccentLight];
+const fixedValueGenerator = () => 0.5;
+const TOOLTIP_HORIZONTAL_SHIFT_SCALER = 12.0;
+
+export const WordCloud = withTooltip(
+  ({
+    data,
+    width = 1000,
+    height = 500,
+    wordPadding = 30,
+    fontWeight = 500,
+    minFontSize = 20,
+    maxFontSize = 150,
+  }: WordCloudProps) => {
+    const {
+      tooltipData,
+      tooltipLeft,
+      tooltipTop,
+      tooltipOpen,
+      showTooltip,
+      hideTooltip,
+    } = useTooltip<WordData>();
+
+    return (
+      <>
+        <WordCloudWordsMemoized
+          width={width}
+          height={height}
+          data={data}
+          wordPadding={wordPadding}
+          fontWeight={fontWeight}
+          minFontSize={minFontSize}
+          maxFontSize={maxFontSize}
+          showTooltip={(data, left, top) => {
+            showTooltip({
+              tooltipData: data,
+              tooltipLeft: left,
+              tooltipTop: top,
+            });
+          }}
+          hideTooltip={hideTooltip}
+          tooltipLeft={tooltipLeft}
+          tooltipTop={tooltipTop}
+        />
+
+        {tooltipOpen && tooltipData ? (
+          <TooltipWithBounds
+            // set this to random so it correctly updates with parent bounds
+            key={Math.random()}
+            top={tooltipTop}
+            left={tooltipLeft}
+            unstyled
+            applyPositionStyle
+            id={styles.tooltip}
+          >
+            {tooltipData.text} ({tooltipData.value})
+          </TooltipWithBounds>
+        ) : null}
+      </>
+    );
+  }
+);
+
+type WordCloudWordsProps = WordCloudProps & {
+  data: Array<WordData>;
+  width: number;
+  height: number;
+  wordPadding: number;
+  fontWeight: number;
+  minFontSize: number;
+  maxFontSize: number;
+  showTooltip: (
+    data: WordData,
+    tooltipLeft: number,
+    tooltipTop: number
+  ) => void;
+  hideTooltip: () => void;
+  // These next props are just used to stop the component from updating when it doesnt need to,
+  // but they are not needed to render the component
+  tooltipLeft?: number;
+  tooltipTop?: number;
+};
+const WordCloudWords: React.FC<WordCloudWordsProps> = ({
+  width,
+  height,
+  data,
+  wordPadding = 30,
+  fontWeight = 400,
+  minFontSize = 20,
+  maxFontSize = 100,
+  showTooltip,
+  hideTooltip,
+}) => {
+  const fontScale = scaleLog({
+    domain: [
+      Math.min(...data.map((w) => w.value)),
+      Math.max(...data.map((w) => w.value)),
+    ],
+    range: [minFontSize, maxFontSize],
+  });
+  const fontSizeSetter = (datum: WordData) => fontScale(datum.value);
+  return (
+    <>
+      <VisxWordcloud
+        words={data}
+        width={width}
+        height={height}
+        fontSize={fontSizeSetter}
+        font="Inconsolata, monospace"
+        padding={wordPadding}
+        spiral={"rectangular"}
+        rotate={0}
+        random={fixedValueGenerator}
+      >
+        {(cloudWords) =>
+          cloudWords.map((w, i) => {
+            return (
+              <Text
+                key={w.text}
+                fill={wordColors[i % wordColors.length]}
+                transform={`translate(${w.x ?? 0}, ${w.y ?? 0})`}
+                fontSize={w.size}
+                fontFamily={w.font}
+                fontWeight={fontWeight}
+                className={styles.word}
+                textAnchor="middle"
+                onMouseMove={
+                  ((e: React.MouseEvent<SVGTextElement, MouseEvent>) => {
+                    const eventSvgCoords = localPoint(
+                      // ownerSVGElement is given by visx docs but not recognized by typescript
+                      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                      // @ts-ignore
+                      e.target.ownerSVGElement as Element,
+                      e
+                    ) as Point;
+
+                    if (w.text) {
+                      showTooltip(
+                        { text: w.text, value: data[i].value },
+                        eventSvgCoords.x -
+                          w.text.length * TOOLTIP_HORIZONTAL_SHIFT_SCALER,
+                        eventSvgCoords.y
+                      );
+                    }
+                    console.log(e, eventSvgCoords);
+                  }) as React.MouseEventHandler<SVGTextElement>
+                }
+                onMouseLeave={(_) => hideTooltip()}
+              >
+                {w.text}
+              </Text>
+            );
+          })
+        }
+      </VisxWordcloud>
+    </>
+  );
+};
+
+const shouldNotRerender = (
+  prevProps: WordCloudWordsProps,
+  nextProps: WordCloudWordsProps
+) => {
+  if (
+    prevProps.tooltipLeft !== nextProps.tooltipLeft ||
+    prevProps.tooltipTop !== nextProps.tooltipTop ||
+    nextProps.tooltipLeft === undefined ||
+    nextProps.tooltipTop === undefined
+  ) {
+    return true; // do not re-render
+  }
+  return false; // will re-render
+};
+
+const WordCloudWordsMemoized = React.memo(WordCloudWords, shouldNotRerender);
--- a/data/mocks.ts
+++ b/data/mocks.ts
@ -35,3 +35,32 @@ export const mockCategoricalData = [
    value: 29,
  },
 ];
+
+export const moreMockCategoricalData = [
+  { key: "Python", value: 29.53 },
+  { key: "Java", value: 17.06 },
+  { key: "JavaScript", value: 8.56 },
+  { key: "C", value: 6.49 },
+  { key: "Assembly", value: 6.31 },
+  { key: "R", value: 5.83 },
+  { key: "Objective C", value: 4.43 },
+  { key: "Swift", value: 3.89 },
+  { key: "PHP", value: 3.85 },
+  { key: "Rust", value: 3.33 },
+  { key: "Ruby", value: 3.25 },
+  { key: "Matlab", value: 3.06 },
+  { key: "TypeScript", value: 3.98 },
+  { key: "Go", value: 3.85 },
+  { key: "Haskell", value: 3.28 },
+  { key: "VBA", value: 3.11 },
+  { key: "Scala", value: 2.79 },
+  { key: "Lua", value: 2.79 },
+  { key: "Julia", value: 2.77 },
+  { key: "Kotlin", value: 2.7 },
+  { key: "Perl", value: 2.41 },
+  { key: "Groovy", value: 2.4 },
+  { key: "Abap", value: 2.24 },
+  { key: "Cobol", value: 2.23 },
+  { key: "Ada", value: 2.21 },
+  { key: "Dart", value: 2.21 },
+];
--- a/package-lock.json
+++ b/package-lock.json
@ -9,8 +9,11 @@
      "version": "0.1.0",
      "dependencies": {
        "@visx/axis": "^2.10.0",
+        "@visx/event": "^2.6.0",
        "@visx/grid": "^2.10.0",
        "@visx/shape": "^2.10.0",
+        "@visx/tooltip": "^2.10.0",
+        "@visx/wordcloud": "^2.10.0",
        "next": "12.1.6",
        "react": "18.1.0",
        "react-dom": "18.1.0"
@ -37,7 +40,7 @@
      },
      "engines": {
        "node": "^16",
-        "npm": "^8.0.0"
+        "npm": ">=7"
      }
    },
    "node_modules/@babel/runtime": {
@ -350,51 +353,6 @@
        "glob": "7.1.7"
      }
    },
-    "node_modules/@next/swc-android-arm-eabi": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.1.6.tgz",
-      "integrity": "sha512-BxBr3QAAAXWgk/K7EedvzxJr2dE014mghBSA9iOEAv0bMgF+MRq4PoASjuHi15M2zfowpcRG8XQhMFtxftCleQ==",
-      "cpu": [
-        "arm"
-      ],
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-android-arm64": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-android-arm64/-/swc-android-arm64-12.1.6.tgz",
-      "integrity": "sha512-EboEk3ROYY7U6WA2RrMt/cXXMokUTXXfnxe2+CU+DOahvbrO8QSWhlBl9I9ZbFzJx28AGB9Yo3oQHCvph/4Lew==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-darwin-arm64": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.1.6.tgz",
-      "integrity": "sha512-P0EXU12BMSdNj1F7vdkP/VrYDuCNwBExtRPDYawgSUakzi6qP0iKJpya2BuLvNzXx+XPU49GFuDC5X+SvY0mOw==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
    "node_modules/@next/swc-darwin-x64": {
      "version": "12.1.6",
      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-12.1.6.tgz",
@ -410,126 +368,6 @@
        "node": ">= 10"
      }
    },
-    "node_modules/@next/swc-linux-arm-gnueabihf": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.1.6.tgz",
-      "integrity": "sha512-PvfEa1RR55dsik/IDkCKSFkk6ODNGJqPY3ysVUZqmnWMDSuqFtf7BPWHFa/53znpvVB5XaJ5Z1/6aR5CTIqxPw==",
-      "cpu": [
-        "arm"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.1.6.tgz",
-      "integrity": "sha512-53QOvX1jBbC2ctnmWHyRhMajGq7QZfl974WYlwclXarVV418X7ed7o/EzGY+YVAEKzIVaAB9JFFWGXn8WWo0gQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.1.6.tgz",
-      "integrity": "sha512-CMWAkYqfGdQCS+uuMA1A2UhOfcUYeoqnTW7msLr2RyYAys15pD960hlDfq7QAi8BCAKk0sQ2rjsl0iqMyziohQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.1.6.tgz",
-      "integrity": "sha512-AC7jE4Fxpn0s3ujngClIDTiEM/CQiB2N2vkcyWWn6734AmGT03Duq6RYtPMymFobDdAtZGFZd5nR95WjPzbZAQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-x64-musl": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.1.6.tgz",
-      "integrity": "sha512-c9Vjmi0EVk0Kou2qbrynskVarnFwfYIi+wKufR9Ad7/IKKuP6aEhOdZiIIdKsYWRtK2IWRF3h3YmdnEa2WLUag==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.1.6.tgz",
-      "integrity": "sha512-3UTOL/5XZSKFelM7qN0it35o3Cegm6LsyuERR3/OoqEExyj3aCk7F025b54/707HTMAnjlvQK3DzLhPu/xxO4g==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-win32-ia32-msvc": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.1.6.tgz",
-      "integrity": "sha512-8ZWoj6nCq6fI1yCzKq6oK0jE6Mxlz4MrEsRyu0TwDztWQWe7rh4XXGLAa2YVPatYcHhMcUL+fQQbqd1MsgaSDA==",
-      "cpu": [
-        "ia32"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.1.6.tgz",
-      "integrity": "sha512-4ZEwiRuZEicXhXqmhw3+de8Z4EpOLQj/gp+D9fFWo6ii6W1kBkNNvvEx4A90ugppu+74pT1lIJnOuz3A9oQeJA==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
    "node_modules/@nodelib/fs.scandir": {
      "version": "2.1.5",
      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@ -571,6 +409,19 @@
      "integrity": "sha512-WiBSI6JBIhC6LRIsB2Kwh8DsGTlbBU+mLRxJmAe3LjHTdkDpwIbEOZgoXBbZilk/vlfjK8i6nKRAvIRn1XaIMw==",
      "dev": true
    },
+    "node_modules/@types/d3": {
+      "version": "3.5.47",
+      "resolved": "https://registry.npmjs.org/@types/d3/-/d3-3.5.47.tgz",
+      "integrity": "sha512-VkWIQoZXLFdcBGe5pdBKJmTU3fmpXvo/KV6ixvTzOMl1yJ2hbTXpfvsziag0kcaerPDwas2T0vxojwQG3YwivQ=="
+    },
+    "node_modules/@types/d3-cloud": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/@types/d3-cloud/-/d3-cloud-1.2.5.tgz",
+      "integrity": "sha512-vEIER9DsEBUOdpRiwCh3n1qE+cV6h4e1LhxhY2sLt+m8LPNAIkOOhTlqk0JDiBwD+ZPM8ynFAOU3AuPuVYBFBA==",
+      "dependencies": {
+        "@types/d3": "^3"
+      }
+    },
    "node_modules/@types/d3-color": {
      "version": "1.4.2",
      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.4.2.tgz",
@ -652,7 +503,6 @@
      "version": "18.0.5",
      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.5.tgz",
      "integrity": "sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA==",
-      "dev": true,
      "dependencies": {
        "@types/react": "*"
      }
@ -886,6 +736,20 @@
        "react": "^16.3.0-0 || ^17.0.0-0 || ^18.0.0-0"
      }
    },
+    "node_modules/@visx/bounds": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@visx/bounds/-/bounds-2.10.0.tgz",
+      "integrity": "sha512-rY7WFTIjQaXA8tFL45O2qbtSRkyF4yF75HiWz06F7BVmJ9UjF2qlomB3Y1z6gk6ZiFhwQ4zxABjOVjAQPLn7nQ==",
+      "dependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "prop-types": "^15.5.10"
+      },
+      "peerDependencies": {
+        "react": "^16.0.0-0 || ^17.0.0-0 || ^18.0.0-0",
+        "react-dom": "^16.0.0-0 || ^17.0.0-0 || ^18.0.0-0"
+      }
+    },
    "node_modules/@visx/curve": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/@visx/curve/-/curve-2.1.0.tgz",
@ -895,6 +759,15 @@
        "d3-shape": "^1.0.6"
      }
    },
+    "node_modules/@visx/event": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@visx/event/-/event-2.6.0.tgz",
+      "integrity": "sha512-WGp91g82s727g3NAnENF1ppC3ZAlvWg+Y+GG0WFg34NmmOZbvPI/PTOqTqZE3x6B8EUn8NJiMxRjxIMbi+IvRw==",
+      "dependencies": {
+        "@types/react": "*",
+        "@visx/point": "2.6.0"
+      }
+    },
    "node_modules/@visx/grid": {
      "version": "2.10.0",
      "resolved": "https://registry.npmjs.org/@visx/grid/-/grid-2.10.0.tgz",
@ -982,6 +855,35 @@
        "react": "^16.3.0-0 || ^17.0.0-0 || ^18.0.0-0"
      }
    },
+    "node_modules/@visx/tooltip": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@visx/tooltip/-/tooltip-2.10.0.tgz",
+      "integrity": "sha512-6Zrd79MIEfyuLBcZ1ypSeAkpQc8oLRNB7FQnegzl3Lje4LK5lJtuf5ST0mwK6G2Uv+GlOW9REJ6VK4gfAGkq9A==",
+      "dependencies": {
+        "@types/react": "*",
+        "@visx/bounds": "2.10.0",
+        "classnames": "^2.3.1",
+        "prop-types": "^15.5.10",
+        "react-use-measure": "^2.0.4"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0-0 || ^17.0.0-0 || ^18.0.0-0",
+        "react-dom": "^16.8.0-0 || ^17.0.0-0 || ^18.0.0-0"
+      }
+    },
+    "node_modules/@visx/wordcloud": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@visx/wordcloud/-/wordcloud-2.10.0.tgz",
+      "integrity": "sha512-SN3W9VbnU/qYofPG5xlN0jJWFTMo5v9jlJtWFLgTy9aHV3CtclyyEAQ6/+VPrKWuNR5bgtOSegiE8EJdobrStg==",
+      "dependencies": {
+        "@types/d3-cloud": "1.2.5",
+        "@visx/group": "2.10.0",
+        "d3-cloud": "^1.2.5"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0-0 || ^17.0.0-0 || ^18.0.0-0"
+      }
+    },
    "node_modules/acorn": {
      "version": "8.7.1",
      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
@ -1429,11 +1331,24 @@
        "internmap": "^1.0.0"
      }
    },
+    "node_modules/d3-cloud": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/d3-cloud/-/d3-cloud-1.2.5.tgz",
+      "integrity": "sha512-4s2hXZgvs0CoUIw31oBAGrHt9Kt/7P9Ik5HIVzISFiWkD0Ga2VLAuO/emO/z1tYIpE7KG2smB4PhMPfFMJpahw==",
+      "dependencies": {
+        "d3-dispatch": "^1.0.3"
+      }
+    },
    "node_modules/d3-color": {
      "version": "1.4.1",
      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz",
      "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q=="
    },
+    "node_modules/d3-dispatch": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz",
+      "integrity": "sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA=="
+    },
    "node_modules/d3-format": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-2.0.0.tgz",
@ -1494,6 +1409,11 @@
      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
      "dev": true
    },
+    "node_modules/debounce": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz",
+      "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug=="
+    },
    "node_modules/debug": {
      "version": "4.3.4",
      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@ -3862,6 +3782,18 @@
      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
    },
+    "node_modules/react-use-measure": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/react-use-measure/-/react-use-measure-2.1.1.tgz",
+      "integrity": "sha512-nocZhN26cproIiIduswYpV5y5lQpSQS1y/4KuvUCjSKmw7ZWIS/+g3aFnX3WdBkyuGUtTLif3UTqnLLhbDoQig==",
+      "dependencies": {
+        "debounce": "^1.2.1"
+      },
+      "peerDependencies": {
+        "react": ">=16.13",
+        "react-dom": ">=16.13"
+      }
+    },
    "node_modules/reduce-css-calc": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
@ -4555,78 +4487,12 @@
        "glob": "7.1.7"
      }
    },
-    "@next/swc-android-arm-eabi": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.1.6.tgz",
-      "integrity": "sha512-BxBr3QAAAXWgk/K7EedvzxJr2dE014mghBSA9iOEAv0bMgF+MRq4PoASjuHi15M2zfowpcRG8XQhMFtxftCleQ==",
-      "optional": true
-    },
-    "@next/swc-android-arm64": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-android-arm64/-/swc-android-arm64-12.1.6.tgz",
-      "integrity": "sha512-EboEk3ROYY7U6WA2RrMt/cXXMokUTXXfnxe2+CU+DOahvbrO8QSWhlBl9I9ZbFzJx28AGB9Yo3oQHCvph/4Lew==",
-      "optional": true
-    },
-    "@next/swc-darwin-arm64": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.1.6.tgz",
-      "integrity": "sha512-P0EXU12BMSdNj1F7vdkP/VrYDuCNwBExtRPDYawgSUakzi6qP0iKJpya2BuLvNzXx+XPU49GFuDC5X+SvY0mOw==",
-      "optional": true
-    },
    "@next/swc-darwin-x64": {
      "version": "12.1.6",
      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-12.1.6.tgz",
      "integrity": "sha512-9FptMnbgHJK3dRDzfTpexs9S2hGpzOQxSQbe8omz6Pcl7rnEp9x4uSEKY51ho85JCjL4d0tDLBcXEJZKKLzxNg==",
      "optional": true
    },
-    "@next/swc-linux-arm-gnueabihf": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.1.6.tgz",
-      "integrity": "sha512-PvfEa1RR55dsik/IDkCKSFkk6ODNGJqPY3ysVUZqmnWMDSuqFtf7BPWHFa/53znpvVB5XaJ5Z1/6aR5CTIqxPw==",
-      "optional": true
-    },
-    "@next/swc-linux-arm64-gnu": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.1.6.tgz",
-      "integrity": "sha512-53QOvX1jBbC2ctnmWHyRhMajGq7QZfl974WYlwclXarVV418X7ed7o/EzGY+YVAEKzIVaAB9JFFWGXn8WWo0gQ==",
-      "optional": true
-    },
-    "@next/swc-linux-arm64-musl": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.1.6.tgz",
-      "integrity": "sha512-CMWAkYqfGdQCS+uuMA1A2UhOfcUYeoqnTW7msLr2RyYAys15pD960hlDfq7QAi8BCAKk0sQ2rjsl0iqMyziohQ==",
-      "optional": true
-    },
-    "@next/swc-linux-x64-gnu": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.1.6.tgz",
-      "integrity": "sha512-AC7jE4Fxpn0s3ujngClIDTiEM/CQiB2N2vkcyWWn6734AmGT03Duq6RYtPMymFobDdAtZGFZd5nR95WjPzbZAQ==",
-      "optional": true
-    },
-    "@next/swc-linux-x64-musl": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.1.6.tgz",
-      "integrity": "sha512-c9Vjmi0EVk0Kou2qbrynskVarnFwfYIi+wKufR9Ad7/IKKuP6aEhOdZiIIdKsYWRtK2IWRF3h3YmdnEa2WLUag==",
-      "optional": true
-    },
-    "@next/swc-win32-arm64-msvc": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.1.6.tgz",
-      "integrity": "sha512-3UTOL/5XZSKFelM7qN0it35o3Cegm6LsyuERR3/OoqEExyj3aCk7F025b54/707HTMAnjlvQK3DzLhPu/xxO4g==",
-      "optional": true
-    },
-    "@next/swc-win32-ia32-msvc": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.1.6.tgz",
-      "integrity": "sha512-8ZWoj6nCq6fI1yCzKq6oK0jE6Mxlz4MrEsRyu0TwDztWQWe7rh4XXGLAa2YVPatYcHhMcUL+fQQbqd1MsgaSDA==",
-      "optional": true
-    },
-    "@next/swc-win32-x64-msvc": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.1.6.tgz",
-      "integrity": "sha512-4ZEwiRuZEicXhXqmhw3+de8Z4EpOLQj/gp+D9fFWo6ii6W1kBkNNvvEx4A90ugppu+74pT1lIJnOuz3A9oQeJA==",
-      "optional": true
-    },
    "@nodelib/fs.scandir": {
      "version": "2.1.5",
      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@ -4659,6 +4525,19 @@
      "integrity": "sha512-WiBSI6JBIhC6LRIsB2Kwh8DsGTlbBU+mLRxJmAe3LjHTdkDpwIbEOZgoXBbZilk/vlfjK8i6nKRAvIRn1XaIMw==",
      "dev": true
    },
+    "@types/d3": {
+      "version": "3.5.47",
+      "resolved": "https://registry.npmjs.org/@types/d3/-/d3-3.5.47.tgz",
+      "integrity": "sha512-VkWIQoZXLFdcBGe5pdBKJmTU3fmpXvo/KV6ixvTzOMl1yJ2hbTXpfvsziag0kcaerPDwas2T0vxojwQG3YwivQ=="
+    },
+    "@types/d3-cloud": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/@types/d3-cloud/-/d3-cloud-1.2.5.tgz",
+      "integrity": "sha512-vEIER9DsEBUOdpRiwCh3n1qE+cV6h4e1LhxhY2sLt+m8LPNAIkOOhTlqk0JDiBwD+ZPM8ynFAOU3AuPuVYBFBA==",
+      "requires": {
+        "@types/d3": "^3"
+      }
+    },
    "@types/d3-color": {
      "version": "1.4.2",
      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.4.2.tgz",
@ -4740,7 +4619,6 @@
      "version": "18.0.5",
      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.5.tgz",
      "integrity": "sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA==",
-      "dev": true,
      "requires": {
        "@types/react": "*"
      }
@ -4878,6 +4756,16 @@
        "prop-types": "^15.6.0"
      }
    },
+    "@visx/bounds": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@visx/bounds/-/bounds-2.10.0.tgz",
+      "integrity": "sha512-rY7WFTIjQaXA8tFL45O2qbtSRkyF4yF75HiWz06F7BVmJ9UjF2qlomB3Y1z6gk6ZiFhwQ4zxABjOVjAQPLn7nQ==",
+      "requires": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "prop-types": "^15.5.10"
+      }
+    },
    "@visx/curve": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/@visx/curve/-/curve-2.1.0.tgz",
@ -4887,6 +4775,15 @@
        "d3-shape": "^1.0.6"
      }
    },
+    "@visx/event": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@visx/event/-/event-2.6.0.tgz",
+      "integrity": "sha512-WGp91g82s727g3NAnENF1ppC3ZAlvWg+Y+GG0WFg34NmmOZbvPI/PTOqTqZE3x6B8EUn8NJiMxRjxIMbi+IvRw==",
+      "requires": {
+        "@types/react": "*",
+        "@visx/point": "2.6.0"
+      }
+    },
    "@visx/grid": {
      "version": "2.10.0",
      "resolved": "https://registry.npmjs.org/@visx/grid/-/grid-2.10.0.tgz",
@ -4962,6 +4859,28 @@
        "reduce-css-calc": "^1.3.0"
      }
    },
+    "@visx/tooltip": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@visx/tooltip/-/tooltip-2.10.0.tgz",
+      "integrity": "sha512-6Zrd79MIEfyuLBcZ1ypSeAkpQc8oLRNB7FQnegzl3Lje4LK5lJtuf5ST0mwK6G2Uv+GlOW9REJ6VK4gfAGkq9A==",
+      "requires": {
+        "@types/react": "*",
+        "@visx/bounds": "2.10.0",
+        "classnames": "^2.3.1",
+        "prop-types": "^15.5.10",
+        "react-use-measure": "^2.0.4"
+      }
+    },
+    "@visx/wordcloud": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@visx/wordcloud/-/wordcloud-2.10.0.tgz",
+      "integrity": "sha512-SN3W9VbnU/qYofPG5xlN0jJWFTMo5v9jlJtWFLgTy9aHV3CtclyyEAQ6/+VPrKWuNR5bgtOSegiE8EJdobrStg==",
+      "requires": {
+        "@types/d3-cloud": "1.2.5",
+        "@visx/group": "2.10.0",
+        "d3-cloud": "^1.2.5"
+      }
+    },
    "acorn": {
      "version": "8.7.1",
      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
@ -5254,11 +5173,24 @@
        "internmap": "^1.0.0"
      }
    },
+    "d3-cloud": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/d3-cloud/-/d3-cloud-1.2.5.tgz",
+      "integrity": "sha512-4s2hXZgvs0CoUIw31oBAGrHt9Kt/7P9Ik5HIVzISFiWkD0Ga2VLAuO/emO/z1tYIpE7KG2smB4PhMPfFMJpahw==",
+      "requires": {
+        "d3-dispatch": "^1.0.3"
+      }
+    },
    "d3-color": {
      "version": "1.4.1",
      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz",
      "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q=="
    },
+    "d3-dispatch": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz",
+      "integrity": "sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA=="
+    },
    "d3-format": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-2.0.0.tgz",
@ -5319,6 +5251,11 @@
      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
      "dev": true
    },
+    "debounce": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz",
+      "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug=="
+    },
    "debug": {
      "version": "4.3.4",
      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@ -6995,6 +6932,14 @@
      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
    },
+    "react-use-measure": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/react-use-measure/-/react-use-measure-2.1.1.tgz",
+      "integrity": "sha512-nocZhN26cproIiIduswYpV5y5lQpSQS1y/4KuvUCjSKmw7ZWIS/+g3aFnX3WdBkyuGUtTLif3UTqnLLhbDoQig==",
+      "requires": {
+        "debounce": "^1.2.1"
+      }
+    },
    "reduce-css-calc": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
--- a/package.json
+++ b/package.json
@ -4,7 +4,7 @@
  "private": true,
  "engines": {
    "node": "^16",
-    "npm": "^8.0.0"
+    "npm": ">=7"
  },
  "scripts": {
    "dev": "next dev",
@ -16,8 +16,11 @@
  },
  "dependencies": {
    "@visx/axis": "^2.10.0",
+    "@visx/event": "^2.6.0",
    "@visx/grid": "^2.10.0",
    "@visx/shape": "^2.10.0",
+    "@visx/tooltip": "^2.10.0",
+    "@visx/wordcloud": "^2.10.0",
    "next": "12.1.6",
    "react": "18.1.0",
    "react-dom": "18.1.0"
--- a/pages/playground.tsx
+++ b/pages/playground.tsx
@ -1,13 +1,26 @@
+import { moreMockCategoricalData } from "data/mocks";
 import React from "react";

+import { WordCloud } from "@/components/WordCloud";
+
 import { ColorPalette } from "../components/ColorPalette";

 export default function Home() {
  return (
-    <>
+    <div>
      <h1>Playground</h1>
      <p>Show off your components here!</p>
      <ColorPalette />
-    </>
+
+      <h2>
+        <code>{"<WordCloud />"}</code>
+      </h2>
+      <WordCloud
+        data={moreMockCategoricalData.map((word) => ({
+          text: word.key,
+          value: word.value,
+        }))}
+      />
+    </div>
  );
 }
Author	SHA1	Message	Date
Shahan Nedadahandeh	f6443560e7	Updated package.json engine continuous-integration/drone/push Build is failing Details	2022-07-20 23:20:34 -07:00
Shahan Nedadahandeh	fc8f9eecc7	Merge remote-tracking branch 'origin/main' into shahanneda/add-wordcloud continuous-integration/drone/push Build is failing Details	2022-07-20 23:09:41 -07:00
Shahan Nedadahandeh	9149117115	Removed unused import continuous-integration/drone/push Build is failing Details	2022-07-20 22:51:34 -07:00
Shahan Nedadahandeh	2e9013d70b	Moved line around	2022-07-20 22:51:34 -07:00
Shahan Nedadahandeh	4fb454427c	Updated id	2022-07-20 22:51:34 -07:00
Shahan Nedadahandeh	ca896bedf6	Updated style	2022-07-20 22:51:33 -07:00
Shahan Nedadahandeh	49cbd40c12	Removed older changes	2022-07-20 22:51:33 -07:00
Shahan Nedadahandeh	1ec4c2735e	Added tooltip to wordcloud	2022-07-20 22:51:30 -07:00
Amy Wang	d638f42e8f	Fix Inconsolata font (#24 ) Fixes #23 Kudos to @j285he for noticing that we had commas in `pages/font.css` when we should've had semicolons. Co-authored-by: Amy Wang <a258wang@csclub.uwaterloo.ca> Reviewed-on: #24 Reviewed-by: Shahan Neda <snedadah@csclub.uwaterloo.ca>	2022-07-20 22:51:01 -07:00
Shahan Nedadahandeh	6273339409	Fix Staging server 404 error (#22 )	2022-07-20 22:50:38 -07:00
Shahan Nedadahandeh	561b1badc8	Tested fonts	2022-07-20 22:50:37 -07:00
Shahan Nedadahandeh	46059a14d4	Fixed fonts and margin	2022-07-20 22:50:37 -07:00
Shahan Nedadahandeh	eef4285627	Test fonts	2022-07-20 22:50:36 -07:00
Shahan Nedadahandeh	ae281310f1	Fixed issue with non html path	2022-07-20 22:50:36 -07:00
Shahan Nedadahandeh	b714317622	fixed typo	2022-07-20 22:50:35 -07:00
Shahan Nedadahandeh	f3110fda04	Test staging nginx config	2022-07-20 22:50:34 -07:00
Shahan Nedadahandeh	91ac58ae53	Added word cloud	2022-07-04 12:24:12 -07:00