From bd993cc0e418d51d91d83db741621d2b1a825e8c Mon Sep 17 00:00:00 2001 From: Dawid Poliszak Date: Thu, 13 Jun 2024 11:51:23 +0200 Subject: [PATCH] NU-1694 change DTPickerStyled approach --- designer/client/src/components/NodeInput.tsx | 21 ++++++++----------- .../client/src/components/common/DTPicker.tsx | 6 +----- .../editors/expression/RawEditor.tsx | 2 +- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/designer/client/src/components/NodeInput.tsx b/designer/client/src/components/NodeInput.tsx index 7587191b29c..b0e30ed293f 100644 --- a/designer/client/src/components/NodeInput.tsx +++ b/designer/client/src/components/NodeInput.tsx @@ -1,14 +1,11 @@ import { css } from "@mui/material"; -import { CSSProperties } from "react"; -export const nodeInputCss = (extended?: CSSProperties) => - css({ - height: "35px", - width: "100%", - padding: "0 10px", - border: "none", - '&[type="checkbox"]': { - height: "20px", - }, - ...extended, - }); +export const nodeInputCss = css({ + height: "35px", + width: "100%", + padding: "0 10px", + border: "none", + '&[type="checkbox"]': { + height: "20px", + }, +}); diff --git a/designer/client/src/components/common/DTPicker.tsx b/designer/client/src/components/common/DTPicker.tsx index e4ca96dc091..9484839556a 100644 --- a/designer/client/src/components/common/DTPicker.tsx +++ b/designer/client/src/components/common/DTPicker.tsx @@ -4,11 +4,7 @@ import { useTranslation } from "react-i18next"; import { styled } from "@mui/material"; import { nodeInputCss } from "../NodeInput"; -const DTPickerStyled = styled(DateTimePicker)(() => ({ - ...nodeInputCss({ - padding: "0", - }), -})); +const DTPickerStyled = styled(DateTimePicker)(nodeInputCss, { padding: 0 }); const style = { background: "none", border: "none", diff --git a/designer/client/src/components/graph/node-modal/editors/expression/RawEditor.tsx b/designer/client/src/components/graph/node-modal/editors/expression/RawEditor.tsx index da084b3104f..2c4afdb736f 100644 --- a/designer/client/src/components/graph/node-modal/editors/expression/RawEditor.tsx +++ b/designer/client/src/components/graph/node-modal/editors/expression/RawEditor.tsx @@ -47,7 +47,7 @@ const RawEditorComponent = (props: RawEditorProps, forwardedRef: ForwardedRef