[Optimize][Event] Add nodeIndex to event target info

- Pass optional ElementInfo through component creation so component elements keep their nodeIndex.
- Include nodeIndex in event target payloads when an Element is available, while preserving callers that only provide an AttributeHolder.
- Keep the type-element-api package testable by declaring its TypeScript dev dependency and aligning tsconfig with existing type packages.

TEST: lynx/tools/rtf/rtf native-ut run --names lynx --target events_test_exec --gtest-filter="TouchEventHandlerTest.*" --silent
TEST: pnpm --dir lynx/js_libraries/type-element-api test

Author: rAY-ooo

core/renderer/dom/element.cc

@@ -2346,6 +2346,7 @@ lepus::Value Element::GetEventTargetInfo(bool is_core_event) {
     BASE_STATIC_STRING_DECL(kId, "id");
     BASE_STATIC_STRING_DECL(kDataset, "dataset");
     BASE_STATIC_STRING_DECL(kUid, "uid");
+    BASE_STATIC_STRING_DECL(kNodeIndex, "nodeIndex");
 
     dict.get()->SetValue(kId, data_model_->idSelector());
     auto dataset = lepus::Dictionary::Create();
@@ -2354,6 +2355,7 @@ lepus::Value Element::GetEventTargetInfo(bool is_core_event) {
     }
     dict.get()->SetValue(kDataset, std::move(dataset));
     dict.get()->SetValue(kUid, id_);
+    dict.get()->SetValue(kNodeIndex, node_index_);
   }
 
   // element ref needed in fiber element worklet

core/renderer/events/touch_event_handler.cc

@@ -1047,6 +1047,7 @@ lepus::Value TouchEventHandler::GetTargetInfo(int32_t impl_id,
     BASE_STATIC_STRING_DECL(kId, "id");
     BASE_STATIC_STRING_DECL(kDataset, "dataset");
     BASE_STATIC_STRING_DECL(kUid, "uid");
+    BASE_STATIC_STRING_DECL(kNodeIndex, "nodeIndex");
 
     dict.get()->SetValue(kId, holder->idSelector());
     auto data_set = lepus::Dictionary::Create();
@@ -1055,6 +1056,9 @@ lepus::Value TouchEventHandler::GetTargetInfo(int32_t impl_id,
     }
     dict.get()->SetValue(kDataset, std::move(data_set));
     dict.get()->SetValue(kUid, impl_id);
+    if (element != nullptr) {
+      dict.get()->SetValue(kNodeIndex, element->NodeIndex());
+    }
   }
 
   // element ref needed in fiber element worklet

core/renderer/events/touch_event_handler_unittest.cc

@@ -78,6 +78,26 @@ TEST_F(TouchEventHandlerTest, TestGetCustomEventParamName) {
   EXPECT_EQ(res2.Table().get()->Contains("params"), true);
 }
 
