fix: revert back to toggle group controlled state

lovrozagar · Jul 5, 2024 · b8e3c24 · b8e3c24
1 parent c745e33
commit b8e3c24
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 16 deletions.
diff --git a/app.tsx b/app.tsx
@@ -1,14 +1,9 @@
-
 import React, { useState } from 'react'
 
 const App = () => {
   const [state, setValue] = useState(false)
 
-  return (
-
-    <div className='h-screen w-full flex flex-col justify-center items-center gap-8'>    </div>
-
-  )
+  return <div className='h-screen w-full flex flex-col justify-center items-center gap-8'> </div>
 }
 
 export { App }
diff --git a/src/components/number-input/hooks/use-number-input.ts b/src/components/number-input/hooks/use-number-input.ts
@@ -6,7 +6,6 @@ import { useControllableState } from '@/components/_shared/hooks/use-controllabl
 import { useMergedRef } from '@/components/_shared/hooks/use-merged-ref'
 import { useOnClickOutside } from '@/components/_shared/hooks/use-on-click-outside'
 import { focusInput } from '@/components/_shared/utils/focus-input'
-import { buttonClasses } from '@/components/button'
 import {
   DEFAULT_NUMBER_INPUT_CLASSNAME,
   DEFAULT_NUMBER_INPUT_CONTAINER_CLASSNAME,

diff --git a/src/components/text-input/hooks/use-text-input.ts b/src/components/text-input/hooks/use-text-input.ts
@@ -6,10 +6,6 @@ import { inputContainerClasses } from '@/components/_shared/classes/input-contai
 import { useControllableState } from '@/components/_shared/hooks/use-controllable-state'
 import { useMergedRef } from '@/components/_shared/hooks/use-merged-ref'
 import { useOnClickOutside } from '@/components/_shared/hooks/use-on-click-outside'
-<<<<<<< HEAD
-import { buttonClasses } from '@/components/button'
-=======
->>>>>>> d68c9fe (refactor: internal hook rewrite, update deps)
 import {
   DEFAULT_TEXT_INPUT_BASE_PASSWORD_TOGGLE_ICON_CLASSNAME,
   DEFAULT_TEXT_INPUT_CLASSNAME,

diff --git a/src/components/toggle-group/components/toggle-group.tsx b/src/components/toggle-group/components/toggle-group.tsx
@@ -2,13 +2,10 @@
 
 import { ToggleGroup as ToggleGroupPrimitive } from '@radix-ui/react-toggle-group'
 import { cn, functionCallOrValue } from '@renderui/utils'
-import React, { useState } from 'react'
+import React from 'react'
 
 import { EMPTY_ARRAY } from '@/components/_shared/constants/constants'
-<<<<<<< HEAD
 import { useControllableState } from '@/components/_shared/hooks/use-controllable-state'
-=======
->>>>>>> d68c9fe (refactor: internal hook rewrite, update deps)
 import { DEFAULT_TOGGLE_GROUP_CLASSNAME } from '@/components/toggle-group/constants/constants'
 import { ToggleGroupProvider } from '@/components/toggle-group/contexts/toggle-group-context'
 import { ToggleGroupProps, ToggleGroupRef } from '@/components/toggle-group/types/toggle-group'
@@ -24,7 +21,11 @@ const ToggleGroup = React.forwardRef<ToggleGroupRef, ToggleGroupProps>((props, r
     ...restProps
   } = props
 
-  const [value, onValueChange] = useState(valueProp ?? defaultValue)
+  const [value, onValueChange] = useControllableState<any>({
+    onChange: onValueChangeProp,
+    defaultProp: defaultValue,
+    prop: valueProp,
+  })
 
   return (
     <ToggleGroupPrimitive