chore(null): strict null checks for more injected/visualization files

src/common/target-helper.ts

@@ -21,9 +21,9 @@ export class TargetHelper {
         target: (string | string[])[],
         dom: Document,
         targetIndex,
-    ) => {
+    ): Element[] => {
         if (!target || target.length < 1) {
-            return;
+            return [];
         }
         const selectors = target[targetIndex];
         let elements: NodeListOf<Element> | null;
@@ -32,7 +32,7 @@ export class TargetHelper {
         } else {
             const shadowHost = this.getShadowHost(selectors, dom);
             if (!shadowHost || !shadowHost.shadowRoot) {
-                return;
+                return [];
             }
             elements = shadowHost.shadowRoot.querySelectorAll(selectors[selectors.length - 1]);
         }

src/injected/visualization/accessible-names-formatter.ts

@@ -1,18 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-import {
-    FormattedCheckResult,
-    HtmlElementAxeResults,
-} from 'common/types/store-data/visualization-scan-result-data';
+import { HtmlElementAxeResults } from 'common/types/store-data/visualization-scan-result-data';
 import { DialogRenderer } from 'injected/dialog-renderer';
 import { AssessmentVisualizationInstance } from 'injected/frameCommunicators/html-element-axe-results-helper';
 import { DrawerConfiguration, Formatter } from 'injected/visualization/formatter';
 import { HeadingStyleConfiguration } from 'injected/visualization/heading-formatter';
-interface DisplayAccessibleNameData {
-    accessibleName: string;
-}
+
 export class AccessibleNamesFormatter implements Formatter {
-    public getDialogRenderer(): DialogRenderer {
+    public getDialogRenderer(): DialogRenderer | null {
         return null;
     }
 
@@ -21,35 +16,28 @@ export class AccessibleNamesFormatter implements Formatter {
         fontColor: '#FFFFFF',
     };
 
-    public getData(nodes: FormattedCheckResult[]) {
-        for (const check of nodes) {
-            if (check.id === 'display-accessible-names') {
-                return {
-                    accessibleName: check.data.accessibleName,
-                };
-            }
-        }
-    }
+    private accessibleNameFromCheck(data: HtmlElementAxeResults | null): string | null {
+        const ruleResult = data?.ruleResults['display-accessible-names'];
+        const checkResult = ruleResult?.any?.find(check => check.id === 'display-accessible-names');
 
-    private getInfo(data: HtmlElementAxeResults): DisplayAccessibleNameData {
-        for (const idx in data.ruleResults) {
-            if (data.ruleResults[idx].ruleId === 'display-accessible-names') {
-                return this.getData(data.ruleResults[idx].any);
-            }
-        }
-        return undefined;
+        return checkResult?.data?.accessibleName ?? null;
     }
 
     public getDrawerConfiguration(
         element: HTMLElement,
-        data: AssessmentVisualizationInstance,
+        data: AssessmentVisualizationInstance | null,
     ): DrawerConfiguration {
-        const accessibleNameToDisplay = this.formatText(this.getInfo(data));
+        const accessibleName = this.accessibleNameFromCheck(data);
+        if (accessibleName == null) {
+            return { showVisualization: false };
+        }
+
+        const formattedAccessibleName = this.formatAccessibleName(accessibleName);
         const config: DrawerConfiguration = {
             textBoxConfig: {
                 fontColor: AccessibleNamesFormatter.style.fontColor,
                 background: AccessibleNamesFormatter.style.outlineColor,
-                text: accessibleNameToDisplay?.accessibleName,
+                text: formattedAccessibleName,
                 fontWeight: '400',
                 fontSize: '10px',
                 outline: '3px dashed',
@@ -62,21 +50,12 @@ export class AccessibleNamesFormatter implements Formatter {
         return config;
     }
 
-    private formatText(accessibleNameData: DisplayAccessibleNameData): DisplayAccessibleNameData {
-        const ElmtAccessibleName = accessibleNameData?.accessibleName;
-        let nameToDisplay;
+    private formatAccessibleName(accessibleName: string): string {
         const allowedNameMaxLength = 40;
-        if (ElmtAccessibleName === undefined) {
-            nameToDisplay = undefined;
+        if (accessibleName.length <= allowedNameMaxLength) {
+            return accessibleName;
         } else {
-            if (ElmtAccessibleName.length <= allowedNameMaxLength) {
-                nameToDisplay = ElmtAccessibleName;
-            } else if (ElmtAccessibleName.length > allowedNameMaxLength) {
-                nameToDisplay = `${ElmtAccessibleName.substring(0, allowedNameMaxLength)}...`;
-            }
+            return `${accessibleName.substring(0, allowedNameMaxLength)}...`;
         }
-        return {
-            accessibleName: nameToDisplay,
-        };
     }
 }

src/injected/visualization/base-drawer.ts

@@ -15,7 +15,7 @@ export abstract class BaseDrawer implements Drawer {
     protected containerClass: string;
     protected changeHandler: () => void;
     public static recalculationTimeout = 16;
-    protected dialogRenderer: DialogRenderer;
+    protected dialogRenderer: DialogRenderer | null;
     protected windowUtils: WindowUtils;
     protected containerElement: HTMLElement | null;
     protected drawerUtils: DrawerUtils;

src/injected/visualization/focus-indicator-creator.ts

@@ -26,13 +26,13 @@ export class FocusIndicatorCreator {
         prevItem: TabbedItem,
         isLastItem: boolean,
         formatter: Formatter,
-    ): FocusIndicator => {
-        const centerPosition: Point = this.centerPositionCalculator.getElementCenterPosition(
+    ): FocusIndicator | null => {
+        const centerPosition: Point | null = this.centerPositionCalculator.getElementCenterPosition(
             item.element,
         );
 
-        if (centerPosition == null) {
-            return;
+        if (item.element == null || centerPosition == null) {
+            return null;
         }
 
         const drawerConfig = formatter.getDrawerConfiguration(
@@ -69,20 +69,20 @@ export class FocusIndicatorCreator {
             drawerConfig.tabIndexLabel,
             item.tabOrder.toString(),
         );
-        const newLine: Element = this.createLinesInTabOrderVisualization(
+        const newLine: Element | null = this.createLinesInTabOrderVisualization(
             item,
             prevItem,
             drawerConfig.line,
             centerPosition,
             drawerConfig.circle.ellipseRx,
-            drawerConfig.line.showSolidFocusLine,
+            drawerConfig.line.showSolidFocusLine ?? false,
         );
 
         const showTabIndexedLabel = drawerConfig.tabIndexLabel.showTabIndexedLabel;
         const focusIndicator: FocusIndicator = {
             circle: newCircle,
-            tabIndexLabel: !showTabIndexedLabel ? null : newLabel,
-            line: newLine,
+            tabIndexLabel: !showTabIndexedLabel ? undefined : newLabel,
+            line: newLine ?? undefined,
         };
 
         return focusIndicator;
@@ -95,7 +95,7 @@ export class FocusIndicatorCreator {
         centerPosition: Point,
         ellipseRx: string,
         showSolidFocusLine: boolean,
-    ): Element {
+    ): Element | null {
         const shouldBreakGraph = this.shouldBreakGraph(item, prevItem);
 
         if (!showSolidFocusLine || shouldBreakGraph) {
@@ -135,23 +135,23 @@ export class FocusIndicatorCreator {
             drawerConfig.focusedLine,
             elementPosition,
             drawerConfig.focusedCircle.ellipseRx,
-            drawerConfig.line.showSolidFocusLine,
+            drawerConfig.line.showSolidFocusLine ?? false,
         );
         return {
             circle: lastItemCircle,
-            line: lastItemLine,
-            tabIndexLabel: null,
+            line: lastItemLine ?? undefined,
+            tabIndexLabel: undefined,
         };
     };
 
     public createFocusIndicatorForFailure = (
         item: TabbedItem,
         formatter: Formatter,
-    ): FocusIndicator => {
+    ): FocusIndicator | null => {
         const centerPosition = this.centerPositionCalculator.getElementCenterPosition(item.element);
 
-        if (centerPosition == null) {
-            return;
+        if (item.element == null || centerPosition == null) {
+            return null;
         }
 
         const drawerConfig = formatter.getDrawerConfiguration(

src/injected/visualization/formatter.ts

@@ -79,7 +79,7 @@ export interface SingleTargetDrawerConfiguration {
 export interface Formatter {
     getDrawerConfiguration(
         element: Node,
-        data: AxeResultsWithFrameLevel,
+        data: AxeResultsWithFrameLevel | null,
     ): DrawerConfiguration | SVGDrawerConfiguration | SingleTargetDrawerConfiguration;
     getDialogRenderer(): DialogRenderer | null;
 }

src/injected/visualization/get-cell-and-header-elements.ts

@@ -15,7 +15,7 @@ export const getCellAndHeaderElementsFromResult = (
         if (isEmpty(headersAttr)) {
             return;
         }
-        const headers = headersAttr.split(' ');
+        const headers = headersAttr!.split(' ');
         headers.forEach(headerId => {
             const headerElement = dom.getElementById(headerId);
             if (headerElement) {

src/injected/visualization/get-visualization-instances-for-tab-stops.ts

@@ -1,7 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { TabStopsScanResultData } from 'common/types/store-data/visualization-scan-result-data';
+import {
+    SingleTabStopRequirementState,
+    TabStopsScanResultData,
+} from 'common/types/store-data/visualization-scan-result-data';
 import { TabStopVisualizationInstance } from 'injected/frameCommunicators/html-element-axe-results-helper';
 import {
     InstanceIdToTabStopVisualizationMap,
@@ -24,7 +27,7 @@ export const GetVisualizationInstancesForTabStops = (
         const instance: TabStopVisualizationInstance = {
             isFailure: false,
             isVisualizationEnabled: true,
-            ruleResults: null,
+            ruleResults: {},
             target: element.target,
             propertyBag: {
                 tabOrder: element.tabOrder,
@@ -36,34 +39,37 @@ export const GetVisualizationInstancesForTabStops = (
         instanceIdToVisualizationInstanceMap[element.instanceId] = instance;
     });
 
-    forOwn(tabStopScanResultData.requirements, (obj, requirementId: TabStopRequirementId) => {
-        obj.instances.forEach(instance => {
-            if (instance.selector == null) {
-                return;
-            }
+    forOwn(
+        tabStopScanResultData.requirements,
+        (obj: SingleTabStopRequirementState, requirementId: TabStopRequirementId) => {
+            obj.instances.forEach(instance => {
+                if (instance.selector == null) {
+                    return;
+                }
 
-            const itemType =
-                requirementId === 'keyboard-navigation'
-                    ? TabbedItemType.MissingItem
-                    : TabbedItemType.ErroredItem;
+                const itemType =
+                    requirementId === 'keyboard-navigation'
+                        ? TabbedItemType.MissingItem
+                        : TabbedItemType.ErroredItem;
 
-            const newInstance: TabStopVisualizationInstance = {
-                isFailure: true,
-                isVisualizationEnabled: true,
-                ruleResults: null,
-                target: instance.selector,
-                propertyBag: {},
-                requirementResults: {
-                    [requirementId]: {
-                        instanceId: instance.id,
+                const newInstance: TabStopVisualizationInstance = {
+                    isFailure: true,
+                    isVisualizationEnabled: true,
+                    ruleResults: {},
+                    target: instance.selector,
+                    propertyBag: {},
+                    requirementResults: {
+                        [requirementId]: {
+                            instanceId: instance.id,
+                        },
                     },
-                },
-                itemType,
-            };
+                    itemType,
+                };
 
-            instanceIdToVisualizationInstanceMap[instance.id] = newInstance;
-        });
-    });
+                instanceIdToVisualizationInstanceMap[instance.id] = newInstance;
+            });
+        },
+    );
 
     return instanceIdToVisualizationInstanceMap;
 };

src/injected/visualization/highlight-box-drawer.ts

@@ -19,16 +19,15 @@ const getTargetElementsFromResult = (result: AxeResultsWithFrameLevel, dom: Docu
 
 export class HighlightBoxDrawer extends BaseDrawer {
     protected elementResults: AxeResultsWithFrameLevel[];
-    protected dialogRenderer: DialogRenderer;
-    private clientUtils: ClientUtils;
+    protected readonly dialogRenderer: DialogRenderer | null;
 
     constructor(
         dom: Document,
         containerClass: string,
         windowUtils: WindowUtils,
         shadowUtils: ShadowUtils,
         drawerUtils: DrawerUtils,
-        clientUtils: ClientUtils,
+        private readonly clientUtils: ClientUtils,
         formatter: Formatter,
         private readonly getElementsToHighlight: typeof getTargetElementsFromResult = getTargetElementsFromResult,
     ) {
@@ -45,7 +44,7 @@ export class HighlightBoxDrawer extends BaseDrawer {
     protected addHighlightsToContainer = async (): Promise<void> => {
         const highlightElements = await this.getHighlightElements();
 
-        if (highlightElements.length > 0) {
+        if (this.containerElement != null && highlightElements.length > 0) {
             for (let elementPos = 0; elementPos < highlightElements.length; elementPos++) {
                 this.containerElement.appendChild(highlightElements[elementPos]);
             }
@@ -55,7 +54,7 @@ export class HighlightBoxDrawer extends BaseDrawer {
     protected createHighlightElement = async (
         element: Element,
         data: HtmlElementAxeResults,
-    ): Promise<HTMLElement> => {
+    ): Promise<HTMLElement | undefined> => {
         const currentDom = this.drawerUtils.getDocumentElement();
         const body = currentDom.body;
         const bodyStyle = this.windowUtils.getComputedStyle(body);
@@ -91,7 +90,9 @@ export class HighlightBoxDrawer extends BaseDrawer {
         const wrapper = currentDom.createElement('div');
         wrapper.classList.add('insights-highlight-box');
         wrapper.classList.add(`insights-highlight-outline-${drawerConfig.outlineStyle ?? 'solid'}`);
-        wrapper.style.outlineColor = drawerConfig.outlineColor;
+        if (drawerConfig.outlineColor != null) {
+            wrapper.style.outlineColor = drawerConfig.outlineColor;
+        }
 
         wrapper.style.top = this.drawerUtils.getContainerTopOffset(offset).toString() + 'px';
         wrapper.style.left = this.drawerUtils.getContainerLeftOffset(offset).toString() + 'px';
@@ -138,7 +139,7 @@ export class HighlightBoxDrawer extends BaseDrawer {
 
             if (drawerConfig.failureBoxConfig.hasDialogView) {
                 failureBox.addEventListener('click', async () => {
-                    await this.dialogRenderer.render(data as any);
+                    await this.dialogRenderer?.render(data as any);
                 });
             }
             wrapper.appendChild(failureBox);
@@ -159,11 +160,15 @@ export class HighlightBoxDrawer extends BaseDrawer {
         box.innerText = boxConfig.text || '';
         box.style.background = boxConfig.background;
         box.style.color = boxConfig.fontColor;
-        box.style.fontSize = boxConfig.fontSize;
-        box.style.fontWeight = boxConfig.fontWeight;
-        box.style.setProperty('width', boxConfig.boxWidth, 'important');
-        box.style.setProperty('cursor', drawerConfig.cursor, 'important');
-        box.style.setProperty('text-align', drawerConfig.textAlign, 'important');
+        if (boxConfig.fontSize != null) {
+            box.style.fontSize = boxConfig.fontSize;
+        }
+        if (boxConfig.fontWeight != null) {
+            box.style.fontWeight = boxConfig.fontWeight;
+        }
+        box.style.setProperty('width', boxConfig.boxWidth ?? null, 'important');
+        box.style.setProperty('cursor', drawerConfig.cursor ?? null, 'important');
+        box.style.setProperty('text-align', drawerConfig.textAlign ?? null, 'important');
 
         return box;
     }