Skip to content

Commit bf35622

Browse files
DjDeveloperrDjDeveloperr
committed
style: format accessibility inspector changes
1 parent fcb1812 commit bf35622

4 files changed

Lines changed: 117 additions & 102 deletions

File tree

‎client/src/app/AppShell.tsx‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,16 +1430,15 @@ export function AppShell({
14301430
);
14311431

14321432
useEffect(() => {
1433-
const refreshMs =
1434-
hierarchyVisible
1435-
? accessibilityPreferredSource === "react-native" ||
1436-
accessibilitySource === "react-native"
1437-
? REACT_NATIVE_ACCESSIBILITY_REFRESH_MS
1438-
: accessibilityPreferredSource === "flutter" ||
1439-
accessibilitySource === "flutter"
1440-
? FLUTTER_ACCESSIBILITY_REFRESH_MS
1441-
: ACCESSIBILITY_REFRESH_MS
1442-
: ACCESSIBILITY_BACKGROUND_REFRESH_MS;
1433+
const refreshMs = hierarchyVisible
1434+
? accessibilityPreferredSource === "react-native" ||
1435+
accessibilitySource === "react-native"
1436+
? REACT_NATIVE_ACCESSIBILITY_REFRESH_MS
1437+
: accessibilityPreferredSource === "flutter" ||
1438+
accessibilitySource === "flutter"
1439+
? FLUTTER_ACCESSIBILITY_REFRESH_MS
1440+
: ACCESSIBILITY_REFRESH_MS
1441+
: ACCESSIBILITY_BACKGROUND_REFRESH_MS;
14431442
let disposed = false;
14441443
let timeout: number | null = null;
14451444
const refreshLoop = async () => {

‎client/src/features/accessibility/AccessibilityInspector.tsx‎

Lines changed: 50 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -514,55 +514,57 @@ function NodeDetails({
514514
const isAndroid = isAndroidSimulator(selectedSimulator);
515515
const sourceText = sourceLocationText(node);
516516
const sourceHref = sourceLocationHref(node);
517-
const details = ([
518-
["Type", accessibilityKind(node)],
519-
["Label", primaryAccessibilityText(node)],
517+
const details = (
520518
[
521-
"Source",
522-
sourceHref ? (
523-
<a className="hierarchy-detail-link" href={sourceHref}>
524-
{sourceText}
525-
</a>
526-
) : (
527-
sourceText
528-
),
529-
],
530-
[
531-
isAndroid ? "Resource ID" : "Identifier",
532-
isAndroid
533-
? (node.androidResourceId ?? "")
534-
: accessibilityIdentifier(node),
535-
],
536-
["Inspector ID", node.inspectorId ?? ""],
537-
["Module", node.moduleName ?? ""],
538-
["NativeScript", nativeScriptDescription(node.nativeScript)],
539-
["React Native", reactNativeDescription(node.reactNative)],
540-
["Flutter", flutterDescription(node.flutter)],
541-
[isAndroid ? "Android Class" : "UIKit Class", node.className ?? ""],
542-
["Package", isAndroid ? (node.androidPackage ?? "") : ""],
543-
["Last JS", lastUIKitScriptText(node)],
544-
["Value", node.AXValue ?? ""],
545-
["Role", node.role ?? ""],
546-
["Role Description", node.role_description ?? ""],
547-
["View Controller", objectClassName(node.viewController)],
548-
["SwiftUI", swiftUIDescription(node.swiftUI)],
549-
["Enabled", node.enabled == null ? "" : node.enabled ? "true" : "false"],
550-
["Hidden", node.isHidden == null ? "" : node.isHidden ? "true" : "false"],
551-
["Clickable", boolDetail(isAndroid, node.clickable)],
552-
["Long Clickable", boolDetail(isAndroid, node.longClickable)],
553-
["Focusable", boolDetail(isAndroid, node.focusable)],
554-
["Focused", boolDetail(isAndroid, node.focused)],
555-
["Scrollable", boolDetail(isAndroid, node.scrollable)],
556-
["Checkable", boolDetail(isAndroid, node.checkable)],
557-
["Checked", boolDetail(isAndroid, node.checked)],
558-
["Selected", boolDetail(isAndroid, node.selected)],
559-
["Password", boolDetail(isAndroid, node.password)],
560-
["Alpha", node.alpha == null ? "" : String(round(node.alpha))],
561-
["Frame", validFrame(node.frame) ? frameText(node.frame) : ""],
562-
["PID", node.pid == null ? "" : String(node.pid)],
563-
["Actions", node.custom_actions?.join(", ") ?? ""],
564-
["Help", node.help ?? ""],
565-
] as Array<[string, DetailValue]>).filter(([, value]) => value);
519+
["Type", accessibilityKind(node)],
520+
["Label", primaryAccessibilityText(node)],
521+
[
522+
"Source",
523+
sourceHref ? (
524+
<a className="hierarchy-detail-link" href={sourceHref}>
525+
{sourceText}
526+
</a>
527+
) : (
528+
sourceText
529+
),
530+
],
531+
[
532+
isAndroid ? "Resource ID" : "Identifier",
533+
isAndroid
534+
? (node.androidResourceId ?? "")
535+
: accessibilityIdentifier(node),
536+
],
537+
["Inspector ID", node.inspectorId ?? ""],
538+
["Module", node.moduleName ?? ""],
539+
["NativeScript", nativeScriptDescription(node.nativeScript)],
540+
["React Native", reactNativeDescription(node.reactNative)],
541+
["Flutter", flutterDescription(node.flutter)],
542+
[isAndroid ? "Android Class" : "UIKit Class", node.className ?? ""],
543+
["Package", isAndroid ? (node.androidPackage ?? "") : ""],
544+
["Last JS", lastUIKitScriptText(node)],
545+
["Value", node.AXValue ?? ""],
546+
["Role", node.role ?? ""],
547+
["Role Description", node.role_description ?? ""],
548+
["View Controller", objectClassName(node.viewController)],
549+
["SwiftUI", swiftUIDescription(node.swiftUI)],
550+
["Enabled", node.enabled == null ? "" : node.enabled ? "true" : "false"],
551+
["Hidden", node.isHidden == null ? "" : node.isHidden ? "true" : "false"],
552+
["Clickable", boolDetail(isAndroid, node.clickable)],
553+
["Long Clickable", boolDetail(isAndroid, node.longClickable)],
554+
["Focusable", boolDetail(isAndroid, node.focusable)],
555+
["Focused", boolDetail(isAndroid, node.focused)],
556+
["Scrollable", boolDetail(isAndroid, node.scrollable)],
557+
["Checkable", boolDetail(isAndroid, node.checkable)],
558+
["Checked", boolDetail(isAndroid, node.checked)],
559+
["Selected", boolDetail(isAndroid, node.selected)],
560+
["Password", boolDetail(isAndroid, node.password)],
561+
["Alpha", node.alpha == null ? "" : String(round(node.alpha))],
562+
["Frame", validFrame(node.frame) ? frameText(node.frame) : ""],
563+
["PID", node.pid == null ? "" : String(node.pid)],
564+
["Actions", node.custom_actions?.join(", ") ?? ""],
565+
["Help", node.help ?? ""],
566+
] as Array<[string, DetailValue]>
567+
).filter(([, value]) => value);
566568

567569
return (
568570
<div className="hierarchy-details">

‎client/src/features/accessibility/AccessibilityOverlay.tsx‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -148,34 +148,34 @@ function AccessibilityDomNode({
148148
const tagName = accessibilityDomTagName(node);
149149

150150
return createElement(tagName, {
151-
"aria-checked":
152-
role === "checkbox" || role === "switch"
153-
? (node.checked ?? undefined)
154-
: undefined,
155-
"aria-label": label,
156-
"aria-level": depth + 1,
157-
"aria-selected": node.selected ?? undefined,
158-
className: "accessibility-dom-node",
159-
"data-testid": `simdeck-accessibility-${id}`,
160-
"data-simdeck-accessibility-id": id,
161-
"data-simdeck-accessibility-component": kind,
162-
"data-simdeck-accessibility-identifier":
163-
accessibilityIdentifier(node) || undefined,
164-
"data-simdeck-accessibility-kind": kind,
165-
"data-simdeck-accessibility-label": primaryAccessibilityText(node),
166-
"data-simdeck-accessibility-image": metadata.imageName,
167-
"data-simdeck-accessibility-source-file": metadata.sourceFile,
168-
"data-simdeck-accessibility-source-line": metadata.sourceLine,
169-
"data-simdeck-accessibility-source-column": metadata.sourceColumn,
170-
"data-simdeck-accessibility-source": node.source || undefined,
171-
"data-simdeck-accessibility-state": metadata.state,
172-
"data-simdeck-accessibility-value": metadata.value,
173-
"data-simdeck-inspector-id": node.inspectorId || undefined,
174-
"data-simdeck-uikit-id": node.uikitId || undefined,
175-
title: label,
176-
role,
177-
style: frameStyle(node.frame, rootFrame),
178-
});
151+
"aria-checked":
152+
role === "checkbox" || role === "switch"
153+
? (node.checked ?? undefined)
154+
: undefined,
155+
"aria-label": label,
156+
"aria-level": depth + 1,
157+
"aria-selected": node.selected ?? undefined,
158+
className: "accessibility-dom-node",
159+
"data-testid": `simdeck-accessibility-${id}`,
160+
"data-simdeck-accessibility-id": id,
161+
"data-simdeck-accessibility-component": kind,
162+
"data-simdeck-accessibility-identifier":
163+
accessibilityIdentifier(node) || undefined,
164+
"data-simdeck-accessibility-kind": kind,
165+
"data-simdeck-accessibility-label": primaryAccessibilityText(node),
166+
"data-simdeck-accessibility-image": metadata.imageName,
167+
"data-simdeck-accessibility-source-file": metadata.sourceFile,
168+
"data-simdeck-accessibility-source-line": metadata.sourceLine,
169+
"data-simdeck-accessibility-source-column": metadata.sourceColumn,
170+
"data-simdeck-accessibility-source": node.source || undefined,
171+
"data-simdeck-accessibility-state": metadata.state,
172+
"data-simdeck-accessibility-value": metadata.value,
173+
"data-simdeck-inspector-id": node.inspectorId || undefined,
174+
"data-simdeck-uikit-id": node.uikitId || undefined,
175+
title: label,
176+
role,
177+
style: frameStyle(node.frame, rootFrame),
178+
});
179179
}
180180

181181
function frameStyle(

‎packages/nativescript-inspector/src/index.ts‎

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,12 @@ export class SimDeckNativeScriptInspector {
844844
: null;
845845
let child =
846846
maxDepth == null || depth < maxDepth
847-
? this.nativeScriptNode(accessoryView, includeHidden, maxDepth, depth + 1)
847+
? this.nativeScriptNode(
848+
accessoryView,
849+
includeHidden,
850+
maxDepth,
851+
depth + 1,
852+
)
848853
: null;
849854
if (child && uikitAccessory) {
850855
child = patchNativeScriptFramesFromUIKit(child, uikitAccessory);
@@ -1445,7 +1450,9 @@ function nativeScriptTabItems(
14451450
sourceRoot = "",
14461451
): JSONObject[] {
14471452
const rawItems = nsArray(
1448-
read(tabView, "items") || read(tabView, "_items") || read(tabView, "_tabItems"),
1453+
read(tabView, "items") ||
1454+
read(tabView, "_items") ||
1455+
read(tabView, "_tabItems"),
14491456
);
14501457
const children = nativeScriptChildren(tabView);
14511458
const count = Math.max(
@@ -1462,7 +1469,8 @@ function nativeScriptTabItems(
14621469
read(child, "_tabItem") ||
14631470
{};
14641471
return {
1465-
title: stringValue(read(item, "title")) || stringValue(read(child, "title")),
1472+
title:
1473+
stringValue(read(item, "title")) || stringValue(read(child, "title")),
14661474
iconSource:
14671475
stringValue(read(item, "iconSource")) ||
14681476
stringValue(read(child, "iconSource")),
@@ -1545,7 +1553,8 @@ function patchNativeScriptFramesFromUIKit(
15451553
): JSONObject {
15461554
const candidates = collectSubviews(
15471555
uikitRoot,
1548-
(view) => Boolean(uikitFrameLabel(view)) && hasUsableFrame(frameInScreen(view)),
1556+
(view) =>
1557+
Boolean(uikitFrameLabel(view)) && hasUsableFrame(frameInScreen(view)),
15491558
).map((view) => ({
15501559
frame: frameInScreen(view),
15511560
label: uikitFrameLabel(view),
@@ -1595,10 +1604,7 @@ function uikitFrameLabel(view: any): string {
15951604
);
15961605
}
15971606

1598-
function findSubview(
1599-
view: any,
1600-
predicate: (view: any) => boolean,
1601-
): any | null {
1607+
function findSubview(view: any, predicate: (view: any) => boolean): any | null {
16021608
if (!view) {
16031609
return null;
16041610
}
@@ -1644,22 +1650,27 @@ function tabBarControls(tabBar: any): any[] {
16441650
}
16451651
byFrame.set(rectKey(frame), control);
16461652
}
1647-
return preferLargestNonOverlappingControls([...byFrame.values()]).sort((left, right) => {
1648-
const leftFrame = frameInScreen(left);
1649-
const rightFrame = frameInScreen(right);
1650-
return rectNumber(leftFrame, "x") - rectNumber(rightFrame, "x");
1651-
});
1653+
return preferLargestNonOverlappingControls([...byFrame.values()]).sort(
1654+
(left, right) => {
1655+
const leftFrame = frameInScreen(left);
1656+
const rightFrame = frameInScreen(right);
1657+
return rectNumber(leftFrame, "x") - rectNumber(rightFrame, "x");
1658+
},
1659+
);
16521660
}
16531661

16541662
function preferLargestNonOverlappingControls(controls: any[]): any[] {
16551663
const accepted: any[] = [];
16561664
for (const control of [...controls].sort(
1657-
(left, right) => rectArea(frameInScreen(right)) - rectArea(frameInScreen(left)),
1665+
(left, right) =>
1666+
rectArea(frameInScreen(right)) - rectArea(frameInScreen(left)),
16581667
)) {
16591668
const frame = frameInScreen(control);
16601669
if (
16611670
!frame ||
1662-
accepted.some((other) => substantiallyOverlaps(frame, frameInScreen(other)))
1671+
accepted.some((other) =>
1672+
substantiallyOverlaps(frame, frameInScreen(other)),
1673+
)
16631674
) {
16641675
continue;
16651676
}
@@ -1737,7 +1748,10 @@ function fallbackTabBarFrame(): JSONObject {
17371748
width: 0,
17381749
height: 0,
17391750
};
1740-
const height = Math.min(83, Math.max(49, rectNumber(screen, "height") * 0.095));
1751+
const height = Math.min(
1752+
83,
1753+
Math.max(49, rectNumber(screen, "height") * 0.095),
1754+
);
17411755
return {
17421756
x: rectNumber(screen, "x"),
17431757
y: rectNumber(screen, "y") + rectNumber(screen, "height") - height,

0 commit comments

Comments
 (0)