Hi guys, this is regarding this PR. Want your suggestions. More info in the thread

sure, let me see 👍

Based on PR comments I have made the following changes:

inline fun <reified T : ViewModel> viewModel(
    qualifier: Qualifier? = null,
    owner: ViewModelStoreOwner? = null,
    scope: Scope = GlobalContext.get().scopeRegistry.rootScope,
    noinline parameters: ParametersDefinition? = null,
): Lazy<T> {
    val storeOwner = owner?.let { ViewModelOwner.fromCompose(it) } ?: getComposeViewModelOwner()
    val state = (owner as? NavBackStackEntry)?.arguments ?: storeOwner.defaultArgs
    return remember(qualifier, parameters) {
        ViewModelLazy(T::class, { storeOwner.storeOwner.viewModelStore }){
            getViewModelFactory<T>(
                owner = {storeOwner},
                qualifier = qualifier,
                parameters = parameters,
                scope = scope,
                state = state?.let { {it} } ?: emptyState()
            )
        }
    }
}

fun getComposeViewModelOwner(): ViewModelOwner {
    return ViewModelOwner.fromCompose(
        LocalViewModelStoreOwner.current!!,
        LocalSavedStateRegistryOwner.current
    )
}

fun ViewModelOwner.Companion.fromCompose(
    storeOwner: ViewModelStoreOwner,
    stateRegistry: SavedStateRegistryOwner? = null
) = ViewModelOwner(
    storeOwner = storeOwner,
    stateRegistry = stateRegistry,
    defaultArgs = (storeOwner as? NavBackStackEntry)?.arguments
)

fun ViewModelOwner.Companion.fromCompose(
    storeOwner: ViewModelStoreOwner
) = ViewModelOwner(
    storeOwner = storeOwner,
    defaultArgs = (storeOwner as? NavBackStackEntry)?.arguments
)

But

ViewModelOwner

will be deprecated next? If so, what should I use?

I believe in 3.2, I need to clean up the way we are composing all of this. With 3.1.6 patch, it brings things closer to last Google VM API

Will be waiting for your reply/changes to proceed 🙏