v0.1.2

Aslam97 · Sep 7, 2024 · 8356f60 · 8356f60
1 parent 2489880
commit 8356f60
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 15 deletions.
diff --git a/packages/react-fancy-switch/package.json b/packages/react-fancy-switch/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@omit/react-fancy-switch",
   "private": false,
-  "version": "0.1.1",
+  "version": "0.1.2",
   "type": "module",
   "license": "MIT",
   "description": "A fancy switch component",

diff --git a/packages/react-fancy-switch/src/components/fancy-switch.tsx b/packages/react-fancy-switch/src/components/fancy-switch.tsx
@@ -1,5 +1,10 @@
 import * as React from 'react'
-import { FancySwitchProps, OptionObject, OptionType } from '../types'
+import {
+  FancySwitchProps,
+  OptionObject,
+  OptionType,
+  OptionValue
+} from '../types'
 
 export const FancySwitch = React.forwardRef<HTMLDivElement, FancySwitchProps>(
   (
@@ -17,18 +22,22 @@ export const FancySwitch = React.forwardRef<HTMLDivElement, FancySwitchProps>(
     ref
   ) => {
     const getOptionValue = React.useCallback(
-      (option: OptionType) =>
-        typeof option === 'string'
-          ? option
-          : (option as OptionObject)[valueKey],
+      (option: OptionType): OptionValue => {
+        if (typeof option === 'string' || typeof option === 'number') {
+          return option
+        }
+        return (option as OptionObject)[valueKey] as OptionValue
+      },
       [valueKey]
     )
 
     const getOptionLabel = React.useCallback(
-      (option: OptionType) =>
-        typeof option === 'string'
-          ? option
-          : (option as OptionObject)[labelKey],
+      (option: OptionType): string => {
+        if (typeof option === 'string' || typeof option === 'number') {
+          return String(option)
+        }
+        return String((option as OptionObject)[labelKey])
+      },
       [labelKey]
     )
 
@@ -41,9 +50,27 @@ export const FancySwitch = React.forwardRef<HTMLDivElement, FancySwitchProps>(
       [options, getOptionValue, getOptionLabel]
     )
 
-    const [activeIndex, setActiveIndex] = React.useState(() =>
-      memoizedOptions.findIndex((option) => option.value === value)
-    )
+    const [activeIndex, setActiveIndex] = React.useState(() => {
+      const index = memoizedOptions.findIndex(
+        (option) => option.value === value
+      )
+      if (index === -1) {
+        console.warn(
+          `FancySwitch: No option found for value "${value}". Defaulting to first option.`
+        )
+        return 0
+      }
+      return index
+    })
+
+    React.useEffect(() => {
+      const newIndex = memoizedOptions.findIndex(
+        (option) => option.value === value
+      )
+      if (newIndex !== -1 && newIndex !== activeIndex) {
+        setActiveIndex(newIndex)
+      }
+    }, [value, memoizedOptions, activeIndex])
 
     const [highlighterStyle, setHighlighterStyle] = React.useState({
       height: 0,
@@ -158,7 +185,7 @@ export const FancySwitch = React.forwardRef<HTMLDivElement, FancySwitchProps>(
     return (
       <div
         role="radiogroup"
-        aria-labelledby="fancy-switch-label"
+        aria-label="Fancy Switch Options"
         {...props}
         ref={containerRef}
       >
@@ -186,10 +213,28 @@ export const FancySwitch = React.forwardRef<HTMLDivElement, FancySwitchProps>(
             onKeyDown={(e) => handleKeyDown(e, index)}
             className={radioClassName}
             {...(index === activeIndex ? { 'data-checked': true } : {})}
+            aria-label={`${option.label} option`}
           >
             {option.label}
           </div>
         ))}
+
+        <div
+          aria-live="polite"
+          style={{
+            position: 'absolute',
+            width: '1px',
+            height: '1px',
+            padding: 0,
+            margin: '-1px',
+            overflow: 'hidden',
+            clip: 'rect(0, 0, 0, 0)',
+            whiteSpace: 'nowrap',
+            borderWidth: 0
+          }}
+        >
+          {memoizedOptions[activeIndex]?.label} selected
+        </div>
       </div>
     )
   }

diff --git a/website/src/App.tsx b/website/src/App.tsx
@@ -39,7 +39,7 @@ function App() {
   const form = useForm<z.infer<typeof FormSchema>>({
     resolver: zodResolver(FormSchema),
     defaultValues: {
-      orderType: 'Delivery',
+      orderType: 'Pickup',
       isPublished: 0,
       pet: 1
     }
@@ -49,6 +49,14 @@ function App() {
     console.log(data)
   }
 
+  // wait 2 second, and change orderType to 'Shipping'
+  useEffect(() => {
+    setTimeout(() => {
+      form.setValue('orderType', 'Shipping')
+      console.log('orderType changed to Shipping')
+    }, 2000)
+  }, [form])
+
   useEffect(() => {
     const handleKeyDown = (e: KeyboardEvent) => {
       if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
@@ -99,6 +107,7 @@ function App() {
                       data-testid="orderType"
                       className="flex rounded-full bg-muted p-2"
                       highlighterClassName="bg-primary rounded-full"
+                      aria-label="Order type"
                       radioClassName={cn(
                         'relative mx-2 flex h-9 cursor-pointer items-center justify-center rounded-full px-3.5 text-sm font-medium transition-colors focus:outline-none data-[checked]:text-primary-foreground'
                       )}