expo-modules-core 55.0.0 → 55.0.2

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 55.0.2 — 2026-01-22
+
+### 💡 Others
+
+- [macos] Remove react-native-macos@0.79.0 workarounds ([#42409](https://github.com/expo/expo/pull/42409) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
+## 55.0.1 — 2026-01-22
+
+_This version does not introduce any user-facing changes._
+
 ## 55.0.0 — 2026-01-21
 
 ### 🛠 Breaking changes
@@ -45,7 +55,7 @@
 ### 🐛 Bug fixes
 
 - [Android] Fixed DSL view props using stale state when updating. ([#41622](https://github.com/expo/expo/pull/41622) by [@kimchi-developer](https://github.com/kimchi-developer))
-- [core] Fixed `useReleasingSharedObject` to defer releasing until after render.
+- [core] Fixed `useReleasingSharedObject` to defer releasing until after render.
 - [android] Fix source sets for events for functional view definitions. ([#41685](https://github.com/expo/expo/pull/41685) by [@aleqsio](https://github.com/aleqsio))
 - [iOS] Fix throwing `InvalidArgsNumberException` when declaring `AsyncFunction` with optional arguments and `Promise`. ([#41054](https://github.com/expo/expo/pull/41054) by [@Wenszel](https://github.com/Wenszel))
 - [iOS] fix queue assertion crash ([#41296](https://github.com/expo/expo/pull/41296) by [@vonovak](https://github.com/vonovak))

package/android/build.gradle

@@ -29,7 +29,7 @@ if (shouldIncludeCompose) {
 }
 
 group = 'host.exp.exponent'
-version = '55.0.0'
+version = '55.0.2'
 
 def isExpoModulesCoreTests = {
   Gradle gradle = getGradle()
@@ -96,7 +96,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "55.0.0"
+    versionName "55.0.2"
     buildConfigField "String", "EXPO_MODULES_CORE_VERSION", "\"${versionName}\""
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", "true"
 

package/android/cmake/main.cmake

@@ -15,9 +15,10 @@ file(
   "${main_dir}/decorators/*.cpp"
   "${main_dir}/installers/*.cpp"
   "${main_dir}/worklets/*.cpp"
-  "${main_dir}/fabric/*.cpp"
 )
 
+file(GLOB fabric_andorid_sources "${ANDROID_SRC_DIR}/fabric/*.cpp")
+
 add_library(
   expo-modules-core
   SHARED

package/android/src/compose/expo/modules/kotlin/views/ComposeViewProp.kt

@@ -17,19 +17,9 @@ class ComposeViewProp(
   anyType: AnyType,
   val property: KProperty1<*, *>
 ) : AnyViewProp(name, anyType) {
-  private var _isStateProp = false
 
   @Suppress("UNCHECKED_CAST")
   override fun set(prop: Dynamic, onView: View, appContext: AppContext?) {
-    setPropDirectly(prop, onView, appContext)
-  }
-
-  override fun set(prop: Any?, onView: View, appContext: AppContext?) {
-    setPropDirectly(prop, onView, appContext)
-  }
-
-  @Suppress("UNCHECKED_CAST")
-  private fun setPropDirectly(prop: Any?, onView: View, appContext: AppContext?) {
     exceptionDecorator({
       PropSetException(name, onView::class, it)
     }) {
@@ -60,13 +50,5 @@ class ComposeViewProp(
     }
   }
 
-  fun asStateProp(): ComposeViewProp {
-    _isStateProp = true
-    return this
-  }
-
   override val isNullable: Boolean = anyType.kType.isMarkedNullable
-
-  override val isStateProp: Boolean
-    get() = _isStateProp
 }

package/android/src/fabric/FabricComponentsRegistry.cpp

@@ -0,0 +1,47 @@
+// Copyright 2018-present 650 Industries. All rights reserved.
+
+#include "FabricComponentsRegistry.h"
+
+#include <react/renderer/componentregistry/ComponentDescriptorProvider.h>
+#include <CoreComponentsRegistry.h>
+
+#include "ExpoViewComponentDescriptor.h"
+
+namespace jni = facebook::jni;
+namespace react = facebook::react;
+
+namespace expo {
+
+// static
+void FabricComponentsRegistry::registerNatives() {
+  registerHybrid({
+    makeNativeMethod("initHybrid", FabricComponentsRegistry::initHybrid),
+    makeNativeMethod("registerComponentsRegistry", FabricComponentsRegistry::registerComponentsRegistry),
+  });
+}
+
+// static
+jni::local_ref<FabricComponentsRegistry::jhybriddata>
+FabricComponentsRegistry::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+  return makeCxxInstance();
+}
+
+void FabricComponentsRegistry::registerComponentsRegistry(
+  jni::alias_ref<jni::JArrayClass<jni::JString>> componentNames) {
+  // Inject the component to the CoreComponentsRegistry because we don't want to touch the MainApplicationReactNativeHost
+  auto providerRegistry = react::CoreComponentsRegistry::sharedProviderRegistry();
+
+  size_t size = componentNames->size();
+  for (size_t i = 0; i < size; ++i) {
+    auto flavor = std::make_shared<std::string const>(componentNames->getElement(i)->toStdString());
+    auto componentName = react::ComponentName{flavor->c_str()};
+    providerRegistry->add(react::ComponentDescriptorProvider {
+      reinterpret_cast<react::ComponentHandle>(componentName),
+      componentName,
+      flavor,
+      &facebook::react::concreteComponentDescriptorConstructor<expo::ExpoViewComponentDescriptor>
+    });
+  }
+}
+
+} // namespace expo

package/android/src/fabric/FabricComponentsRegistry.h

@@ -0,0 +1,25 @@
+// Copyright 2018-present 650 Industries. All rights reserved.
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+
+namespace expo {
+
+class FabricComponentsRegistry : public facebook::jni::HybridClass<FabricComponentsRegistry> {
+public:
+  static auto constexpr
+    kJavaDescriptor = "Lexpo/modules/adapters/react/FabricComponentsRegistry;";
+
+  static void registerNatives();
+
+  FabricComponentsRegistry() {};
+
+  void registerComponentsRegistry(
+    facebook::jni::alias_ref<facebook::jni::JArrayClass<facebook::jni::JString>> componentNames);
+
+private:
+  static facebook::jni::local_ref<jhybriddata> initHybrid(facebook::jni::alias_ref<jhybridobject> jThis);
+};
+
+} // namespace expo

package/android/src/main/cpp/JNIInjector.cpp

@@ -21,8 +21,7 @@
 #include "worklets/WorkletNativeRuntime.h"
 
 #if RN_FABRIC_ENABLED
-#include "fabric/FabricComponentsRegistry.h"
-#include "fabric/NativeStatePropsGetter.h"
+#include "FabricComponentsRegistry.h"
 #endif
 
 #include <jni.h>
@@ -63,7 +62,6 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
 
 #if RN_FABRIC_ENABLED
     expo::FabricComponentsRegistry::registerNatives();
-    expo::NativeStatePropsGetter::registerNatives();
 #endif
   });
 }

package/android/src/main/java/expo/modules/adapters/react/FabricComponentsRegistry.kt

@@ -3,51 +3,24 @@
 package expo.modules.adapters.react
 
 import com.facebook.jni.HybridData
+import com.facebook.react.uimanager.ViewManager
 import com.facebook.soloader.SoLoader
 import expo.modules.core.interfaces.DoNotStrip
-import expo.modules.kotlin.jni.ExpectedType
-import expo.modules.kotlin.views.ViewManagerWrapperDelegate
 
 @Suppress("KotlinJniMissingFunction")
 @DoNotStrip
-class FabricComponentsRegistry(viewDelegates: List<ViewManagerWrapperDelegate>) {
+class FabricComponentsRegistry(viewManagerList: List<ViewManager<*, *>>) {
+  private val componentNames: List<String> = viewManagerList.map { it.name }
+
   @DoNotStrip
   private val mHybridData = initHybrid()
 
   init {
-    val componentNames = Array(viewDelegates.size) { i ->
-      viewDelegates[i].viewManagerName
-    }
-
-    val stateProps = viewDelegates.map {
-      it.props.filter { (_, prop) -> prop.isStateProp }.values
-    }
-
-    val statePropNames = Array(componentNames.size) { i ->
-      Array(stateProps[i].size) { j ->
-        stateProps[i].elementAt(j).name
-      }
-    }
-
-    val statePropsType = Array(componentNames.size) { i ->
-      Array(stateProps[i].size) { j ->
-        stateProps[i].elementAt(j).type.getCppRequiredTypes()
-      }
-    }
-
-    registerComponentsRegistry(
-      componentNames,
-      statePropNames,
-      statePropsType
-    )
+    registerComponentsRegistry(componentNames.toTypedArray())
   }
 
   private external fun initHybrid(): HybridData
-  private external fun registerComponentsRegistry(
-    componentNames: Array<String>,
-    statePropNames: Array<Array<String>>,
-    statePropTypes: Array<Array<ExpectedType>>
-  )
+  private external fun registerComponentsRegistry(componentNames: Array<String>)
 
   @Throws(Throwable::class)
   protected fun finalize() {

package/android/src/main/java/expo/modules/adapters/react/ModuleRegistryAdapter.java

@@ -22,7 +22,7 @@ import expo.modules.kotlin.CoreLoggerKt;
 import expo.modules.kotlin.ExpoBridgeModule;
 import expo.modules.kotlin.KotlinInteropModuleRegistry;
 import expo.modules.kotlin.ModulesProvider;
-import expo.modules.kotlin.views.ViewManagerWrapperDelegate;
+import expo.modules.kotlin.views.ViewWrapperDelegateHolder;
 
 /**
  * An adapter over {@link ModuleRegistry}, compatible with React (implementing {@link ReactPackage}).
@@ -43,7 +43,7 @@ public class ModuleRegistryAdapter implements ReactPackage {
   }
 
   // We need to save all view holders to update them when the new kotlin module registry will be created.
-  private List<ViewManagerWrapperDelegate> mWrapperDelegates = null;
+  private List<ViewWrapperDelegateHolder> mWrapperDelegateHolders = null;
   private FabricComponentsRegistry mFabricComponentsRegistry = null;
 
   public ModuleRegistryAdapter(List<Package> packageList) {
@@ -69,9 +69,9 @@ public class ModuleRegistryAdapter implements ReactPackage {
     }
 
     List<NativeModule> nativeModules = getNativeModulesFromModuleRegistry(reactContext, moduleRegistry, null);
-    if (mWrapperDelegates != null) {
+    if (mWrapperDelegateHolders != null) {
       KotlinInteropModuleRegistry kotlinInteropModuleRegistry = proxy.getKotlinInteropModuleRegistry();
-      kotlinInteropModuleRegistry.updateModuleHoldersInViewDelegates(mWrapperDelegates);
+      kotlinInteropModuleRegistry.updateModuleHoldersInViewManagers(mWrapperDelegateHolders);
     }
 
     return nativeModules;
@@ -108,17 +108,13 @@ public class ModuleRegistryAdapter implements ReactPackage {
 
     NativeModulesProxy modulesProxy = Objects.requireNonNull(getOrCreateNativeModulesProxy(reactContext, null));
     KotlinInteropModuleRegistry kotlinInteropModuleRegistry = modulesProxy.getKotlinInteropModuleRegistry();
-    List<ViewManagerWrapperDelegate> kViewManagerDelegates = kotlinInteropModuleRegistry.exportViewManagerDelegates();
+    List<ViewManager<?, ?>> kViewManager = kotlinInteropModuleRegistry.exportViewManagers();
     // Saves all holders that needs to be in sync with module registry
-    mWrapperDelegates = kViewManagerDelegates;
-    List<? extends ViewManager<?, ?>> viewManagers = kViewManagerDelegates
-      .stream()
-      .map(ViewManagerWrapperDelegate::toRNViewManager)
-      .toList();
-    viewManagerList.addAll(viewManagers);
+    mWrapperDelegateHolders = kotlinInteropModuleRegistry.extractViewManagersDelegateHolders(kViewManager);
+    viewManagerList.addAll(kViewManager);
     if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
       // Intentionally to only add Sweet API view managers for Fabric support
-      mFabricComponentsRegistry = new FabricComponentsRegistry(kViewManagerDelegates);
+      mFabricComponentsRegistry = new FabricComponentsRegistry(kViewManager);
     }
 
     return viewManagerList;

package/android/src/main/java/expo/modules/kotlin/KotlinInteropModuleRegistry.kt

@@ -2,12 +2,17 @@ package expo.modules.kotlin
 
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.uimanager.ViewManager
 import expo.modules.adapters.react.NativeModulesProxy
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.exception.UnexpectedException
 import expo.modules.kotlin.modules.DEFAULT_MODULE_VIEW
 import expo.modules.kotlin.tracing.trace
+import expo.modules.kotlin.views.GroupViewManagerWrapper
+import expo.modules.kotlin.views.SimpleViewManagerWrapper
+import expo.modules.kotlin.views.ViewManagerType
 import expo.modules.kotlin.views.ViewManagerWrapperDelegate
+import expo.modules.kotlin.views.ViewWrapperDelegateHolder
 import java.lang.ref.WeakReference
 
 class KotlinInteropModuleRegistry(
@@ -39,12 +44,16 @@ class KotlinInteropModuleRegistry(
     }
   }
 
-  fun exportViewManagerDelegates(): List<ViewManagerWrapperDelegate> =
-    trace("KotlinInteropModuleRegistry.exportViewManagerDelegates") {
+  fun exportViewManagers(): List<ViewManager<*, *>> =
+    trace("KotlinInteropModuleRegistry.exportViewManagers") {
       registry
         .flatMap { module ->
           module.definition.viewManagerDefinitions.map { (name, definition) ->
-            ViewManagerWrapperDelegate(module, definition, if (name == DEFAULT_MODULE_VIEW) module.name else null)
+            val wrapperDelegate = ViewManagerWrapperDelegate(module, definition, if (name == DEFAULT_MODULE_VIEW) module.name else null)
+            when (definition.getViewManagerType()) {
+              ViewManagerType.SIMPLE -> SimpleViewManagerWrapper(wrapperDelegate)
+              ViewManagerType.GROUP -> GroupViewManagerWrapper(wrapperDelegate)
+            }
           }
         }
     }
@@ -65,6 +74,11 @@ class KotlinInteropModuleRegistry(
       return@trace result
     }
 
+  fun extractViewManagersDelegateHolders(viewManagers: List<ViewManager<*, *>>): List<ViewWrapperDelegateHolder> =
+    trace("KotlinInteropModuleRegistry.extractViewManagersDelegateHolders") {
+      viewManagers.filterIsInstance<ViewWrapperDelegateHolder>()
+    }
+
   /**
    * Since React Native v0.55, {@link com.facebook.react.ReactPackage#createViewManagers(ReactApplicationContext)}
    * gets called only once per lifetime of {@link com.facebook.react.ReactInstanceManager}.
@@ -73,12 +87,13 @@ class KotlinInteropModuleRegistry(
    * the instance that was bound with the prop method won't be the same as the instance returned by module registry.
    * To fix that we need to update all modules holder in exported view managers.
    */
-  fun updateModuleHoldersInViewDelegates(viewDelegates: List<ViewManagerWrapperDelegate>) =
-    trace("KotlinInteropModuleRegistry.updateModuleHoldersInViewDelegates") {
-      viewDelegates
-        .forEach { delegate ->
-          delegate.moduleHolder = requireNotNull(registry.getModuleHolder(delegate.moduleHolder.name)) {
-            "Cannot update the module holder for ${delegate.moduleHolder.name}."
+  fun updateModuleHoldersInViewManagers(viewWrapperHolders: List<ViewWrapperDelegateHolder>) =
+    trace("KotlinInteropModuleRegistry.updateModuleHoldersInViewManagers") {
+      viewWrapperHolders
+        .map { it.viewWrapperDelegate }
+        .forEach { holderWrapper ->
+          holderWrapper.moduleHolder = requireNotNull(registry.getModuleHolder(holderWrapper.moduleHolder.name)) {
+            "Cannot update the module holder for ${holderWrapper.moduleHolder.name}."
           }
         }
     }

package/android/src/main/java/expo/modules/kotlin/views/AnyViewProp.kt

@@ -11,9 +11,5 @@ abstract class AnyViewProp(
 ) {
   abstract fun set(prop: Dynamic, onView: View, appContext: AppContext? = null)
 
-  abstract fun set(prop: Any?, onView: View, appContext: AppContext? = null)
-
   abstract val isNullable: Boolean
-
-  internal abstract val isStateProp: Boolean
 }

package/android/src/main/java/expo/modules/kotlin/views/ConcreteViewProp.kt

@@ -12,34 +12,16 @@ open class ConcreteViewProp<ViewType : View, PropType>(
   propType: AnyType,
   protected val setter: (view: ViewType, prop: PropType) -> Unit
 ) : AnyViewProp(name, propType) {
-  private var _isStateProp = false
-
+  @Suppress("UNCHECKED_CAST")
   override fun set(prop: Dynamic, onView: View, appContext: AppContext?) {
-    setPropDirectly(prop, onView, appContext)
-  }
-
-  override fun set(prop: Any?, onView: View, appContext: AppContext?) {
-    setPropDirectly(prop, onView, appContext)
-  }
-
-  private fun setPropDirectly(prop: Any?, onView: View, appContext: AppContext?) {
     exceptionDecorator({
       PropSetException(name, onView::class, it)
     }) {
-      @Suppress("UNCHECKED_CAST")
       setter(onView as ViewType, type.convert(prop, appContext) as PropType)
     }
   }
 
   override val isNullable: Boolean = propType.kType.isMarkedNullable
-
-  override val isStateProp: Boolean
-    get() = _isStateProp
-
-  fun asStateProp(): ConcreteViewProp<ViewType, PropType> {
-    _isStateProp = true
-    return this
-  }
 }
 
 class ConcreteViewPropWithDefault<ViewType : View, PropType>(

package/android/src/main/java/expo/modules/kotlin/views/GroupViewManagerWrapper.kt

@@ -12,7 +12,7 @@ import expo.modules.core.utilities.ifNull
 class GroupViewManagerWrapper(
   override val viewWrapperDelegate: ViewManagerWrapperDelegate
 ) : ViewGroupManager<ViewGroup>(), ViewWrapperDelegateHolder {
-  override fun getName(): String = viewWrapperDelegate.viewManagerName
+  override fun getName(): String = "ViewManagerAdapter_${viewWrapperDelegate.name}"
 
   override fun createViewInstance(reactContext: ThemedReactContext): ViewGroup =
     viewWrapperDelegate.createView(reactContext) as ViewGroup
@@ -21,7 +21,6 @@ class GroupViewManagerWrapper(
     val propsMap = props.getBackingMap()
     // Updates expo related properties.
     val handledProps = viewWrapperDelegate.updateProperties(viewToUpdate, propsMap)
-    viewWrapperDelegate.updateStateProps(viewToUpdate)
     // Updates remaining props using RN implementation.
     // To not triggered undefined setters we filtrated already handled properties.
     super.updateProperties(
@@ -40,9 +39,9 @@ class GroupViewManagerWrapper(
     props: ReactStylesDiffMap?,
     stateWrapper: StateWrapper?
   ): Any? {
-    (view as? ExpoView)?.stateWrapper = stateWrapper
-    viewWrapperDelegate.updateStateProps(view)
-    return null
+    val view = view as? ExpoView ?: return null
+    view.stateWrapper = stateWrapper
+    return super.updateState(view, props, stateWrapper)
   }
 
   override fun getNativeProps(): MutableMap<String, String> {
@@ -58,8 +57,8 @@ class GroupViewManagerWrapper(
     viewWrapperDelegate.onDestroy(view)
   }
 
-  override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any> {
-    val expoEvent = viewWrapperDelegate.getExportedCustomDirectEventTypeConstants()
+  override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any>? {
+    val expoEvent = viewWrapperDelegate.getExportedCustomDirectEventTypeConstants() ?: emptyMap()
     return super.getExportedCustomDirectEventTypeConstants()?.plus(expoEvent) ?: expoEvent
   }
 

package/android/src/main/java/expo/modules/kotlin/views/SimpleViewManagerWrapper.kt

@@ -3,14 +3,13 @@ package expo.modules.kotlin.views
 import android.view.View
 import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.SimpleViewManager
-import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.getBackingMap
 
 class SimpleViewManagerWrapper(
   override val viewWrapperDelegate: ViewManagerWrapperDelegate
 ) : SimpleViewManager<View>(), ViewWrapperDelegateHolder {
-  override fun getName(): String = viewWrapperDelegate.viewManagerName
+  override fun getName(): String = "ViewManagerAdapter_${viewWrapperDelegate.name}"
 
   override fun createViewInstance(reactContext: ThemedReactContext): View =
     viewWrapperDelegate.createView(reactContext)
@@ -19,7 +18,6 @@ class SimpleViewManagerWrapper(
     val propsMap = props.getBackingMap()
     // Updates expo related properties.
     val handledProps = viewWrapperDelegate.updateProperties(viewToUpdate, propsMap)
-    viewWrapperDelegate.updateStateProps(viewToUpdate)
     // Updates remaining props using RN implementation.
     // To not triggered undefined setters we filtrated already handled properties.
     super.updateProperties(
@@ -28,16 +26,6 @@ class SimpleViewManagerWrapper(
     )
   }
 
-  override fun updateState(
-    view: View,
-    props: ReactStylesDiffMap?,
-    stateWrapper: StateWrapper?
-  ): Any? {
-    (view as? ExpoView)?.stateWrapper = stateWrapper
-    viewWrapperDelegate.updateStateProps(view)
-    return null
-  }
-
   override fun onAfterUpdateTransaction(view: View) {
     super.onAfterUpdateTransaction(view)
     viewWrapperDelegate.onViewDidUpdateProps(view)
@@ -56,8 +44,8 @@ class SimpleViewManagerWrapper(
     viewWrapperDelegate.onDestroy(view)
   }
 
-  override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any> {
-    val expoEvent = viewWrapperDelegate.getExportedCustomDirectEventTypeConstants()
+  override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any>? {
+    val expoEvent = viewWrapperDelegate.getExportedCustomDirectEventTypeConstants() ?: emptyMap()
     return super.getExportedCustomDirectEventTypeConstants()?.plus(expoEvent) ?: expoEvent
   }
 }

package/android/src/main/java/expo/modules/kotlin/views/ViewDefinitionBuilder.kt

@@ -123,14 +123,12 @@ class ViewDefinitionBuilder<T : View>(
   inline fun <reified PropType> Prop(
     name: String,
     noinline body: (view: T, prop: PropType) -> Unit
-  ): ConcreteViewProp<T, PropType> {
-    return ConcreteViewProp(
+  ) {
+    props[name] = ConcreteViewProp(
       name,
       toAnyType<PropType>(),
       body
-    ).apply {
-      props[name] = this
-    }
+    )
   }
 
   /**
@@ -140,14 +138,12 @@ class ViewDefinitionBuilder<T : View>(
   inline fun <reified ViewType : View, reified PropType> Prop(
     name: String,
     noinline body: (view: ViewType, prop: PropType) -> Unit
-  ): ConcreteViewProp<ViewType, PropType> {
-    return ConcreteViewProp(
+  ) {
+    props[name] = ConcreteViewProp(
       name,
       toAnyType<PropType>(),
       body
-    ).apply {
-      props[name] = this
-    }
+    )
   }
 
   /**
@@ -158,15 +154,13 @@ class ViewDefinitionBuilder<T : View>(
     name: String,
     defaultValue: PropType,
     noinline body: (view: ViewType, prop: PropType) -> Unit
-  ): ConcreteViewPropWithDefault<ViewType, PropType> {
-    return ConcreteViewPropWithDefault(
+  ) {
+    props[name] = ConcreteViewPropWithDefault(
       name,
       toAnyType<PropType>(),
       body,
       defaultValue
-    ).apply {
-      props[name] = this
-    }
+    )
   }
 
   inline fun <reified ViewType : View, reified PropType, reified CustomValueType> PropGroup(