Skip to content
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

Bugfix/devtools UI #4141

Merged
merged 10 commits into from
Dec 2, 2024
Merged

Bugfix/devtools UI #4141

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8766a0d
fix(devtools): fix the mapping between DOM tree and UI inspector
Cyunong Nov 12, 2024
ac44177
fix(devtools): fix potential crash
Cyunong Nov 12, 2024
58a40b0
fix(devtools): fix magic number
Cyunong Nov 13, 2024
f69d299
fix(devtools): fix the name of function
Cyunong Nov 15, 2024
2baa32d
Merge remote-tracking branch 'upstream/main' into bugfix/devtools_ui
Cyunong Nov 29, 2024
1cf3912
fix(ios): fix null hippy tag in UI inspector
Cyunong Nov 29, 2024
0ab96f4
fix(ios): todo not a hippy view
Cyunong Nov 29, 2024
1c6ba75
fix(ios): simplify logic
Cyunong Nov 29, 2024
8a780e0
fix(ios): simplify logic and refine todo
Cyunong Dec 2, 2024
065c15a
fix(ios): fix indent error
Cyunong Dec 2, 2024
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
43 changes: 22 additions & 21 deletions renderer/native/ios/renderer/component/view/HippyViewManager.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,28 +188,29 @@ - (void)measureInAppWindow:(NSNumber *)componentTag
HIPPY_EXPORT_METHOD(getViewTagByLocation:(nonnull NSNumber *)componentTag
params:(NSDictionary *__nonnull)params
callback:(HippyPromiseResolveBlock)callback) {
[self.bridge.uiManager addUIBlock:^(__unused HippyUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
NSMutableDictionary *locationDict = [NSMutableDictionary dictionaryWithDictionary:@{
HippyTagKey: @(InvalidTag),
[self.bridge.uiManager addUIBlock:^(__unused HippyUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
NSMutableDictionary *locationDict = [NSMutableDictionary dictionaryWithDictionary:@{
HippyTagKey: @(InvalidTag),
}];
UIView *view = viewRegistry[componentTag];
if (view == nil) {
callback(locationDict);
return;
}
UIView *rootView = viewRegistry[view.rootTag];
if (rootView == nil) {
callback(locationDict);
return;
}
double locationX = [params[HippyXOnScreenKey] doubleValue];
double locationY = [params[HippyYOnScreenKey] doubleValue];
UIView* hitView = [rootView hitTest:{locationX, locationY} withEvent:nil];
// TODO: The hitView may not a hippy view (such as a sub native view). Should trace to hippy view.
if (hitView.hippyTag) {
[locationDict setObject:hitView.hippyTag forKey:HippyTagKey];
}
callback(@[locationDict]);
}];
UIView *view = viewRegistry[componentTag];
if (view == nil) {
callback(locationDict);
return;
}
UIView *rootView = viewRegistry[view.rootTag];
if (rootView == nil) {
callback(locationDict);
return;
}
double locationX = [params[HippyXOnScreenKey] doubleValue];
double locationY = [params[HippyYOnScreenKey] doubleValue];
UIView* hitView = [rootView hitTest:{locationX, locationY} withEvent:nil];
if (hitView != nil && [hitView respondsToSelector:@selector(hippyTag)]) {
[locationDict setObject:hitView.hippyTag forKey:HippyTagKey];
}
callback(@[locationDict]);
}];
}

HIPPY_EXPORT_METHOD(getLocationOnScreen:(nonnull NSNumber *)componentTag
Expand Down
Loading