@codeleap/web 3.21.7 → 3.21.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codeleap/web",
-  "version": "3.21.7",
+  "version": "3.21.9",
   "main": "src/index.ts",
   "repository": {
     "url": "https://github.com/codeleap-uk/internal-libs-monorepo.git",

package/src/components/Select/index.tsx

@@ -225,17 +225,19 @@ export const Select = forwardRef<HTMLInputElement, SelectProps>(
       selectedOption: _selectedOption,
       setSelectedOption: _setSelectedOption,
       loadingMessage,
+      selectRef = null,
       ...otherProps
     } = selectProps
 
-    const innerInputRef = useRef<any>(null)
+    const _innerInputRef = useRef<any>(null)
+    const innerInputRef = selectRef || _innerInputRef
     const innerWrapperRef = useRef(null)
 
     const hasSelectedOptionState = !TypeGuards.isNil(_selectedOption) && TypeGuards.isFunction(_setSelectedOption)
 
-    const initialValue = (loadInitialValue && !TypeGuards.isNil(options)) 
-      ? options?.find((option) => option?.value === value) 
-      : value 
+    const initialValue = (loadInitialValue && !TypeGuards.isNil(options))
+      ? options?.find((option) => option?.value === value)
+      : value
 
     const [selectedOption, setSelectedOption] = hasSelectedOptionState ? [_selectedOption, _setSelectedOption] : useState(initialValue ?? value)
 

package/src/components/TextInput/index.tsx

@@ -117,6 +117,10 @@ export const TextInputComponent = forwardRef<InputRef, TextInputProps>((props, i
   useImperativeHandle(inputRef, () => {
     return {
       focus: () => {
+        if (isMasked) {
+          innerInputRef.current?.getInputDOMNode()?.focus()
+        }
+        
         innerInputRef.current?.focus?.()
       },
       isTextInput: true,
@@ -221,7 +225,9 @@ export const TextInputComponent = forwardRef<InputRef, TextInputProps>((props, i
       innerWrapperProps={{
         ...(inputBaseProps.innerWrapperProps || {}),
         [inputBaseAction]: () => {
-          // if (isMasked) innerInputRef.current?.onFocus?.()
+          if (isMasked) {
+            innerInputRef.current?.getInputDOMNode()?.focus()
+          }
           innerInputRef.current?.focus?.()
           if (isPressable) onPress?.()
         },

package/src/lib/usePopState.ts

@@ -1,9 +1,14 @@
 import { AnyFunction, useIsomorphicEffect, useUnmount } from '@codeleap/common'
 
 export const usePopState = (dependence: boolean, handler: AnyFunction) => {
+
   useIsomorphicEffect(() => {
     if (dependence) {
-      window.history.pushState(null, null, window.location.pathname)
+      const pathname = location.pathname
+      const searchParams = location.search
+      const newUrl = pathname + searchParams
+
+      window.history.pushState(null, null, newUrl)
       window.addEventListener('popstate', handler)
     } else {
       window.removeEventListener('popstate', handler)