Merge pull request #52 from govtechmy/staging

hotfixes

Author: PyConqueror

.github/pull_request_template.md

@@ -0,0 +1,25 @@
+## Summarise the feature
+
+Issue ticket # (issue)
+
+Description:
+
+## Type of change
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] This change requires a documentation update
+
+## Affected endpoints
+
+/?
+
+## Checklist
+
+- [ ] My code follows the style guidelines of this project
+- [ ] I have performed a self-review of my code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] I have added tests that prove my fix is effective or that my feature works

components/Combobox/index.tsx

@@ -147,12 +147,10 @@ const ComboBox = <T extends unknown>({
             </li>
           ) : items.length > 100 ? (
             <>
-              <li
-                key="total-size"
-                style={{ height: rowVirtualizer.totalSize }}
-              />
+              <li style={{ height: rowVirtualizer.totalSize }} />
               {rowVirtualizer.virtualItems.map(virtualRow => (
                 <ComboOption<T>
+                  key={`vc-${virtualRow.index}`}
                   option={items[virtualRow.index]}
                   total={options.length}
                   format={format}
@@ -178,6 +176,7 @@ const ComboBox = <T extends unknown>({
           ) : (
             items.map((item, i) => (
               <ComboOption<T>
+                key={`cb-${item.value}`}
                 option={item}
                 total={options.length}
                 format={format}

components/Combobox/option.tsx

@@ -39,7 +39,7 @@ function ComboOptionInner<T>(
 ) {
   return (
     <li
-      key={index}
+      key={`cop-${index}`}
       ref={ref}
       role="option"
       aria-selected={isSelected}
@@ -79,7 +79,7 @@ function ComboOptionInner<T>(
         )}
         {isSelected && (
           <span className="absolute inset-y-0 right-0 flex items-center">
-            <CheckCircleIcon className="h-4 w-4 text-primary dark:text-secondary" />
+            <CheckCircleIcon className="text-primary h-4 w-4 dark:text-secondary" />
           </span>
         )}
       </div>

components/Drawer/index.tsx

@@ -40,7 +40,7 @@ const DrawerContent = React.forwardRef<
     <DrawerPrimitive.Content
       ref={ref}
       className={cn(
-        "fixed inset-x-0 bottom-0 z-50 flex max-h-[90dvh] min-w-[360px] flex-col rounded-t-xl border border-otl-gray-200 bg-bg-white",
+        "fixed inset-x-0 bottom-0 z-50 flex max-h-[90dvh] min-w-[360px] flex-col overflow-auto rounded-t-xl border border-otl-gray-200 bg-bg-white after:!inset-0 after:!h-0",
         className
       )}
       {...props}