Merge pull request #116 from CLIMB-TRE/development

Bug fixes

Author: tombch

lib/Onyx.scss

@@ -42,6 +42,14 @@ $theme-colors: map-merge($theme-colors, $custom-theme);
     @import "../node_modules/bootstrap/scss/modal";
     @import "../node_modules/bootstrap/scss/spinners";
 
+ // Fix pagination disabled state
+  .page-item.disabled .page-link {
+      color: var(--bs-pagination-disabled-color) !important;
+      pointer-events: none !important;
+      background-color: var(--bs-pagination-disabled-bg) !important;
+      border-color: var(--bs-pagination-disabled-border-color) !important;
+  }
+
   .modal-backdrop {
     position: fixed;
     top: 0;

lib/components/Dropdowns.tsx

@@ -34,18 +34,20 @@ const Option = (props: OptionProps) => {
   const splitLabel = props.label.split("|", 2);
 
   return (
-    <small>
-      <components.Option {...props}>
-        {splitLabel.length > 0 && <div>{splitLabel[0]}</div>}
-        {splitLabel.length > 1 && (
-          <div
-            style={{ color: "var(--onyx-dropdown-option-description-color)" }}
-          >
-            {splitLabel[1]}
-          </div>
-        )}
-      </components.Option>
-    </small>
+    <div className="onyx">
+      <small>
+        <components.Option {...props}>
+          {splitLabel.length > 0 && <div>{splitLabel[0]}</div>}
+          {splitLabel.length > 1 && (
+            <div
+              style={{ color: "var(--onyx-dropdown-option-description-color)" }}
+            >
+              {splitLabel[1]}
+            </div>
+          )}
+        </components.Option>
+      </small>
+    </div>
   );
 };
 

lib/components/Table.tsx

@@ -367,7 +367,7 @@ function TableOptions(props: TableOptionsProps) {
   };
 
   return (
-    <Pagination size="sm">
+    <>
       <ExportModal
         {...props}
         defaultFileExtension=".csv"
@@ -407,7 +407,7 @@ function TableOptions(props: TableOptionsProps) {
           Export to CSV/TSV
         </Dropdown.Item>
       </DropdownButton>
-    </Pagination>
+    </>
   );
 }
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "climb-onyx-gui",
-  "version": "0.16.0",
+  "version": "0.16.1",
   "description": "Onyx Graphical User Interface",
   "keywords": [
     "gui",