react-native-ui-lib 7.41.1-snapshot.6935 → 7.41.1-snapshot.6946

package/lib/components/Keyboard/KeyboardInput/TextInputKeyboardManager/TextInputKeyboardManager.ios.js

@@ -45,7 +45,7 @@ export default class TextInputKeyboardManager {
   };
 }
 function findNodeHandle(ref) {
-  return ReactNative.findNodeHandle(ref.current || ref);
+  return ref.current?.getNodeHandle?.() || ref?.getNodeHandle?.() || ReactNative.findNodeHandle(ref.current || ref);
 }
 const springAnimation = {
   duration: 400,

package/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uilib-native",
-  "version": "4.5.1",
+  "version": "4.5.2",
   "homepage": "https://github.com/wix/react-native-ui-lib",
   "description": "uilib native components (separated from js components)",
   "main": "components/index",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ui-lib",
-  "version": "7.41.1-snapshot.6935",
+  "version": "7.41.1-snapshot.6946",
   "main": "src/index.js",
   "types": "src/index.d.ts",
   "author": "Ethan Sharabi <ethan.shar@gmail.com>",

package/src/components/picker/helpers/useNewPickerProps.js

@@ -13,23 +13,27 @@ const useNewPickerProps = props => {
     renderHeader,
     renderOverlay
   } = props;
-  const modalProps = {
+  const defaultModalProps = {
     animationType: 'slide',
     transparent: Constants.isIOS && enableModalBlur,
     enableModalBlur: Constants.isIOS && enableModalBlur,
     onRequestClose: topBarProps?.onCancel
   };
+  const mergedModalProps = {
+    ...defaultModalProps,
+    ...(onShow && {
+      onShow
+    }),
+    ...pickerModalProps,
+    ...customPickerProps?.modalProps
+  };
   const newProps = {
     renderHeader: renderCustomDialogHeader || renderHeader,
     renderInput: renderPicker || renderInput,
     renderOverlay: renderCustomModal || renderOverlay,
     customPickerProps: {
-      modalProps: {
-        onShow,
-        ...modalProps,
-        ...pickerModalProps
-      },
-      ...customPickerProps
+      ...customPickerProps,
+      modalProps: mergedModalProps
     }
   };
   return newProps;

package/src/components/textField/useImperativeInputHandle.js

@@ -1,10 +1,12 @@
 import { useContext, useImperativeHandle, useRef } from 'react';
+import { findNodeHandle } from 'react-native';
 import FieldContext from "./FieldContext";
 const useImperativeInputHandle = (ref, props) => {
   const inputRef = useRef();
   const context = useContext(FieldContext);
   useImperativeHandle(ref, () => {
     return {
+      getNodeHandle: () => inputRef.current ? findNodeHandle(inputRef.current) : null,
       isFocused: () => inputRef.current?.isFocused(),
       focus: () => inputRef.current?.focus(),
       blur: () => inputRef.current?.blur(),