Remove getInspectorDataForInstance#48335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
javache wants to merge 1 commit into from
Closed

Remove getInspectorDataForInstance #48335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/react-native/ReactAndroid/api/ReactAndroid.api
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2595,7 +2595,6 @@ public class com/facebook/react/fabric/FabricUIManager : com/facebook/react/brid
public fun dispatchCommand (ILjava/lang/String;Lcom/facebook/react/bridge/ReadableArray;)V
public fun getColor (I[Ljava/lang/String;)I
public fun getEventDispatcher ()Lcom/facebook/react/uimanager/events/EventDispatcher;
public fun getInspectorDataForInstance (ILandroid/view/View;)Lcom/facebook/react/bridge/ReadableMap;
public fun getPerformanceCounters ()Ljava/util/Map;
public fun getThemeData (I[F)Z
public fun initialize ()V
Expand Down
23 changes: 0 additions & 23 deletions ...es/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -257,29 +257,6 @@ public <T extends View> int addRootView(final T rootView, final WritableMap init
return rootTag;
}

/**
* This API returns metadata associated to the React Component that rendered the Android View
* received as a parameter.
*
* @param surfaceId {@link int} that represents the surfaceId for the View received as a
* parameter. In practice surfaceId can be retrieved calling the {@link View#getId()} method
* on the {@link ReactRoot} that holds the View received as a second parameter.
* @param view {@link View} view that will be used to retrieve the React view hierarchy metadata.
* @return a {@link ReadableMap} that contains metadata associated to the React Component that
* rendered the Android View received as a parameter. For more details about the keys stored
* in the {@link ReadableMap} refer to the "getInspectorDataForInstance" method from
* jni/react/fabric/Binding.cpp file.
*/
@UiThread
@ThreadConfined(UI)
public ReadableMap getInspectorDataForInstance(final int surfaceId, final View view) {
UiThreadUtil.assertOnUiThread();
int reactTag = view.getId();

EventEmitterWrapper eventEmitter = mMountingManager.getEventEmitter(surfaceId, reactTag);
return mBinding.getInspectorDataForInstance(eventEmitter);
}

@Override
@AnyThread
@ThreadConfined(ANY)
Expand Down
6 changes: 0 additions & 6 deletions ...act-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerBinding.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,12 +11,10 @@ import android.annotation.SuppressLint
import com.facebook.jni.HybridClassBase
import com.facebook.proguard.annotations.DoNotStrip
import com.facebook.react.bridge.NativeMap
import com.facebook.react.bridge.ReadableNativeMap
import com.facebook.react.bridge.RuntimeExecutor
import com.facebook.react.bridge.RuntimeScheduler
import com.facebook.react.common.mapbuffer.MapBufferSoLoader
import com.facebook.react.fabric.events.EventBeatManager
import com.facebook.react.fabric.events.EventEmitterWrapper
import com.facebook.react.uimanager.PixelUtil.getDisplayMetricDensity

@DoNotStrip
Expand DownExpand Up@@ -82,10 +80,6 @@ internal class FabricUIManagerBinding : HybridClassBase() {

public external fun reportMount(surfaceId: Int)

public external fun getInspectorDataForInstance(
eventEmitterWrapper: EventEmitterWrapper?
): ReadableNativeMap?

public fun register(
runtimeExecutor: RuntimeExecutor,
runtimeScheduler: RuntimeScheduler,
Expand Down
30 changes: 0 additions & 30 deletions packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,33 +44,6 @@ std::shared_ptr<Scheduler> FabricUIManagerBinding::getScheduler() {
return scheduler_;
}

jni::local_ref<ReadableNativeMap::jhybridobject>
FabricUIManagerBinding::getInspectorDataForInstance(
jni::alias_ref<EventEmitterWrapper::javaobject> eventEmitterWrapper) {
auto scheduler = getScheduler();
if (!scheduler) {
LOG(ERROR) << "FabricUIManagerBinding::startSurface: scheduler disappeared";
return ReadableNativeMap::newObjectCxxArgs(folly::dynamic::object());
}

EventEmitterWrapper* cEventEmitter = cthis(eventEmitterWrapper);
InspectorData data =
scheduler->getInspectorDataForInstance(*cEventEmitter->eventEmitter);

folly::dynamic result = folly::dynamic::object;
result["fileName"] = data.fileName;
result["lineNumber"] = data.lineNumber;
result["columnNumber"] = data.columnNumber;
result["selectedIndex"] = data.selectedIndex;
result["props"] = data.props;
auto hierarchy = folly::dynamic::array();
for (const auto& hierarchyItem : data.hierarchy) {
hierarchy.push_back(hierarchyItem);
}
result["hierarchy"] = hierarchy;
return ReadableNativeMap::newObjectCxxArgs(result);
}

void FabricUIManagerBinding::setPixelDensity(float pointScaleFactor) {
pointScaleFactor_ = pointScaleFactor;
}
Expand DownExpand Up@@ -661,9 +634,6 @@ void FabricUIManagerBinding::registerNatives() {
"installFabricUIManager",
FabricUIManagerBinding::installFabricUIManager),
makeNativeMethod("startSurface", FabricUIManagerBinding::startSurface),
makeNativeMethod(
"getInspectorDataForInstance",
FabricUIManagerBinding::getInspectorDataForInstance),
makeNativeMethod(
"startSurfaceWithConstraints",
FabricUIManagerBinding::startSurfaceWithConstraints),
Expand Down
3 changes: 0 additions & 3 deletions packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,9 +57,6 @@ class FabricUIManagerBinding : public jni::HybridClass<FabricUIManagerBinding>,
jboolean isRTL,
jboolean doLeftAndRightSwapInRTL);

jni::local_ref<ReadableNativeMap::jhybridobject> getInspectorDataForInstance(
jni::alias_ref<EventEmitterWrapper::javaobject> eventEmitterWrapper);

static void initHybrid(jni::alias_ref<jhybridobject> jobj);

void installFabricUIManager(
Expand Down
31 changes: 0 additions & 31 deletions packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -216,37 +216,6 @@ void Scheduler::registerSurface(
surfaceHandler.setUIManager(uiManager_.get());
}

InspectorData Scheduler::getInspectorDataForInstance(
const EventEmitter& eventEmitter) const noexcept {
return executeSynchronouslyOnSameThread_CAN_DEADLOCK<InspectorData>(
runtimeExecutor_, [=](jsi::Runtime& runtime) -> InspectorData {
auto uiManagerBinding = UIManagerBinding::getBinding(runtime);
auto value = uiManagerBinding->getInspectorDataForInstance(
runtime, eventEmitter);

// TODO T97216348: avoid transforming jsi into folly::dynamic
auto dynamic = jsi::dynamicFromValue(runtime, value);
auto source = dynamic["source"];

InspectorData result = {};
result.fileName =
source["fileName"].isNull() ? "" : source["fileName"].c_str();
result.lineNumber = (int)source["lineNumber"].getDouble();
result.columnNumber = (int)source["columnNumber"].getDouble();
result.selectedIndex = (int)dynamic["selectedIndex"].getDouble();
// TODO T97216348: remove folly::dynamic from InspectorData struct
result.props = dynamic["props"];
auto hierarchy = dynamic["hierarchy"];
for (auto& i : hierarchy) {
auto viewHierarchyValue = i["name"];
if (!viewHierarchyValue.isNull()) {
result.hierarchy.emplace_back(viewHierarchyValue.c_str());
}
}
return result;
});
}

void Scheduler::unregisterSurface(
const SurfaceHandler& surfaceHandler) const noexcept {
surfaceHandler.setUIManager(nullptr);
Expand Down
3 changes: 0 additions & 3 deletions packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,9 +52,6 @@ class Scheduler final : public UIManagerDelegate {
void registerSurface(const SurfaceHandler& surfaceHandler) const noexcept;
void unregisterSurface(const SurfaceHandler& surfaceHandler) const noexcept;

InspectorData getInspectorDataForInstance(
const EventEmitter& eventEmitter) const noexcept;

/*
* This is broken. Please do not use.
* `ComponentDescriptor`s are not designed to be used outside of `UIManager`,
Expand Down
27 changes: 0 additions & 27 deletions packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,33 +62,6 @@ UIManagerBinding::~UIManagerBinding() {
<< this << ").";
}

jsi::Value UIManagerBinding::getInspectorDataForInstance(
jsi::Runtime& runtime,
const EventEmitter& eventEmitter) const {
auto eventTarget = eventEmitter.eventTarget_;
EventEmitter::DispatchMutex().lock();

if (!runtime.global().hasProperty(runtime, "__fbBatchedBridge") ||
!eventTarget) {
return jsi::Value::undefined();
}

eventTarget->retain(runtime);
auto instanceHandle = eventTarget->getInstanceHandle(runtime);
eventTarget->release(runtime);
EventEmitter::DispatchMutex().unlock();

if (instanceHandle.isUndefined()) {
return jsi::Value::undefined();
}

return callMethodOfModule(
runtime,
"ReactFabric",
"getInspectorDataForInstance",
{std::move(instanceHandle)});
}

void UIManagerBinding::dispatchEvent(
jsi::Runtime& runtime,
const EventTarget* eventTarget,
Expand Down
4 changes: 0 additions & 4 deletions packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,10 +40,6 @@ class UIManagerBinding : public jsi::HostObject {

~UIManagerBinding() override;

jsi::Value getInspectorDataForInstance(
jsi::Runtime& runtime,
const EventEmitter& eventEmitter) const;

/*
* Delivers raw event data to JavaScript.
* Thread synchronization must be enforced externally.
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Remove getInspectorDataForInstance#48335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

javache
wants to merge
1
commit into

from

 Closed


Remove getInspectorDataForInstance
#48335
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
packages/react-native/ReactAndroid/api/ReactAndroid.api

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2595,7 +2595,6 @@ public class com/facebook/react/fabric/FabricUIManager : com/facebook/react/brid
	public fun dispatchCommand (ILjava/lang/String;Lcom/facebook/react/bridge/ReadableArray;)V
	public fun getColor (I[Ljava/lang/String;)I
	public fun getEventDispatcher ()Lcom/facebook/react/uimanager/events/EventDispatcher;
	public fun getInspectorDataForInstance (ILandroid/view/View;)Lcom/facebook/react/bridge/ReadableMap;
	public fun getPerformanceCounters ()Ljava/util/Map;
	public fun getThemeData (I[F)Z
	public fun initialize ()V
Expand Down

23 changes: 0 additions & 23 deletions
...es/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,29 +257,6 @@ public <T extends View> int addRootView(final T rootView, final WritableMap init
 return rootTag;
 }

 /**
 * This API returns metadata associated to the React Component that rendered the Android View
 * received as a parameter.
 *
 * @param surfaceId {@link int} that represents the surfaceId for the View received as a
 * parameter. In practice surfaceId can be retrieved calling the {@link View#getId()} method
 * on the {@link ReactRoot} that holds the View received as a second parameter.
 * @param view {@link View} view that will be used to retrieve the React view hierarchy metadata.
 * @return a {@link ReadableMap} that contains metadata associated to the React Component that
 * rendered the Android View received as a parameter. For more details about the keys stored
 * in the {@link ReadableMap} refer to the "getInspectorDataForInstance" method from
 * jni/react/fabric/Binding.cpp file.
 */
 @UiThread
 @ThreadConfined(UI)
 public ReadableMap getInspectorDataForInstance(final int surfaceId, final View view) {
 UiThreadUtil.assertOnUiThread();
 int reactTag = view.getId();

 EventEmitterWrapper eventEmitter = mMountingManager.getEventEmitter(surfaceId, reactTag);
 return mBinding.getInspectorDataForInstance(eventEmitter);
 }

 @Override
 @AnyThread
 @ThreadConfined(ANY)
Expand Down

6 changes: 0 additions & 6 deletions
...act-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerBinding.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,12 +11,10 @@ import android.annotation.SuppressLint
import com.facebook.jni.HybridClassBase
import com.facebook.proguard.annotations.DoNotStrip
import com.facebook.react.bridge.NativeMap
import com.facebook.react.bridge.ReadableNativeMap
import com.facebook.react.bridge.RuntimeExecutor
import com.facebook.react.bridge.RuntimeScheduler
import com.facebook.react.common.mapbuffer.MapBufferSoLoader
import com.facebook.react.fabric.events.EventBeatManager
import com.facebook.react.fabric.events.EventEmitterWrapper
import com.facebook.react.uimanager.PixelUtil.getDisplayMetricDensity

@DoNotStrip
Expand DownExpand Up@@ -82,10 +80,6 @@ internal class FabricUIManagerBinding : HybridClassBase() {

 public external fun reportMount(surfaceId: Int)

 public external fun getInspectorDataForInstance(
 eventEmitterWrapper: EventEmitterWrapper?
 ): ReadableNativeMap?

 public fun register(
 runtimeExecutor: RuntimeExecutor,
 runtimeScheduler: RuntimeScheduler,
Expand Down

30 changes: 0 additions & 30 deletions
packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,33 +44,6 @@ std::shared_ptr<Scheduler> FabricUIManagerBinding::getScheduler() {
 return scheduler_;
}

jni::local_ref<ReadableNativeMap::jhybridobject>
FabricUIManagerBinding::getInspectorDataForInstance(
 jni::alias_ref<EventEmitterWrapper::javaobject> eventEmitterWrapper) {
 auto scheduler = getScheduler();
 if (!scheduler) {
 LOG(ERROR) << "FabricUIManagerBinding::startSurface: scheduler disappeared";
 return ReadableNativeMap::newObjectCxxArgs(folly::dynamic::object());
 }

 EventEmitterWrapper* cEventEmitter = cthis(eventEmitterWrapper);
 InspectorData data =
 scheduler->getInspectorDataForInstance(*cEventEmitter->eventEmitter);

 folly::dynamic result = folly::dynamic::object;
 result["fileName"] = data.fileName;
 result["lineNumber"] = data.lineNumber;
 result["columnNumber"] = data.columnNumber;
 result["selectedIndex"] = data.selectedIndex;
 result["props"] = data.props;
 auto hierarchy = folly::dynamic::array();
 for (const auto& hierarchyItem : data.hierarchy) {
 hierarchy.push_back(hierarchyItem);
 }
 result["hierarchy"] = hierarchy;
 return ReadableNativeMap::newObjectCxxArgs(result);
}

void FabricUIManagerBinding::setPixelDensity(float pointScaleFactor) {
 pointScaleFactor_ = pointScaleFactor;
}
Expand DownExpand Up@@ -661,9 +634,6 @@ void FabricUIManagerBinding::registerNatives() {
 "installFabricUIManager",
 FabricUIManagerBinding::installFabricUIManager),
 makeNativeMethod("startSurface", FabricUIManagerBinding::startSurface),
 makeNativeMethod(
 "getInspectorDataForInstance",
 FabricUIManagerBinding::getInspectorDataForInstance),
 makeNativeMethod(
 "startSurfaceWithConstraints",
 FabricUIManagerBinding::startSurfaceWithConstraints),
Expand Down

3 changes: 0 additions & 3 deletions
packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,9 +57,6 @@ class FabricUIManagerBinding : public jni::HybridClass<FabricUIManagerBinding>,
 jboolean isRTL,
 jboolean doLeftAndRightSwapInRTL);

 jni::local_ref<ReadableNativeMap::jhybridobject> getInspectorDataForInstance(
 jni::alias_ref<EventEmitterWrapper::javaobject> eventEmitterWrapper);

 static void initHybrid(jni::alias_ref<jhybridobject> jobj);

 void installFabricUIManager(
Expand Down

31 changes: 0 additions & 31 deletions
packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -216,37 +216,6 @@ void Scheduler::registerSurface(
 surfaceHandler.setUIManager(uiManager_.get());
}

InspectorData Scheduler::getInspectorDataForInstance(
 const EventEmitter& eventEmitter) const noexcept {
 return executeSynchronouslyOnSameThread_CAN_DEADLOCK<InspectorData>(
 runtimeExecutor_, [=](jsi::Runtime& runtime) -> InspectorData {
 auto uiManagerBinding = UIManagerBinding::getBinding(runtime);
 auto value = uiManagerBinding->getInspectorDataForInstance(
 runtime, eventEmitter);

 // TODO T97216348: avoid transforming jsi into folly::dynamic
 auto dynamic = jsi::dynamicFromValue(runtime, value);
 auto source = dynamic["source"];

 InspectorData result = {};
 result.fileName =
 source["fileName"].isNull() ? "" : source["fileName"].c_str();
 result.lineNumber = (int)source["lineNumber"].getDouble();
 result.columnNumber = (int)source["columnNumber"].getDouble();
 result.selectedIndex = (int)dynamic["selectedIndex"].getDouble();
 // TODO T97216348: remove folly::dynamic from InspectorData struct
 result.props = dynamic["props"];
 auto hierarchy = dynamic["hierarchy"];
 for (auto& i : hierarchy) {
 auto viewHierarchyValue = i["name"];
 if (!viewHierarchyValue.isNull()) {
 result.hierarchy.emplace_back(viewHierarchyValue.c_str());
 }
 }
 return result;
 });
}

void Scheduler::unregisterSurface(
 const SurfaceHandler& surfaceHandler) const noexcept {
 surfaceHandler.setUIManager(nullptr);
Expand Down

3 changes: 0 additions & 3 deletions
packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,9 +52,6 @@ class Scheduler final : public UIManagerDelegate {
 void registerSurface(const SurfaceHandler& surfaceHandler) const noexcept;
 void unregisterSurface(const SurfaceHandler& surfaceHandler) const noexcept;

 InspectorData getInspectorDataForInstance(
 const EventEmitter& eventEmitter) const noexcept;

 /*
 * This is broken. Please do not use.
 * `ComponentDescriptor`s are not designed to be used outside of `UIManager`,
Expand Down

27 changes: 0 additions & 27 deletions
packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,33 +62,6 @@ UIManagerBinding::~UIManagerBinding() {
 << this << ").";
}

jsi::Value UIManagerBinding::getInspectorDataForInstance(
 jsi::Runtime& runtime,
 const EventEmitter& eventEmitter) const {
 auto eventTarget = eventEmitter.eventTarget_;
 EventEmitter::DispatchMutex().lock();

 if (!runtime.global().hasProperty(runtime, "__fbBatchedBridge") ||
 !eventTarget) {
 return jsi::Value::undefined();
 }

 eventTarget->retain(runtime);
 auto instanceHandle = eventTarget->getInstanceHandle(runtime);
 eventTarget->release(runtime);
 EventEmitter::DispatchMutex().unlock();

 if (instanceHandle.isUndefined()) {
 return jsi::Value::undefined();
 }

 return callMethodOfModule(
 runtime,
 "ReactFabric",
 "getInspectorDataForInstance",
 {std::move(instanceHandle)});
}

void UIManagerBinding::dispatchEvent(
 jsi::Runtime& runtime,
 const EventTarget* eventTarget,
Expand Down

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,10 +40,6 @@ class UIManagerBinding : public jsi::HostObject {

 ~UIManagerBinding() override;

 jsi::Value getInspectorDataForInstance(
 jsi::Runtime& runtime,
 const EventEmitter& eventEmitter) const;

 /*
 * Delivers raw event data to JavaScript.
 * Thread synchronization must be enforced externally.
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove getInspectorDataForInstance#48335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

javache
wants to merge
1
commit into

from

 Closed


Remove getInspectorDataForInstance
#48335
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
packages/react-native/ReactAndroid/api/ReactAndroid.api

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2595,7 +2595,6 @@ public class com/facebook/react/fabric/FabricUIManager : com/facebook/react/brid
	public fun dispatchCommand (ILjava/lang/String;Lcom/facebook/react/bridge/ReadableArray;)V
	public fun getColor (I[Ljava/lang/String;)I
	public fun getEventDispatcher ()Lcom/facebook/react/uimanager/events/EventDispatcher;
	public fun getInspectorDataForInstance (ILandroid/view/View;)Lcom/facebook/react/bridge/ReadableMap;
	public fun getPerformanceCounters ()Ljava/util/Map;
	public fun getThemeData (I[F)Z
	public fun initialize ()V
Expand Down

23 changes: 0 additions & 23 deletions
...es/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,29 +257,6 @@ public <T extends View> int addRootView(final T rootView, final WritableMap init
 return rootTag;
 }

 /**
 * This API returns metadata associated to the React Component that rendered the Android View
 * received as a parameter.
 *
 * @param surfaceId {@link int} that represents the surfaceId for the View received as a
 * parameter. In practice surfaceId can be retrieved calling the {@link View#getId()} method
 * on the {@link ReactRoot} that holds the View received as a second parameter.
 * @param view {@link View} view that will be used to retrieve the React view hierarchy metadata.
 * @return a {@link ReadableMap} that contains metadata associated to the React Component that
 * rendered the Android View received as a parameter. For more details about the keys stored
 * in the {@link ReadableMap} refer to the "getInspectorDataForInstance" method from
 * jni/react/fabric/Binding.cpp file.
 */
 @UiThread
 @ThreadConfined(UI)
 public ReadableMap getInspectorDataForInstance(final int surfaceId, final View view) {
 UiThreadUtil.assertOnUiThread();
 int reactTag = view.getId();

 EventEmitterWrapper eventEmitter = mMountingManager.getEventEmitter(surfaceId, reactTag);
 return mBinding.getInspectorDataForInstance(eventEmitter);
 }

 @Override
 @AnyThread
 @ThreadConfined(ANY)
Expand Down

6 changes: 0 additions & 6 deletions
...act-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerBinding.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,12 +11,10 @@ import android.annotation.SuppressLint
import com.facebook.jni.HybridClassBase
import com.facebook.proguard.annotations.DoNotStrip
import com.facebook.react.bridge.NativeMap
import com.facebook.react.bridge.ReadableNativeMap
import com.facebook.react.bridge.RuntimeExecutor
import com.facebook.react.bridge.RuntimeScheduler
import com.facebook.react.common.mapbuffer.MapBufferSoLoader
import com.facebook.react.fabric.events.EventBeatManager
import com.facebook.react.fabric.events.EventEmitterWrapper
import com.facebook.react.uimanager.PixelUtil.getDisplayMetricDensity

@DoNotStrip
Expand DownExpand Up@@ -82,10 +80,6 @@ internal class FabricUIManagerBinding : HybridClassBase() {

 public external fun reportMount(surfaceId: Int)

 public external fun getInspectorDataForInstance(
 eventEmitterWrapper: EventEmitterWrapper?
 ): ReadableNativeMap?

 public fun register(
 runtimeExecutor: RuntimeExecutor,
 runtimeScheduler: RuntimeScheduler,
Expand Down

30 changes: 0 additions & 30 deletions
packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,33 +44,6 @@ std::shared_ptr<Scheduler> FabricUIManagerBinding::getScheduler() {
 return scheduler_;
}

jni::local_ref<ReadableNativeMap::jhybridobject>
FabricUIManagerBinding::getInspectorDataForInstance(
 jni::alias_ref<EventEmitterWrapper::javaobject> eventEmitterWrapper) {
 auto scheduler = getScheduler();
 if (!scheduler) {
 LOG(ERROR) << "FabricUIManagerBinding::startSurface: scheduler disappeared";
 return ReadableNativeMap::newObjectCxxArgs(folly::dynamic::object());
 }

 EventEmitterWrapper* cEventEmitter = cthis(eventEmitterWrapper);
 InspectorData data =
 scheduler->getInspectorDataForInstance(*cEventEmitter->eventEmitter);

 folly::dynamic result = folly::dynamic::object;
 result["fileName"] = data.fileName;
 result["lineNumber"] = data.lineNumber;
 result["columnNumber"] = data.columnNumber;
 result["selectedIndex"] = data.selectedIndex;
 result["props"] = data.props;
 auto hierarchy = folly::dynamic::array();
 for (const auto& hierarchyItem : data.hierarchy) {
 hierarchy.push_back(hierarchyItem);
 }
 result["hierarchy"] = hierarchy;
 return ReadableNativeMap::newObjectCxxArgs(result);
}

void FabricUIManagerBinding::setPixelDensity(float pointScaleFactor) {
 pointScaleFactor_ = pointScaleFactor;
}
Expand DownExpand Up@@ -661,9 +634,6 @@ void FabricUIManagerBinding::registerNatives() {
 "installFabricUIManager",
 FabricUIManagerBinding::installFabricUIManager),
 makeNativeMethod("startSurface", FabricUIManagerBinding::startSurface),
 makeNativeMethod(
 "getInspectorDataForInstance",
 FabricUIManagerBinding::getInspectorDataForInstance),
 makeNativeMethod(
 "startSurfaceWithConstraints",
 FabricUIManagerBinding::startSurfaceWithConstraints),
Expand Down

3 changes: 0 additions & 3 deletions
packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,9 +57,6 @@ class FabricUIManagerBinding : public jni::HybridClass<FabricUIManagerBinding>,
 jboolean isRTL,
 jboolean doLeftAndRightSwapInRTL);

 jni::local_ref<ReadableNativeMap::jhybridobject> getInspectorDataForInstance(
 jni::alias_ref<EventEmitterWrapper::javaobject> eventEmitterWrapper);

 static void initHybrid(jni::alias_ref<jhybridobject> jobj);

 void installFabricUIManager(
Expand Down

31 changes: 0 additions & 31 deletions
packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -216,37 +216,6 @@ void Scheduler::registerSurface(
 surfaceHandler.setUIManager(uiManager_.get());
}

InspectorData Scheduler::getInspectorDataForInstance(
 const EventEmitter& eventEmitter) const noexcept {
 return executeSynchronouslyOnSameThread_CAN_DEADLOCK<InspectorData>(
 runtimeExecutor_, [=](jsi::Runtime& runtime) -> InspectorData {
 auto uiManagerBinding = UIManagerBinding::getBinding(runtime);
 auto value = uiManagerBinding->getInspectorDataForInstance(
 runtime, eventEmitter);

 // TODO T97216348: avoid transforming jsi into folly::dynamic
 auto dynamic = jsi::dynamicFromValue(runtime, value);
 auto source = dynamic["source"];

 InspectorData result = {};
 result.fileName =
 source["fileName"].isNull() ? "" : source["fileName"].c_str();
 result.lineNumber = (int)source["lineNumber"].getDouble();
 result.columnNumber = (int)source["columnNumber"].getDouble();
 result.selectedIndex = (int)dynamic["selectedIndex"].getDouble();
 // TODO T97216348: remove folly::dynamic from InspectorData struct
 result.props = dynamic["props"];
 auto hierarchy = dynamic["hierarchy"];
 for (auto& i : hierarchy) {
 auto viewHierarchyValue = i["name"];
 if (!viewHierarchyValue.isNull()) {
 result.hierarchy.emplace_back(viewHierarchyValue.c_str());
 }
 }
 return result;
 });
}

void Scheduler::unregisterSurface(
 const SurfaceHandler& surfaceHandler) const noexcept {
 surfaceHandler.setUIManager(nullptr);
Expand Down

3 changes: 0 additions & 3 deletions
packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,9 +52,6 @@ class Scheduler final : public UIManagerDelegate {
 void registerSurface(const SurfaceHandler& surfaceHandler) const noexcept;
 void unregisterSurface(const SurfaceHandler& surfaceHandler) const noexcept;

 InspectorData getInspectorDataForInstance(
 const EventEmitter& eventEmitter) const noexcept;

 /*
 * This is broken. Please do not use.
 * `ComponentDescriptor`s are not designed to be used outside of `UIManager`,
Expand Down

27 changes: 0 additions & 27 deletions
packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,33 +62,6 @@ UIManagerBinding::~UIManagerBinding() {
 << this << ").";
}

jsi::Value UIManagerBinding::getInspectorDataForInstance(
 jsi::Runtime& runtime,
 const EventEmitter& eventEmitter) const {
 auto eventTarget = eventEmitter.eventTarget_;
 EventEmitter::DispatchMutex().lock();

 if (!runtime.global().hasProperty(runtime, "__fbBatchedBridge") ||
 !eventTarget) {
 return jsi::Value::undefined();
 }

 eventTarget->retain(runtime);
 auto instanceHandle = eventTarget->getInstanceHandle(runtime);
 eventTarget->release(runtime);
 EventEmitter::DispatchMutex().unlock();

 if (instanceHandle.isUndefined()) {
 return jsi::Value::undefined();
 }

 return callMethodOfModule(
 runtime,
 "ReactFabric",
 "getInspectorDataForInstance",
 {std::move(instanceHandle)});
}

void UIManagerBinding::dispatchEvent(
 jsi::Runtime& runtime,
 const EventTarget* eventTarget,
Expand Down

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,10 +40,6 @@ class UIManagerBinding : public jsi::HostObject {

 ~UIManagerBinding() override;

 jsi::Value getInspectorDataForInstance(
 jsi::Runtime& runtime,
 const EventEmitter& eventEmitter) const;

 /*
 * Delivers raw event data to JavaScript.
 * Thread synchronization must be enforced externally.
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove getInspectorDataForInstance#48335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

javache
wants to merge
1
commit into

from

 Closed


Remove getInspectorDataForInstance
#48335
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
packages/react-native/ReactAndroid/api/ReactAndroid.api

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2595,7 +2595,6 @@ public class com/facebook/react/fabric/FabricUIManager : com/facebook/react/brid
	public fun dispatchCommand (ILjava/lang/String;Lcom/facebook/react/bridge/ReadableArray;)V
	public fun getColor (I[Ljava/lang/String;)I
	public fun getEventDispatcher ()Lcom/facebook/react/uimanager/events/EventDispatcher;
	public fun getInspectorDataForInstance (ILandroid/view/View;)Lcom/facebook/react/bridge/ReadableMap;
	public fun getPerformanceCounters ()Ljava/util/Map;
	public fun getThemeData (I[F)Z
	public fun initialize ()V
Expand Down

23 changes: 0 additions & 23 deletions
...es/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,29 +257,6 @@ public <T extends View> int addRootView(final T rootView, final WritableMap init
 return rootTag;
 }

 /**
 * This API returns metadata associated to the React Component that rendered the Android View
 * received as a parameter.
 *
 * @param surfaceId {@link int} that represents the surfaceId for the View received as a
 * parameter. In practice surfaceId can be retrieved calling the {@link View#getId()} method
 * on the {@link ReactRoot} that holds the View received as a second parameter.
 * @param view {@link View} view that will be used to retrieve the React view hierarchy metadata.
 * @return a {@link ReadableMap} that contains metadata associated to the React Component that
 * rendered the Android View received as a parameter. For more details about the keys stored
 * in the {@link ReadableMap} refer to the "getInspectorDataForInstance" method from
 * jni/react/fabric/Binding.cpp file.
 */
 @UiThread
 @ThreadConfined(UI)
 public ReadableMap getInspectorDataForInstance(final int surfaceId, final View view) {
 UiThreadUtil.assertOnUiThread();
 int reactTag = view.getId();

 EventEmitterWrapper eventEmitter = mMountingManager.getEventEmitter(surfaceId, reactTag);
 return mBinding.getInspectorDataForInstance(eventEmitter);
 }

 @Override
 @AnyThread
 @ThreadConfined(ANY)
Expand Down

6 changes: 0 additions & 6 deletions
...act-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerBinding.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,12 +11,10 @@ import android.annotation.SuppressLint
import com.facebook.jni.HybridClassBase
import com.facebook.proguard.annotations.DoNotStrip
import com.facebook.react.bridge.NativeMap
import com.facebook.react.bridge.ReadableNativeMap
import com.facebook.react.bridge.RuntimeExecutor
import com.facebook.react.bridge.RuntimeScheduler
import com.facebook.react.common.mapbuffer.MapBufferSoLoader
import com.facebook.react.fabric.events.EventBeatManager
import com.facebook.react.fabric.events.EventEmitterWrapper
import com.facebook.react.uimanager.PixelUtil.getDisplayMetricDensity

@DoNotStrip
Expand DownExpand Up@@ -82,10 +80,6 @@ internal class FabricUIManagerBinding : HybridClassBase() {

 public external fun reportMount(surfaceId: Int)

 public external fun getInspectorDataForInstance(
 eventEmitterWrapper: EventEmitterWrapper?
 ): ReadableNativeMap?

 public fun register(
 runtimeExecutor: RuntimeExecutor,
 runtimeScheduler: RuntimeScheduler,
Expand Down

30 changes: 0 additions & 30 deletions
packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,33 +44,6 @@ std::shared_ptr<Scheduler> FabricUIManagerBinding::getScheduler() {
 return scheduler_;
}

jni::local_ref<ReadableNativeMap::jhybridobject>
FabricUIManagerBinding::getInspectorDataForInstance(
 jni::alias_ref<EventEmitterWrapper::javaobject> eventEmitterWrapper) {
 auto scheduler = getScheduler();
 if (!scheduler) {
 LOG(ERROR) << "FabricUIManagerBinding::startSurface: scheduler disappeared";
 return ReadableNativeMap::newObjectCxxArgs(folly::dynamic::object());
 }

 EventEmitterWrapper* cEventEmitter = cthis(eventEmitterWrapper);
 InspectorData data =
 scheduler->getInspectorDataForInstance(*cEventEmitter->eventEmitter);

 folly::dynamic result = folly::dynamic::object;
 result["fileName"] = data.fileName;
 result["lineNumber"] = data.lineNumber;
 result["columnNumber"] = data.columnNumber;
 result["selectedIndex"] = data.selectedIndex;
 result["props"] = data.props;
 auto hierarchy = folly::dynamic::array();
 for (const auto& hierarchyItem : data.hierarchy) {
 hierarchy.push_back(hierarchyItem);
 }
 result["hierarchy"] = hierarchy;
 return ReadableNativeMap::newObjectCxxArgs(result);
}

void FabricUIManagerBinding::setPixelDensity(float pointScaleFactor) {
 pointScaleFactor_ = pointScaleFactor;
}
Expand DownExpand Up@@ -661,9 +634,6 @@ void FabricUIManagerBinding::registerNatives() {
 "installFabricUIManager",
 FabricUIManagerBinding::installFabricUIManager),
 makeNativeMethod("startSurface", FabricUIManagerBinding::startSurface),
 makeNativeMethod(
 "getInspectorDataForInstance",
 FabricUIManagerBinding::getInspectorDataForInstance),
 makeNativeMethod(
 "startSurfaceWithConstraints",
 FabricUIManagerBinding::startSurfaceWithConstraints),
Expand Down

3 changes: 0 additions & 3 deletions
packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,9 +57,6 @@ class FabricUIManagerBinding : public jni::HybridClass<FabricUIManagerBinding>,
 jboolean isRTL,
 jboolean doLeftAndRightSwapInRTL);

 jni::local_ref<ReadableNativeMap::jhybridobject> getInspectorDataForInstance(
 jni::alias_ref<EventEmitterWrapper::javaobject> eventEmitterWrapper);

 static void initHybrid(jni::alias_ref<jhybridobject> jobj);

 void installFabricUIManager(
Expand Down

31 changes: 0 additions & 31 deletions
packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -216,37 +216,6 @@ void Scheduler::registerSurface(
 surfaceHandler.setUIManager(uiManager_.get());
}

InspectorData Scheduler::getInspectorDataForInstance(
 const EventEmitter& eventEmitter) const noexcept {
 return executeSynchronouslyOnSameThread_CAN_DEADLOCK<InspectorData>(
 runtimeExecutor_, [=](jsi::Runtime& runtime) -> InspectorData {
 auto uiManagerBinding = UIManagerBinding::getBinding(runtime);
 auto value = uiManagerBinding->getInspectorDataForInstance(
 runtime, eventEmitter);

 // TODO T97216348: avoid transforming jsi into folly::dynamic
 auto dynamic = jsi::dynamicFromValue(runtime, value);
 auto source = dynamic["source"];

 InspectorData result = {};
 result.fileName =
 source["fileName"].isNull() ? "" : source["fileName"].c_str();
 result.lineNumber = (int)source["lineNumber"].getDouble();
 result.columnNumber = (int)source["columnNumber"].getDouble();
 result.selectedIndex = (int)dynamic["selectedIndex"].getDouble();
 // TODO T97216348: remove folly::dynamic from InspectorData struct
 result.props = dynamic["props"];
 auto hierarchy = dynamic["hierarchy"];
 for (auto& i : hierarchy) {
 auto viewHierarchyValue = i["name"];
 if (!viewHierarchyValue.isNull()) {
 result.hierarchy.emplace_back(viewHierarchyValue.c_str());
 }
 }
 return result;
 });
}

void Scheduler::unregisterSurface(
 const SurfaceHandler& surfaceHandler) const noexcept {
 surfaceHandler.setUIManager(nullptr);
Expand Down

3 changes: 0 additions & 3 deletions
packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,9 +52,6 @@ class Scheduler final : public UIManagerDelegate {
 void registerSurface(const SurfaceHandler& surfaceHandler) const noexcept;
 void unregisterSurface(const SurfaceHandler& surfaceHandler) const noexcept;

 InspectorData getInspectorDataForInstance(
 const EventEmitter& eventEmitter) const noexcept;

 /*
 * This is broken. Please do not use.
 * `ComponentDescriptor`s are not designed to be used outside of `UIManager`,
Expand Down

27 changes: 0 additions & 27 deletions
packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,33 +62,6 @@ UIManagerBinding::~UIManagerBinding() {
 << this << ").";
}

jsi::Value UIManagerBinding::getInspectorDataForInstance(
 jsi::Runtime& runtime,
 const EventEmitter& eventEmitter) const {
 auto eventTarget = eventEmitter.eventTarget_;
 EventEmitter::DispatchMutex().lock();

 if (!runtime.global().hasProperty(runtime, "__fbBatchedBridge") ||
 !eventTarget) {
 return jsi::Value::undefined();
 }

 eventTarget->retain(runtime);
 auto instanceHandle = eventTarget->getInstanceHandle(runtime);
 eventTarget->release(runtime);
 EventEmitter::DispatchMutex().unlock();

 if (instanceHandle.isUndefined()) {
 return jsi::Value::undefined();
 }

 return callMethodOfModule(
 runtime,
 "ReactFabric",
 "getInspectorDataForInstance",
 {std::move(instanceHandle)});
}

void UIManagerBinding::dispatchEvent(
 jsi::Runtime& runtime,
 const EventTarget* eventTarget,
Expand Down

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,10 +40,6 @@ class UIManagerBinding : public jsi::HostObject {

 ~UIManagerBinding() override;

 jsi::Value getInspectorDataForInstance(
 jsi::Runtime& runtime,
 const EventEmitter& eventEmitter) const;

 /*
 * Delivers raw event data to JavaScript.
 * Thread synchronization must be enforced externally.
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Remove getInspectorDataForInstance#48335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

javache
wants to merge
1
commit into

from

 Closed


Remove getInspectorDataForInstance
#48335
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
packages/react-native/ReactAndroid/api/ReactAndroid.api

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2595,7 +2595,6 @@ public class com/facebook/react/fabric/FabricUIManager : com/facebook/react/brid
	public fun dispatchCommand (ILjava/lang/String;Lcom/facebook/react/bridge/ReadableArray;)V
	public fun getColor (I[Ljava/lang/String;)I
	public fun getEventDispatcher ()Lcom/facebook/react/uimanager/events/EventDispatcher;
	public fun getInspectorDataForInstance (ILandroid/view/View;)Lcom/facebook/react/bridge/ReadableMap;
	public fun getPerformanceCounters ()Ljava/util/Map;
	public fun getThemeData (I[F)Z
	public fun initialize ()V
Expand Down

23 changes: 0 additions & 23 deletions
...es/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,29 +257,6 @@ public <T extends View> int addRootView(final T rootView, final WritableMap init
 return rootTag;
 }

 /**
 * This API returns metadata associated to the React Component that rendered the Android View
 * received as a parameter.
 *
 * @param surfaceId {@link int} that represents the surfaceId for the View received as a
 * parameter. In practice surfaceId can be retrieved calling the {@link View#getId()} method
 * on the {@link ReactRoot} that holds the View received as a second parameter.
 * @param view {@link View} view that will be used to retrieve the React view hierarchy metadata.
 * @return a {@link ReadableMap} that contains metadata associated to the React Component that
 * rendered the Android View received as a parameter. For more details about the keys stored
 * in the {@link ReadableMap} refer to the "getInspectorDataForInstance" method from
 * jni/react/fabric/Binding.cpp file.
 */
 @UiThread
 @ThreadConfined(UI)
 public ReadableMap getInspectorDataForInstance(final int surfaceId, final View view) {
 UiThreadUtil.assertOnUiThread();
 int reactTag = view.getId();

 EventEmitterWrapper eventEmitter = mMountingManager.getEventEmitter(surfaceId, reactTag);
 return mBinding.getInspectorDataForInstance(eventEmitter);
 }

 @Override
 @AnyThread
 @ThreadConfined(ANY)
Expand Down

6 changes: 0 additions & 6 deletions
...act-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerBinding.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,12 +11,10 @@ import android.annotation.SuppressLint
import com.facebook.jni.HybridClassBase
import com.facebook.proguard.annotations.DoNotStrip
import com.facebook.react.bridge.NativeMap
import com.facebook.react.bridge.ReadableNativeMap
import com.facebook.react.bridge.RuntimeExecutor
import com.facebook.react.bridge.RuntimeScheduler
import com.facebook.react.common.mapbuffer.MapBufferSoLoader
import com.facebook.react.fabric.events.EventBeatManager
import com.facebook.react.fabric.events.EventEmitterWrapper
import com.facebook.react.uimanager.PixelUtil.getDisplayMetricDensity

@DoNotStrip
Expand DownExpand Up@@ -82,10 +80,6 @@ internal class FabricUIManagerBinding : HybridClassBase() {

 public external fun reportMount(surfaceId: Int)

 public external fun getInspectorDataForInstance(
 eventEmitterWrapper: EventEmitterWrapper?
 ): ReadableNativeMap?

 public fun register(
 runtimeExecutor: RuntimeExecutor,
 runtimeScheduler: RuntimeScheduler,
Expand Down

30 changes: 0 additions & 30 deletions
packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,33 +44,6 @@ std::shared_ptr<Scheduler> FabricUIManagerBinding::getScheduler() {
 return scheduler_;
}

jni::local_ref<ReadableNativeMap::jhybridobject>
FabricUIManagerBinding::getInspectorDataForInstance(
 jni::alias_ref<EventEmitterWrapper::javaobject> eventEmitterWrapper) {
 auto scheduler = getScheduler();
 if (!scheduler) {
 LOG(ERROR) << "FabricUIManagerBinding::startSurface: scheduler disappeared";
 return ReadableNativeMap::newObjectCxxArgs(folly::dynamic::object());
 }

 EventEmitterWrapper* cEventEmitter = cthis(eventEmitterWrapper);
 InspectorData data =
 scheduler->getInspectorDataForInstance(*cEventEmitter->eventEmitter);

 folly::dynamic result = folly::dynamic::object;
 result["fileName"] = data.fileName;
 result["lineNumber"] = data.lineNumber;
 result["columnNumber"] = data.columnNumber;
 result["selectedIndex"] = data.selectedIndex;
 result["props"] = data.props;
 auto hierarchy = folly::dynamic::array();
 for (const auto& hierarchyItem : data.hierarchy) {
 hierarchy.push_back(hierarchyItem);
 }
 result["hierarchy"] = hierarchy;
 return ReadableNativeMap::newObjectCxxArgs(result);
}

void FabricUIManagerBinding::setPixelDensity(float pointScaleFactor) {
 pointScaleFactor_ = pointScaleFactor;
}
Expand DownExpand Up@@ -661,9 +634,6 @@ void FabricUIManagerBinding::registerNatives() {
 "installFabricUIManager",
 FabricUIManagerBinding::installFabricUIManager),
 makeNativeMethod("startSurface", FabricUIManagerBinding::startSurface),
 makeNativeMethod(
 "getInspectorDataForInstance",
 FabricUIManagerBinding::getInspectorDataForInstance),
 makeNativeMethod(
 "startSurfaceWithConstraints",
 FabricUIManagerBinding::startSurfaceWithConstraints),
Expand Down

3 changes: 0 additions & 3 deletions
packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,9 +57,6 @@ class FabricUIManagerBinding : public jni::HybridClass<FabricUIManagerBinding>,
 jboolean isRTL,
 jboolean doLeftAndRightSwapInRTL);

 jni::local_ref<ReadableNativeMap::jhybridobject> getInspectorDataForInstance(
 jni::alias_ref<EventEmitterWrapper::javaobject> eventEmitterWrapper);

 static void initHybrid(jni::alias_ref<jhybridobject> jobj);

 void installFabricUIManager(
Expand Down

31 changes: 0 additions & 31 deletions
packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -216,37 +216,6 @@ void Scheduler::registerSurface(
 surfaceHandler.setUIManager(uiManager_.get());
}

InspectorData Scheduler::getInspectorDataForInstance(
 const EventEmitter& eventEmitter) const noexcept {
 return executeSynchronouslyOnSameThread_CAN_DEADLOCK<InspectorData>(
 runtimeExecutor_, [=](jsi::Runtime& runtime) -> InspectorData {
 auto uiManagerBinding = UIManagerBinding::getBinding(runtime);
 auto value = uiManagerBinding->getInspectorDataForInstance(
 runtime, eventEmitter);

 // TODO T97216348: avoid transforming jsi into folly::dynamic
 auto dynamic = jsi::dynamicFromValue(runtime, value);
 auto source = dynamic["source"];

 InspectorData result = {};
 result.fileName =
 source["fileName"].isNull() ? "" : source["fileName"].c_str();
 result.lineNumber = (int)source["lineNumber"].getDouble();
 result.columnNumber = (int)source["columnNumber"].getDouble();
 result.selectedIndex = (int)dynamic["selectedIndex"].getDouble();
 // TODO T97216348: remove folly::dynamic from InspectorData struct
 result.props = dynamic["props"];
 auto hierarchy = dynamic["hierarchy"];
 for (auto& i : hierarchy) {
 auto viewHierarchyValue = i["name"];
 if (!viewHierarchyValue.isNull()) {
 result.hierarchy.emplace_back(viewHierarchyValue.c_str());
 }
 }
 return result;
 });
}

void Scheduler::unregisterSurface(
 const SurfaceHandler& surfaceHandler) const noexcept {
 surfaceHandler.setUIManager(nullptr);
Expand Down

3 changes: 0 additions & 3 deletions
packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,9 +52,6 @@ class Scheduler final : public UIManagerDelegate {
 void registerSurface(const SurfaceHandler& surfaceHandler) const noexcept;
 void unregisterSurface(const SurfaceHandler& surfaceHandler) const noexcept;

 InspectorData getInspectorDataForInstance(
 const EventEmitter& eventEmitter) const noexcept;

 /*
 * This is broken. Please do not use.
 * `ComponentDescriptor`s are not designed to be used outside of `UIManager`,
Expand Down

27 changes: 0 additions & 27 deletions
packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,33 +62,6 @@ UIManagerBinding::~UIManagerBinding() {
 << this << ").";
}

jsi::Value UIManagerBinding::getInspectorDataForInstance(
 jsi::Runtime& runtime,
 const EventEmitter& eventEmitter) const {
 auto eventTarget = eventEmitter.eventTarget_;
 EventEmitter::DispatchMutex().lock();

 if (!runtime.global().hasProperty(runtime, "__fbBatchedBridge") ||
 !eventTarget) {
 return jsi::Value::undefined();
 }

 eventTarget->retain(runtime);
 auto instanceHandle = eventTarget->getInstanceHandle(runtime);
 eventTarget->release(runtime);
 EventEmitter::DispatchMutex().unlock();

 if (instanceHandle.isUndefined()) {
 return jsi::Value::undefined();
 }

 return callMethodOfModule(
 runtime,
 "ReactFabric",
 "getInspectorDataForInstance",
 {std::move(instanceHandle)});
}

void UIManagerBinding::dispatchEvent(
 jsi::Runtime& runtime,
 const EventTarget* eventTarget,
Expand Down

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,10 +40,6 @@ class UIManagerBinding : public jsi::HostObject {

 ~UIManagerBinding() override;

 jsi::Value getInspectorDataForInstance(
 jsi::Runtime& runtime,
 const EventEmitter& eventEmitter) const;

 /*
 * Delivers raw event data to JavaScript.
 * Thread synchronization must be enforced externally.
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove getInspectorDataForInstance#48335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

javache
wants to merge
1
commit into

from

 Closed


Remove getInspectorDataForInstance
#48335
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
packages/react-native/ReactAndroid/api/ReactAndroid.api

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2595,7 +2595,6 @@ public class com/facebook/react/fabric/FabricUIManager : com/facebook/react/brid
	public fun dispatchCommand (ILjava/lang/String;Lcom/facebook/react/bridge/ReadableArray;)V
	public fun getColor (I[Ljava/lang/String;)I
	public fun getEventDispatcher ()Lcom/facebook/react/uimanager/events/EventDispatcher;
	public fun getInspectorDataForInstance (ILandroid/view/View;)Lcom/facebook/react/bridge/ReadableMap;
	public fun getPerformanceCounters ()Ljava/util/Map;
	public fun getThemeData (I[F)Z
	public fun initialize ()V
Expand Down

23 changes: 0 additions & 23 deletions
...es/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,29 +257,6 @@ public <T extends View> int addRootView(final T rootView, final WritableMap init
 return rootTag;
 }

 /**
 * This API returns metadata associated to the React Component that rendered the Android View
 * received as a parameter.
 *
 * @param surfaceId {@link int} that represents the surfaceId for the View received as a
 * parameter. In practice surfaceId can be retrieved calling the {@link View#getId()} method
 * on the {@link ReactRoot} that holds the View received as a second parameter.
 * @param view {@link View} view that will be used to retrieve the React view hierarchy metadata.
 * @return a {@link ReadableMap} that contains metadata associated to the React Component that
 * rendered the Android View received as a parameter. For more details about the keys stored
 * in the {@link ReadableMap} refer to the "getInspectorDataForInstance" method from
 * jni/react/fabric/Binding.cpp file.
 */
 @UiThread
 @ThreadConfined(UI)
 public ReadableMap getInspectorDataForInstance(final int surfaceId, final View view) {
 UiThreadUtil.assertOnUiThread();
 int reactTag = view.getId();

 EventEmitterWrapper eventEmitter = mMountingManager.getEventEmitter(surfaceId, reactTag);
 return mBinding.getInspectorDataForInstance(eventEmitter);
 }

 @Override
 @AnyThread
 @ThreadConfined(ANY)
Expand Down

6 changes: 0 additions & 6 deletions
...act-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerBinding.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,12 +11,10 @@ import android.annotation.SuppressLint
import com.facebook.jni.HybridClassBase
import com.facebook.proguard.annotations.DoNotStrip
import com.facebook.react.bridge.NativeMap
import com.facebook.react.bridge.ReadableNativeMap
import com.facebook.react.bridge.RuntimeExecutor
import com.facebook.react.bridge.RuntimeScheduler
import com.facebook.react.common.mapbuffer.MapBufferSoLoader
import com.facebook.react.fabric.events.EventBeatManager
import com.facebook.react.fabric.events.EventEmitterWrapper
import com.facebook.react.uimanager.PixelUtil.getDisplayMetricDensity

@DoNotStrip
Expand DownExpand Up@@ -82,10 +80,6 @@ internal class FabricUIManagerBinding : HybridClassBase() {

 public external fun reportMount(surfaceId: Int)

 public external fun getInspectorDataForInstance(
 eventEmitterWrapper: EventEmitterWrapper?
 ): ReadableNativeMap?

 public fun register(
 runtimeExecutor: RuntimeExecutor,
 runtimeScheduler: RuntimeScheduler,
Expand Down

30 changes: 0 additions & 30 deletions
packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,33 +44,6 @@ std::shared_ptr<Scheduler> FabricUIManagerBinding::getScheduler() {
 return scheduler_;
}

jni::local_ref<ReadableNativeMap::jhybridobject>
FabricUIManagerBinding::getInspectorDataForInstance(
 jni::alias_ref<EventEmitterWrapper::javaobject> eventEmitterWrapper) {
 auto scheduler = getScheduler();
 if (!scheduler) {
 LOG(ERROR) << "FabricUIManagerBinding::startSurface: scheduler disappeared";
 return ReadableNativeMap::newObjectCxxArgs(folly::dynamic::object());
 }

 EventEmitterWrapper* cEventEmitter = cthis(eventEmitterWrapper);
 InspectorData data =
 scheduler->getInspectorDataForInstance(*cEventEmitter->eventEmitter);

 folly::dynamic result = folly::dynamic::object;
 result["fileName"] = data.fileName;
 result["lineNumber"] = data.lineNumber;
 result["columnNumber"] = data.columnNumber;
 result["selectedIndex"] = data.selectedIndex;
 result["props"] = data.props;
 auto hierarchy = folly::dynamic::array();
 for (const auto& hierarchyItem : data.hierarchy) {
 hierarchy.push_back(hierarchyItem);
 }
 result["hierarchy"] = hierarchy;
 return ReadableNativeMap::newObjectCxxArgs(result);
}

void FabricUIManagerBinding::setPixelDensity(float pointScaleFactor) {
 pointScaleFactor_ = pointScaleFactor;
}
Expand DownExpand Up@@ -661,9 +634,6 @@ void FabricUIManagerBinding::registerNatives() {
 "installFabricUIManager",
 FabricUIManagerBinding::installFabricUIManager),
 makeNativeMethod("startSurface", FabricUIManagerBinding::startSurface),
 makeNativeMethod(
 "getInspectorDataForInstance",
 FabricUIManagerBinding::getInspectorDataForInstance),
 makeNativeMethod(
 "startSurfaceWithConstraints",
 FabricUIManagerBinding::startSurfaceWithConstraints),
Expand Down

3 changes: 0 additions & 3 deletions
packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,9 +57,6 @@ class FabricUIManagerBinding : public jni::HybridClass<FabricUIManagerBinding>,
 jboolean isRTL,
 jboolean doLeftAndRightSwapInRTL);

 jni::local_ref<ReadableNativeMap::jhybridobject> getInspectorDataForInstance(
 jni::alias_ref<EventEmitterWrapper::javaobject> eventEmitterWrapper);

 static void initHybrid(jni::alias_ref<jhybridobject> jobj);

 void installFabricUIManager(
Expand Down

31 changes: 0 additions & 31 deletions
packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -216,37 +216,6 @@ void Scheduler::registerSurface(
 surfaceHandler.setUIManager(uiManager_.get());
}

InspectorData Scheduler::getInspectorDataForInstance(
 const EventEmitter& eventEmitter) const noexcept {
 return executeSynchronouslyOnSameThread_CAN_DEADLOCK<InspectorData>(
 runtimeExecutor_, [=](jsi::Runtime& runtime) -> InspectorData {
 auto uiManagerBinding = UIManagerBinding::getBinding(runtime);
 auto value = uiManagerBinding->getInspectorDataForInstance(
 runtime, eventEmitter);

 // TODO T97216348: avoid transforming jsi into folly::dynamic
 auto dynamic = jsi::dynamicFromValue(runtime, value);
 auto source = dynamic["source"];

 InspectorData result = {};
 result.fileName =
 source["fileName"].isNull() ? "" : source["fileName"].c_str();
 result.lineNumber = (int)source["lineNumber"].getDouble();
 result.columnNumber = (int)source["columnNumber"].getDouble();
 result.selectedIndex = (int)dynamic["selectedIndex"].getDouble();
 // TODO T97216348: remove folly::dynamic from InspectorData struct
 result.props = dynamic["props"];
 auto hierarchy = dynamic["hierarchy"];
 for (auto& i : hierarchy) {
 auto viewHierarchyValue = i["name"];
 if (!viewHierarchyValue.isNull()) {
 result.hierarchy.emplace_back(viewHierarchyValue.c_str());
 }
 }
 return result;
 });
}

void Scheduler::unregisterSurface(
 const SurfaceHandler& surfaceHandler) const noexcept {
 surfaceHandler.setUIManager(nullptr);
Expand Down

3 changes: 0 additions & 3 deletions
packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,9 +52,6 @@ class Scheduler final : public UIManagerDelegate {
 void registerSurface(const SurfaceHandler& surfaceHandler) const noexcept;
 void unregisterSurface(const SurfaceHandler& surfaceHandler) const noexcept;

 InspectorData getInspectorDataForInstance(
 const EventEmitter& eventEmitter) const noexcept;

 /*
 * This is broken. Please do not use.
 * `ComponentDescriptor`s are not designed to be used outside of `UIManager`,
Expand Down

27 changes: 0 additions & 27 deletions
packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,33 +62,6 @@ UIManagerBinding::~UIManagerBinding() {
 << this << ").";
}

jsi::Value UIManagerBinding::getInspectorDataForInstance(
 jsi::Runtime& runtime,
 const EventEmitter& eventEmitter) const {
 auto eventTarget = eventEmitter.eventTarget_;
 EventEmitter::DispatchMutex().lock();

 if (!runtime.global().hasProperty(runtime, "__fbBatchedBridge") ||
 !eventTarget) {
 return jsi::Value::undefined();
 }

 eventTarget->retain(runtime);
 auto instanceHandle = eventTarget->getInstanceHandle(runtime);
 eventTarget->release(runtime);
 EventEmitter::DispatchMutex().unlock();

 if (instanceHandle.isUndefined()) {
 return jsi::Value::undefined();
 }

 return callMethodOfModule(
 runtime,
 "ReactFabric",
 "getInspectorDataForInstance",
 {std::move(instanceHandle)});
}

void UIManagerBinding::dispatchEvent(
 jsi::Runtime& runtime,
 const EventTarget* eventTarget,
Expand Down

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,10 +40,6 @@ class UIManagerBinding : public jsi::HostObject {

 ~UIManagerBinding() override;

 jsi::Value getInspectorDataForInstance(
 jsi::Runtime& runtime,
 const EventEmitter& eventEmitter) const;

 /*
 * Delivers raw event data to JavaScript.
 * Thread synchronization must be enforced externally.
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove getInspectorDataForInstance#48335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

javache
wants to merge
1
commit into

from

 Closed


Remove getInspectorDataForInstance
#48335
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
packages/react-native/ReactAndroid/api/ReactAndroid.api

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2595,7 +2595,6 @@ public class com/facebook/react/fabric/FabricUIManager : com/facebook/react/brid
	public fun dispatchCommand (ILjava/lang/String;Lcom/facebook/react/bridge/ReadableArray;)V
	public fun getColor (I[Ljava/lang/String;)I
	public fun getEventDispatcher ()Lcom/facebook/react/uimanager/events/EventDispatcher;
	public fun getInspectorDataForInstance (ILandroid/view/View;)Lcom/facebook/react/bridge/ReadableMap;
	public fun getPerformanceCounters ()Ljava/util/Map;
	public fun getThemeData (I[F)Z
	public fun initialize ()V
Expand Down

23 changes: 0 additions & 23 deletions
...es/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,29 +257,6 @@ public <T extends View> int addRootView(final T rootView, final WritableMap init
 return rootTag;
 }

 /**
 * This API returns metadata associated to the React Component that rendered the Android View
 * received as a parameter.
 *
 * @param surfaceId {@link int} that represents the surfaceId for the View received as a
 * parameter. In practice surfaceId can be retrieved calling the {@link View#getId()} method
 * on the {@link ReactRoot} that holds the View received as a second parameter.
 * @param view {@link View} view that will be used to retrieve the React view hierarchy metadata.
 * @return a {@link ReadableMap} that contains metadata associated to the React Component that
 * rendered the Android View received as a parameter. For more details about the keys stored
 * in the {@link ReadableMap} refer to the "getInspectorDataForInstance" method from
 * jni/react/fabric/Binding.cpp file.
 */
 @UiThread
 @ThreadConfined(UI)
 public ReadableMap getInspectorDataForInstance(final int surfaceId, final View view) {
 UiThreadUtil.assertOnUiThread();
 int reactTag = view.getId();

 EventEmitterWrapper eventEmitter = mMountingManager.getEventEmitter(surfaceId, reactTag);
 return mBinding.getInspectorDataForInstance(eventEmitter);
 }

 @Override
 @AnyThread
 @ThreadConfined(ANY)
Expand Down

6 changes: 0 additions & 6 deletions
...act-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerBinding.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,12 +11,10 @@ import android.annotation.SuppressLint
import com.facebook.jni.HybridClassBase
import com.facebook.proguard.annotations.DoNotStrip
import com.facebook.react.bridge.NativeMap
import com.facebook.react.bridge.ReadableNativeMap
import com.facebook.react.bridge.RuntimeExecutor
import com.facebook.react.bridge.RuntimeScheduler
import com.facebook.react.common.mapbuffer.MapBufferSoLoader
import com.facebook.react.fabric.events.EventBeatManager
import com.facebook.react.fabric.events.EventEmitterWrapper
import com.facebook.react.uimanager.PixelUtil.getDisplayMetricDensity

@DoNotStrip
Expand DownExpand Up@@ -82,10 +80,6 @@ internal class FabricUIManagerBinding : HybridClassBase() {

 public external fun reportMount(surfaceId: Int)

 public external fun getInspectorDataForInstance(
 eventEmitterWrapper: EventEmitterWrapper?
 ): ReadableNativeMap?

 public fun register(
 runtimeExecutor: RuntimeExecutor,
 runtimeScheduler: RuntimeScheduler,
Expand Down

30 changes: 0 additions & 30 deletions
packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,33 +44,6 @@ std::shared_ptr<Scheduler> FabricUIManagerBinding::getScheduler() {
 return scheduler_;
}

jni::local_ref<ReadableNativeMap::jhybridobject>
FabricUIManagerBinding::getInspectorDataForInstance(
 jni::alias_ref<EventEmitterWrapper::javaobject> eventEmitterWrapper) {
 auto scheduler = getScheduler();
 if (!scheduler) {
 LOG(ERROR) << "FabricUIManagerBinding::startSurface: scheduler disappeared";
 return ReadableNativeMap::newObjectCxxArgs(folly::dynamic::object());
 }

 EventEmitterWrapper* cEventEmitter = cthis(eventEmitterWrapper);
 InspectorData data =
 scheduler->getInspectorDataForInstance(*cEventEmitter->eventEmitter);

 folly::dynamic result = folly::dynamic::object;
 result["fileName"] = data.fileName;
 result["lineNumber"] = data.lineNumber;
 result["columnNumber"] = data.columnNumber;
 result["selectedIndex"] = data.selectedIndex;
 result["props"] = data.props;
 auto hierarchy = folly::dynamic::array();
 for (const auto& hierarchyItem : data.hierarchy) {
 hierarchy.push_back(hierarchyItem);
 }
 result["hierarchy"] = hierarchy;
 return ReadableNativeMap::newObjectCxxArgs(result);
}

void FabricUIManagerBinding::setPixelDensity(float pointScaleFactor) {
 pointScaleFactor_ = pointScaleFactor;
}
Expand DownExpand Up@@ -661,9 +634,6 @@ void FabricUIManagerBinding::registerNatives() {
 "installFabricUIManager",
 FabricUIManagerBinding::installFabricUIManager),
 makeNativeMethod("startSurface", FabricUIManagerBinding::startSurface),
 makeNativeMethod(
 "getInspectorDataForInstance",
 FabricUIManagerBinding::getInspectorDataForInstance),
 makeNativeMethod(
 "startSurfaceWithConstraints",
 FabricUIManagerBinding::startSurfaceWithConstraints),
Expand Down

3 changes: 0 additions & 3 deletions
packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,9 +57,6 @@ class FabricUIManagerBinding : public jni::HybridClass<FabricUIManagerBinding>,
 jboolean isRTL,
 jboolean doLeftAndRightSwapInRTL);

 jni::local_ref<ReadableNativeMap::jhybridobject> getInspectorDataForInstance(
 jni::alias_ref<EventEmitterWrapper::javaobject> eventEmitterWrapper);

 static void initHybrid(jni::alias_ref<jhybridobject> jobj);

 void installFabricUIManager(
Expand Down

31 changes: 0 additions & 31 deletions
packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -216,37 +216,6 @@ void Scheduler::registerSurface(
 surfaceHandler.setUIManager(uiManager_.get());
}

InspectorData Scheduler::getInspectorDataForInstance(
 const EventEmitter& eventEmitter) const noexcept {
 return executeSynchronouslyOnSameThread_CAN_DEADLOCK<InspectorData>(
 runtimeExecutor_, [=](jsi::Runtime& runtime) -> InspectorData {
 auto uiManagerBinding = UIManagerBinding::getBinding(runtime);
 auto value = uiManagerBinding->getInspectorDataForInstance(
 runtime, eventEmitter);

 // TODO T97216348: avoid transforming jsi into folly::dynamic
 auto dynamic = jsi::dynamicFromValue(runtime, value);
 auto source = dynamic["source"];

 InspectorData result = {};
 result.fileName =
 source["fileName"].isNull() ? "" : source["fileName"].c_str();
 result.lineNumber = (int)source["lineNumber"].getDouble();
 result.columnNumber = (int)source["columnNumber"].getDouble();
 result.selectedIndex = (int)dynamic["selectedIndex"].getDouble();
 // TODO T97216348: remove folly::dynamic from InspectorData struct
 result.props = dynamic["props"];
 auto hierarchy = dynamic["hierarchy"];
 for (auto& i : hierarchy) {
 auto viewHierarchyValue = i["name"];
 if (!viewHierarchyValue.isNull()) {
 result.hierarchy.emplace_back(viewHierarchyValue.c_str());
 }
 }
 return result;
 });
}

void Scheduler::unregisterSurface(
 const SurfaceHandler& surfaceHandler) const noexcept {
 surfaceHandler.setUIManager(nullptr);
Expand Down

3 changes: 0 additions & 3 deletions
packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,9 +52,6 @@ class Scheduler final : public UIManagerDelegate {
 void registerSurface(const SurfaceHandler& surfaceHandler) const noexcept;
 void unregisterSurface(const SurfaceHandler& surfaceHandler) const noexcept;

 InspectorData getInspectorDataForInstance(
 const EventEmitter& eventEmitter) const noexcept;

 /*
 * This is broken. Please do not use.
 * `ComponentDescriptor`s are not designed to be used outside of `UIManager`,
Expand Down

27 changes: 0 additions & 27 deletions
packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,33 +62,6 @@ UIManagerBinding::~UIManagerBinding() {
 << this << ").";
}

jsi::Value UIManagerBinding::getInspectorDataForInstance(
 jsi::Runtime& runtime,
 const EventEmitter& eventEmitter) const {
 auto eventTarget = eventEmitter.eventTarget_;
 EventEmitter::DispatchMutex().lock();

 if (!runtime.global().hasProperty(runtime, "__fbBatchedBridge") ||
 !eventTarget) {
 return jsi::Value::undefined();
 }

 eventTarget->retain(runtime);
 auto instanceHandle = eventTarget->getInstanceHandle(runtime);
 eventTarget->release(runtime);
 EventEmitter::DispatchMutex().unlock();

 if (instanceHandle.isUndefined()) {
 return jsi::Value::undefined();
 }

 return callMethodOfModule(
 runtime,
 "ReactFabric",
 "getInspectorDataForInstance",
 {std::move(instanceHandle)});
}

void UIManagerBinding::dispatchEvent(
 jsi::Runtime& runtime,
 const EventTarget* eventTarget,
Expand Down

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,10 +40,6 @@ class UIManagerBinding : public jsi::HostObject {

 ~UIManagerBinding() override;

 jsi::Value getInspectorDataForInstance(
 jsi::Runtime& runtime,
 const EventEmitter& eventEmitter) const;

 /*
 * Delivers raw event data to JavaScript.
 * Thread synchronization must be enforced externally.
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Remove getInspectorDataForInstance#48335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

javache
wants to merge
1
commit into

from

 Closed


Remove getInspectorDataForInstance
#48335
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
packages/react-native/ReactAndroid/api/ReactAndroid.api

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2595,7 +2595,6 @@ public class com/facebook/react/fabric/FabricUIManager : com/facebook/react/brid
	public fun dispatchCommand (ILjava/lang/String;Lcom/facebook/react/bridge/ReadableArray;)V
	public fun getColor (I[Ljava/lang/String;)I
	public fun getEventDispatcher ()Lcom/facebook/react/uimanager/events/EventDispatcher;
	public fun getInspectorDataForInstance (ILandroid/view/View;)Lcom/facebook/react/bridge/ReadableMap;
	public fun getPerformanceCounters ()Ljava/util/Map;
	public fun getThemeData (I[F)Z
	public fun initialize ()V
Expand Down

23 changes: 0 additions & 23 deletions
...es/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,29 +257,6 @@ public <T extends View> int addRootView(final T rootView, final WritableMap init
 return rootTag;
 }

 /**
 * This API returns metadata associated to the React Component that rendered the Android View
 * received as a parameter.
 *
 * @param surfaceId {@link int} that represents the surfaceId for the View received as a
 * parameter. In practice surfaceId can be retrieved calling the {@link View#getId()} method
 * on the {@link ReactRoot} that holds the View received as a second parameter.
 * @param view {@link View} view that will be used to retrieve the React view hierarchy metadata.
 * @return a {@link ReadableMap} that contains metadata associated to the React Component that
 * rendered the Android View received as a parameter. For more details about the keys stored
 * in the {@link ReadableMap} refer to the "getInspectorDataForInstance" method from
 * jni/react/fabric/Binding.cpp file.
 */
 @UiThread
 @ThreadConfined(UI)
 public ReadableMap getInspectorDataForInstance(final int surfaceId, final View view) {
 UiThreadUtil.assertOnUiThread();
 int reactTag = view.getId();

 EventEmitterWrapper eventEmitter = mMountingManager.getEventEmitter(surfaceId, reactTag);
 return mBinding.getInspectorDataForInstance(eventEmitter);
 }

 @Override
 @AnyThread
 @ThreadConfined(ANY)
Expand Down

6 changes: 0 additions & 6 deletions
...act-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerBinding.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,12 +11,10 @@ import android.annotation.SuppressLint
import com.facebook.jni.HybridClassBase
import com.facebook.proguard.annotations.DoNotStrip
import com.facebook.react.bridge.NativeMap
import com.facebook.react.bridge.ReadableNativeMap
import com.facebook.react.bridge.RuntimeExecutor
import com.facebook.react.bridge.RuntimeScheduler
import com.facebook.react.common.mapbuffer.MapBufferSoLoader
import com.facebook.react.fabric.events.EventBeatManager
import com.facebook.react.fabric.events.EventEmitterWrapper
import com.facebook.react.uimanager.PixelUtil.getDisplayMetricDensity

@DoNotStrip
Expand DownExpand Up@@ -82,10 +80,6 @@ internal class FabricUIManagerBinding : HybridClassBase() {

 public external fun reportMount(surfaceId: Int)

 public external fun getInspectorDataForInstance(
 eventEmitterWrapper: EventEmitterWrapper?
 ): ReadableNativeMap?

 public fun register(
 runtimeExecutor: RuntimeExecutor,
 runtimeScheduler: RuntimeScheduler,
Expand Down

30 changes: 0 additions & 30 deletions
packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,33 +44,6 @@ std::shared_ptr<Scheduler> FabricUIManagerBinding::getScheduler() {
 return scheduler_;
}

jni::local_ref<ReadableNativeMap::jhybridobject>
FabricUIManagerBinding::getInspectorDataForInstance(
 jni::alias_ref<EventEmitterWrapper::javaobject> eventEmitterWrapper) {
 auto scheduler = getScheduler();
 if (!scheduler) {
 LOG(ERROR) << "FabricUIManagerBinding::startSurface: scheduler disappeared";
 return ReadableNativeMap::newObjectCxxArgs(folly::dynamic::object());
 }

 EventEmitterWrapper* cEventEmitter = cthis(eventEmitterWrapper);
 InspectorData data =
 scheduler->getInspectorDataForInstance(*cEventEmitter->eventEmitter);

 folly::dynamic result = folly::dynamic::object;
 result["fileName"] = data.fileName;
 result["lineNumber"] = data.lineNumber;
 result["columnNumber"] = data.columnNumber;
 result["selectedIndex"] = data.selectedIndex;
 result["props"] = data.props;
 auto hierarchy = folly::dynamic::array();
 for (const auto& hierarchyItem : data.hierarchy) {
 hierarchy.push_back(hierarchyItem);
 }
 result["hierarchy"] = hierarchy;
 return ReadableNativeMap::newObjectCxxArgs(result);
}

void FabricUIManagerBinding::setPixelDensity(float pointScaleFactor) {
 pointScaleFactor_ = pointScaleFactor;
}
Expand DownExpand Up@@ -661,9 +634,6 @@ void FabricUIManagerBinding::registerNatives() {
 "installFabricUIManager",
 FabricUIManagerBinding::installFabricUIManager),
 makeNativeMethod("startSurface", FabricUIManagerBinding::startSurface),
 makeNativeMethod(
 "getInspectorDataForInstance",
 FabricUIManagerBinding::getInspectorDataForInstance),
 makeNativeMethod(
 "startSurfaceWithConstraints",
 FabricUIManagerBinding::startSurfaceWithConstraints),
Expand Down

3 changes: 0 additions & 3 deletions
packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,9 +57,6 @@ class FabricUIManagerBinding : public jni::HybridClass<FabricUIManagerBinding>,
 jboolean isRTL,
 jboolean doLeftAndRightSwapInRTL);

 jni::local_ref<ReadableNativeMap::jhybridobject> getInspectorDataForInstance(
 jni::alias_ref<EventEmitterWrapper::javaobject> eventEmitterWrapper);

 static void initHybrid(jni::alias_ref<jhybridobject> jobj);

 void installFabricUIManager(
Expand Down

31 changes: 0 additions & 31 deletions
packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -216,37 +216,6 @@ void Scheduler::registerSurface(
 surfaceHandler.setUIManager(uiManager_.get());
}

InspectorData Scheduler::getInspectorDataForInstance(
 const EventEmitter& eventEmitter) const noexcept {
 return executeSynchronouslyOnSameThread_CAN_DEADLOCK<InspectorData>(
 runtimeExecutor_, [=](jsi::Runtime& runtime) -> InspectorData {
 auto uiManagerBinding = UIManagerBinding::getBinding(runtime);
 auto value = uiManagerBinding->getInspectorDataForInstance(
 runtime, eventEmitter);

 // TODO T97216348: avoid transforming jsi into folly::dynamic
 auto dynamic = jsi::dynamicFromValue(runtime, value);
 auto source = dynamic["source"];

 InspectorData result = {};
 result.fileName =
 source["fileName"].isNull() ? "" : source["fileName"].c_str();
 result.lineNumber = (int)source["lineNumber"].getDouble();
 result.columnNumber = (int)source["columnNumber"].getDouble();
 result.selectedIndex = (int)dynamic["selectedIndex"].getDouble();
 // TODO T97216348: remove folly::dynamic from InspectorData struct
 result.props = dynamic["props"];
 auto hierarchy = dynamic["hierarchy"];
 for (auto& i : hierarchy) {
 auto viewHierarchyValue = i["name"];
 if (!viewHierarchyValue.isNull()) {
 result.hierarchy.emplace_back(viewHierarchyValue.c_str());
 }
 }
 return result;
 });
}

void Scheduler::unregisterSurface(
 const SurfaceHandler& surfaceHandler) const noexcept {
 surfaceHandler.setUIManager(nullptr);
Expand Down

3 changes: 0 additions & 3 deletions
packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,9 +52,6 @@ class Scheduler final : public UIManagerDelegate {
 void registerSurface(const SurfaceHandler& surfaceHandler) const noexcept;
 void unregisterSurface(const SurfaceHandler& surfaceHandler) const noexcept;

 InspectorData getInspectorDataForInstance(
 const EventEmitter& eventEmitter) const noexcept;

 /*
 * This is broken. Please do not use.
 * `ComponentDescriptor`s are not designed to be used outside of `UIManager`,
Expand Down

27 changes: 0 additions & 27 deletions
packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,33 +62,6 @@ UIManagerBinding::~UIManagerBinding() {
 << this << ").";
}

jsi::Value UIManagerBinding::getInspectorDataForInstance(
 jsi::Runtime& runtime,
 const EventEmitter& eventEmitter) const {
 auto eventTarget = eventEmitter.eventTarget_;
 EventEmitter::DispatchMutex().lock();

 if (!runtime.global().hasProperty(runtime, "__fbBatchedBridge") ||
 !eventTarget) {
 return jsi::Value::undefined();
 }

 eventTarget->retain(runtime);
 auto instanceHandle = eventTarget->getInstanceHandle(runtime);
 eventTarget->release(runtime);
 EventEmitter::DispatchMutex().unlock();

 if (instanceHandle.isUndefined()) {
 return jsi::Value::undefined();
 }

 return callMethodOfModule(
 runtime,
 "ReactFabric",
 "getInspectorDataForInstance",
 {std::move(instanceHandle)});
}

void UIManagerBinding::dispatchEvent(
 jsi::Runtime& runtime,
 const EventTarget* eventTarget,
Expand Down

4 changes: 0 additions & 4 deletions
packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,10 +40,6 @@ class UIManagerBinding : public jsi::HostObject {

 ~UIManagerBinding() override;

 jsi::Value getInspectorDataForInstance(
 jsi::Runtime& runtime,
 const EventEmitter& eventEmitter) const;

 /*
 * Delivers raw event data to JavaScript.
 * Thread synchronization must be enforced externally.
Expand Down