Merge pull request #134 from AlphadayHQ/dev

v2.0.0
AlphadayHQ · Nov 23, 2023 · f60e122 · f60e122
2 parents 5dc3878 + 5483487
commit f60e122
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 28 deletions.
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@alphaday/frontend",
   "private": true,
-  "version": "2.0.0-rc2",
+  "version": "2.0.0",
   "type": "module",
   "scripts": {
     "prepare": "export VITE_COMMIT=$(git rev-parse --short HEAD)",

diff --git a/packages/ui-kit/src/components/scrollbar/ScrollBar.tsx b/packages/ui-kit/src/components/scrollbar/ScrollBar.tsx
@@ -13,6 +13,8 @@ export interface ScrollBarProps extends HTMLProps<HTMLDivElement> {
     onYReachEnd?: (container: HTMLElement) => void;
 }
 
+const isTouchDevice = "ontouchstart" in window || navigator.maxTouchPoints > 0;
+
 export const ScrollBar: FC<ScrollBarProps> = ({
     children,
     onScroll,
@@ -26,7 +28,8 @@ export const ScrollBar: FC<ScrollBarProps> = ({
         <div
             ref={(ref) => ref && containerRef?.(ref)}
             className={twMerge(
-                "overflow-hidden overflow-y-auto scrollbar-track-backgroundVariant1800 scrollbar-thumb-primaryVariant800 scrollbar scrollbar-w-[5px] overscroll-contain h-full",
+                "overflow-hidden hover:none:text-blue hover:overflow-y-auto scrollbar-track-backgroundVariant1800 scrollbar-thumb-primaryVariant800 scrollbar scrollbar-w-[5px] overscroll-contain h-full",
+                isTouchDevice && "overflow-y-auto",
                 className
             )}
             style={{ scrollbarGutter: "stable", ...style }}

diff --git a/packages/ui-kit/src/components/switch/Switch.module.scss b/packages/ui-kit/src/components/switch/Switch.module.scss
diff --git a/packages/ui-kit/src/components/switch/Switch.tsx b/packages/ui-kit/src/components/switch/Switch.tsx
@@ -1,6 +1,5 @@
 import { FC } from "react";
 import { twMerge } from "tailwind-merge";
-import styles from "./Switch.module.scss";
 
 export interface SwitchProps {
     options: [string, string];
@@ -27,7 +26,7 @@ export const Switch: FC<SwitchProps> = ({
             aria-label={label}
             className={twMerge(
                 "relative inline-block text-primary",
-                disabled ? styles.disabled : "",
+                disabled && "text-primaryVariant300 pointer-events-none",
                 className
             )}
             {...restProps}
@@ -44,15 +43,17 @@ export const Switch: FC<SwitchProps> = ({
                 <span
                     className={twMerge(
                         "m-[3px] text-center capitalize fontGroup-highlightSemi duration-[400ms] rounded-lg py-[3px] px-2 min-w-min two-col:min-w-[62px] hover:bg-btnBackgroundVariant1200 active:bg-btnBackgroundVariant1600 option1",
-                        !checked && "bg-btnBackgroundVariant1400"
+                        !checked && "bg-btnBackgroundVariant1400",
+                        !checked && disabled && "bg-primaryVariant300"
                     )}
                 >
                     {options[0]}
                 </span>
                 <span
                     className={twMerge(
                         "m-[3px] text-center capitalize fontGroup-highlightSemi duration-[400ms] rounded-lg py-[3px] px-2 min-w-min two-col:min-w-[62px] hover:bg-btnBackgroundVariant1200 active:bg-btnBackgroundVariant1600 option2",
-                        checked && "bg-btnBackgroundVariant1400"
+                        checked && "bg-btnBackgroundVariant1400",
+                        checked && disabled && "bg-primaryVariant300"
                     )}
                 >
                     {options[1]}