diff --git a/frameworks/core/interfaces/native/implementation/bind_sheet_utils.cpp b/frameworks/core/interfaces/native/implementation/bind_sheet_utils.cpp index ef1b762dadfb0fb1e5d0fafa02b90cb9e108dd90..ade6c73e5ac86898f76d4d9264c4a31845bd2b17 100644 --- a/frameworks/core/interfaces/native/implementation/bind_sheet_utils.cpp +++ b/frameworks/core/interfaces/native/implementation/bind_sheet_utils.cpp @@ -37,25 +37,25 @@ void BindSheetUtil::ParseLifecycleCallbacks(SheetCallbacks& callbacks, const Ark auto onAppear = Converter::OptConvert(sheetOptions.onAppear); if (onAppear) { callbacks.onAppear = [arkCallback = CallbackHelper(onAppear.value())]() { - arkCallback.Invoke(); + arkCallback.InvokeSync(); }; } auto onDisappear = Converter::OptConvert(sheetOptions.onDisappear); if (onDisappear) { callbacks.onDisappear = [arkCallback = CallbackHelper(onDisappear.value())]() { - arkCallback.Invoke(); + arkCallback.InvokeSync(); }; } auto onWillAppear = Converter::OptConvert(sheetOptions.onWillAppear); if (onWillAppear) { callbacks.onWillAppear = [arkCallback = CallbackHelper(onWillAppear.value())]() { - arkCallback.Invoke(); + arkCallback.InvokeSync(); }; } auto onWillDisappear = Converter::OptConvert(sheetOptions.onWillDisappear); if (onWillDisappear) { callbacks.onWillDisappear = [arkCallback = CallbackHelper(onWillDisappear.value())]() { - arkCallback.Invoke(); + arkCallback.InvokeSync(); }; } auto shouldDismiss = Converter::OptConvert(sheetOptions.shouldDismiss); @@ -64,13 +64,13 @@ void BindSheetUtil::ParseLifecycleCallbacks(SheetCallbacks& callbacks, const Ark Ark_SheetDismiss parameter; const auto keeper = CallbackKeeper::Claim(std::move(ViewAbstractModelStatic::DismissSheetStatic)); parameter.dismiss = keeper.ArkValue(); - arkCallback.Invoke(parameter); + arkCallback.InvokeSync(parameter); }; } auto onTypeDidChange = Converter::OptConvert(sheetOptions.onTypeDidChange); if (onTypeDidChange) { callbacks.onTypeDidChange = [arkCallback = CallbackHelper(onTypeDidChange.value())](int32_t value) { - arkCallback.Invoke(Converter::ArkValue(static_cast(value))); + arkCallback.InvokeSync(Converter::ArkValue(static_cast(value))); }; } } @@ -84,7 +84,7 @@ void BindSheetUtil::ParseFuntionalCallbacks(SheetCallbacks& callbacks, const Ark parameter.reason = OptConvert(reasonOpt).value_or(ARK_DISMISS_REASON_CLOSE_BUTTON); const auto keeper = CallbackKeeper::Claim(std::move(ViewAbstractModelStatic::DismissSheetStatic)); parameter.dismiss = keeper.ArkValue(); - arkCallback.Invoke(parameter); + arkCallback.InvokeSync(parameter); }; } auto onWillSpringBackWhenDismiss = Converter::OptConvert( @@ -94,26 +94,26 @@ void BindSheetUtil::ParseFuntionalCallbacks(SheetCallbacks& callbacks, const Ark Ark_SpringBackAction parameter; const auto keeper = CallbackKeeper::Claim(std::move(ViewAbstractModelStatic::SheetSpringBackStatic)); parameter.springBack = keeper.ArkValue(); - arkCallback.Invoke(parameter); + arkCallback.InvokeSync(parameter); }; } auto onHeightDidChange = Converter::OptConvert(sheetOptions.onHeightDidChange); if (onHeightDidChange) { callbacks.onHeightDidChange = [arkCallback = CallbackHelper(onHeightDidChange.value())](int32_t value) { - arkCallback.Invoke(Converter::ArkValue(value)); + arkCallback.InvokeSync(Converter::ArkValue(value)); }; } auto onWidthDidChange = Converter::OptConvert(sheetOptions.onWidthDidChange); if (onWidthDidChange) { callbacks.onWidthDidChange = [arkCallback = CallbackHelper(onWidthDidChange.value())](int32_t value) { - arkCallback.Invoke(Converter::ArkValue(value)); + arkCallback.InvokeSync(Converter::ArkValue(value)); }; } auto onDetentsDidChange = Converter::OptConvert(sheetOptions.onDetentsDidChange); if (onDetentsDidChange) { callbacks.onDetentsDidChange = [arkCallback = CallbackHelper(onDetentsDidChange.value())]( int32_t value) { - arkCallback.Invoke(Converter::ArkValue(value)); + arkCallback.InvokeSync(Converter::ArkValue(value)); }; } } @@ -222,28 +222,28 @@ void BindSheetUtil::ParseContentCoverCallbacks(WeakPtr weakNode, cons if (onAppearValue) { onShowCallback = [arkCallback = CallbackHelper(onAppearValue.value()), weakNode]() { PipelineContext::SetCallBackNode(weakNode); - arkCallback.Invoke(); + arkCallback.InvokeSync(); }; } auto onDisappearValue = OptConvert(options.onDisappear); if (onDisappearValue) { onDismissCallback = [arkCallback = CallbackHelper(onDisappearValue.value()), weakNode]() { PipelineContext::SetCallBackNode(weakNode); - arkCallback.Invoke(); + arkCallback.InvokeSync(); }; } auto onWillAppearValue = OptConvert(options.onWillAppear); if (onWillAppearValue) { onWillShowCallback = [arkCallback = CallbackHelper(onWillAppearValue.value()), weakNode]() { PipelineContext::SetCallBackNode(weakNode); - arkCallback.Invoke(); + arkCallback.InvokeSync(); }; } auto onWillDisappearValue = OptConvert(options.onWillDisappear); if (onWillDisappearValue) { onWillDismissCallback = [arkCallback = CallbackHelper(onWillDisappearValue.value()), weakNode]() { PipelineContext::SetCallBackNode(weakNode); - arkCallback.Invoke(); + arkCallback.InvokeSync(); }; } auto onWillDismissValue = OptConvert(options.onWillDismiss); @@ -257,7 +257,7 @@ void BindSheetUtil::ParseContentCoverCallbacks(WeakPtr weakNode, cons .value_or(ARK_DISMISS_REASON_CLOSE_BUTTON); const auto keeper = CallbackKeeper::Claim(std::move(ViewAbstractModelStatic::DismissContentCoverStatic)); parameter.dismiss = keeper.ArkValue(); - arkCallback.Invoke(parameter); + arkCallback.InvokeSync(parameter); }; } }