Merge branch 'main' of https://github.com/chanzuckerberg/sci-components…

… into prod
chanzuckerberg · May 10, 2024 · 865d5d6 · 865d5d6
2 parents d2df223 + c42970a
commit 865d5d6
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [20.2.0](https://github.com/chanzuckerberg/sci-components/compare/@czi-sds/components@20.1.2...@czi-sds/components@20.2.0) (2024-05-09)
+
+### Features
+
+- **complexfilter:** add shouldisTriggerChangeOnOptionClick to complexFilter and ([#772](https://github.com/chanzuckerberg/sci-components/issues/772)) ([038ad54](https://github.com/chanzuckerberg/sci-components/commit/038ad542a91b05b06af5b77dff0a644a509f0cc0))
+
 ## [20.1.2](https://github.com/chanzuckerberg/sci-components/compare/@czi-sds/components@20.1.0...@czi-sds/components@20.1.2) (2024-05-03)
 
 ### Bug Fixes

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@czi-sds/components",
-  "version": "20.1.2",
+  "version": "20.2.0",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
   "types": "dist/index.cjs.d.ts",

diff --git a/packages/components/src/core/ComplexFilter/index.tsx b/packages/components/src/core/ComplexFilter/index.tsx
@@ -88,12 +88,13 @@ const ComplexFilter = <
   // * such as sliders for ranges, inline multi selects, etc.
   return (
     <>
-      <Wrapper {...rest}>
+      <Wrapper>
         <InputDropdownComponent
           label={label}
           onClick={handleClick}
           sdsStage={open ? "userInput" : "default"}
           {...InputDropdownProps}
+          {...rest}
         />
 
         <StyledChipsWrapper>

diff --git a/packages/components/src/core/Dropdown/__storybook__/stories/test.tsx b/packages/components/src/core/Dropdown/__storybook__/stories/test.tsx
@@ -14,6 +14,7 @@ export const TestDemo = <
 ): JSX.Element => {
   return (
     <RawDropdown<T, Multiple, DisableClearable, FreeSolo>
+      data-testid="dropdown"
       label="Click Target"
       onChange={noop}
       options={AUTOCOMPLETE_SINGLE_COLUMN_OPTIONS as T[]}

diff --git a/packages/components/src/core/Dropdown/__tests__/__snapshots__/index.test.tsx.snap b/packages/components/src/core/Dropdown/__tests__/__snapshots__/index.test.tsx.snap
@@ -3,7 +3,6 @@
 exports[`<Dropdown /> Default story renders snapshot 1`] = `
 <button
   class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium css-1yq35rh-MuiButtonBase-root-MuiButton-root"
-  data-testid="dropdown"
   label="Click Target"
   tabindex="0"
   type="button"
@@ -48,7 +47,6 @@ exports[`<Dropdown /> Default story renders snapshot 1`] = `
 exports[`<Dropdown /> MultiColumnWithButtons story renders snapshot 1`] = `
 <button
   class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium css-1yq35rh-MuiButtonBase-root-MuiButton-root"
-  data-testid="dropdown"
   label="Click Target"
   tabindex="0"
   type="button"

diff --git a/packages/components/src/core/Dropdown/index.tsx b/packages/components/src/core/Dropdown/index.tsx
@@ -138,7 +138,7 @@ const Dropdown = <
         onClick={handleClick}
         sdsStage={open ? "userInput" : "default"}
         {...InputDropdownProps}
-        data-testid="dropdown"
+        {...rest}
       />
       <DropdownMenu<T, Multiple, DisableClearable, FreeSolo>
         anchorEl={anchorEl}