Merge pull request #579 from LifeSG/bump-version

Bump v2.8.0-canary.2
LifeSG · Sep 27, 2024 · dec923e · dec923e
2 parents f72968c + 46279a9
commit dec923e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@lifesg/react-design-system",
-    "version": "2.8.0-canary.1",
+    "version": "2.8.0-canary.2",
     "description": "A component design system for LifeSG web apps",
     "main": "dist/cjs/index.js",
     "module": "dist/index.js",

diff --git a/src/time-range-picker/combobox-picker/combobox-picker.tsx b/src/time-range-picker/combobox-picker/combobox-picker.tsx
@@ -418,7 +418,7 @@ export const ComboboxPicker = ({
                     offset={8}
                     alignment={alignment}
                     fitAvailableHeight
-                    zIndex={dropdownZIndex}
+                    customZIndex={dropdownZIndex}
                 />
             </DropdownListState>
             {renderError()}

diff --git a/tests/time-range-picker/time-range-picker.spec.tsx b/tests/time-range-picker/time-range-picker.spec.tsx
@@ -18,7 +18,6 @@ describe("TimeRangePicker", () => {
             unobserve: jest.fn(),
             disconnect: jest.fn(),
         }));
-        jest.setTimeout(10000);
     });
 
     describe("Combobox variant", () => {
@@ -495,7 +494,7 @@ describe("TimeRangePicker", () => {
                 expect(mockOnBlur).toHaveBeenCalledTimes(1);
                 expect(mockOnFocus).toHaveBeenCalledTimes(2);
                 expect(screen.queryByTestId(DROPDOWN_TESTID)).toBeVisible();
-            });
+            }, 10000);
         });
 
         describe("readonly/disabled behavior", () => {