Merge pull request #745 from appsmithorg/release

chore: Release PR
appsmithorg · Jul 5, 2024 · 7523390 · 7523390
2 parents d686bc2 + ed99f0b
commit 7523390
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 15 deletions.
diff --git a/.changeset/few-experts-live.md b/.changeset/few-experts-live.md
@@ -0,0 +1,5 @@
+---
+"@appsmithorg/design-system": patch
+---
+
+feat: Added events and defer prop to ScrollArea
diff --git a/.changeset/smart-socks-learn.md b/.changeset/smart-socks-learn.md
@@ -0,0 +1,5 @@
+---
+"@appsmithorg/design-system": patch
+---
+
+fix: Updated sm size for DatePicker, Input, Number Input, and Search Input
diff --git a/packages/design-system/src/Input/Input.styles.tsx b/packages/design-system/src/Input/Input.styles.tsx
@@ -15,7 +15,7 @@ const Variables = css`
   --input-padding-x: var(--ads-v2-spaces-2); // padding left and right
   --input-padding-y: var(--ads-v2-spaces-2); // padding top and bottom
   --input-font-size: var(--ads-v2-font-size-2);
-  --input-height: 22px;
+  --input-height: 24px;
 `;
 
 const getSizes = (size: InputSizes, component: "input" | "textarea") => {
@@ -24,7 +24,7 @@ const getSizes = (size: InputSizes, component: "input" | "textarea") => {
       --input-padding-x: var(--ads-v2-spaces-2);
       --input-padding-y: var(--ads-v2-spaces-2);
       --input-font-size: var(--ads-v2-font-size-2);
-      --input-height: ${component === "input" ? "22px" : "60px"};
+      --input-height: ${component === "input" ? "24px" : "60px"};
     `,
     md: css`
       --input-padding-x: var(--ads-v2-spaces-3);

diff --git a/packages/design-system/src/ScrollArea/ScrollArea.tsx b/packages/design-system/src/ScrollArea/ScrollArea.tsx
@@ -10,15 +10,27 @@ import { ScrollAreaProps } from "./ScrollArea.types";
 
 function ScrollArea(props: ScrollAreaProps) {
   const ref = useRef<HTMLDivElement>(null);
-  const { children, className, options, size = "md", ...rest } = props;
+  const {
+    children,
+    className,
+    defer,
+    events,
+    options,
+    size = "md",
+    ...rest
+  } = props;
   const defaultOptions: UseOverlayScrollbarsParams["options"] = {
     scrollbars: {
       theme: "ads-v2-scroll-theme",
       autoHide: "scroll",
     },
     ...options,
   };
-  const [initialize] = useOverlayScrollbars({ options: defaultOptions });
+  const [initialize] = useOverlayScrollbars({
+    options: defaultOptions,
+    events,
+    defer,
+  });
 
   useEffect(() => {
     if (ref.current) initialize(ref.current);

diff --git a/packages/design-system/src/ScrollArea/ScrollArea.types.ts b/packages/design-system/src/ScrollArea/ScrollArea.types.ts
@@ -6,4 +6,6 @@ import { Sizes } from "__config__/types";
 export interface ScrollAreaProps extends React.HTMLAttributes<HTMLDivElement> {
   size?: Extract<Sizes, "sm" | "md">;
   options?: UseOverlayScrollbarsParams["options"];
+  events?: UseOverlayScrollbarsParams["events"];
+  defer?: UseOverlayScrollbarsParams["defer"];
 }
diff --git a/packages/design-system/src/SearchInput/SearchInput.styles.tsx b/packages/design-system/src/SearchInput/SearchInput.styles.tsx
@@ -7,13 +7,11 @@ const Sizes = {
     --input-font-size: 14px;
     --input-padding-x: var(--ads-v2-spaces-3); // padding left and right
     --input-padding-y: var(--ads-v2-spaces-2); // padding top and bottom
-    --input-height: 28px;
   `,
   md: css`
     --input-padding-x: var(--ads-v2-spaces-3);
     --input-padding-y: var(--ads-v2-spaces-3);
     --input-font-size: var(--ads-v2-font-size-4);
-    --input-height: 36px;
   `,
 };
 

diff --git a/yarn.lock b/yarn.lock
@@ -21264,21 +21264,21 @@ write-file-atomic@^4.0.1, write-file-atomic@^4.0.2:
     signal-exit "^3.0.7"
 
 ws@^6.1.0:
-  version "6.2.2"
-  resolved "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz"
-  integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.3.tgz#ccc96e4add5fd6fedbc491903075c85c5a11d9ee"
+  integrity sha512-jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==
   dependencies:
     async-limiter "~1.0.0"
 
 ws@^7.4.6:
-  version "7.5.9"
-  resolved "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz"
-  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
+  version "7.5.10"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
+  integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
 
 ws@^8.2.3:
-  version "8.13.0"
-  resolved "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz"
-  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
+  version "8.17.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
+  integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==
 
 x-default-browser@^0.4.0:
   version "0.4.0"