Merge pull request #60 from concord-consortium/misc-04-09-2024-fixes

Misc fixes:
concord-consortium · Apr 10, 2024 · 6102b2b · 6102b2b
2 parents bcb95a1 + c8bfc51
commit 6102b2b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/src/components/app.tsx b/src/components/app.tsx
@@ -390,7 +390,7 @@ export const App = () => {
             </div>
           </div>
 
-          <SpeedToggle fastSimulation={fastSimulation} onChange={handleSpeedToggle} disabled={animating} />
+          <SpeedToggle fastSimulation={fastSimulation} onChange={handleSpeedToggle} />
 
         </div>
         <div className="buttons">

diff --git a/src/components/graph.tsx b/src/components/graph.tsx
@@ -808,6 +808,11 @@ export const Graph = (props: Props) => {
     const svg = d3.select(svgRef.current);
     const root = svg.select("g.root");
     const bounds = (root.node() as SVGGElement).getBBox();
+
+    if (!bounds.width || !bounds.height) {
+      return false;
+    }
+
     const center = {
       x: bounds.x + (bounds.width / 2),
       y: bounds.y + (bounds.height / 2),

diff --git a/src/components/speed-toggle.scss b/src/components/speed-toggle.scss
@@ -4,7 +4,7 @@
     margin: 7px 0;
     display: flex;
     gap: 10px;
-    cursor: pointer;
+    cursor: default;
 
     &>div {
       width: 40px;

diff --git a/src/components/speed-toggle.tsx b/src/components/speed-toggle.tsx
@@ -4,11 +4,10 @@ import "./speed-toggle.scss";
 
 interface Props {
   fastSimulation: boolean;
-  disabled: boolean;
   onChange: (newValue: boolean) => void;
 }
 
-export const SpeedToggle = ({fastSimulation, disabled, onChange}: Props) => {
+export const SpeedToggle = ({fastSimulation, onChange}: Props) => {
   const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     onChange(e.target.checked);
   };
@@ -28,7 +27,6 @@ export const SpeedToggle = ({fastSimulation, disabled, onChange}: Props) => {
           title={title}
           checked={fastSimulation}
           onChange={handleChange}
-          disabled={disabled}
         />
         <div style={getStyle(fastSimulation)} className="fast">Fast</div>
       </div>

diff --git a/src/hooks/use-codap.ts b/src/hooks/use-codap.ts
@@ -77,7 +77,8 @@ export const useCODAP = ({onCODAPDataChanged, getGraph, setGraph, setInitialGrap
 
   const handleDataChanged = useCallback(async ({datasetName, collectionName, attributeName}: CODAPAttribute) => {
     const values = await getValuesForAttribute(datasetName, collectionName, attributeName);
-    if (viewMode === "dataset" && (JSON.stringify(values) !== JSON.stringify(valuesRef.current))) {
+    const valuesChanged = !valuesRef.current || (JSON.stringify(values) !== JSON.stringify(valuesRef.current));
+    if (viewMode === "dataset" && valuesChanged) {
       onCODAPDataChanged(values);
       valuesRef.current = values;
     }
@@ -127,6 +128,7 @@ export const useCODAP = ({onCODAPDataChanged, getGraph, setGraph, setInitialGrap
           collectionName: iMessage.values.collection.name,
           attributeName: iMessage.values.attribute.name
         };
+        valuesRef.current = [];
         setAttribute(newAttribute);
         await handleDataChanged(newAttribute);
         await notifyStateIsDirty();