From d630f7335dea257cda12b35d4355457a00b7c745 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Thu, 26 May 2022 08:23:43 -0400 Subject: [PATCH] Minor fixes --- .../src/components/SquiggleChart.tsx | 33 +++++++++---------- .../src/vega-specs/spec-percentiles.json | 1 + .../squiggle-lang/src/js/rescript_interop.ts | 2 +- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index 2971a3e1..31d48a1c 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -12,7 +12,7 @@ import { defaultBindings, defaultEnvironment, declarationArg, - declaration + declaration, } from "@quri/squiggle-lang"; import { NumberShower } from "./NumberShower"; import { DistributionChart } from "./DistributionChart"; @@ -25,14 +25,12 @@ function getRange(x: declaration) { case "Float": { return { floats: { min: first.value.min, max: first.value.max } }; } - case "Time": { - return { time: { min: first.value.min, max: first.value.max } }; + case "Date": { + return { time: { min: first.value.min, max: first.value.max} }; } } } -function getChartSettings( - x: declaration -): FunctionChartSettings { +function getChartSettings(x: declaration): FunctionChartSettings { let range = getRange(x); let min = range.floats ? range.floats.min : 0; let max = range.floats ? range.floats.max : 10; @@ -207,7 +205,6 @@ const SquiggleItem: React.FC = ({ /> ))} - ) ); case "arraystring": @@ -241,17 +238,17 @@ const SquiggleItem: React.FC = ({ /> ); case "lambdaDeclaration": { - return ( - - ); - } + return ( + + ); + } default: { return <>Should be unreachable; } diff --git a/packages/components/src/vega-specs/spec-percentiles.json b/packages/components/src/vega-specs/spec-percentiles.json index d533a866..36e4450c 100644 --- a/packages/components/src/vega-specs/spec-percentiles.json +++ b/packages/components/src/vega-specs/spec-percentiles.json @@ -75,6 +75,7 @@ "name": "xscale", "type": "linear", "nice": true, + "zero": false, "domain": { "data": "facet", "field": "x" diff --git a/packages/squiggle-lang/src/js/rescript_interop.ts b/packages/squiggle-lang/src/js/rescript_interop.ts index 64e7a64f..9f9bdb39 100644 --- a/packages/squiggle-lang/src/js/rescript_interop.ts +++ b/packages/squiggle-lang/src/js/rescript_interop.ts @@ -102,7 +102,7 @@ type rescriptDeclarationArg = max: number; } | { - TAG: 1; // Float + TAG: 1; // Date min: Date; max: Date; };