+TEST_F(TouchEventHandlerTest, TestGetTargetInfoNodeIndex) {
+  auto holder = fml::MakeRefCounted<AttributeHolder>();
+  holder->SetIdSelector(base::String("target"));
+
+  lepus::Value target_info_without_element =
+      TouchEventHandler::GetTargetInfo(11, holder.get());
+  ASSERT_TRUE(target_info_without_element.IsObject());
+  EXPECT_FALSE(target_info_without_element.Table()->Contains("nodeIndex"));
+
+  base::String tag("view");
+  auto element =
+      tasm_->page_proxy()->element_manager()->CreateFiberElement(tag);
+  element->SetNodeIndex(42);
+  lepus::Value target_info_with_element = TouchEventHandler::GetTargetInfo(
+      element->impl_id(), element->data_model(), element.get());
+  ASSERT_TRUE(target_info_with_element.IsObject());
+  EXPECT_EQ(target_info_with_element.Table()->GetValue("nodeIndex").Number(),
+            42);
+}
+
 TEST_F(TouchEventHandlerTest, TestHandleTriggerComponentEvent0) {
   touch_event_handler_->HandleTriggerComponentEvent(nullptr, "xxxx",
                                                     lepus::Value());
@@ -114,8 +134,10 @@ TEST_F(TouchEventHandlerTest, TestHandleTriggerComponentEvent2) {
   touch_event_handler_->HandleTriggerComponentEvent(tasm_.get(), "xxxx", obj);
   EXPECT_EQ(delegate_->DumpDelegate(),
             "SendPageEvent  onXXXX "
-            "{\"currentTarget\":{\"dataset\":{},\"id\":\"\"},\"detail\":null,"
-            "\"target\":{\"dataset\":{},\"id\":\"\"},\"type\":\"xxxx\"}\n");
+            "{\"currentTarget\":{\"dataset\":{},\"id\":\"\",\"nodeIndex\":1},"
+            "\"detail\":null,"
+            "\"target\":{\"dataset\":{},\"id\":\"\",\"nodeIndex\":1},\"type\":"
+            "\"xxxx\"}\n");
 }
 
 TEST_F(TouchEventHandlerTest, TestHandleTriggerComponentEvent3) {

core/runtime/lepus/bindings/renderer_functions.cc

@@ -2667,8 +2667,6 @@ RENDERER_FUNCTION_CC(FiberCreateComponent) {
   CONVERT_ARG_AND_CHECK_FOR_ELEMENT_API(arg3, 3, String, FiberCreateComponent);
   CONVERT_ARG_AND_CHECK_FOR_ELEMENT_API(arg4, 4, String, FiberCreateComponent);
   CONVERT_ARG_AND_CHECK_FOR_ELEMENT_API(arg5, 5, String, FiberCreateComponent);
-  CONVERT_ARG(arg6, 6);
-
   auto* self = GET_TASM_POINTER();
   auto& manager = self->page_proxy()->element_manager();
   const auto& parent_component_unique_id = static_cast<int64_t>(arg0->Number());
@@ -2688,21 +2686,35 @@ RENDERER_FUNCTION_CC(FiberCreateComponent) {
   component_element->set_style_sheet_manager(
       self->style_sheet_manager(entry_name_str));
 
-  if (argc >= 7 && arg6->IsObject()) {
-    if (arg6->GetProperty(BASE_STATIC_STRING(kRemoveComponentElement))
-            .IsTrue()) {
-      component_element->MarkAsWrapperComponent();
+  if (argc >= 7) {
+    CONVERT_ARG(arg6, 6);
+    if (arg6->IsObject()) {
+      if (arg6->GetProperty(BASE_STATIC_STRING(kRemoveComponentElement))
+              .IsTrue()) {
+        component_element->MarkAsWrapperComponent();
+      }
+      // TODO(zhouzhitao): Currently, the Component Element is non-standard, and
+      // in fact, TTML is given a non-standard behavior based on this
+      // non-standard Component Element. In the future, the Component Element is
+      // expected to be gradually deprecated, and TTML should also migrate to
+      // the standard API. Therefore, for now, this logic will not be added to
+      // SetConfig; the standard behavior should be a combination of the two
+      // PAPIs.
+      if (arg6->GetProperty(BASE_STATIC_STRING(kIsAsyncFlushRoot)).IsTrue()) {
+        component_element->MarkAsyncFlushRoot(true);
+      }
+      component_element->SetConfig(arg6->ToLepusValue());
     }
-    // TODO(zhouzhitao): Currently, the Component Element is non-standard, and
-    // in fact, TTML is given a non-standard behavior based on this non-standard
-    // Component Element. In the future, the Component Element is expected to be
-    // gradually deprecated, and TTML should also migrate to the standard API.
-    // Therefore, for now, this logic will not be added to SetConfig; the
-    // standard behavior should be a combination of the two PAPIs.
-    if (arg6->GetProperty(BASE_STATIC_STRING(kIsAsyncFlushRoot)).IsTrue()) {
-      component_element->MarkAsyncFlushRoot(true);
+  }
+
+  if (argc >= 8) {
+    CONVERT_ARG(arg7, 7);
+    if (arg7->IsObject()) {
+      const auto& nid = arg7->GetProperty(BASE_STATIC_STRING(kNodeIndex));
+      if (nid.IsNumber()) {
+        component_element->SetNodeIndex(nid.Number());
+      }
     }
-    component_element->SetConfig(arg6->ToLepusValue());
   }
 
   ON_NODE_CREATE(component_element);

js_libraries/type-element-api/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.0.8
+
+### Patch Changes
+
+- Add ElementInfo for `__CreateComponent` API.
+
 ## 0.0.7
 
 ### Patch Changes

js_libraries/type-element-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lynx-js/type-element-api",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "Type definitions for all Element PAPI provided by the Lynx team, used to improve Element PAPI support in your framework.",
   "keywords": ["element-api" , "types"],
   "repository": {
@@ -25,6 +25,7 @@
   ],
   "dependencies": {},
   "devDependencies": {
+    "typescript": "5.8.3",
     "tsd": "0.30.4",
     "vitest": "2.1.9"
   }

js_libraries/type-element-api/test/index.test-d.ts

@@ -52,6 +52,9 @@ describe('Test Element API Types', () => {
 
   it('should have correct global functions available', () => {
     expectTypeOf<typeof __CreatePage>().toBeFunction();
+    expectTypeOf<typeof __CreateComponent>().toBeFunction();
+    expectTypeOf<typeof __CreateComponent>().toBeCallableWith(1, 'component-id', 2, '', 'component-name', 'component/path');
+    expectTypeOf<typeof __CreateComponent>().toBeCallableWith(1, 'component-id', 2, '', 'component-name', 'component/path', {}, { nodeIndex: 42 });
     expectTypeOf<typeof __CreateView>().toBeFunction();
     expectTypeOf<typeof __CreateText>().toBeFunction();
     expectTypeOf<typeof __ElementAnimate>().toBeFunction();

js_libraries/type-element-api/tsconfig.json

@@ -6,7 +6,7 @@
     "strict": true,
     "outDir": "lib",
     "typeRoots": ["./node_modules/@types", "./types"],
-    "types": ["./types/index"],
+    "types": [],
     "jsx": "preserve",
     "module": "esnext",
     "moduleResolution": "Node",

js_libraries/type-element-api/types/element-api.d.ts

@@ -148,7 +148,8 @@ declare global {
     entryName: string,
     name: string,
     path: string,
-    config?: Record<string, unknown>
+    config?: Record<string, unknown>,
+    info?: ElementInfo,
   ): ComponentElementRef;
 
   function __CreateView(parentComponentUniId: number, info?: ElementInfo): ViewElementRef;