react-native-controlled-input 0.13.0 → 0.15.0

package/android/src/main/java/com/controlledinput/ControlledInputView.kt

@@ -26,10 +26,6 @@ import com.facebook.react.uimanager.UIManagerHelper
 import kotlinx.coroutines.flow.MutableStateFlow
 
 /**
- * Keep this class in package `com.controlledinput` with simple name `ControlledInputView`:
- * apps that patch `react-native-keyboard-controller` locate the host via
- * `Class.name == "com.controlledinput.ControlledInputView"` for Compose (non-EditText) focus.
- *
  * RN + Jetpack Compose hosting view aligned with Expo UI / [ExpoComposeView] + [ExpoView]:
  * - [shouldUseAndroidLayout]: requestLayout posts measureAndLayout (RN #17968)
  * - onMeasure skips child [ComposeView] until attached (window + WindowRecomposer)

package/ios/ControlledInputView.mm

@@ -28,15 +28,6 @@ using namespace facebook::react;
     return concreteComponentDescriptorProvider<ControlledInputViewComponentDescriptor>();
 }
 
-/// `react-native-keyboard-controller` resolves `UIResponder.reactViewTag` as
-/// `(firstResponder as UIView).superview.tag`. The field's superview is this content view,
-/// so its `tag` must match the Fabric component's react tag or keyboard events disagree
-/// on `target` and `KeyboardAwareScrollView` mis-animates (iOS hide jumps).
-- (void)syncContentViewReactTagFromContainer
-{
-  _inputView.tag = self.tag;
-}
-
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {
@@ -47,18 +38,11 @@ using namespace facebook::react;
     _inputView.delegate = self;
 
     self.contentView = _inputView;
-    [self syncContentViewReactTagFromContainer];
   }
 
   return self;
 }
 
-- (void)layoutSubviews
-{
-  [super layoutSubviews];
-  [self syncContentViewReactTagFromContainer];
-}
-
 - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
 {
     const auto &oldViewProps = *std::static_pointer_cast<ControlledInputViewProps const>(_props);

package/ios/RNControlledInput.swift

@@ -144,11 +144,23 @@ public class RNControlledInput: UIView, UITextFieldDelegate {
     }
 
     private func applyFont() {
-        if let family = fontFamily, let font = UIFont(name: family, size: fontSize) {
-            textField.font = font
-        } else {
+        guard let family = fontFamily else {
             textField.font = UIFont.systemFont(ofSize: fontSize)
+            return
+        }
+        // UIFont(name:size:) needs the PostScript name. Expo's useFonts keys are aliased via a
+        // swizzled UIFont.fontNames(forFamilyName:) — RN Text resolves aliases that way, so we must too.
+        if let font = UIFont(name: family, size: fontSize) {
+            textField.font = font
+            return
+        }
+        for face in UIFont.fontNames(forFamilyName: family) {
+            if let font = UIFont(name: face, size: fontSize) {
+                textField.font = font
+                return
+            }
         }
+        textField.font = UIFont.systemFont(ofSize: fontSize)
     }
 
     private func applyAutoComplete() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-controlled-input",
-  "version": "0.13.0",
+  "version": "0.15.0",
   "description": "React Native Controlled Inputative Controlled Input",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",