Merge branch 'beta' into feat/legend-scroll

tremorlabs · Oct 23, 2023 · 25b7fb5 · 25b7fb5
2 parents a804e2c + 2a0df8f
commit 25b7fb5
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 55 deletions.
diff --git a/package.json b/package.json
@@ -62,6 +62,7 @@
     "@storybook/theming": "^7.4.6",
     "@testing-library/react": "^13.1.1",
     "@types/jest": "^27.4.1",
+    "@types/node": "^20.8.7",
     "@types/react": "^18.0.5",
     "@types/react-transition-group": "^4.4.5",
     "@typescript-eslint/eslint-plugin": "^6.7.5",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/components/chart-elements/AreaChart/AreaChart.tsx b/src/components/chart-elements/AreaChart/AreaChart.tsx
@@ -162,6 +162,7 @@ const AreaChart = React.forwardRef<HTMLDivElement, AreaChartProps>((props, ref)
               />
             ) : null}
             <XAxis
+              padding={{ left: 20, right: 20 }}
               hide={!showXAxis}
               dataKey={index}
               tick={{ transform: "translate(0, 6)" }}
@@ -176,7 +177,7 @@ const AreaChart = React.forwardRef<HTMLDivElement, AreaChartProps>((props, ref)
                 // dark
                 "dark:fill-dark-tremor-content",
               )}
-              interval={intervalType}
+              interval={startEndOnly ? "preserveStartEnd" : intervalType}
               tickLine={false}
               axisLine={false}
               minTickGap={5}

diff --git a/src/components/chart-elements/BarChart/BarChart.tsx b/src/components/chart-elements/BarChart/BarChart.tsx
@@ -159,9 +159,10 @@ const BarChart = React.forwardRef<HTMLDivElement, BarChartProps>((props, ref) =>
 
             {layout !== "vertical" ? (
               <XAxis
+                padding={{ left: 20, right: 20 }}
                 hide={!showXAxis}
                 dataKey={index}
-                interval={intervalType}
+                interval={startEndOnly ? "preserveStartEnd" : intervalType}
                 tick={{ transform: "translate(0, 6)" }}
                 ticks={startEndOnly ? [data[0][index], data[data.length - 1][index]] : undefined}
                 fill=""

diff --git a/src/components/chart-elements/LineChart/LineChart.tsx b/src/components/chart-elements/LineChart/LineChart.tsx
@@ -159,9 +159,10 @@ const LineChart = React.forwardRef<HTMLDivElement, LineChartProps>((props, ref)
               />
             ) : null}
             <XAxis
+              padding={{ left: 20, right: 20 }}
               hide={!showXAxis}
               dataKey={index}
-              interval={intervalType}
+              interval={startEndOnly ? "preserveStartEnd" : intervalType}
               tick={{ transform: "translate(0, 6)" }}
               ticks={startEndOnly ? [data[0][index], data[data.length - 1][index]] : undefined}
               fill=""

diff --git a/src/components/chart-elements/ScatterChart/ScatterChart.tsx b/src/components/chart-elements/ScatterChart/ScatterChart.tsx
@@ -214,7 +214,7 @@ const ScatterChart = React.forwardRef<HTMLDivElement, ScatterChartProps>((props,
               <XAxis
                 hide={!showXAxis}
                 dataKey={x}
-                interval={intervalType}
+                interval={startEndOnly ? "preserveStartEnd" : intervalType}
                 tick={{ transform: "translate(0, 6)" }}
                 ticks={startEndOnly ? [data[0][x], data[data.length - 1][x]] : undefined}
                 type="number"

diff --git a/src/components/input-elements/Switch/Switch.tsx b/src/components/input-elements/Switch/Switch.tsx
@@ -77,21 +77,14 @@ const Switch = React.forwardRef<HTMLDivElement, SwitchProps>((props, ref) => {
           <span className={tremorTwMerge(makeSwitchClassName("sr-only"), "sr-only")}>
             Switch {isChecked ? "on" : "off"}
           </span>
-          {/* <span
-          aria-hidden="true"
-          className={tremorTwMerge(
-            makeSwitchClassName("background"),
-            "pointer-events-none absolute h-full w-full rounded-md bg-white",
-          )}
-        /> */}
           <span
             aria-hidden="true"
             className={tremorTwMerge(
               makeSwitchClassName("background"),
               isChecked
                 ? getColorClassNames(color, colorPalette.background).bgColor
-                : "bg-tremor-content-subtle dark:bg-dark-tremor-content-subtle",
-              "pointer-events-none absolute mx-auto h-3.5 w-9 rounded-tremor-full transition-colors duration-100 ease-in-out",
+                : "bg-tremor-border dark:bg-dark-tremor-border",
+              "pointer-events-none absolute mx-auto h-3 w-9 rounded-tremor-full transition-colors duration-100 ease-in-out",
             )}
           />
           <span
@@ -103,8 +96,7 @@ const Switch = React.forwardRef<HTMLDivElement, SwitchProps>((props, ref) => {
                     getColorClassNames(color, colorPalette.background).bgColor,
                     "translate-x-5 border-white",
                   )
-                : "translate-x-0 bg-tremor-content-subtle dark:bg-dark-tremor-content-subtle border-white",
-
+                : "translate-x-0 bg-tremor-border dark:bg-dark-tremor-border border-white",
               "pointer-events-none absolute left-0 inline-block h-5 w-5 transform rounded-tremor-full border-2 shadow-tremor-input duration-100 ease-in-out transition",
               isFocused ? tremorTwMerge("ring-2 ring-blue-200") : "",
             )}