diff --git a/package-lock.json b/package-lock.json
index 5948cbd6..5f22e169 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "@diamondlightsource/cs-web-lib",
- "version": "0.10.18",
+ "version": "0.10.19",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@diamondlightsource/cs-web-lib",
- "version": "0.10.18",
+ "version": "0.10.19",
"license": "ISC",
"dependencies": {
"apollo-link-retry": "^2.2.16",
diff --git a/package.json b/package.json
index 1b088d75..343b338a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "@diamondlightsource/cs-web-lib",
"type": "module",
- "version": "0.10.18",
+ "version": "0.10.19",
"description": "Control system web library",
"main": "./dist/index.cjs",
"scripts": {
diff --git a/src/ui/widgets/ByteMonitor/byteMonitor.test.tsx b/src/ui/widgets/ByteMonitor/byteMonitor.test.tsx
index 4cc63b2d..c158c389 100644
--- a/src/ui/widgets/ByteMonitor/byteMonitor.test.tsx
+++ b/src/ui/widgets/ByteMonitor/byteMonitor.test.tsx
@@ -10,18 +10,6 @@ import { PvDatum } from "../../../redux/csState";
import { vi } from "vitest";
import { createMockStyle } from "../../../test-utils/styleTestUtils";
-vi.mock("../../hooks/useStyle", () => ({
- useStyle: vi.fn(() =>
- createMockStyle({
- customColors: {
- onColor: "rgb(155, 160, 209)",
- offColor: "rgba(0, 0, 0, 1)",
- borderColor: "rgba(150, 150, 150, 1)"
- }
- })
- )
-}));
-
vi.mock("../../hooks/useStyle", () => ({
useStyle: vi.fn(props =>
createMockStyle({
@@ -42,6 +30,10 @@ const ByteMonitorRenderer = (byteMonitorProps: any): ReactTestRendererJSON => {
};
describe("", (): void => {
+ beforeEach(() => {
+ vi.clearAllMocks();
+ });
+
test("default properties are added to bytemonitor component", (): void => {
const byteMonitorProps = {
pvData: [
diff --git a/src/ui/widgets/DataBrowser/dataBrowser.test.tsx b/src/ui/widgets/DataBrowser/dataBrowser.test.tsx
index f876863a..1c94dc92 100644
--- a/src/ui/widgets/DataBrowser/dataBrowser.test.tsx
+++ b/src/ui/widgets/DataBrowser/dataBrowser.test.tsx
@@ -45,16 +45,6 @@ vi.mock("@mui/material", () => ({
))
}));
-vi.mock("../../hooks/useStyle", () => ({
- useStyle: vi.fn(() =>
- createMockStyle({
- colors: {
- color: "rgba(255,255,0,1)",
- backgroundColor: "rgba(127,0,127,1)"
- }
- })
- )
-}));
vi.mock("../../hooks/useStyle", () => ({
useStyle: vi.fn(props =>
createMockStyle({
diff --git a/src/ui/widgets/LinearMeter/linearMeter.tsx b/src/ui/widgets/LinearMeter/linearMeter.tsx
index 370d2bbf..66129318 100644
--- a/src/ui/widgets/LinearMeter/linearMeter.tsx
+++ b/src/ui/widgets/LinearMeter/linearMeter.tsx
@@ -361,4 +361,4 @@ export const LinearMeter = (
props: InferWidgetProps
): JSX.Element => ;
-registerWidget(LinearMeter, LinearMeterProps, widgetName);
+registerWidget(LinearMeter, LinearMeterWidgetProps, widgetName);
diff --git a/src/ui/widgets/StripChart/stripChart.tsx b/src/ui/widgets/StripChart/stripChart.tsx
index 2efb075f..85de0eb7 100644
--- a/src/ui/widgets/StripChart/stripChart.tsx
+++ b/src/ui/widgets/StripChart/stripChart.tsx
@@ -95,7 +95,8 @@ export const StripChartComponent = (
// If we're passed an empty array fill in defaults
const localAxes = useMemo(
- () => (axes.length > 0 ? [...(axes as Axes)] : [newAxis({ xAxis: false })]),
+ () =>
+ axes?.length > 0 ? [...(axes as Axes)] : [newAxis({ xAxis: false })],
[axes]
);
// Convert start time into milliseconds period
diff --git a/src/ui/widgets/Thermometer/thermometer.tsx b/src/ui/widgets/Thermometer/thermometer.tsx
index e98ae3ff..e7e0a10f 100644
--- a/src/ui/widgets/Thermometer/thermometer.tsx
+++ b/src/ui/widgets/Thermometer/thermometer.tsx
@@ -52,7 +52,7 @@ export const ThermometerComponent = (
): JSX.Element => {
const svgRef = useRef(null);
const [style, newProps] = useStyle(
- { foregroundColor: props.fillColor },
+ { ...props, foregroundColor: props.fillColor },
widgetName,
props.class
);